Changeset 3361

Timestamp:

02/03/10 09:42:58 (6 weeks ago)

Author:

Azaezel

Message:

simple primitives + a NULL workaround

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• CollisionShape.cpp (modified) (5 diffs)
• CollisionShape.hpp (modified) (2 diffs)
• PhysicsActor.cpp (modified) (2 diffs)
• PhysicsZone.cpp (modified) (5 diffs)

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

@@ -47 +47 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 CollisionShape::CollisionShape()
-:   m_shape(NULL)
+:   m_pShape(NULL)
 ,   m_pScriptObject(NULL)
 ,   m_activationState(1)
@@ -57 +57 @@
 
     m_name = "";
+    m_IsNUllFlaged = false;
 }
 
@@ -62 +63 @@
 CollisionShape::~CollisionShape()
 {
+    if (m_pShape != NULL) delete m_pShape;
 }
 
@@ -82 +84 @@
 CollisionShape::getShapePtr()
 {
-    return m_shape;
+    return m_pShape;
 }
 
@@ -89 +91 @@
 CollisionShape::setShapePtr(btCollisionShape* _shape)
 {
-    m_shape = _shape;
+    m_pShape = _shape;
 }
 

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

@@ -69 +69 @@
 
 public:
-    /// @ For Internal Newton usage
+    /// @ For Internal Bullet usage
     /// @{
     btCollisionShape* getShapePtr();
     void setShapePtr(btCollisionShape* _shape);
+    void setIsNUllShape(bool _isnull){m_IsNUllFlaged = _isnull;};
+    bool isNULLShape(){return m_IsNUllFlaged;};
     /// @}
 
@@ -103 +105 @@
     /// @{
 private:
-    btCollisionShape*                        m_shape;
-    wpPhysicsZone_type                     m_pZone;
-    Zen::Math::Real                                  m_scaleX, m_scaleY, m_scaleZ;
-    Scripting::I_ObjectReference*           m_pScriptObject;
-    std::string                             m_name;
-        Zen::Math::Real                                                 m_minStrikeLen;
-    unsigned                                m_activationState;
-        int                                                                             m_collisionGroup;
-
-        pOwningObject_type                      m_pOwner;
+    btCollisionShape*                   m_pShape;
+    wpPhysicsZone_type                  m_pZone;
+    Zen::Math::Real                     m_scaleX, m_scaleY, m_scaleZ;
+    Scripting::I_ObjectReference*       m_pScriptObject;
+    std::string                         m_name;
+    Zen::Math::Real                     m_minStrikeLen;
+    unsigned                            m_activationState;
+    int                                 m_collisionGroup;
+    bool                                m_IsNUllFlaged;    
+    pOwningObject_type                  m_pOwner;
     /// @}
 

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

@@ -66 +66 @@
 {
     if (m_MotionState != NULL) delete m_MotionState;
+    if (m_pActor != NULL) delete m_pActor;
 }
 
@@ -135 +136 @@
     m_pActor = new btRigidBody(rbInfo);
     m_pActor->setUserPointer(this);
-    m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
+    //http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=4461&hilit=btRigidBody+vs+btCollisionObject
+    //might rework this to be part of collisiongroups later
+    if (dynamic_cast<CollisionShape*>(_collision.get())->isNULLShape())
+    {
+        m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK | btCollisionObject::CF_NO_CONTACT_RESPONSE);
+    }
+    else
+    {
+        m_pActor->setCollisionFlags(m_pActor->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
+    }
     return true;
 }

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

@@ -71 +71 @@
 PhysicsZone::~PhysicsZone()
 {
-    delete m_pZone;
-    delete m_pSolver;
-    delete m_pDispatcher;
-    delete m_pCollisionConfiguration;
-    delete m_pBroadphase;
+    if (m_pZone!= NULL) delete m_pZone;
+    if (m_pSolver!= NULL) delete m_pSolver;
+    if (m_pDispatcher!= NULL) delete m_pDispatcher;
+    if (m_pCollisionConfiguration!= NULL) delete m_pCollisionConfiguration;
+    if (m_pBroadphase != NULL) delete m_pBroadphase;
 }
 
@@ -312 +312 @@
     CollisionShape* pRawPointer = new CollisionShape();
     pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateNull(m_pZone));
+
+    //bit of a hacktastic workaround, but see http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=4461&hilit=btRigidBody+vs+btCollisionObject for intent
+    pRawPointer->setShapePtr(new btSphereShape(btScalar(1.)));
+    pRawPointer->setIsNUllShape(true);
     // TODO - set offsetMatrix (currently passing NULL, which centers the body at its origin)
     return pShape;
@@ -323 +326 @@
     CollisionShape* pRawPointer = new CollisionShape();
     pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateBox(m_pZone, _dx, _dy, _dz, NULL));
+
+    pRawPointer->setShapePtr(new btBoxShape(btVector3(_dx,_dy,_dz)));
     // TODO - set offsetMatrix (currently passing NULL, which centers the body at its origin)
     return pShape;
@@ -334 +338 @@
     CollisionShape* pRawPointer = new CollisionShape();
     pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateSphere(m_pZone, _radiusX, _radiusY, _radiusZ, NULL));
+
+    //seem to recall something about a multisphere shape being scalable in multiple directions... research further
+    pRawPointer->setShapePtr(new btSphereShape(btScalar(_radiusX)));
     // TODO - set offsetMatrix (currently passing NULL, which centers the body at its origin)
     return pShape;
@@ -346 +352 @@
     CollisionShape* pRawPointer = new CollisionShape();
     pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateCapsule(m_pZone, _radius, _height, NULL));
+
+    pRawPointer->setShapePtr(new btCapsuleShape(_radius, _height));
     // TODO - set offsetMatrix (currently passing NULL, which centers the body at its origin)
     return pShape;