- fix batch generating and rendering errors

SoapyMan · SoapyMan · commit e875f6c4539d · 2021-03-07T02:42:53.000+06:00
diff --git a/DriverLevelTool/viewer/gl_renderer.cpp b/DriverLevelTool/viewer/gl_renderer.cpp
@@ -1,4 +1,4 @@
-#include "gl_renderer.h"
+﻿#include "gl_renderer.h"
 #include <SDL.h>
 #include "core/cmdlib.h"
 
@@ -25,6 +25,7 @@ int			g_swapInterval = 1;
 
 int			g_CurrentBlendMode = BM_NONE;
 int			g_CurrentDepthMode = 0;
+int			g_CurrentCullMode = CULL_NONE;
 GrVAO*		g_CurrentVAO = nullptr;
 TextureID	g_lastBoundTexture = -1;
 ShaderID	g_CurrentShader = -1;
@@ -54,6 +55,12 @@ static const GLenum glPrimitiveType[] = {
 	GL_POINTS,
 };
 
+static const GLenum glCullModes[] = {
+	GL_NONE,
+	GL_CW,
+	GL_CCW,
+};
+
 void GR_GetWVPUniforms(GLuint program)
 {
 	u_MatrixUniforms[MATRIX_VIEW] = glGetUniformLocation(program, "u_View");
@@ -342,7 +349,7 @@ void GR_UpdateMatrixUniforms()
 	g_matrices[MATRIX_WORLDVIEWPROJECTION] = identity4() * g_matrices[MATRIX_PROJECTION] * (g_matrices[MATRIX_VIEW] * g_matrices[MATRIX_WORLD]);
 	
 	for(int i = 0; i < MATRIX_MODES; i++)
-		glUniformMatrix4fv(u_MatrixUniforms[i], 1, GL_FALSE, g_matrices[i]);
+		glUniformMatrix4fv(u_MatrixUniforms[i], 1, GL_TRUE, g_matrices[i]);
 }
 
 //----------------------------------------------------------------
@@ -365,8 +372,8 @@ TextureID GR_CreateRGBATexture(int width, int height, ubyte* data)
 	glGenTextures(1, &newTexture);
 
 	glBindTexture(GL_TEXTURE_2D, newTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 
 	glFinish();
@@ -408,6 +415,16 @@ void GR_ClearDepth(float depth)
 	glClear(GL_STENCIL_BUFFER_BIT);
 }
 
+void GR_BeginScene()
+{
+	GR_SetViewPort(0, 0, g_windowWidth, g_windowHeight);
+}
+
+void GR_EndScene()
+{
+	
+}
+
 void GR_SwapWindow()
 {
 	SDL_GL_SwapWindow(g_window);
@@ -481,6 +498,24 @@ void GR_SetBlendMode(GR_BlendMode blendMode)
 	g_CurrentBlendMode = blendMode;
 }
 
+void GR_SetCullMode(GR_CullMode cullMode)
+{
+	if (g_CurrentCullMode == cullMode)
+		return;
+
+	if(cullMode == CULL_NONE)
+	{
+		glDisable(GL_CULL_FACE);
+	}
+	else
+	{
+		glEnable(GL_CULL_FACE);
+		glFrontFace(glCullModes[cullMode]);
+	}
+	
+	g_CurrentCullMode = cullMode;
+}
+
 //--------------------------------------------------------------------------
 
 GrVAO* GR_CreateVAO(int numVertices, GrVertex* verts /*= nullptr*/, int dynamic /*= 0*/)
