eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

rotating particles (rendering at least)

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@217 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-09-15 03:01:10 +00:00
parent c0c41a92f5
commit 0f5a9b0a04
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
engine/client/r_part.c
View file

@ -130,6 +130,7 @@ typedef struct {
vec3_t rgb; vec3_t rgb;
float alpha; float alpha;
float scale; float scale;
float rotation;
} ramp_t; } ramp_t;
typedef struct part_type_s { typedef struct part_type_s {
@ -2159,13 +2160,8 @@ float pframetime;
#ifdef RGLQUAKE #ifdef RGLQUAKE
void GL_DrawTexturedParticle(particle_t *p, part_type_t *type) void GL_DrawTexturedParticle(particle_t *p, part_type_t *type)
{ {
float x,y;
float scale; float scale;
float texrot[7][2] ={
{0, 0},
{1, 0},
{1, 1},
{0, 1}
};
if (lasttype != type) if (lasttype != type)
{ {
@ -2203,14 +2199,24 @@ void GL_DrawTexturedParticle(particle_t *p, part_type_t *type)
p->rgb[2], p->rgb[2],
p->alpha); p->alpha);
glTexCoord2fv (texrot[((int)p/sizeof(*p))&3]); if (p->angle)
glVertex3f (p->org[0] - pright[0]*scale - pup[0]*scale, p->org[1] - pright[1]*scale - pup[1]*scale, p->org[2] - pright[2]*scale - pup[2]*scale); {
glTexCoord2fv (texrot[((int)p/sizeof(*p)+1)&3]); //bottom left x = sin(p->angle)*scale;
glVertex3f (p->org[0] - pright[0]*scale + pup[0]*scale, p->org[1] - pright[1]*scale + pup[1]*scale, p->org[2] - pright[2]*scale + pup[2]*scale); y = cos(p->angle)*scale;
glTexCoord2fv (texrot[((int)p/sizeof(*p)+2)&3]); //bottom right }
glVertex3f (p->org[0] + pright[0]*scale + pup[0]*scale, p->org[1] + pright[1]*scale + pup[1]*scale, p->org[2] + pright[2]*scale + pup[2]*scale); else
glTexCoord2fv (texrot[((int)p/sizeof(*p)+3)&3]); //top right {
glVertex3f (p->org[0] + pright[0]*scale - pup[0]*scale, p->org[1] + pright[1]*scale - pup[1]*scale, p->org[2] + pright[2]*scale - pup[2]*scale); x = 0;
y = scale;
}
glTexCoord2f(0,0);
glVertex3f (p->org[0] - x*pright[0] - y*pup[0], p->org[1] - x*pright[1] - y*pup[1], p->org[2] - x*pright[2] - y*pup[2]);
glTexCoord2f(0,1);
glVertex3f (p->org[0] - y*pright[0] + x*pup[0], p->org[1] - y*pright[1] + x*pup[1], p->org[2] - y*pright[2] + x*pup[2]);
glTexCoord2f(1,1);
glVertex3f (p->org[0] + x*pright[0] + y*pup[0], p->org[1] + x*pright[1] + y*pup[1], p->org[2] + x*pright[2] + y*pup[2]);
glTexCoord2f(1,0);
glVertex3f (p->org[0] + y*pright[0] - x*pup[0], p->org[1] + y*pright[1] - x*pup[1], p->org[2] + y*pright[2] - x*pup[2]);
} }
void GL_DrawTrifanParticle(particle_t *p, part_type_t *type) void GL_DrawTrifanParticle(particle_t *p, part_type_t *type)
@ -2353,7 +2359,7 @@ void SWD_DrawParticleBlob(particle_t *p, part_type_t *type)
D_DrawParticleTrans(p); D_DrawParticleTrans(p);
} }
#endif #endif
void DrawParticleTypes (void texturedparticles(void*,void*), void sparkparticles(void*,void*)) void DrawParticleTypes (void texturedparticles(particle_t *,part_type_t*), void sparkparticles(particle_t*,part_type_t*))
{ {
qboolean (*tr) (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal); qboolean (*tr) (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal);
@ -2400,9 +2406,9 @@ void DrawParticleTypes (void texturedparticles(void*,void*), void sparkparticles
while ((p=type->particles)) while ((p=type->particles))
{ {
if (*type->texname) if (*type->texname)
RQ_AddDistReorder(texturedparticles, p, type, p->org); RQ_AddDistReorder((void*)texturedparticles, p, type, p->org);
else else
RQ_AddDistReorder(sparkparticles, p, type, p->org); RQ_AddDistReorder((void*)sparkparticles, p, type, p->org);
type->particles = p->next; type->particles = p->next;
p->next = free_particles; p->next = free_particles;
@ -2532,9 +2538,9 @@ void DrawParticleTypes (void texturedparticles(void*,void*), void sparkparticles
} }
if (*type->texname) if (*type->texname)
RQ_AddDistReorder(texturedparticles, p, type, p->org); RQ_AddDistReorder((void*)texturedparticles, p, type, p->org);
else else
RQ_AddDistReorder(sparkparticles, p, type, p->org); RQ_AddDistReorder((void*)sparkparticles, p, type, p->org);
} }
} }

1
engine/common/particles.h
View file

@ -53,6 +53,7 @@ typedef struct particle_s
float color; float color;
vec3_t rgb; vec3_t rgb;
float alpha; float alpha;
float angle;
// drivers never touch the following fields // drivers never touch the following fields
vec3_t vel; vec3_t vel;