Changeset 3349

Timestamp:

02/01/10 14:17:05 (6 weeks ago)

Author:

Azaezel

Message:

removed bullets TransformCallback? method for the CollisionShape?, instead using an overloaded btMotionState for the PhysicsActor?. as these are callbacks which call behaviors referencing instances, the net effect is the same, though admittedly somewhat hairy to read over. perhaps there's a cleaner method available we can implement later

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2

Files:

• ZBullet/src/CollisionShape.hpp (modified) (1 diff)
• ZBullet/src/PhysicsActor.cpp (modified) (6 diffs)
• ZBullet/src/PhysicsActor.hpp (modified) (5 diffs)
• ZNewton/src/PhysicsActor.cpp (modified) (1 diff)
• ZNewton/src/PhysicsActor.hpp (modified) (1 diff)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/CollisionShape.hpp

@@ -78 +78 @@
     /// @{
 private:
-    static void TransformCallback(const btRigidBody* _body, const Zen::Math::Real* _matrix);
     static void ApplyForceAndTorqueCallback(const btRigidBody* _pBody);
     static void ActivationStateCallback(const btRigidBody* body, unsigned state);

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.cpp

@@ -58 +58 @@
 
     m_name = "";
+    m_MotionState = NULL;
 }
 
@@ -63 +64 @@
 PhysicsActor::~PhysicsActor()
 {
-    //NewtonDestroyBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    if (m_MotionState != NULL) delete m_MotionState;
 }
 
@@ -131 +132 @@
 
     // set the transform call back function
-    btRigidBodySetTransformCallback(m_pActor, TransformCallback);
-    
+    m_MotionState = new PhysicsActor::ZenMotionState(this);
+
     m_pActor->setUserPointer(this);
 
@@ -423 +424 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-// set the transformation of a rigid body
-void 
-PhysicsActor::TransformCallback(const btRigidBody* _body, const Zen::Math::Real* _matrix)
-{
-    void* pBody = _body->getUserPointer();
-    if (pBody != NULL)
+void
+PhysicsActor::ZenMotionState::getWorldTransform(btTransform& _worldTrans) const
+{
+
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
+PhysicsActor::ZenMotionState::setWorldTransform(const btTransform& _worldTrans)
+{
+    if (m_userPointer == NULL) return;
+    PhysicsActor* pShape = static_cast<PhysicsActor*>(m_userPointer);
+
+    // Only use the transform callback if the state is active
+    if (pShape->getActivationState() == 1)
     {
-        PhysicsActor* pShape = static_cast<PhysicsActor*>(pBody);
-
-        // Only use the transform callback if the state is active
-        if (pShape->m_activationState != 0)
-        {
-            Math::Matrix4 transform;
-            for(int x = 0; x < 16; x++)
-            {
-                transform.m_array[x] = _matrix[x];
-            }
-            TransformEventData evenData(*pShape, transform);
-            pShape->onTransformEvent(evenData);
-        }
+        Math::Matrix4 transform;
+        _worldTrans.getOpenGLMatrix(transform.m_array);
+        TransformEventData evenData(*pShape, transform);
+        pShape->onTransformEvent(evenData);
     }
 }
@@ -472 +473 @@
     return m_otherActor;
 }
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-void 
-PhysicsActor::ZenMotionState::setWorldTransform(const btTransform &_worldTrans)
-{
-
-}
+
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 Scripting::I_ObjectReference*
@@ -532 +528 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+int
+PhysicsActor::getActivationState()
+{
+    m_activationState = m_pActor->getActivationState();
+    return m_activationState;
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 }   // namespace ZBullet
 }   // namespace Zen

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp

@@ -95 +95 @@
     virtual void setSleepingThresholds(float _minLinearMotion, float _minAngularMotion);
     virtual void setActivationState(unsigned _state);
+    virtual int getActivationState();
 
     virtual void setAdvancedCollisionPrediction(bool _mode);
@@ -114 +115 @@
     /// @{
 private:
-    static void TransformCallback(const btRigidBody* _body, const Zen::Math::Real* _matrix);
     void applyForce(const Math::Vector3& _force);
     void applyImpulse(const Math::Vector3& _force, const Math::Vector3& _worldPos);
@@ -360 +360 @@
         {
         public:
-            ZenMotionState();
+            ZenMotionState(void* _userData);
             virtual ~ZenMotionState();
             virtual void getWorldTransform(btTransform& _worldTrans) const;
             //Bullet only calls the update of worldtransform for active objects
             virtual void setWorldTransform(const btTransform& _worldTrans);
+            void*               m_userPointer;
         };
     /// @name Extended Member Variables
@@ -382 +383 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline
-PhysicsActor::ZenMotionState::ZenMotionState()
+PhysicsActor::ZenMotionState::ZenMotionState(void* _userData)
+: m_userPointer(_userData)
 {
 
@@ -392 +394 @@
 
 }
+
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZNewton/src/PhysicsActor.cpp

@@ -643 +643 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+int
+PhysicsActor::getActivationState()
+{
+    m_activationState = NewtonBodyGetSleepingState(m_pActor);
+    return m_activationState;
+}
+
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 }   // namespace ZNewton
 }   // namespace Zen

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZNewton/src/PhysicsActor.hpp

@@ -93 +93 @@
     virtual void setSleepingThresholds(float _minLinearMotion, float _minAngularMotion);
     void setActivationState(unsigned _state);
+    virtual int getActivationState();
 
     virtual void setAdvancedCollisionPrediction(bool _mode);