From 2687dfe6a2347b62eb96901986076040be56b126 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 21 Jan 2013 13:04:58 -0500 Subject: [PATCH] snes: remove pcx_to_sprite tool We'll just use the pcx to 4bpp tile tool instead --- tb_snes/tools/Makefile | 12 +- tb_snes/tools/pcx_to_sprite.c | 214 ---------------------------------- 2 files changed, 2 insertions(+), 224 deletions(-) delete mode 100644 tb_snes/tools/pcx_to_sprite.c diff --git a/tb_snes/tools/Makefile b/tb_snes/tools/Makefile index 8d223c3..28f6407 100644 --- a/tb_snes/tools/Makefile +++ b/tb_snes/tools/Makefile @@ -3,7 +3,7 @@ CFLAGS = -O2 -Wall LFLAGS = all: bin2byte color_convert convert_font convert_font_bin \ - dump_font make_pal pcx_to_sprite \ + dump_font make_pal \ pcx_to_tiles_4bpp pcx_to_tiles_8bpp \ ansi_to_tile string_to_bytes convert_font_4bpp \ snes_checksum @@ -64,14 +64,6 @@ make_pal: make_pal.o make_pal.o: make_pal.c $(CC) $(CFLAGS) -c make_pal.c - -pcx_to_sprite: pcx_to_sprite.o - $(CC) $(LFLAGS) -o pcx_to_sprite pcx_to_sprite.o - -pcx_to_sprite.o: pcx_to_sprite.c - $(CC) $(CFLAGS) -c pcx_to_sprite.c - - pcx_to_tiles_4bpp: pcx_to_tiles_4bpp.o $(CC) $(LFLAGS) -o pcx_to_tiles_4bpp pcx_to_tiles_4bpp.o @@ -104,7 +96,7 @@ snes_checksum.o: snes_checksum.c clean: rm -f *.o *~ bin2byte color_convert convert_font \ - convert_font_bin dump_font make_pal pcx_to_sprite \ + convert_font_bin dump_font make_pal \ pcx_to_tiles_4bpp pcx_to_tiles_8bpp \ ansi_to_tile string_to_bytes \ convert_font_4bpp snes_checksum diff --git a/tb_snes/tools/pcx_to_sprite.c b/tb_snes/tools/pcx_to_sprite.c deleted file mode 100644 index 38f1aca..0000000 --- a/tb_snes/tools/pcx_to_sprite.c +++ /dev/null @@ -1,214 +0,0 @@ -/* Converts a 24-bit PCX file to a raw file for use in ECE498 Project 1 */ - -#include /* For FILE I/O */ -#include /* For strncmp */ -#include /* for open() */ -#include /* for lseek() */ -#include /* for file modes */ -#include /* exit() */ - -/* Convert to 15-bpp bgr */ -int rgb2bgr(int r,int g, int b) { - int r2,g2,b2,bgr; - - r2=(r>>3)&0x1f; - g2=(g>>3)&0x1f; - b2=(b>>3)&0x1f; - - bgr=(b2<<10)|(g2<<5)|r2; - - return bgr; -} - - -int vmwLoadPCX(int pcx_fd) { - - int debug=1,bpp; - int x,y; - int i,numacross,planes=0; - int xsize,ysize,plane; - int xmin,ymin,xmax,ymax,version; - unsigned char pcx_header[128]; - unsigned char temp_byte; - - /* Open the file */ - // pcx_fd=open(filename,O_RDONLY); - - //if (pcx_fd<0) { - // printf("ERROR! File \"%s\" not found!\n",filename); - // return -1; - // } - - /*************** DECODE THE HEADER *************************/ - - // lseek(pcx_fd,0,SEEK_SET); - - read(pcx_fd,&pcx_header,128); - - xmin=(pcx_header[5]<<8)+pcx_header[4]; - ymin=(pcx_header[7]<<8)+pcx_header[6]; - - xmax=(pcx_header[9]<<8)+pcx_header[8]; - ymax=(pcx_header[11]<<8)+pcx_header[10]; - - version=pcx_header[1]; - bpp=pcx_header[3]; - - if (debug) { - - fprintf(stderr,"Manufacturer: "); - if (pcx_header[0]==10) fprintf(stderr,"Zsoft\n"); - else fprintf(stderr,"Unknown %i\n",pcx_header[0]); - - fprintf(stderr,"Version: "); - - switch(version) { - case 0: fprintf(stderr,"2.5\n"); break; - case 2: fprintf(stderr,"2.8 w palette\n"); break; - case 3: fprintf(stderr,"2.8 w/o palette\n"); break; - case 4: fprintf(stderr,"Paintbrush for Windows\n"); break; - case 5: fprintf(stderr,"3.0+\n"); break; - default: fprintf(stderr,"Unknown %i\n",version); - } - fprintf(stderr,"Encoding: "); - if (pcx_header[2]==1) fprintf(stderr,"RLE\n"); - else fprintf(stderr,"Unknown %i\n",pcx_header[2]); - - fprintf(stderr,"BitsPerPixelPerPlane: %i\n",bpp); - fprintf(stderr,"File goes from %i,%i to %i,%i\n",xmin,ymin,xmax,ymax); - - fprintf(stderr,"Horizontal DPI: %i\n",(pcx_header[13]<<8)+pcx_header[12]); - fprintf(stderr,"Vertical DPI: %i\n",(pcx_header[15]<<8)+pcx_header[14]); - - fprintf(stderr,"Number of colored planes: %i\n",pcx_header[65]); - fprintf(stderr,"Bytes per line: %i\n",(pcx_header[67]<<8)+pcx_header[66]); - fprintf(stderr,"Palette Type: %i\n",(pcx_header[69]<<8)+pcx_header[68]); - fprintf(stderr,"Hscreen Size: %i\n",(pcx_header[71]<<8)+pcx_header[70]); - fprintf(stderr,"Vscreen Size: %i\n",(pcx_header[73]<<8)+pcx_header[72]); - - } - planes=pcx_header[65]; - -// if ((version==5) && (bpp==8) && (pcx_header[65]==3)) type=24; -// else if (version==5) type=8; -// else type=0; - - xsize=((xmax-xmin)+1); - ysize=((ymax-ymin)+1); - - char *output; - - output=calloc((xsize*ysize),sizeof(unsigned int)); - if (output==NULL) return -1; - - x=0; y=0; - - while(y>1); - } - - printf("\t.word $%02x%02x\n",plane1,plane0); - } - - printf("\t; Plane 2 Plane 3\n"); - for(y=0;y>2); - plane3|=(((output[(y*xsize)+x])&8)>>3); - } - - printf("\t.word $%02x%02x\n",plane3,plane2); - } - - for(i=0;i<1008;i++) { - printf("\t.word $ffff\n"); - } - - printf("sprite_palette:\n"); - - /* read in palette */ - read(pcx_fd,&temp_byte,1); - if (temp_byte!=12) { - printf("Error! No palette found!\n"); - } - else { - int r,g,b; - for(i=0;i<16;i++) { - read(pcx_fd,&temp_byte,1); - r=temp_byte; - read(pcx_fd,&temp_byte,1); - g=temp_byte; - read(pcx_fd,&temp_byte,1); - b=temp_byte; - printf("\t.word $%x\t; r=%x g=%x b=%x\n",rgb2bgr(r,g,b),r,g,b); - } - } - - // close(pcx_fd); - - return 0; -} - - -int main(int argc, char **argv) { - - int result;//,x,y; - // FILE *fff; - - //char filename[]="butterfinger.pcx"; - - /* read from stdin */ - - result=vmwLoadPCX(fileno(stdin)); - - if (result<0) { - fprintf(stderr,"Error reading PCX from stdin\n"); - exit(1); - } - - // fff=fopen("input.bin","w"); - //if (fff==NULL) exit(1); - - // fwrite(buffer,sizeof(unsigned int),buffer[0]*buffer[1]+2,stdout); - - return 0; -}