From f2994c046a7c1a324b3ec95a8fb14e43aa7d01ea Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 2 May 2019 20:26:59 -0700 Subject: GLTF Loader: fixed transforms --- AssetLoader/interface/GLTFLoader.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'AssetLoader/interface') diff --git a/AssetLoader/interface/GLTFLoader.h b/AssetLoader/interface/GLTFLoader.h index a0e503a..dc3d500 100644 --- a/AssetLoader/interface/GLTFLoader.h +++ b/AssetLoader/interface/GLTFLoader.h @@ -258,20 +258,19 @@ struct Model float3 max = float3(-FLT_MAX, -FLT_MAX, -FLT_MAX); } dimensions; - Model(IRenderDevice* pDevice, IDeviceContext* pContext, const std::string &filename, float scale = 1.0f); + Model(IRenderDevice* pDevice, IDeviceContext* pContext, const std::string &filename); - void UpdateAnimation(IDeviceContext* pContext, Uint32 index, float time); + void UpdateAnimation(Uint32 index, float time); private: - void LoadFromFile(IRenderDevice* pDevice, IDeviceContext* pContext, const std::string &filename, float scale); + void LoadFromFile(IRenderDevice* pDevice, IDeviceContext* pContext, const std::string &filename); void LoadNode(IRenderDevice* pDevice, Node* parent, const tinygltf::Node& gltf_node, uint32_t nodeIndex, const tinygltf::Model& gltf_model, std::vector& indexBuffer, - std::vector& vertexBuffer, - float globalscale); + std::vector& vertexBuffer); void LoadSkins(const tinygltf::Model& gltf_model); -- cgit v1.2.3