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

Made SceneNodes non-movable

Browse Source 
Fixed SceneNodes copy constructor not parenting the right object


Former-commit-id: 21a08e3bb0931af426d97399dab86dda9acdf172
This commit is contained in:
Lynix
2015-01-17 00:15:01 +01:00
parent 6d3228477f
commit fdb722ef14
7 changed files with 25 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,6 @@ class NAZARA_API NzModel : public NzSceneNode
public:
NzModel();
NzModel(const NzModel& model);
NzModel(NzModel&& model);
virtual ~NzModel();
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const override;
@@ -83,7 +82,6 @@ class NAZARA_API NzModel : public NzSceneNode
void SetSkinCount(unsigned int skinCount);
NzModel& operator=(const NzModel& node);
NzModel& operator=(NzModel&& node);
protected:
void InvalidateNode() override;

3
include/Nazara/Graphics/SceneNode.hpp
View File

@@ -21,6 +21,7 @@ class NAZARA_API NzSceneNode : public NzNode
public:
NzSceneNode();
NzSceneNode(const NzSceneNode& sceneNode);
NzSceneNode(NzSceneNode& sceneNode) = delete;
virtual ~NzSceneNode();
virtual void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const = 0;
@@ -43,7 +44,7 @@ class NAZARA_API NzSceneNode : public NzNode
bool IsVisible() const;
NzSceneNode& operator=(const NzSceneNode& sceneNode);
NzSceneNode& operator=(NzSceneNode&& sceneNode);
NzSceneNode& operator=(NzSceneNode&& sceneNode) = delete;
protected:
virtual bool FrustumCull(const NzFrustumf& frustum) const;

5
include/Nazara/Graphics/Sprite.hpp
View File

@@ -18,8 +18,7 @@ class NAZARA_API NzSprite : public NzSceneNode
NzSprite();
NzSprite(NzTexture* texture);
NzSprite(const NzSprite& sprite);
NzSprite(NzSprite&& sprite);
~NzSprite();
~NzSprite() = default;
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const override;
@@ -40,6 +39,8 @@ class NAZARA_API NzSprite : public NzSceneNode
void SetTextureCoords(const NzRectf& coords);
void SetTextureRect(const NzRectui& rect);
NzSprite& operator=(const NzSprite& sprite);
private:
void InvalidateNode() override;
void Register() override;