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--)
LoadPCX
============
*/
-qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
+qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
{
pcx_t pcx;
qbyte *a, *b, *image_rgba, *pbuf;
const qbyte *palette, *fin, *enddata;
int x, y, x2, dataByte;
- if (loadsize < (int)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)
+ 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)
- {
+ if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
return NULL;
- }
- if (matchheight && (pcx.ymax+1) != 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)
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 (const qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadTGA (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;
qbyte *pixbuf, *image_rgba;
- const qbyte *fin, *enddata;
+ qbyte *fin, *enddata;
TargaHeader targa_header;
unsigned char palette[256*4], *p;
- if (loadsize < 19)
+ if (fs_filesize < 19)
return NULL;
- enddata = f + loadsize;
+ enddata = f + fs_filesize;
targa_header.id_length = f[0];
targa_header.colormap_type = f[1];
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;
-
fin = f + 18;
if (targa_header.id_length != 0)
fin += targa_header.id_length; // skip TARGA image comment
{
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");
+ Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\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;
}
- 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;
}
}
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;
}
{
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;
}
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];
LoadLMP
============
*/
-qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight)
+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)
{
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 + LittleLong(inwal->offsets[0]), image_rgba, image_width * image_height, palette_complete);
+ return image_rgba;
+}
+
+
+
/*
============
LoadLMP
============
*/
-qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight)
{
qbyte *image_8bit;
- int width, height;
- if (loadsize < 9)
+ if (fs_filesize < 9)
{
- Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+ Con_Print("LoadLMPAs8Bit: 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("LoadLMPAs8Bit: invalid size\n");
+ Con_Printf("LoadLMPAs8Bit: 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("LoadLMPAs8Bit: invalid LMP file\n");
+ Con_Print("LoadLMPAs8Bit: invalid LMP file\n");
return NULL;
}
- image_width = width;
- image_height = height;
-
image_8bit = Mem_Alloc(tempmempool, image_width * image_height);
if (!image_8bit)
{
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);
}
+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;
+ 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, "override/%s.tga", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadTGA (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "override/%s.jpg", basename);
- f = COM_LoadFile(name, true);
- if (f)
+ for (i = 0;imageformats[i].formatstring;i++)
{
- data = JPEG_LoadImage (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "textures/%s.tga", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadTGA (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "textures/%s.jpg", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = JPEG_LoadImage (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "textures/%s.pcx", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadPCX (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "%s.tga", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadTGA (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "%s.jpg", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = JPEG_LoadImage (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "%s.pcx", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- data = LoadPCX (f, matchwidth, matchheight);
- goto loaded;
- }
- sprintf (name, "%s.lmp", basename);
- f = COM_LoadFile(name, true);
- if (f)
- {
- 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);
- 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)
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;
*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;
}
*out++ = in[0];
}
}
- COM_WriteFile (filename, buffer, width*height*3 + 18 );
+ FS_WriteFile (filename, buffer, width*height*3 + 18 );
Mem_Free(buffer);
}
*out++ = in[3];
}
}
- COM_WriteFile (filename, buffer, width*height*4 + 18 );
+ FS_WriteFile (filename, buffer, width*height*4 + 18 );
Mem_Free(buffer);
}
/*
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);
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] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
+ 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;
}
}
-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];
+ Image_StripImageExtension(shadername, name);
memset(s, 0, sizeof(*s));
s->basepixels = loadimagepixels(name, false, 0, 0);
if (s->basepixels == NULL)
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_width = s->basepixels_width;
{
if (s->basepixels)
Mem_Free(s->basepixels);
+ if (s->maskpixels)
+ Mem_Free(s->maskpixels);
if (s->nmappixels)
Mem_Free(s->nmappixels);
if (s->glowpixels)
projects / xonotic / darkplaces.git / blobdiff