Skip to content

Commit 4798a89

Browse files
committed
Move SF_TRIANGLES plane calculation to map loading
1 parent 4020d87 commit 4798a89

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/engine/renderer/tr_bsp.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,15 @@ static void ParseTriSurf( dsurface_t* ds, drawVert_t* verts, bspSurface_t* surf,
10801080

10811081
srfGeneric_t* surface = ( srfGeneric_t* ) surf->data;
10821082
surface->surfaceType = surfaceType_t::SF_TRIANGLES;
1083+
1084+
plane_t plane;
1085+
srfVert_t* v1 = surface->verts + surface->triangles[0].indexes[0];
1086+
srfVert_t* v2 = surface->verts + surface->triangles[0].indexes[1];
1087+
srfVert_t* v3 = surface->verts + surface->triangles[0].indexes[2];
1088+
1089+
PlaneFromPoints( plane, v1->xyz, v2->xyz, v3->xyz );
1090+
VectorCopy( plane.normal, surface->plane.normal );
1091+
surface->plane.dist = plane.dist;
10831092
}
10841093

10851094
static void ParseMesh( dsurface_t *ds, drawVert_t *verts, bspSurface_t *surf )

src/engine/renderer/tr_main.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,6 @@ R_PlaneForSurface
12051205
*/
12061206
void R_PlaneForSurface( surfaceType_t *surfType, cplane_t *plane ) {
12071207
srfPoly_t *poly;
1208-
srfVert_t *v1, *v2, *v3;
12091208

12101209
if ( !surfType )
12111210
{
@@ -1218,19 +1217,9 @@ void R_PlaneForSurface( surfaceType_t *surfType, cplane_t *plane ) {
12181217
switch ( *surfType )
12191218
{
12201219
case surfaceType_t::SF_FACE:
1221-
{
1222-
*plane = ( ( srfSurfaceFace_t* ) surfType )->plane;
1223-
return;
1224-
}
12251220
case surfaceType_t::SF_TRIANGLES:
12261221
{
1227-
srfGeneric_t* tri = ( srfGeneric_t* ) surfType;
1228-
v1 = tri->verts + tri->triangles[0].indexes[0];
1229-
v2 = tri->verts + tri->triangles[0].indexes[1];
1230-
v3 = tri->verts + tri->triangles[0].indexes[2];
1231-
PlaneFromPoints( plane4, v1->xyz, v2->xyz, v3->xyz );
1232-
VectorCopy( plane4.normal, plane->normal );
1233-
plane->dist = plane4.dist;
1222+
*plane = ( ( srfSurfaceFace_t* ) surfType )->plane;
12341223
return;
12351224
}
12361225
case surfaceType_t::SF_POLY:

0 commit comments

Comments
 (0)