diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index 53458e09d..d0de7cb6f 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -37,6 +37,7 @@ class NAZARA_API NzModel : public NzRenderable, public NzResource public: NzModel(); NzModel(const NzModel& model) = default; + NzModel(NzModel&& model) = default; virtual ~NzModel(); 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); NzModel& operator=(const NzModel& node) = default; + NzModel& operator=(NzModel&& node) = default; protected: void MakeBoundingVolume() const override; diff --git a/include/Nazara/Graphics/SkeletalModel.hpp b/include/Nazara/Graphics/SkeletalModel.hpp index 509d579ed..bbea076b8 100644 --- a/include/Nazara/Graphics/SkeletalModel.hpp +++ b/include/Nazara/Graphics/SkeletalModel.hpp @@ -54,7 +54,6 @@ class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable bool IsAnimated() const; bool IsAnimationEnabled() const; - bool IsDrawable() const; bool LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params = NzSkeletalModelParameters()); bool LoadFromMemory(const void* data, std::size_t size, const NzSkeletalModelParameters& params = NzSkeletalModelParameters()); diff --git a/src/Nazara/Graphics/SkeletalModel.cpp b/src/Nazara/Graphics/SkeletalModel.cpp index 5c2c91ab7..4eff37caf 100644 --- a/src/Nazara/Graphics/SkeletalModel.cpp +++ b/src/Nazara/Graphics/SkeletalModel.cpp @@ -136,11 +136,6 @@ bool NzSkeletalModel::IsAnimationEnabled() const return m_animationEnabled; } -bool NzSkeletalModel::IsDrawable() const -{ - return m_mesh != nullptr && m_mesh->GetSubMeshCount() >= 1; -} - bool NzSkeletalModel::LoadFromFile(const NzString& filePath, const NzSkeletalModelParameters& params) { return NzSkeletalModelLoader::LoadFromFile(this, filePath, params);