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

Moved Model::EnableDraw to SceneNode::EnableDrawing

Browse Source 
Same goes for Model::IsDrawEnabled() => SceneNode::IsDrawingEnabled()
Is Drawable is now a pure virtual method from SceneNode


Former-commit-id: 217c6a21a98206ee0b283aaa216d419696a70faf
This commit is contained in:
Lynix
2013-08-23 13:16:42 +02:00
parent fe6816b089
commit 7fa8f3dafd
10 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@ class NAZARA_API NzLight : public NzSceneNode
nzSceneNodeType GetSceneNodeType() const;
NzColor GetSpecularColor() const;
bool IsDrawable() const;
void SetAmbientColor(const NzColor& ambient);
void SetAttenuation(float attenuation);
void SetDiffuseColor(const NzColor& diffuse);

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

@@ -45,7 +45,6 @@ class NAZARA_API NzModel : public NzSceneNode, public NzUpdatable
void AdvanceAnimation(float elapsedTime);
void EnableAnimation(bool animation);
void EnableDraw(bool draw);
NzAnimation* GetAnimation() const;
const NzBoundingVolumef& GetBoundingVolume() const;
@@ -65,7 +64,6 @@ class NAZARA_API NzModel : public NzSceneNode, public NzUpdatable
bool IsAnimationEnabled() const;
bool IsDrawable() const;
bool IsDrawEnabled() const;
bool LoadFromFile(const NzString& filePath, const NzModelParameters& params = NzModelParameters());
bool LoadFromMemory(const void* data, std::size_t size, const NzModelParameters& params = NzModelParameters());
@@ -103,7 +101,6 @@ class NAZARA_API NzModel : public NzSceneNode, public NzUpdatable
const NzSequence* m_currentSequence;
bool m_animationEnabled;
mutable bool m_boundingVolumeUpdated;
bool m_drawEnabled;
float m_interpolation;
unsigned int m_currentFrame;
unsigned int m_matCount;

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

@@ -20,18 +20,25 @@ class NAZARA_API NzSceneNode : public NzNode
public:
NzSceneNode();
NzSceneNode(const NzSceneNode& node);
NzSceneNode(const NzSceneNode& sceneNode);
virtual ~NzSceneNode();
virtual void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const = 0;
void EnableDrawing(bool drawingEnabled);
virtual const NzBoundingVolumef& GetBoundingVolume() const = 0;
nzNodeType GetNodeType() const final;
NzScene* GetScene() const;
virtual nzSceneNodeType GetSceneNodeType() const = 0;
virtual bool IsDrawable() const = 0;
bool IsDrawingEnabled() const;
bool IsVisible() const;
NzSceneNode& operator=(const NzSceneNode& sceneNode);
NzSceneNode& operator=(NzSceneNode&& sceneNode);
protected:
virtual void OnParenting(const NzNode* parent) override;
virtual void OnVisibilityChange(bool visibility);
@@ -43,6 +50,7 @@ class NAZARA_API NzSceneNode : public NzNode
virtual void Update();
NzScene* m_scene;
bool m_drawingEnabled;
bool m_visible;
private:

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

@@ -20,6 +20,8 @@ class NAZARA_API NzSceneRoot : public NzSceneNode
const NzBoundingVolumef& GetBoundingVolume() const override;
nzSceneNodeType GetSceneNodeType() const override;
bool IsDrawable() const;
private:
NzSceneRoot(NzScene* scene);
virtual ~NzSceneRoot();

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

@@ -27,6 +27,8 @@ class NAZARA_API NzSprite : public NzSceneNode
const NzVector2f& GetSize() const;
const NzRectf& GetTextureCoords() const;
bool IsDrawable() const;
void SetMaterial(NzMaterial* material);
void SetSize(const NzVector2f& size);
void SetTextureCoords(const NzRectf& coords);