From 3a80efdab33829fa12eb4f7360dad89eed9f62c1 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 23 Apr 2019 21:06:35 -0700 Subject: Implemented texture data loading in gltf loader --- AssetLoader/interface/GLTFLoader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AssetLoader/interface') diff --git a/AssetLoader/interface/GLTFLoader.h b/AssetLoader/interface/GLTFLoader.h index 51f3822..02bea46 100644 --- a/AssetLoader/interface/GLTFLoader.h +++ b/AssetLoader/interface/GLTFLoader.h @@ -255,7 +255,7 @@ struct Model float3 max = float3(-FLT_MAX, -FLT_MAX, -FLT_MAX); } dimensions; - void loadFromFile(IRenderDevice* pDevice, IDeviceContext* pContext, std::string filename, float scale = 1.0f); + void LoadFromFile(IRenderDevice* pDevice, IDeviceContext* pContext, std::string filename, float scale = 1.0f); void Destroy(); void Draw(IDeviceContext* pCtx); void UpdateAnimation(IDeviceContext* pContext, Uint32 index, float time); @@ -277,7 +277,7 @@ private: const tinygltf::Model& gltf_model); void LoadTextureSamplers(IRenderDevice* pDevice, const tinygltf::Model& gltf_model); void LoadMaterials(const tinygltf::Model& gltf_model); - void loadAnimations(const tinygltf::Model& gltf_model); + void LoadAnimations(const tinygltf::Model& gltf_model); void DrawNode(IDeviceContext* pCtx, const Node* node); void CalculateBoundingBox(Node* node, const Node* parent); void GetSceneDimensions(); -- cgit v1.2.3