mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 03:41:27 +00:00
merge qw_client/r_part.c and uquake/r_part.c into common/r_part.c
merge qw_client/gl_rpart.c and uquake/gl_rpart.c into common/gl_rpart.c r_part.c tested for uquake and seems ok, but gl_rpart.c untested
This commit is contained in:
Bill Currie
parent
5f3c8c1738
commit
981acbc014
4 changed files with 110 additions and 676 deletions
|
|
@ -29,13 +29,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "mathlib.h"
|
||||
|
||||
extern particle_t *active_particles, *free_particles;
|
||||
extern int ramp1[8], ramp2[8], ramp3[8];
|
||||
extern int ramp1[8], ramp2[8], ramp3[8];
|
||||
|
||||
/*
|
||||
===============
|
||||
R_DrawParticles
|
||||
===============
|
||||
*/
|
||||
extern cvar_t sv_gravity;
|
||||
|
||||
void R_DrawParticles (void)
|
||||
{
|
||||
particle_t *p, *kill;
|
||||
|
|
@ -62,12 +64,19 @@ void R_DrawParticles (void)
|
|||
|
||||
VectorScale (vup, 1.5, up);
|
||||
VectorScale (vright, 1.5, right);
|
||||
|
||||
#ifdef UQUAKE
|
||||
frametime = cl.time - cl.oldtime;
|
||||
#else
|
||||
frametime = host_frametime;
|
||||
#endif
|
||||
time3 = frametime * 15;
|
||||
time2 = frametime * 10; // 15;
|
||||
time1 = frametime * 5;
|
||||
#ifdef UQUAKE
|
||||
grav = frametime * sv_gravity.value * 0.05;
|
||||
#else
|
||||
grav = frametime * 800 * 0.05;
|
||||
#endif
|
||||
dvel = 4*frametime;
|
||||
|
||||
for ( ;; )
|
||||
|
|
@ -106,6 +115,9 @@ void R_DrawParticles (void)
|
|||
scale = 1;
|
||||
else
|
||||
scale = 1 + scale * 0.004;
|
||||
#if 0 // was in uquake, but give it a go
|
||||
glColor3ubv ((byte *)&d_8to24table[(int)p->color]);
|
||||
#else
|
||||
at = (byte *)&d_8to24table[(int)p->color];
|
||||
if (p->type==pt_fire)
|
||||
theAlpha = 255*(6-p->ramp)/6;
|
||||
|
|
@ -117,6 +129,7 @@ void R_DrawParticles (void)
|
|||
glColor4ub (*at, *(at+1), *(at+2), theAlpha);
|
||||
// glColor3ubv (at);
|
||||
// glColor3ubv ((byte *)&d_8to24table[(int)p->color]);
|
||||
#endif
|
||||
glTexCoord2f (0,0);
|
||||
glVertex3fv (p->org);
|
||||
glTexCoord2f (1,0);
|
||||
|
|
@ -124,7 +137,6 @@ void R_DrawParticles (void)
|
|||
glTexCoord2f (0,1);
|
||||
glVertex3f (p->org[0] + right[0]*scale, p->org[1] + right[1]*scale, p->org[2] + right[2]*scale);
|
||||
|
||||
|
||||
p->org[0] += p->vel[0]*frametime;
|
||||
p->org[1] += p->vel[1]*frametime;
|
||||
p->org[2] += p->vel[2]*frametime;
|
||||
|
|
@ -175,9 +187,17 @@ void R_DrawParticles (void)
|
|||
p->vel[i] -= p->vel[i]*dvel;
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
|
||||
case pt_slowgrav:
|
||||
#ifdef UQUAKE
|
||||
case pt_grav:
|
||||
#ifdef QUAKE2
|
||||
p->vel[2] -= grav * 20;
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
case pt_slowgrav:
|
||||
#ifdef QUAKEWORLD
|
||||
case pt_grav:
|
||||
#endif
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
/*
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
|
@ -208,7 +210,7 @@ void R_ReadPointFile_f (void)
|
|||
char name[MAX_OSPATH];
|
||||
char buf[256];
|
||||
|
||||
snprintf(name, sizeof(name),"maps/%s.pts", sv.name);
|
||||
// FIXME snprintf(name, sizeof(name),"maps/%s.pts", sv.name);
|
||||
|
||||
COM_FOpenFile (name, &f);
|
||||
if (!f)
|
||||
|
|
@ -409,6 +411,16 @@ void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
|
|||
{
|
||||
int i, j;
|
||||
particle_t *p;
|
||||
#ifdef QUAKEWORLD
|
||||
int scale;
|
||||
|
||||
if (count > 130)
|
||||
scale = 3;
|
||||
else if (count > 20)
|
||||
scale = 2;
|
||||
else
|
||||
scale = 1;
|
||||
#endif
|
||||
|
||||
for (i=0 ; i<count ; i++)
|
||||
{
|
||||
|
|
@ -419,6 +431,12 @@ void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
|
|||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
#ifdef QUAKEWORLD
|
||||
p->die = cl.time + 0.1*(rand()%5);
|
||||
p->color = (color&~7) + (rand()&7);
|
||||
p->type = pt_grav;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
#else
|
||||
if (count == 1024)
|
||||
{ // rocket explosion
|
||||
p->die = cl.time + 5;
|
||||
|
|
@ -444,7 +462,12 @@ void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#ifdef QUAKEWORLD
|
||||
p->org[j] = org[j] + scale*((rand()&15)-8);
|
||||
p->vel[j] = dir[j]*15;// + (rand()%300)-150;
|
||||
#else
|
||||
p->die = cl.time + 0.1*(rand()%5);
|
||||
p->color = (color&~7) + (rand()&7);
|
||||
p->type = pt_slowgrav;
|
||||
|
|
@ -453,6 +476,7 @@ void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
|
|||
p->org[j] = org[j] + ((rand()&15)-8);
|
||||
p->vel[j] = dir[j]*15;// + (rand()%300)-150;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -484,7 +508,11 @@ void R_LavaSplash (vec3_t org)
|
|||
|
||||
p->die = cl.time + 2 + (rand()&31) * 0.02;
|
||||
p->color = 224 + (rand()&7);
|
||||
#ifdef QUAKEWORLD
|
||||
p->type = pt_grav;
|
||||
#else
|
||||
p->type = pt_slowgrav;
|
||||
#endif
|
||||
|
||||
dir[0] = j*8 + (rand()&7);
|
||||
dir[1] = i*8 + (rand()&7);
|
||||
|
|
@ -526,7 +554,11 @@ void R_TeleportSplash (vec3_t org)
|
|||
|
||||
p->die = cl.time + 0.2 + (rand()&7) * 0.02;
|
||||
p->color = 7 + (rand()&7);
|
||||
#ifdef QUAKEWORLD
|
||||
p->type = pt_grav;
|
||||
#else
|
||||
p->type = pt_slowgrav;
|
||||
#endif
|
||||
|
||||
dir[0] = j*8;
|
||||
dir[1] = i*8;
|
||||
|
|
@ -549,7 +581,6 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type)
|
|||
int j;
|
||||
particle_t *p;
|
||||
int dec;
|
||||
static int tracercount;
|
||||
|
||||
VectorSubtract (end, start, vec);
|
||||
len = VectorNormalize (vec);
|
||||
|
|
@ -575,64 +606,73 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type)
|
|||
VectorCopy (vec3_origin, p->vel);
|
||||
p->die = cl.time + 2;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case 0: // rocket trail
|
||||
p->ramp = (rand()&3);
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
switch (type) {
|
||||
case 0:
|
||||
// rocket trail
|
||||
p->ramp = (rand()&3);
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 1:
|
||||
// smoke smoke
|
||||
p->ramp = (rand()&3) + 2;
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 2:
|
||||
// blood
|
||||
#ifdef QUAKEWORLD
|
||||
p->type = pt_slowgrav;
|
||||
#else
|
||||
p->type = pt_grav;
|
||||
#endif
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 3:
|
||||
case 5:
|
||||
{
|
||||
// tracer
|
||||
static int tracercount;
|
||||
|
||||
case 1: // smoke smoke
|
||||
p->ramp = (rand()&3) + 2;
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
|
||||
case 2: // blood
|
||||
p->type = pt_grav;
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
case 5: // tracer
|
||||
p->die = cl.time + 0.5;
|
||||
p->type = pt_static;
|
||||
if (type == 3)
|
||||
p->color = 52 + ((tracercount&4)<<1);
|
||||
else
|
||||
p->color = 230 + ((tracercount&4)<<1);
|
||||
|
||||
|
||||
tracercount++;
|
||||
|
||||
VectorCopy (start, p->org);
|
||||
if (tracercount & 1)
|
||||
{
|
||||
if (tracercount & 1) {
|
||||
p->vel[0] = 30*vec[1];
|
||||
p->vel[1] = 30*-vec[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
p->vel[0] = 30*-vec[1];
|
||||
p->vel[1] = 30*vec[0];
|
||||
}
|
||||
break;
|
||||
|
||||
case 4: // slight blood
|
||||
p->type = pt_grav;
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
len -= 3;
|
||||
break;
|
||||
|
||||
case 6: // voor trail
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
// slight blood
|
||||
#ifdef QUAKEWORLD
|
||||
p->type = pt_slowgrav;
|
||||
#else
|
||||
p->type = pt_grav;
|
||||
#endif
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
len -= 3;
|
||||
break;
|
||||
case 6:
|
||||
// voor trail
|
||||
p->color = 9*16 + 8 + (rand()&3);
|
||||
p->type = pt_static;
|
||||
p->die = cl.time + 0.3;
|
||||
|
|
@ -640,10 +680,6 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type)
|
|||
p->org[j] = start[j] + ((rand()&15)-8);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
VectorAdd (start, vec, start);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,450 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
#include "qtypes.h"
|
||||
#include "quakedef.h"
|
||||
#include "r_local.h"
|
||||
|
||||
#include "d_iface.h"
|
||||
#include "mathlib.h"
|
||||
#include "console.h"
|
||||
|
||||
#define MAX_PARTICLES 2048 // default max # of particles at one
|
||||
// time
|
||||
#define ABSOLUTE_MIN_PARTICLES 512 // no fewer than this no matter what's
|
||||
// on the command line
|
||||
|
||||
int ramp1[8] = {0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61};
|
||||
int ramp2[8] = {0x6f, 0x6e, 0x6d, 0x6c, 0x6b, 0x6a, 0x68, 0x66};
|
||||
int ramp3[8] = {0x6d, 0x6b, 6, 5, 4, 3};
|
||||
|
||||
particle_t *active_particles, *free_particles;
|
||||
|
||||
particle_t *particles;
|
||||
int r_numparticles;
|
||||
|
||||
vec3_t r_pright, r_pup, r_ppn;
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
R_InitParticles
|
||||
===============
|
||||
*/
|
||||
void R_InitParticles (void)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = COM_CheckParm ("-particles");
|
||||
|
||||
if (i)
|
||||
{
|
||||
r_numparticles = (int)(Q_atoi(com_argv[i+1]));
|
||||
if (r_numparticles < ABSOLUTE_MIN_PARTICLES)
|
||||
r_numparticles = ABSOLUTE_MIN_PARTICLES;
|
||||
}
|
||||
else
|
||||
{
|
||||
r_numparticles = MAX_PARTICLES;
|
||||
}
|
||||
|
||||
particles = (particle_t *)
|
||||
Hunk_AllocName (r_numparticles * sizeof(particle_t), "particles");
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
R_ClearParticles
|
||||
===============
|
||||
*/
|
||||
void R_ClearParticles (void)
|
||||
{
|
||||
int i;
|
||||
|
||||
free_particles = &particles[0];
|
||||
active_particles = NULL;
|
||||
|
||||
for (i=0 ;i<r_numparticles ; i++)
|
||||
particles[i].next = &particles[i+1];
|
||||
particles[r_numparticles-1].next = NULL;
|
||||
}
|
||||
|
||||
|
||||
void R_ReadPointFile_f (void)
|
||||
{
|
||||
QFile *f;
|
||||
vec3_t org;
|
||||
int r;
|
||||
int c;
|
||||
particle_t *p;
|
||||
char name[MAX_OSPATH];
|
||||
char buf[256];
|
||||
|
||||
// FIXME snprintf(name, sizeof(name),"maps/%s.pts", sv.name);
|
||||
|
||||
COM_FOpenFile (name, &f);
|
||||
if (!f)
|
||||
{
|
||||
Con_Printf ("couldn't open %s\n", name);
|
||||
return;
|
||||
}
|
||||
|
||||
Con_Printf ("Reading %s...\n", name);
|
||||
c = 0;
|
||||
for ( ;; )
|
||||
{
|
||||
if (!Qgets(f,buf,sizeof(buf)))
|
||||
break;
|
||||
r = sscanf (buf,"%f %f %f\n", &org[0], &org[1], &org[2]);
|
||||
if (r != 3)
|
||||
break;
|
||||
c++;
|
||||
|
||||
if (!free_particles)
|
||||
{
|
||||
Con_Printf ("Not enough free particles\n");
|
||||
break;
|
||||
}
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = 99999;
|
||||
p->color = (-c)&15;
|
||||
p->type = pt_static;
|
||||
VectorCopy (vec3_origin, p->vel);
|
||||
VectorCopy (org, p->org);
|
||||
}
|
||||
|
||||
Qclose (f);
|
||||
Con_Printf ("%i points read\n", c);
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
R_ParticleExplosion
|
||||
|
||||
===============
|
||||
*/
|
||||
void R_ParticleExplosion (vec3_t org)
|
||||
{
|
||||
int i, j;
|
||||
particle_t *p;
|
||||
|
||||
for (i=0 ; i<1024 ; i++)
|
||||
{
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = cl.time + 5;
|
||||
p->color = ramp1[0];
|
||||
p->ramp = rand()&3;
|
||||
if (i & 1)
|
||||
{
|
||||
p->type = pt_explode;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
p->org[j] = org[j] + ((rand()%32)-16);
|
||||
p->vel[j] = (rand()%512)-256;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p->type = pt_explode2;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
p->org[j] = org[j] + ((rand()%32)-16);
|
||||
p->vel[j] = (rand()%512)-256;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
R_BlobExplosion
|
||||
|
||||
===============
|
||||
*/
|
||||
void R_BlobExplosion (vec3_t org)
|
||||
{
|
||||
int i, j;
|
||||
particle_t *p;
|
||||
|
||||
for (i=0 ; i<1024 ; i++)
|
||||
{
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = cl.time + 1 + (rand()&8)*0.05;
|
||||
|
||||
if (i & 1)
|
||||
{
|
||||
p->type = pt_blob;
|
||||
p->color = 66 + rand()%6;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
p->org[j] = org[j] + ((rand()%32)-16);
|
||||
p->vel[j] = (rand()%512)-256;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p->type = pt_blob2;
|
||||
p->color = 150 + rand()%6;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
p->org[j] = org[j] + ((rand()%32)-16);
|
||||
p->vel[j] = (rand()%512)-256;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
R_RunParticleEffect
|
||||
|
||||
===============
|
||||
*/
|
||||
void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
|
||||
{
|
||||
int i, j;
|
||||
particle_t *p;
|
||||
int scale;
|
||||
|
||||
if (count > 130)
|
||||
scale = 3;
|
||||
else if (count > 20)
|
||||
scale = 2;
|
||||
else
|
||||
scale = 1;
|
||||
|
||||
for (i=0 ; i<count ; i++)
|
||||
{
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = cl.time + 0.1*(rand()%5);
|
||||
p->color = (color&~7) + (rand()&7);
|
||||
p->type = pt_grav;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
p->org[j] = org[j] + scale*((rand()&15)-8);
|
||||
p->vel[j] = dir[j]*15;// + (rand()%300)-150;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
R_LavaSplash
|
||||
|
||||
===============
|
||||
*/
|
||||
void R_LavaSplash (vec3_t org)
|
||||
{
|
||||
int i, j, k;
|
||||
particle_t *p;
|
||||
float vel;
|
||||
vec3_t dir;
|
||||
|
||||
for (i=-16 ; i<16 ; i++)
|
||||
for (j=-16 ; j<16 ; j++)
|
||||
for (k=0 ; k<1 ; k++)
|
||||
{
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = cl.time + 2 + (rand()&31) * 0.02;
|
||||
p->color = 224 + (rand()&7);
|
||||
p->type = pt_grav;
|
||||
|
||||
dir[0] = j*8 + (rand()&7);
|
||||
dir[1] = i*8 + (rand()&7);
|
||||
dir[2] = 256;
|
||||
|
||||
p->org[0] = org[0] + dir[0];
|
||||
p->org[1] = org[1] + dir[1];
|
||||
p->org[2] = org[2] + (rand()&63);
|
||||
|
||||
VectorNormalize (dir);
|
||||
vel = 50 + (rand()&63);
|
||||
VectorScale (dir, vel, p->vel);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
===============
|
||||
R_TeleportSplash
|
||||
|
||||
===============
|
||||
*/
|
||||
void R_TeleportSplash (vec3_t org)
|
||||
{
|
||||
int i, j, k;
|
||||
particle_t *p;
|
||||
float vel;
|
||||
vec3_t dir;
|
||||
|
||||
for (i=-16 ; i<16 ; i+=4)
|
||||
for (j=-16 ; j<16 ; j+=4)
|
||||
for (k=-24 ; k<32 ; k+=4)
|
||||
{
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
p->die = cl.time + 0.2 + (rand()&7) * 0.02;
|
||||
p->color = 7 + (rand()&7);
|
||||
p->type = pt_grav;
|
||||
|
||||
dir[0] = j*8;
|
||||
dir[1] = i*8;
|
||||
dir[2] = k*8;
|
||||
|
||||
p->org[0] = org[0] + i + (rand()&3);
|
||||
p->org[1] = org[1] + j + (rand()&3);
|
||||
p->org[2] = org[2] + k + (rand()&3);
|
||||
|
||||
VectorNormalize (dir);
|
||||
vel = 50 + (rand()&63);
|
||||
VectorScale (dir, vel, p->vel);
|
||||
}
|
||||
}
|
||||
|
||||
void R_RocketTrail (vec3_t start, vec3_t end, int type)
|
||||
{
|
||||
vec3_t vec;
|
||||
float len;
|
||||
int j;
|
||||
particle_t *p;
|
||||
|
||||
VectorSubtract (end, start, vec);
|
||||
len = VectorNormalize (vec);
|
||||
while (len > 0)
|
||||
{
|
||||
len -= 3;
|
||||
|
||||
if (!free_particles)
|
||||
return;
|
||||
p = free_particles;
|
||||
free_particles = p->next;
|
||||
p->next = active_particles;
|
||||
active_particles = p;
|
||||
|
||||
VectorCopy (vec3_origin, p->vel);
|
||||
p->die = cl.time + 2;
|
||||
|
||||
switch (type) {
|
||||
case 4:
|
||||
// slight blood
|
||||
p->type = pt_slowgrav;
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
len -= 3;
|
||||
break;
|
||||
case 2:
|
||||
// blood
|
||||
p->type = pt_slowgrav;
|
||||
p->color = 67 + (rand()&3);
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 6:
|
||||
// voor trail
|
||||
p->color = 9*16 + 8 + (rand()&3);
|
||||
p->type = pt_static;
|
||||
p->die = cl.time + 0.3;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()&15)-8);
|
||||
break;
|
||||
case 1:
|
||||
// smoke smoke
|
||||
p->ramp = (rand()&3) + 2;
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 0:
|
||||
// rocket trail
|
||||
p->ramp = (rand()&3);
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->type = pt_fire;
|
||||
for (j=0 ; j<3 ; j++)
|
||||
p->org[j] = start[j] + ((rand()%6)-3);
|
||||
break;
|
||||
case 3:
|
||||
case 5:
|
||||
{
|
||||
// tracer
|
||||
static int tracercount;
|
||||
|
||||
p->die = cl.time + 0.5;
|
||||
p->type = pt_static;
|
||||
if (type == 3)
|
||||
p->color = 52 + ((tracercount&4)<<1);
|
||||
else
|
||||
p->color = 230 + ((tracercount&4)<<1);
|
||||
|
||||
tracercount++;
|
||||
|
||||
VectorCopy (start, p->org);
|
||||
if (tracercount & 1) {
|
||||
p->vel[0] = 30*vec[1];
|
||||
p->vel[1] = 30*-vec[0];
|
||||
} else {
|
||||
p->vel[0] = 30*-vec[1];
|
||||
p->vel[1] = 30*vec[0];
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
VectorAdd (start, vec, start);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "glquake.h"
|
||||
#include "r_local.h"
|
||||
#include <mathlib.h>
|
||||
|
||||
extern particle_t *active_particles, *free_particles;
|
||||
extern int ramp1[8], ramp2[8], ramp3[8];
|
||||
|
||||
/*
|
||||
===============
|
||||
R_DrawParticles
|
||||
===============
|
||||
*/
|
||||
extern cvar_t sv_gravity;
|
||||
|
||||
void R_DrawParticles (void)
|
||||
{
|
||||
particle_t *p, *kill;
|
||||
float grav;
|
||||
int i;
|
||||
float time2, time3;
|
||||
float time1;
|
||||
float dvel;
|
||||
float frametime;
|
||||
|
||||
vec3_t up, right;
|
||||
float scale;
|
||||
|
||||
GL_Bind(particletexture);
|
||||
glEnable (GL_BLEND);
|
||||
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
||||
glBegin (GL_TRIANGLES);
|
||||
|
||||
VectorScale (vup, 1.5, up);
|
||||
VectorScale (vright, 1.5, right);
|
||||
frametime = cl.time - cl.oldtime;
|
||||
time3 = frametime * 15;
|
||||
time2 = frametime * 10; // 15;
|
||||
time1 = frametime * 5;
|
||||
grav = frametime * sv_gravity.value * 0.05;
|
||||
dvel = 4*frametime;
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
kill = active_particles;
|
||||
if (kill && kill->die < cl.time)
|
||||
{
|
||||
active_particles = kill->next;
|
||||
kill->next = free_particles;
|
||||
free_particles = kill;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
for (p=active_particles ; p ; p=p->next)
|
||||
{
|
||||
for ( ;; )
|
||||
{
|
||||
kill = p->next;
|
||||
if (kill && kill->die < cl.time)
|
||||
{
|
||||
p->next = kill->next;
|
||||
kill->next = free_particles;
|
||||
free_particles = kill;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// hack a scale up to keep particles from disapearing
|
||||
scale = (p->org[0] - r_origin[0])*vpn[0] + (p->org[1] - r_origin[1])*vpn[1]
|
||||
+ (p->org[2] - r_origin[2])*vpn[2];
|
||||
if (scale < 20)
|
||||
scale = 1;
|
||||
else
|
||||
scale = 1 + scale * 0.004;
|
||||
glColor3ubv ((byte *)&d_8to24table[(int)p->color]);
|
||||
glTexCoord2f (0,0);
|
||||
glVertex3fv (p->org);
|
||||
glTexCoord2f (1,0);
|
||||
glVertex3f (p->org[0] + up[0]*scale, p->org[1] + up[1]*scale, p->org[2] + up[2]*scale);
|
||||
glTexCoord2f (0,1);
|
||||
glVertex3f (p->org[0] + right[0]*scale, p->org[1] + right[1]*scale, p->org[2] + right[2]*scale);
|
||||
p->org[0] += p->vel[0]*frametime;
|
||||
p->org[1] += p->vel[1]*frametime;
|
||||
p->org[2] += p->vel[2]*frametime;
|
||||
|
||||
switch (p->type)
|
||||
{
|
||||
case pt_static:
|
||||
break;
|
||||
case pt_fire:
|
||||
p->ramp += time1;
|
||||
if (p->ramp >= 6)
|
||||
p->die = -1;
|
||||
else
|
||||
p->color = ramp3[(int)p->ramp];
|
||||
p->vel[2] += grav;
|
||||
break;
|
||||
|
||||
case pt_explode:
|
||||
p->ramp += time2;
|
||||
if (p->ramp >=8)
|
||||
p->die = -1;
|
||||
else
|
||||
p->color = ramp1[(int)p->ramp];
|
||||
for (i=0 ; i<3 ; i++)
|
||||
p->vel[i] += p->vel[i]*dvel;
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
|
||||
case pt_explode2:
|
||||
p->ramp += time3;
|
||||
if (p->ramp >=8)
|
||||
p->die = -1;
|
||||
else
|
||||
p->color = ramp2[(int)p->ramp];
|
||||
for (i=0 ; i<3 ; i++)
|
||||
p->vel[i] -= p->vel[i]*frametime;
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
|
||||
case pt_blob:
|
||||
for (i=0 ; i<3 ; i++)
|
||||
p->vel[i] += p->vel[i]*dvel;
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
|
||||
case pt_blob2:
|
||||
for (i=0 ; i<2 ; i++)
|
||||
p->vel[i] -= p->vel[i]*dvel;
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
|
||||
case pt_grav:
|
||||
#ifdef QUAKE2
|
||||
p->vel[2] -= grav * 20;
|
||||
break;
|
||||
#endif
|
||||
case pt_slowgrav:
|
||||
p->vel[2] -= grav;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
glEnd ();
|
||||
glDisable (GL_BLEND);
|
||||
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
||||
}
|
||||
|
||||
Loading…
Reference in a new issue