From 8cc4d58920cd6bdab0b7fb328d7d3922176d1f40 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 10 Dec 2020 14:52:07 -0800 Subject: GLTF Loader: added --- AssetLoader/interface/GLTFLoader.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'AssetLoader/interface') diff --git a/AssetLoader/interface/GLTFLoader.hpp b/AssetLoader/interface/GLTFLoader.hpp index 604c838..81c7a96 100644 --- a/AssetLoader/interface/GLTFLoader.hpp +++ b/AssetLoader/interface/GLTFLoader.hpp @@ -348,9 +348,6 @@ struct Model /// Optional resource cache usage info. ResourceCacheUseInfo* pCacheInfo = nullptr; - - /// Optional transform to apply to the model - const float4x4* pTransform = nullptr; }; Model(IRenderDevice* pDevice, IDeviceContext* pContext, @@ -362,6 +359,8 @@ struct Model void PrepareGPUResources(IRenderDevice* pDevice, IDeviceContext* pCtx); + void Transform(const float4x4& Matrix); + IBuffer* GetBuffer(BUFFER_ID BuffId) { return Buffers[BuffId].pBuffer; @@ -415,7 +414,7 @@ private: void LoadMaterials(const tinygltf::Model& gltf_model); void LoadAnimations(const tinygltf::Model& gltf_model); void CalculateBoundingBox(Node* node, const Node* parent); - void GetSceneDimensions(); + void CalculateSceneDimensions(); Node* FindNode(Node* parent, Uint32 index); Node* NodeFromIndex(uint32_t index); -- cgit v1.2.3