qf
/
newtree
mirror of https://git.code.sf.net/p/quake/newtree
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

15to8 palette pre-loading for win32 targets too...

This commit is contained in:
Dabb 2000-07-09 09:43:10 +00:00
parent 01148e4ce9
commit 728a5dfc47
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
source/vid_wgl.c
View File

@ -718,13 +718,19 @@ void VID_SetPalette (unsigned char *palette)
unsigned r,g,b; unsigned r,g,b;
unsigned v; unsigned v;
int r1,g1,b1; int r1,g1,b1;
int j,k,l; int k;
unsigned short i; unsigned short i;
unsigned *table; unsigned *table;
FILE *f;
char s[255];
float dist, bestdist;
static qboolean palflag = false;
// //
// 8 8 8 encoding // 8 8 8 encoding
// //
// Con_Printf("Converting 8to24\n");
pal = palette; pal = palette;
table = d_8to24table; table = d_8to24table;
for (i=0 ; i<256 ; i++) for (i=0 ; i<256 ; i++)
@ -733,38 +739,55 @@ void VID_SetPalette (unsigned char *palette)
g = pal[1]; g = pal[1];
b = pal[2]; b = pal[2];
pal += 3; pal += 3;
// v = (255<<24) + (r<<16) + (g<<8) + (b<<0); // v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
// v = (255<<0) + (r<<8) + (g<<16) + (b<<24); // v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
v = (255<<24) + (r<<0) + (g<<8) + (b<<16); v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
*table++ = v; *table++ = v;
} }
d_8to24table[255] &= 0xffffff; // 255 is transparent d_8to24table[255] &= 0; // 255 is transparent
// JACK: 3D distance calcs - k is last closest, l is the distance. // JACK: 3D distance calcs - k is last closest, l is the distance.
// FIXME: Precalculate this and cache to disk. // FIXME: Precalculate this and cache to disk.
for (i=0; i < (1<<15); i++) { if (palflag)
/* Maps return;
000000000000000 palflag = true;
000000000011111 = Red = 0x1F
000001111100000 = Blue = 0x03E0 COM_FOpenFile("glquake/15to8.pal", &f);
111110000000000 = Grn = 0x7C00 if (f) {
*/ fread(d_15to8table, 1<<15, 1, f);
r = ((i & 0x1F) << 3)+4; fclose(f);
g = ((i & 0x03E0) >> 2)+4; } else {
b = ((i & 0x7C00) >> 7)+4; for (i=0; i < (1<<15); i++) {
pal = (unsigned char *)d_8to24table; /* Maps
for (v=0,k=0,l=10000*10000; v<256; v++,pal+=4) { 000000000000000
r1 = r-pal[0]; 000000000011111 = Red = 0x1F
g1 = g-pal[1]; 000001111100000 = Blue = 0x03E0
b1 = b-pal[2]; 111110000000000 = Grn = 0x7C00
j = (r1*r1)+(g1*g1)+(b1*b1); */
if (j<l) { r = ((i & 0x1F) << 3)+4;
k=v; g = ((i & 0x03E0) >> 2)+4;
l=j; b = ((i & 0x7C00) >> 7)+4;
pal = (unsigned char *)d_8to24table;
for (v=0,k=0,bestdist=10000.0; v<256; v++,pal+=4) {
r1 = (int)r - (int)pal[0];
g1 = (int)g - (int)pal[1];
b1 = (int)b - (int)pal[2];
dist = sqrt(((r1*r1)+(g1*g1)+(b1*b1)));
if (dist < bestdist) {
k=v;
bestdist = dist;
}
} }
d_15to8table[i]=k;
}
snprintf(s, sizeof(s), "%s/glquake", com_gamedir);
Sys_mkdir (s);
snprintf(s, sizeof(s), "%s/glquake/15to8.pal", com_gamedir);
if ((f = fopen(s, "wb")) != NULL) {
fwrite(d_15to8table, 1<<15, 1, f);
fclose(f);
} }
d_15to8table[i]=k;
} }
} }
@ -773,7 +796,7 @@ BOOL gammaworks;
void VID_ShiftPalette (unsigned char *palette) void VID_ShiftPalette (unsigned char *palette)
{ {
extern byte ramps[3][256]; extern byte ramps[3][256];
// VID_SetPalette (palette); // VID_SetPalette (palette);
// gammaworks = SetDeviceGammaRamp (maindc, ramps); // gammaworks = SetDeviceGammaRamp (maindc, ramps);