X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=3fa3f3ba1ff07663d91ed12260e30bf847c2d1e9;hb=c8faaabd182ae985281ec019f87ce7b7186b4ce9;hp=b46e3f4f91910d39bfb98430590a4132f08a3029;hpb=61f6f92291491fe35ecd38747e37e6d569fec28d;p=xonotic%2Fdarkplaces.git diff --git a/image.c b/image.c index b46e3f4f..3fa3f3ba 100644 --- a/image.c +++ b/image.c @@ -2,44 +2,107 @@ #include "quakedef.h" #include "image.h" #include "jpeg.h" +#include "image_png.h" #include "r_shadow.h" int image_width; int image_height; -void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices) +#if 1 +// written by LordHavoc in a readable way, optimized by Vic, further optimized by LordHavoc (the non-special index case), readable version preserved below this +void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices) { - int c, x, y; - const qbyte *in, *inrow, *incolumn; - if (flipdiagonal) + int index, c, x, y; + const unsigned char *in, *line; + int row_inc = (inputflipy ? -inputwidth : inputwidth) * numinputcomponents, col_inc = (inputflipx ? -1 : 1) * numinputcomponents; + int row_ofs = (inputflipy ? (inputheight - 1) * inputwidth * numinputcomponents : 0), col_ofs = (inputflipx ? (inputwidth - 1) * numinputcomponents : 0); + + for (c = 0; c < numoutputcomponents; c++) + if (outputinputcomponentindices[c] & 0x80000000) + break; + if (c < numoutputcomponents) { - for (y = 0;y < height;y++) + // special indices used + if (inputflipdiagonal) { - incolumn = inpixels + (flipx ? width - 1 - y : y) * numincomponents; - for (x = 0;x < width;x++) + for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc) + for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents) + for (c = 0; c < numoutputcomponents; c++) + outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index]; + } + else + { + for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc) + for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents) + for (c = 0; c < numoutputcomponents; c++) + outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index]; + } + } + else + { + // special indices not used + if (inputflipdiagonal) + { + for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc) + for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents) + for (c = 0; c < numoutputcomponents; c++) + outpixels[c] = in[outputinputcomponentindices[c]]; + } + else + { + for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc) + for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents) + for (c = 0; c < numoutputcomponents; c++) + outpixels[c] = in[outputinputcomponentindices[c]]; + } + } +} +#else +// intentionally readable version +void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices) +{ + int index, c, x, y; + const unsigned char *in, *inrow, *incolumn; + if (inputflipdiagonal) + { + for (x = 0;x < inputwidth;x++) + { + for (y = 0;y < inputheight;y++) { - in = incolumn + (flipy ? height - 1 - x : x) * width * numincomponents; - for (c = 0;c < numoutcomponents;c++) - *outpixels++ = in[inputcomponentindices[c]]; + in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents; + for (c = 0;c < numoutputcomponents;c++) + { + index = outputinputcomponentindices[c]; + if (index & 0x80000000) + *outpixels++ = index; + else + *outpixels++ = in[index]; + } } } } else { - for (y = 0;y < height;y++) + for (y = 0;y < inputheight;y++) { - inrow = inpixels + (flipy ? height - 1 - y : y) * width * numincomponents; - for (x = 0;x < width;x++) + for (x = 0;x < inputwidth;x++) { - in = inrow + (flipx ? width - 1 - x : x) * numincomponents; - for (c = 0;c < numoutcomponents;c++) - *outpixels++ = in[inputcomponentindices[c]]; + in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents; + for (c = 0;c < numoutputcomponents;c++) + { + index = outputinputcomponentindices[c]; + if (index & 0x80000000) + *outpixels++ = index; + else + *outpixels++ = in[index]; + } } } } } +#endif -void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab) +void Image_GammaRemapRGB(const unsigned char *in, unsigned char *out, int pixels, const unsigned char *gammar, const unsigned char *gammag, const unsigned char *gammab) { while (pixels--) { @@ -52,9 +115,9 @@ void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *g } // note: pal must be 32bit color -void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal) +void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal) { - int *iout = (void *)out; + int *iout = (int *)out; while (pixels >= 8) { iout[0] = pal[in[0]]; @@ -97,7 +160,7 @@ void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned ================================================================= */ -typedef struct +typedef struct pcx_s { char manufacturer; char version; @@ -118,16 +181,16 @@ typedef struct LoadPCX ============ */ -qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight) +unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, int matchheight) { pcx_t pcx; - qbyte *a, *b, *image_rgba, *pbuf; - const qbyte *palette, *fin, *enddata; + unsigned char *a, *b, *image_rgba, *pbuf; + const unsigned char *palette, *fin, *enddata; int x, y, x2, dataByte; - if (fs_filesize < (int)sizeof(pcx) + 768) + if (filesize < (int)sizeof(pcx) + 768) { - Con_Printf ("Bad pcx file\n"); + Con_Print("Bad pcx file\n"); return NULL; } @@ -150,15 +213,15 @@ qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight) image_height = pcx.ymax + 1 - pcx.ymin; if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) { - Con_Printf ("Bad pcx file\n"); + Con_Print("Bad pcx file\n"); return NULL; } if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - palette = f + fs_filesize - 768; + palette = f + filesize - 768; - image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4); + image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4); if (!image_rgba) { Con_Printf("LoadPCX: not enough memory for %i by %i image\n", image_width, image_height); @@ -227,19 +290,7 @@ TargaHeader; void PrintTargaHeader(TargaHeader *t) { - Con_Printf("TargaHeader:\n"); - Con_Printf("uint8 id_length = %i;\n", t->id_length); - Con_Printf("uint8 colormap_type = %i;\n", t->colormap_type); - Con_Printf("uint8 image_type = %i;\n", t->image_type); - Con_Printf("uint16 colormap_index = %i;\n", t->colormap_index); - Con_Printf("uint16 colormap_length = %i;\n", t->colormap_length); - Con_Printf("uint8 colormap_size = %i;\n", t->colormap_size); - Con_Printf("uint16 x_origin = %i;\n", t->x_origin); - Con_Printf("uint16 y_origin = %i;\n", t->y_origin); - Con_Printf("uint16 width = %i;\n", t->width); - Con_Printf("uint16 height = %i;\n", t->height); - Con_Printf("uint8 pixel_size = %i;\n", t->pixel_size); - Con_Printf("uint8 attributes = %i;\n", t->attributes); + Con_Printf("TargaHeader:\nuint8 id_length = %i;\nuint8 colormap_type = %i;\nuint8 image_type = %i;\nuint16 colormap_index = %i;\nuint16 colormap_length = %i;\nuint8 colormap_size = %i;\nuint16 x_origin = %i;\nuint16 y_origin = %i;\nuint16 width = %i;\nuint16 height = %i;\nuint8 pixel_size = %i;\nuint8 attributes = %i;\n", t->id_length, t->colormap_type, t->image_type, t->colormap_index, t->colormap_length, t->colormap_size, t->x_origin, t->y_origin, t->width, t->height, t->pixel_size, t->attributes); } /* @@ -247,18 +298,19 @@ void PrintTargaHeader(TargaHeader *t) LoadTGA ============= */ -qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) +unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight) { - int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex; - qbyte *pixbuf, *image_rgba; - qbyte *fin, *enddata; + int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits; + unsigned char *pixbuf, *image_rgba; + const unsigned char *fin, *enddata; + unsigned char *p; TargaHeader targa_header; - unsigned char palette[256*4], *p; + unsigned char palette[256*4]; - if (fs_filesize < 19) + if (filesize < 19) return NULL; - enddata = f + fs_filesize; + enddata = f + filesize; targa_header.id_length = f[0]; targa_header.colormap_type = f[1]; @@ -273,7 +325,7 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) targa_header.height = image_height = f[14] + f[15] * 256; if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) { - Con_Printf("LoadTGA: invalid size\n"); + Con_Print("LoadTGA: invalid size\n"); PrintTargaHeader(&targa_header); return NULL; } @@ -282,35 +334,26 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) targa_header.pixel_size = f[16]; targa_header.attributes = f[17]; + // advance to end of header fin = f + 18; - if (targa_header.id_length != 0) - fin += targa_header.id_length; // skip TARGA image comment - if (targa_header.image_type == 2 || targa_header.image_type == 10) - { - if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32) - { - Con_Printf ("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n"); - PrintTargaHeader(&targa_header); - return NULL; - } - } - else if (targa_header.image_type == 1 || targa_header.image_type == 9) + + // skip TARGA image comment (usually 0 bytes) + fin += targa_header.id_length; + + // read/skip the colormap if present (note: according to the TARGA spec it + // can be present even on truecolor or greyscale images, just not used by + // the image data) + if (targa_header.colormap_type) { - if (targa_header.pixel_size != 8) - { - Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n"); - PrintTargaHeader(&targa_header); - return NULL; - } if (targa_header.colormap_length > 256) { - Con_Printf ("LoadTGA: only up to 256 colormap_length supported\n"); + Con_Print("LoadTGA: only up to 256 colormap_length supported\n"); PrintTargaHeader(&targa_header); return NULL; } if (targa_header.colormap_index) { - Con_Printf ("LoadTGA: colormap_index not supported\n"); + Con_Print("LoadTGA: colormap_index not supported\n"); PrintTargaHeader(&targa_header); return NULL; } @@ -336,7 +379,27 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) } else { - Con_Printf ("LoadTGA: Only 32 and 24 bit colormap_size supported\n"); + Con_Print("LoadTGA: Only 32 and 24 bit colormap_size supported\n"); + PrintTargaHeader(&targa_header); + return NULL; + } + } + + // check our pixel_size restrictions according to image_type + if (targa_header.image_type == 2 || targa_header.image_type == 10) + { + if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32) + { + Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n"); + PrintTargaHeader(&targa_header); + return NULL; + } + } + else if (targa_header.image_type == 1 || targa_header.image_type == 9) + { + if (targa_header.pixel_size != 8) + { + Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n"); PrintTargaHeader(&targa_header); return NULL; } @@ -345,28 +408,36 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) { if (targa_header.pixel_size != 8) { - Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n"); + Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n"); PrintTargaHeader(&targa_header); return NULL; } } else { - Con_Printf ("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type); + Con_Printf("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type); PrintTargaHeader(&targa_header); return NULL; } if (targa_header.attributes & 0x10) { - Con_Printf ("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n"); + Con_Print("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n"); + return NULL; + } + + // number of attribute bits per pixel, we only support 0 or 8 + alphabits = targa_header.attributes & 0x0F; + if (alphabits != 8 && alphabits != 0) + { + Con_Print("LoadTGA: only 0 or 8 attribute (alpha) bits supported\n"); return NULL; } - image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4); + image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4); if (!image_rgba) { - Con_Printf ("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height); + Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height); return NULL; } @@ -439,6 +510,8 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) red = green = blue = *fin++; break; } + if (!alphabits) + alpha = 255; } } *pixbuf++ = red; @@ -464,19 +537,19 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight) LoadLMP ============ */ -qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight) +unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, int matchheight, qboolean loadAs8Bit) { - qbyte *image_rgba; + unsigned char *image_buffer; - if (fs_filesize < 9) + if (filesize < 9) { - Con_Printf("LoadLMP: invalid LMP file\n"); + Con_Print("LoadLMP: invalid LMP file\n"); return NULL; } // parse the very complicated header *chuckle* - image_width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216; - image_height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216; + image_width = BuffLittleLong(f); + image_height = BuffLittleLong(f + 4); if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) { Con_Printf("LoadLMP: invalid size %ix%i\n", image_width, image_height); @@ -485,23 +558,32 @@ qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight) if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - if (fs_filesize < 8 + image_width * image_height) + if (filesize < (8 + image_width * image_height)) { - Con_Printf("LoadLMP: invalid LMP file\n"); + Con_Print("LoadLMP: invalid LMP file\n"); return NULL; } - image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4); - if (!image_rgba) + if (loadAs8Bit) { - Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height); - return NULL; + image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height); + memcpy(image_buffer, f + 8, image_width * image_height); } - Image_Copy8bitRGBA(f + 8, image_rgba, image_width * image_height, palette_complete); - return image_rgba; + else + { + image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4); + Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_transparent); + } + return image_buffer; } -typedef struct +static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight) +{ + return LoadLMP(f, filesize, matchwidth, matchheight, false); +} + + +typedef struct q2wal_s { char name[32]; unsigned width, height; @@ -512,14 +594,14 @@ typedef struct int value; } q2wal_t; -qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight) +unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, int matchheight) { - qbyte *image_rgba; - const q2wal_t *inwal = (const void *)f; + unsigned char *image_rgba; + const q2wal_t *inwal = (const q2wal_t *)f; - if (fs_filesize < (int) sizeof(q2wal_t)) + if (filesize < (int) sizeof(q2wal_t)) { - Con_Printf("LoadWAL: invalid WAL file\n"); + Con_Print("LoadWAL: invalid WAL file\n"); return NULL; } @@ -533,13 +615,13 @@ qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight) if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height) + if (filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height) { - Con_Printf("LoadWAL: invalid WAL file\n"); + Con_Print("LoadWAL: invalid WAL file\n"); return NULL; } - image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4); + image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4); if (!image_rgba) { Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height); @@ -550,49 +632,6 @@ qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight) } - -/* -============ -LoadLMP -============ -*/ -qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight) -{ - qbyte *image_8bit; - - if (fs_filesize < 9) - { - Con_Printf("LoadLMPAs8Bit: invalid LMP file\n"); - return NULL; - } - - // parse the very complicated header *chuckle* - image_width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216; - image_height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216; - if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) - { - Con_Printf("LoadLMPAs8Bit: invalid size %ix%i\n", image_width, image_height); - return NULL; - } - if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) - return NULL; - - if (fs_filesize < 8 + image_width * image_height) - { - Con_Printf("LoadLMPAs8Bit: invalid LMP file\n"); - return NULL; - } - - image_8bit = Mem_Alloc(tempmempool, image_width * image_height); - if (!image_8bit) - { - Con_Printf("LoadLMPAs8Bit: not enough memory for %i by %i image\n", image_width, image_height); - return NULL; - } - memcpy(image_8bit, f + 8, image_width * image_height); - return image_8bit; -} - void Image_StripImageExtension (const char *in, char *out) { const char *end, *temp; @@ -614,57 +653,122 @@ void Image_StripImageExtension (const char *in, char *out) strcpy(out, in); } -struct +typedef struct imageformat_s { const char *formatstring; - qbyte *(*loadfunc)(qbyte *f, int matchwidth, int matchheight); + unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int matchwidth, int matchheight); } -imageformats[] = +imageformat_t; + +// GAME_TENEBRAE only +imageformat_t imageformats_tenebrae[] = { {"override/%s.tga", LoadTGA}, + {"override/%s.png", PNG_LoadImage}, {"override/%s.jpg", JPEG_LoadImage}, + {NULL, NULL} +}; + +imageformat_t imageformats_nopath[] = +{ {"textures/%s.tga", LoadTGA}, + {"textures/%s.png", PNG_LoadImage}, {"textures/%s.jpg", JPEG_LoadImage}, - {"textures/%s.pcx", LoadPCX}, - {"textures/%s.wal", LoadWAL}, {"%s.tga", LoadTGA}, + {"%s.png", PNG_LoadImage}, + {"%s.jpg", JPEG_LoadImage}, + {NULL, NULL} +}; + +imageformat_t imageformats_textures[] = +{ + {"%s.tga", LoadTGA}, + {"%s.png", PNG_LoadImage}, + {"%s.jpg", JPEG_LoadImage}, + {"%s.pcx", LoadPCX}, + {"%s.wal", LoadWAL}, + {NULL, NULL} +}; + +imageformat_t imageformats_gfx[] = +{ + {"%s.tga", LoadTGA}, + {"%s.png", PNG_LoadImage}, + {"%s.jpg", JPEG_LoadImage}, + {"%s.pcx", LoadPCX}, + {"%s.lmp", LoadLMPRGBA}, + {NULL, NULL} +}; + +imageformat_t imageformats_other[] = +{ + {"%s.tga", LoadTGA}, + {"%s.png", PNG_LoadImage}, {"%s.jpg", JPEG_LoadImage}, {"%s.pcx", LoadPCX}, - {"%s.lmp", LoadLMP}, {NULL, NULL} }; -qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight) +unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight) { - int i; - qbyte *f, *data = NULL; + fs_offset_t filesize; + imageformat_t *firstformat, *format; + unsigned char *f, *data = NULL; char basename[MAX_QPATH], name[MAX_QPATH], *c; if (developer_memorydebug.integer) Mem_CheckSentinelsGlobal(); - Image_StripImageExtension(filename, basename); // strip filename extensions to allow replacement by other types + if (developer_texturelogging.integer) + Log_Printf("textures.log", "%s\n", filename); + strlcpy(basename, filename, sizeof(basename)); + Image_StripImageExtension(basename, basename); // strip filename extensions to allow replacement by other types // replace *'s with #, so commandline utils don't get confused when dealing with the external files for (c = basename;*c;c++) if (*c == '*') *c = '#'; - for (i = 0;imageformats[i].formatstring;i++) + name[0] = 0; + if (strchr(basename, '/')) { - sprintf (name, imageformats[i].formatstring, basename); - if ((f = FS_LoadFile(name, true)) && (data = imageformats[i].loadfunc(f, matchwidth, matchheight))) + int i; + for (i = 0;i < (int)sizeof(name)-1 && basename[i] != '/';i++) + name[i] = basename[i]; + name[i] = 0; + } + if (gamemode == GAME_TENEBRAE) + firstformat = imageformats_tenebrae; + else if (!strcasecmp(name, "textures")) + firstformat = imageformats_textures; + else if (!strcasecmp(name, "gfx")) + firstformat = imageformats_gfx; + else if (!strchr(name, '/')) + firstformat = imageformats_nopath; + else + firstformat = imageformats_other; + // now try all the formats in the selected list + for (format = firstformat;format->formatstring;format++) + { + sprintf (name, format->formatstring, basename); + f = FS_LoadFile(name, tempmempool, true, &filesize); + if (f) { + data = format->loadfunc(f, filesize, matchwidth, matchheight); Mem_Free(f); - Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height); - if (developer_memorydebug.integer) - Mem_CheckSentinelsGlobal(); - return data; + if (data) + { + if (developer.integer >= 10) + Con_Printf("loaded image %s (%dx%d)\n", name, image_width, image_height); + if (developer_memorydebug.integer) + Mem_CheckSentinelsGlobal(); + return data; + } } } if (complain) { - Con_Printf ("Couldn't load %s using ", filename); - for (i = 0;imageformats[i].formatstring;i++) + Con_Printf("Couldn't load %s using ", filename); + for (format = firstformat;format->formatstring;format++) { - sprintf (name, imageformats[i].formatstring, basename); - Con_Printf (i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring); + sprintf (name, format->formatstring, basename); + Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring); } } if (developer_memorydebug.integer) @@ -672,127 +776,22 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, return NULL; } -int image_makemask (const qbyte *in, qbyte *out, int size) -{ - int i, count; - count = 0; - for (i = 0;i < size;i++) - { - out[0] = out[1] = out[2] = 255; - out[3] = in[3]; - if (in[3] != 255) - count++; - in += 4; - out += 4; - } - return count; -} - -qbyte* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight) -{ - qbyte *in, *data; - in = data = loadimagepixels(filename, complain, matchwidth, matchheight); - if (!data) - return NULL; - if (image_makemask(data, data, image_width * image_height)) - return data; // some transparency - else - { - Mem_Free(data); - return NULL; // all opaque - } -} - rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags) { - qbyte *data; - rtexture_t *rt; - if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) - return 0; - rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); - Mem_Free(data); - return rt; -} - -rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags) -{ - qbyte *data; + unsigned char *data; rtexture_t *rt; - if (!(data = loadimagepixelsmask (filename, complain, matchwidth, matchheight))) - return 0; - rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); - Mem_Free(data); - return rt; -} - -rtexture_t *image_masktex; -rtexture_t *image_nmaptex; -rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags) -{ - qbyte *data; - rtexture_t *rt; - image_masktex = NULL; - image_nmaptex = NULL; if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) return 0; - rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); - - if (flags & TEXF_ALPHA && image_makemask(data, data, image_width * image_height)) - image_masktex = R_LoadTexture2D(pool, va("%s_mask", filename), image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); - Mem_Free(data); return rt; } -rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale) -{ - qbyte *data, *data2; - rtexture_t *rt; - image_masktex = NULL; - image_nmaptex = NULL; - if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) - return 0; - - data2 = Mem_Alloc(tempmempool, image_width * image_height * 4); - - rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); - - Image_HeightmapToNormalmap(data, data2, image_width, image_height, (flags & TEXF_CLAMP) != 0, bumpscale); - image_nmaptex = R_LoadTexture2D(pool, va("%s_nmap", filename), image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL); - - if (flags & TEXF_ALPHA && image_makemask(data, data2, image_width * image_height)) - image_masktex = R_LoadTexture2D(pool, va("%s_mask", filename), image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL); - - Mem_Free(data2); - - Mem_Free(data); - return rt; -} - -rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale) -{ - qbyte *data, *data2; - rtexture_t *rt; - if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) - return 0; - data2 = Mem_Alloc(tempmempool, image_width * image_height * 4); - - Image_HeightmapToNormalmap(data, data2, image_width, image_height, (flags & TEXF_CLAMP) != 0, bumpscale); - rt = R_LoadTexture2D(pool, filename, image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL); - - Mem_Free(data2); - Mem_Free(data); - return rt; -} - -qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data) +qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer) { qboolean ret; - qbyte *buffer, *out; - const qbyte *in, *end; - - buffer = Mem_Alloc(tempmempool, width*height*3 + 18); + unsigned char *out; + const unsigned char *in, *end; memset (buffer, 0, 18); buffer[2] = 2; // uncompressed type @@ -814,51 +813,16 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig } ret = FS_WriteFile (filename, buffer, width*height*3 + 18 ); - Mem_Free(buffer); return ret; } -void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data) +void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data) { int y; - qbyte *buffer, *out; - const qbyte *in, *end; + unsigned char *buffer, *out; + const unsigned char *in, *end; - buffer = Mem_Alloc(tempmempool, width*height*3 + 18); - - memset (buffer, 0, 18); - buffer[2] = 2; // uncompressed type - buffer[12] = (width >> 0) & 0xFF; - buffer[13] = (width >> 8) & 0xFF; - buffer[14] = (height >> 0) & 0xFF; - buffer[15] = (height >> 8) & 0xFF; - buffer[16] = 24; // pixel size - - // swap rgb to bgr and flip upside down - out = buffer + 18; - for (y = height - 1;y >= 0;y--) - { - in = data + y * width * 3; - end = in + width * 3; - for (;in < end;in += 3) - { - *out++ = in[2]; - *out++ = in[1]; - *out++ = in[0]; - } - } - FS_WriteFile (filename, buffer, width*height*3 + 18 ); - - Mem_Free(buffer); -} - -void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyte *data) -{ - int y; - qbyte *buffer, *out; - const qbyte *in, *end; - - buffer = Mem_Alloc(tempmempool, width*height*4 + 18); + buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*4 + 18); memset (buffer, 0, 18); buffer[2] = 2; // uncompressed type @@ -867,6 +831,7 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt buffer[14] = (height >> 0) & 0xFF; buffer[15] = (height >> 8) & 0xFF; buffer[16] = 32; // pixel size + buffer[17] = 8; // 8 bits of alpha // swap rgba to bgra and flip upside down out = buffer + 18; @@ -887,27 +852,7 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt Mem_Free(buffer); } -qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba) -{ - const qbyte *end; - if (rgba) - { - // check alpha bytes - for (end = data + size * 4, data += 3;data < end;data += 4) - if (*data < 255) - return 1; - } - else - { - // color 255 is transparent - for (end = data + size;data < end;data++) - if (*data == 255) - return 1; - } - return 0; -} - -static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth) +static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth) { int j, xi, oldx = 0, f, fstep, endx, lerp; fstep = (int) (inwidth*65536.0f/outwidth); @@ -923,10 +868,10 @@ static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, if (xi < endx) { lerp = f & 0xFFFF; - *out++ = (qbyte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]); - *out++ = (qbyte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]); - *out++ = (qbyte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]); - *out++ = (qbyte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]); + *out++ = (unsigned char) ((((in[4] - in[0]) * lerp) >> 16) + in[0]); + *out++ = (unsigned char) ((((in[5] - in[1]) * lerp) >> 16) + in[1]); + *out++ = (unsigned char) ((((in[6] - in[2]) * lerp) >> 16) + in[2]); + *out++ = (unsigned char) ((((in[7] - in[3]) * lerp) >> 16) + in[3]); } else // last pixel of the line has no pixel to lerp to { @@ -938,7 +883,7 @@ static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, } } -static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth) +static void Image_Resample24LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth) { int j, xi, oldx = 0, f, fstep, endx, lerp; fstep = (int) (inwidth*65536.0f/outwidth); @@ -954,9 +899,9 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, if (xi < endx) { lerp = f & 0xFFFF; - *out++ = (qbyte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]); - *out++ = (qbyte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]); - *out++ = (qbyte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]); + *out++ = (unsigned char) ((((in[3] - in[0]) * lerp) >> 16) + in[0]); + *out++ = (unsigned char) ((((in[4] - in[1]) * lerp) >> 16) + in[1]); + *out++ = (unsigned char) ((((in[5] - in[2]) * lerp) >> 16) + in[2]); } else // last pixel of the line has no pixel to lerp to { @@ -967,21 +912,21 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, } } -int resamplerowsize = 0; -qbyte *resamplerow1 = NULL; -qbyte *resamplerow2 = NULL; -mempool_t *resamplemempool = NULL; - -#define LERPBYTE(i) r = resamplerow1[i];out[i] = (qbyte) ((((resamplerow2[i] - r) * lerp) >> 16) + r) +#define LERPBYTE(i) r = resamplerow1[i];out[i] = (unsigned char) ((((resamplerow2[i] - r) * lerp) >> 16) + r) void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight) { int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4; - qbyte *out; - const qbyte *inrow; - out = outdata; + unsigned char *out; + const unsigned char *inrow; + unsigned char *resamplerow1; + unsigned char *resamplerow2; + out = (unsigned char *)outdata; fstep = (int) (inheight*65536.0f/outheight); - inrow = indata; + resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*4*2); + resamplerow2 = resamplerow1 + outwidth*4; + + inrow = (const unsigned char *)indata; oldy = 0; Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth); Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth); @@ -993,7 +938,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o lerp = f & 0xFFFF; if (yi != oldy) { - inrow = (qbyte *)indata + inwidth4*yi; + inrow = (unsigned char *)indata + inwidth4*yi; if (yi == oldy+1) memcpy(resamplerow1, resamplerow2, outwidth4); else @@ -1056,7 +1001,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o { if (yi != oldy) { - inrow = (qbyte *)indata + inwidth4*yi; + inrow = (unsigned char *)indata + inwidth4*yi; if (yi == oldy+1) memcpy(resamplerow1, resamplerow2, outwidth4); else @@ -1066,15 +1011,19 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o memcpy(out, resamplerow1, outwidth4); } } + + Mem_Free(resamplerow1); + resamplerow1 = NULL; + resamplerow2 = NULL; } -void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight) +void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight) { int i, j; unsigned frac, fracstep; // relies on int being 4 bytes int *inrow, *out; - out = outdata; + out = (int *)outdata; fracstep = inwidth*0x10000/outwidth; for (i = 0;i < outheight;i++) @@ -1108,12 +1057,17 @@ void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight) { int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3; - qbyte *out; - const qbyte *inrow; - out = outdata; + unsigned char *out; + const unsigned char *inrow; + unsigned char *resamplerow1; + unsigned char *resamplerow2; + out = (unsigned char *)outdata; fstep = (int) (inheight*65536.0f/outheight); - inrow = indata; + resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*3*2); + resamplerow2 = resamplerow1 + outwidth*3; + + inrow = (const unsigned char *)indata; oldy = 0; Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth); Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth); @@ -1125,7 +1079,7 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o lerp = f & 0xFFFF; if (yi != oldy) { - inrow = (qbyte *)indata + inwidth3*yi; + inrow = (unsigned char *)indata + inwidth3*yi; if (yi == oldy+1) memcpy(resamplerow1, resamplerow2, outwidth3); else @@ -1181,7 +1135,7 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o { if (yi != oldy) { - inrow = (qbyte *)indata + inwidth3*yi; + inrow = (unsigned char *)indata + inwidth3*yi; if (yi == oldy+1) memcpy(resamplerow1, resamplerow2, outwidth3); else @@ -1191,19 +1145,22 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o memcpy(out, resamplerow1, outwidth3); } } + Mem_Free(resamplerow1); + resamplerow1 = NULL; + resamplerow2 = NULL; } void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight) { int i, j, f, inwidth3 = inwidth * 3; unsigned frac, fracstep; - qbyte *inrow, *out; - out = outdata; + unsigned char *inrow, *out; + out = (unsigned char *)outdata; fracstep = inwidth*0x10000/outwidth; for (i = 0;i < outheight;i++) { - inrow = (qbyte *)indata + inwidth3*(i*inheight/outheight); + inrow = (unsigned char *)indata + inwidth3*(i*inheight/outheight); frac = fracstep >> 1; j = outwidth - 4; while (j >= 0) @@ -1236,23 +1193,16 @@ Image_Resample void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality) { if (indepth != 1 || outdepth != 1) - Sys_Error("Image_Resample: 3D resampling not supported\n"); - if (resamplerowsize < outwidth*4) { - if (resamplerow1) - Mem_Free(resamplerow1); - resamplerowsize = outwidth*4; - if (!resamplemempool) - resamplemempool = Mem_AllocPool("Image Scaling Buffer"); - resamplerow1 = Mem_Alloc(resamplemempool, resamplerowsize*2); - resamplerow2 = resamplerow1 + resamplerowsize; + Con_Printf ("Image_Resample: 3D resampling not supported\n"); + return; } if (bytesperpixel == 4) { if (quality) Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight); else - Image_Resample32Nearest(indata, inwidth, inheight, outdata, outwidth, outheight); + Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight); } else if (bytesperpixel == 3) { @@ -1262,15 +1212,18 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight); } else - Sys_Error("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel); + Con_Printf ("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel); } // in can be the same as out -void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel) +void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel) { int x, y, nextrow; if (*depth != 1 || destdepth != 1) - Sys_Error("Image_Resample: 3D resampling not supported\n"); + { + Con_Printf ("Image_Resample: 3D resampling not supported\n"); + return; + } nextrow = *width * bytesperpixel; if (*width > destwidth) { @@ -1285,10 +1238,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2); - out[1] = (qbyte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2); - out[2] = (qbyte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2); - out[3] = (qbyte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2); + out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2); + out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2); + out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2); + out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2); out += 4; in += 8; } @@ -1301,9 +1254,9 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[3] + in[nextrow ] + in[nextrow+3]) >> 2); - out[1] = (qbyte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2); - out[2] = (qbyte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2); + out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow ] + in[nextrow+3]) >> 2); + out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2); + out[2] = (unsigned char) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2); out += 3; in += 6; } @@ -1311,7 +1264,7 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * } } else - Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); + Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); } else { @@ -1322,10 +1275,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[4]) >> 1); - out[1] = (qbyte) ((in[1] + in[5]) >> 1); - out[2] = (qbyte) ((in[2] + in[6]) >> 1); - out[3] = (qbyte) ((in[3] + in[7]) >> 1); + out[0] = (unsigned char) ((in[0] + in[4]) >> 1); + out[1] = (unsigned char) ((in[1] + in[5]) >> 1); + out[2] = (unsigned char) ((in[2] + in[6]) >> 1); + out[3] = (unsigned char) ((in[3] + in[7]) >> 1); out += 4; in += 8; } @@ -1337,16 +1290,16 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[3]) >> 1); - out[1] = (qbyte) ((in[1] + in[4]) >> 1); - out[2] = (qbyte) ((in[2] + in[5]) >> 1); + out[0] = (unsigned char) ((in[0] + in[3]) >> 1); + out[1] = (unsigned char) ((in[1] + in[4]) >> 1); + out[2] = (unsigned char) ((in[2] + in[5]) >> 1); out += 3; in += 6; } } } else - Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); + Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); } } else @@ -1361,10 +1314,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[nextrow ]) >> 1); - out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1); - out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1); - out[3] = (qbyte) ((in[3] + in[nextrow+3]) >> 1); + out[0] = (unsigned char) ((in[0] + in[nextrow ]) >> 1); + out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1); + out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1); + out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1); out += 4; in += 4; } @@ -1377,9 +1330,9 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { for (x = 0;x < *width;x++) { - out[0] = (qbyte) ((in[0] + in[nextrow ]) >> 1); - out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1); - out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1); + out[0] = (unsigned char) ((in[0] + in[nextrow ]) >> 1); + out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1); + out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1); out += 3; in += 3; } @@ -1387,10 +1340,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * } } else - Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); + Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel); } else - Sys_Error("Image_MipReduce: desired size already achieved\n"); + Con_Printf ("Image_MipReduce: desired size already achieved\n"); } } @@ -1438,8 +1391,8 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2]; n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0]; */ - n[0] = ((p1[0] + p1[1] + p1[2]) - (p0[0] + p0[1] + p0[2])); - n[1] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[2])); + n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2])); + n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2])); n[2] = ibumpscale; VectorNormalize(n); /* @@ -1453,19 +1406,20 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou out[0] = 128.0f + n[0] * 127.0f; out[1] = 128.0f + n[1] * 127.0f; out[2] = 128.0f + n[2] * 127.0f; - out[3] = 255; + out[3] = (p0[0] + p0[1] + p0[2]) / 3; out += 4; } } } -int image_loadskin(imageskin_t *s, char *shadername) +int image_loadskin(imageskin_t *s, const char *shadername) { int j; - qbyte *bumppixels; + unsigned char *bumppixels; int bumppixels_width, bumppixels_height; char name[MAX_QPATH]; - Image_StripImageExtension(shadername, name); + strlcpy(name, shadername, sizeof(name)); + Image_StripImageExtension(name, name); memset(s, 0, sizeof(*s)); s->basepixels = loadimagepixels(name, false, 0, 0); if (s->basepixels == NULL) @@ -1474,9 +1428,13 @@ int image_loadskin(imageskin_t *s, char *shadername) s->basepixels_height = image_height; bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0; - if (Image_CheckAlpha(s->basepixels, s->basepixels_width * s->basepixels_height, true)) + for (j = 3;j < s->basepixels_width * s->basepixels_height * 4;j += 4) + if (s->basepixels[j] < 255) + break; + if (j < s->basepixels_width * s->basepixels_height * 4) { - s->maskpixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); + // has transparent pixels + s->maskpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); s->maskpixels_width = s->basepixels_width; s->maskpixels_height = s->basepixels_height; memcpy(s->maskpixels, s->basepixels, s->maskpixels_width * s->maskpixels_height * 4); @@ -1530,7 +1488,7 @@ int image_loadskin(imageskin_t *s, char *shadername) { if (r_shadow_bumpscale_bumpmap.value > 0) { - s->nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4); + s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4); s->nmappixels_width = bumppixels_width; s->nmappixels_height = bumppixels_height; Image_HeightmapToNormalmap(bumppixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_bumpmap.value); @@ -1540,7 +1498,7 @@ int image_loadskin(imageskin_t *s, char *shadername) { if (r_shadow_bumpscale_basetexture.value > 0) { - s->nmappixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); + s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); s->nmappixels_width = s->basepixels_width; s->nmappixels_height = s->basepixels_height; Image_HeightmapToNormalmap(s->basepixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_basetexture.value);