Changeset 3322

Timestamp:

01/28/10 13:58:06 (7 weeks ago)

Author:

Azaezel

Message:

several todos to revisit as applications require them...

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• PhysicsActor.hpp (modified) (3 diffs)
• PhysicsZone.cpp (modified) (1 diff)
• PhysicsZone.hpp (modified) (1 diff)

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

@@ -48 +48 @@
 class ZBulletMaterial;
 class PhysicsZone;
+
 class PhysicsActor
 :   public Engine::Physics::I_PhysicsActor
@@ -266 +267 @@
         virtual void setContactRestitution(Math::Real _restitution)
         {
-            /*
-            remove after we unbreak intellisense for m_pActor
-            btRigidBody* temp;
-            temp->setRestitution(_restitution);
-            */
-            m_pActor->setRestitution(_restitution);
+            //TODO: resolve - illegal call of non-static member function
+            //getActorPtr()->setRestitution(_restitution);
         }
 
@@ -278 +275 @@
             //for clearing modifications made to actor restitutions at collision-time
             //mebbey we should auto-run this after the callbacks fired?
-            m_pActor->setRestitution(getActor().getMaterial()->getRestitution());
+            //TODO: resolve - illegal call of non-static member function
+            //getActorPtr()->setRestitution(getActor().getMaterial()->getRestitution()); 
         }
 
         virtual void setContactFrictionState(int _state, bool _primary = true)
         {
-            NewtonMaterialSetContactFrictionState(m_pMaterial, _state, _primary ? 0 : 1);
+            //TODO: resolve -
+            //if getActor().getMaterial()->getStaticFriction() > 0;
+            //getActorPtr()->setFriction(getActor().getMaterial()->getStaticFriction());
         }
 
         virtual void setStaticFrictionCoefficient(Math::Real _coefficent, bool _primary = true)
         {
-            NewtonMaterialSetContactStaticFrictionCoef(m_pMaterial, _coefficent, _primary ? 0 : 1);
+            //TODO: resolve -
+            //if getActor().getMaterial()->getStaticFriction() > 0;
+            //getActorPtr()->setFriction(getActor().getMaterial()->getStaticFriction());
         }
 
         virtual void setKineticFrictionCoefficient(Math::Real _coefficent, bool _primary = true)
         {
-            NewtonMaterialSetContactKineticFrictionCoef(m_pMaterial, _coefficent, _primary ? 0 : 1);
+            //TODO: resolve -
+            //if getActor().getMaterial()->getStaticFriction() > 0;
+            //getActorPtr()->setFriction(getActor().getMaterial()->getDynamicFriction());
         }
 

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

@@ -577 +577 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 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/ZBullet/src/PhysicsZone.hpp

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