skin code cleanup complete

This commit is contained in:
Bill Currie 2001-01-17 09:36:38 +00:00
parent aab3c199a2
commit e955df08d1

View file

@ -38,6 +38,7 @@
byte player_8bit_texels[320 * 200];
static byte translate[256];
static unsigned int translate32[256];
void
Skin_Set_Translate (player_info_t *player)
@ -49,8 +50,10 @@ Skin_Set_Translate (player_info_t *player)
top = bound (0, player->topcolor, 13) * 16;
bottom = bound (0, player->bottomcolor, 13) * 16;
if (VID_Is8bit ()) { // 8bit texture upload
for (i = 0; i < 16; i++) {
if (top < 128) // the artists made some backwards ranges. sigh.
if (top < 128) // the artists made some backwards
// ranges. sigh.
translate[TOP_RANGE + i] = top + i;
else
translate[TOP_RANGE + i] = top + 15 - i;
@ -60,20 +63,100 @@ Skin_Set_Translate (player_info_t *player)
else
translate[BOTTOM_RANGE + i] = bottom + 15 - i;
}
} else {
if (top < 128) // the artists made some backwards
// ranges. sigh.
memcpy (translate32 + TOP_RANGE, d_8to24table + top,
16 * sizeof (unsigned int));
else
for (i = 0; i < 16; i++)
translate32[TOP_RANGE + i] = top + 15 - i;
if (bottom < 128)
memcpy (translate32 + BOTTOM_RANGE, d_8to24table + bottom,
16 * sizeof (unsigned int));
else
for (i = 0; i < 16; i++)
translate32[BOTTOM_RANGE + i] = bottom + 15 - i;
}
}
static void
build_skin_8 (byte * original, int tinwidth, int tinheight,
unsigned int scaled_width, unsigned int scaled_height,
int inwidth)
{
unsigned int frac, fracstep;
byte *inrow;
byte pixels[512 * 256], *out;
int i, j;
out = pixels;
memset (pixels, 0, sizeof (pixels));
fracstep = tinwidth * 0x10000 / scaled_width;
for (i = 0; i < scaled_height; i++, out += scaled_width) {
inrow = original + inwidth * (i * tinheight / scaled_height);
frac = fracstep >> 1;
for (j = 0; j < scaled_width; j += 4) {
out[j] = translate[inrow[frac >> 16]];
frac += fracstep;
out[j + 1] = translate[inrow[frac >> 16]];
frac += fracstep;
out[j + 2] = translate[inrow[frac >> 16]];
frac += fracstep;
out[j + 3] = translate[inrow[frac >> 16]];
frac += fracstep;
}
}
GL_Upload8_EXT ((byte *) pixels, scaled_width, scaled_height, false, false);
}
static void
build_skin_32 (byte * original, int tinwidth, int tinheight,
unsigned int scaled_width, unsigned int scaled_height,
int inwidth)
{
unsigned int frac, fracstep;
byte *inrow;
unsigned int pixels[512 * 256], *out;
int i, j;
out = pixels;
memset (pixels, 0, sizeof (pixels));
fracstep = tinwidth * 0x10000 / scaled_width;
for (i = 0; i < scaled_height; i++, out += scaled_width) {
inrow = original + inwidth * (i * tinheight / scaled_height);
frac = fracstep >> 1;
for (j = 0; j < scaled_width; j += 4) {
out[j] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 1] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 2] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 3] = translate32[inrow[frac >> 16]];
frac += fracstep;
}
}
glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format,
scaled_width, scaled_height, 0, GL_RGBA,
GL_UNSIGNED_BYTE, pixels);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
void
Skin_Do_Translation (player_info_t *player)
{
int i, j;
int inwidth, inheight;
int tinwidth, tinheight;
unsigned int scaled_width, scaled_height;
unsigned int frac, fracstep;
unsigned int translate32[256];
byte *original;
unsigned int pixels[512 * 256], *out;
byte *inrow;
// locate the original skin pixels
tinwidth = 296; // real model width
@ -104,58 +187,13 @@ Skin_Do_Translation (player_info_t *player)
scaled_height >>= gl_playermip->int_val;
if (VID_Is8bit ()) { // 8bit texture upload
byte *out2;
out2 = (byte *) pixels;
memset (pixels, 0, sizeof (pixels));
fracstep = tinwidth * 0x10000 / scaled_width;
for (i = 0; i < scaled_height; i++, out2 += scaled_width) {
inrow = original + inwidth * (i * tinheight / scaled_height);
frac = fracstep >> 1;
for (j = 0; j < scaled_width; j += 4) {
out2[j] = translate[inrow[frac >> 16]];
frac += fracstep;
out2[j + 1] = translate[inrow[frac >> 16]];
frac += fracstep;
out2[j + 2] = translate[inrow[frac >> 16]];
frac += fracstep;
out2[j + 3] = translate[inrow[frac >> 16]];
frac += fracstep;
}
build_skin_8 (original, tinwidth, tinheight, scaled_width,
scaled_height, inwidth);
} else {
build_skin_32 (original, tinwidth, tinheight, scaled_width,
scaled_height, inwidth);
}
GL_Upload8_EXT ((byte *) pixels, scaled_width, scaled_height, false,
false);
return;
}
for (i = 0; i < 256; i++)
translate32[i] = d_8to24table[translate[i]];
out = pixels;
memset (pixels, 0, sizeof (pixels));
fracstep = tinwidth * 0x10000 / scaled_width;
for (i = 0; i < scaled_height; i++, out += scaled_width) {
inrow = original + inwidth * (i * tinheight / scaled_height);
frac = fracstep >> 1;
for (j = 0; j < scaled_width; j += 4) {
out[j] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 1] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 2] = translate32[inrow[frac >> 16]];
frac += fracstep;
out[j + 3] = translate32[inrow[frac >> 16]];
frac += fracstep;
}
}
glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format,
scaled_width, scaled_height, 0, GL_RGBA,
GL_UNSIGNED_BYTE, pixels);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
void
@ -163,6 +201,8 @@ Skin_Init_Translation (void)
{
int i;
for (i=0; i < 256; i++)
for (i = 0; i < 256; i++) {
translate[i] = i;
translate32[i] = d_8to24table[i];
}
}