From 4fca31049f4204bde5f40cf5c67263c121abaa90 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 7 Dec 2024 12:52:00 +0100 Subject: [PATCH] no need to set all that stuff manually --- src/hardware/hw_defs.h | 10 +++++----- src/hardware/hw_main.c | 25 ++++++++----------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 41d86c89c..91146f228 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -132,14 +132,14 @@ typedef struct { FLOAT x,y,z; // position #ifdef USE_FTRANSFORM_ANGLEZ - FLOAT anglex,angley,anglez; // aimingangle / viewangle - FLOAT anglex2,anglez2; // secondaries + FLOAT anglex, angley, anglez; // aimingangle / viewangle + FLOAT anglex2, anglez2; // secondaries #else - FLOAT anglex,angley; // aimingangle / viewangle + FLOAT anglex, angley; // aimingangle / viewangle FLOAT anglex2; // secondaries #endif - FLOAT scalex,scaley,scalez; - FLOAT spritexscale,spriteyscale; + FLOAT scalex, scaley, scalez; + FLOAT spritexscale, spriteyscale; FLOAT fovxangle, fovyangle; UINT8 splitscreen; boolean flip; // screenflip diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 204405ae3..5e24e6eae 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5065,7 +5065,7 @@ void HWR_BuildSkyDome(void) static boolean drewsky = false; -static void HWR_DrawSkyBackground(float fpov) +static void HWR_DrawSkyBackground(void) { FTransform dometransform; @@ -5074,25 +5074,17 @@ static void HWR_DrawSkyBackground(float fpov) HWD.pfnSetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); - memset(&dometransform, 0x00, sizeof(FTransform)); + memcpy(&dometransform, &atransform, sizeof(FTransform)); + + dometransform.x = 0.0; + dometransform.y = 0.0; + dometransform.z = 0.0; //04/01/2000: Hurdler: added for T&L // It should replace all other gl_viewxxx when finished HWR_SetTransformAiming(&dometransform); dometransform.angley = (float)((viewangle-ANGLE_270)>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); - dometransform.flip = atransform.flip; - dometransform.mirror = atransform.mirror; - dometransform.mirrorflip = atransform.mirrorflip; - - dometransform.scalex = 1; - dometransform.scaley = (float)vid.width/vid.height; - dometransform.scalez = 1; - dometransform.fovxangle = fpov; // Tails - dometransform.fovyangle = fpov; // Tails - HWR_RollTransform(&dometransform, viewroll); - dometransform.splitscreen = splitscreen; - HWR_GetTexture(texturetranslation[skytexture], false); if (gl_sky.texture != texturetranslation[skytexture]) @@ -5107,7 +5099,6 @@ static void HWR_DrawSkyBackground(float fpov) HWD.pfnRenderSkyDome(&gl_sky); } - // -----------------+ // HWR_ClearView : clear the viewwindow, with maximum z value. also clears stencil buffer. // -----------------+ @@ -5321,7 +5312,7 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl HWR_SkyWallList_Clear(); HWR_SetStencilState(HWR_STENCIL_NORMAL, 1); drewsky = false; - HWR_DrawSkyBackground(fpov); + HWR_DrawSkyBackground(); HWR_SetStencilState(HWR_STENCIL_NORMAL, 0); HWD.pfnClearBuffer(false, false, true, 0);// clear skywall markings from the stencil buffer HWR_SetTransform(fpov, player);// restore transform @@ -5386,7 +5377,7 @@ static void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox) ST_doPaletteStuff(); // Draw the sky background. - HWR_DrawSkyBackground(fpov); + HWR_DrawSkyBackground(); if (skybox) drewsky = true;