Changeset 3353

Timestamp:

02/01/10 16:26:20 (7 weeks ago)

Author:

Azaezel

Message:

getting and applying additional torque

Files:

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

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

@@ -373 +373 @@
 PhysicsActor::getTorque()
 {
-    Math::Vector3 velocity;
-    btRigidBodyGetTorque(m_pActor, velocity.m_array);
-    m_torque = velocity;
+    btVector3 tquat = m_pActor->getTotalTorque();
+    m_torque.m_x = tquat.x();
+    m_torque.m_y = tquat.y();
+    m_torque.m_z = tquat.z();
     return m_torque;
 }
@@ -510 +511 @@
 PhysicsActor::applyTorque(const Math::Vector3& _torque)
 {
-    btRigidBodyAddTorque(m_pActor, _torque.m_array);
+    btVector3 tquat = btVector3(_torque.m_x,_torque.m_y,_torque.m_z);
+    m_pActor->applyTorque(tquat);//todo: crosscheck consistency, and if this one acts too far differently than newton, use applyTorqueImpulse, as that accounts for an inertial tensor
 }