qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 20:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Clean up some stray vup etc

Browse source 
Now vup, vfwd, vright names are restricted to only the software renderer
(the only one that has such global variables).
This commit is contained in:
Bill Currie 2022-03-17 11:55:58 +09:00
parent 0e58f96d37
commit 335d387ba8
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/video/renderer/glsl/glsl_sprite.c
View file

@ -180,18 +180,17 @@ R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
}
static void
make_quad (mspriteframe_t *frame, vec4f_t origin, vec4f_t vpn, vec4f_t vright,
vec4f_t vup, float verts[6][3])
make_quad (mspriteframe_t *frame, vec4f_t origin, vec4f_t sright, vec4f_t sup, float verts[6][3])
{
vec4f_t left, up, right, down;
vec4f_t ul, ur, ll, lr;
// build the sprite poster in worldspace
// first, rotate the sprite axes into world space
right = frame->right * vright;
up = frame->up * vup;
left = frame->left * vright;
down = frame->down * vup;
right = frame->right * sright;
up = frame->up * sup;
left = frame->left * sright;
down = frame->down * sup;
// next, build the sprite corners from the axes
ul = up + left;
ur = up + right;
@ -213,7 +212,7 @@ glsl_R_DrawSprite (entity_t *ent)
mspriteframe_t *frame1, *frame2;
float blend;
vec4f_t cameravec = {};
vec4f_t svpn = {}, svright = {}, svup = {};
vec4f_t spn = {}, sright = {}, sup = {};
static quat_t color = { 1, 1, 1, 1};
float vertsa[6][3], vertsb[6][3];
static float uvab[6][4] = {
@ -229,7 +228,7 @@ glsl_R_DrawSprite (entity_t *ent)
cameravec = r_refdef.frame.position - origin;
if (!R_BillboardFrame (ent, sprite->type, &cameravec[0],
&svup[0], &svright[0], &svpn[0])) {
&sup[0], &sright[0], &spn[0])) {
// the orientation is undefined so can't draw the sprite
return;
}
@ -246,8 +245,8 @@ glsl_R_DrawSprite (entity_t *ent)
qfeglVertexAttrib4fv (quake_sprite.colorb.location, color);
qfeglVertexAttrib1f (quake_sprite.blend.location, blend);
make_quad (frame1, origin, svpn, svright, svup, vertsa);
make_quad (frame2, origin, svpn, svright, svup, vertsb);
make_quad (frame1, origin, sright, sup, vertsa);
make_quad (frame2, origin, sright, sup, vertsb);
qfeglVertexAttribPointer (quake_sprite.vertexa.location, 3, GL_FLOAT,
0, 0, vertsa);

28
libs/video/renderer/r_main.c
View file

@ -92,22 +92,20 @@ void
R_SetFrustum (void)
{
int i;
vec4f_t vright = r_refdef.frame.right;
vec4f_t vfwd = r_refdef.frame.forward;
vec4f_t vup = r_refdef.frame.up;
vec4f_t right = r_refdef.frame.right;
vec4f_t fwd = r_refdef.frame.forward;
vec4f_t up = r_refdef.frame.up;
float rot_x = 90 - r_refdef.fov_x / 2;
float rot_y = 90 - r_refdef.fov_y / 2;
// rotate VPN right by FOV_X/2 degrees
RotatePointAroundVector (frustum[0].normal, &vup[0], &vfwd[0],
-(90 - r_refdef.fov_x / 2));
// rotate VPN left by FOV_X/2 degrees
RotatePointAroundVector (frustum[1].normal, &vup[0], &vfwd[0],
90 - r_refdef.fov_x / 2);
// rotate VPN up by FOV_Y/2 degrees
RotatePointAroundVector (frustum[2].normal, &vright[0], &vfwd[0],
90 - r_refdef.fov_y / 2);
// rotate VPN down by FOV_Y/2 degrees
RotatePointAroundVector (frustum[3].normal, &vright[0], &vfwd[0],
-(90 - r_refdef.fov_y / 2));
// rotate FWD right by FOV_X/2 degrees
RotatePointAroundVector (frustum[0].normal, &up[0], &fwd[0], -rot_x);
// rotate FWD left by FOV_X/2 degrees
RotatePointAroundVector (frustum[1].normal, &up[0], &fwd[0], rot_x);
// rotate FWD up by FOV_Y/2 degrees
RotatePointAroundVector (frustum[2].normal, &right[0], &fwd[0], rot_y);
// rotate FWD down by FOV_Y/2 degrees
RotatePointAroundVector (frustum[3].normal, &right[0], &fwd[0], -rot_y);
vec4f_t origin = r_refdef.frame.position;
for (i = 0; i < 4; i++) {