Changeset 3317

Timestamp:

01/26/10 10:55:08 (8 weeks ago)

Author:

Azaezel

Message:

world initialization rough draft

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src

Files:

• PhysicsZone.cpp (modified) (2 diffs)
• PhysicsZone.hpp (modified) (1 diff)

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

@@ -37 +37 @@
 #include <Zen/Core/Math/Vector4.hpp>
 
-//#include <dVector.h> //no likey. recheck
-
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 namespace Zen {
 namespace ZBullet {
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+//refnote: http://bulletphysics.org/mediawiki-1.5.8/index.php/Hello_World
 PhysicsZone::PhysicsZone()
 :   m_pScriptModule(Engine::Physics::I_PhysicsManager::getSingleton().getDefaultScriptModule())
 ,   m_pScriptObject(NULL)
 {
-    m_pZone = NewtonCreate(NULL, NULL);
-
-    m_vGravity = Math::Vector3(0.0f, -9.8f, 0.0f);
+
     m_bDefaultMaterialCreated = false;
 
-    NewtonSetFrictionModel(m_pZone, 1);
-    NewtonSetSolverModel(m_pZone, 2);
+    // Build the broadphase
+    int maxProxies = 1024;
+    btVector3 worldAabbMin(-10000,-10000,-10000);
+    btVector3 worldAabbMax(10000,10000,10000);
+    m_pBroadphase = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies);
+ 
+    // Set up the collision configuration and dispatcher
+    m_pCollisionConfiguration = new btDefaultCollisionConfiguration();
+    m_pDispatcher = new btCollisionDispatcher(collisionConfiguration);
+ 
+    // The actual physics solver
+    m_pSolver = new btSequentialImpulseConstraintSolver;
+ 
+    // The world.
+    m_pZone = new btDiscreteDynamicsWorld(m_pDispatcher,m_pBroadphase,m_pSolver,m_pCollisionConfiguration);
+    m_pZone->setGravity(btVector3(0.0f, -9.8f, 0.0f));
 }
 
@@ -59 +70 @@
 PhysicsZone::~PhysicsZone()
 {
-    NewtonDestroy(m_pZone);
+    delete m_pDynamicsWorld;
+    delete m_pSolver;
+    delete m_pDispatcher;
+    delete m_pCollisionConfiguration;
+    delete m_pBroadphase;
 }
 

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

@@ -159 +159 @@
     /// @{
 private:
-    btDiscreteDynamicsWorld*                        m_pZone;
+    btDiscreteDynamicsWorld*            m_pZone;
+    btAxisSweep3*                       m_pBroadphase;
+    btCollisionDispatcher*              m_pDispatcher;
+    btDefaultCollisionConfiguration*    m_pCollisionConfiguration;
+    btSequentialImpulseConstraintSolver* m_pSolver;
     Math::Vector3                       m_vGravity;
     bool                                m_bDefaultMaterialCreated;