Changeset 3324

Timestamp:

01/28/10 14:40:12 (7 weeks ago)

Author:

Azaezel

Message:

various minor points of cleanup. properly deleting m_pZone, typos, and the like

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• PhysicsActor.cpp (modified) (4 diffs)
• PhysicsZone.cpp (modified) (1 diff)

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

@@ -200 +200 @@
 PhysicsActor::setLinearDamping(float _damping)
 {
-    m_pActor->setDamping(_damping.magnitude(), m_pActor->getAngularDamping());
+    m_pActor->setDamping(_damping, m_pActor->getAngularDamping());
 }
 
@@ -345 +345 @@
     btTransform mat;
 
-    btVector3 tquat = btVector3(_orient.m_x,_orient.m_y,_orient.m_z;
+    btVector3 tquat = btVector3(_orient.m_x,_orient.m_y,_orient.m_z);
     tquat.setW(_orient.m_w);
 
     mat.setOrigin(m_pActor->getWorldTransform().getOrigin());
-    mat.setRotation(tquat);
+    mat.setRotation(btQuaternion(tquat,1.0f));
     
     if (m_pActor->getMotionState() != NULL)
@@ -363 +363 @@
 PhysicsActor::setOrientation(const Math::Matrix4& _orient)
 {
-    Math::Quaternion4 tquat = Quaternion4(_orient);
+    Math::Quaternion4 tquat = Math::Quaternion4(_orient);
     setOrientation(tquat);
 }
@@ -414 +414 @@
 {
     setActivationState(true);
-    m_pActor->setAngularVelocity(btVector3(_omega.x,_omega.y,_omega.z));
+    m_pActor->setAngularVelocity(btVector3(_omega.m_x,_omega.m_y,_omega.m_z));
 }
 

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

@@ -70 +70 @@
 PhysicsZone::~PhysicsZone()
 {
-    delete m_pDynamicsWorld;
+    delete m_pZone;
     delete m_pSolver;
     delete m_pDispatcher;