Changeset 3301 for plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZNewton/src/PhysicsActor.cpp

Timestamp:

01/19/10 21:44:59 (8 months ago)

Author:

Azaezel

Message:

sent all instances of NewtonWorldUnfreezeBody? through setActivationState(bool) for simplicity of maintenance/portability and implemented the same for bullet

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZNewton/src/PhysicsActor.cpp (modified) (6 diffs)

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

@@ -208 +208 @@
 {
     NewtonBodySetAutoFreeze(m_pActor, _bFreeze ? 1 : 0);
-    NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    setActivationState(true);
     m_activationState = 1;
 }
@@ -292 +292 @@
     getOrientation(mat);
     mat.setPosition(_pos);
-    NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    setActivationState(true);
     m_activationState = 1;
 
@@ -359 +359 @@
     matrix.setPosition(pos);
 
-    NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    setActivationState(true);
     m_activationState = 1;
 
@@ -369 +369 @@
 PhysicsActor::setLinearVelocity(const Math::Vector3& _velocity)
 {
-    NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    setActivationState(true);
     m_activationState = 1;
 
@@ -405 +405 @@
 PhysicsActor::setAngularVelocity(const Math::Vector3& _omega)
 {
-    NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    setActivationState(true);
     m_activationState = 1;
 
@@ -620 +620 @@
 {
     m_activationState = _state;
+    if (m_activationState)
+        NewtonWorldUnfreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
+    else
+        NewtonWorldFreezeBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), m_pActor);
 }