summaryrefslogtreecommitdiffstats
path: root/AssetLoader/interface
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-01-11 00:05:43 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-01-11 00:05:43 +0000
commite355607f4c3a97132cc069f13991c0636320b2d3 (patch)
tree48c98ff7ab68a9a89a8a74f2a97e6e0559d66b83 /AssetLoader/interface
parentGLTF loader: reworked initial texture data to be stored as user data in the t... (diff)
downloadDiligentTools-e355607f4c3a97132cc069f13991c0636320b2d3.tar.gz
DiligentTools-e355607f4c3a97132cc069f13991c0636320b2d3.zip
GLTF loader: reworked buffer initialization with user data
Diffstat (limited to 'AssetLoader/interface')
-rw-r--r--AssetLoader/interface/GLTFLoader.hpp17
1 files changed, 9 insertions, 8 deletions
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<Uint32>& IndexData,
+ std::vector<VertexBasicAttribs>& VertexBasicData,
+ std::vector<VertexSkinAttribs>* 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<ResourceInitData> InitData;
+ bool GPUDataInitialized = false;
struct BufferInfo
{