diff --git a/src/render/glTFModel.h b/src/render/glTFModel.h index 098a63c..62cf121 100644 --- a/src/render/glTFModel.h +++ b/src/render/glTFModel.h @@ -15,7 +15,7 @@ #include #include - +#define TINYGLTF_NO_STB_IMAGE_WRITE #ifdef VK_USE_PLATFORM_ANDROID_KHR #define TINYGLTF_ANDROID_LOAD_FROM_ASSETS @@ -31,14 +31,24 @@ // Contains everything required to render a glTF model in Vulkan // This class is heavily simplified (compared to glTF's feature set) but retains the basic glTF structure -class VulkanglTFModel +namespace VulkanglTFModel { -public: + // The class requires some Vulkan objects so it can create it's own resources vks::VulkanDevice* vulkanDevice; VkQueue copyQueue; uint32_t nodeCount; + enum DescriptorBindingFlags { + ImageBaseColor = 0x00000001, + ImageNormalMap = 0x00000002 + }; + + extern VkDescriptorSetLayout descriptorSetLayoutImage; + extern VkDescriptorSetLayout descriptorSetLayoutUbo; + extern VkMemoryPropertyFlags memoryPropertyFlags; + extern uint32_t descriptorBindingFlags; + // The vertex layout for the samples' model struct Vertex { glm::vec3 pos;