handle ogl lightlevelpost similar to rr

now that we have everything for it
This commit is contained in:
Alug committed 2025-02-04 23:00:44 +01:00
1 parent 6ed7e26d86
commit f9ccacf118
2 files changed
+84 -67

No files matched your search

+75 -64
View File
@@ -322,61 +322,74 @@ static void HWR_SetShaderState(void)
GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0);
}
static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel)
{
if (R_ThingIsFullBright(thing))
*lightlevel = 255;
else if (R_ThingIsFullDark(thing))
*lightlevel = 0;
else if (thing->frame & FF_ABSOLUTELIGHTLEVEL)
*lightlevel = R_ThingLightLevel(thing);
else
return false;
return true;
}
void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 *lightlevel, boolean model, const boolean papersprite)
{
const boolean semibright = R_ThingIsSemiBright(spr->mobj);
(void)papersprite;
if (spr->mobj->frame & FF_ABSOLUTELIGHTLEVEL)
*lightlevel += R_ThingLightLevel(spr->mobj);
if (maplighting.directional == true && P_SectorUsesDirectionalLighting(sector))
{
*lightlevel = R_ThingLightLevel(spr->mobj);
return;
}
else
{
*lightlevel += R_ThingLightLevel(spr->mobj);
if (model == false) // this is implemented by shader
{
fixed_t extralight = R_GetSpriteDirectionalLighting(R_PointToAngle(spr->mobj->x, spr->mobj->y));
// this seems to be wrong???
/*fixed_t extralight = R_GetSpriteDirectionalLighting(
papersprite
? R_PointToAngle(spr->mobj->x, spr->mobj->y) + (spr->flip ? -ANGLE_90 : ANGLE_90)
: R_PointToAngle(spr->mobj->x, spr->mobj->y) // fixme
);*/
// Less change in contrast in dark sectors
extralight = FixedMul(extralight, min(max(0, *lightlevel), 255) * FRACUNIT / 255);
// NO NO BAD! WHY!?
/*if (papersprite)
{
// Papersprite contrast should match walls
*lightlevel += FixedFloor(extralight + (FRACUNIT / 2)) / FRACUNIT;
}
else*/
{
// simple OGL approximation
fixed_t tr = R_PointToDist(spr->mobj->x, spr->mobj->y);
fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
// Less change in contrast at further distances, to counteract DOOM diminished light
fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
extralight = FixedMul(extralight, min(n, FRACUNIT));
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
*lightlevel += FixedFloor((extralight * 2) + (FRACUNIT / 2)) / FRACUNIT;
}
}
// Semibright objects will be made slightly brighter to compensate contrast
if (semibright)
{
*lightlevel += 16;
}
}
if (maplighting.directional == false || !P_SectorUsesDirectionalLighting(sector) || model == true)
return;
fixed_t extralight = R_GetSpriteDirectionalLighting(R_PointToAngle(spr->mobj->x, spr->mobj->y));
// this seems to be wrong???
/*fixed_t extralight = R_GetSpriteDirectionalLighting(
papersprite
? R_PointToAngle(spr->mobj->x, spr->mobj->y) + (spr->flip ? -ANGLE_90 : ANGLE_90)
: R_PointToAngle(spr->mobj->x, spr->mobj->y) // fixme
);*/
// Less change in contrast in dark sectors
extralight = FixedMul(extralight, min(max(0, *lightlevel), 255) * FRACUNIT / 255);
// NO NO BAD! WHY!?
/*if (papersprite)
{
// Papersprite contrast should match walls
*lightlevel += FixedFloor(extralight + (FRACUNIT / 2)) / FRACUNIT;
}
else*/
{
// simple OGL approximation
fixed_t tr = R_PointToDist(spr->mobj->x, spr->mobj->y);
fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
// Less change in contrast at further distances, to counteract DOOM diminished light
fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
extralight = FixedMul(extralight, min(n, FRACUNIT));
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
*lightlevel += FixedFloor((extralight * 2) + (FRACUNIT / 2)) / FRACUNIT;
}
// Semibright objects will be made slightly brighter to compensate contrast
if (semibright)
{
*lightlevel += 16;
*lightlevel = 128 + (*lightlevel >> 1);
}
}
@@ -875,9 +888,9 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
}
#endif
FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
FBITFIELD HWR_GetBlendModeFlag(INT32 style)
{
switch (ast)
switch (style)
{
case AST_TRANSLUCENT:
return PF_Translucent;
@@ -892,8 +905,6 @@ FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
default:
return PF_Masked;
}
return 0;
}
UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
@@ -3543,6 +3554,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
FSurfaceInfo Surf;
extracolormap_t *colormap;
INT32 lightlevel;
boolean lightset = true;
FBITFIELD blend = 0;
UINT8 alpha;
@@ -3678,10 +3690,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
i = 0;
temp = FLOAT_TO_FIXED(realtop);
if (R_ThingIsFullBright(spr->mobj))
lightlevel = 255;
else if (R_ThingIsFullDark(spr->mobj))
lightlevel = 0;
lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel);
for (i = 1; i < sector->numlights; i++)
{
@@ -3689,13 +3698,14 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
if (!(h <= temp))
continue;
if (!(spr->mobj->frame & FF_FULLBRIGHT))
if (!lightset)
lightlevel = min(*list[i-1].lightlevel, 255);
colormap = list[i-1].extra_colormap;
break;
}
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
if (!lightset)
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
for (i = 0; i < sector->numlights; i++)
{
@@ -3705,9 +3715,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
// even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite
if (!(list[i].flags & FF_NOSHADE) && (list[i].flags & FF_CUTSPRITES))
{
if (!(spr->mobj->frame & FF_FULLBRIGHT))
if (!lightset)
{
lightlevel = min(*list[i].lightlevel, 255);
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
}
colormap = list[i].extra_colormap;
}
@@ -3902,18 +3915,15 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// colormap test
sector_t *sector = spr->mobj->subsector->sector;
INT32 lightlevel = 255;
boolean lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel);
extracolormap_t *colormap = sector->extra_colormap;
const boolean fullbright = R_ThingIsFullBright(spr->mobj);
if (R_ThingIsFullDark(spr->mobj))
lightlevel = 0;
else if (!fullbright)
if (!lightset)
lightlevel = min(sector->lightlevel, 255);
if (R_ThingIsSemiBright(spr->mobj))
lightlevel = 128 + (lightlevel>>1);
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
if (!lightset)
HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false, papersprite);
HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !fullbright);
@@ -4586,6 +4596,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
return;
const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
INT32 blendmode;
if (thing->frame & FF_BLENDMASK)
blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+9 -3
View File
@@ -1587,19 +1587,22 @@ void GL_SetBlend(FBITFIELD PolyFlags)
}
else
#endif
// mix texture colour with Surface->PolyColor
if (PolyFlags & PF_Modulated)
{ // mix texture colour with Surface->PolyColor
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
// colour from texture is unchanged before blending
}
else
{ // colour from texture is unchanged before blending
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
}
}
if (Xor & PF_Occlude) // depth test but (no) depth write
{
if (PolyFlags&PF_Occlude)
{
pglDepthMask(1);
}
else
pglDepthMask(0);
}
@@ -1617,9 +1620,12 @@ void GL_SetBlend(FBITFIELD PolyFlags)
}
}
if (PolyFlags & PF_NoTexture)
{
GL_SetNoTexture();
}
}
CurrentPolyFlags = PolyFlags;
}
static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)