From af4c2fe391172646181bc2b6928766dba52404ea Mon Sep 17 00:00:00 2001
From: MonsterIestyn <iestynjealous@ntlworld.com>
Date: Wed, 28 Jan 2015 15:16:50 +0000
Subject: [PATCH] Some minor cleanup for OpenGL sprite/MD2 code
---
src/hardware/hw_main.c | 13 ++-----------
src/hardware/hw_md2.c | 13 +++++++------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index bc86c12957..ea0fb6bdba 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3658,7 +3658,7 @@ static void HWR_DrawSpriteShadow(gr_vissprite_t *spr, GLPatch_t *gpatch, float t
/*if (spr->mobj->frame & FF_TRANSMASK || spr->mobj->flags2 & MF2_SHADOW)
{
sector_t *sector = spr->mobj->subsector->sector;
- UINT8 lightlevel = sector->lightlevel;
+ UINT8 lightlevel = 255;
extracolormap_t *colormap = sector->extra_colormap;
if (sector->numlights)
@@ -3667,8 +3667,6 @@ static void HWR_DrawSpriteShadow(gr_vissprite_t *spr, GLPatch_t *gpatch, float t
if (!(spr->mobj->frame & FF_FULLBRIGHT))
lightlevel = *sector->lightlist[light].lightlevel;
- else
- lightlevel = 255;
if (sector->lightlist[light].extra_colormap)
colormap = sector->lightlist[light].extra_colormap;
@@ -3830,7 +3828,7 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
// colormap test
{
sector_t *sector = spr->mobj->subsector->sector;
- UINT8 lightlevel = sector->lightlevel;
+ UINT8 lightlevel = 255;
extracolormap_t *colormap = sector->extra_colormap;
if (sector->numlights)
@@ -3841,8 +3839,6 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
if (!(spr->mobj->frame & FF_FULLBRIGHT))
lightlevel = *sector->lightlist[light].lightlevel;
- else
- lightlevel = 255;
if (sector->lightlist[light].extra_colormap)
colormap = sector->lightlist[light].extra_colormap;
@@ -3851,16 +3847,11 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
{
if (!(spr->mobj->frame & FF_FULLBRIGHT))
lightlevel = sector->lightlevel;
- else
- lightlevel = 255;
if (sector->extra_colormap)
colormap = sector->extra_colormap;
}
- if (spr->mobj->frame & FF_FULLBRIGHT)
- lightlevel = 255;
-
if (colormap)
Surf.FlatColor.rgba = HWR_Lighting(lightlevel, colormap->rgba, colormap->fadergba, false, false);
else
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 6d2a1d4a37..de648f1b90 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1082,6 +1082,12 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
md2_t *md2;
UINT8 color[4];
+ if (!cv_grmd2.value)
+ return;
+
+ if (!spr->precip)
+ return;
+
// MD2 colormap fix
// colormap test
{
@@ -1116,8 +1122,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
Surf.FlatColor.rgba = HWR_Lighting(lightlevel, NORMALFOG, FADEFOG, false, false);
}
- // Look at HWR_ProjetctSprite for more
- if (cv_grmd2.value && ((md2_models[spr->mobj->sprite].scale > 0.0f) || (md2_playermodels[(skin_t*)spr->mobj->skin-skins].scale > 0.0f)) && !spr->precip)
+ // Look at HWR_ProjectSprite for more
{
GLPatch_t *gpatch;
INT32 *buff;
@@ -1134,15 +1139,11 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
//durs = tics;
if (spr->mobj->flags2 & MF2_SHADOW)
- {
Surf.FlatColor.s.alpha = 0x40;
- }
else if (spr->mobj->frame & FF_TRANSMASK)
HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
else
- {
Surf.FlatColor.s.alpha = 0xFF;
- }
// dont forget to enabled the depth test because we can't do this like
// before: polygons models are not sorted
--
GitLab