diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-04-24 04:06:35 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-04-24 04:06:35 +0000 |
| commit | 3a80efdab33829fa12eb4f7360dad89eed9f62c1 (patch) | |
| tree | b753d287c207e86915f01b404804c5d0eaedd010 /AssetLoader/interface | |
| parent | Moved GLTFLoader structures to the header (diff) | |
| download | DiligentTools-3a80efdab33829fa12eb4f7360dad89eed9f62c1.tar.gz DiligentTools-3a80efdab33829fa12eb4f7360dad89eed9f62c1.zip | |
Implemented texture data loading in gltf loader
Diffstat (limited to 'AssetLoader/interface')
| -rw-r--r-- | AssetLoader/interface/GLTFLoader.h | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |