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

Always pass bary to set_vertex.

Browse source 
The contents of the barycentric coordinatess in the vertex data don't
matter for the dummy vertices, so skip the if and just use the first
barycentric coordinate.
This commit is contained in:
Bill Currie 2016-01-27 20:47:50 +09:00
parent cdce665de1
commit fff6d799b6
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/video/renderer/glsl/glsl_particles.c
View file

@ -1736,9 +1736,7 @@ set_vertex (trailvtx_t *v, const particle_t *point, float w, const vec3_t bary,
byte *color = (byte *) &d_8to24table[(byte) point->color];
VectorCopy (point->org, v->vertex);
if (bary) {
VectorCopy (bary, v->bary);
}
v->vertex[3] = w * point->scale;
v->texoff = off;
VectorScale (color, 1.5 / 255, v->colora);
@ -1780,8 +1778,8 @@ build_verts (trailvtx_t *v)
point = trail->points;
VectorScale (point->org, 2, dup.org);
VectorSubtract (dup.org, point->next->org, dup.org);
set_vertex (v++, &dup, -1, 0, 0);
set_vertex (v++, &dup, +1, 0, 0);
set_vertex (v++, &dup, -1, bary, 0);
set_vertex (v++, &dup, +1, bary, 0);
for (point = trail->points; point; point = point->next) {
second_last_point = last_point;
last_point = point;
@ -1793,8 +1791,8 @@ build_verts (trailvtx_t *v)
}
VectorScale (last_point->org, 2, dup.org);
VectorSubtract (dup.org, second_last_point->org, dup.org);
set_vertex (v++, &dup, -1, 0, 0);
set_vertex (v++, &dup, +1, 0, 0);
set_vertex (v++, &dup, -1, bary, 0);
set_vertex (v++, &dup, +1, bary, 0);
}
}