Changeset 3349 for plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp

Timestamp:

02/01/10 14:17:05 (6 months 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

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp (modified) (5 diffs)

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