From 0b7c67de2de1394653edc9c6bcb8ca97f006b8ad Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 6 May 2026 12:25:38 +0200 Subject: [PATCH] some code style cleanups --- src/d_main.c | 8 ++++---- src/hardware/hw_clip.c | 11 +++++----- src/hardware/hw_draw.c | 40 ++++++++++++++++++++----------------- src/hardware/hw_main.cpp | 43 ++++++++++++++++++++-------------------- src/p_map.c | 28 +++++++++++++++----------- src/p_mobj.c | 24 ++++++++++++++-------- 6 files changed, 85 insertions(+), 69 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 7d802b50b..86b9e1182 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -851,15 +851,15 @@ void D_SRB2Loop(void) precise_t elapsed; precise_t enterprecise, finishprecise; + boolean ranwipe = false; + + enterprecise = I_GetPreciseTime(); + if (I_Interrupted()) { I_Quit(); } - enterprecise = I_GetPreciseTime(); - - boolean ranwipe = false; - memset(&g_dc, 0, sizeof(g_dc)); Z_Frame_Reset(); diff --git a/src/hardware/hw_clip.c b/src/hardware/hw_clip.c index 6790823f2..68bbc98e3 100644 --- a/src/hardware/hw_clip.c +++ b/src/hardware/hw_clip.c @@ -319,16 +319,17 @@ angle_t gld_FrustumAngle(angle_t tiltangle) double clipfov; double floatangle; angle_t a1; - - float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1); - - if (tilt > 90.0f) - tilt = 90.0f; + float tilt; // If the pitch is larger than this you can look all around at a FOV of 90 if (abs((signed)tiltangle) > 46 * ANG1) return 0xffffffff; + tilt = fabsf(((float)(int)tiltangle) / (float)ANG1); + + if (tilt > 90.0f) + tilt = 90.0f; + // ok, this is a gross hack that barely works... // but at least it doesn't overestimate too much... clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI; diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 3f1e5340c..56184dfee 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -32,20 +32,6 @@ #include -typedef struct -{ - UINT8 id_field_length ; // 1 - UINT8 color_map_type ; // 2 - UINT8 image_type ; // 3 - UINT8 dummy[5] ; // 4, 8 - INT16 x_origin ; // 9, 10 - INT16 y_origin ; //11, 12 - INT16 width ; //13, 14 - INT16 height ; //15, 16 - UINT8 image_pix_size ; //17 - UINT8 image_descriptor; //18 -} ATTRPACK TGAHeader; // sizeof is 18 - static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255}; static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255}; static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127}; @@ -57,8 +43,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p { FOutVector v[4]; FBITFIELD flags; - float cx = FIXED_TO_FLOAT(x); - float cy = FIXED_TO_FLOAT(y); + float cx, cy; UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT); GLPatch_t *hwrPatch; @@ -72,6 +57,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p if (alphalevel >= 10 && alphalevel < 13) return; + cx = FIXED_TO_FLOAT(x); + cy = FIXED_TO_FLOAT(y); + const float fvw = (float)vid.width; const float fvh = (float)vid.height; @@ -244,8 +232,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, { FOutVector v[4]; FBITFIELD flags; - float cx = FIXED_TO_FLOAT(x); - float cy = FIXED_TO_FLOAT(y); + float cx, cy; UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); GLPatch_t *hwrPatch; @@ -258,6 +245,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, if (alphalevel >= 10 && alphalevel < 13) return; + cx = FIXED_TO_FLOAT(x); + cy = FIXED_TO_FLOAT(y); + const float fvw = (float)vid.width; const float fvh = (float)vid.height; @@ -968,6 +958,20 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color) #endif #ifndef USE_PNG +typedef struct +{ + UINT8 id_field_length ; // 1 + UINT8 color_map_type ; // 2 + UINT8 image_type ; // 3 + UINT8 dummy[5] ; // 4, 8 + INT16 x_origin ; // 9, 10 + INT16 y_origin ; //11, 12 + INT16 width ; //13, 14 + INT16 height ; //15, 16 + UINT8 image_pix_size ; //17 + UINT8 image_descriptor; //18 +} ATTRPACK TGAHeader; // sizeof is 18 + // -------------------------------------------------------------------------- // save screenshots with TGA format // -------------------------------------------------------------------------- diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 47f0bcdec..57f64e9c0 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -522,7 +522,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo { INT16 finallight = lightnum; - if (cv_glfakecontrast.value == 0 || (HWR_ShouldUsePaletteRendering() && colormap)) + if (cv_glfakecontrast.value == 0 || (colormap && HWR_ShouldUsePaletteRendering())) return (FUINT)finallight; if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector)) @@ -3637,7 +3637,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) { const fixed_t h = P_GetLightZAt(§or->lightlist[i], sprmo->x, sprmo->y); - if (!(h <= temp)) + if (h > temp) continue; if (!lightset) @@ -3772,7 +3772,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) mobj_t *sprmo = spr->mobj; - if (UNLIKELY(!sprmo->subsector)) + if (!sprmo->subsector) return; const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE); @@ -3936,7 +3936,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) const precipmobj_t *sprmo = spr->precip; - if (UNLIKELY(!sprmo->subsector)) + if (!sprmo->subsector) return; // cache sprite graphics @@ -4136,22 +4136,23 @@ static std::vector drawnodes; static void *HWR_CreateDrawNode(gl_drawnode_type_t type) { - // if we didnt alloc anything yet, reserve atleast 64 nodes - // dont declare with it as we want our size to be 0! + gl_drawnode_t *drawnode; drawnodes.reserve(DRAWNODES_INIT_SIZE); drawnodes.emplace_back(); - drawnodes.back().type = type; + + drawnode = &drawnodes.back(); + drawnode->type = type; // not sure if returning different pointers to a union is necessary switch (type) { case DRAWNODE_PLANE: - return &drawnodes.back().u.plane; + return &drawnode->u.plane; case DRAWNODE_POLYOBJECT_PLANE: - return &drawnodes.back().u.polyplane; + return &drawnode->u.polyplane; case DRAWNODE_WALL: - return &drawnodes.back().u.wall; + return &drawnode->u.wall; } return NULL; @@ -4653,11 +4654,9 @@ static void HWR_ProjectSprite(mobj_t *thing) ) { ang = R_PointToAngle(interp.x, interp.y); - #ifdef ROTSPRITE camang = ang; #endif - ang -= interp.angle; if (mirrored) @@ -4788,11 +4787,11 @@ static void HWR_ProjectSprite(mobj_t *thing) // if the sprite is out of our view, dont need to draw it X) if (!gld_SphereInFrustum( (FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f, - FixedToFloat(interp.z) + (y1 + y2) / 2.0f, - FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, - //1.5 == sqrt(2) + small delta for MF_FOREGROUND - std::max(FixedToFloat(spr_width) * spritexscale, - FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f)) + FixedToFloat(interp.z) + (y1 + y2) / 2.0f, + FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, + //1.5 == sqrt(2) + small delta for MF_FOREGROUND + std::max(FixedToFloat(spr_width) * spritexscale, + FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f)) { return; } @@ -5008,11 +5007,11 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) if (!gld_SphereInFrustum( (FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f, - FixedToFloat(interp.z) + (y1 + y2) / 2.0f, - FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, - //1.5 == sqrt(2) + small delta for MF_FOREGROUND - std::max(FixedToFloat(spr_width) * thing_scale, - FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f)) + FixedToFloat(interp.z) + (y1 + y2) / 2.0f, + FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, + //1.5 == sqrt(2) + small delta for MF_FOREGROUND + std::max(FixedToFloat(spr_width) * thing_scale, + FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f)) { return; } diff --git a/src/p_map.c b/src/p_map.c index a5e503062..388d230f7 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -321,7 +321,7 @@ static boolean PIT_CheckThing(mobj_t *thing) // Ignore spectators if ((tmthing->player && tmthing->player->spectator) - || (thing->player && thing->player->spectator)) + || (thing->player && thing->player->spectator)) return true; #ifdef SEENAMES @@ -1509,14 +1509,14 @@ static boolean PIT_CheckThing(mobj_t *thing) // Adjusts tmfloorz and tmceilingz as lines are contacted - FOR CAMERA ONLY static boolean PIT_CheckCameraLine(line_t *ld) { - if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) + if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) return true; - if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) - { + if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) return true; - } if (P_BoxOnLineSide(tmbbox, ld) != -1) return true; @@ -1571,11 +1571,13 @@ static boolean PIT_CheckCameraLine(line_t *ld) // static boolean PIT_CheckLine(line_t *ld) { - if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) + if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) return true; - if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) + if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) return true; if (P_BoxOnLineSide(tmbbox, ld) != -1) @@ -1584,10 +1586,12 @@ static boolean PIT_CheckLine(line_t *ld) if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag. { fixed_t cosradius, sinradius; + cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT)); sinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT)); + if (P_PointOnLineSide(tmx - cosradius, tmy - sinradius, ld) - == P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld)) + == P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld)) return true; // the line doesn't cross between collider's start or end } @@ -4002,10 +4006,10 @@ static inline boolean PIT_GetSectors(line_t *ld) tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) return true; - if (P_BoxOnLineSide(tmbbox, ld) != -1) + if (ld->polyobj) // line belongs to a polyobject, don't add it return true; - if (ld->polyobj) // line belongs to a polyobject, don't add it + if (P_BoxOnLineSide(tmbbox, ld) != -1) return true; // This line crosses through the object. diff --git a/src/p_mobj.c b/src/p_mobj.c index 599a9a566..78a09d594 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -620,8 +620,10 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t fixed_t highline; ld = boundsec->lines[i]; - if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) + if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) continue; if (P_BoxOnLineSide(bbox, ld) != -1) @@ -713,8 +715,10 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed fixed_t highline; ld = boundsec->lines[i]; - if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) + if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) continue; if (P_BoxOnLineSide(bbox, ld) != -1) @@ -801,8 +805,10 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix fixed_t highline; ld = boundsec->lines[i]; - if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) + if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) continue; if (P_BoxOnLineSide(bbox, ld) != -1) @@ -888,8 +894,10 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f fixed_t highline; ld = boundsec->lines[i]; - if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] - || bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) + if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || + bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || + bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || + bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) continue; if (P_BoxOnLineSide(bbox, ld) != -1)