summaryrefslogtreecommitdiffstats
path: root/AssetLoader/interface
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-05-03 03:26:59 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-05-03 03:26:59 +0000
commitf2994c046a7c1a324b3ec95a8fb14e43aa7d01ea (patch)
tree2bf7f21f3834da4aa6bcd7818aeaea425e53c1e2 /AssetLoader/interface
parentGLTF Loader: fixed texture format recognition (diff)
downloadDiligentTools-f2994c046a7c1a324b3ec95a8fb14e43aa7d01ea.tar.gz
DiligentTools-f2994c046a7c1a324b3ec95a8fb14e43aa7d01ea.zip
GLTF Loader: fixed transforms
Diffstat (limited to 'AssetLoader/interface')
-rw-r--r--AssetLoader/interface/GLTFLoader.h9
1 files changed, 4 insertions, 5 deletions
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<uint32_t>& indexBuffer,
- std::vector<Vertex>& vertexBuffer,
- float globalscale);
+ std::vector<Vertex>& vertexBuffer);
void LoadSkins(const tinygltf::Model& gltf_model);