/* dependencies */
#include "q3map2.h"
-
+#include "webp/decode.h"
/* -------------------------------------------------------------------------------
/* get dds info */
if ( DDSGetInfo( (ddsBuffer_t*) buffer, &w, &h, &pf ) ) {
- Sys_Printf( "WARNING: Invalid DDS texture\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: Invalid DDS texture\n" );
return;
}
/* only certain types of dds textures are supported */
if ( pf != DDS_PF_ARGB8888 && pf != DDS_PF_DXT1 && pf != DDS_PF_DXT3 && pf != DDS_PF_DXT5 ) {
- Sys_Printf( "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf );
+ Sys_FPrintf( SYS_WRN, "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf );
return;
}
DDSDecompress( (ddsBuffer_t*) buffer, *pixels );
}
+#ifdef BUILD_CRUNCH
+/*
+ LoadCRNBuffer
+ loads a crn image into a valid rgba image
+*/
+void LoadCRNBuffer( byte *buffer, int size, byte **pixels, int *width, int *height) {
+ /* dummy check */
+ if ( buffer == NULL || size <= 0 || pixels == NULL || width == NULL || height == NULL ) {
+ return;
+ }
+ if ( !GetCRNImageSize( buffer, size, width, height ) ) {
+ Sys_FPrintf( SYS_WRN, "WARNING: Error getting crn imag dimensions.\n");;
+ return;
+ }
+ int outBufSize = *width * *height * 4;
+ *pixels = safe_malloc( outBufSize );
+ if ( !ConvertCRNtoRGBA( buffer, size, outBufSize, *pixels) ) {
+ Sys_FPrintf( SYS_WRN, "WARNING: Error decoding crn image.\n", 0 );
+ return;
+ }
+}
+#endif // BUILD_CRUNCH
/*
typedef struct pngBuffer_s
{
byte *buffer;
- int size, offset;
-}
-pngBuffer_t;
+ png_size_t size, offset;
+} pngBuffer_t;
void PNGReadData( png_struct *png, png_byte *buffer, png_size_t size ){
pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png );
static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, int *height ){
png_struct *png;
png_info *info, *end;
- pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png );
- int i, bitDepth, colorType, channels;
- png_uint_32 w, h;
+ pngBuffer_t pb;
+ int bitDepth, colorType;
+ png_uint_32 w, h, i;
byte **rowPointers;
/* dummy check */
/* determine if this is a png file */
if ( png_sig_cmp( buffer, 0, 8 ) != 0 ) {
- Sys_Printf( "WARNING: Invalid PNG file\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: Invalid PNG file\n" );
return;
}
/* create png structs */
png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
if ( png == NULL ) {
- Sys_Printf( "WARNING: Unable to create PNG read struct\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG read struct\n" );
return;
}
info = png_create_info_struct( png );
if ( info == NULL ) {
- Sys_Printf( "WARNING: Unable to create PNG info struct\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG info struct\n" );
png_destroy_read_struct( &png, NULL, NULL );
return;
}
end = png_create_info_struct( png );
if ( end == NULL ) {
- Sys_Printf( "WARNING: Unable to create PNG end info struct\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG end info struct\n" );
png_destroy_read_struct( &png, &info, NULL );
return;
}
/* set read callback */
- pb->buffer = buffer;
- pb->size = size;
- pb->offset = 0;
+ pb.buffer = buffer;
+ pb.size = size;
+ pb.offset = 0;
png_set_read_fn( png, &pb, PNGReadData );
- //png->io_ptr = &pb; /* hack! */
/* set error longjmp */
if ( setjmp( png_jmpbuf(png) ) ) {
- Sys_Printf( "WARNING: An error occurred reading PNG image\n" );
+ Sys_FPrintf( SYS_WRN, "WARNING: An error occurred reading PNG image\n" );
png_destroy_read_struct( &png, &info, &end );
return;
}
png_get_IHDR( png, info,
&w, &h, &bitDepth, &colorType, NULL, NULL, NULL );
- /* read number of channels */
- channels = png_get_channels( png, info );
-
/* the following will probably bork on certain types of png images, but hey... */
/* force indexed/gray/trans chunk to rgb */
/* create image pixel buffer */
*width = w;
*height = h;
- *pixels = safe_malloc( w * h * 4 );
+ /* initialize with zeros, this memory area may not be entirely rewritten */
+ *pixels = safe_malloc0( w * h * 4 );
/* create row pointers */
rowPointers = safe_malloc( h * sizeof( byte* ) );
/* clean up */
free( rowPointers );
png_destroy_read_struct( &png, &info, &end );
+}
+
+
+static void LoadWEBPBuffer( byte *buffer, int size, byte **pixels, int *width, int *height ){
+
+ int image_width;
+ int image_height;
+
+ if ( !WebPGetInfo( buffer, ( size_t) size, &image_width, &image_height ) )
+ {
+ Sys_FPrintf( SYS_WRN, "WARNING: An error occurred reading WEBP image info\n" );
+ return;
+ }
+
+ /* create image pixel buffer */
+ *pixels = safe_malloc( image_width * image_height * 4 );
+ *width = image_width;
+ *height = image_height;
+
+ int out_stride = image_width * 4;
+ int out_size = image_height * out_stride;
+
+ if ( !WebPDecodeRGBAInto( buffer, (size_t) size, *pixels, out_size, out_stride ) )
+ {
+ Sys_FPrintf( SYS_WRN, "WARNING: An error occurred reading WEBP image\n" );
+ return;
+ }
}
char name[ 1024 ];
int size;
byte *buffer = NULL;
+ qboolean alphaHack = qfalse;
/* init */
return NULL;
}
- /* strip file extension off name */
- strcpy( name, filename );
- StripExtension( name );
+ /* try with extension then without extension
+ so light.blend will be unfortunately first
+ tried as light.tga like it always did, but
+ then, light.blend.tga will be tried as well */
+ for ( i = 0; i < 2; i++ )
+ {
+ strcpy( name, filename );
- /* try to find existing image */
- image = ImageFind( name );
- if ( image != NULL ) {
- image->refCount++;
- return image;
- }
+ if ( i == 0 )
+ {
+ /* strip file extension off name */
+ StripExtension( name );
+ }
- /* none found, so find first non-null image */
- image = NULL;
- for ( i = 0; i < MAX_IMAGES; i++ )
- {
- if ( images[ i ].name == NULL ) {
- image = &images[ i ];
- break;
+ /* try to find existing image */
+ image = ImageFind( name );
+ if ( image != NULL ) {
+ image->refCount++;
+ return image;
}
- }
- /* too many images? */
- if ( image == NULL ) {
- Error( "MAX_IMAGES (%d) exceeded, there are too many image files referenced by the map.", MAX_IMAGES );
- }
+ /* none found, so find first non-null image */
+ image = NULL;
+ for ( i = 0; i < MAX_IMAGES; i++ )
+ {
+ if ( images[ i ].name == NULL ) {
+ image = &images[ i ];
+ break;
+ }
+ }
- /* set it up */
- image->name = safe_malloc( strlen( name ) + 1 );
- strcpy( image->name, name );
+ /* too many images? */
+ if ( image == NULL ) {
+ Error( "MAX_IMAGES (%d) exceeded, there are too many image files referenced by the map.", MAX_IMAGES );
+ }
+
+ /* set it up */
+ image->name = safe_malloc( strlen( name ) + 1 );
+ strcpy( image->name, name );
+
+ /* add a dummy extension that can be removed */
+ strcat( name, ".tga" );
+
+ /* Sys_FPrintf( SYS_WRN, "==> Looking for %s\n", name ); */
+
+ /* attempt to load tga */
+ StripExtension( name );
+ strcat( name, ".tga" );
+ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
+ if ( size > 0 ) {
+ LoadTGABuffer( buffer, buffer + size, &image->pixels, &image->width, &image->height );
+ break;
+ }
- /* attempt to load tga */
- StripExtension( name );
- strcat( name, ".tga" );
- size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
- if ( size > 0 ) {
- LoadTGABuffer( buffer, buffer + size, &image->pixels, &image->width, &image->height );
- }
- else
- {
/* attempt to load png */
StripExtension( name );
strcat( name, ".png" );
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
if ( size > 0 ) {
LoadPNGBuffer( buffer, size, &image->pixels, &image->width, &image->height );
+ break;
}
- else
- {
- /* attempt to load jpg */
+
+ /* attempt to load jpg */
+ StripExtension( name );
+ strcat( name, ".jpg" );
+ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
+ if ( size > 0 ) {
+ if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) {
+ // On error, LoadJPGBuff might store a pointer to the error message in image->pixels
+ Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
+ }
+ alphaHack = qtrue;
+ break;
+ }
+
+ /* attempt to load dds */
+ StripExtension( name );
+ strcat( name, ".dds" );
+ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
+
+ /* also look for .dds image in dds/ prefix like Doom3 or DarkPlaces */
+ if ( size <= 0 ) {
+ strcpy( name, "dds/" );
+ strcat( name, image->name );
StripExtension( name );
- strcat( name, ".jpg" );
+ strcat( name, ".dds" );
size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
- if ( size > 0 ) {
- if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) {
- Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels );
- }
- }
- else
- {
- /* attempt to load dds */
- StripExtension( name );
- strcat( name, ".dds" );
- size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
- if ( size > 0 ) {
- LoadDDSBuffer( buffer, size, &image->pixels, &image->width, &image->height );
-
- /* debug code */
- #if 1
- {
- ddsPF_t pf;
- DDSGetInfo( (ddsBuffer_t*) buffer, NULL, NULL, &pf );
- Sys_Printf( "pf = %d\n", pf );
- if ( image->width > 0 ) {
- StripExtension( name );
- strcat( name, "_converted.tga" );
- WriteTGA( "C:\\games\\quake3\\baseq3\\textures\\rad\\dds_converted.tga", image->pixels, image->width, image->height );
- }
- }
- #endif
- }
- }
+ }
+
+ if ( size > 0 ) {
+ LoadDDSBuffer( buffer, size, &image->pixels, &image->width, &image->height );
+ break;
+ }
+
+ /* attempt to load ktx */
+ StripExtension( name );
+ strcat( name, ".ktx" );
+ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
+ if ( size > 0 ) {
+ LoadKTXBufferFirstImage( buffer, size, &image->pixels, &image->width, &image->height );
+ break;
+ }
+
+ #ifdef BUILD_CRUNCH
+ /* attempt to load crn */
+ StripExtension( name );
+ strcat( name, ".crn" );
+ size = vfsLoadFile( ( const char* ) name, ( void** ) &buffer, 0 );
+ if ( size > 0 ) {
+ LoadCRNBuffer( buffer, size, &image->pixels, &image->width, &image->height );
+ break;
+ }
+ #endif // BUILD_CRUNCH
+
+ /* attempt to load webp */
+ StripExtension( name );
+ strcat( name, ".webp" );
+ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 );
+ if ( size > 0 ) {
+ LoadWEBPBuffer( buffer, size, &image->pixels, &image->width, &image->height );
+ break;
}
}
/* make sure everything's kosher */
if ( size <= 0 || image->width <= 0 || image->height <= 0 || image->pixels == NULL ) {
+ // Sys_FPrintf( SYS_WRN, "WARNING: Image not found: \"%s\"\n", filename );
//% Sys_Printf( "size = %d width = %d height = %d pixels = 0x%08x (%s)\n",
//% size, image->width, image->height, image->pixels, name );
free( image->name );
return NULL;
}
+ /* tell user which image file is found for the given texture path */
+ Sys_FPrintf( SYS_VRB, "Loaded image: \"%s\"\n", name );
+
/* set filename */
image->filename = safe_malloc( strlen( name ) + 1 );
strcpy( image->filename, name );
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 ) {
+ if (pixels) {
+ // On error, LoadJPGBuff might store a pointer to the error message in pixels
+ Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels );
+ }
+ } else {
+ if ( 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;
}