pr updates

cadams-dak · cadams-dak · commit 2a156a1f38f5 · 2025-11-06T11:26:36.000-05:00
diff --git a/AssetLoader/interface/GLTFBuilder.hpp b/AssetLoader/interface/GLTFBuilder.hpp
@@ -444,6 +444,8 @@ Mesh* ModelBuilder::LoadMesh(const GltfModelType& GltfModel,
         if (GltfPrimitive.GetIndicesId() >= 0)
         {
             IndexCount = ConvertIndexData(GltfModel, GltfPrimitive.GetIndicesId(), VertexStart);
+            // For indexed primitives, the vertex offset is baked into the indices,
+            VertexStart = 0;
         }
 
         int MaterialId = GltfPrimitive.GetMaterialId();
diff --git a/AssetLoader/interface/GLTFLoader.hpp b/AssetLoader/interface/GLTFLoader.hpp
@@ -410,22 +410,22 @@ struct Primitive
     const Uint32 FirstIndex;
     const Uint32 IndexCount;
     const Uint32 VertexCount;
-    const Uint32 VertexStart;
+    const Uint32 FirstVertex;
     const Uint32 MaterialId;
 
     const BoundBox BB;
 
     Primitive(Uint32        _FirstIndex,
               Uint32        _IndexCount,
               Uint32        _VertexCount,
-              Uint32        _VertexStart,
+              Uint32        _FirstVertex,
               Uint32        _MaterialId,
               const float3& _BBMin,
               const float3& _BBMax) :
         FirstIndex{_FirstIndex},
         IndexCount{_IndexCount},
         VertexCount{_VertexCount},
-        VertexStart{_VertexStart},
+        FirstVertex{_FirstVertex},
         MaterialId{_MaterialId},
         BB{_BBMin, _BBMax}
     {

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,8 @@ Mesh* ModelBuilder::LoadMesh(const GltfModelType& GltfModel,`
`444`	`444`	`if (GltfPrimitive.GetIndicesId() >= 0)`
`445`	`445`	`{`
`446`	`446`	`IndexCount = ConvertIndexData(GltfModel, GltfPrimitive.GetIndicesId(), VertexStart);`
	`447`	`+ // For indexed primitives, the vertex offset is baked into the indices,`
	`448`	`+ VertexStart = 0;`
`447`	`449`	`}`
`448`	`450`
`449`	`451`	`int MaterialId = GltfPrimitive.GetMaterialId();`