yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

soft: fix lightmap mask

Browse source
This commit is contained in:
Denis Pauk 2022-03-22 08:37:57 +02:00
parent c20c47b06f
commit 3b825670ba
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/refresh/soft/header/local.h
View file

@ -93,6 +93,9 @@ typedef enum
rserr_unknown
} rserr_t;
/* 64 light grades available */
#define LIGHTMASK 0x3F00
extern viddef_t vid;
extern pixel_t *vid_buffer; // invisible buffer
extern pixel_t *vid_colormap; // 256 * VID_GRADES size

10
src/client/refresh/soft/sw_image.c
View file

@ -332,6 +332,8 @@ static byte *d_16to8table = NULL; // 16 to 8 bit conversion table
/*
* Apply color light to texture pixel
*
* vid_colormap[pix + ( llight & 0xFF00 )];
*
* TODO: -22% fps lost
*/
pixel_t
@ -341,7 +343,7 @@ R_ApplyLight(pixel_t pix, const light3_t light)
int i_c;
/* full light, code could skip light processing */
if (((light[0] | light[1] | light[2]) & 0xFF00) <= vid_lightthreshold)
if (((light[0] | light[1] | light[2]) & LIGHTMASK) <= vid_lightthreshold)
return pix;
/* get color component for each component */
@ -350,9 +352,9 @@ R_ApplyLight(pixel_t pix, const light3_t light)
b_b = d_8to24table[pix * 4 + 2];
/* scale by light */
b_r = vid_lightmap[(light[0] & 0xFF00) + b_r];
b_g = vid_lightmap[(light[1] & 0xFF00) + b_g];
b_b = vid_lightmap[(light[2] & 0xFF00) + b_b];
b_r = vid_lightmap[(light[0] & LIGHTMASK) + b_r];
b_g = vid_lightmap[(light[1] & LIGHTMASK) + b_g];
b_b = vid_lightmap[(light[2] & LIGHTMASK) + b_b];
/* convert back to indexed color */
b_r = ( b_r >> 3 ) & 31;

4
src/client/refresh/soft/sw_surf.c
View file

@ -72,12 +72,12 @@ R_SameLight(size_t size, const light3_t lightstep, const light3_t light)
{
int i;
if (((light[0] | light[1] | light[2]) & 0xFF00) > vid_lightthreshold)
if (((light[0] | light[1] | light[2]) & LIGHTMASK) > vid_lightthreshold)
return false;
for (i=0; i<3; i++)
{
if (((size * lightstep[i] + light[i]) & 0xFF00) > vid_lightthreshold)
if (((size * lightstep[i] + light[i]) & LIGHTMASK) > vid_lightthreshold)
return false;
}
return true;