#include "quakedef.h"
+#include "image.h"
+#include "jpeg.h"
+#include "r_shadow.h"
int image_width;
int image_height;
-void Image_GammaRemapRGB(qbyte *in, qbyte *out, int pixels, qbyte *gammar, qbyte *gammag, qbyte *gammab)
+void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices)
+{
+ int index, c, x, y;
+ const qbyte *in, *inrow, *incolumn;
+ if (flipdiagonal)
+ {
+ for (y = 0;y < height;y++)
+ {
+ incolumn = inpixels + (flipx ? width - 1 - y : y) * numincomponents;
+ for (x = 0;x < width;x++)
+ {
+ in = incolumn + (flipy ? height - 1 - x : x) * width * numincomponents;
+ for (c = 0;c < numoutcomponents;c++)
+ {
+ index = inputcomponentindices[c];
+ *outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+ }
+ }
+ }
+ }
+ else
+ {
+ for (y = 0;y < height;y++)
+ {
+ inrow = inpixels + (flipy ? height - 1 - y : y) * width * numincomponents;
+ for (x = 0;x < width;x++)
+ {
+ in = inrow + (flipx ? width - 1 - x : x) * numincomponents;
+ for (c = 0;c < numoutcomponents;c++)
+ {
+ index = inputcomponentindices[c];
+ *outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+ }
+ }
+ }
+ }
+}
+
+void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab)
{
while (pixels--)
{
}
// note: pal must be 32bit color
-void Image_Copy8bitRGBA(qbyte *in, qbyte *out, int pixels, int *pal)
+void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal)
{
int *iout = (void *)out;
while (pixels >= 8)
qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
{
pcx_t pcx;
- qbyte *palette, *a, *b, *image_rgba, *fin, *pbuf, *enddata;
+ qbyte *a, *b, *image_rgba, *pbuf;
+ const qbyte *palette, *fin, *enddata;
int x, y, x2, dataByte;
- if (loadsize < sizeof(pcx) + 768)
+ if (fs_filesize < (int)sizeof(pcx) + 768)
{
- Con_Printf ("Bad pcx file\n");
+ Con_Print("Bad pcx file\n");
return NULL;
}
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)
- {
- Con_Printf ("Bad pcx file\n");
- return NULL;
- }
-
- if (matchwidth && (pcx.xmax+1) != matchwidth)
+ 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_Print("Bad pcx file\n");
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 + loadsize - 768;
+ palette = f + fs_filesize - 768;
image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4);
if (!image_rgba)
else
a[x++] = dataByte;
}
+ fin += pcx.bytes_per_line - image_width; // the number of bytes per line is always forced to an even number
while(x < image_width)
a[x++] = 0;
}
}
TargaHeader;
-TargaHeader targa_header;
-
+void PrintTargaHeader(TargaHeader *t)
+{
+ 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);
+ 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);
+}
/*
=============
*/
qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
{
- int columns, rows, row, column;
- qbyte *pixbuf, *image_rgba, *fin, *enddata;
+ int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex;
+ qbyte *pixbuf, *image_rgba;
+ qbyte *fin, *enddata;
+ TargaHeader targa_header;
+ unsigned char palette[256*4], *p;
- if (loadsize < 18+3)
+ if (fs_filesize < 19)
return NULL;
+
+ enddata = f + fs_filesize;
+
targa_header.id_length = f[0];
targa_header.colormap_type = f[1];
targa_header.image_type = f[2];
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];
- if (targa_header.image_type != 2 && targa_header.image_type != 10)
+ 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_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.colormap_length > 256)
+ {
+ Con_Print("LoadTGA: only up to 256 colormap_length supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ if (targa_header.colormap_index)
+ {
+ Con_Print("LoadTGA: colormap_index not supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ if (targa_header.colormap_size == 24)
+ {
+ for (x = 0;x < targa_header.colormap_length;x++)
+ {
+ palette[x*4+2] = *fin++;
+ palette[x*4+1] = *fin++;
+ palette[x*4+0] = *fin++;
+ palette[x*4+3] = 255;
+ }
+ }
+ else if (targa_header.colormap_size == 32)
+ {
+ for (x = 0;x < targa_header.colormap_length;x++)
+ {
+ palette[x*4+2] = *fin++;
+ palette[x*4+1] = *fin++;
+ palette[x*4+0] = *fin++;
+ palette[x*4+3] = *fin++;
+ }
+ }
+ else
+ {
+ Con_Print("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ }
+ else if (targa_header.image_type == 3 || targa_header.image_type == 11)
{
- Con_Printf ("LoadTGA: Only type 2 and 10 targa RGB images supported\n");
+ 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;
+ }
+ }
+ 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);
+ PrintTargaHeader(&targa_header);
return NULL;
}
- if (targa_header.colormap_type != 0 || (targa_header.pixel_size != 32 && targa_header.pixel_size != 24))
+ if (targa_header.attributes & 0x10)
{
- Con_Printf ("LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+ Con_Print("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
return NULL;
}
- enddata = f + loadsize;
-
- columns = targa_header.width;
- rows = targa_header.height;
-
- image_rgba = Mem_Alloc(tempmempool, columns * rows * 4);
+ 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", columns, rows);
+ Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
return NULL;
}
- fin = f + 18;
- if (targa_header.id_length != 0)
- fin += targa_header.id_length; // skip TARGA image comment
+ // If bit 5 of attributes isn't set, the image has been stored from bottom to top
+ if ((targa_header.attributes & 0x20) == 0)
+ {
+ pixbuf = image_rgba + (image_height - 1)*image_width*4;
+ row_inc = -image_width*4*2;
+ }
+ else
+ {
+ pixbuf = image_rgba;
+ row_inc = 0;
+ }
- if (targa_header.image_type == 2)
+ compressed = targa_header.image_type == 9 || targa_header.image_type == 10 || targa_header.image_type == 11;
+ x = 0;
+ y = 0;
+ red = green = blue = alpha = 255;
+ while (y < image_height)
{
- // Uncompressed, RGB images
- for(row = rows - 1;row >= 0;row--)
+ // decoder is mostly the same whether it's compressed or not
+ readpixelcount = 1000000;
+ runlen = 1000000;
+ if (compressed && fin < enddata)
{
- pixbuf = image_rgba + row*columns*4;
- for(column = 0;column < columns;column++)
- {
- switch (targa_header.pixel_size)
- {
- case 24:
- if (fin + 3 > enddata)
- break;
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = 255;
- fin += 3;
- break;
- case 32:
- if (fin + 4 > enddata)
- break;
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = fin[3];
- fin += 4;
- break;
- }
- }
+ runlen = *fin++;
+ // high bit indicates this is an RLE compressed run
+ if (runlen & 0x80)
+ readpixelcount = 1;
+ runlen = 1 + (runlen & 0x7f);
}
- }
- else if (targa_header.image_type==10)
- {
- // Runlength encoded RGB images
- unsigned char red = 0, green = 0, blue = 0, alphabyte = 0, packetHeader, packetSize, j;
- for(row = rows - 1;row >= 0;row--)
+
+ while((runlen--) && y < image_height)
{
- pixbuf = image_rgba + row * columns * 4;
- for(column = 0;column < columns;)
+ if (readpixelcount > 0)
{
- if (fin >= enddata)
- goto outofdata;
- packetHeader = *fin++;
- packetSize = 1 + (packetHeader & 0x7f);
- if (packetHeader & 0x80)
+ readpixelcount--;
+ red = green = blue = alpha = 255;
+ if (fin < enddata)
{
- // run-length packet
- switch (targa_header.pixel_size)
+ switch(targa_header.image_type)
{
- case 24:
- if (fin + 3 > enddata)
- goto outofdata;
- blue = *fin++;
- green = *fin++;
- red = *fin++;
- alphabyte = 255;
+ case 1:
+ case 9:
+ // colormapped
+ pindex = *fin++;
+ if (pindex >= targa_header.colormap_length)
+ pindex = 0; // error
+ p = palette + pindex * 4;
+ red = p[0];
+ green = p[1];
+ blue = p[2];
+ alpha = p[3];
break;
- case 32:
- if (fin + 4 > enddata)
- goto outofdata;
+ case 2:
+ case 10:
+ // BGR or BGRA
blue = *fin++;
- green = *fin++;
- red = *fin++;
- alphabyte = *fin++;
+ if (fin < enddata)
+ green = *fin++;
+ if (fin < enddata)
+ red = *fin++;
+ if (targa_header.pixel_size == 32 && fin < enddata)
+ alpha = *fin++;
+ break;
+ case 3:
+ case 11:
+ // greyscale
+ red = green = blue = *fin++;
break;
- }
-
- for(j = 0;j < packetSize;j++)
- {
- *pixbuf++ = red;
- *pixbuf++ = green;
- *pixbuf++ = blue;
- *pixbuf++ = alphabyte;
- column++;
- if (column == columns)
- {
- // run spans across rows
- column = 0;
- if (row > 0)
- row--;
- else
- goto breakOut;
- pixbuf = image_rgba + row * columns * 4;
- }
- }
- }
- else
- {
- // non run-length packet
- for(j = 0;j < packetSize;j++)
- {
- switch (targa_header.pixel_size)
- {
- case 24:
- if (fin + 3 > enddata)
- goto outofdata;
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = 255;
- fin += 3;
- break;
- case 32:
- if (fin + 4 > enddata)
- goto outofdata;
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = fin[3];
- fin += 4;
- break;
- }
- column++;
- if (column == columns)
- {
- // pixel packet run spans across rows
- column = 0;
- if (row > 0)
- row--;
- else
- goto breakOut;
- pixbuf = image_rgba + row * columns * 4;
- }
}
}
}
- breakOut:;
+ *pixbuf++ = red;
+ *pixbuf++ = green;
+ *pixbuf++ = blue;
+ *pixbuf++ = alpha;
+ x++;
+ if (x == image_width)
+ {
+ // end of line, advance to next
+ x = 0;
+ y++;
+ pixbuf += row_inc;
+ }
}
}
-outofdata:;
- image_width = columns;
- image_height = rows;
return image_rgba;
}
qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight)
{
qbyte *image_rgba;
- int width, height;
- if (loadsize < 9)
+ 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 = 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("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 (loadsize < 8 + width * 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_width = width;
- image_height = height;
+ image_rgba = 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);
+ return NULL;
+ }
+ Image_Copy8bitRGBA(f + 8, image_rgba, image_width * image_height, palette_complete);
+ return image_rgba;
+}
+
+typedef struct
+{
+ 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 (qbyte *f, int matchwidth, int matchheight)
+{
+ qbyte *image_rgba;
+ const q2wal_t *inwal = (const void *)f;
+
+ if (fs_filesize < (int) sizeof(q2wal_t))
+ {
+ Con_Print("LoadWAL: invalid WAL file\n");
+ return NULL;
+ }
+
+ 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("LoadWAL: invalid size %ix%i\n", image_width, image_height);
+ return NULL;
+ }
+ 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)
+ {
+ Con_Print("LoadWAL: invalid WAL file\n");
+ return NULL;
+ }
image_rgba = 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);
return NULL;
}
- Image_Copy8bitRGBA(f + 8, image_rgba, image_width * image_height, d_8to24table);
+ Image_Copy8bitRGBA(f + LittleLong(inwal->offsets[0]), image_rgba, image_width * image_height, palette_complete);
return image_rgba;
}
-void Image_StripImageExtension (char *in, char *out)
+
+
+/*
+============
+LoadLMP
+============
+*/
+qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight)
+{
+ qbyte *image_8bit;
+
+ if (fs_filesize < 9)
+ {
+ Con_Print("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_Print("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)
{
- char *end, *temp;
+ const char *end, *temp;
end = in + strlen(in);
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++;
strcpy(out, in);
}
-qbyte *loadimagepixels (char *filename, qboolean complain, int matchwidth, int matchheight)
+struct
+{
+ const char *formatstring;
+ qbyte *(*loadfunc)(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", LoadLMP},
+ {NULL, NULL}
+};
+
+qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
{
- qbyte *f, *data;
- char basename[256], name[256], *c;
- Image_StripImageExtension(filename, basename); // strip .tga, .pcx and .lmp extensions to allow replacement by other types
+ int i;
+ qbyte *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
// 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, "textures/%s.tga", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadTGA (f, matchwidth, matchheight);
- Mem_Free(f);
- return data;
- }
- sprintf (name, "textures/%s.pcx", basename);
- f = COM_LoadFile(name, true);
- if (f)
+ for (i = 0;imageformats[i].formatstring;i++)
{
- data = LoadPCX (f, matchwidth, matchheight);
- Mem_Free(f);
- return data;
- }
- sprintf (name, "%s.tga", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadTGA (f, matchwidth, matchheight);
- Mem_Free(f);
- return data;
- }
- sprintf (name, "%s.pcx", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadPCX (f, matchwidth, matchheight);
- Mem_Free(f);
- return data;
+ 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;
+ }
+ }
}
- sprintf (name, "%s.lmp", basename);
- f = COM_LoadFile(name, true);
- if (f)
+ if (complain)
{
- data = LoadLMP (f, matchwidth, matchheight);
- Mem_Free(f);
- return data;
+ 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);
+ }
}
- if (complain)
- Con_Printf ("Couldn't load %s.tga, .pcx, .lmp\n", filename);
+ if (developer_memorydebug.integer)
+ Mem_CheckSentinelsGlobal();
return NULL;
}
-int image_makemask (qbyte *in, qbyte *out, int size)
+int image_makemask (const qbyte *in, qbyte *out, int size)
{
- int i, count;
+ int i, count;
count = 0;
for (i = 0;i < size;i++)
{
return count;
}
-qbyte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight)
+qbyte* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight)
{
qbyte *in, *data;
in = data = loadimagepixels(filename, complain, matchwidth, matchheight);
}
}
-rtexture_t *loadtextureimage (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+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_LoadTexture (pool, filename, image_width, image_height, data, TEXTYPE_RGBA, TEXF_ALPHA | (mipmap ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 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, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
{
qbyte *data;
rtexture_t *rt;
if (!(data = loadimagepixelsmask (filename, complain, matchwidth, matchheight)))
return 0;
- rt = R_LoadTexture (pool, filename, image_width, image_height, data, TEXTYPE_RGBA, TEXF_ALPHA | (mipmap ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 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 *loadtextureimagewithmask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+rtexture_t *image_nmaptex;
+rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
{
- int count;
qbyte *data;
- char *filename2;
rtexture_t *rt;
image_masktex = NULL;
+ image_nmaptex = NULL;
if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
return 0;
- rt = R_LoadTexture (pool, filename, image_width, image_height, data, TEXTYPE_RGBA, TEXF_ALPHA | (mipmap ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 0));
- count = image_makemask(data, data, image_width * image_height);
- if (count)
- {
- filename2 = Mem_Alloc(tempmempool, strlen(filename) + 6);
- sprintf(filename2, "%s_mask", filename);
- image_masktex = R_LoadTexture (pool, filename2, image_width, image_height, data, TEXTYPE_RGBA, TEXF_ALPHA | (mipmap ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 0));
- Mem_Free(filename2);
- }
+
+ 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;
}
-qboolean Image_WriteTGARGB_preflipped (char *filename, int width, int height, qbyte *data)
+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 ret;
- qbyte *buffer, *in, *out, *end;
+ qbyte *buffer, *out;
+ const qbyte *in, *end;
buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
*out++ = in[1];
*out++ = in[0];
}
- ret = COM_WriteFile (filename, buffer, width*height*3 + 18 );
+ ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
Mem_Free(buffer);
return ret;
}
-void Image_WriteTGARGB (char *filename, int width, int height, qbyte *data)
+void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data)
{
int y;
- qbyte *buffer, *in, *out, *end;
+ qbyte *buffer, *out;
+ const qbyte *in, *end;
buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
*out++ = in[0];
}
}
- COM_WriteFile (filename, buffer, width*height*3 + 18 );
+ FS_WriteFile (filename, buffer, width*height*3 + 18 );
Mem_Free(buffer);
}
-void Image_WriteTGARGBA (char *filename, int width, int height, qbyte *data)
+void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyte *data)
{
int y;
- qbyte *buffer, *in, *out, *end;
+ qbyte *buffer, *out;
+ const qbyte *in, *end;
buffer = Mem_Alloc(tempmempool, width*height*4 + 18);
*out++ = in[3];
}
}
- COM_WriteFile (filename, buffer, width*height*4 + 18 );
+ FS_WriteFile (filename, buffer, width*height*4 + 18 );
Mem_Free(buffer);
}
-qboolean Image_CheckAlpha(qbyte *data, int size, qboolean rgba)
+qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba)
{
- qbyte *end;
+ const qbyte *end;
if (rgba)
{
// check alpha bytes
return 0;
}
-static void Image_Resample32LerpLine (qbyte *in, qbyte *out, int inwidth, int outwidth)
+static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
{
int j, xi, oldx = 0, f, fstep, endx, lerp;
fstep = (int) (inwidth*65536.0f/outwidth);
}
}
-static void Image_Resample24LerpLine (qbyte *in, qbyte *out, int inwidth, int outwidth)
+static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
{
int j, xi, oldx = 0, f, fstep, endx, lerp;
fstep = (int) (inwidth*65536.0f/outwidth);
mempool_t *resamplemempool = NULL;
#define LERPBYTE(i) r = resamplerow1[i];out[i] = (qbyte) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
-void Image_Resample32Lerp(void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+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 *inrow, *out;
+ qbyte *out;
+ const qbyte *inrow;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
}
}
-void Image_Resample32Nearest(void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
{
int i, j;
unsigned frac, fracstep;
}
}
-void Image_Resample24Lerp(void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+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 *inrow, *out;
+ qbyte *out;
+ const qbyte *inrow;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
}
}
-void Image_Resample24Nolerp(void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+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;
Image_Resample
================
*/
-void Image_Resample (void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight, int bytesperpixel, int quality)
+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)
}
// in can be the same as out
-void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel)
+void Image_MipReduce(const qbyte *in, qbyte *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");
nextrow = *width * bytesperpixel;
if (*width > destwidth)
{
}
}
+void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
+{
+ int x, y;
+ const unsigned char *p0, *p1, *p2;
+ unsigned char *out;
+ float iwidth, iheight, ibumpscale, n[3];
+ iwidth = 1.0f / width;
+ iheight = 1.0f / height;
+ ibumpscale = (255.0f * 3.0f) / bumpscale;
+ out = outpixels;
+ for (y = 0;y < height;y++)
+ {
+ for (x = 0;x < width;x++)
+ {
+ p0 = inpixels + (y * width + x) * 4;
+ if (x == width - 1)
+ {
+ if (clamp)
+ p1 = inpixels + (y * width + x) * 4;
+ else
+ p1 = inpixels + (y * width) * 4;
+ }
+ else
+ p1 = inpixels + (y * width + x + 1) * 4;
+ if (y == height - 1)
+ {
+ if (clamp)
+ p2 = inpixels + (y * width + x) * 4;
+ else
+ p2 = inpixels + x * 4;
+ }
+ else
+ p2 = inpixels + ((y + 1) * width + x) * 4;
+ /*
+ dv[0][0] = iwidth;
+ dv[0][1] = 0;
+ 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);
+ n[0] = dv[0][1]*dv[1][2]-dv[0][2]*dv[1][1];
+ 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[2] = ibumpscale;
+ VectorNormalize(n);
+ /*
+ // this should work for the bottom right triangle if anyone wants
+ // code for that for some reason
+ 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);
+ */
+ 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 += 4;
+ }
+ }
+}
+
+int image_loadskin(imageskin_t *s, char *shadername)
+{
+ int j;
+ qbyte *bumppixels;
+ int bumppixels_width, bumppixels_height;
+ char name[MAX_QPATH];
+ Image_StripImageExtension(shadername, name);
+ memset(s, 0, sizeof(*s));
+ s->basepixels = loadimagepixels(name, false, 0, 0);
+ if (s->basepixels == NULL)
+ return false;
+ s->basepixels_width = image_width;
+ 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))
+ {
+ s->maskpixels = 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);
+ for (j = 0;j < s->basepixels_width * s->basepixels_height * 4;j += 4)
+ {
+ s->maskpixels[j+0] = 255;
+ s->maskpixels[j+1] = 255;
+ s->maskpixels[j+2] = 255;
+ }
+ }
+
+ // _luma is supported for tenebrae compatibility
+ // (I think it's a very stupid name, but oh well)
+ if ((s->glowpixels = loadimagepixels(va("%s_glow", name), false, 0, 0)) != NULL
+ || (s->glowpixels = loadimagepixels(va("%s_luma", name), false, 0, 0)) != NULL)
+ {
+ s->glowpixels_width = image_width;
+ s->glowpixels_height = image_height;
+ }
+ // _norm is the name used by tenebrae
+ // (I don't like the name much)
+ if ((s->nmappixels = loadimagepixels(va("%s_norm", name), false, 0, 0)) != NULL)
+ {
+ s->nmappixels_width = image_width;
+ s->nmappixels_height = image_height;
+ }
+ else if ((bumppixels = loadimagepixels(va("%s_bump", name), false, 0, 0)) != NULL)
+ {
+ bumppixels_width = image_width;
+ bumppixels_height = image_height;
+ }
+ if ((s->glosspixels = loadimagepixels(va("%s_gloss", name), false, 0, 0)) != NULL)
+ {
+ s->glosspixels_width = image_width;
+ s->glosspixels_height = image_height;
+ }
+ if ((s->pantspixels = loadimagepixels(va("%s_pants", name), false, 0, 0)) != NULL)
+ {
+ s->pantspixels_width = image_width;
+ s->pantspixels_height = image_height;
+ }
+ if ((s->shirtpixels = loadimagepixels(va("%s_shirt", name), false, 0, 0)) != NULL)
+ {
+ s->shirtpixels_width = image_width;
+ s->shirtpixels_height = image_height;
+ }
+
+ if (s->nmappixels == NULL)
+ {
+ if (bumppixels != NULL)
+ {
+ if (r_shadow_bumpscale_bumpmap.value > 0)
+ {
+ s->nmappixels = 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);
+ }
+ }
+ else
+ {
+ if (r_shadow_bumpscale_basetexture.value > 0)
+ {
+ s->nmappixels = 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);
+ }
+ }
+ }
+ if (bumppixels != NULL)
+ Mem_Free(bumppixels);
+ return true;
+}
+
+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)
+ Mem_Free(s->glowpixels);
+ if (s->glosspixels)
+ Mem_Free(s->glosspixels);
+ if (s->pantspixels)
+ Mem_Free(s->pantspixels);
+ if (s->shirtpixels)
+ Mem_Free(s->shirtpixels);
+ memset(s, 0, sizeof(*s));
+}
+
projects / xonotic / darkplaces.git / blobdiff