Changeset 3326

Timestamp:

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

Author:

Azaezel

Message:

cleanup for setUserPointer, removed event constructor references to the ZBulletMaterial stub-class. we'll be deriving those from getActor()s later down the line

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• PhysicsActor.cpp (modified) (1 diff)
• PhysicsActor.hpp (modified) (9 diffs)
• PhysicsMaterial.cpp (modified) (2 diffs)

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

@@ -135 +135 @@
     btRigidBodySetAutoactiveCallback(m_pActor, ActivationStateCallback);
     
-    m_pActor.setUserPointer(this);
+    m_pActor->setUserPointer(this);
 
     return true;

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

@@ -46 +46 @@
 namespace ZBullet {
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-class ZBulletMaterial;
 class PhysicsZone;
 
@@ -183 +182 @@
     public:
 
-        CollisionEventData(const ZBulletMaterial* _pMaterial, Engine::Physics::I_PhysicsActor& _shape, Engine::Physics::I_PhysicsActor& _otherShape);
+        CollisionEventData(Engine::Physics::I_PhysicsActor& _shape, Engine::Physics::I_PhysicsActor& _otherShape);
 
     protected:
-        const ZBulletMaterial*                  m_pMaterial;
+        Engine::Physics::I_PhysicsMaterial*     m_pMaterial;
         Engine::Physics::I_PhysicsActor&        m_actor;
         Engine::Physics::I_PhysicsActor&        m_otherActor;
@@ -205 +204 @@
 
     public:
-        BeginCollisionEventData(const ZBulletMaterial* _pMaterial, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
+        BeginCollisionEventData(Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
 
     private:
@@ -329 +328 @@
     public:
 
-        DuringCollisionEventData(const ZBulletMaterial* _pMaterial, const btManifoldPoint* _contact, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
+        DuringCollisionEventData(const btManifoldPoint* _contact, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
 
     private:
@@ -346 +345 @@
     public:
 
-        EndCollisionEventData(const ZBulletMaterial* _material, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
+        EndCollisionEventData(Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor);
 
     private:
@@ -392 +391 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline
-PhysicsActor::CollisionEventData::CollisionEventData(const ZBulletMaterial* _pMaterial, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
-:   m_pMaterial(_pMaterial)
-,   m_actor(_actor)
+PhysicsActor::CollisionEventData::CollisionEventData(Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
+:   m_actor(_actor)
 ,   m_otherActor(_otherActor)
 {
@@ -401 +399 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline
-PhysicsActor::BeginCollisionEventData::BeginCollisionEventData(const ZBulletMaterial* _pMaterial, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
-:   CollisionEventData(_pMaterial, _actor, _otherActor)
+PhysicsActor::BeginCollisionEventData::BeginCollisionEventData(Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
+:   CollisionEventData(_actor, _otherActor)
 ,   m_ignoreCollision(false)
 {
@@ -409 +407 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline
-PhysicsActor::DuringCollisionEventData::DuringCollisionEventData(const ZBulletMaterial* _pMaterial, const btManifoldPoint* _pContact, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
-:   CollisionEventData(_pMaterial, _actor, _otherActor)
+PhysicsActor::DuringCollisionEventData::DuringCollisionEventData(const btManifoldPoint* _pContact, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
+:   CollisionEventData(_actor, _otherActor)
 ,   m_pContact(_pContact)
 {
@@ -418 +416 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 inline
-PhysicsActor::EndCollisionEventData::EndCollisionEventData(const ZBulletMaterial* _pMaterial, Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
-:   CollisionEventData(_pMaterial, _actor, _otherActor)
+PhysicsActor::EndCollisionEventData::EndCollisionEventData(Engine::Physics::I_PhysicsActor& _actor, Engine::Physics::I_PhysicsActor& _otherActor)
+:   CollisionEventData(_actor, _otherActor)
 {
 }

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

@@ -38 +38 @@
 {
     m_pNewtonZone = dynamic_cast<PhysicsZone*>(m_pZone.get())->getZonePtr();
-    m_defaultGroupID = ZBulletMaterialGetDefaultGroupID(m_pNewtonZone);
+    m_defaultGroupID = NULL;
 
     if (_default)
@@ -54 +54 @@
     m_staticFriction = 1.0f;
     setDynamicFriction(0.7f);
-        setCallbacks();
+    setCallbacks();
 }