qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-24 02:22:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove vid_basepal, creating vid.palette (current palette) and host_basepal

Browse source
This commit is contained in:
Bill Currie 2002-09-10 03:51:10 +00:00
parent 232aca8fcb
commit 9f6f50699d
17 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/vid.h
View file

@ -35,7 +35,6 @@
#define VID_GRADES (1 << VID_CBITS)
struct cvar_s;
extern byte *vid_basepal;
extern byte *vid_colormap;
extern unsigned char d_15to8table[65536];
@ -55,6 +54,7 @@ typedef struct {
void *buffer; // invisible buffer
short *zbuffer;
void *surfcache;
byte *palette; // 256 * 3
byte *colormap8; // 256 * VID_GRADES size
unsigned short *colormap16; // 256 * VID_GRADES size
unsigned int *colormap32; // 256 * VID_GRADES size

2
libs/video/renderer/gl/gl_draw.c
View file

@ -737,7 +737,7 @@ void
Draw_Fill (int x, int y, int w, int h, int c)
{
qfglDisable (GL_TEXTURE_2D);
qfglColor3ubv (vid_basepal + c * 3);
qfglColor3ubv (vid.palette + c * 3);
qfglBegin (GL_QUADS);

6
libs/video/renderer/gl/gl_screen.c
View file

@ -631,9 +631,9 @@ MipColor (int r, int g, int b)
for (i = 0; i < 256; i++) {
static int j;
j = i * 3;
r1 = vid_basepal[j] - r;
g1 = vid_basepal[j + 1] - g;
b1 = vid_basepal[j + 2] - b;
r1 = vid.palette[j] - r;
g1 = vid.palette[j + 1] - g;
b1 = vid.palette[j + 2] - b;
dist = r1 * r1 + g1 * g1 + b1 * b1;
if (dist < bestdist) {
bestdist = dist;

16
libs/video/renderer/sw/screen.c
View file

@ -350,7 +350,7 @@ SCR_ApplyBlend (void) // Used to be V_UpdatePalette
int r, g, b, i;
byte *basepal, *newpal;
byte pal[768];
basepal = vid_basepal;
basepal = vid.palette;
newpal = pal;
for (i = 0; i < 256; i++) {
@ -619,9 +619,9 @@ SCR_ScreenShot (int width, int height)
for ( /* */ ; dy < dey; dy++) {
src = vid.buffer + (vid.rowbytes * dy) + dx;
for (nx = dx; nx < dex; nx++) {
r += vid_basepal[*src * 3];
g += vid_basepal[*src * 3 + 1];
b += vid_basepal[*src * 3 + 2];
r += vid.palette[*src * 3];
g += vid.palette[*src * 3 + 1];
b += vid.palette[*src * 3 + 2];
src++;
count++;
}
@ -656,7 +656,7 @@ SCR_ScreenShot_f (void)
// save the pcx file
pcx = EncodePCX (vid.buffer, vid.width, vid.height, vid.rowbytes,
vid_basepal, false, &pcx_len);
vid.palette, false, &pcx_len);
COM_WriteFile (pcxname, pcx, pcx_len);
@ -686,9 +686,9 @@ MipColor (int r, int g, int b)
bestdist = 256 * 256 * 3;
for (i = 0; i < 256; i++) {
r1 = vid_basepal[i * 3] - r;
g1 = vid_basepal[i * 3 + 1] - g;
b1 = vid_basepal[i * 3 + 2] - b;
r1 = vid.palette[i * 3] - r;
g1 = vid.palette[i * 3 + 1] - g;
b1 = vid.palette[i * 3 + 2] - b;
dist = r1 * r1 + g1 * g1 + b1 * b1;
if (dist < bestdist) {
bestdist = dist;

2
libs/video/renderer/sw/sw_rmisc.c
View file

@ -172,7 +172,7 @@ WarpPalette (void)
for (i = 0; i < 256; i++) {
for (j = 0; j < 3; j++) {
newpalette[i * 3 + j] =
(vid_basepal[i * 3 + j] + basecolor[j]) / 2;
(vid.palette[i * 3 + j] + basecolor[j]) / 2;
}
}

10
libs/video/renderer/sw32/screen.c
View file

@ -354,7 +354,7 @@ SCR_ApplyBlend (void) // Used to be V_UpdatePalette
switch(r_pixbytes) {
case 1:
{
basepal = vid_basepal;
basepal = vid.palette;
newpal = pal;
for (i = 0; i < 256; i++) {
@ -668,7 +668,7 @@ SCR_ScreenShot_f (void)
switch(r_pixbytes) {
case 1:
pcx = EncodePCX (vid.buffer, vid.width, vid.height, vid.rowbytes,
vid_basepal, false, &pcx_len);
vid.palette, false, &pcx_len);
break;
case 2:
Con_Printf("SCR_ScreenShot_f: FIXME - add 16bit support\n");
@ -706,9 +706,9 @@ MipColor (int r, int g, int b)
bestdist = 256 * 256 * 3;
for (i = 0; i < 256; i++) {
r1 = vid_basepal[i * 3] - r;
g1 = vid_basepal[i * 3 + 1] - g;
b1 = vid_basepal[i * 3 + 2] - b;
r1 = vid.palette[i * 3] - r;
g1 = vid.palette[i * 3 + 1] - g;
b1 = vid.palette[i * 3 + 2] - b;
dist = r1 * r1 + g1 * g1 + b1 * b1;
if (dist < bestdist) {
bestdist = dist;

2
libs/video/renderer/sw32/sw32_rmisc.c
View file

@ -172,7 +172,7 @@ WarpPalette (void)
for (i = 0; i < 256; i++) {
for (j = 0; j < 3; j++) {
newpalette[i * 3 + j] =
(vid_basepal[i * 3 + j] + basecolor[j]) / 2;
(vid.palette[i * 3 + j] + basecolor[j]) / 2;
}
}

3
libs/video/targets/vid.c
View file

@ -153,7 +153,7 @@ VID_UpdateGamma (cvar_t *vid_gamma)
VID_BuildGammaTable (gamma);
if (vid.initialized) {
for (i = 0; i < sizeof (pal); i++)
pal[i] = gammatable[vid_basepal[i]];
pal[i] = gammatable[vid.palette[i]];
VID_SetPalette (pal); // update with the new palette
}
}
@ -170,6 +170,7 @@ VID_InitGamma (unsigned char *pal)
int i;
double gamma = 1.45;
vid.palette = pal;
if ((i = COM_CheckParm ("-gamma"))) {
gamma = atof (com_argv[i + 1]);
}

4
libs/video/targets/vid_sdl32.c
View file

@ -149,9 +149,9 @@ VID_Init (unsigned char *palette)
vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0);
vid.numpages = 1;
if (vid_colormap)
VID_MakeColormaps(256 - vid_colormap[16384], vid_basepal);
VID_MakeColormaps(256 - vid_colormap[16384], vid.palette);
else
VID_MakeColormaps(224, vid_basepal);
VID_MakeColormaps(224, vid.palette);
VGA_pagebase = vid.buffer = rendersurface->pixels;
VGA_rowbytes = vid.rowbytes = rendersurface->pitch;
vid.conbuffer = vid.buffer;

2
nq/source/cl_main.c
View file

@ -399,7 +399,7 @@ SetPal (int i)
old = i;
if (i == 0)
VID_SetPalette (vid_basepal);
VID_SetPalette (vid.palette);
else if (i == 1) {
for (c = 0; c < 768; c += 3) {
pal[c] = 0;

6
nq/source/cl_tent.c
View file

@ -424,9 +424,9 @@ CL_ParseTEnt (void)
dl->die = cl.time + 0.5;
dl->decay = 300;
colorStart = (colorStart + (rand() % colorLength)) * 3;
dl->color[0] = vid_basepal[colorStart] * (1.0 / 255.0);
dl->color[1] = vid_basepal[colorStart + 1] * (1.0 / 255.0);
dl->color[2] = vid_basepal[colorStart + 2] * (1.0 / 255.0);
dl->color[0] = vid.palette[colorStart] * (1.0 / 255.0);
dl->color[1] = vid.palette[colorStart + 1] * (1.0 / 255.0);
dl->color[2] = vid.palette[colorStart + 2] * (1.0 / 255.0);
break;
case TE_EXPLOSION3: // Nehahra colored light explosion

8
nq/source/host.c
View file

@ -98,7 +98,7 @@ client_t *host_client; // current client
jmp_buf host_abortserver;
byte *vid_basepal;
byte *host_basepal;
cvar_t *fs_globalcfg;
cvar_t *fs_usercfg;
@ -951,14 +951,14 @@ Host_Init (void)
Con_Printf ("%4.1f megabyte heap\n", host_mem_size->value);
if (cls.state != ca_dedicated) {
vid_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!vid_basepal)
host_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!host_basepal)
Sys_Error ("Couldn't load gfx/palette.lmp");
vid_colormap = (byte *) COM_LoadHunkFile ("gfx/colormap.lmp");
if (!vid_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp");
VID_Init (vid_basepal);
VID_Init (host_basepal);
Draw_Init ();
SCR_Init ();
R_Init ();

4
nq/source/skin.c
View file

@ -168,7 +168,7 @@ Skin_Cache (skin_t *skin)
return NULL;
}
}
tex = LoadPCX (file, 0, vid_basepal);
tex = LoadPCX (file, 0, vid.palette);
Qclose (file);
if (!tex || tex->width > 320 || tex->height > 200) {
@ -184,7 +184,7 @@ Skin_Cache (skin_t *skin)
opix = out->data;
out->width = 320;
out->height = 200;
out->palette = tex->palette; //FIXME assumes 0 or vid_basepal
out->palette = tex->palette; //FIXME assumes 0 or vid.palette
memset (opix, 0, pixels);
for (i = 0, ipix = tex->data; i < tex->height;
i++, opix += 320, ipix += tex->width)

10
qw/source/cl_main.c
View file

@ -200,7 +200,7 @@ int host_framecount;
int host_hunklevel;
byte *vid_basepal;
byte *host_basepal;
byte *vid_colormap;
cvar_t *host_speeds;
@ -1776,14 +1776,14 @@ Host_Init (void)
Con_Printf ("%4.1f megabyte heap.\n", cl_mem_size->value);
vid_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!vid_basepal)
host_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!host_basepal)
Sys_Error ("Couldn't load gfx/palette.lmp");
vid_colormap = (byte *) COM_LoadHunkFile ("gfx/colormap.lmp");
if (!vid_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp");
VID_Init (vid_basepal);
VID_Init (host_basepal);
Draw_Init ();
SCR_Init ();
R_Init ();
@ -1845,7 +1845,7 @@ Host_Shutdown (void)
NET_Shutdown ();
S_Shutdown ();
IN_Shutdown ();
if (vid_basepal)
if (host_basepal)
VID_Shutdown ();
}

2
qw/source/cl_screen.c
View file

@ -171,7 +171,7 @@ CL_RSShot_f (void)
tex->height - 21);
pcx = EncodePCX (tex->data, tex->width, tex->height, tex->width,
vid_basepal, true, &pcx_len);
vid.palette, true, &pcx_len);
}
if (pcx) {
CL_StartUpload ((void *)pcx, pcx_len);

6
qw/source/cl_tent.c
View file

@ -427,9 +427,9 @@ CL_ParseTEnt (void)
dl->die = cl.time + 0.5;
dl->decay = 300;
colorStart = (colorStart + (rand() % colorLength)) * 3;
dl->color[0] = vid_basepal[colorStart] * (1.0 / 255.0);
dl->color[1] = vid_basepal[colorStart + 1] * (1.0 / 255.0);
dl->color[2] = vid_basepal[colorStart + 2] * (1.0 / 255.0);
dl->color[0] = vid.palette[colorStart] * (1.0 / 255.0);
dl->color[1] = vid.palette[colorStart + 1] * (1.0 / 255.0);
dl->color[2] = vid.palette[colorStart + 2] * (1.0 / 255.0);
break;
case TE_GUNSHOT: // bullet hitting wall

4
qw/source/skin.c
View file

@ -171,7 +171,7 @@ Skin_Cache (skin_t *skin)
return NULL;
}
}
tex = LoadPCX (file, 0, vid_basepal);
tex = LoadPCX (file, 0, vid.palette);
Qclose (file);
if (!tex || tex->width > 320 || tex->height > 200) {
@ -187,7 +187,7 @@ Skin_Cache (skin_t *skin)
opix = out->data;
out->width = 320;
out->height = 200;
out->palette = tex->palette; //FIXME assumes 0 or vid_basepal
out->palette = tex->palette; //FIXME assumes 0 or vid.palette
memset (opix, 0, pixels);
for (i = 0, ipix = tex->data; i < tex->height;
i++, opix += 320, ipix += tex->width)