X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.c;h=fd971ecc5f0b5cc768013c50304f93ae90c186d5;hb=28518d468abf40ed92227387e69ccb5b534e4afb;hp=c3430f2276e0f00c6912e43649854d12bc76435d;hpb=17837f58260f8fa29420cba9b95ee10f74612335;p=xonotic%2Fdarkplaces.git diff --git a/image.c b/image.c index c3430f22..fd971ecc 100644 --- a/image.c +++ b/image.c @@ -7,6 +7,100 @@ int image_width; int image_height; +#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(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices) +{ + int index, c, x, y; + const qbyte *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) + { + // special indices 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] = ((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(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices) +{ + int index, c, x, y; + const qbyte *in, *inrow, *incolumn; + if (inputflipdiagonal) + { + for (x = 0;x < inputwidth;x++) + { + for (y = 0;y < inputheight;y++) + { + 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 < inputheight;y++) + { + for (x = 0;x < inputwidth;x++) + { + 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) { while (pixels--) @@ -22,7 +116,7 @@ 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) { - int *iout = (void *)out; + int *iout = (int *)out; while (pixels >= 8) { iout[0] = pal[in[0]]; @@ -65,7 +159,7 @@ void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned ================================================================= */ -typedef struct +typedef struct pcx_s { char manufacturer; char version; @@ -95,7 +189,7 @@ qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight) if (fs_filesize < (int)sizeof(pcx) + 768) { - Con_Printf ("Bad pcx file\n"); + Con_Print("Bad pcx file\n"); return NULL; } @@ -114,27 +208,19 @@ qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight) pcx.bytes_per_line = LittleShort (pcx.bytes_per_line); pcx.palette_type = LittleShort (pcx.palette_type); - if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || pcx.xmax > 320 || pcx.ymax > 256) + image_width = pcx.xmax + 1 - pcx.xmin; + 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 && (pcx.xmax+1) != matchwidth) - { - return NULL; - } - if (matchheight && (pcx.ymax+1) != matchheight) - { + if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - } - - image_width = pcx.xmax+1; - image_height = pcx.ymax+1; palette = f + fs_filesize - 768; - image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4); + image_rgba = (qbyte *)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); @@ -203,19 +289,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); } /* @@ -225,11 +299,12 @@ LoadTGA */ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight) { - int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen; + int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits; qbyte *pixbuf, *image_rgba; const qbyte *fin, *enddata; + unsigned char *p; TargaHeader targa_header; - unsigned char palette[256*4], *p; + unsigned char palette[256*4]; if (fs_filesize < 19) return NULL; @@ -245,47 +320,39 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight) targa_header.colormap_size = f[7]; targa_header.x_origin = f[8] + f[9] * 256; targa_header.y_origin = f[10] + f[11] * 256; - targa_header.width = f[12] + f[13] * 256; - targa_header.height = f[14] + f[15] * 256; - if (matchwidth && targa_header.width != matchwidth) + targa_header.width = image_width = f[12] + f[13] * 256; + targa_header.height = image_height = f[14] + f[15] * 256; + if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) + { + Con_Print("LoadTGA: invalid size\n"); + PrintTargaHeader(&targa_header); return NULL; - if (matchheight && targa_header.height != matchheight) + } + if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; targa_header.pixel_size = f[16]; targa_header.attributes = f[17]; - image_width = targa_header.width; - image_height = targa_header.height; - + // 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) + if (targa_header.colormap_length > 256) { - Con_Printf ("LoadTGA: only 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; } @@ -311,7 +378,27 @@ qbyte *LoadTGA (const 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; } @@ -320,28 +407,36 @@ qbyte *LoadTGA (const 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 = (qbyte *)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; } @@ -388,7 +483,10 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight) case 1: case 9: // colormapped - p = palette + (*fin++) * 4; + pindex = *fin++; + if (pindex >= targa_header.colormap_length) + pindex = 0; // error + p = palette + pindex * 4; red = p[0]; green = p[1]; blue = p[2]; @@ -411,6 +509,8 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight) red = green = blue = *fin++; break; } + if (!alphabits) + alpha = 255; } } *pixbuf++ = red; @@ -436,93 +536,101 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight) LoadLMP ============ */ -qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight) +qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit) { - qbyte *image_rgba; - int width, height; + qbyte *image_buffer; if (fs_filesize < 9) { - Con_Printf("LoadLMP: invalid LMP file\n"); + Con_Print("LoadLMP: invalid LMP file\n"); return NULL; } // parse the very complicated header *chuckle* - width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216; - height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216; - if ((unsigned) width > 4096 || (unsigned) height > 4096) + 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\n"); + Con_Printf("LoadLMP: invalid size %ix%i\n", image_width, image_height); return NULL; } - if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight)) + if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - if (fs_filesize < 8 + width * height) + if (fs_filesize < (fs_offset_t)(8 + image_width * image_height)) { - Con_Printf("LoadLMP: invalid LMP file\n"); + Con_Print("LoadLMP: invalid LMP file\n"); return NULL; } - image_width = width; - image_height = height; - - 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 = (qbyte *)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 = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4); + Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete); + } + return image_buffer; } -/* -============ -LoadLMP -============ -*/ -qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight) +static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight) { - qbyte *image_8bit; - int width, height; + return LoadLMP(f, matchwidth, matchheight, false); +} - if (fs_filesize < 9) + +typedef struct q2wal_s +{ + char name[32]; + unsigned width, height; + unsigned offsets[MIPLEVELS]; // four mip maps stored + char animname[32]; // next frame in animation chain + int flags; + int contents; + int value; +} q2wal_t; + +qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight) +{ + qbyte *image_rgba; + const q2wal_t *inwal = (const q2wal_t *)f; + + if (fs_filesize < (int) sizeof(q2wal_t)) { - Con_Printf("LoadLMPAs8Bit: invalid LMP file\n"); + Con_Print("LoadWAL: invalid WAL file\n"); return NULL; } - // parse the very complicated header *chuckle* - width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216; - height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216; - if ((unsigned) width > 4096 || (unsigned) height > 4096) + image_width = LittleLong(inwal->width); + image_height = LittleLong(inwal->height); + if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0) { - Con_Printf("LoadLMPAs8Bit: invalid size\n"); + Con_Printf("LoadWAL: invalid size %ix%i\n", image_width, image_height); return NULL; } - if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight)) + if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight)) return NULL; - if (fs_filesize < 8 + width * height) + if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height) { - Con_Printf("LoadLMPAs8Bit: invalid LMP file\n"); + Con_Print("LoadWAL: invalid WAL file\n"); return NULL; } - image_width = width; - image_height = height; - - image_8bit = Mem_Alloc(tempmempool, image_width * image_height); - if (!image_8bit) + image_rgba = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4); + if (!image_rgba) { - Con_Printf("LoadLMPAs8Bit: not enough memory for %i by %i image\n", image_width, image_height); + Con_Printf("LoadLMP: 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; + Image_Copy8bitRGBA(f + LittleLong(inwal->offsets[0]), image_rgba, image_width * image_height, palette_complete); + return image_rgba; } + void Image_StripImageExtension (const char *in, char *out) { const char *end, *temp; @@ -530,7 +638,11 @@ void Image_StripImageExtension (const char *in, char *out) if ((end - in) >= 4) { temp = end - 4; - if (strcmp(temp, ".tga") == 0 || strcmp(temp, ".pcx") == 0 || strcmp(temp, ".lmp") == 0) + if (strcmp(temp, ".tga") == 0 + || strcmp(temp, ".pcx") == 0 + || strcmp(temp, ".lmp") == 0 + || strcmp(temp, ".png") == 0 + || strcmp(temp, ".jpg") == 0) end = temp; while (in < end) *out++ = *in++; @@ -540,92 +652,70 @@ void Image_StripImageExtension (const char *in, char *out) strcpy(out, in); } +struct imageformat_s +{ + const char *formatstring; + qbyte *(*loadfunc)(const qbyte *f, int matchwidth, int matchheight); +} +imageformats[] = +{ + {"override/%s.tga", LoadTGA}, + {"override/%s.jpg", JPEG_LoadImage}, + {"textures/%s.tga", LoadTGA}, + {"textures/%s.jpg", JPEG_LoadImage}, + {"textures/%s.pcx", LoadPCX}, + {"textures/%s.wal", LoadWAL}, + {"%s.tga", LoadTGA}, + {"%s.jpg", JPEG_LoadImage}, + {"%s.pcx", LoadPCX}, + {"%s.lmp", LoadLMPRGBA}, + {NULL, NULL} +}; + qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight) { - qbyte *f, *data; + int i; + qbyte *f, *data = NULL; char basename[MAX_QPATH], name[MAX_QPATH], *c; - Image_StripImageExtension(filename, basename); // strip filename extensions to allow replacement by other types + if (developer_memorydebug.integer) + Mem_CheckSentinelsGlobal(); + 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 = '#'; - sprintf (name, "override/%s.tga", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = LoadTGA (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "override/%s.jpg", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = JPEG_LoadImage (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "textures/%s.tga", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = LoadTGA (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "textures/%s.jpg", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = JPEG_LoadImage (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "textures/%s.pcx", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = LoadPCX (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "%s.tga", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = LoadTGA (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "%s.jpg", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = JPEG_LoadImage (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "%s.pcx", basename); - f = FS_LoadFile(name, true); - if (f) - { - data = LoadPCX (f, matchwidth, matchheight); - goto loaded; - } - sprintf (name, "%s.lmp", basename); - f = FS_LoadFile(name, true); - if (f) + for (i = 0;imageformats[i].formatstring;i++) { - data = LoadLMP (f, matchwidth, matchheight); - goto loaded; + sprintf (name, imageformats[i].formatstring, basename); + f = FS_LoadFile(name, tempmempool, true); + if (f) + { + data = imageformats[i].loadfunc(f, matchwidth, matchheight); + Mem_Free(f); + if (data) + { + Con_DPrintf("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.tga, .jpg, .pcx, .lmp\n", filename); - return NULL; -loaded: - Mem_Free(f); - Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height); - if (image_width == 0 || image_height == 0) { - Con_Printf("error loading image %s - it is a %dx%d pixel image!\n", name); - if (data != NULL) - Mem_Free(data); - data = NULL; + Con_Printf("Couldn't load %s using ", filename); + for (i = 0;imageformats[i].formatstring;i++) + { + sprintf (name, imageformats[i].formatstring, basename); + Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring); + } } - return data; + if (developer_memorydebug.integer) + Mem_CheckSentinelsGlobal(); + return NULL; } int image_makemask (const qbyte *in, qbyte *out, int size) @@ -710,7 +800,7 @@ rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *f if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) return 0; - data2 = Mem_Alloc(tempmempool, image_width * image_height * 4); + data2 = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4); rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL); @@ -732,7 +822,7 @@ rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filena rtexture_t *rt; if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight))) return 0; - data2 = Mem_Alloc(tempmempool, image_width * image_height * 4); + data2 = (qbyte *)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); @@ -742,14 +832,12 @@ rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filena 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 qbyte *data, qbyte *buffer) { qboolean ret; - qbyte *buffer, *out; + qbyte *out; const qbyte *in, *end; - buffer = Mem_Alloc(tempmempool, width*height*3 + 18); - memset (buffer, 0, 18); buffer[2] = 2; // uncompressed type buffer[12] = (width >> 0) & 0xFF; @@ -770,7 +858,6 @@ 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; } @@ -780,7 +867,7 @@ void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte qbyte *buffer, *out; const qbyte *in, *end; - buffer = Mem_Alloc(tempmempool, width*height*3 + 18); + buffer = (qbyte *)Mem_Alloc(tempmempool, width*height*3 + 18); memset (buffer, 0, 18); buffer[2] = 2; // uncompressed type @@ -814,7 +901,7 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt qbyte *buffer, *out; const qbyte *in, *end; - buffer = Mem_Alloc(tempmempool, width*height*4 + 18); + buffer = (qbyte *)Mem_Alloc(tempmempool, width*height*4 + 18); memset (buffer, 0, 18); buffer[2] = 2; // uncompressed type @@ -823,6 +910,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; // transparent flag? (seems to be needed by gimp) // swap rgba to bgra and flip upside down out = buffer + 18; @@ -923,21 +1011,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) 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; + qbyte *resamplerow1; + qbyte *resamplerow2; + out = (qbyte *)outdata; fstep = (int) (inheight*65536.0f/outheight); - inrow = indata; + resamplerow1 = (qbyte *)Mem_Alloc(tempmempool, outwidth*4*2); + resamplerow2 = resamplerow1 + outwidth*4; + + inrow = (const qbyte *)indata; oldy = 0; Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth); Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth); @@ -1022,15 +1110,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++) @@ -1066,10 +1158,15 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o 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; + qbyte *resamplerow1; + qbyte *resamplerow2; + out = (qbyte *)outdata; fstep = (int) (inheight*65536.0f/outheight); - inrow = indata; + resamplerow1 = (qbyte *)Mem_Alloc(tempmempool, outwidth*3*2); + resamplerow2 = resamplerow1 + outwidth*3; + + inrow = (const qbyte *)indata; oldy = 0; Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth); Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth); @@ -1147,6 +1244,9 @@ 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) @@ -1154,7 +1254,7 @@ void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void int i, j, f, inwidth3 = inwidth * 3; unsigned frac, fracstep; qbyte *inrow, *out; - out = outdata; + out = (qbyte *)outdata; fracstep = inwidth*0x10000/outwidth; for (i = 0;i < outheight;i++) @@ -1192,23 +1292,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) { @@ -1218,7 +1311,7 @@ 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 @@ -1226,7 +1319,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int * { 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) { @@ -1267,7 +1363,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 { @@ -1302,7 +1398,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 @@ -1343,10 +1439,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"); } } @@ -1386,7 +1482,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou /* dv[0][0] = iwidth; dv[0][1] = 0; - dv[0][2] = ((p1[0] + p1[1] + p1[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale); + dv[0][2] = ((p0[0] + p0[1] + p0[2]) * ibumpscale) - ((p1[0] + p1[1] + p1[2]) * ibumpscale); dv[1][0] = 0; dv[1][1] = iheight; dv[1][2] = ((p2[0] + p2[1] + p2[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale); @@ -1395,13 +1491,13 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0]; */ n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2])); - n[1] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[2])); + n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2])); n[2] = ibumpscale; VectorNormalize(n); /* // this should work for the bottom right triangle if anyone wants // code for that for some reason - n[0] = ((p1[0] + p1[1] + p1[2]) - (p3[0] + p3[1] + p3[2])); + n[0] = ((p3[0] + p3[1] + p3[2]) - (p1[0] + p1[1] + p1[2])); n[1] = ((p2[0] + p2[1] + p2[2]) - (p3[0] + p3[1] + p3[2])); n[2] = ibumpscale; VectorNormalize(n); @@ -1409,17 +1505,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 *name) +int image_loadskin(imageskin_t *s, char *shadername) { int j; qbyte *bumppixels; int bumppixels_width, bumppixels_height; + char name[MAX_QPATH]; + 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) @@ -1428,12 +1527,9 @@ int image_loadskin(imageskin_t *s, char *name) s->basepixels_height = image_height; bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0; - 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) + if (Image_CheckAlpha(s->basepixels, s->basepixels_width * s->basepixels_height, true)) { - s->maskpixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); + s->maskpixels = (qbyte *)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); @@ -1487,7 +1583,7 @@ int image_loadskin(imageskin_t *s, char *name) { if (r_shadow_bumpscale_bumpmap.value > 0) { - s->nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4); + s->nmappixels = (qbyte *)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); @@ -1497,7 +1593,7 @@ int image_loadskin(imageskin_t *s, char *name) { if (r_shadow_bumpscale_basetexture.value > 0) { - s->nmappixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4); + s->nmappixels = (qbyte *)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); @@ -1513,6 +1609,8 @@ void image_freeskin(imageskin_t *s) { if (s->basepixels) Mem_Free(s->basepixels); + if (s->maskpixels) + Mem_Free(s->maskpixels); if (s->nmappixels) Mem_Free(s->nmappixels); if (s->glowpixels)