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

Reduce cl_cam diffs to spectator specifics.

Browse source
This commit is contained in:
Bill Currie 2011-08-24 13:56:00 +09:00
parent 73d11aedca
commit 85bcac3c8d
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
nq/source/cl_cam.c
View file

@ -80,6 +80,7 @@ TraceLine (vec3_t start, vec3_t end, vec3_t impact)
trace_t trace;
memset (&trace, 0, sizeof (trace));
trace.fraction = 1;
MOD_TraceLine (cl.worldmodel->hulls, 0, start, end, &trace);
VectorCopy (trace.endpos, impact);
@ -129,8 +130,8 @@ Chase_Update (void)
// don't let camera get too far from player
VectorSubtract (camera_origin, player_origin, dir);
VectorCopy (dir, forward);
VectorSubtract (camera_origin, player_origin, dir);
VectorCopy (dir, forward);
VectorNormalize (forward);
if (VectorLength (dir) > chase_back->value) {
@ -198,25 +199,25 @@ Chase_Update (void)
}
if (in_speed.state & 1) {
cmd.forwardmove *= cl_movespeedkey->value;
cmd.sidemove *= cl_movespeedkey->value;
cmd.sidemove *= cl_movespeedkey->value;
}
// mouse and joystick controllers add to movement
dir[1] = cl.viewangles[1] - camera_angles[1]; dir[0] = 0; dir[2] = 0;
VectorSet (0, cl.viewangles[1] - camera_angles[1], 0, dir);
AngleVectors (dir, forward, right, up);
VectorScale (forward, viewdelta.position[2] * m_forward->value,
VectorScale (forward, viewdelta.position[2] * m_forward->value,
forward);
VectorScale (right, viewdelta.position[0] * m_side->value, right);
VectorAdd (forward, right, dir);
VectorScale (right, viewdelta.position[0] * m_side->value, right);
VectorAdd (forward, right, dir);
cmd.forwardmove += dir[0];
cmd.sidemove -= dir[1];
cmd.sidemove -= dir[1];
dir[1] = camera_angles[1]; dir[0] = 0; dir[2] = 0;
VectorSet (0, camera_angles[1], 0, dir);
AngleVectors (dir, forward, right, up);
VectorScale (forward, cmd.forwardmove, forward);
VectorScale (right, cmd.sidemove, right);
VectorAdd (forward, right, dir);
VectorScale (right, cmd.sidemove, right);
VectorAdd (forward, right, dir);
if (dir[1] || dir[0]) {
cl.viewangles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);

59
qw/source/cl_cam.c
View file

@ -678,7 +678,7 @@ CL_Cam_Init_Cvars (void)
chase_active = Cvar_Get ("chase_active", "0", CVAR_NONE, NULL, "None");
}
static void
static inline void
TraceLine (vec3_t start, vec3_t end, vec3_t impact)
{
trace_t trace;
@ -695,23 +695,23 @@ Chase_Update (void)
{
float pitch, yaw, fwd;
int i;
vec3_t forward, up, right, stop, dir;
usercmd_t cmd; // movement direction
vec3_t forward, up, right, stop, dir;
// lazy camera, look toward player entity
if (chase_active->int_val == 2 || chase_active->int_val == 3)
{
if (chase_active->int_val == 2 || chase_active->int_val == 3) {
// control camera angles with key/mouse/joy-look
camera_angles[PITCH] += cl.viewangles[PITCH] - player_angles[PITCH];
camera_angles[YAW] += cl.viewangles[YAW] - player_angles[YAW];
camera_angles[ROLL] += cl.viewangles[ROLL] - player_angles[ROLL];
if (chase_active->int_val == 2)
{
if (camera_angles[PITCH] < -60) camera_angles[PITCH] = -60;
if (camera_angles[PITCH] > 60) camera_angles[PITCH] = 60;
if (chase_active->int_val == 2) {
if (camera_angles[PITCH] < -60)
camera_angles[PITCH] = -60;
if (camera_angles[PITCH] > 60)
camera_angles[PITCH] = 60;
}
// move camera, it's not enough to just change the angles because
@ -724,8 +724,7 @@ Chase_Update (void)
VectorScale (forward, chase_back->value, forward);
VectorSubtract (player_origin, forward, camera_origin);
if (chase_active->int_val == 2)
{
if (chase_active->int_val == 2) {
VectorCopy (r_refdef.vieworg, player_origin);
// don't let camera get too low
@ -739,8 +738,7 @@ Chase_Update (void)
VectorCopy (dir, forward);
VectorNormalize (forward);
if (VectorLength (dir) > chase_back->value)
{
if (VectorLength (dir) > chase_back->value) {
VectorScale (forward, chase_back->value, dir);
VectorAdd (player_origin, dir, camera_origin);
}
@ -753,32 +751,32 @@ Chase_Update (void)
if (VectorLength (stop) != 0)
VectorSubtract (stop, forward, camera_origin);
VectorSubtract (camera_origin, r_refdef.vieworg, dir);
VectorSubtract (camera_origin, r_refdef.vieworg, dir);
VectorCopy (dir, forward);
VectorNormalize (forward);
if (chase_active->int_val == 2)
{
if (dir[1] == 0 && dir[0] == 0)
{
if (chase_active->int_val == 2) {
if (dir[1] == 0 && dir[0] == 0) {
// look straight up or down
// camera_angles[YAW] = r_refdef.viewangles[YAW];
if (dir[2] > 0)
camera_angles[PITCH] = 90;
else
camera_angles[PITCH] = 270;
}
else
{
} else {
yaw = (atan2 (dir[1], dir[0]) * 180 / M_PI);
if (yaw < 0) yaw += 360;
if (yaw < 180) yaw += 180;
else yaw -= 180;
if (yaw < 0)
yaw += 360;
if (yaw < 180)
yaw += 180;
else
yaw -= 180;
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;
if (pitch < 0)
pitch += 360;
camera_angles[PITCH] = pitch;
}
}
@ -809,7 +807,7 @@ Chase_Update (void)
}
// mouse and joystick controllers add to movement
dir[1] = cl.viewangles[1] - camera_angles[1]; dir[0] = 0; dir[2] = 0;
VectorSet (0, cl.viewangles[1] - camera_angles[1], 0, dir);
AngleVectors (dir, forward, right, up);
VectorScale (forward, viewdelta.position[2] * m_forward->value,
forward);
@ -818,19 +816,20 @@ Chase_Update (void)
cmd.forwardmove += dir[0];
cmd.sidemove -= dir[1];
dir[1] = camera_angles[1]; dir[0] = 0; dir[2] = 0;
VectorSet (0, camera_angles[1], 0, dir);
AngleVectors (dir, forward, right, up);
VectorScale (forward, cmd.forwardmove, forward);
VectorScale (right, cmd.sidemove, right);
VectorAdd (forward, right, dir);
if (dir[1] || dir[0])
{
if (dir[1] || dir[0]) {
cl.viewangles[YAW] = (atan2 (dir[1], dir[0]) * 180 / M_PI);
if (cl.viewangles[YAW] < 0) cl.viewangles[YAW] += 360;
// if (cl.viewangles[YAW] < 180) cl.viewangles[YAW] += 180;
// else cl.viewangles[YAW] -= 180;
// if (cl.viewangles[YAW] < 180)
// cl.viewangles[YAW] += 180;
// else
// cl.viewangles[YAW] -= 180;
}
cl.viewangles[PITCH] = 0;