Changeset 3325

Timestamp:

01/28/10 14:46:15 (7 weeks ago)

Author:

Azaezel

Message:

userdata referencing

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

@@ -134 +134 @@
     btRigidBodySetForceAndTorqueCallback(m_pActor, ApplyForceAndTorqueCallback);
     btRigidBodySetAutoactiveCallback(m_pActor, ActivationStateCallback);
-
-    //btRigidBodySetFreezeTreshold(m_pActor, 
-
-    btRigidBodySetUserData(m_pActor, this);
+    
+    m_pActor.setUserPointer(this);
 
     return true;
@@ -440 +438 @@
 PhysicsActor::TransformCallback(const btRigidBody* _body, const Zen::Math::Real* _matrix)
 {
-    void* pBody = btRigidBodyGetUserData(_body);
+    void* pBody = _body->getUserPointer();
     if (pBody != NULL)
     {