}
// note: pal must be 32bit color
-void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal)
+void Image_Copy8bitBGRA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal)
{
int *iout = (int *)out;
while (pixels >= 8)
LoadPCX
============
*/
-unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+unsigned char* LoadPCX_BGRA (const unsigned char *f, int filesize)
{
pcx_t pcx;
- unsigned char *a, *b, *image_rgba, *pbuf;
+ unsigned char *a, *b, *image_buffer, *pbuf;
const unsigned char *palette, *fin, *enddata;
int x, y, x2, dataByte;
Con_Print("Bad pcx file\n");
return NULL;
}
- if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
- return NULL;
palette = f + filesize - 768;
- image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
- if (!image_rgba)
+ image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
+ if (!image_buffer)
{
Con_Printf("LoadPCX: not enough memory for %i by %i image\n", image_width, image_height);
return NULL;
}
- pbuf = image_rgba + image_width*image_height*3;
+ pbuf = image_buffer + image_width*image_height*3;
enddata = palette;
for (y = 0;y < image_height && fin < enddata;y++)
a[x++] = 0;
}
- a = image_rgba;
+ a = image_buffer;
b = pbuf;
for(x = 0;x < image_width*image_height;x++)
{
y = *b++ * 3;
- *a++ = palette[y];
- *a++ = palette[y+1];
*a++ = palette[y+2];
+ *a++ = palette[y+1];
+ *a++ = palette[y];
*a++ = 255;
}
- return image_rgba;
+ return image_buffer;
}
/*
LoadTGA
=============
*/
-unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
{
- int x, y, pix_inc, row_inc, red, green, blue, alpha, runlen, alphabits;
- unsigned char *pixbuf, *image_rgba;
+ int x, y, pix_inc, row_inci, runlen, alphabits;
+ unsigned char *image_buffer;
+ unsigned int *pixbufi;
const unsigned char *fin, *enddata;
- unsigned char *p;
TargaHeader targa_header;
- unsigned char palette[256*4];
+ unsigned int palettei[256];
+ union
+ {
+ unsigned int i;
+ unsigned char b[4];
+ }
+ bgra;
if (filesize < 19)
return NULL;
PrintTargaHeader(&targa_header);
return NULL;
}
- if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
- return NULL;
targa_header.pixel_size = f[16];
targa_header.attributes = f[17];
{
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;
+ bgra.b[0] = *fin++;
+ bgra.b[1] = *fin++;
+ bgra.b[2] = *fin++;
+ bgra.b[3] = 255;
+ palettei[x] = bgra.i;
}
}
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++;
- }
+ memcpy(palettei, fin, targa_header.colormap_length*4);
+ fin += targa_header.colormap_length * 4;
}
else
{
// set up a palette to make the loader easier
for (x = 0;x < 256;x++)
{
- palette[x*4+2] = x;
- palette[x*4+1] = x;
- palette[x*4+0] = x;
- palette[x*4+3] = 255;
+ bgra.b[0] = bgra.b[1] = bgra.b[2] = x;
+ bgra.b[3] = 255;
+ palettei[x] = bgra.i;
}
// fall through to colormap case
case 1:
return NULL;
}
- image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
- if (!image_rgba)
+ image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+ if (!image_buffer)
{
Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
return NULL;
// 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;
+ pixbufi = (unsigned int*)image_buffer + (image_height - 1)*image_width;
+ row_inci = -image_width*2;
}
else
{
- pixbuf = image_rgba;
- row_inc = 0;
+ pixbufi = (unsigned int*)image_buffer;
+ row_inci = 0;
}
x = 0;
y = 0;
- red = green = blue = alpha = 255;
pix_inc = 1;
if ((targa_header.image_type & ~8) == 2)
- pix_inc = targa_header.pixel_size / 8;
+ pix_inc = (targa_header.pixel_size + 7) / 8;
switch (targa_header.image_type)
{
case 1: // colormapped, uncompressed
case 3: // greyscale, uncompressed
if (fin + image_width * image_height * pix_inc > enddata)
break;
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
- {
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
for (x = 0;x < image_width;x++)
- {
- p = palette + *fin++ * 4;
- *pixbuf++ = p[0];
- *pixbuf++ = p[1];
- *pixbuf++ = p[2];
- *pixbuf++ = p[3];
- }
- }
+ *pixbufi++ = palettei[*fin++];
break;
case 2:
// BGR or BGRA, uncompressed
break;
if (targa_header.pixel_size == 32 && alphabits)
{
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
- {
- for (x = 0;x < image_width;x++, fin += pix_inc)
- {
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = fin[3];
- }
- }
+ for (y = 0;y < image_height;y++)
+ memcpy(pixbufi + y * (image_width + row_inci), fin + y * image_width * pix_inc, image_width*4);
}
else
{
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
{
for (x = 0;x < image_width;x++, fin += pix_inc)
{
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = 255;
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
+ *pixbufi++ = bgra.i;
}
}
}
break;
case 9: // colormapped, RLE
case 11: // greyscale, RLE
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
{
for (x = 0;x < image_width;)
{
break; // error - truncated file
if (x + runlen > image_width)
break; // error - line exceeds width
- p = palette + *fin++ * 4;
- red = p[0];
- green = p[1];
- blue = p[2];
- alpha = p[3];
+ bgra.i = palettei[*fin++];
for (;runlen--;x++)
- {
- *pixbuf++ = red;
- *pixbuf++ = green;
- *pixbuf++ = blue;
- *pixbuf++ = alpha;
- }
+ *pixbufi++ = bgra.i;
}
else
{
if (x + runlen > image_width)
break; // error - line exceeds width
for (;runlen--;x++)
- {
- p = palette + *fin++ * 4;
- *pixbuf++ = p[0];
- *pixbuf++ = p[1];
- *pixbuf++ = p[2];
- *pixbuf++ = p[3];
- }
+ *pixbufi++ = palettei[*fin++];
}
}
}
// BGR or BGRA, RLE
if (targa_header.pixel_size == 32 && alphabits)
{
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
{
for (x = 0;x < image_width;)
{
break; // error - truncated file
if (x + runlen > image_width)
break; // error - line exceeds width
- red = fin[2];
- green = fin[1];
- blue = fin[0];
- alpha = fin[3];
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = fin[3];
fin += pix_inc;
for (;runlen--;x++)
- {
- *pixbuf++ = red;
- *pixbuf++ = green;
- *pixbuf++ = blue;
- *pixbuf++ = alpha;
- }
+ *pixbufi++ = bgra.i;
}
else
{
break; // error - truncated file
if (x + runlen > image_width)
break; // error - line exceeds width
- for (;runlen--;x++, fin += pix_inc)
+ for (;runlen--;x++)
{
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = fin[3];
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = fin[3];
+ fin += pix_inc;
+ *pixbufi++ = bgra.i;
}
}
}
}
else
{
- for (y = 0;y < image_height;y++, pixbuf += row_inc)
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
{
for (x = 0;x < image_width;)
{
break; // error - truncated file
if (x + runlen > image_width)
break; // error - line exceeds width
- red = fin[2];
- green = fin[1];
- blue = fin[0];
- alpha = 255;
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
fin += pix_inc;
for (;runlen--;x++)
- {
- *pixbuf++ = red;
- *pixbuf++ = green;
- *pixbuf++ = blue;
- *pixbuf++ = alpha;
- }
+ *pixbufi++ = bgra.i;
}
else
{
break; // error - truncated file
if (x + runlen > image_width)
break; // error - line exceeds width
- for (;runlen--;x++, fin += pix_inc)
+ for (;runlen--;x++)
{
- *pixbuf++ = fin[2];
- *pixbuf++ = fin[1];
- *pixbuf++ = fin[0];
- *pixbuf++ = 255;
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
+ fin += pix_inc;
+ *pixbufi++ = bgra.i;
}
}
}
break;
}
- return image_rgba;
-}
-
-/*
-============
-LoadLMP
-============
-*/
-unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, int matchheight, qboolean loadAs8Bit)
-{
- unsigned char *image_buffer;
-
- if (filesize < 9)
- {
- Con_Print("LoadLMP: invalid LMP file\n");
- return NULL;
- }
-
- // parse the very complicated header *chuckle*
- 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);
- return NULL;
- }
- if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
- return NULL;
-
- if (filesize < (8 + image_width * image_height))
- {
- Con_Print("LoadLMP: invalid LMP file\n");
- return NULL;
- }
-
- if (loadAs8Bit)
- {
- image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height);
- memcpy(image_buffer, f + 8, image_width * image_height);
- }
- else
- {
- image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
- Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_transparent);
- }
return image_buffer;
}
-
typedef struct q2wal_s
{
char name[32];
int value;
} q2wal_t;
-unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize)
{
- unsigned char *image_rgba;
+ unsigned char *image_buffer;
const q2wal_t *inwal = (const q2wal_t *)f;
if (filesize < (int) sizeof(q2wal_t))
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 (filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
{
return NULL;
}
- image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
- if (!image_rgba)
+ image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+ if (!image_buffer)
{
- Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height);
+ Con_Printf("LoadWAL: 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;
+ Image_Copy8bitBGRA(f + LittleLong(inwal->offsets[0]), image_buffer, image_width * image_height, palette_bgra_complete);
+ return image_buffer;
}
typedef struct imageformat_s
{
const char *formatstring;
- unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int matchwidth, int matchheight);
+ unsigned char *(*loadfunc)(const unsigned char *f, int filesize);
}
imageformat_t;
// GAME_TENEBRAE only
imageformat_t imageformats_tenebrae[] =
{
- {"override/%s.tga", LoadTGA},
- {"override/%s.png", PNG_LoadImage},
- {"override/%s.jpg", JPEG_LoadImage},
- {"override/%s.pcx", LoadPCX},
+ {"override/%s.tga", LoadTGA_BGRA},
+ {"override/%s.png", PNG_LoadImage_BGRA},
+ {"override/%s.jpg", JPEG_LoadImage_BGRA},
+ {"override/%s.pcx", LoadPCX_BGRA},
{NULL, NULL}
};
imageformat_t imageformats_nopath[] =
{
- {"override/%s.tga", LoadTGA},
- {"override/%s.png", PNG_LoadImage},
- {"override/%s.jpg", JPEG_LoadImage},
- {"textures/%s.tga", LoadTGA},
- {"textures/%s.png", PNG_LoadImage},
- {"textures/%s.jpg", JPEG_LoadImage},
+ {"override/%s.tga", LoadTGA_BGRA},
+ {"override/%s.png", PNG_LoadImage_BGRA},
+ {"override/%s.jpg", JPEG_LoadImage_BGRA},
+ {"textures/%s.tga", LoadTGA_BGRA},
+ {"textures/%s.png", PNG_LoadImage_BGRA},
+ {"textures/%s.jpg", JPEG_LoadImage_BGRA},
+ {"%s.tga", LoadTGA_BGRA},
+ {"%s.png", PNG_LoadImage_BGRA},
+ {"%s.jpg", JPEG_LoadImage_BGRA},
+ {"%s.pcx", LoadPCX_BGRA},
+ {NULL, NULL}
+};
+
+// GAME_DELUXEQUAKE only
+// VorteX: the point why i use such messy texture paths is
+// that GtkRadiant can't detect normal/gloss textures
+// and exclude them from texture browser
+// so i just use additional folder to store this textures
+imageformat_t imageformats_dq[] =
+{
{"%s.tga", LoadTGA},
- {"%s.png", PNG_LoadImage},
{"%s.jpg", JPEG_LoadImage},
- {"%s.pcx", LoadPCX},
+ {"texturemaps/%s.tga", LoadTGA},
+ {"texturemaps/%s.jpg", JPEG_LoadImage},
{NULL, NULL}
};
imageformat_t imageformats_textures[] =
{
- {"%s.tga", LoadTGA},
- {"%s.png", PNG_LoadImage},
- {"%s.jpg", JPEG_LoadImage},
- {"%s.pcx", LoadPCX},
- {"%s.wal", LoadWAL},
+ {"%s.tga", LoadTGA_BGRA},
+ {"%s.png", PNG_LoadImage_BGRA},
+ {"%s.jpg", JPEG_LoadImage_BGRA},
+ {"%s.pcx", LoadPCX_BGRA},
+ {"%s.wal", LoadWAL_BGRA},
{NULL, NULL}
};
imageformat_t imageformats_gfx[] =
{
- {"%s.tga", LoadTGA},
- {"%s.png", PNG_LoadImage},
- {"%s.jpg", JPEG_LoadImage},
- {"%s.pcx", LoadPCX},
+ {"%s.tga", LoadTGA_BGRA},
+ {"%s.png", PNG_LoadImage_BGRA},
+ {"%s.jpg", JPEG_LoadImage_BGRA},
+ {"%s.pcx", LoadPCX_BGRA},
{NULL, NULL}
};
imageformat_t imageformats_other[] =
{
- {"%s.tga", LoadTGA},
- {"%s.png", PNG_LoadImage},
- {"%s.jpg", JPEG_LoadImage},
- {"%s.pcx", LoadPCX},
+ {"%s.tga", LoadTGA_BGRA},
+ {"%s.png", PNG_LoadImage_BGRA},
+ {"%s.jpg", JPEG_LoadImage_BGRA},
+ {"%s.pcx", LoadPCX_BGRA},
{NULL, NULL}
};
int fixtransparentpixels(unsigned char *data, int w, int h);
-unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight, qboolean allowFixtrans)
+unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qboolean allowFixtrans)
{
fs_offset_t filesize;
imageformat_t *firstformat, *format;
}
if (gamemode == GAME_TENEBRAE)
firstformat = imageformats_tenebrae;
+ else if (gamemode == GAME_DELUXEQUAKE)
+ firstformat = imageformats_dq;
else if (!strcasecmp(name, "textures"))
firstformat = imageformats_textures;
else if (!strcasecmp(name, "gfx"))
f = FS_LoadFile(name, tempmempool, true, &filesize);
if (f)
{
- data = format->loadfunc(f, filesize, matchwidth, matchheight);
+ data = format->loadfunc(f, filesize);
Mem_Free(f);
if (data)
{
char outfilename[MAX_QPATH], buf[MAX_QPATH];
Image_StripImageExtension(name, buf, sizeof(buf));
dpsnprintf(outfilename, sizeof(outfilename), "fixtrans/%s.tga", buf);
- Image_WriteTGARGBA(outfilename, image_width, image_height, data);
+ Image_WriteTGABGRA(outfilename, image_width, image_height, data);
Con_Printf("- %s written.\n", outfilename);
}
}
return NULL;
}
-rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, qboolean allowFixtrans)
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans)
{
unsigned char *data;
rtexture_t *rt;
- if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight, allowFixtrans)))
+ if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans)))
return 0;
- rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
+ rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_BGRA, flags, NULL);
Mem_Free(data);
return rt;
}
unsigned char r, g, b, a, r0, g0, b0;
if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_U)
{
- r = data[FIXTRANS_PIXEL_U * 4 + 0];
+ r = data[FIXTRANS_PIXEL_U * 4 + 2];
g = data[FIXTRANS_PIXEL_U * 4 + 1];
- b = data[FIXTRANS_PIXEL_U * 4 + 2];
+ b = data[FIXTRANS_PIXEL_U * 4 + 0];
a = data[FIXTRANS_PIXEL_U * 4 + 3];
sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
}
if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_D)
{
- r = data[FIXTRANS_PIXEL_D * 4 + 0];
+ r = data[FIXTRANS_PIXEL_D * 4 + 2];
g = data[FIXTRANS_PIXEL_D * 4 + 1];
- b = data[FIXTRANS_PIXEL_D * 4 + 2];
+ b = data[FIXTRANS_PIXEL_D * 4 + 0];
a = data[FIXTRANS_PIXEL_D * 4 + 3];
sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
}
if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_L)
{
- r = data[FIXTRANS_PIXEL_L * 4 + 0];
+ r = data[FIXTRANS_PIXEL_L * 4 + 2];
g = data[FIXTRANS_PIXEL_L * 4 + 1];
- b = data[FIXTRANS_PIXEL_L * 4 + 2];
+ b = data[FIXTRANS_PIXEL_L * 4 + 0];
a = data[FIXTRANS_PIXEL_L * 4 + 3];
sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
}
if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_R)
{
- r = data[FIXTRANS_PIXEL_R * 4 + 0];
+ r = data[FIXTRANS_PIXEL_R * 4 + 2];
g = data[FIXTRANS_PIXEL_R * 4 + 1];
- b = data[FIXTRANS_PIXEL_R * 4 + 2];
+ b = data[FIXTRANS_PIXEL_R * 4 + 0];
a = data[FIXTRANS_PIXEL_R * 4 + 3];
sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
}
if(!cnt)
continue;
- r0 = data[FIXTRANS_PIXEL * 4 + 0];
+ r0 = data[FIXTRANS_PIXEL * 4 + 2];
g0 = data[FIXTRANS_PIXEL * 4 + 1];
- b0 = data[FIXTRANS_PIXEL * 4 + 2];
+ b0 = data[FIXTRANS_PIXEL * 4 + 0];
if(sumA)
{
// there is a surrounding non-alpha pixel
}
if(r != r0 || g != g0 || b != b0)
++changedPixels;
- data[FIXTRANS_PIXEL * 4 + 0] = r;
+ data[FIXTRANS_PIXEL * 4 + 2] = r;
data[FIXTRANS_PIXEL * 4 + 1] = g;
- data[FIXTRANS_PIXEL * 4 + 2] = b;
+ data[FIXTRANS_PIXEL * 4 + 0] = b;
fixMask[FIXTRANS_PIXEL] |= FIXTRANS_FIXED;
}
for(y = 0; y < h; ++y)
Con_Printf("Processing %s... ", filename);
Image_StripImageExtension(filename, buf, sizeof(buf));
dpsnprintf(outfilename, sizeof(outfilename), "fixtrans/%s.tga", buf);
- if(!(data = loadimagepixels(filename, true, 0, 0, false)))
+ if(!(data = loadimagepixelsbgra(filename, true, false)))
return;
if((n = fixtransparentpixels(data, image_width, image_height)))
{
- Image_WriteTGARGBA(outfilename, image_width, image_height, data);
+ Image_WriteTGABGRA(outfilename, image_width, image_height, data);
Con_Printf("%s written (%d pixels changed).\n", outfilename, n);
}
else
}
}
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer)
+qboolean Image_WriteTGABGR_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer)
{
qboolean ret;
- unsigned char *out;
- const unsigned char *in, *end;
memset (buffer, 0, 18);
buffer[2] = 2; // uncompressed type
buffer[16] = 24; // pixel size
// swap rgb to bgr
- in = data;
- out = buffer + 18;
- end = in + width*height*3;
- for (;in < end;in += 3)
- {
- *out++ = in[2];
- *out++ = in[1];
- *out++ = in[0];
- }
+ memcpy(buffer + 18, data, width*height*3);
ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
return ret;
}
-void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data)
+void Image_WriteTGABGRA (const char *filename, int width, int height, const unsigned char *data)
{
int y;
unsigned char *buffer, *out;
buffer[16] = 32; // pixel size
buffer[17] = 8; // 8 bits of alpha
- // swap rgba to bgra and flip upside down
+ // flip upside down
out = buffer + 18;
for (y = height - 1;y >= 0;y--)
{
- in = data + y * width * 4;
- end = in + width * 4;
- for (;in < end;in += 4)
- {
- *out++ = in[2];
- *out++ = in[1];
- *out++ = in[0];
- *out++ = in[3];
- }
+ memcpy(out, data + y * width * 4, width * 4);
+ out += width*4;
}
- FS_WriteFile (filename, buffer, width*height*4 + 18 );
}
else
{
buffer[16] = 24; // pixel size
buffer[17] = 0; // 8 bits of alpha
- // swap rgba to bgr and flip upside down
+ // truncate bgra to bgr and flip upside down
out = buffer + 18;
for (y = height - 1;y >= 0;y--)
{
end = in + width * 4;
for (;in < end;in += 4)
{
- *out++ = in[2];
- *out++ = in[1];
*out++ = in[0];
+ *out++ = in[1];
+ *out++ = in[2];
}
}
- FS_WriteFile (filename, buffer, width*height*3 + 18 );
}
+ FS_WriteFile (filename, buffer, out - buffer);
Mem_Free(buffer);
}
}
}
-static void Image_Resample24LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
-{
- int j, xi, oldx = 0, f, fstep, endx, lerp;
- fstep = (int) (inwidth*65536.0f/outwidth);
- endx = (inwidth-1);
- for (j = 0,f = 0;j < outwidth;j++, f += fstep)
- {
- xi = f >> 16;
- if (xi != oldx)
- {
- in += (xi - oldx) * 3;
- oldx = xi;
- }
- if (xi < endx)
- {
- lerp = f & 0xFFFF;
- *out++ = (unsigned char) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
- *out++ = (unsigned char) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
- *out++ = (unsigned char) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
- }
- else // last pixel of the line has no pixel to lerp to
- {
- *out++ = in[0];
- *out++ = in[1];
- *out++ = in[2];
- }
- }
-}
-
#define LERPBYTE(i) r = resamplerow1[i];out[i] = (unsigned char) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
void Image_Resample32Lerp(const 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;
- unsigned char *out;
- const unsigned char *inrow;
- unsigned char *resamplerow1;
- unsigned char *resamplerow2;
- out = (unsigned char *)outdata;
- fstep = (int) (inheight*65536.0f/outheight);
-
- resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*3*2);
- resamplerow2 = resamplerow1 + outwidth*3;
-
- inrow = (const unsigned char *)indata;
- oldy = 0;
- Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
- Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
- for (i = 0, f = 0;i < outheight;i++,f += fstep)
- {
- yi = f >> 16;
- if (yi < endy)
- {
- lerp = f & 0xFFFF;
- if (yi != oldy)
- {
- inrow = (unsigned char *)indata + inwidth3*yi;
- if (yi == oldy+1)
- memcpy(resamplerow1, resamplerow2, outwidth3);
- else
- Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
- Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
- oldy = yi;
- }
- j = outwidth - 4;
- while(j >= 0)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- LERPBYTE( 6);
- LERPBYTE( 7);
- LERPBYTE( 8);
- LERPBYTE( 9);
- LERPBYTE(10);
- LERPBYTE(11);
- out += 12;
- resamplerow1 += 12;
- resamplerow2 += 12;
- j -= 4;
- }
- if (j & 2)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- out += 6;
- resamplerow1 += 6;
- resamplerow2 += 6;
- }
- if (j & 1)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- out += 3;
- resamplerow1 += 3;
- resamplerow2 += 3;
- }
- resamplerow1 -= outwidth3;
- resamplerow2 -= outwidth3;
- }
- else
- {
- if (yi != oldy)
- {
- inrow = (unsigned char *)indata + inwidth3*yi;
- if (yi == oldy+1)
- memcpy(resamplerow1, resamplerow2, outwidth3);
- else
- Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
- oldy = yi;
- }
- 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)
-{
- int i, j, f, inwidth3 = inwidth * 3;
- unsigned frac, fracstep;
- unsigned char *inrow, *out;
- out = (unsigned char *)outdata;
-
- fracstep = inwidth*0x10000/outwidth;
- for (i = 0;i < outheight;i++)
- {
- inrow = (unsigned char *)indata + inwidth3*(i*inheight/outheight);
- frac = fracstep >> 1;
- j = outwidth - 4;
- while (j >= 0)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- j -= 4;
- }
- if (j & 2)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- out += 2;
- }
- if (j & 1)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- out += 1;
- }
- }
-}
-
/*
================
Image_Resample
================
*/
-void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality)
+void Image_Resample32(const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int quality)
{
if (indepth != 1 || outdepth != 1)
{
Con_Printf ("Image_Resample: 3D resampling not supported\n");
return;
}
- if (bytesperpixel == 4)
- {
- if (quality)
- Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
- else
- Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
- }
- else if (bytesperpixel == 3)
- {
- if (quality)
- Image_Resample24Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
- else
- Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
- }
+ if (quality)
+ Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
else
- Con_Printf ("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
+ Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
}
// in can be the same as out
-void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
+void Image_MipReduce32(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth)
{
const unsigned char *inrow;
int x, y, nextrow;
// note: if given odd width/height this discards the last row/column of
// pixels, rather than doing a proper box-filter scale down
inrow = in;
- nextrow = *width * bytesperpixel;
+ nextrow = *width * 4;
if (*width > destwidth)
{
*width >>= 1;
{
// reduce both
*height >>= 1;
- if (bytesperpixel == 4)
+ for (y = 0;y < *height;y++, inrow += nextrow * 2)
{
- for (y = 0;y < *height;y++, inrow += nextrow * 2)
+ for (in = inrow, x = 0;x < *width;x++)
{
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2);
- out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
- out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
- out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
- out += 4;
- in += 8;
- }
+ out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2);
+ out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
+ out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
+ out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
+ out += 4;
+ in += 8;
}
}
- else if (bytesperpixel == 3)
- {
- for (y = 0;y < *height;y++, inrow += nextrow * 2)
- {
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow ] + in[nextrow+3]) >> 2);
- out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
- out[2] = (unsigned char) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
- out += 3;
- in += 6;
- }
- }
- }
- else
- Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
}
else
{
// reduce width
- if (bytesperpixel == 4)
- {
- for (y = 0;y < *height;y++, inrow += nextrow)
- {
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
- out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
- out[2] = (unsigned char) ((in[2] + in[6]) >> 1);
- out[3] = (unsigned char) ((in[3] + in[7]) >> 1);
- out += 4;
- in += 8;
- }
- }
- }
- else if (bytesperpixel == 3)
+ for (y = 0;y < *height;y++, inrow += nextrow)
{
- for (y = 0;y < *height;y++, inrow += nextrow)
+ for (in = inrow, x = 0;x < *width;x++)
{
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
- out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
- out[2] = (unsigned char) ((in[2] + in[5]) >> 1);
- out += 3;
- in += 6;
- }
+ out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
+ out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
+ out[2] = (unsigned char) ((in[2] + in[6]) >> 1);
+ out[3] = (unsigned char) ((in[3] + in[7]) >> 1);
+ out += 4;
+ in += 8;
}
}
- else
- Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
}
}
else
{
// reduce height
*height >>= 1;
- if (bytesperpixel == 4)
+ for (y = 0;y < *height;y++, inrow += nextrow * 2)
{
- for (y = 0;y < *height;y++, inrow += nextrow * 2)
+ for (in = inrow, x = 0;x < *width;x++)
{
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[nextrow ]) >> 1);
- out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
- out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
- out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1);
- out += 4;
- in += 4;
- }
+ out[0] = (unsigned char) ((in[0] + in[nextrow ]) >> 1);
+ out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
+ out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
+ out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1);
+ out += 4;
+ in += 4;
}
}
- else if (bytesperpixel == 3)
- {
- for (y = 0;y < *height;y++, inrow += nextrow * 2)
- {
- for (in = inrow, x = 0;x < *width;x++)
- {
- out[0] = (unsigned char) ((in[0] + in[nextrow ]) >> 1);
- out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
- out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
- out += 3;
- in += 3;
- }
- }
- }
- else
- Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
}
else
Con_Printf ("Image_MipReduce: desired size already achieved\n");
}
}
-void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
+void Image_HeightmapToNormalmap_BGRA(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
{
int x, y, x1, x2, y1, y2;
const unsigned char *b, *row[3];
n[2] = ibumpscale;
VectorNormalize(n);
// turn it into a dot3 rgb vector texture
- out[0] = (int)(128.0f + n[0] * 127.0f);
+ out[2] = (int)(128.0f + n[0] * 127.0f);
out[1] = (int)(128.0f + n[1] * 127.0f);
- out[2] = (int)(128.0f + n[2] * 127.0f);
+ out[0] = (int)(128.0f + n[2] * 127.0f);
out[3] = (p[4]) / 3;
out += 4;
}
projects / xonotic / darkplaces.git / blobdiff