This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit f9e571231100fa24ebc14432f0635324b86d7417
Author: SmileTheory <smilethe...@gmail.com>
Date: Tue Sep 6 19:44:14 2016 -0700
OpenGL2: Fix missing bounds calculation when loading BSP surfaces.
---
code/renderergl2/tr_bsp.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index dbd3932..8b923c3 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -667,7 +667,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int
lightmapNum ) {
return shader;
}
-void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int realLightmapNum,
float hdrVertColors[3])
+void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int realLightmapNum,
float hdrVertColors[3], vec3_t *bounds)
{
vec4_t v;
@@ -675,6 +675,9 @@ void LoadDrawVertToSrfVert(srfVert_t *s, drawVert_t *d, int
realLightmapNum, flo
s->xyz[1] = LittleFloat(d->xyz[1]);
s->xyz[2] = LittleFloat(d->xyz[2]);
+ if (bounds)
+ AddPointToBounds(s->xyz, bounds[0], bounds[1]);
+
s->st[0] = LittleFloat(d->st[0]);
s->st[1] = LittleFloat(d->st[1]);
@@ -771,7 +774,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts,
float *hdrVertColors,
ClearBounds(surf->cullinfo.bounds[0], surf->cullinfo.bounds[1]);
verts += LittleLong(ds->firstVert);
for(i = 0; i < numVerts; i++)
- LoadDrawVertToSrfVert(&cv->verts[i], &verts[i],
realLightmapNum, hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 :
NULL);
+ LoadDrawVertToSrfVert(&cv->verts[i], &verts[i],
realLightmapNum, hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 :
NULL, surf->cullinfo.bounds);
// copy triangles
badTriangles = 0;
@@ -872,7 +875,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts,
float *hdrVertColors,
verts += LittleLong( ds->firstVert );
numPoints = width * height;
for(i = 0; i < numPoints; i++)
- LoadDrawVertToSrfVert(&points[i], &verts[i], realLightmapNum,
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL);
+ LoadDrawVertToSrfVert(&points[i], &verts[i], realLightmapNum,
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL, NULL);
// pre-tesseleate
R_SubdividePatchToGrid( grid, width, height, points );
@@ -936,7 +939,7 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t
*verts, float *hdrVertColor
ClearBounds(surf->cullinfo.bounds[0], surf->cullinfo.bounds[1]);
verts += LittleLong(ds->firstVert);
for(i = 0; i < numVerts; i++)
- LoadDrawVertToSrfVert(&cv->verts[i], &verts[i], -1,
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL);
+ LoadDrawVertToSrfVert(&cv->verts[i], &verts[i], -1,
hdrVertColors ? hdrVertColors + (ds->firstVert + i) * 3 : NULL,
surf->cullinfo.bounds);
// copy triangles
badTriangles = 0;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/ioquake3.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
