diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
commit | 2fb82920059257fd7ac8e33bfe53de13e7ed53bd (patch) | |
tree | cb8de3a839cb9878d0869d4e436a235346109c16 /source/gameengine/SceneGraph | |
parent | c2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (diff) |
style cleanup
Diffstat (limited to 'source/gameengine/SceneGraph')
-rw-r--r-- | source/gameengine/SceneGraph/SG_Controller.h | 8 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_IObject.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_IObject.h | 8 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Node.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Node.h | 18 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_ParentRelation.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Spatial.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Spatial.h | 12 |
8 files changed, 28 insertions, 28 deletions
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h index d82738dbb86..455aaf90d6d 100644 --- a/source/gameengine/SceneGraph/SG_Controller.h +++ b/source/gameengine/SceneGraph/SG_Controller.h @@ -53,7 +53,7 @@ public: ) {}; virtual - bool + bool Update( double time )=0; @@ -69,13 +69,13 @@ public: ); virtual - void + void SetSimulatedTime( double time )=0; - virtual - SG_Controller* + virtual + SG_Controller* GetReplica( class SG_Node* destnode )=0; diff --git a/source/gameengine/SceneGraph/SG_IObject.cpp b/source/gameengine/SceneGraph/SG_IObject.cpp index afd647c2a2a..9ae32a89ff8 100644 --- a/source/gameengine/SceneGraph/SG_IObject.cpp +++ b/source/gameengine/SceneGraph/SG_IObject.cpp @@ -70,7 +70,7 @@ AddSGController( m_SGcontrollers.push_back(cont); } - void + void SG_IObject:: RemoveSGController( SG_Controller* cont diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index c36c984f3d3..53b51507e97 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -174,7 +174,7 @@ public: * this object is deleted. */ - void + void AddSGController( SG_Controller* cont ); @@ -196,7 +196,7 @@ public: * leaks. */ - void + void RemoveAllControllers( ); @@ -233,7 +233,7 @@ public: * This may be NULL. */ - inline const void* GetSGClientObject() const + inline const void* GetSGClientObject() const { return m_SGclientObject; } @@ -280,7 +280,7 @@ public: void SetControllerTime(double time); virtual - void + void Destruct( ) = 0; diff --git a/source/gameengine/SceneGraph/SG_Node.cpp b/source/gameengine/SceneGraph/SG_Node.cpp index 33af9f16d7c..04d9a306fc4 100644 --- a/source/gameengine/SceneGraph/SG_Node.cpp +++ b/source/gameengine/SceneGraph/SG_Node.cpp @@ -143,7 +143,7 @@ Destruct() } const - SG_Node* + SG_Node * SG_Node:: GetRootSGParent( ) const { diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h index 1d0c0e592e6..063eeaab01d 100644 --- a/source/gameengine/SceneGraph/SG_Node.h +++ b/source/gameengine/SceneGraph/SG_Node.h @@ -63,7 +63,7 @@ public: * make a deep copy. */ - void + void AddChild( SG_Node* child ); @@ -75,7 +75,7 @@ public: * If the node was not a child of this object no action is performed. */ - void + void RemoveChild( SG_Node* child ); @@ -149,7 +149,7 @@ public: * Disconnect this node from it's parent */ - void + void DisconnectFromParent( ); @@ -182,12 +182,12 @@ public: - /** + /** * Update the spatial data of this node. Iterate through * the children of this node and update their world data. */ - void + void UpdateWorldData( double time, bool parentUpdated=false @@ -198,7 +198,7 @@ public: * the children nodes and update their simulated time. */ - void + void SetSimulatedTime( double time, bool recurse @@ -244,17 +244,17 @@ public: * Node replication functions. */ - SG_Node* + SG_Node* GetSGReplica( ); - void + void Destruct( ); private: - void + void ProcessSGReplica( SG_Node** replica ); diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h index 4478ed11bc1..6e314996456 100644 --- a/source/gameengine/SceneGraph/SG_ParentRelation.h +++ b/source/gameengine/SceneGraph/SG_ParentRelation.h @@ -118,7 +118,7 @@ protected : */ SG_ParentRelation( - ) { + ) { }; /** diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp index f8c4b5165ee..8c0d2b88c63 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.cpp +++ b/source/gameengine/SceneGraph/SG_Spatial.cpp @@ -161,8 +161,8 @@ RelativeTranslate( } } SetModified(); -} - +} + /** * Scaling methods. diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h index e456851d183..7630af51781 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.h +++ b/source/gameengine/SceneGraph/SG_Spatial.h @@ -137,7 +137,7 @@ public: } - void + void RelativeRotate( const MT_Matrix3x3& rot, bool local @@ -178,12 +178,12 @@ public: m_worldScaling = scale; } - const MT_Point3& GetLocalPosition() const + const MT_Point3& GetLocalPosition() const { return m_localPosition; } - const MT_Matrix3x3& GetLocalOrientation() const + const MT_Matrix3x3& GetLocalOrientation() const { return m_localRotation; } @@ -193,17 +193,17 @@ public: return m_localScaling; } - const MT_Point3& GetWorldPosition() const + const MT_Point3& GetWorldPosition() const { return m_worldPosition; } - const MT_Matrix3x3& GetWorldOrientation() const + const MT_Matrix3x3& GetWorldOrientation() const { return m_worldRotation; } - const MT_Vector3& GetWorldScaling() const + const MT_Vector3& GetWorldScaling() const { return m_worldScaling; } |