qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 23:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

complete the merge of sw_rpart.c. this involved adding old_origin to entity_t

Browse source 
and setting it up correctly
This commit is contained in:
Bill Currie 2001-05-18 19:21:51 +00:00
parent 1dbfea351a
commit 6ee0692e58
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nq/include/render.h
View file

@ -53,6 +53,7 @@ typedef struct entity_s
double msgtime; // time of last update double msgtime; // time of last update
vec3_t msg_origins[2]; // last two updates (0 is newest) vec3_t msg_origins[2]; // last two updates (0 is newest)
vec3_t origin; vec3_t origin;
vec3_t old_origin;
vec3_t msg_angles[2]; // last two updates (0 is newest) vec3_t msg_angles[2]; // last two updates (0 is newest)
vec3_t angles; vec3_t angles;
struct model_s *model; // NULL = no model struct model_s *model; // NULL = no model

3
nq/source/cl_main.c
View file

@ -556,7 +556,6 @@ CL_RelinkEntities (void)
float frac, f, d; float frac, f, d;
vec3_t delta; vec3_t delta;
float bobjrotate; float bobjrotate;
vec3_t oldorg;
dlight_t *dl; dlight_t *dl;
// determine partial update time // determine partial update time
@ -594,7 +593,7 @@ CL_RelinkEntities (void)
continue; continue;
} }
VectorCopy (ent->origin, oldorg); VectorCopy (ent->origin, ent->old_origin);
if (ent->forcelink) { // the entity was not updated in the if (ent->forcelink) { // the entity was not updated in the
// last message so move to the final spot // last message so move to the final spot

17
nq/source/sw_rpart.c
View file

@ -40,6 +40,7 @@
#include "client.h" #include "client.h"
#include "host.h" #include "host.h"
#include "r_cvar.h" #include "r_cvar.h"
#include "r_dynamic.h"
#include "r_local.h" #include "r_local.h"
int ramp1[8] = { 0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61 }; int ramp1[8] = { 0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61 };
@ -425,7 +426,7 @@ R_RocketTrail (int type, entity_t *ent)
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->msg_origins[1], vec); VectorSubtract (ent->origin, ent->old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
len -= 3; len -= 3;
@ -444,31 +445,31 @@ R_RocketTrail (int type, entity_t *ent)
p->type = pt_slowgrav; p->type = pt_slowgrav;
p->color = 67 + (rand () & 3); p->color = 67 + (rand () & 3);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->msg_origins[1][j] + ((rand () % 6) - 3); p->org[j] = ent->old_origin[j] + ((rand () % 6) - 3);
len -= 3; len -= 3;
} else if (type == 2) { // blood } else if (type == 2) { // blood
p->type = pt_slowgrav; p->type = pt_slowgrav;
p->color = 67 + (rand () & 3); p->color = 67 + (rand () & 3);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->msg_origins[1][j] + ((rand () % 6) - 3); p->org[j] = ent->old_origin[j] + ((rand () % 6) - 3);
} else if (type == 6) { // voor trail } else if (type == 6) { // voor trail
p->color = 9 * 16 + 8 + (rand () & 3); p->color = 9 * 16 + 8 + (rand () & 3);
p->type = pt_static; p->type = pt_static;
p->die = cl.time + 0.3; p->die = cl.time + 0.3;
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->msg_origins[1][j] + ((rand () & 15) - 8); p->org[j] = ent->old_origin[j] + ((rand () & 15) - 8);
} else if (type == 1) { // smoke smoke } else if (type == 1) { // smoke smoke
p->ramp = (rand () & 3) + 2; p->ramp = (rand () & 3) + 2;
p->color = ramp3[(int) p->ramp]; p->color = ramp3[(int) p->ramp];
p->type = pt_fire; p->type = pt_fire;
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->msg_origins[1][j] + ((rand () % 6) - 3); p->org[j] = ent->old_origin[j] + ((rand () % 6) - 3);
} else if (type == 0) { // rocket trail } else if (type == 0) { // rocket trail
p->ramp = (rand () & 3); p->ramp = (rand () & 3);
p->color = ramp3[(int) p->ramp]; p->color = ramp3[(int) p->ramp];
p->type = pt_fire; p->type = pt_fire;
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->msg_origins[1][j] + ((rand () % 6) - 3); p->org[j] = ent->old_origin[j] + ((rand () % 6) - 3);
} else if (type == 3 || type == 5) { // tracer } else if (type == 3 || type == 5) { // tracer
static int tracercount; static int tracercount;
@ -481,7 +482,7 @@ R_RocketTrail (int type, entity_t *ent)
tracercount++; tracercount++;
VectorCopy (ent->msg_origins[1], p->org); VectorCopy (ent->old_origin, p->org);
if (tracercount & 1) { if (tracercount & 1) {
p->vel[0] = 30 * vec[1]; p->vel[0] = 30 * vec[1];
p->vel[1] = 30 * -vec[0]; p->vel[1] = 30 * -vec[0];
@ -492,7 +493,7 @@ R_RocketTrail (int type, entity_t *ent)
} }
VectorAdd (ent->msg_origins[1], vec, ent->msg_origins[1]); VectorAdd (ent->old_origin, vec, ent->old_origin);
} }
} }