From e355607f4c3a97132cc069f13991c0636320b2d3 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 10 Jan 2021 16:05:43 -0800 Subject: GLTF loader: reworked buffer initialization with user data --- AssetLoader/interface/GLTFLoader.hpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'AssetLoader/interface') diff --git a/AssetLoader/interface/GLTFLoader.hpp b/AssetLoader/interface/GLTFLoader.hpp index cbe97a3..0d5a7fd 100644 --- a/AssetLoader/interface/GLTFLoader.hpp +++ b/AssetLoader/interface/GLTFLoader.hpp @@ -449,12 +449,14 @@ private: IDeviceContext* pContext, const CreateInfo& CI); - void LoadNode(IRenderDevice* pDevice, - Node* parent, - const tinygltf::Node& gltf_node, - uint32_t nodeIndex, - const tinygltf::Model& gltf_model, - bool LoadSkin); + void LoadNode(IRenderDevice* pDevice, + Node* parent, + const tinygltf::Node& gltf_node, + uint32_t nodeIndex, + const tinygltf::Model& gltf_model, + std::vector& IndexData, + std::vector& VertexBasicData, + std::vector* pVertexSkinData); void LoadSkins(const tinygltf::Model& gltf_model); @@ -472,8 +474,7 @@ private: Node* FindNode(Node* parent, Uint32 index); Node* NodeFromIndex(uint32_t index); - struct ResourceInitData; - std::unique_ptr InitData; + bool GPUDataInitialized = false; struct BufferInfo { -- cgit v1.2.3