qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

No colored lights in software - sorry, 256 colors isn't enough. It does

Browse source 
look sane now however.  Other projects which wish to keep the ability
to render in software better check out the changes - you won't find them
in a tutorial.  ;>
This commit is contained in:
Joseph Carter 2000-03-09 12:28:44 +00:00
parent 9ffc3e44df
commit 70b443f25f
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common/r_surf.c
View file

@ -1,4 +1,5 @@
/* /*
r_surf.c - surface-related refresh code
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors
@ -19,10 +20,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// r_surf.c: surface-related refresh code
#include "quakedef.h" #include <quakedef.h>
#include "r_local.h" #include <r_local.h>
#include <mathlib.h> #include <mathlib.h>
#include <cvars.h> #include <cvars.h>
#include <sys.h> #include <sys.h>
@ -66,13 +66,13 @@ R_AddDynamicLights
void R_AddDynamicLights (void) void R_AddDynamicLights (void)
{ {
msurface_t *surf; msurface_t *surf;
int lnum; int lnum;
int sd, td; int sd, td;
float dist, rad, minlight; float dist, rad, minlight;
vec3_t impact, local; vec3_t impact, local;
int s, t; int s, t;
int i; int i;
int smax, tmax; int smax, tmax;
mtexinfo_t *tex; mtexinfo_t *tex;
surf = r_drawsurf.surf; surf = r_drawsurf.surf;
@ -86,8 +86,8 @@ void R_AddDynamicLights (void)
continue; // not lit by this light continue; // not lit by this light
rad = cl_dlights[lnum].radius; rad = cl_dlights[lnum].radius;
dist = DotProduct (cl_dlights[lnum].origin, surf->plane->normal) - dist = DotProduct (cl_dlights[lnum].origin,
surf->plane->dist; surf->plane->normal) - surf->plane->dist;
rad -= fabs(dist); rad -= fabs(dist);
minlight = cl_dlights[lnum].minlight; minlight = cl_dlights[lnum].minlight;
if (rad < minlight) if (rad < minlight)
@ -155,7 +155,7 @@ void R_BuildLightMap (void)
{ {
int smax, tmax; int smax, tmax;
int t; int t;
int i, size; int i, j, size;
byte *lightmap; byte *lightmap;
unsigned scale; unsigned scale;
int maps; int maps;
@ -182,12 +182,22 @@ void R_BuildLightMap (void)
// add all the lightmaps // add all the lightmaps
if (lightmap) if (lightmap)
for (maps = 0 ; maps < MAXLIGHTMAPS && surf->styles[maps] != 255 ; for (maps = 0;
maps++) (maps < MAXLIGHTMAPS) && (surf->styles[maps] != 255);
maps++)
{ {
scale = r_drawsurf.lightadj[maps]; // 8.8 fraction scale = r_drawsurf.lightadj[maps]; // 8.8 fraction
for (i=0 ; i<size ; i++) for (i=0 ; i<size ; i++)
blocklights[i] += lightmap[i] * scale; if (bspver == CBSPVERSION)
{
// no color, so we'll just add the
// color values together
for (j=0 ; j<3 ; j++)
blocklights[i] +=
lightmap[j] * scale;
} else {
blocklights[i] += lightmap[i] * scale;
}
lightmap += size; // skip to next lightmap lightmap += size; // skip to next lightmap
} }