Fix glTF loading for index types other than 16-bit

engine/CMakeLists.txt

@@ -174,8 +174,8 @@ set (KOKKO_SOURCES
 	src/Graphics/TransformUpdateReceiver.hpp
 	src/Graphics/Scene.cpp
 	src/Graphics/Scene.hpp
-	src/Math/BoundingBox.cpp
-	src/Math/BoundingBox.hpp
+	src/Math/AABB.cpp
+	src/Math/AABB.hpp
 	src/Math/Frustum.hpp
 	src/Math/Intersect3D.cpp
 	src/Math/Intersect3D.hpp

engine/src/Debug/DebugTextRenderer.cpp

@@ -326,11 +326,9 @@ void DebugTextRenderer::CreateAndUploadData()
 	data.vertexData = vertexData.GetData();
 	data.vertexDataSize = vertexData.GetCount() * sizeof(vertexData[0]);
 	data.vertexCount = vertexData.GetCount() / static_cast<int>(componentCount);
-	data.vertexBufferUsage = RenderBufferUsage::DynamicDraw;
 	data.indexData = indexData.GetData();
 	data.indexDataSize = indexData.GetCount() * sizeof(indexData[0]);
-	data.indexCount = static_cast<unsigned int>(indexData.GetCount());
-	data.indexBufferUsage = RenderBufferUsage::DynamicDraw;
+	data.indexCount = static_cast<uint32_t>(indexData.GetCount());
 
 	meshManager->UploadIndexed(meshId, data);
 

engine/src/Debug/DebugVectorRenderer.cpp

@@ -348,7 +348,6 @@ void DebugVectorRenderer::DrawLineChainScreen(size_t count, const Vec3f* points,
 		VertexData data;
 		data.vertexFormat = vertexFormatPos;
 		data.primitiveMode = RenderPrimitiveMode::LineStrip;
-		data.vertexBufferUsage = RenderBufferUsage::DynamicDraw;
 		data.vertexData = reinterpret_cast<const float*>(points);
 		data.vertexDataSize = static_cast<unsigned int>(requiredBufferSize);
 		data.vertexCount = static_cast<unsigned int>(count);

engine/src/Graphics/TerrainQuadTree.cpp

@@ -10,7 +10,7 @@
 
 #include "Graphics/TerrainSystem.hpp"
 
-#include "Math/BoundingBox.hpp"
+#include "Math/AABB.hpp"
 #include "Math/Frustum.hpp"
 #include "Math/Intersect3D.hpp"
 
@@ -121,7 +121,7 @@ void TerrainQuadTree::RenderTile(
 	Vec3f tileMin = levelOrigin + Vec3f(id.x * tileWidth, terrainBottom, id.y * tileWidth);
 	Vec3f tileSize(tileWidth, terrainHeight, tileWidth);
 
-	BoundingBox tileBounds;
+	AABB tileBounds;
 	tileBounds.extents = tileSize * 0.5f;
 	tileBounds.center = tileMin + tileBounds.extents;
 

engine/src/Math/BoundingBox.cpp → engine/src/Math/AABB.cpp

@@ -1,25 +1,28 @@
-#include "Math/BoundingBox.hpp"
+#include "Math/AABB.hpp"
 
 #include <cmath>
 #include <algorithm>
 #include <limits>
 
-BoundingBox BoundingBox::Transform(const Mat4x4f& m) const
+namespace kokko
+{
+
+AABB AABB::Transform(const Mat4x4f& m) const
 {
 	Mat4x4f absm;
 
 	for (int i = 0; i < 16; ++i)
 		absm[i] = std::abs(m[i]);
 
-	BoundingBox result;
+	AABB result;
 
 	result.center = (m * Vec4f(this->center, 1.0f)).xyz();
 	result.extents = (absm * Vec4f(this->extents, 0.0f)).xyz();
 
 	return result;
 }
 
-void BoundingBox::UpdateToContain(unsigned int count, const Vec3f* points)
+void AABB::UpdateToContain(unsigned int count, const Vec3f* points)
 {
 	constexpr float fmax = std::numeric_limits<float>::max();
 	constexpr float fmin = std::numeric_limits<float>::min();
@@ -42,3 +45,5 @@ void BoundingBox::UpdateToContain(unsigned int count, const Vec3f* points)
 	extents = difference * 0.5f;
 	center = minimum + extents;
 }
+
+} // namespace kokko

engine/src/Math/BoundingBox.hpp → engine/src/Math/AABB.hpp

@@ -3,11 +3,16 @@
 #include "Math/Vec3.hpp"
 #include "Math/Mat4x4.hpp"
 
-struct BoundingBox
+namespace kokko
+{
+
+struct AABB
 {
 	Vec3f center;
 	Vec3f extents;
 
-	BoundingBox Transform(const Mat4x4f& m) const;
+	AABB Transform(const Mat4x4f& m) const;
 	void UpdateToContain(unsigned int count, const Vec3f* points);
 };
+
+} // namespace kokko