From 2eb22f8debec811cdea32ed7b8cf3ec98c752f7c Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 14 Sep 2023 19:24:43 -0400 Subject: Load model textures checkpoint. Refactors some Vulkan items related to CompGrBinds and EntityTypes. Adds some Vulkan globals related to textures. Adds a number of placeholder items: - Iffy use of setting Vulkan globals on instanced structs. - Unimplemented and inaccurate shaders - Iffy gltf sub-buffer logic (ignores vertex color data) - MipMap TODOs - TextureArray TODOs --- src/entities.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/entities.hpp') diff --git a/src/entities.hpp b/src/entities.hpp index 53fe0d9..98aba33 100644 --- a/src/entities.hpp +++ b/src/entities.hpp @@ -2,6 +2,7 @@ #define PKE_ENTITIES_HPP #include "vendor/cgltf-include.hpp" +#include "vendor/stb_image_include.hpp" #include "ecs.hpp" #include "components.hpp" #include "asset-manager.hpp" @@ -11,10 +12,15 @@ #include struct EntityType { + const char *modelsDir = nullptr; const char *modelFile = nullptr; const char *entityTypeCode = nullptr; EntityHandle entityHandle = EntityHandle_MAX; - VkPipelineLayoutCreateInfo *vkPipelineLayoutCreateInfo = nullptr; + VkDeviceMemory deviceMemoryVert = VK_NULL_HANDLE; + VkDeviceMemory deviceMemoryInst = VK_NULL_HANDLE; + VkDeviceMemory deviceMemoryTexture = VK_NULL_HANDLE; + VkImage textureImage = VK_NULL_HANDLE; + VkImageView textureImageView = VK_NULL_HANDLE; uint32_t startingInstanceCount = 1024; struct Importer_GLTF { int16_t AccessorIndexVertex = -1; -- cgit v1.2.3