Fix model load issues, add unit tests

aleksigron · Jun 1, 2024 · 71d52da · 71d52da
1 parent 7bc0f76
commit 71d52da
Show file tree

Hide file tree

Showing 11 changed files with 269 additions and 31 deletions.
diff --git a/engine/src/Debug/DebugVectorRenderer.cpp b/engine/src/Debug/DebugVectorRenderer.cpp
@@ -451,7 +451,7 @@ void DebugVectorRenderer::Render(kokko::render::CommandEncoder* encoder, World*
 				encoder->BindVertexArray(prim.vertexArrayId);
 
 				if (mesh.indexType != RenderIndexType::None)
-					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 				else
 					encoder->Draw(mesh.primitiveMode, 0, prim.count);
 			}

diff --git a/engine/src/Graphics/EnvironmentSystem.cpp b/engine/src/Graphics/EnvironmentSystem.cpp
@@ -424,7 +424,7 @@ void EnvironmentSystem::Upload(render::CommandEncoder* encoder)
 					BindBufferRange(encoder, UniformBlockBinding::Viewport,
 						viewportUniformBufferId, viewportBlockStride * i, sizeof(ViewportUniformBlock));
 
-					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 				}
 			}
 
@@ -467,7 +467,7 @@ void EnvironmentSystem::Upload(render::CommandEncoder* encoder)
 					BindBufferRange(encoder, UniformBlockBinding::Viewport,
 						viewportUniformBufferId, viewportBlockStride * i, sizeof(ViewportUniformBlock));
 
-					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 				}
 			}
 
@@ -515,7 +515,7 @@ void EnvironmentSystem::Upload(render::CommandEncoder* encoder)
 						BindBufferRange(encoder, UniformBlockBinding::Viewport,
 							viewportUniformBufferId, viewportBlockStride * i, sizeof(ViewportUniformBlock));
 
-						encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+						encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 					}
 				}
 			}

diff --git a/engine/src/Graphics/GraphicsFeatureDeferredLighting.cpp b/engine/src/Graphics/GraphicsFeatureDeferredLighting.cpp
@@ -376,7 +376,7 @@ void GraphicsFeatureDeferredLighting::Render(const RenderParameters& parameters)
 		auto& mesh = parameters.modelManager->GetModelMeshes(meshId)[0];
 		auto& prim = parameters.modelManager->GetModelPrimitives(meshId)[0];
 		encoder->BindVertexArray(prim.vertexArrayId);
-		encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+		encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 
 		return;
 	}

diff --git a/engine/src/Graphics/GraphicsFeatureSkybox.cpp b/engine/src/Graphics/GraphicsFeatureSkybox.cpp
@@ -113,7 +113,7 @@ void GraphicsFeatureSkybox::Render(const RenderParameters& parameters)
 	auto& mesh = parameters.modelManager->GetModelMeshes(meshId)[0];
 	auto& prim = parameters.modelManager->GetModelPrimitives(meshId)[0];
 	encoder->BindVertexArray(prim.vertexArrayId);
-	encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+	encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 }
 
 }
diff --git a/engine/src/Rendering/PostProcessRenderer.cpp b/engine/src/Rendering/PostProcessRenderer.cpp
@@ -91,7 +91,7 @@ void PostProcessRenderer::RenderPasses(unsigned int count, const PostProcessRend
 		if (pass.textureCount > 0)
 			BindTextures(shader, pass.textureCount, pass.textureNameHashes, pass.textureIds, pass.samplerIds);
 
-		encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+		encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 	}
 }
 

diff --git a/engine/src/Rendering/Renderer.cpp b/engine/src/Rendering/Renderer.cpp
@@ -417,7 +417,7 @@ void Renderer::Render(Window* window, const Optional<CameraParameters>& editorCa
 				{
 					auto& prim = primitives[primIdx];
 					encoder->BindVertexArray(prim.vertexArrayId);
-					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, 0, 0);
+					encoder->DrawIndexed(mesh.primitiveMode, mesh.indexType, prim.count, prim.indexOffset, 0);
 				}
 
 				objectDrawsProcessed += 1;