qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

make VectorSubtract and VectorCompare macros and clean up the readability

Browse source 
of R_DrawParticles
This commit is contained in:
Bill Currie 2001-08-29 20:19:54 +00:00
parent 3656d6fd59
commit 0d55476711
3 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/QF/mathlib.h
View file

@ -48,6 +48,9 @@ extern int nanmask;
#define VectorMA(a,s,b,c) {(c)[0]=(a)[0]+(s)*(b)[0];(c)[1]=(a)[1]+(s)*(b)[1];(c)[2]=(a)[2]+(s)*(b)[2];} #define VectorMA(a,s,b,c) {(c)[0]=(a)[0]+(s)*(b)[0];(c)[1]=(a)[1]+(s)*(b)[1];(c)[2]=(a)[2]+(s)*(b)[2];}
#define Length(a) sqrt(DotProduct(a, a)) #define Length(a) sqrt(DotProduct(a, a))
#define VectorScale(a,b,c) {(c)[0]=(a)[0]*(b);(c)[1]=(a)[1]*(b);(c)[2]=(a)[2]*(b);}
#define VectorCompare(x, y) ((x[0] == y[0]) && (x[1] == y[1]) && (x[2] == y[2]))
/* /*
* VectorDistance, the distance between two points. * VectorDistance, the distance between two points.
* Yes, this is the same as sqrt(VectorSubtract then DotProduct), * Yes, this is the same as sqrt(VectorSubtract then DotProduct),
@ -75,12 +78,12 @@ void _VectorSubtract (vec3_t veca, vec3_t vecb, vec3_t out);
void _VectorAdd (vec3_t veca, vec3_t vecb, vec3_t out); void _VectorAdd (vec3_t veca, vec3_t vecb, vec3_t out);
void _VectorCopy (vec3_t in, vec3_t out); void _VectorCopy (vec3_t in, vec3_t out);
int VectorCompare (vec3_t v1, vec3_t v2); int _VectorCompare (vec3_t v1, vec3_t v2);
//vec_t Length (vec3_t v); //vec_t Length (vec3_t v);
void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross); void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross);
float VectorNormalize (vec3_t v); // returns vector length float VectorNormalize (vec3_t v); // returns vector length
void VectorInverse (vec3_t v); void VectorInverse (vec3_t v);
void VectorScale (vec3_t in, vec_t scale, vec3_t out); void _VectorScale (vec3_t in, vec_t scale, vec3_t out);
int Q_log2(int val); int Q_log2(int val);
void R_ConcatRotations (float in1[3][3], float in2[3][3], float out[3][3]); void R_ConcatRotations (float in1[3][3], float in2[3][3], float out[3][3]);

4
libs/util/mathlib.c
View file

@ -369,7 +369,7 @@ AngleVectors (vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
} }
int int
VectorCompare (vec3_t v1, vec3_t v2) _VectorCompare (vec3_t v1, vec3_t v2)
{ {
int i; int i;
@ -470,7 +470,7 @@ VectorInverse (vec3_t v)
} }
void void
VectorScale (vec3_t in, vec_t scale, vec3_t out) _VectorScale (vec3_t in, vec_t scale, vec3_t out)
{ {
out[0] = in[0] * scale; out[0] = in[0] * scale;
out[1] = in[1] * scale; out[1] = in[1] * scale;

38
libs/video/renderer/gl/gl_dyn_part.c
View file

@ -562,7 +562,7 @@ R_DrawParticles (void)
float scale; float scale;
particle_t *part; particle_t *part;
vec3_t up, right, o_up, o_right; vec3_t up, right, o_up, o_right;
vec3_t up_scale, right_scale, up_right_scale; vec3_t up_scale, right_scale, up_right_scale, down_right_scale;
int activeparticles, maxparticle, j, k; int activeparticles, maxparticle, j, k;
// LordHavoc: particles should not affect zbuffer // LordHavoc: particles should not affect zbuffer
@ -603,8 +603,7 @@ R_DrawParticles (void)
at = (byte *) & d_8to24table[(byte) part->color]; at = (byte *) & d_8to24table[(byte) part->color];
alpha = part->alpha; alpha = part->alpha;
#define mVectorCompare(x, y) ((x[0] == y[0]) && (x[1] == y[1]) && (x[2] == y[2])) if (VectorCompare(part->up, part->right)) {
if (mVectorCompare(part->up, part->right)) {
memcpy(up, o_up, sizeof(up)); memcpy(up, o_up, sizeof(up));
memcpy(right, o_right, sizeof(right)); memcpy(right, o_right, sizeof(right));
} else { } else {
@ -623,33 +622,16 @@ R_DrawParticles (void)
scale = part->scale; scale = part->scale;
up_scale[0] = up[0] * scale; VectorScale (up, scale, up_scale);
up_scale[1] = up[1] * scale; VectorScale (right, scale, right_scale);
up_scale[2] = up[2] * scale;
right_scale[0] = right[0] * scale; VectorAdd (right_scale, up_scale, up_right_scale);
right_scale[1] = right[1] * scale; VectorSubtract (right_scale, up_scale, down_right_scale);
right_scale[2] = right[2] * scale;
up_right_scale[0] = (up[0] + right[0]) * scale; VectorAdd (part->org, up_right_scale, varray[0].vertex);
up_right_scale[1] = (up[1] + right[1]) * scale; VectorAdd (part->org, down_right_scale, varray[1].vertex);
up_right_scale[2] = (up[2] + right[2]) * scale; VectorSubtract (part->org, up_right_scale, varray[2].vertex);
VectorSubtract (part->org, down_right_scale, varray[3].vertex);
varray[0].vertex[0] = part->org[0] + up_right_scale[0];
varray[0].vertex[1] = part->org[1] + up_right_scale[1];
varray[0].vertex[2] = part->org[2] + up_right_scale[2];
varray[1].vertex[0] = part->org[0] - up_scale[0] + right_scale[0];
varray[1].vertex[1] = part->org[1] - up_scale[1] + right_scale[1];
varray[1].vertex[2] = part->org[2] - up_scale[2] + right_scale[2];
varray[2].vertex[0] = part->org[0] - up_right_scale[0];
varray[2].vertex[1] = part->org[1] - up_right_scale[1];
varray[2].vertex[2] = part->org[2] - up_right_scale[2];
varray[3].vertex[0] = part->org[0] + up_scale[0] - right_scale[0];
varray[3].vertex[1] = part->org[1] + up_scale[1] - right_scale[1];
varray[3].vertex[2] = part->org[2] + up_scale[2] - right_scale[2];
qfglBindTexture (GL_TEXTURE_2D, part->tex); qfglBindTexture (GL_TEXTURE_2D, part->tex);
qfglDrawArrays (GL_QUADS, 0, 4); qfglDrawArrays (GL_QUADS, 0, 4);