quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also support the alpha channel hack for JPEG that DarkPlaces supports (foo.jpg + foo_alpha.jpg)

Browse Source
This commit is contained in:
Rudolf Polzer
2011-02-23 13:22:07 +01:00
parent e9b8397628
commit 4d276901a6
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/quake3/q3map2/image.c
View File

@@ -346,6 +346,7 @@ image_t *ImageLoad( const char *filename )
char name[ 1024 ];
int size;
byte *buffer = NULL;
qboolean alphaHack = qfalse;
/* init */
@@ -410,6 +411,7 @@ image_t *ImageLoad( const char *filename )
{
if( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL )
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
alphaHack = qtrue;
}
else
{
@@ -460,6 +462,28 @@ image_t *ImageLoad( const char *filename )
/* set count */
image->refCount = 1;
numImages++;
if(alphaHack)
{
StripExtension( name );
strcat( name, "_alpha.jpg" );
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if( size > 0 )
{
unsigned char *pixels;
int width, height;
if( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 && pixels != NULL )
Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
if(pixels && width == image->width && height == image->height)
{
int i;
for(i = 0; i < width*height; ++i)
image->pixels[4*i+3] = pixels[4*i+2]; // copy alpha from blue channel
}
free(pixels);
free(buffer);
}
}
/* return the image */
return image;