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

Moved name attribute from Node to SceneNode

Browse Source 
Former-commit-id: 6f920af67cd6c339d132a67b364742fdf172d5e9
This commit is contained in:
Lynix
2015-01-24 14:13:11 +01:00
parent e46cb43ef5
commit 090263d847
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Graphics/SceneNode.cpp
View File

@@ -93,6 +93,11 @@ NzVector3f NzSceneNode::GetLeft() const
return NzNode::GetLeft();
}
const NzString& NzSceneNode::GetName() const
{
return m_name;
}
nzNodeType NzSceneNode::GetNodeType() const
{
return nzNodeType_Scene;
@@ -139,6 +144,11 @@ bool NzSceneNode::IsVisible() const
return m_visible;
}
void NzSceneNode::SetName(const NzString& name)
{
m_name = name;
}
NzSceneNode& NzSceneNode::operator=(const NzSceneNode& sceneNode)
{
NzNode::operator=(sceneNode);

11
src/Nazara/Utility/Node.cpp
View File

@@ -125,11 +125,6 @@ NzVector3f NzNode::GetLeft() const
return m_derivedRotation * NzVector3f::Left();
}
const NzString& NzNode::GetName() const
{
return m_name;
}
nzNodeType NzNode::GetNodeType() const
{
return nzNodeType_Default;
@@ -413,11 +408,6 @@ void NzNode::SetInitialScale(float scaleX, float scaleY, float scaleZ)
InvalidateNode();
}
void NzNode::SetName(const NzString& name)
{
m_name = name;
}
void NzNode::SetParent(const NzNode* node, bool keepDerived)
{
#if NAZARA_UTILITY_SAFE
@@ -621,7 +611,6 @@ NzNode& NzNode::operator=(const NzNode& node)
m_initialPosition = node.m_initialPosition;
m_initialRotation = node.m_initialRotation;
m_initialScale = node.m_initialScale;
m_name = node.m_name;
m_position = node.m_position;
m_rotation = node.m_rotation;
m_scale = node.m_scale;