From 25402941e3ca636285ace68c13051fd0dbe29a9c Mon Sep 17 00:00:00 2001 From: ink-soul Date: Mon, 5 Jun 2023 10:38:28 +0800 Subject: [PATCH] reconstruct render --- src/render/render.cpp | 6 ++++-- src/render/render.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/render/render.cpp b/src/render/render.cpp index 47e5a56..b99e717 100644 --- a/src/render/render.cpp +++ b/src/render/render.cpp @@ -221,8 +221,8 @@ PlumageRender::PlumageRender(): VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i])); } } - - void PlumageRender::loadglTFFile(std::string filename, VulkanglTFModel& model, bool bSkyboxFlag = false) +/* + void PlumageRender::loadglTFFile(std::string filename, glTFModel::Model& model, bool bSkyboxFlag = false) { tinygltf::Model glTFInput; tinygltf::TinyGLTF gltfContext; @@ -333,6 +333,8 @@ PlumageRender::PlumageRender(): vkDestroyBuffer(device, indexStaging.buffer, nullptr); vkFreeMemory(device, indexStaging.memory, nullptr); } +*/ + // TO DO:reconstruct with getting file path through struct void PlumageRender::loadAssets() { diff --git a/src/render/render.h b/src/render/render.h index 12b022c..00e2a93 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -17,7 +17,7 @@ public: bool ToneMapping = true; bool pbrEnabled = true; - VulkanglTFModel glTFModel; + glTFModel::Model glTFModel; struct ShaderData { vks::Buffer buffer; @@ -154,7 +154,7 @@ public: uint32_t numSamples = 32u; } prefilterPushBlock; - VulkanglTFModel skyboxModel; + glTFModel::Model skyboxModel; PlumageRender(); ~PlumageRender() @@ -185,7 +185,7 @@ public: shaderData.buffer.destroy(); shaderData.skinSSBO.destroy(); } - void loadglTFFile(std::string filename, VulkanglTFModel& model, bool bSkyboxFlag); + virtual void getEnabledFeatures(); void createAttachment(VkFormat format, VkImageUsageFlagBits usage, FrameBufferAttachment* attachment, uint32_t width, uint32_t height); virtual void setupFrameBuffer();