From 4e8865d4957894ff9bbb1ef0beb03f253212632d Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 13 Nov 2025 17:37:30 +0100 Subject: [PATCH] cleanup some wonky float/double maths --- src/dedicated/i_system.c | 42 ++++++++++++++++++-------------- src/hardware/hw_main.cpp | 24 +++++++++--------- src/hardware/r_opengl/r_opengl.c | 14 +++++------ src/sdl/i_system.cpp | 34 ++++++++++++++------------ 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index d2ffa12ad..fe8889405 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -808,20 +808,23 @@ static void I_SetupMumble(void) void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) { #ifdef HAVE_MUMBLE - double angle; + float angle; fixed_t anglef; if (!mumble) return; - if (mumble->uiVersion != 2) { - wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256); + if (mumble->uiVersion != 2) + { + wcsncpy(mumble->name, L"SRB2Kart " VERSIONSTRINGW, 256); wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048); mumble->uiVersion = 2; } mumble->uiTick++; - if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink. + // Zero out, but never delink. + if (!netgame || gamestate != GS_LEVEL) + { mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; mumble->fAvatarFront[0] = 1.0f; mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; @@ -838,31 +841,34 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) mumble->context_len = (UINT32)(p - mumble->context); } - if (mobj) { - mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT; - mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT; - mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT; + if (mobj) + { + mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT; + mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT; + mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT; anglef = AngleFixed(mobj->angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fAvatarFront[0] = (float)cos(angle); + angle = (float)(FixedToFloat(anglef) * DEG2RAD); + mumble->fAvatarFront[0] = cosf(angle); mumble->fAvatarFront[1] = 0.0f; - mumble->fAvatarFront[2] = (float)sin(angle); - } else { + mumble->fAvatarFront[2] = sinf(angle); + } + else + { mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; mumble->fAvatarFront[0] = 1.0f; mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; } - mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT; - mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT; - mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT; + mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT; + mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT; + mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT; anglef = AngleFixed(listener.angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fCameraFront[0] = (float)cos(angle); + angle = (float)(FixedToFloat(anglef) * DEG2RAD); + mumble->fCameraFront[0] = cosf(angle); mumble->fCameraFront[1] = 0.0f; - mumble->fCameraFront[2] = (float)sin(angle); + mumble->fCameraFront[2] = sinf(angle); #else (void)mobj; (void)listener; diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index a2539cc7d..8dc4d3804 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -5940,31 +5940,33 @@ static void HWR_DoPostProcessor(player_t *player) float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL)); UINT8 x, y; - INT32 WAVELENGTH; - INT32 AMPLITUDE; - INT32 FREQUENCY; + float WAVELENGTH; + float AMPLITUDE; + float FREQUENCY; // Modifies the wave. if (thiscam->postimg & POSTIMG_WATER) { - WAVELENGTH = 5; - AMPLITUDE = 40; - FREQUENCY = 8; + WAVELENGTH = 5.0f; + AMPLITUDE = 40.0f; + FREQUENCY = 8.0f; } else { - WAVELENGTH = 10; - AMPLITUDE = 60; - FREQUENCY = 4; + WAVELENGTH = 10.0f; + AMPLITUDE = 60.0f; + FREQUENCY = 4.0f; } + //static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek + for (x = 0; x < SCREENVERTS; x++) { for (y = 0; y < SCREENVERTS; y++) { // Change X position based on its Y position. - v[x][y][0] = (x/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f + (float)sin((disStart+(y*WAVELENGTH))/FREQUENCY)/AMPLITUDE; - v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f; + v[x][y][0] = x-4.5f + sinf(((disStart+((float)y * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale) + v[x][y][1] = y-4.5f; // (y / scale) } } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index b8466ee3a..024dd2629 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1583,11 +1583,11 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color) // This is the preferred, 'modern' way of rendering lines -- creating a polygon. if (fabsf(v2->x - v1->x) > FLT_EPSILON) - angle = (float)atan((v2->y-v1->y)/(v2->x-v1->x)); + angle = atanf((v2->y-v1->y)/(v2->x-v1->x)); else angle = (float)N_PI_DEMI; - dx = (float)sin(angle) / (float)screen_width; - dy = (float)cos(angle) / (float)screen_height; + dx = sinf(angle) / (float)screen_width; + dy = cosf(angle) / (float)screen_height; p[0] = v1->x - dx; p[1] = -(v1->y + dy); p[2] = 1; p[3] = v2->x - dx; p[4] = -(v2->y + dy); p[5] = 1; @@ -3136,8 +3136,8 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics void GL_SetTransform(FTransform *stransform) { static boolean special_splitscreen; - GLdouble used_fov; boolean shearing = false; + float used_fov; pglLoadIdentity(); @@ -3196,11 +3196,11 @@ void GL_SetTransform(FTransform *stransform) if (special_splitscreen) { - used_fov = (float)(atan(tan(used_fov * M_PIl / 360) * 0.8) * 360 / M_PIl); - GL_Perspective((GLfloat)used_fov, 2*ASPECT_RATIO); + used_fov = (atanf(tanf(used_fov * (float)M_PI / 360.0f) * 0.8f) * 360.0f / (float)M_PI); + GL_Perspective(used_fov, 2*ASPECT_RATIO); } else - GL_Perspective((GLfloat)used_fov, ASPECT_RATIO); + GL_Perspective(used_fov, ASPECT_RATIO); pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer) pglMatrixMode(GL_MODELVIEW); diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 272379aa8..0dc751c85 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1260,7 +1260,7 @@ static void I_SetupMumble(void) void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) { #ifdef HAVE_MUMBLE - double angle; + float angle; fixed_t anglef; if (!mumble) @@ -1274,7 +1274,9 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) } mumble->uiTick++; - if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink. + // Zero out, but never delink. + if (!netgame || gamestate != GS_LEVEL) + { mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; mumble->fAvatarFront[0] = 1.0f; mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; @@ -1293,30 +1295,32 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) if (mobj) { - mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT; - mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT; - mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT; + mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT; + mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT; + mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT; anglef = AngleFixed(mobj->angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fAvatarFront[0] = (float)cos(angle); + angle = (float)(FixedToFloat(anglef) * DEG2RAD); + mumble->fAvatarFront[0] = cosf(angle); mumble->fAvatarFront[1] = 0.0f; - mumble->fAvatarFront[2] = (float)sin(angle); - } else { + mumble->fAvatarFront[2] = sinf(angle); + } + else + { mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; mumble->fAvatarFront[0] = 1.0f; mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; } - mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT; - mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT; - mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT; + mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT; + mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT; + mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT; anglef = AngleFixed(listener.angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fCameraFront[0] = (float)cos(angle); + angle = (float)(FixedToFloat(anglef) * DEG2RAD); + mumble->fCameraFront[0] = cosf(angle); mumble->fCameraFront[1] = 0.0f; - mumble->fCameraFront[2] = (float)sin(angle); + mumble->fCameraFront[2] = sinf(angle); #else (void)mobj; (void)listener;