@@ -565,5 +600,5 @@ void GR_DrawNonIndexed(GR_PrimitiveType primitivesType, int firstVertex, int num
 
 void GR_DrawIndexed(GR_PrimitiveType primitivesType, int firstIndex, int numIndices)
 {
-	glDrawElements(glPrimitiveType[primitivesType], numIndices, GL_UNSIGNED_INT, (void*)(intptr_t)firstIndex);
+	glDrawElements(glPrimitiveType[primitivesType], numIndices, GL_UNSIGNED_INT, (void*)(intptr_t)(firstIndex*sizeof(int)));
 }
diff --git a/DriverLevelTool/viewer/gl_renderer.h b/DriverLevelTool/viewer/gl_renderer.h
@@ -29,13 +29,20 @@ enum GR_ShaderAttrib
 
 enum GR_BlendMode
 {
-	BM_NONE,
+	BM_NONE = 0,
 	BM_AVERAGE,
 	BM_ADD,
 	BM_SUBTRACT,
 	BM_ADD_QUATER_SOURCE
 };
 
+enum GR_CullMode
+{
+	CULL_NONE = 0,
+	CULL_FRONT,
+	CULL_BACK,
+};
+
 enum GR_MatrixMode
 {
 	MATRIX_VIEW = 0,
@@ -69,6 +76,9 @@ ShaderID	GR_CompileShader(const char* source);
 
 //--------------------------------------------------
 
+void		GR_BeginScene();
+void		GR_EndScene();
+
 void		GR_ClearColor(int r, int g, int b);
 void		GR_ClearDepth(float depth);
 
@@ -94,12 +104,13 @@ void		GR_SetMatrix(GR_MatrixMode mode, const Matrix4x4& matrix);
 
 void		GR_SetPolygonOffset(float ofs);
 void		GR_SetDepth(int enable);
+void		GR_SetCullMode(GR_CullMode cullMode);
 
 void		GR_UpdateMatrixUniforms();
 
 //--------------------------------------------------
 
-void GR_DrawNonIndexed(GR_PrimitiveType primitivesType, int firstVertex, int numVertices);
-void GR_DrawIndexed(GR_PrimitiveType primitivesType, int firstIndex, int numIndices);
+void		GR_DrawNonIndexed(GR_PrimitiveType primitivesType, int firstVertex, int numVertices);
+void		GR_DrawIndexed(GR_PrimitiveType primitivesType, int firstIndex, int numIndices);
 
 #endif
diff --git a/DriverLevelTool/viewer/rendermodel.cpp b/DriverLevelTool/viewer/rendermodel.cpp
@@ -75,9 +75,16 @@ int FindGrVertexIndex(const DkList<vertexTuple_t>& whereFind, int flags, int ver
 	return -1;
 }
 
-modelBatch_t* FindBatch(DkList<modelBatch_t*>& batches, int tpageId)
+struct genBatch_t
 {
-	for(int i = 0; i < batches.numElem(); i++)
+	DkList<int>				indices;
+	
+	int tpage;
+};
+
+genBatch_t* FindBatch(DkList<genBatch_t*>& batches, int tpageId)
+{
+	for (int i = 0; i < batches.numElem(); i++)
 	{
 		if (batches[i]->tpage == tpageId)
 			return batches[i];
@@ -87,10 +94,9 @@ modelBatch_t* FindBatch(DkList<modelBatch_t*>& batches, int tpageId)
 
 void CRenderModel::GenerateBuffers()
 {
-	DkList<vertexTuple_t>	verticesMap;
-	
+	DkList<genBatch_t*>		batches;
 	DkList<GrVertex>		vertices;
-	DkList<int>				indices;
+	DkList<vertexTuple_t>	verticesMap;
 	
 	MODEL* model = m_sourceModel->model;
 	MODEL* vertex_ref = model;
@@ -108,13 +114,13 @@ void CRenderModel::GenerateBuffers()
 		vertex_ref = ref->model;
 	}
 
-	modelBatch_t* batch = nullptr;
+	genBatch_t* batch = nullptr;
 	
 	int modelSize = m_sourceModel->size;
 	int face_ofs = 0;
 	dpoly_t dec_face;
 
-	// go throught all polygons
+	// go through all polygons
 	for (int i = 0; i < model->num_polys; i++)
 	{
 		char* facedata = model->pPolyAt(face_ofs);
@@ -133,7 +139,9 @@ void CRenderModel::GenerateBuffers()
 		{
 			MsgError("poly id=%d type=%d ofs=%d zero size!\n", i, *facedata & 31, model->poly_block + face_ofs);
 			break;
-		}	
+		}
+
+		face_ofs += poly_size;
 
 		int numPolyVerts = (dec_face.flags & FACE_IS_QUAD) ? 4 : 3;
 		bool bad_face = false;
@@ -161,22 +169,22 @@ void CRenderModel::GenerateBuffers()
 		if (bad_face)
 		{
 			MsgError("poly id=%d type=%d ofs=%d has invalid indices (or format is unknown)\n", i, *facedata & 31, model->poly_block + face_ofs);
-			face_ofs += poly_size;
+			
 			continue;
 		}
 
 		// find or create new batch
 		int tpageId = (dec_face.flags & FACE_TEXTURED) ? dec_face.page : -1;
 
-		batch = FindBatch(m_batches, tpageId);
+		if(batch && batch->tpage != tpageId)
+			batch = FindBatch(batches, tpageId);
+		
 		if (!batch)
 		{
-			batch = new modelBatch_t;
-			batch->startIndex = indices.numElem();
-			batch->numIndices = 0;
+			batch = new genBatch_t;
 			batch->tpage = tpageId;
 	
-			m_batches.append(batch);
+			batches.append(batch);
 		}
 		
 		// Gouraud-shaded poly smoothing
@@ -193,7 +201,7 @@ void CRenderModel::GenerateBuffers()
 			int vflags = dec_face.flags & ~(FACE_IS_QUAD | FACE_RGB);
 			
 			// try searching for vertex
-			int index = FindGrVertexIndex(verticesMap, 
+			int index = FindGrVertexIndex(verticesMap,
 				vflags,
 				dec_face.vindices[VERT_IDX], 
 				dec_face.nindices[VERT_IDX], 
@@ -207,6 +215,7 @@ void CRenderModel::GenerateBuffers()
 
 				vertMap.flags = vflags;
 				vertMap.normalIndex = -1;
+				vertMap.vertexIndex = dec_face.vindices[VERT_IDX];
 				
 				// get the vertex
 				SVECTOR* vert = vertex_ref->pVertex(dec_face.vindices[VERT_IDX]);
@@ -230,11 +239,10 @@ void CRenderModel::GenerateBuffers()
 					newVert.tc_v = float(uv.v) / 256.0f;
 				}
 
-				vertMap.grVertexIndex = vertices.append(newVert);
-				vertMap.vertexIndex = dec_face.vindices[VERT_IDX];
+				index = vertMap.grVertexIndex = vertices.append(newVert);
 
 				// add vertex and a map
-				index = verticesMap.append(vertMap);
+				verticesMap.append(vertMap);
 
 				// vertices and verticesMap should be equal
 				_ASSERT(verticesMap.numElem() == vertices.numElem());
@@ -257,30 +265,50 @@ void CRenderModel::GenerateBuffers()
 
 			// set to each vertex
 			for (int v = 0; v < numPolyVerts; v++)
-				*(Vector3D*)&vertices[faceIndices[0]].nx = normal;
+				*(Vector3D*)&vertices[faceIndices[v]].nx = normal;
 		}
 
 		// triangulate quads
 		if(numPolyVerts == 4)
 		{
-			indices.append(faceIndices[0]);
-			indices.append(faceIndices[1]);
-			indices.append(faceIndices[2]);
-
-			indices.append(faceIndices[0]);
-			indices.append(faceIndices[2]);
-			indices.append(faceIndices[3]);
-			batch->numIndices += 6;
+			batch->indices.append(faceIndices[0]);
+			batch->indices.append(faceIndices[1]);
+			batch->indices.append(faceIndices[2]);
+
+			batch->indices.append(faceIndices[2]);
+			batch->indices.append(faceIndices[3]);
+			batch->indices.append(faceIndices[0]);
 		}
 		else
 		{
-			indices.append(faceIndices[0]);
-			indices.append(faceIndices[1]);
-			indices.append(faceIndices[2]);
-			batch->numIndices += 6;
+			batch->indices.append(faceIndices[0]);
+			batch->indices.append(faceIndices[1]);
+			batch->indices.append(faceIndices[2]);
 		}
+	}
 
-		face_ofs += poly_size;
+	//DkList<GrVertex> vertices;
+	DkList<int> indices;
+
+	// merge batches
+	for(int i = 0; i < batches.numElem(); i++)
+	{	
+		//int startVertex = vertices.numElem();
+		int startIndex = indices.numElem();
+		
+		//vertices.append(batches[i]->vertices);
+
+		for(int j = 0; j < batches[i]->indices.numElem(); j++)
+			indices.append(batches[i]->indices[j]);
+
+		modelBatch_t batch;
+		batch.startIndex = startIndex;
+		batch.numIndices = batches[i]->indices.numElem();
+		batch.tpage = batches[i]->tpage;
+
+		m_batches.append(batch);
+		
+		delete batches[i];
 	}
 	
 	m_vao = GR_CreateVAO(vertices.numElem(), indices.numElem(), vertices.ptr(), indices.ptr(), 0);
@@ -300,9 +328,9 @@ void CRenderModel::Draw()
 	
 	for(int i = 0; i < m_batches.numElem(); i++)
 	{
-		modelBatch_t* batch = m_batches[i];
+		modelBatch_t& batch = m_batches[i];
 		GR_SetShader(g_modelShader);
-		GR_SetTexture(g_hwTexturePages[batch->tpage][0]);
-		GR_DrawIndexed(PRIM_TRIANGLES, batch->startIndex, batch->numIndices);
+		GR_SetTexture(g_hwTexturePages[batch.tpage][0]);
+		GR_DrawIndexed(PRIM_TRIANGLES, batch.startIndex, batch.numIndices);
 	}
 }
diff --git a/DriverLevelTool/viewer/rendermodel.h b/DriverLevelTool/viewer/rendermodel.h
@@ -31,7 +31,7 @@ class CRenderModel
 	RegionModels_t*			m_regModelData{ nullptr };
 	ModelRef_t*				m_sourceModel { nullptr };
 	GrVAO*					m_vao { nullptr };
-	DkList<modelBatch_t*>	m_batches;
+	DkList<modelBatch_t>	m_batches;
 	int						m_numVerts;
 };
 
