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

Merge remote-tracking branch 'origin/Scene-Update'

Browse Source 
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
This commit is contained in:
Lynix
2015-01-25 16:35:18 +01:00
parent 722622ded1 4a2f386c80
commit a185f03abc
26 changed files with 620 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;