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

Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK

Browse Source 
Conflicts:
	include/Nazara/Graphics/SkeletalModel.hpp
	src/Nazara/Graphics/SkeletalModel.cpp

Former-commit-id: 7dba08bc594d501adbc5a81c4ec1a70021eaa5b6
This commit is contained in:
Lynix
2015-05-31 22:18:09 +02:00
parent 847aa234c6 962c1f2362
commit 0f7948ea4c
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource
public: public:
NzModel(); NzModel();
NzModel(const NzModel& model) = default; NzModel(const NzModel& model) = default;
NzModel(NzModel&& model) = default;
virtual ~NzModel(); virtual ~NzModel();
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const override; void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const override;
@@ -72,6 +73,7 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource
void SetSkinCount(unsigned int skinCount); void SetSkinCount(unsigned int skinCount);
NzModel& operator=(const NzModel& node) = default; NzModel& operator=(const NzModel& node) = default;
NzModel& operator=(NzModel&& node) = default;
protected: protected:
void MakeBoundingVolume() const override; void MakeBoundingVolume() const override;

1
include/Nazara/Graphics/SkeletalModel.hpp
View File

@@ -54,7 +54,6 @@ class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable
bool IsAnimated() const; bool IsAnimated() const;
bool IsAnimationEnabled() const; bool IsAnimationEnabled() const;
bool IsDrawable() const;
bool LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params = NzSkeletalModelParameters()); bool LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params = NzSkeletalModelParameters());
bool LoadFromMemory(const void* data, std::size_t size, const NzSkeletalModelParameters& params = NzSkeletalModelParameters()); bool LoadFromMemory(const void* data, std::size_t size, const NzSkeletalModelParameters& params = NzSkeletalModelParameters());

5
src/Nazara/Graphics/SkeletalModel.cpp
View File

@@ -136,11 +136,6 @@ bool NzSkeletalModel::IsAnimationEnabled() const
return m_animationEnabled; return m_animationEnabled;
} }
bool NzSkeletalModel::IsDrawable() const
{
return m_mesh != nullptr && m_mesh->GetSubMeshCount() >= 1;
}
bool NzSkeletalModel::LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params) bool NzSkeletalModel::LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params)
{ {
return NzSkeletalModelLoader::LoadFromFile(this, filePath, params); return NzSkeletalModelLoader::LoadFromFile(this, filePath, params);