Changeset 3352 for plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.cpp

Timestamp:

02/01/10 15:59:41 (6 months ago)

Author:

Azaezel

Message:

initialization and static setting expansion, ZenMotionState? becomes MotionState?, fixed method definition order for CustomMaterialCombinerCallback? in PhysicsService?

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.cpp (modified) (7 diffs)

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

@@ -59 +59 @@
     m_name = "";
     m_MotionState = NULL;
+    m_mass = 0.0f;
 }
 
@@ -79 +80 @@
 {
     m_CollisionShape = _pCollisionShape;
+    m_mass = 0.0f;
     attachBody(m_CollisionShape);
 }
@@ -126 +128 @@
     //   TreeCollision (not impl yet), UserMesh (heightfield)
 
-
-
-    m_pActor = NewtonCreateBody(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), dynamic_cast<CollisionShape*>(_collision.get())->getShapePtr());
-    NewtonReleaseCollision(dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr(), dynamic_cast<CollisionShape*>(_collision.get())->getShapePtr());
-
     // set the transform call back function
-    m_MotionState = new PhysicsActor::ZenMotionState(this);
-
+    m_MotionState = new MotionState(this);
+    //mass, motionstate, collisionshape, and inertia are all necessary prior to creation for bullet
+    btRigidBody::btRigidBodyConstructionInfo rbInfo(m_mass,m_MotionState,dynamic_cast<CollisionShape*>(_collision.get())->getShapePtr(),btVector3(0.0f,0.0f,0.0f));
+
+    m_pActor = new btRigidBody(rbInfo);
     m_pActor->setUserPointer(this);
-
+    m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
     return true;
 }
@@ -204 +204 @@
 PhysicsActor::getMass()
 {
-    Zen::Math::Real mass;
-    Zen::Math::Real Ixx;
-    Zen::Math::Real Iyy;
-    Zen::Math::Real Izz;
-    btRigidBodyGetMassMatrix(m_pActor, &mass, &Ixx, &Iyy, &Izz);
-
-    return mass;
-}
-
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+    return m_mass;
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+//this gets a bit arcane since we're dealing with bit-flags. see http://www.cprogramming.com/tutorial/bitwise_operators.html for reference - bjr
 void 
 PhysicsActor::SetStatic(bool _isStatic = false)
@@ -221 +216 @@
         {
                 setMass(0);
+      m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() | btCollisionObject::CF_STATIC_OBJECT);
         }
         else
+   {
                 setMass(m_mass);
+      m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() & ~btCollisionObject::CF_STATIC_OBJECT);
+   }
 }
 
@@ -245 +244 @@
 PhysicsActor::setMass(float _mass)
 {
-    // set the mass to zero to make this a static body.
-    // set the mass to any positive value to make this a dynamic body.
-    Zen::Math::Real Ixx = _mass * m_scaleX * m_scaleX;
-    Zen::Math::Real Iyy = _mass * m_scaleY * m_scaleY;
-    Zen::Math::Real Izz = _mass * m_scaleZ * m_scaleZ;
-    btRigidBodySetMassMatrix(m_pActor, _mass, Ixx, Iyy, Izz);
+    m_mass = _mass;
 }
 
@@ -425 +419 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 void
-PhysicsActor::ZenMotionState::getWorldTransform(btTransform& _worldTrans) const
-{
-
-}
-
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-void
-PhysicsActor::ZenMotionState::setWorldTransform(const btTransform& _worldTrans)
+PhysicsActor::MotionState::getWorldTransform(btTransform& _worldTrans) const
+{
+//don't belive we really need anything here since were updating visuals on the set end... might need to crosscheck later -bjr
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
+PhysicsActor::MotionState::setWorldTransform(const btTransform& _worldTrans)
 {
     if (m_userPointer == NULL) return;