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

Make trails in sw renderers const-friendly.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2003-10-23 03:53:59 +00:00
parent 894f3974f4
commit bcf3738c1c
2 changed files with 90 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
libs/video/renderer/sw/sw_rpart.c
View file

@ -355,8 +355,8 @@ R_TeleportSplash_QF (const vec3_t org)
} }
} }
void static void
R_DarkFieldParticles_ID (entity_t *ent) R_DarkFieldParticles_ID (const entity_t *ent)
{ {
int i, j, k; int i, j, k;
unsigned int rnd; unsigned int rnd;
@ -404,7 +404,7 @@ R_DarkFieldParticles_ID (entity_t *ent)
static vec3_t avelocities[NUMVERTEXNORMALS]; static vec3_t avelocities[NUMVERTEXNORMALS];
static void static void
R_EntityParticles_ID (entity_t *ent) R_EntityParticles_ID (const entity_t *ent)
{ {
int i; int i;
float angle, sp, sy, cp, cy; // cr, sr float angle, sp, sy, cp, cy; // cr, sr
@ -457,17 +457,18 @@ R_EntityParticles_ID (entity_t *ent)
} }
static void static void
R_RocketTrail_QF (entity_t *ent) R_RocketTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -487,24 +488,25 @@ R_RocketTrail_QF (entity_t *ent)
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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_GrenadeTrail_QF (entity_t *ent) R_GrenadeTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -524,24 +526,25 @@ R_GrenadeTrail_QF (entity_t *ent)
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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_BloodTrail_QF (entity_t *ent) R_BloodTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -560,25 +563,26 @@ R_BloodTrail_QF (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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
break; break;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_SlightBloodTrail_QF (entity_t *ent) R_SlightBloodTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -597,23 +601,24 @@ R_SlightBloodTrail_QF (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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_WizTrail_QF (entity_t *ent) R_WizTrail_QF (const entity_t *ent)
{ {
float len; float len;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -634,7 +639,7 @@ R_WizTrail_QF (entity_t *ent)
tracercount++; tracercount++;
VectorCopy (ent->old_origin, p->org); VectorCopy (old_origin, p->org);
if (tracercount & 1) { if (tracercount & 1) {
p->vel[0] = 30.0 * vec[1]; p->vel[0] = 30.0 * vec[1];
p->vel[1] = 30.0 * -vec[0]; p->vel[1] = 30.0 * -vec[0];
@ -644,21 +649,22 @@ R_WizTrail_QF (entity_t *ent)
} }
p->vel[2] = 0.0; p->vel[2] = 0.0;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_FlameTrail_QF (entity_t *ent) R_FlameTrail_QF (const entity_t *ent)
{ {
float len; float len;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -679,7 +685,7 @@ R_FlameTrail_QF (entity_t *ent)
tracercount++; tracercount++;
VectorCopy (ent->old_origin, p->org); VectorCopy (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];
@ -689,22 +695,23 @@ R_FlameTrail_QF (entity_t *ent)
} }
p->vel[2] = 0.0; p->vel[2] = 0.0;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_VoorTrail_QF (entity_t *ent) R_VoorTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -723,9 +730,9 @@ R_VoorTrail_QF (entity_t *ent)
p->type = pt_static; p->type = pt_static;
p->color = 9 * 16 + 8 + (rand () & 3); p->color = 9 * 16 + 8 + (rand () & 3);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->old_origin[j] + ((rand () & 15) - 8); p->org[j] = old_origin[j] + ((rand () & 15) - 8);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }

87
libs/video/renderer/sw32/sw32_rpart.c
View file

@ -300,7 +300,7 @@ R_TeleportSplash_QF (const vec3_t org)
} }
static void static void
R_DarkFieldParticles_ID (entity_t *ent) R_DarkFieldParticles_ID (const entity_t *ent)
{ {
int i, j, k; int i, j, k;
unsigned int rnd; unsigned int rnd;
@ -346,7 +346,7 @@ R_DarkFieldParticles_ID (entity_t *ent)
static vec3_t avelocities[NUMVERTEXNORMALS]; static vec3_t avelocities[NUMVERTEXNORMALS];
static void static void
R_EntityParticles_ID (entity_t *ent) R_EntityParticles_ID (const entity_t *ent)
{ {
int i; int i;
float angle, sp, sy, cp, cy; // cr, sr float angle, sp, sy, cp, cy; // cr, sr
@ -466,16 +466,17 @@ R_LightningBloodEffect_QF (const vec3_t org)
} }
static void static void
R_RocketTrail_QF (entity_t *ent) R_RocketTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, ent->old_origin, vec); VectorSubtract (ent->origin, ent->old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
@ -496,24 +497,25 @@ R_RocketTrail_QF (entity_t *ent)
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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_GrenadeTrail_QF (entity_t *ent) R_GrenadeTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -533,24 +535,25 @@ R_GrenadeTrail_QF (entity_t *ent)
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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_BloodTrail_QF (entity_t *ent) R_BloodTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -569,25 +572,26 @@ R_BloodTrail_QF (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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
break; break;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_SlightBloodTrail_QF (entity_t *ent) R_SlightBloodTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -606,23 +610,24 @@ R_SlightBloodTrail_QF (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->old_origin[j] + ((rand () % 6) - 3); p->org[j] = old_origin[j] + ((rand () % 6) - 3);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_WizTrail_QF (entity_t *ent) R_WizTrail_QF (const entity_t *ent)
{ {
float len; float len;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -643,7 +648,7 @@ R_WizTrail_QF (entity_t *ent)
tracercount++; tracercount++;
VectorCopy (ent->old_origin, p->org); VectorCopy (old_origin, p->org);
if (tracercount & 1) { if (tracercount & 1) {
p->vel[0] = 30.0 * vec[1]; p->vel[0] = 30.0 * vec[1];
p->vel[1] = 30.0 * -vec[0]; p->vel[1] = 30.0 * -vec[0];
@ -653,21 +658,22 @@ R_WizTrail_QF (entity_t *ent)
} }
p->vel[2] = 0.0; p->vel[2] = 0.0;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_FlameTrail_QF (entity_t *ent) R_FlameTrail_QF (const entity_t *ent)
{ {
float len; float len;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -688,7 +694,7 @@ R_FlameTrail_QF (entity_t *ent)
tracercount++; tracercount++;
VectorCopy (ent->old_origin, p->org); VectorCopy (old_origin, p->org);
if (tracercount & 1) { if (tracercount & 1) {
p->vel[0] = 30.0 * vec[1]; p->vel[0] = 30.0 * vec[1];
p->vel[1] = 30.0 * -vec[0]; p->vel[1] = 30.0 * -vec[0];
@ -698,22 +704,23 @@ R_FlameTrail_QF (entity_t *ent)
} }
p->vel[2] = 0.0; p->vel[2] = 0.0;
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
static void static void
R_VoorTrail_QF (entity_t *ent) R_VoorTrail_QF (const entity_t *ent)
{ {
float len; float len;
int j; int j;
particle_t *p; particle_t *p;
vec3_t vec; vec3_t old_origin, vec;
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
VectorSubtract (ent->origin, ent->old_origin, vec); VectorCopy (ent->old_origin, old_origin);
VectorSubtract (ent->origin, old_origin, vec);
len = VectorNormalize (vec); len = VectorNormalize (vec);
while (len > 0) { while (len > 0) {
@ -732,22 +739,18 @@ R_VoorTrail_QF (entity_t *ent)
p->type = pt_static; p->type = pt_static;
p->color = 9 * 16 + 8 + (rand () & 3); p->color = 9 * 16 + 8 + (rand () & 3);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
p->org[j] = ent->old_origin[j] + ((rand () & 15) - 8); p->org[j] = old_origin[j] + ((rand () & 15) - 8);
VectorAdd (ent->old_origin, vec, ent->old_origin); VectorAdd (old_origin, vec, old_origin);
} }
} }
void void
R_DrawParticles (void) R_DrawParticles (void)
{ {
particle_t *p, **particle; float dvel, grav, frametime, time1, time2, time3;
float grav;
int i; int i;
float time2, time3; particle_t *p, **particle;
float time1;
float dvel;
float frametime;
D_StartParticles (); D_StartParticles ();