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

Graphics/SkeletalModel: Update to new code

Browse Source 
Former-commit-id: 74b17bf06b3c7c22477ee3a098301e70b093f890
This commit is contained in:
Lynix
2015-05-31 22:12:46 +02:00
parent d7e640fd1e
commit 8f8eca1d70
2 changed files with 11 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,11 @@ class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable
public:
NzSkeletalModel();
NzSkeletalModel(const NzSkeletalModel& model);
NzSkeletalModel(NzSkeletalModel&& model);
~NzSkeletalModel();
NzSkeletalModel(const NzSkeletalModel& model) = default;
NzSkeletalModel(NzSkeletalModel&& model) = default;
~NzSkeletalModel() = default;
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const override;
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const override;
void AdvanceAnimation(float elapsedTime);
NzSkeletalModel* Clone() const;
@@ -67,13 +67,13 @@ class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable
bool SetSequence(const NzString& sequenceName);
void SetSequence(unsigned int sequenceIndex);
NzSkeletalModel& operator=(const NzSkeletalModel& node);
NzSkeletalModel& operator=(NzSkeletalModel&& node);
NzSkeletalModel& operator=(const NzSkeletalModel& node) = default;
NzSkeletalModel& operator=(NzSkeletalModel&& node) = default;
private:
void MakeBoundingVolume() const override;
void Register() override;
void Unregister() override;
/*void Register() override;
void Unregister() override;*/
void Update() override;
NzAnimationRef m_animation;