diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-24 10:40:15 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-24 10:40:15 +0400 |
| commit | 63048b6cf4358dc9231e0704e03e0f8d5729a174 (patch) | |
| tree | 33a1047d2d9007021a78ab2c2fbb8fc5d06727c5 /source/gameengine/SceneGraph | |
| parent | a46f456e92b14d986022b301757a7bad3c4c76b5 (diff) | |
Synchronise game engine with Tuhopuu2 tree.
Diffstat (limited to 'source/gameengine/SceneGraph')
| -rw-r--r-- | source/gameengine/SceneGraph/SG_Controller.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/SceneGraph/SG_Controller.h | 3 | ||||
| -rw-r--r-- | source/gameengine/SceneGraph/SG_Spatial.cpp | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/gameengine/SceneGraph/SG_Controller.cpp b/source/gameengine/SceneGraph/SG_Controller.cpp index 918b4ea3fb4..86dbc7c2c42 100644 --- a/source/gameengine/SceneGraph/SG_Controller.cpp +++ b/source/gameengine/SceneGraph/SG_Controller.cpp @@ -1,4 +1,5 @@ /** + * @file SG_Controller.cpp * $Id$ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** * diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h index 3fd4a7f47cd..b5bb6943479 100644 --- a/source/gameengine/SceneGraph/SG_Controller.h +++ b/source/gameengine/SceneGraph/SG_Controller.h @@ -37,6 +37,9 @@ #include "SG_IObject.h" +/** + * A scenegraph controller + */ class SG_Controller { public: diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp index e37fd08a517..77e805c0758 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.cpp +++ b/source/gameengine/SceneGraph/SG_Spatial.cpp @@ -48,13 +48,13 @@ SG_Spatial( SG_IObject(clientobj,clientinfo,callbacks), m_localPosition(MT_Point3(0,0,0)), - m_localScaling(MT_Vector3(1.f,1.f,1.f)), m_localRotation(1,0,0,0,1,0,0,0,1), + m_localScaling(MT_Vector3(1.f,1.f,1.f)), m_parent_relation (NULL), m_worldPosition(MT_Point3(0,0,0)), - m_worldScaling(MT_Vector3(1.f,1.f,1.f)), - m_worldRotation(0,0,0,0,0,0,0,0,0) + m_worldRotation(0,0,0,0,0,0,0,0,0), + m_worldScaling(MT_Vector3(1.f,1.f,1.f)) { } @@ -65,12 +65,12 @@ SG_Spatial( ) : SG_IObject(other), m_localPosition(other.m_localPosition), - m_localScaling(other.m_localScaling), m_localRotation(other.m_localRotation), + m_localScaling(other.m_localScaling), m_parent_relation(NULL), m_worldPosition(other.m_worldPosition), - m_worldScaling(other.m_worldScaling), - m_worldRotation(other.m_worldRotation) + m_worldRotation(other.m_worldRotation), + m_worldScaling(other.m_worldScaling) { // duplicate the parent relation for this object m_parent_relation = other.m_parent_relation->NewCopy(); |