Changeset 3361 for plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/CollisionShape.hpp

Timestamp:

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

Author:

Azaezel

Message:

simple primitives + a NULL workaround

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/CollisionShape.hpp (modified) (2 diffs)

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;
     /// @}