Changeset 3323

Timestamp:

01/28/10 14:26:31 (7 weeks ago)

Author:

Azaezel

Message:

further documentation on motionstates. removes ApplyForceAndTorqueCallback?. highly newton specific

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• PhysicsActor.cpp (modified) (2 diffs)
• PhysicsActor.hpp (modified) (4 diffs)

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

@@ -460 +460 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-void
-PhysicsActor::ApplyForceAndTorqueCallback(const btRigidBody* _body)
-{
-    class ApplyForcesEventData
-    :   public I_ApplyForcesEventData
-    {
-        /// @name I_ApplyForcesEventData implementation
-        /// @{
-    public:
-        /// Get the physics shape associated with this event
-        virtual I_PhysicsActor& getActor()
-        {
-            return *m_pShape;
-        }
-
-        /// Apply a force to this shape
-        virtual void applyForce(const Math::Vector3& _force)
-        {
-            m_pShape->applyForce(_force);
-        }
-
-        /// Apply torque to this shape
-        virtual void applyTorque(const Math::Vector3& _torque)
-        {
-            m_pShape->applyTorque(_torque);
-        }
-
-        /// @}
-
-        /// @name 'Structors
-        /// @{
-    public:
-        ApplyForcesEventData(PhysicsActor* _pShape)
-        :   m_pShape(_pShape)
-        {
-        }
-
-        virtual ~ApplyForcesEventData()
-        {
-        }
-        /// @}
-
-        /// @name Member Variables
-        /// @{
-    private:
-        PhysicsActor*   m_pShape;
-        /// @}
-
-    };  // class ApplyForcesEventData;
-
-    void* pBody = btRigidBodyGetUserData(_body);
-    if (pBody != NULL)
-    {
-        PhysicsActor* pPhysicsActor = static_cast<PhysicsActor*>(pBody);
-
-        // Only apply forces if the state is active
-        if (pPhysicsActor->m_activationState != 0)
-        {
-            ApplyForcesEventData eventData(pPhysicsActor);
-            eventData.getActor().onApplyForcesEvent(eventData);
-        }
-    }
-}
-
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-void
-PhysicsActor::ActivationStateCallback(const btRigidBody* _body, unsigned _state)
-{
-    void* pBody = btRigidBodyGetUserData(_body);
-    if (pBody != NULL)
-    {
-        static_cast<PhysicsActor*>(pBody)->setActivationState(_state);
-    }
-}
-
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 Engine::Physics::I_PhysicsActor&
 PhysicsActor::TransformEventData::getActor()
@@ -561 +485 @@
     return m_otherActor;
 }
-
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void 
+PhysicsActor::ZenMotionState::setWorldTransform(const btTransform &_worldTrans)
+{
+
+}
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 Scripting::I_ObjectReference*

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

@@ -113 +113 @@
 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);
-
     void applyForce(const Math::Vector3& _force);
     void applyTorque(const Math::Vector3& _torque);
@@ -354 +351 @@
 
     };  // class EndCollisionEventData
-    private:
+    public:
+        //copied from the bullet headers:
+        //The btMotionState interface class allows the dynamics world to synchronize and interpolate the updated world transforms with graphics
+        //For optimizations, potentially only moving objects get synchronized (using setWorldPosition/setWorldOrientation)
         class ZenMotionState : public btMotionState
         {
@@ -360 +360 @@
             ZenMotionState();
             virtual ~ZenMotionState();
-            virtual void getWorldTransform(btTransform &worldTrans) const;
-            virtual void setWorldTransform(const btTransform &worldTrans);
+            virtual void getWorldTransform(btTransform& _worldTrans) const;
+            //Bullet only calls the update of worldtransform for active objects
+            virtual void setWorldTransform(const btTransform& _worldTrans);
         };
-
     /// @name Extended Member Variables
     /// @{
@@ -376 +376 @@
 ,   m_transform(_transform)
 {
-    m_MotionState->setWorldTransform(_transform);
 }