thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ark-arrow-model-lighting' into 'master'

Browse source 
Disable directional lighting on Ark Arrow models

Closes #1061

See merge request KartKrew/Kart!2059
This commit is contained in:
Oni 2024-03-10 14:22:59 +00:00
commit 0a5b476a9f
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/hw_md2.c
View file

@ -1362,7 +1362,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
if (!lightset)
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, true);
HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !R_ThingIsFullBright(spr->mobj));
HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !R_ThingIsFullBright(spr->mobj) && R_ThingModelUsesDirectionalLighting(spr->mobj));
}
else
Surf.PolyColor.rgba = 0xFFFFFFFF;

9
src/r_things.cpp
View file

@ -3871,6 +3871,15 @@ boolean R_ThingIsFullDark(mobj_t *thing)
return ((thing->frame & FF_BRIGHTMASK) == FF_FULLDARK);
}
boolean R_ThingModelUsesDirectionalLighting(mobj_t *thing)
{
if (thing->type == MT_ARKARROW)
{
return false;
}
return true;
}
//
// R_DrawMasked
//

1
src/r_things.h
View file

@ -91,6 +91,7 @@ boolean R_ThingIsFloorSprite (mobj_t *thing);
boolean R_ThingIsFullBright (mobj_t *thing);
boolean R_ThingIsSemiBright (mobj_t *thing);
boolean R_ThingIsFullDark (mobj_t *thing);
boolean R_ThingModelUsesDirectionalLighting(mobj_t *thing);
boolean R_ThingIsFlashing(mobj_t *thing);