From fff6d799b610415c48ea5aa1e32c6cf68fac7b7e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 27 Jan 2016 20:47:50 +0900 Subject: [PATCH] Always pass bary to set_vertex. 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. --- libs/video/renderer/glsl/glsl_particles.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c index 42e8fe924..cb38cb07c 100644 --- a/libs/video/renderer/glsl/glsl_particles.c +++ b/libs/video/renderer/glsl/glsl_particles.c @@ -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); - } + 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); } }