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

Much diff noise reduction.

This commit is contained in:
Bill Currie 2012-06-01 08:20:09 +09:00
parent 81dc750857
commit 5bae5b3740
2 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
nq/source/cl_view.c
View File

@ -29,9 +29,7 @@
#endif #endif
#include "QF/cmd.h" #include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/screen.h" #include "QF/screen.h"
@ -86,9 +84,6 @@ cshift_t cshift_lava = { {255, 80, 0}, 150};
cshift_t cshift_bonus = { {215, 186, 60}, 50}; cshift_t cshift_bonus = { {215, 186, 60}, 50};
/*
FIXME duplicates SV_CalcRoll in sv_user.c
*/
float float
V_CalcRoll (const vec3_t angles, const vec3_t velocity) V_CalcRoll (const vec3_t angles, const vec3_t velocity)
{ {
@ -509,25 +504,24 @@ CalcGunAngle (void)
static void static void
V_BoundOffsets (void) V_BoundOffsets (void)
{ {
entity_t *ent; entity_t *ent = &cl_entities[cl.viewentity];
vec_t *origin = ent->origin;
ent = &cl_entities[cl.viewentity];
// absolutely bound refresh reletive to entity clipping hull // absolutely bound refresh reletive to entity clipping hull
// so the view can never be inside a solid wall // so the view can never be inside a solid wall
if (r_data->refdef->vieworg[0] < ent->origin[0] - 14) if (r_data->refdef->vieworg[0] < origin[0] - 14)
r_data->refdef->vieworg[0] = ent->origin[0] - 14; r_data->refdef->vieworg[0] = origin[0] - 14;
else if (r_data->refdef->vieworg[0] > ent->origin[0] + 14) else if (r_data->refdef->vieworg[0] > origin[0] + 14)
r_data->refdef->vieworg[0] = ent->origin[0] + 14; r_data->refdef->vieworg[0] = origin[0] + 14;
if (r_data->refdef->vieworg[1] < ent->origin[1] - 14) if (r_data->refdef->vieworg[1] < origin[1] - 14)
r_data->refdef->vieworg[1] = ent->origin[1] - 14; r_data->refdef->vieworg[1] = origin[1] - 14;
else if (r_data->refdef->vieworg[1] > ent->origin[1] + 14) else if (r_data->refdef->vieworg[1] > origin[1] + 14)
r_data->refdef->vieworg[1] = ent->origin[1] + 14; r_data->refdef->vieworg[1] = origin[1] + 14;
if (r_data->refdef->vieworg[2] < ent->origin[2] - 22) if (r_data->refdef->vieworg[2] < origin[2] - 22)
r_data->refdef->vieworg[2] = ent->origin[2] - 22; r_data->refdef->vieworg[2] = origin[2] - 22;
else if (r_data->refdef->vieworg[2] > ent->origin[2] + 30) else if (r_data->refdef->vieworg[2] > origin[2] + 30)
r_data->refdef->vieworg[2] = ent->origin[2] + 30; r_data->refdef->vieworg[2] = origin[2] + 30;
} }
/* /*
@ -574,26 +568,25 @@ V_CalcViewRoll (void)
v_dmg_time -= host_frametime; v_dmg_time -= host_frametime;
} }
if (cl.stats[STAT_HEALTH] <= 0) { if (cl.stats[STAT_HEALTH] <= 0)
r_data->refdef->viewangles[ROLL] = 80; // dead view angle r_data->refdef->viewangles[ROLL] = 80; // dead view angle
return;
}
} }
static void static void
V_CalcIntermissionRefdef (void) V_CalcIntermissionRefdef (void)
{ {
entity_t *ent, *view;
float old;
// ent is the player model (visible when out of body) // ent is the player model (visible when out of body)
ent = &cl_entities[cl.viewentity]; entity_t *ent = &cl_entities[cl.viewentity];
entity_t *view;
float old;
vec_t *origin = ent->origin;
vec_t *angles = ent->angles;
// view is the weapon model (visible only from inside body) // view is the weapon model (visible only from inside body)
view = &cl.viewent; view = &cl.viewent;
VectorCopy (ent->origin, r_data->refdef->vieworg); VectorCopy (origin, r_data->refdef->vieworg);
VectorCopy (ent->angles, r_data->refdef->viewangles); VectorCopy (angles, r_data->refdef->viewangles);
view->model = NULL; view->model = NULL;
// always idle in intermission // always idle in intermission
@ -606,23 +599,23 @@ V_CalcIntermissionRefdef (void)
static void static void
V_CalcRefdef (void) V_CalcRefdef (void)
{ {
entity_t *ent, *view; // ent is the player model (visible when out of body)
entity_t *ent = &cl_entities[cl.viewentity];
// view is the weapon model (visible only from inside body)
entity_t *view = &cl.viewent;
float bob; float bob;
static float oldz = 0; static float oldz = 0;
int i; int i;
vec3_t angles, forward, right, up; vec3_t angles;
vec3_t forward, right, up;
vec_t *origin = ent->origin;
V_DriftPitch (); V_DriftPitch ();
// ent is the player model (visible when out of body)
ent = &cl_entities[cl.viewentity];
// view is the weapon model (visible only from inside body)
view = &cl.viewent;
bob = V_CalcBob (); bob = V_CalcBob ();
// refresh position // refresh position
VectorCopy (ent->origin, r_data->refdef->vieworg); VectorCopy (origin, r_data->refdef->vieworg);
r_data->refdef->vieworg[2] += cl.viewheight + bob; r_data->refdef->vieworg[2] += cl.viewheight + bob;
// never let it sit exactly on a node line, because a water plane can // never let it sit exactly on a node line, because a water plane can
@ -645,6 +638,7 @@ V_CalcRefdef (void)
AngleVectors (angles, forward, right, up); AngleVectors (angles, forward, right, up);
// don't allow cheats in multiplayer // don't allow cheats in multiplayer
// FIXME check for dead
if (cl.maxclients == 1) { if (cl.maxclients == 1) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
r_data->refdef->vieworg[i] += scr_ofsx->value * forward[i] + r_data->refdef->vieworg[i] += scr_ofsx->value * forward[i] +
@ -660,7 +654,7 @@ V_CalcRefdef (void)
CalcGunAngle (); CalcGunAngle ();
VectorCopy (ent->origin, view->origin); VectorCopy (origin, view->origin);
view->origin[2] += cl.viewheight; view->origin[2] += cl.viewheight;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -692,7 +686,7 @@ V_CalcRefdef (void)
r_data->refdef->viewangles); r_data->refdef->viewangles);
// smooth out stair step ups // smooth out stair step ups
if (cl.onground && ent->origin[2] - oldz > 0) { if (cl.onground && origin[2] - oldz > 0) {
float steptime; float steptime;
steptime = cl.time - cl.oldtime; steptime = cl.time - cl.oldtime;
@ -700,16 +694,16 @@ V_CalcRefdef (void)
steptime = 0; steptime = 0;
oldz += steptime * 80; oldz += steptime * 80;
if (oldz > ent->origin[2]) if (oldz > origin[2])
oldz = ent->origin[2]; oldz = origin[2];
if (ent->origin[2] - oldz > 12) if (origin[2] - oldz > 12)
oldz = ent->origin[2] - 12; oldz = origin[2] - 12;
r_data->refdef->vieworg[2] += oldz - ent->origin[2]; r_data->refdef->vieworg[2] += oldz - origin[2];
view->origin[2] += oldz - ent->origin[2]; view->origin[2] += oldz - origin[2];
} else } else
oldz = ent->origin[2]; oldz = origin[2];
if (chase_active->int_val) if (cl.chase && chase_active->int_val)
Chase_Update (); Chase_Update ();
CL_TransformEntity (view, view->angles, true); CL_TransformEntity (view, view->angles, true);
@ -730,8 +724,7 @@ V_RenderView (void)
if (cl.intermission) { // intermission / finale rendering if (cl.intermission) { // intermission / finale rendering
V_CalcIntermissionRefdef (); V_CalcIntermissionRefdef ();
} else { } else {
if (!cl.paused) V_CalcRefdef ();
V_CalcRefdef ();
} }
r_funcs->R_RenderView (); r_funcs->R_RenderView ();

48
qw/source/cl_view.c
View File

@ -28,14 +28,10 @@
# include "config.h" # include "config.h"
#endif #endif
#include <stdlib.h>
#include <math.h>
#include "QF/cmd.h" #include "QF/cmd.h"
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/vid.h"
#include "qw/bothdefs.h" #include "qw/bothdefs.h"
#include "chase.h" #include "chase.h"
@ -313,10 +309,7 @@ V_BonusFlash_f (void)
&& !(cl.sv_cshifts & INFO_CSHIFT_BONUS)) && !(cl.sv_cshifts & INFO_CSHIFT_BONUS))
return; return;
cl.cshifts[CSHIFT_BONUS].destcolor[0] = 215; cl.cshifts[CSHIFT_BONUS] = cshift_bonus;
cl.cshifts[CSHIFT_BONUS].destcolor[1] = 186;
cl.cshifts[CSHIFT_BONUS].destcolor[2] = 69;
cl.cshifts[CSHIFT_BONUS].percent = 50;
} }
/* /*
@ -588,6 +581,8 @@ V_CalcViewRoll (void)
v_dmg_time -= host_frametime; v_dmg_time -= host_frametime;
} }
if (view_message->pls.flags & PF_DEAD) // PF_GIB will also set PF_DEAD
r_data->refdef->viewangles[ROLL] = 80; // dead view angle
} }
static void static void
@ -595,12 +590,14 @@ V_CalcIntermissionRefdef (void)
{ {
entity_t *view; entity_t *view;
float old; float old;
vec_t *origin = cl.simorg;
vec_t *angles = cl.simangles;
// view is the weapon model (visible only from inside body) // view is the weapon model (visible only from inside body)
view = &cl.viewent; view = &cl.viewent;
VectorCopy (cl.simorg, r_data->refdef->vieworg); VectorCopy (origin, r_data->refdef->vieworg);
VectorCopy (cl.simangles, r_data->refdef->viewangles); VectorCopy (angles, r_data->refdef->viewangles);
view->model = NULL; view->model = NULL;
// always idle in intermission // always idle in intermission
@ -613,21 +610,20 @@ V_CalcIntermissionRefdef (void)
static void static void
V_CalcRefdef (void) V_CalcRefdef (void)
{ {
entity_t *view; // view is the weapon model (visible only from inside body)
entity_t *view = &cl.viewent;
float bob; float bob;
static float oldz = 0; static float oldz = 0;
int i; int i;
vec3_t forward, right, up; vec3_t forward, right, up;
vec_t *origin = cl.simorg;
V_DriftPitch (); V_DriftPitch ();
// view is the weapon model (visible only from inside body)
view = &cl.viewent;
bob = V_CalcBob (); bob = V_CalcBob ();
// refresh position from simulated origin // refresh position from simulated origin
VectorCopy (cl.simorg, r_data->refdef->vieworg); VectorCopy (origin, r_data->refdef->vieworg);
r_data->refdef->vieworg[2] += cl.viewheight + bob; r_data->refdef->vieworg[2] += cl.viewheight + bob;
// never let it sit exactly on a node line, because a water plane can // never let it sit exactly on a node line, because a water plane can
@ -641,9 +637,6 @@ V_CalcRefdef (void)
V_CalcViewRoll (); V_CalcViewRoll ();
V_AddIdle (); V_AddIdle ();
if (view_message->pls.flags & PF_DEAD) // PF_GIB will also set PF_DEAD
r_data->refdef->viewangles[ROLL] = 80; // dead view angle
// offsets // offsets
AngleVectors (cl.simangles, forward, right, up); AngleVectors (cl.simangles, forward, right, up);
@ -664,7 +657,7 @@ V_CalcRefdef (void)
CalcGunAngle (); CalcGunAngle ();
VectorCopy (cl.simorg, view->origin); VectorCopy (origin, view->origin);
view->origin[2] += cl.viewheight; view->origin[2] += cl.viewheight;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -699,23 +692,24 @@ V_CalcRefdef (void)
r_data->refdef->viewangles); r_data->refdef->viewangles);
// smooth out stair step ups // smooth out stair step ups
if ((cl.onground != -1) && (cl.simorg[2] - oldz > 0)) { if ((cl.onground != -1) && (origin[2] - oldz > 0)) {
float steptime; float steptime;
steptime = host_frametime; steptime = host_frametime;
oldz += steptime * 80; oldz += steptime * 80;
if (oldz > cl.simorg[2]) if (oldz > origin[2])
oldz = cl.simorg[2]; oldz = origin[2];
if (cl.simorg[2] - oldz > 12) if (origin[2] - oldz > 12)
oldz = cl.simorg[2] - 12; oldz = origin[2] - 12;
r_data->refdef->vieworg[2] += oldz - cl.simorg[2]; r_data->refdef->vieworg[2] += oldz - origin[2];
view->origin[2] += oldz - cl.simorg[2]; view->origin[2] += oldz - origin[2];
} else } else
oldz = cl.simorg[2]; oldz = origin[2];
if (cl.chase && chase_active->int_val) if (cl.chase && chase_active->int_val)
Chase_Update (); Chase_Update ();
CL_TransformEntity (view, view->angles, true); CL_TransformEntity (view, view->angles, true);
} }