Changeset 1782Tweet

Timestamp:

Aug 20, 2012, 11:21:01 PM (11 years ago)

Author:

touky

Message:

Small physic refactor.

Location:

trunk/test/Physics

Files:

• Include/EasyCharacterController.h (modified) (4 diffs)
• Include/EasyConstraint.h (modified) (3 diffs)
• Include/EasyPhysics.h (modified) (2 diffs)
• Include/LolPhysics.h (modified) (2 diffs)
• Src/EasyCharacterController.cpp (modified) (3 diffs)
• Src/EasyConstraint.cpp (modified) (2 diffs)
• Src/EasyPhysics.cpp (modified) (4 diffs)

trunk/test/Physics/Include/EasyCharacterController.h

@@ -11 +11 @@
 
 //
-// The EasyPhysic class
+// The EasyCharacterController class
 // ------------------
+//
+
+//Should try to to make a btKinematicCharacterController for real.
 //
 
@@ -34 +37 @@
 {
 
+        friend class Simulation;
+        friend class EasyPhysic;
+
 #ifdef HAVE_PHYS_USE_BULLET
 
@@ -48 +54 @@
                 m_gamegroup = GAMEGROUP_EZP_CHAR_CTRLR;
                 m_up_axis = 1;
+                m_gravity = vec3(.0f, -9.81f, .0f);
         }
         ~EasyCharacterController()
@@ -78 +85 @@
         vec3                                                    m_base_cached_movement;
         vec3                                                    m_frame_cached_movement;
+        vec3                                                    m_gravity;
+        vec3                                                    m_velocity;
 
 #else  // NO PHYSIC IMPLEMENTATION

trunk/test/Physics/Include/EasyConstraint.h

@@ -31 +31 @@
 class EasyConstraint
 {
+
+        friend class Simulation;
+        friend class EasyPhysic;
+
 #ifdef HAVE_PHYS_USE_BULLET
 
@@ -41 +45 @@
                 m_cone_twist_constraint(NULL),
                 m_6dof_constraint(NULL),
+                m_owner_simulation(NULL),
                 m_a_physobj(NULL),
                 m_b_physobj(NULL),
@@ -194 +199 @@
 
 private:
+        Simulation*                                     m_owner_simulation;
         EasyPhysic*                                     m_a_physobj;
         EasyPhysic*                                     m_b_physobj;

trunk/test/Physics/Include/EasyPhysics.h

@@ -34 +34 @@
 {
 
+        friend class Simulation;
         friend class EasyConstraint;
-        friend class Simulation;
 
 #ifdef HAVE_PHYS_USE_BULLET
@@ -154 +154 @@
         int                                                                                     m_collision_mask;
         WorldEntity*                                                            m_owner_entity;
+        Simulation*                                                                     m_owner_simulation;
 
         //Base/Attachment logic

trunk/test/Physics/Include/LolPhysics.h

@@ -321 +321 @@
 
 private:
+
         friend class EasyPhysic;
+        friend class EasyCharacterController;
         friend class EasyConstraint;
 
+        enum eEasyPhysicType
+        {
+                EEPT_Dynamic,
+                EEPT_Static,
+                EEPT_Ghost,
+                EEPT_CollisionObject,
+                EEPT_CharacterController,
+
+                EEPT_MAX
+        };
+
+        //m_owner_simulation
         //Adds the given EasyPhysic to the correct list.
-        void AddToDynamic(EasyPhysic* NewEPDynamic)     { m_dynamic_list << NewEPDynamic; }
-        void AddToStatic(EasyPhysic* NewEPStatic)       { m_static_list << NewEPStatic; }
-        void AddToGhost(EasyPhysic* NewEPGhost)         { m_ghost_list << NewEPGhost; }
-        void AddToConstraint(EasyConstraint* NewEC)     { m_constraint_list     << NewEC; }
+        void ObjectRegistration(bool AddObject, EasyPhysic* NewEP, eEasyPhysicType CurType)
+        {
+                Array<EasyPhysic*>* SearchList = NULL;
+                switch(CurType)
+                {
+                        case EEPT_Dynamic:
+                        {
+                                SearchList = &m_dynamic_list;
+                                break;
+                        }
+                        case EEPT_Static:
+                        {
+                                SearchList = &m_static_list;
+                                break;
+                        }
+                        case EEPT_Ghost:
+                        {
+                                SearchList = &m_ghost_list;
+                                break;
+                        }
+                        case EEPT_CollisionObject:
+                        {
+                                SearchList = &m_collision_object_list;
+                                break;
+                        }
+                        case EEPT_CharacterController:
+                        {
+                                SearchList = &m_character_controller_list;
+                                break;
+                        }
+                }
+
+                if (AddObject)
+                {
+                        NewEP->m_owner_simulation = this;
+                        (*SearchList) << NewEP;
+                }
+                else
+                {
+                        NewEP->m_owner_simulation = NULL;
+                        for (int i = 0; i < SearchList->Count(); ++i)
+                        {
+                                if ((*SearchList)[i] == NewEP)
+                                {
+                                        SearchList->Remove(i--);
+                                        break;
+                                }
+                        }
+                }
+        }
+        void ObjectRegistration(bool AddObject, EasyConstraint* NewEC)
+        {
+                Array<EasyConstraint*>* SearchList = NULL;
+                SearchList = &m_constraint_list;
+
+                if (AddObject)
+                {
+                        NewEC->m_owner_simulation = this;
+                        (*SearchList) << NewEC;
+                }
+                else
+                {
+                        NewEC->m_owner_simulation = NULL;
+                        for (int i = 0; i < SearchList->Count(); ++i)
+                        {
+                                if ((*SearchList)[i] == NewEC)
+                                {
+                                        SearchList->Remove(i--);
+                                        break;
+                                }
+                        }
+                }
+        }
 
         //Easy Physics body List
@@ -334 +417 @@
         Array<EasyPhysic*>                                              m_static_list;
         Array<EasyPhysic*>                                              m_ghost_list;
+        Array<EasyPhysic*>                                              m_collision_object_list;
+        Array<EasyPhysic*>                                              m_character_controller_list;
         Array<EasyConstraint*>                                  m_constraint_list;
 

trunk/test/Physics/Src/EasyCharacterController.cpp

@@ -63 +63 @@
 
                 m_character = new btKinematicCharacterController(m_pair_caching_object, m_convex_shape, m_step_height, m_up_axis);
+
+                //Deactivate Character controller basic behaviour.
+                //m_character->setGravity(.0f);
+                //m_character->setFallSpeed(.0f);
+
                 dynamics_world->addAction(m_character);
+                current_simulation->ObjectRegistration(true, this, Simulation::EEPT_CharacterController);
                 Ticker::Ref(this);
         }
@@ -79 +85 @@
                 {
                         dynamics_world->removeAction(m_character);
+                        current_simulation->ObjectRegistration(false, this, Simulation::EEPT_CharacterController);
                         Ticker::Unref(this);
                 }
@@ -119 +126 @@
         Entity::TickGame(seconds);
 
-        m_character->setVelocityForTimeInterval(LOL2BT_VEC3(LOL2BT_UNIT * (m_base_cached_movement + m_frame_cached_movement)) / seconds, seconds);
+        int IterationsNb = (int)(seconds / m_owner_simulation->m_timestep);
+        float NewSeconds = IterationsNb * m_owner_simulation->m_timestep;
+        m_character->setVelocityForTimeInterval(LOL2BT_VEC3(LOL2BT_UNIT * (m_base_cached_movement + m_frame_cached_movement)) / NewSeconds, NewSeconds);
         m_base_cached_movement = vec3(.0f);
 }

