qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[client] Fix the chase cameras 

They no longer spin like crazy. I don't know how, but I must have broken
something over the years as I'm sure Seth had the code working (and I
seem to remember seeing it working). In the process, clean up a lot of
the angle mess.
This commit is contained in:
Bill Currie 2022-03-01 14:44:53 +09:00
parent 5b08ee768c
commit 1859ff233d
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/client/cl_chase.c
View File

@ -160,24 +160,19 @@ cam_controls (chasestate_t *cs, viewstate_t *vs)
if (dir[1] || dir[0]) {
vs->player_angles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
if (vs->player_angles[YAW] < 0) {
vs->player_angles[YAW] += 360;
}
}
vs->player_angles[PITCH] = 0;
// remember the new angle to calculate the difference next frame
VectorCopy (vs->player_angles, cs->player_angles);
}
static void
update_cam_frame (chasestate_t *cs, viewstate_t *vs)
{
// control camera angles with key/mouse/joy-look
vec3_t d;
VectorSubtract (vs->player_angles, cs->player_angles, d);
VectorAdd (cs->camera_angles, d, cs->camera_angles);
// remember the new angle to calculate the difference next frame
VectorCopy (vs->player_angles, cs->player_angles);
}
static void
@ -231,8 +226,7 @@ chase_mode_2 (chasestate_t *cs)
limit_distance (cs);
check_for_walls (cs, forward);
dir = cs->camera_origin - vs->player_origin;
forward = normalf (dir);
dir = vs->player_origin - cs->camera_origin;
if (dir[1] == 0 && dir[0] == 0) {
// look straight up or down
@ -240,22 +234,14 @@ chase_mode_2 (chasestate_t *cs)
if (dir[2] > 0)
cs->camera_angles[PITCH] = 90;
else
cs->camera_angles[PITCH] = 270;
cs->camera_angles[PITCH] = -90;
} else {
float pitch, yaw, fwd;
yaw = (atan2 (dir[1], dir[0]) * 180 / M_PI);
if (yaw < 0)
yaw += 360;
if (yaw < 180)
yaw += 180;
else
yaw -= 180;
cs->camera_angles[YAW] = yaw;
fwd = sqrt (dir[0] * dir[0] + dir[1] * dir[1]);
pitch = (atan2 (dir[2], fwd) * 180 / M_PI);
if (pitch < 0)
pitch += 360;
pitch = -(atan2 (dir[2], fwd) * 180 / M_PI);
cs->camera_angles[PITCH] = pitch;
}
set_camera (cs, vs);

10
libs/client/cl_view.c
View File

@ -693,10 +693,6 @@ V_CalcRefdef (viewstate_t *vs)
vec3_t ang = {-viewangles[0], viewangles[1], viewangles[2]};
CL_TransformEntity (view, 1, ang, gun_origin);
}
if (vs->chase && chase_active->int_val) {
Chase_Update (vs->chasestate);
}
}
static void
@ -745,7 +741,11 @@ V_RenderView (viewstate_t *vs)
if (vs->intermission) { // intermission / finale rendering
V_CalcIntermissionRefdef (vs);
} else {
V_CalcRefdef (vs);
if (vs->chase && chase_active->int_val) {
Chase_Update (vs->chasestate);
} else {
V_CalcRefdef (vs);
}
}
}

1
nq/source/cl_main.c
View File

@ -202,6 +202,7 @@ CL_ClearState (void)
__auto_type cam = cl.viewstate.camera_transform;
memset (&cl, 0, sizeof (cl));
cl.viewstate.camera_transform = cam;
cl.viewstate.player_origin = (vec4f_t) {0, 0, 0, 1};
cl.viewstate.chase = 1;
cl.viewstate.chasestate = &cl.chasestate;
cl.chasestate.viewstate = &cl.viewstate;