fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-10 12:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

move DEG2RAD macro to mathlib.h.

Browse source 
From a patch by Andrei Drexler
This commit is contained in:
Ozkan Sezer 2022-03-11 23:55:10 +03:00
parent 144b43f333
commit c5a45e7e58
3 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Quake/gl_rmain.c
View file

@ -209,7 +209,7 @@ void GLSLGamma_GammaCorrect (void)
r_gamma_texture_width = TexMgr_Pad(r_gamma_texture_width); r_gamma_texture_width = TexMgr_Pad(r_gamma_texture_width);
r_gamma_texture_height = TexMgr_Pad(r_gamma_texture_height); r_gamma_texture_height = TexMgr_Pad(r_gamma_texture_height);
} }
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, r_gamma_texture_width, r_gamma_texture_height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, r_gamma_texture_width, r_gamma_texture_height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -224,7 +224,7 @@ void GLSLGamma_GammaCorrect (void)
Sys_Error("GLSLGamma_CreateShaders failed"); Sys_Error("GLSLGamma_CreateShaders failed");
} }
} }
// copy the framebuffer to the texture // copy the framebuffer to the texture
GL_DisableMultitexture(); GL_DisableMultitexture();
glBindTexture (GL_TEXTURE_2D, r_gamma_texture); glBindTexture (GL_TEXTURE_2D, r_gamma_texture);
@ -254,9 +254,9 @@ void GLSLGamma_GammaCorrect (void)
glTexCoord2f (0, tmax); glTexCoord2f (0, tmax);
glVertex2f (-1, 1); glVertex2f (-1, 1);
glEnd (); glEnd ();
GL_UseProgramFunc (0); GL_UseProgramFunc (0);
// clear cached binding // clear cached binding
GL_ClearBindings (); GL_ClearBindings ();
} }
@ -274,6 +274,7 @@ qboolean R_CullBox (vec3_t emins, vec3_t emaxs)
mplane_t *p; mplane_t *p;
byte signbits; byte signbits;
float vec[3]; float vec[3];
for (i = 0;i < 4;i++) for (i = 0;i < 4;i++)
{ {
p = frustum + i; p = frustum + i;
@ -387,7 +388,6 @@ assumes side and forward are perpendicular, and normalized
to turn away from side, use a negative angle to turn away from side, use a negative angle
=============== ===============
*/ */
#define DEG2RAD( a ) ( (a) * M_PI_DIV_180 )
void TurnVector (vec3_t out, const vec3_t forward, const vec3_t side, float angle) void TurnVector (vec3_t out, const vec3_t forward, const vec3_t side, float angle)
{ {
float scale_forward, scale_side; float scale_forward, scale_side;
@ -451,7 +451,7 @@ void R_SetupGL (void)
//johnfitz -- rewrote this section //johnfitz -- rewrote this section
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity (); glLoadIdentity ();
scale = CLAMP(1, (int)r_scale.value, 4); // ericw -- see R_ScaleView scale = CLAMP(1, (int)r_scale.value, 4); // ericw -- see R_ScaleView
glViewport (glx + r_refdef.vrect.x, glViewport (glx + r_refdef.vrect.x,
gly + glheight - r_refdef.vrect.y - r_refdef.vrect.height, gly + glheight - r_refdef.vrect.y - r_refdef.vrect.height,
@ -459,19 +459,19 @@ void R_SetupGL (void)
r_refdef.vrect.height / scale); r_refdef.vrect.height / scale);
//johnfitz //johnfitz
GL_SetFrustum (r_fovx, r_fovy); //johnfitz -- use r_fov* vars GL_SetFrustum (r_fovx, r_fovy); //johnfitz -- use r_fov* vars
// glCullFace(GL_BACK); //johnfitz -- glquake used CCW with backwards culling -- let's do it right // glCullFace(GL_BACK); //johnfitz -- glquake used CCW with backwards culling -- let's do it right
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity (); glLoadIdentity ();
glRotatef (-90, 1, 0, 0); // put Z going up glRotatef (-90, 1, 0, 0); // put Z going up
glRotatef (90, 0, 0, 1); // put Z going up glRotatef (90, 0, 0, 1); // put Z going up
glRotatef (-r_refdef.viewangles[2], 1, 0, 0); glRotatef (-r_refdef.viewangles[2], 1, 0, 0);
glRotatef (-r_refdef.viewangles[0], 0, 1, 0); glRotatef (-r_refdef.viewangles[0], 0, 1, 0);
glRotatef (-r_refdef.viewangles[1], 0, 0, 1); glRotatef (-r_refdef.viewangles[1], 0, 0, 1);
glTranslatef (-r_refdef.vieworg[0], -r_refdef.vieworg[1], -r_refdef.vieworg[2]); glTranslatef (-r_refdef.vieworg[0], -r_refdef.vieworg[1], -r_refdef.vieworg[2]);
// //
// set drawing parms // set drawing parms

4
Quake/mathlib.c
View file

@ -29,9 +29,6 @@ vec3_t vec3_origin = {0,0,0};
/*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/
//#define DEG2RAD( a ) ( a * M_PI ) / 180.0F
#define DEG2RAD( a ) ( (a) * M_PI_DIV_180 ) //johnfitz
void ProjectPointOnPlane( vec3_t dst, const vec3_t p, const vec3_t normal ) void ProjectPointOnPlane( vec3_t dst, const vec3_t p, const vec3_t normal )
{ {
float d; float d;
@ -322,7 +319,6 @@ float VectorNormalize (vec3_t v)
} }
return length; return length;
} }
void VectorInverse (vec3_t v) void VectorInverse (vec3_t v)

3
Quake/mathlib.h
View file

@ -32,7 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h #define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif #endif
#define M_PI_DIV_180 (M_PI / 180.0) //johnfitz #define M_PI_DIV_180 (M_PI / 180.0) //johnfitz
#define DEG2RAD(a) ((a) * M_PI_DIV_180)
struct mplane_s; struct mplane_s;