mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-30 07:41:56 +00:00
8d08bc4d86
make work properly: Win32 thing.. If you don't free textures explicitly, you can cause a problem with nVidia drivers. Colored lighting is now RGB instead of RGBA. The alpha is kinda pointless on a lightmap and the effect's not all that great. Plus people stuck with 16 bit OpenGL (any other 3dfx people out there?) will be quite pleased with the improvement in image quality. This does include LordHavoc's dynamic light optimization code which takes most of the pain out of having gl_flashblend off. All glColor*'s are now half of what they used to be, except where they aren't. If that doesn't make sense, don't worry. If you see one that's only half what you'd expect, don't worry---it probably is meant to be like that.. (More below) glDisable (GL_BLEND) is now a thing of the GL_PAST. As is GL_REPLACE. Instead, we _always_ use GL_MODULATE and leave GL_BLEND turned on. This seems at first like it might be a performance hit, but I swear it's much more expensive to change blending modes and texture functions 20-30 times every screen frame! Win32 issue.. Even though we check for multitexture, we currently don't use it. Reason is that I am planning to replace SGIS_multitexture with the preferred ARB_multitexture extension which is supported in most GL 1.1 implementations and is a requirement for GL 1.2 anyway. I also wanted to get rid of some duplicated code. Since Linux doesn't support multitexture yet, I just commented out the code keeping me from compiling to get it to work. Win32 should work without it until it's fixed, which shouldn't be long since the differences between SGIS and ARB multitextures as far as Quake is concerned is minimal AT BEST. LordHavoc and I have been working tirelessly (well not quite, we both did manage to sleep sometime during this ordeal) to fix the lighting in the GL renderers! It looks DAMNED CLOSE to software's lighting now, including the ability to overbright a color. You've gotta see this to know what I'm talking about. That's why the glColor*'s are halved in most places. The gamma table code and the general way it works is LordHavoc's design, but over the course of re-implementing it in QF we did come up with a few more small optimizations. A lot of people have noticed that QF's fps count has gone to shit lately. No promises that this undid whatever the problem was. That means there could be a huge optimization lurking somewhere in the shadows, waiting for us to fix it for a massive FPS boost. Even if there's not, the code in this commit DOUBLED MY FPS COUNT. Granted I was getting pathetic FPS as it was (around 30, which is pathetic even for a Voodoo3 in Linux) but still---60 is a big improvement over 30! Please be sure to "test" this code thuroughly.
208 lines
4.3 KiB
C
208 lines
4.3 KiB
C
/*
|
|
gl_view.c
|
|
|
|
player eye positioning
|
|
|
|
Copyright (C) 1996-1997 Id Software, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
|
|
Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA
|
|
|
|
$Id$
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
#include "bothdefs.h" // needed by: common.h, net.h, client.h
|
|
|
|
#include "bspfile.h" // needed by: glquake.h
|
|
#include "vid.h"
|
|
#include "sys.h"
|
|
#include "zone.h" // needed by: client.h, gl_model.h
|
|
#include "mathlib.h" // needed by: protocol.h, render.h, client.h,
|
|
// modelgen.h, glmodel.h
|
|
#include "wad.h"
|
|
#include "draw.h"
|
|
#include "cvar.h"
|
|
#include "net.h" // needed by: client.h
|
|
#include "protocol.h" // needed by: client.h
|
|
#include "cmd.h"
|
|
#include "sbar.h"
|
|
#include "render.h" // needed by: client.h, model.h, glquake.h
|
|
#include "client.h" // need cls in this file
|
|
#include "model.h" // needed by: glquake.h
|
|
#include "console.h"
|
|
#include "glquake.h"
|
|
|
|
extern byte *host_basepal;
|
|
extern double host_frametime;
|
|
extern int onground;
|
|
extern byte gammatable[256];
|
|
|
|
extern cvar_t *gl_cshiftpercent;
|
|
|
|
byte ramps[3][256];
|
|
float v_blend[4];
|
|
|
|
void V_CalcPowerupCshift (void);
|
|
qboolean V_CheckGamma (void);
|
|
|
|
/*
|
|
V_CalcBlend
|
|
|
|
LordHavoc made this a real, (messy,) true alpha blend. Cleaned it up
|
|
a bit, but otherwise this is his code. --KB
|
|
*/
|
|
void
|
|
V_CalcBlend (void)
|
|
{
|
|
float r, g, b, a, a2, a3;
|
|
int j;
|
|
|
|
r = 0;
|
|
g = 0;
|
|
b = 0;
|
|
a = 0;
|
|
|
|
for (j=0 ; j<NUM_CSHIFTS ; j++)
|
|
{
|
|
if (!gl_cshiftpercent->value)
|
|
continue;
|
|
|
|
a2 = ((cl.cshifts[j].percent * gl_cshiftpercent->value) / 100.0) / 255.0;
|
|
|
|
if (!a2)
|
|
continue;
|
|
|
|
a2 = min(a2, 1.0);
|
|
r += (cl.cshifts[j].destcolor[0]-r) * a2;
|
|
g += (cl.cshifts[j].destcolor[1]-g) * a2;
|
|
b += (cl.cshifts[j].destcolor[2]-b) * a2;
|
|
|
|
a3 = (1.0 - a) * (1.0 - a2);
|
|
a = 1.0 - a3;
|
|
}
|
|
|
|
if (a > 1.0)
|
|
{
|
|
a2 = 1.0 / a;
|
|
r *= a2;
|
|
g *= a2;
|
|
b *= a2;
|
|
a = 1.0;
|
|
}
|
|
|
|
v_blend[0] = min(r, 255.0)/255.0;
|
|
v_blend[1] = min(g, 255.0)/255.0;
|
|
v_blend[2] = min(b, 255.0)/255.0;
|
|
v_blend[3] = bound (0.0, a, 1.0);
|
|
}
|
|
|
|
/*
|
|
=============
|
|
V_UpdatePalette
|
|
=============
|
|
*/
|
|
|
|
void V_UpdatePalette (void)
|
|
{
|
|
int i, j;
|
|
qboolean new;
|
|
byte *basepal, *newpal;
|
|
byte pal[768];
|
|
float r,g,b,a;
|
|
int ir, ig, ib;
|
|
qboolean force;
|
|
|
|
V_CalcPowerupCshift ();
|
|
|
|
new = false;
|
|
|
|
for (i=0 ; i<NUM_CSHIFTS ; i++)
|
|
{
|
|
if (cl.cshifts[i].percent != cl.prev_cshifts[i].percent)
|
|
{
|
|
new = true;
|
|
cl.prev_cshifts[i].percent = cl.cshifts[i].percent;
|
|
}
|
|
for (j=0 ; j<3 ; j++)
|
|
if (cl.cshifts[i].destcolor[j] != cl.prev_cshifts[i].destcolor[j])
|
|
{
|
|
new = true;
|
|
cl.prev_cshifts[i].destcolor[j] = cl.cshifts[i].destcolor[j];
|
|
}
|
|
}
|
|
|
|
// drop the damage value
|
|
cl.cshifts[CSHIFT_DAMAGE].percent -= host_frametime*150;
|
|
if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
|
|
cl.cshifts[CSHIFT_DAMAGE].percent = 0;
|
|
|
|
// drop the bonus value
|
|
cl.cshifts[CSHIFT_BONUS].percent -= host_frametime*100;
|
|
if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
|
|
cl.cshifts[CSHIFT_BONUS].percent = 0;
|
|
|
|
force = V_CheckGamma ();
|
|
if (!new && !force)
|
|
return;
|
|
|
|
V_CalcBlend ();
|
|
|
|
//Con_Printf("b: %4.2f %4.2f %4.2f %4.6f\n", v_blend[0], v_blend[1], v_blend[2], v_blend[3]);
|
|
|
|
a = v_blend[3];
|
|
r = 255*v_blend[0]*a;
|
|
g = 255*v_blend[1]*a;
|
|
b = 255*v_blend[2]*a;
|
|
|
|
a = 1-a;
|
|
for (i=0 ; i<256 ; i++)
|
|
{
|
|
ir = min(i*a + r, 255);
|
|
ig = min(i*a + g, 255);
|
|
ib = min(i*a + b, 255);
|
|
|
|
ramps[0][i] = gammatable[ir];
|
|
ramps[1][i] = gammatable[ig];
|
|
ramps[2][i] = gammatable[ib];
|
|
}
|
|
|
|
basepal = host_basepal;
|
|
newpal = pal;
|
|
|
|
for (i=0 ; i<256 ; i++)
|
|
{
|
|
ir = basepal[0];
|
|
ig = basepal[1];
|
|
ib = basepal[2];
|
|
basepal += 3;
|
|
|
|
newpal[0] = ramps[0][ir];
|
|
newpal[1] = ramps[1][ig];
|
|
newpal[2] = ramps[2][ib];
|
|
newpal += 3;
|
|
}
|
|
|
|
VID_ShiftPalette (pal);
|
|
}
|
|
|