From 262a84aac6478f81cbee5720bfef7dd00cd5f151 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 13 Oct 2024 02:28:07 +0200 Subject: [PATCH] fix ogl shearing no clue wtf kart was doing here lmao --- src/hardware/hw_defs.h | 2 +- src/hardware/hw_main.c | 42 ++++++++++++++++++-------------- src/hardware/r_opengl/r_opengl.c | 2 +- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 7d2d17532..dc8d44ca8 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -156,7 +156,7 @@ typedef struct boolean mirrorflip; // Encore Mode with Flipcam #endif boolean shearing; // 14042019 - angle_t viewaiming; // 17052019 + float viewaiming; // 17052019 } FTransform; // Transformed vector, as passed to HWR API diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index db9846c07..5d243d4c3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -309,9 +309,10 @@ FTransform atransform; // Float variants of viewx, viewy, viewz, etc. static float gr_viewx, gr_viewy, gr_viewz; float gr_viewsin, gr_viewcos; +static float gr_viewludsin, gr_viewludcos; static angle_t gr_aimingangle; -static float gr_viewludsin, gr_viewludcos; +static void HWR_SetTransformAiming(FTransform *trans); // ========================================================================== // Visual portals (attr. Hannu Hanhi) @@ -5130,15 +5131,12 @@ void HWR_DrawSkyBackground(float fpov) //04/01/2000: Hurdler: added for T&L // It should replace all other gr_viewxxx when finished - if (!atransform.shearing) - dometransform.anglex = (float)(aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); + 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.shearing = atransform.shearing; - dometransform.viewaiming = atransform.viewaiming; dometransform.scalex = 1; dometransform.scaley = (float)vid.width/vid.height; @@ -5199,6 +5197,25 @@ void HWR_SetViewSize(void) HWD.pfnFlushScreenTextures(); } +// Set view aiming, for the sky dome, the skybox, +// and the normal view, all with a single function. +static void HWR_SetTransformAiming(FTransform *trans) +{ + if (cv_grshearing.value) + { + fixed_t fixedaiming = AIMINGTODY(aimingangle); + trans->viewaiming = FIXED_TO_FLOAT(fixedaiming); + trans->shearing = true; + gr_aimingangle = 0; + } + else + { + trans->shearing = false; + gr_aimingangle = aimingangle; + } + trans->anglex = (float)(gr_aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); +} + void HWR_SetTransform(float fpov, player_t *player) { postimg_t *postprocessor = &postimgtype[0]; @@ -5221,23 +5238,12 @@ void HWR_SetTransform(float fpov, player_t *player) atransform.scaley = (float)vid.width/vid.height; atransform.scalez = 1; - // 14042019 - gr_aimingangle = aimingangle; - atransform.shearing = false; - atransform.viewaiming = aimingangle; - - if (cv_grshearing.value) - { - gr_aimingangle = 0; - atransform.shearing = true; - } + HWR_SetTransformAiming(&atransform); + atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); gr_viewludsin = FIXED_TO_FLOAT(FINECOSINE(gr_aimingangle>>ANGLETOFINESHIFT)); gr_viewludcos = FIXED_TO_FLOAT(-FINESINE(gr_aimingangle>>ANGLETOFINESHIFT)); - atransform.anglex = (float)(gr_aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); - atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES); - atransform.fovxangle = fpov; // Tails atransform.fovyangle = fpov; // Tails HWR_RollTransform(&atransform, viewroll); diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index abfbfdd25..4be4d4c27 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -2984,7 +2984,7 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform) // https://zdoom.org/wiki/Y-shearing if (shearing) { - float dy = FIXED_TO_FLOAT(AIMINGTODY((stransform->viewaiming)) * 2)* ((float)vid.width / vid.height) / ((float)BASEVIDWIDTH / BASEVIDHEIGHT); //screen_width/BASEVIDWIDTH; + float dy = stransform->viewaiming * 2; if (stransform->flip || stransform->mirrorflip) dy *= -1.0f; pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);