diff --git a/src/doomdef.h b/src/doomdef.h index 8cefd9474..373ceb2a0 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -477,7 +477,7 @@ extern INT32 cv_debug; // Misc stuff for later... // ======================= -#define ANG2RAD(angle) ((float)((angle)*M_PI)/ANGLE_180) +#define ANG2RAD(angle) ((float)((angle)*M_PIf) / (float)ANGLE_180) // Modifier key variables, accessible anywhere extern UINT8 shiftdown, ctrldown, altdown; @@ -526,6 +526,10 @@ UINT32 quickncasehash (const char *p, size_t n) #define M_PIl 3.1415926535897932384626433832795029L #endif +#ifndef M_PIf +#define M_PIf 3.14159265f +#endif + // Floating point comparison epsilons from float.h #ifndef FLT_EPSILON #define FLT_EPSILON 1.1920928955078125e-7f diff --git a/src/hardware/hw_clip.c b/src/hardware/hw_clip.c index 624dc4234..3365136b3 100644 --- a/src/hardware/hw_clip.c +++ b/src/hardware/hw_clip.c @@ -177,7 +177,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range) void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle) { - if(startangle > endangle) + if (startangle > endangle) { // The range has to added in two parts. gld_clipper_AddClipRange(startangle, ANGLE_MAX); @@ -319,7 +319,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle) double floatangle; angle_t a1; - float tilt = (float)fabs(((double)(int)tiltangle) / ANG1); + float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1); if (tilt > 90.0f) tilt = 90.0f; @@ -330,7 +330,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle) // 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_PIl; + clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI; floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0; if (floatangle >= 180.0) return 0xffffffff; diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index b53b7cb82..3a82f4c7d 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -261,7 +261,8 @@ static void CV_screentextures_OnChange(void) static void CV_glframebuffer_OnChange(void) { ONLY_IF_GL_LOADED - if ((cv_glframebuffer.value != 0 && cv_glscreentextures.value != 2) || (!supportFBO && cv_glframebuffer.value != 0)) // screen FBO needs screen textures + if ((cv_glframebuffer.value != 0 && cv_glscreentextures.value != 2) + || (!supportFBO && cv_glframebuffer.value != 0)) // screen FBO needs screen textures CV_SetValue(&cv_glframebuffer, 0); I_DownSample(); @@ -5134,7 +5135,7 @@ static gl_sky_t gl_sky; static void HWR_SkyDomeVertex(gl_sky_t *sky, gl_skyvertex_t *vbo, int r, int c, signed char yflip, float delta, boolean foglayer) { - static constexpr float radians = (float)(M_PIl / 180.0f); + static constexpr float radians = (M_PIf / 180.0f); static constexpr float scale = 10000.0f; static constexpr float maxSideAngle = 60.0f * radians; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index b106a5530..c64ba9634 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1110,12 +1110,12 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect) const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE; - if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO) + if ((fabsf(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO) { return; } - const GLfloat focallength = (GLfloat)(1.0f / (GLfloat)tan(fovy * (GLfloat)M_PIl / 360.0f)); + const GLfloat focallength = (1.0f / tanf(fovy * M_PIf / 360.0f)); m[0][0] = focallength / aspect; m[1][1] = focallength; @@ -1556,6 +1556,7 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color) angle = atanf((v2->y-v1->y)/(v2->x-v1->x)); else angle = (float)N_PI_DEMI; + dx = sinf(angle) / (float)screen_width; dy = cosf(angle) / (float)screen_height; @@ -3178,11 +3179,13 @@ void GL_SetTransform(FTransform *stransform) if (special_splitscreen) { - used_fov = (atanf(tanf(used_fov * (float)M_PI / 360.0f) * 0.8f) * 360.0f / (float)M_PI); + used_fov = (atanf(tanf(used_fov * M_PIf / 360.0f) * 0.8f) * 360.0f / M_PIf); GL_Perspective(used_fov, 2*ASPECT_RATIO); } else + { GL_Perspective(used_fov, ASPECT_RATIO); + } pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer) pglMatrixMode(GL_MODELVIEW);