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(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 (flipdiagonal)
+ if (inputflipdiagonal)
{
- for (y = 0;y < height;y++)
+ for (x = 0;x < inputwidth;x++)
{
- incolumn = inpixels + (flipx ? width - 1 - y : y) * numincomponents;
- for (x = 0;x < width;x++)
+ for (y = 0;y < inputheight;y++)
{
- in = incolumn + (flipy ? height - 1 - x : x) * width * numincomponents;
- for (c = 0;c < numoutcomponents;c++)
+ in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+ for (c = 0;c < numoutputcomponents;c++)
{
- index = inputcomponentindices[c];
- *outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+ 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++)
+ in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+ for (c = 0;c < numoutputcomponents;c++)
{
- index = inputcomponentindices[c];
- *outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+ 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)
{
LoadPCX
============
*/
-qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
+qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
{
pcx_t pcx;
qbyte *a, *b, *image_rgba, *pbuf;
if (fs_filesize < (int)sizeof(pcx) + 768)
{
- Con_Printf ("Bad pcx file\n");
+ Con_Print("Bad pcx file\n");
return NULL;
}
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))
void PrintTargaHeader(TargaHeader *t)
{
- Con_Printf("TargaHeader:\n");
+ Con_Print("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);
LoadTGA
=============
*/
-qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
{
- int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex;
+ int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
qbyte *pixbuf, *image_rgba;
- qbyte *fin, *enddata;
+ const qbyte *fin, *enddata;
TargaHeader targa_header;
unsigned char palette[256*4], *p;
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;
}
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;
}
}
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;
}
{
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;
}
image_rgba = 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;
}
row_inc = 0;
}
+ // 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;
+ }
+
compressed = targa_header.image_type == 9 || targa_header.image_type == 10 || targa_header.image_type == 11;
x = 0;
y = 0;
red = green = blue = *fin++;
break;
}
+ if (!alphabits)
+ alpha = 255;
}
}
*pixbuf++ = red;
LoadLMP
============
*/
-qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit)
{
- qbyte *image_rgba;
+ 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*
- 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);
if (fs_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 = 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 = Mem_Alloc(tempmempool, image_width * image_height * 4);
+ Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete);
+ }
+ return image_buffer;
+}
+
+static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight)
+{
+ return LoadLMP(f, matchwidth, matchheight, false);
}
+
typedef struct
{
char name[32];
int value;
} q2wal_t;
-qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight)
{
qbyte *image_rgba;
const q2wal_t *inwal = (const void *)f;
if (fs_filesize < (int) sizeof(q2wal_t))
{
- Con_Printf("LoadWAL: invalid WAL file\n");
+ Con_Print("LoadWAL: invalid WAL file\n");
return NULL;
}
if ((int) fs_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;
}
}
-
-/*
-============
-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;
struct
{
const char *formatstring;
- qbyte *(*loadfunc)(qbyte *f, int matchwidth, int matchheight);
+ qbyte *(*loadfunc)(const qbyte *f, int matchwidth, int matchheight);
}
imageformats[] =
{
{"%s.tga", LoadTGA},
{"%s.jpg", JPEG_LoadImage},
{"%s.pcx", LoadPCX},
- {"%s.lmp", LoadLMP},
+ {"%s.lmp", LoadLMPRGBA},
{NULL, NULL}
};
char basename[MAX_QPATH], name[MAX_QPATH], *c;
if (developer_memorydebug.integer)
Mem_CheckSentinelsGlobal();
+ if (developer_texturelogging.integer)
+ Log_Printf("textures.log", "%s\n", filename);
Image_StripImageExtension(filename, 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++)
for (i = 0;imageformats[i].formatstring;i++)
{
sprintf (name, imageformats[i].formatstring, basename);
- if ((f = FS_LoadFile(name, true)) && (data = imageformats[i].loadfunc(f, matchwidth, matchheight)))
+ f = FS_LoadFile(name, tempmempool, true);
+ if (f)
{
+ data = imageformats[i].loadfunc(f, 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)
+ {
+ 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 using ", filename);
+ 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);
+ Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
}
}
if (developer_memorydebug.integer)
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;
}
ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
- Mem_Free(buffer);
return ret;
}
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;
}
}
-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;
+ qbyte *resamplerow1;
+ qbyte *resamplerow2;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
+ resamplerow1 = Mem_Alloc(tempmempool, outwidth*4*2);
+ resamplerow2 = resamplerow1 + outwidth*4;
+
inrow = indata;
oldy = 0;
Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
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;
int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
qbyte *out;
const qbyte *inrow;
+ qbyte *resamplerow1;
+ qbyte *resamplerow2;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
+ resamplerow1 = Mem_Alloc(tempmempool, outwidth*3*2);
+ resamplerow2 = resamplerow1 + outwidth*3;
+
inrow = indata;
oldy = 0;
Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
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)
{
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;
- }
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)
{
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;
}
}
projects / xonotic / darkplaces.git / blobdiff