Changeset 1764 for trunk/test/Physics/IncludeTweet

Timestamp:

Aug 16, 2012, 7:14:07 PM (10 years ago)

Author:

touky

Message:

Added Base/Attachment Logic, works with Kinematic & Ghost.

Location:

trunk/test/Physics/Include

Files:

• EasyCharacterController.h (modified) (1 diff)
• EasyPhysics.h (modified) (6 diffs)

trunk/test/Physics/Include/EasyCharacterController.h

@@ -36 +36 @@
 
 public:
-        EasyCharacterController() :
-                EasyPhysic(),
+        EasyCharacterController(WorldEntity* NewOwnerEntity) :
+                EasyPhysic(NewOwnerEntity),
                 m_character(NULL)
         {

trunk/test/Physics/Include/EasyPhysics.h

@@ -39 +39 @@
 
 public:
-        EasyPhysic();
+        EasyPhysic(WorldEntity* NewOwnerEntity);
         ~EasyPhysic();
 
@@ -50 +50 @@
         virtual bool CanChangeCollisionChannel() { return (m_rigid_body == NULL); }
         virtual void SetTransform(const lol::vec3& base_location, const lol::quat& base_rotation=lol::quat(lol::mat4(1.0f)));
+private:
+        virtual void BaseTransformChanged(const lol::mat4& PreviousMatrix, const lol::mat4& NewMatrix);
+public:
         virtual void SetMass(float mass);
         virtual void InitBodyToRigid(bool ZeroMassIsKinematic=false);
@@ -77 +80 @@
 
 public:
-        EasyPhysic() { }
+        EasyPhysic(WorldEntity* NewOwnerEntity) { m_owner_entity = NewOwnerEntity; }
 
         virtual void SetShapeToBox(lol::vec3& BoxSize) { }
@@ -87 +90 @@
         virtual bool CanChangeCollisionChannel() { return true; }
         virtual void SetTransform(const lol::vec3& base_location, const lol::quat& base_rotation=lol::quat(lol::mat4(1.0f))) { }
+private:
+        virtual void BaseTransformChanged(const lol::mat4& PreviousMatrix, const lol::mat4& NewMatrix) { }
+public:
         virtual void SetMass(float mass) { }
         virtual void InitBodyToRigid() { }
@@ -114 +120 @@
         int GetCollisionMask()  { return m_collision_mask; }
 
+        //Base/Attachment logic
+        virtual void AttachTo(EasyPhysic* NewBase, bool NewBaseLockLocation = true, bool NewBaseLockRotation = true)
+        {
+                if (NewBase == this || NewBase->m_base_physic == this)
+                        return;
+
+                if (NewBase)
+                {
+                        bool bAlreadyExists = false;
+                        for (int i = 0; i < NewBase->m_based_physic_list.Count(); ++i)
+                                if (NewBase->m_based_physic_list[i] == this)
+                                        bAlreadyExists = true;
+                        if (!bAlreadyExists)
+                                NewBase->m_based_physic_list << this;
+                        m_base_physic = NewBase;
+                        m_base_lock_location = NewBaseLockLocation;
+                        m_base_lock_rotation = NewBaseLockRotation;
+                }
+                else
+                {
+                        for (int i = 0; i < NewBase->m_based_physic_list.Count(); ++i)
+                                if (NewBase->m_based_physic_list[i] == this)
+                                        NewBase->m_based_physic_list.Remove(i--);
+                        m_base_physic = NULL;
+                }
+        }
+
 protected:
         lol::mat4                                                                       m_local_to_world;
@@ -119 +152 @@
         int                                                                                     m_collision_group;
         int                                                                                     m_collision_mask;
+        WorldEntity*                                                            m_owner_entity;
+
+        //Base/Attachment logic
+        Array<EasyPhysic*>                                                      m_based_physic_list;    //List of objects based on this : this object moves, its based object move with it.
+        EasyPhysic*                                                                     m_base_physic;                  //Base for this object : The base moves, the object moves with it.
+        bool                                                                            m_base_lock_location;   //when this is TRUE, location moves with rotation change.
+        bool                                                                            m_base_lock_rotation;   //when this is TRUE, rotation moves with rotation change.
+
+        //Touch logic
+        Array<EasyPhysic*>                                                      m_touching_physic;              //Maintained by ghost objects
 };