Move indices for material system surfaces when merging

This allows merging surfaces that originally don't have consecutive indexes.

Author: VReaperV

src/engine/renderer/GeometryOptimiser.cpp

@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "GeometryOptimiser.h"
 
 #include "ShadeCommon.h"
+#include "GeometryCache.h"
 
 static int LeafSurfaceCompare( const void* a, const void* b ) {
 	bspSurface_t* aa, * bb;
@@ -421,7 +422,8 @@ void MergeDuplicateVertices( bspSurface_t** rendererSurfaces, int numSurfaces, s
 	Log::Notice( "Merged %i vertices into %i in %i ms", numVerticesIn, numVerticesOut, Sys::Milliseconds() - start );
 }
 
-std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** rendererSurfaces, int numSurfaces ) {
+std::vector<MaterialSurface> OptimiseMapGeometryMaterial( bspSurface_t** rendererSurfaces, int numSurfaces,
+	const srfVert_t* vertices, const int numVerticesIn, const glIndex_t* indices, const int numIndicesIn ) {
 	std::vector<MaterialSurface> materialSurfaces;
 	materialSurfaces.reserve( numSurfaces );
 
@@ -469,13 +471,22 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 
 	std::vector<MaterialSurface> processedMaterialSurfaces;
 	processedMaterialSurfaces.reserve( numSurfaces );
+
+	glIndex_t* idxs = ( glIndex_t* ) ri.Hunk_AllocateTempMemory( numIndicesIn * sizeof( glIndex_t ) );
+	uint32_t numIndices = 0;
 	for ( uint32_t i = 0; i < materialSurfaces.size(); i++ ) {
 		MaterialSurface* surface = &materialSurfaces[i];
 
 		if ( surface->merged ) {
 			continue;
 		}
 
+		memcpy( idxs + numIndices, indices + surface->firstIndex, surface->count * sizeof( glIndex_t ) );
+		
+		surface->firstIndex = numIndices;
+
+		numIndices += surface->count;
+
 		uint32_t lastIndex = surface->firstIndex + surface->count;
 		for ( uint32_t j = i + 1; j < materialSurfaces.size(); j++ ) {
 			MaterialSurface* surface2 = &materialSurfaces[j];
@@ -551,15 +562,16 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 				continue;
 			}
 
-			if ( surface2->firstIndex == lastIndex ) {
-				surface->count += surface2->count;
-				lastIndex += surface2->count;
+			memcpy( idxs + numIndices, indices + surface2->firstIndex, surface2->count * sizeof( glIndex_t ) );
+			numIndices += surface2->count;
 
-				VectorCopy( origin, surface->origin );
-				surface->radius = radius;
+			surface->count += surface2->count;
+			lastIndex += surface2->count;
 
-				surface2->merged = true;
-			}
+			VectorCopy( origin, surface->origin );
+			surface->radius = radius;
+
+			surface2->merged = true;
 
 			if ( surface->count >= MAX_MATERIAL_SURFACE_INDEXES ) {
 				break;
@@ -577,5 +589,16 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 	materialSystem.SetWorldBounds( worldBounds );
 	materialSystem.GenerateWorldCommandBuffer( processedMaterialSurfaces );
 
+	vertexAttributeSpec_t attrs[] {
+		{ ATTR_INDEX_POSITION, GL_FLOAT, GL_FLOAT, &vertices[0].xyz, 3, sizeof( *vertices ), 0 },
+		{ ATTR_INDEX_COLOR, GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE, &vertices[0].lightColor, 4, sizeof( *vertices ), ATTR_OPTION_NORMALIZE },
+		{ ATTR_INDEX_QTANGENT, GL_SHORT, GL_SHORT, &vertices[0].qtangent, 4, sizeof( *vertices ), ATTR_OPTION_NORMALIZE },
+		{ ATTR_INDEX_TEXCOORD, GL_FLOAT, GL_HALF_FLOAT, &vertices[0].st, 4, sizeof( *vertices ), 0 },
+	};
+
+	geometryCache.AddMapGeometry( numVerticesIn, numIndices, std::begin( attrs ), std::end( attrs ), idxs );
+
+	ri.Hunk_FreeTempMemory( idxs );
+
 	return materialSurfaces;
 }

src/engine/renderer/GeometryOptimiser.h

@@ -99,6 +99,7 @@ void OptimiseMapGeometryCore( world_t* world, bspSurface_t** rendererSurfaces, i
 void MergeLeafSurfacesCore( world_t* world, bspSurface_t** rendererSurfaces, int numSurfaces );
 void MergeDuplicateVertices( bspSurface_t** rendererSurfaces, int numSurfaces, srfVert_t* vertices, int numVerticesIn,
 	glIndex_t* indices, int numIndicesIn, int& numVerticesOut, int& numIndicesOut );
-std::vector<MaterialSurface> OptimiseMapGeometryMaterial( bspSurface_t** rendererSurfaces, int numSurfaces );
+std::vector<MaterialSurface> OptimiseMapGeometryMaterial( bspSurface_t** rendererSurfaces, int numSurfaces,
+	const srfVert_t* vertices, const int numVerticesIn, const glIndex_t* indices, const int numIndicesIn );
 
 #endif // GEOMETRY_OPTIMISER_H

src/engine/renderer/tr_bsp.cpp

@@ -2721,7 +2721,7 @@ static void R_CreateWorldVBO() {
 	MergeDuplicateVertices( rendererSurfaces, numSurfaces, vboVerts, numVertsInitial, vboIdxs, 3 * numTriangles, numVerts, numIndices );
 
 	if ( glConfig2.usingMaterialSystem ) {
-		OptimiseMapGeometryMaterial( rendererSurfaces, numSurfaces );
+		OptimiseMapGeometryMaterial( rendererSurfaces, numSurfaces, vboVerts, numVerts, vboIdxs, numIndices );
 	}
 
 	vertexAttributeSpec_t attrs[]{
@@ -2731,10 +2731,6 @@ static void R_CreateWorldVBO() {
 		{ ATTR_INDEX_TEXCOORD, GL_FLOAT, GL_HALF_FLOAT, &vboVerts[0].st, 4, sizeof( *vboVerts ), 0 },
 	};
 
-	if ( glConfig2.usingGeometryCache ) {
-		geometryCache.AddMapGeometry( numVerts, numIndices, std::begin( attrs ), std::end( attrs ), vboIdxs );
-	}
-
 	s_worldData.vbo = R_CreateStaticVBO(
 		"staticWorld_VBO", std::begin( attrs ), std::end( attrs ), numVerts );
 	s_worldData.ibo = R_CreateStaticIBO2( "staticWorld_IBO", numTriangles, vboIdxs );