Changeset 3462

Timestamp:

02/26/10 20:25:38 (5 months ago)

Author:

trichards

Message:

Minor formatting cleanups to I_PhysicsActor

Files:

• Engine/branches/0185_GEN_PHYSICS_REFACTOR_2/Physics/I_PhysicsActor.hpp (modified) (7 diffs)

Engine/branches/0185_GEN_PHYSICS_REFACTOR_2/Physics/I_PhysicsActor.hpp

@@ -71 +71 @@
     class I_TransformEventData;
     class I_ApplyForcesEventData;
-        class I_BeginCollisionEventData;
+    class I_BeginCollisionEventData;
     class I_DuringCollisionEventData;
     class I_EndCollisionEventData;
@@ -84 +84 @@
     typedef Event::Event<I_TransformEventData&>             TransformEvent_type;
     typedef Event::Event<I_ApplyForcesEventData&>           ApplyForcesEvent_type;
-        typedef Event::Event<I_BeginCollisionEventData&>        BeginCollisionEvent_type;
-        typedef Event::Event<I_DuringCollisionEventData&>       DuringCollisionEvent_type;
-        typedef Event::Event<I_EndCollisionEventData&>          EndCollisionEvent_type;
-        typedef Memory::managed_ptr<Zen::Engine::Core::I_GameObject> pGameObject_type;
+    typedef Event::Event<I_BeginCollisionEventData&>        BeginCollisionEvent_type;
+    typedef Event::Event<I_DuringCollisionEventData&>       DuringCollisionEvent_type;
+    typedef Event::Event<I_EndCollisionEventData&>          EndCollisionEvent_type;
+    typedef Memory::managed_ptr<Zen::Engine::Core::I_GameObject> pGameObject_type;
     /// @}
 
@@ -93 +93 @@
     /// @{
 public:
-        /// Set the game object associated with this physics actor.
-        virtual void setGameObject(pGameObject_type _pGameObject) = 0;
-
-        /// Get the game object associated with this physics actor.
-        virtual pGameObject_type getGameObject() = 0;
+    /// Set the game object associated with this physics actor.
+    virtual void setGameObject(pGameObject_type _pGameObject) = 0;
+
+    /// Get the game object associated with this physics actor.
+    virtual pGameObject_type getGameObject() = 0;
 
     virtual void setCollisionShape(pCollisionShape_type _pCollisionShape) = 0;
@@ -162 +162 @@
 
     /// @todo Use I_PhysicsGroup& instead of int.
-        virtual void setCollisionGroup(const int _group) = 0;
+    virtual void setCollisionGroup(const int _group) = 0;
 
     /// @todo Use I_PhysicsGroup& instead of int.
-        virtual const int getCollisionGroup() const = 0;
+    virtual const int getCollisionGroup() const = 0;
     /// @}
 
@@ -194 +194 @@
     ApplyForcesEvent_type onApplyForcesEvent;
 
-        /// This event is fired once the Axis Aligned Bounding Box (AABB) of the shape intersects that of another
-        BeginCollisionEvent_type onBoundBoxCollisionEvent;
-
-        /// This event is fired while the physics engine determines two objects are colliding
-        DuringCollisionEvent_type onCollisionEvent;
-
-        /// This event is fired after the physics engine determines two objects are colliding and acts on it
-        EndCollisionEvent_type onCollisionResolutionEvent;
+    /// This event is fired once the Axis Aligned Bounding Box (AABB) of the shape intersects that of another
+    BeginCollisionEvent_type onBoundBoxCollisionEvent;
+
+    /// This event is fired while the physics engine determines two objects are colliding
+    DuringCollisionEvent_type onCollisionEvent;
+
+    /// This event is fired after the physics engine determines two objects are colliding and acts on it
+    EndCollisionEvent_type onCollisionResolutionEvent;
     /// @}
 
@@ -217 +217 @@
     {
     public:
-        /// Get the Physics Shape related to this event.
-        virtual I_PhysicsActor& getActor() = 0;
-
-        /// Get the matrix of the future transform.
-        virtual const Math::Matrix4& getTransform() const = 0;
+    /// Get the Physics Shape related to this event.
+    virtual I_PhysicsActor& getActor() = 0;
+
+    /// Get the matrix of the future transform.
+    virtual const Math::Matrix4& getTransform() const = 0;
 
     protected:
@@ -349 +349 @@
 
     /// @}
-        public:
-                bool m_IsStatic;
-                Math::Real m_mass;
+
 };  // interface I_PhysicsActor