Changeset 3339

Timestamp:

01/31/10 13:03:15 (5 weeks ago)

Author:

Azaezel

Message:

elevates the damping get/set pairs as well as setActivationState(bool) to the interface, and adds a setSleepingThresholds method for tracking when to shut down adding more motion (prevents whats commonly referred to as 'jitter')
also: stepSimulation for bullet, and a destroyPhysicsActor callback for zones in newton (already added for bullet a while back)

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2

Files:

• ZBullet/src/PhysicsActor.cpp (modified) (1 diff)
• ZBullet/src/PhysicsActor.hpp (modified) (4 diffs)
• ZBullet/src/PhysicsMaterial.cpp (modified) (1 diff)
• ZBullet/src/PhysicsService.cpp (modified) (3 diffs)
• ZNewton/src/PhysicsActor.cpp (modified) (1 diff)
• ZNewton/src/PhysicsActor.hpp (modified) (3 diffs)
• ZNewton/src/PhysicsZone.cpp (modified) (1 diff)
• ZNewton/src/PhysicsZone.hpp (modified) (1 diff)

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

@@ -202 +202 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 void
-PhysicsActor::setAutoFreeze(bool _bFreeze)
-{
-    btRigidBodySetAutoFreeze(m_pActor, _bFreeze ? 1 : 0);
-    setActivationState(true);
-    m_activationState = 1;
-}
-
+PhysicsActor::setSleepingThresholds(float _minLinearMotion, float _minAngularMotion)
+{
+    m_pActor->setSleepingThresholds(_minLinearMotion, _minAngularMotion);
+}
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 const Math::Real

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

@@ -87 +87 @@
     virtual const Math::Vector3 getAngularVelocity() const;
     virtual void setAngularVelocity(const Math::Vector3& _omega);
+
     virtual const Math::Vector3 getAngularDamping() const;
     virtual void setAngularDamping(const Math::Vector3& _damping);
@@ -92 +93 @@
     virtual void setLinearDamping(float _damping);
     virtual void setAutoFreeze(bool _bFreeze);
+    virtual void setSleepingThresholds(float _minLinearMotion, float _minAngularMotion);
+    virtual void setActivationState(unsigned _state);
 
     virtual void setAdvancedCollisionPrediction(bool _mode);
@@ -104 +107 @@
         virtual void setGameObject(pOwningObject_type _pOwner);
         virtual pOwningObject_type getGameObject();
-    bool attachBody(pCollisionShape_type _collision);
+   bool attachBody(pCollisionShape_type _collision);
 
     /// @}
@@ -114 +117 @@
     void applyForce(const Math::Vector3& _force);
     void applyTorque(const Math::Vector3& _torque);
-
-    void setActivationState(unsigned _state);
     /// @}
 public:

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

@@ -172 +172 @@
     m_bCollidable = _collide;
 //todo: handle via collisiongroups
+}
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~

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

@@ -30 +30 @@
 #include <exception>
 #include <iostream>
-#include <btManifoldResult.h>
+#include <btBulletDynamicsCommon.h>
 
 extern ContactAddedCallback             gContactAddedCallback;
@@ -41 +41 @@
     //gContactAddedCallback usage can be found under btManifoldResult::addContactPoint
     //it is an explicitly defined global method handle called during btManifoldResult::addContactPoint
-    gContactAddedCallback = CustomMaterialCombinerCallback;
+    gContactAddedCallback = Zen::ZBullet::CustomMaterialCombinerCallback;
 }
 
@@ -73 +73 @@
     for (std::set<pPhysicsZone_type>::iterator iter = m_zoneSet.begin(); iter != m_zoneSet.end(); iter++)
     {
-        NewtonUpdate(dynamic_cast<PhysicsZone*>(iter->get())->getZonePtr(), (Zen::Math::Real)_elapsedTime);
+        dynamic_cast<PhysicsZone*>(iter->get())->getZonePtr()->stepSimulation((Zen::Math::Real)_elapsedTime);
     }
 }

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

@@ -211 +211 @@
     m_activationState = 1;
 }
+// http://newtondynamics.com/wiki/index.php5?title=NewtonBodySetFreezeTreshold
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
+PhysicsActor::setSleepingThresholds(float _minLinearMotion, float _minAngularMotion)
+{
+    //we'll stick with a default of 10 frames of motion since it's simpler to track distance/angle for most folks (that, and theres no equivalents in other engines I've found) -BJR
+    NewtonBodySetFreezeTreshold(m_pActor,_minLinearMotion,_minAngularMotion, 10);
+}
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~

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

@@ -91 +91 @@
     virtual void setLinearDamping(float _damping);
     virtual void setAutoFreeze(bool _bFreeze);
+    virtual void setSleepingThresholds(float _minLinearMotion, float _minAngularMotion);
+    void setActivationState(unsigned _state);
 
     virtual void setAdvancedCollisionPrediction(bool _mode);
@@ -116 +118 @@
     void applyForce(const Math::Vector3& _force);
     void applyTorque(const Math::Vector3& _torque);
-
-    void setActivationState(unsigned _state);
     /// @}
 public:
@@ -270 +270 @@
         virtual void setContactFrictionState(int _state, bool _primary = true)
         {
+            //http://www.newtondynamics.com/wiki/index.php5?title=NewtonMaterialSetContactFrictionState
             NewtonMaterialSetContactFrictionState(m_pMaterial, _state, _primary ? 0 : 1);
         }

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

@@ -562 +562 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 void
+PhysicsZone::destroyPhysicsActor(wpPhysicsActor_type _wpPhysicsActor)
+{
+    // TODO - remove appropriate entry from m_zoneSet
+    //m_zoneSet.erase(iter);
+
+    /// Fire the PhysicsZone's onDestroyEvent
+    _wpPhysicsActor->onDestroyEvent(_wpPhysicsActor);
+    
+    /// delete the PhysicsZone pointer
+    PhysicsActor* pPhysicsActor = dynamic_cast<PhysicsActor*>(_wpPhysicsActor.get());
+
+    if (pPhysicsActor)
+    {
+        delete pPhysicsActor;
+    }
+    else
+    {
+        throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::destroyPhysicsActor() : _wpPhysicsActor is an invalid PhysicsActor.");
+    }
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
 PhysicsZone::stepSimulation(double _elapsedTime)
 {

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

@@ -97 +97 @@
 
     void destroyCollisionShape(wpCollisionShape_type _wpCollisionShape);
+    void destroyPhysicsActor(wpPhysicsActor_type _wpPhysicsActor);
 
     void stepSimulation(double _elapsedTime);