TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Disabled shading of flat (non-textured) polygons. Fixes laser and plasma lighting bug, hopefully doesn't break anything else.

Browse source
This commit is contained in:
Bradley Bell 2005-03-16 01:56:24 +00:00
parent 1c6ee209de
commit 88ab8d3495
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
3d/interp.c
View file

@ -1,4 +1,4 @@
/* $Id: interp.c,v 1.16 2004-12-20 09:25:44 btb Exp $ */
/* $Id: interp.c,v 1.17 2005-03-16 01:56:24 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -23,7 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#ifdef RCS
static char rcsid[] = "$Id: interp.c,v 1.16 2004-12-20 09:25:44 btb Exp $";
static char rcsid[] = "$Id: interp.c,v 1.17 2005-03-16 01:56:24 btb Exp $";
#endif
#include <stdlib.h>
@ -360,13 +360,18 @@ bool g3_draw_polygon_model(void *model_ptr,grs_bitmap **model_bitmaps,vms_angvec
Assert( nv < MAX_POINTS_PER_POLY );
if (g3_check_normal_facing(vp(p+4),vp(p+16)) > 0) {
int i;
#ifdef FADE_FLATPOLY
short c;
unsigned char cc;
int l;
#endif
// DPH: Now we treat this color as 15bpp
// gr_setcolor(w(p+28));
#ifndef FADE_FLATPOLY
gr_setcolor(gr_find_closest_color_15bpp(w(p + 28)));
#else
//l = (32 * model_light) >> 16;
l = f2i(fixmul(i2f(32), model_light));
if (l<0) l = 0;
@ -374,6 +379,7 @@ bool g3_draw_polygon_model(void *model_ptr,grs_bitmap **model_bitmaps,vms_angvec
cc = gr_find_closest_color_15bpp(w(p+28));
c = gr_fade_table[(l<<8)|cc];
gr_setcolor(c);
#endif
for (i=0;i<nv;i++)
point_list[i] = Interp_point_list + wp(p+30)[i];

4
ChangeLog
View file

@ -1,5 +1,9 @@
2005-03-15 Bradley Bell <btb@icculus.org>
* 3d/interp.c: Disabled shading of flat (non-textured) polygons.
Fixes laser and plasma lighting bug, hopefully doesn't break
anything else.
* main/state.c: Fix crash if Num_walls=0
2005-03-12 Bradley Bell <btb@icculus.org>