From b4ba9eb4f1fe02d65945a263beb3185a617a414b Mon Sep 17 00:00:00 2001
From: Jonathan Bradley <jcb@pikum.xyz>
Date: Tue, 12 Sep 2023 14:31:09 -0400
Subject: load gltf files - no shaders yet

---
 src/components.hpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/components.hpp')

diff --git a/src/components.hpp b/src/components.hpp
index 4ea4db2..ce5f0f2 100644
--- a/src/components.hpp
+++ b/src/components.hpp
@@ -22,11 +22,6 @@ struct Entity {
 	bool isMarkedForRemoval = false;
 };
 
-struct Vert {
-	glm::vec3 pos;
-	glm::vec2 tex;
-};
-
 struct InstPos {
 	glm::vec3 pos;
 	glm::vec3 rot;
@@ -36,17 +31,24 @@ struct InstPos {
 struct CompGrBinds {
 	EntityHandle entHandle = EntityHandle_MAX;
 	GrBindsHandle grBindsHandle = GrBindsHandle_MAX;
-	VkDeviceMemory deviceMemory = VK_NULL_HANDLE;
+	VkDeviceMemory deviceMemoryVert = VK_NULL_HANDLE;
+	VkDeviceMemory deviceMemoryInst = VK_NULL_HANDLE;
 	VkBuffer vertexBuffer = VK_NULL_HANDLE;
 	uint32_t vertexFirstBinding = 0;
 	uint32_t vertexCount = 0;
 	VkDeviceSize vertexOffsets = 0;
-	DynArray<Vert> vertexes{0};
+	VkBuffer normalsBuffer = VK_NULL_HANDLE;
+	uint32_t normalsFirstBinding = 0;
+	uint32_t normalsCount = 0;
+	VkDeviceSize normalsOffsets = 0;
+	VkBuffer uvBuffer = VK_NULL_HANDLE;
+	uint32_t uvFirstBinding = 0;
+	uint32_t uvCount = 0;
+	VkDeviceSize uvOffsets = 0;
 	VkBuffer indexBuffer = VK_NULL_HANDLE;
 	uint32_t indexFirstBinding = 0;
 	uint32_t indexCount = 0;
 	VkDeviceSize indexOffsets = 0;
-	DynArray<uint16_t> indexes{0};
 	VkBuffer instanceBuffer = VK_NULL_HANDLE;
 	uint32_t instanceFirstBinding = 0;
 	uint32_t instanceCount = 0;
-- 
cgit v1.2.3