sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Update Light and Model to new interface

Browse Source 
Former-commit-id: 5643f20261524f93a5d080404de5ab0b29151acb
This commit is contained in:
Lynix
2015-06-04 00:18:43 +02:00
parent 349b322834
commit 8c6806eacb
6 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/Nazara/Graphics/Model.hpp
View File

@@ -27,7 +27,9 @@ struct NAZARA_API NzModelParameters
class NzModel;
using NzModelConstRef = NzObjectRef<const NzModel>;
using NzModelLoader = NzResourceLoader<NzModel, NzModelParameters>;
using NzModelRef = NzObjectRef<NzModel>;
class NAZARA_API NzModel : public NzRenderable, public NzResource
{
@@ -42,9 +44,6 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const override;
NzModel* Clone() const;
NzModel* Create() const;
NzMaterial* GetMaterial(const NzString& subMeshName) const;
NzMaterial* GetMaterial(unsigned int matIndex) const;
NzMaterial* GetMaterial(unsigned int skinIndex, const NzString& subMeshName) const;
@@ -75,6 +74,8 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource
NzModel& operator=(const NzModel& node) = default;
NzModel& operator=(NzModel&& node) = default;
template<typename... Args> static NzModelRef New(Args&&... args);
protected:
void MakeBoundingVolume() const override;
@@ -87,4 +88,6 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource
static NzModelLoader::LoaderList s_loaders;
};
#include <Nazara/Graphics/Model.inl>
#endif // NAZARA_MODEL_HPP