/* 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
/*
png_struct *png;
png_info *info, *end;
pngBuffer_t pb;
- //pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png );
int bitDepth, colorType;
png_uint_32 w, h, i;
byte **rowPointers;
/* 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;
}
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;
}
image->name = safe_malloc( strlen( name ) + 1 );
strcpy( image->name, 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 );
- }
- else
- {
+ do {
+ /* 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 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 */
- 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_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) image->pixels );
- }
- alphaHack = qtrue;
+
+ /* 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 );
}
- else
+ alphaHack = qtrue;
+ break;
+ }
+
+ /* 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
{
- /* 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
- }
- else
- {
- /* attempt to load ktx */
+ ddsPF_t pf;
+ DDSGetInfo( (ddsBuffer_t*) buffer, NULL, NULL, &pf );
+ Sys_Printf( "pf = %d\n", pf );
+ if ( image->width > 0 ) {
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 );
- }
+ strcat( name, "_converted.tga" );
+ WriteTGA( "C:\\games\\quake3\\baseq3\\textures\\rad\\dds_converted.tga", image->pixels, image->width, image->height );
}
}
+ #endif // debug
+ 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
+ } while (qfalse);
/* free file buffer */
free( buffer );
if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 ) {
if (pixels) {
// On error, LoadJPGBuff might store a pointer to the error message in pixels
- Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels );
- }
+ Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels );
+ }
} else {
if ( width == image->width && height == image->height ) {
int i;