trunk/test/Physics/Src/EasyConstraint.cpp

@@ -26 +26 @@
         {
                 dynamics_world->addConstraint(m_typed_constraint, m_disable_a2b_collision);
-                current_simulation->AddToConstraint(this);
+                current_simulation->ObjectRegistration(true, this);
         }
 }
@@ -34 +34 @@
         btDiscreteDynamicsWorld* dynamics_world = current_simulation->GetWorld();
         if (dynamics_world && m_typed_constraint)
+        {
                 dynamics_world->removeConstraint(m_typed_constraint);
+                current_simulation->ObjectRegistration(false, this);
+        }
 }
 

trunk/test/Physics/Src/EasyPhysics.cpp

@@ -42 +42 @@
         m_collision_mask(1),
         m_owner_entity(NewOwnerEntity),
+        m_owner_simulation(NULL),
         m_base_physic(NULL)
 {
@@ -287 +288 @@
                 {
                         dynamics_world->addCollisionObject(m_ghost_object, m_collision_group, m_collision_mask);
-                        current_simulation->AddToGhost(this);
+                        current_simulation->ObjectRegistration(true, this, Simulation::EEPT_Ghost);
                 }
                 else if (m_rigid_body)
@@ -293 +294 @@
                         dynamics_world->addRigidBody(m_rigid_body, m_collision_group, m_collision_mask);
                         if (m_mass != .0f)
-                                current_simulation->AddToDynamic(this);
+                                current_simulation->ObjectRegistration(true, this, Simulation::EEPT_Dynamic);
                         else
-                                current_simulation->AddToStatic(this);
+                                current_simulation->ObjectRegistration(true, this, Simulation::EEPT_Static);
                 }
                 else
+                {
                         dynamics_world->addCollisionObject(m_collision_object, m_collision_group, m_collision_mask);
+                        current_simulation->ObjectRegistration(true, this, Simulation::EEPT_CollisionObject);
+                }
         }
 }
@@ -309 +313 @@
         {
                 if (m_rigid_body)
+                {
                         dynamics_world->removeRigidBody(m_rigid_body);
-                else if (m_collision_object)
+                        if (m_mass != .0f)
+                                current_simulation->ObjectRegistration(false, this, Simulation::EEPT_Dynamic);
+                        else
+                                current_simulation->ObjectRegistration(false, this, Simulation::EEPT_Static);
+                }
+                else
+                {
                         dynamics_world->removeCollisionObject(m_collision_object);
+                        if (m_ghost_object)
+                                current_simulation->ObjectRegistration(false, this, Simulation::EEPT_Ghost);
+                        current_simulation->ObjectRegistration(false, this, Simulation::EEPT_CollisionObject);
+                }
         }
 }