From b1d86f3abbc07ab22f84bd8239185fd6ba16ae3d Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 16 Jul 2025 21:52:18 +0200 Subject: [PATCH] cache those things --- src/d_main.c | 2 +- src/hardware/hw_main.cpp | 50 ++++++++++++++++++++++------------------ src/p_mobj.c | 4 +++- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 45d1145e6..38cb88045 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1537,7 +1537,7 @@ static void D_CheckSaturnExtraFiles(void) } // extra round joystick inputdisplay sprites - if (W_CheckMultipleLumps("JOYBCK","JOYKNB","JOYSHD", NULL)) + if (W_CheckMultipleLumps("JOYBCK", "JOYKNB", "JOYSHD", NULL)) { joystickicon = true; PUSHCONS(inputdisplay_cons_temp, last_inputdisplay_i, 3, "StickGFX"); diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 494d7438d..9668b9223 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -790,7 +790,8 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool for (i = 0; i < subsector->numlines; i++, line++) { - if (line->linedef->special != HORIZONSPECIAL) + // this check sucks and is a hotspot lel + if (LIKELY(line->linedef->special != HORIZONSPECIAL)) continue; if (R_PointOnSegSide(viewx, viewy, line) != 0) @@ -806,8 +807,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool } else { - x1 = FixedToFloat(line->v1->x); - y1 = FixedToFloat(line->v1->x); + x1 = y1 = FixedToFloat(line->v1->x); } if (line->pv2) @@ -3936,11 +3936,13 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) INT32 shader = SHADER_NONE; - if (!spr->mobj || !spr->mobj->subsector) + const mobj_t *sprmo = spr->mobj; + + if (UNLIKELY(!sprmo || !sprmo->subsector)) return; - const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE); - const sector_t *sector = spr->mobj->subsector->sector; + const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE); + const sector_t *sector = sprmo->subsector->sector; if (sector->numlights) { @@ -4006,9 +4008,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) // Draw shadow BEFORE sprite if (UNLIKELY(cv_shadow.value // Shadows enabled - && (spr->mobj->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow. - && !(spr->mobj->flags2 & MF2_DEBRIS) // Debris have no corona or shadow. - && (spr->mobj->z >= spr->mobj->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground. + && (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow. + && !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow. + && (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground. { //////////////////// // SHADOW SPRITE! // @@ -4038,24 +4040,24 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !fullbright); INT32 blendmode; - if (spr->mobj->frame & FF_BLENDMASK) - blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + if (sprmo->frame & FF_BLENDMASK) + blendmode = ((sprmo->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; else - blendmode = spr->mobj->blendmode; + blendmode = sprmo->blendmode; if (UNLIKELY(!cv_translucency.value)) // translucency disabled { Surf.PolyColor.s.alpha = 0xFF; blend = PF_Translucent|PF_Occlude; } - else if (spr->mobj->flags2 & MF2_SHADOW) + else if (sprmo->flags2 & MF2_SHADOW) { Surf.PolyColor.s.alpha = 0x40; blend = HWR_GetBlendModeFlag(blendmode); } - else if (spr->mobj->frame & FF_TRANSMASK) + else if (sprmo->frame & FF_TRANSMASK) { - INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; + INT32 trans = (sprmo->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; blend = HWR_SurfaceBlend(blendmode, trans, &Surf); } else @@ -4068,7 +4070,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } - if (cv_playerfade.value && spr->mobj->player) + if (cv_playerfade.value && sprmo->player) Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha); if (HWR_UseShader()) @@ -4091,7 +4093,9 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) INT32 shader = SHADER_NONE; - if (!spr->mobj || !spr->mobj->subsector) + const mobj_t *sprmo = spr->mobj; + + if (UNLIKELY(!sprmo || !sprmo->subsector)) return; // cache sprite graphics @@ -4129,7 +4133,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) wallVerts[0].t = wallVerts[1].t = hwrpatch->max_t; // colormap test - sector_t *sector = spr->mobj->subsector->sector; + sector_t *sector = sprmo->subsector->sector; UINT8 lightlevel = 255; extracolormap_t *colormap = sector->extra_colormap; @@ -4137,9 +4141,9 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) { INT32 light; - light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before + light = R_GetPlaneLight(sector, sprmo->z + sprmo->height, false); // Always use the light at the top instead of whatever I was doing before - if (!(spr->mobj->frame & FF_FULLBRIGHT)) + if (!(sprmo->frame & FF_FULLBRIGHT)) lightlevel = static_cast(CLAMP(*sector->lightlist[light].lightlevel, 0, 255)); if (sector->lightlist[light].extra_colormap) @@ -4147,7 +4151,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) } else { - if (!(spr->mobj->frame & FF_FULLBRIGHT)) + if (!(sprmo->frame & FF_FULLBRIGHT)) lightlevel = static_cast(CLAMP(sector->lightlevel, 0, 255)); if (sector->extra_colormap) @@ -4156,9 +4160,9 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector)); - if (spr->mobj->frame & FF_TRANSMASK) + if (sprmo->frame & FF_TRANSMASK) { - INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; + INT32 trans = (sprmo->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; blend = HWR_SurfaceBlend(AST_TRANSLUCENT, trans, &Surf); } else diff --git a/src/p_mobj.c b/src/p_mobj.c index b4851d0de..f66c9438e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9067,8 +9067,10 @@ void P_MobjThinker(mobj_t *mobj) tmfloorthing = tmhitthing = NULL; + const sector_t *sec1 = mobj->subsector ? mobj->subsector->sector : NULL; + // 970 allows ANY mobj to trigger a linedef exec - if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8) + if (sec1 && GETSECSPECIAL(sec1->special, 2) == 8) { sector_t *sec2;