#include "quakedef.h"
+#include "image.h"
int image_width;
int image_height;
-void Image_GammaRemapRGB(qbyte *in, qbyte *out, int pixels, qbyte *gammar, qbyte *gammag, qbyte *gammab)
+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)
LoadPCX
============
*/
-qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
+qbyte* LoadPCX (const 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 (loadsize < (int)sizeof(pcx) + 768)
{
Con_Printf ("Bad pcx file\n");
return NULL;
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;
}
LoadTGA
=============
*/
-qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
{
- int columns, rows, row, column;
- qbyte *pixbuf, *image_rgba, *fin, *enddata;
+ int x, y, row_inc;
+ unsigned char red, green, blue, alpha, run, runlen;
+ qbyte *pixbuf, *image_rgba;
+ const qbyte *fin, *enddata;
if (loadsize < 18+3)
return NULL;
enddata = f + loadsize;
- columns = targa_header.width;
- rows = targa_header.height;
+ image_width = targa_header.width;
+ image_height = 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;
}
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)
{
// Uncompressed, RGB images
- for(row = rows - 1;row >= 0;row--)
+ if (targa_header.pixel_size == 24)
{
- pixbuf = image_rgba + row*columns*4;
- for(column = 0;column < columns;column++)
+ if (fin + image_width * image_height * 3 <= enddata)
{
- switch (targa_header.pixel_size)
+ for(y = 0;y < image_height;y++)
{
- 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;
+ for(x = 0;x < image_width;x++)
+ {
+ *pixbuf++ = fin[2];
+ *pixbuf++ = fin[1];
+ *pixbuf++ = fin[0];
+ *pixbuf++ = 255;
+ fin += 3;
+ }
+ pixbuf += row_inc;
+ }
+ }
+ }
+ else
+ {
+ if (fin + image_width * image_height * 4 <= enddata)
+ {
+ for(y = 0;y < image_height;y++)
+ {
+ for(x = 0;x < image_width;x++)
+ {
+ *pixbuf++ = fin[2];
+ *pixbuf++ = fin[1];
+ *pixbuf++ = fin[0];
+ *pixbuf++ = fin[3];
+ fin += 4;
+ }
+ pixbuf += row_inc;
}
}
}
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--)
+ x = 0;
+ y = 0;
+ while (y < image_height && fin < enddata)
{
- pixbuf = image_rgba + row * columns * 4;
- for(column = 0;column < columns;)
+ runlen = *fin++;
+ if (runlen & 0x80)
{
- if (fin >= enddata)
- goto outofdata;
- packetHeader = *fin++;
- packetSize = 1 + (packetHeader & 0x7f);
- if (packetHeader & 0x80)
+ // RLE compressed run
+ runlen = 1 + (runlen & 0x7f);
+ if (targa_header.pixel_size == 24)
{
- // run-length packet
- switch (targa_header.pixel_size)
- {
- case 24:
- if (fin + 3 > enddata)
- goto outofdata;
- blue = *fin++;
- green = *fin++;
- red = *fin++;
- alphabyte = 255;
+ if (fin + 3 > enddata)
break;
- case 32:
- if (fin + 4 > enddata)
- goto outofdata;
- blue = *fin++;
- green = *fin++;
- red = *fin++;
- alphabyte = *fin++;
+ blue = *fin++;
+ green = *fin++;
+ red = *fin++;
+ alpha = 255;
+ }
+ else
+ {
+ if (fin + 4 > enddata)
break;
- }
+ blue = *fin++;
+ green = *fin++;
+ red = *fin++;
+ alpha = *fin++;
+ }
- for(j = 0;j < packetSize;j++)
+ while (runlen && y < image_height)
+ {
+ run = runlen;
+ if (run > image_width - x)
+ run = image_width - x;
+ x += run;
+ runlen -= run;
+ while(run--)
{
*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;
- }
+ *pixbuf++ = alpha;
+ }
+ if (x == image_width)
+ {
+ // end of line, advance to next
+ x = 0;
+ y++;
+ pixbuf += row_inc;
}
}
- else
+ }
+ else
+ {
+ // RLE uncompressed run
+ runlen = 1 + (runlen & 0x7f);
+ while (runlen && y < image_height)
{
- // non run-length packet
- for(j = 0;j < packetSize;j++)
+ run = runlen;
+ if (run > image_width - x)
+ run = image_width - x;
+ x += run;
+ runlen -= run;
+ if (targa_header.pixel_size == 24)
{
- switch (targa_header.pixel_size)
+ if (fin + run * 3 > enddata)
+ break;
+ while(run--)
{
- case 24:
- if (fin + 3 > enddata)
- goto outofdata;
*pixbuf++ = fin[2];
*pixbuf++ = fin[1];
*pixbuf++ = fin[0];
*pixbuf++ = 255;
fin += 3;
+ }
+ }
+ else
+ {
+ if (fin + run * 4 > enddata)
break;
- case 32:
- if (fin + 4 > enddata)
- goto outofdata;
+ while(run--)
+ {
*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;
}
}
+ if (x == image_width)
+ {
+ // end of line, advance to next
+ x = 0;
+ y++;
+ pixbuf += row_inc;
+ }
}
}
- breakOut:;
}
}
-outofdata:;
-
- image_width = columns;
- image_height = rows;
return image_rgba;
}
LoadLMP
============
*/
-qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight)
{
qbyte *image_rgba;
int width, height;
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 + 8, image_rgba, image_width * image_height, palette_complete);
return image_rgba;
}
-void Image_StripImageExtension (char *in, char *out)
+/*
+============
+LoadLMP
+============
+*/
+qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight)
{
- char *end, *temp;
+ qbyte *image_8bit;
+ int width, height;
+
+ if (loadsize < 9)
+ {
+ Con_Printf("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)
+ {
+ Con_Printf("LoadLMPAs8Bit: invalid size\n");
+ return NULL;
+ }
+ if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight))
+ return NULL;
+
+ if (loadsize < 8 + width * height)
+ {
+ Con_Printf("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)
+ {
+ 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;
end = in + strlen(in);
if ((end - in) >= 4)
{
strcpy(out, in);
}
-qbyte *loadimagepixels (char *filename, qboolean complain, int matchwidth, int matchheight)
+qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
{
qbyte *f, *data;
char basename[256], name[256], *c;
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;
}
-qboolean Image_WriteTGARGB_preflipped (char *filename, int width, int height, qbyte *data)
+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 (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);
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);
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);
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)
{
Sys_Error("Image_MipReduce: desired size already achieved\n");
}
}
+
+extern cvar_t r_shadow_bumpscale;
+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 * r_shadow_bumpscale.value);
+ 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] = ((p1[0] + p1[1] + p1[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[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] = ((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[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;
+ }
+ }
+}
projects / xonotic / darkplaces.git / blobdiff