team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

I got that wrong. Sorry. top-down-rle tgas work a bit better now. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@471 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-11-19 03:09:38 +00:00
parent ac284a1b94
commit 5360ef0097
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
engine/client/image.c
View File

@ -141,7 +141,7 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
#define NTSC_GREEN 0.587
#define NTSC_BLUE 0.114
char *data;
unsigned char *data;
qboolean flipped;
@ -201,7 +201,7 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
pixbuf = targa_rgba + ((rows-1)-row)*columns*(asgrey?1:4);
for(column=0; column<columns; )
{
packetHeader=getc(fin);
packetHeader=*data++;
packetSize = 1 + (packetHeader & 0x7f);
if (packetHeader & 0x80)
{ // run-length packet
@ -216,16 +216,16 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
alphabyte = (int)(inrow[1]&0x80)*2-1; //alpha?
break;
case 24:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
alphabyte = 255;
break;
case 32:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
alphabyte = *data++;
break;
default:
blue = 127;
@ -251,7 +251,10 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
row--;
else
goto breakOut;
pixbuf = targa_rgba + row*columns*4;
if (flipped)
pixbuf = targa_rgba + row*columns*4;
else
pixbuf = targa_rgba + ((rows-1)-row)*columns*4;
}
}
}
@ -268,7 +271,10 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
row--;
else
goto breakOut;
pixbuf = targa_rgba + row*columns;
if (flipped)
pixbuf = targa_rgba + row*columns*1;
else
pixbuf = targa_rgba + ((rows-1)-row)*columns*1;
}
}
}
@ -295,19 +301,19 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
*pixbuf++ = alphabyte;
break;
case 24:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
*pixbuf++ = 255;
break;
case 32:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
alphabyte = *data++;
*pixbuf++ = red;
*pixbuf++ = green;
*pixbuf++ = blue;
@ -328,7 +334,10 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
row--;
else
goto breakOut;
pixbuf = targa_rgba + row*columns*4;
if (flipped)
pixbuf = targa_rgba + row*columns*4;
else
pixbuf = targa_rgba + ((rows-1)-row)*columns*4;
}
}
}
@ -349,16 +358,16 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
*pixbuf++ = red*NTSC_RED + green*NTSC_GREEN + blue*NTSC_BLUE;
break;
case 24:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
*pixbuf++ = red*NTSC_RED + green*NTSC_GREEN + blue*NTSC_BLUE;
break;
case 32:
blue = getc(fin);
green = getc(fin);
red = getc(fin);
alphabyte = getc(fin);
blue = *data++;
green = *data++;
red = *data++;
alphabyte = *data++;
*pixbuf++ = red*NTSC_RED + green*NTSC_GREEN + blue*NTSC_BLUE;
break;
default:
@ -376,7 +385,10 @@ qbyte *ReadTargaFile(qbyte *buf, int length, int *width, int *height, int asgrey
row--;
else
goto breakOut;
pixbuf = targa_rgba + row*columns;
if (flipped)
pixbuf = targa_rgba + row*columns*1;
else
pixbuf = targa_rgba + ((rows-1)-row)*columns*1;
}
}
}