Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ParallelPhysicsEnvironment development started

Browse Source
This commit is contained in:
ejcoumans
2006-06-30 05:39:15 +00:00
parent 54d609faa2
commit 8e91b0cd68
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -14,6 +14,8 @@ subject to the following restrictions:
*/
#include "CcdPhysicsEnvironment.h"
#include "ParallelPhysicsEnvironment.h"
#include "CcdPhysicsController.h"
#include "MyMotionState.h"
//#include "GL_LineSegmentShape.h"
@@ -87,8 +89,11 @@ const int maxNumObjects = 32760;
MyMotionState ms[maxNumObjects];
CcdPhysicsController* physObjects[maxNumObjects] = {0,0,0,0};
int shapeIndex[maxNumObjects];
#ifdef USE_PARALLEL_DISPATCHER
ParallelPhysicsEnvironment* physicsEnvironmentPtr = 0;
#else
CcdPhysicsEnvironment* physicsEnvironmentPtr = 0;
#endif
#define CUBE_HALF_EXTENTS 1
@@ -131,7 +136,7 @@ int main(int argc,char** argv)
CollisionDispatcher* dispatcher = new CollisionDispatcher();
Dispatcher* dispatcher2 = new ParallelIslandDispatcher();
ParallelIslandDispatcher* dispatcher2 = new ParallelIslandDispatcher();
SimdVector3 worldAabbMin(-30000,-30000,-30000);
SimdVector3 worldAabbMax(30000,30000,30000);
@@ -139,7 +144,11 @@ int main(int argc,char** argv)
//BroadphaseInterface* broadphase = new AxisSweep3(worldAabbMin,worldAabbMax,maxProxies,maxOverlap);
OverlappingPairCache* broadphase = new SimpleBroadphase(maxProxies,maxOverlap);
#ifdef USE_PARALLEL_DISPATCHER
physicsEnvironmentPtr = new ParallelPhysicsEnvironment(dispatcher2,broadphase);
#else
physicsEnvironmentPtr = new CcdPhysicsEnvironment(dispatcher,broadphase);
#endif
physicsEnvironmentPtr->setDeactivationTime(2.f);
physicsEnvironmentPtr->setGravity(0,-10,0);

2
Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h
View File

@@ -99,7 +99,7 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment
virtual void endFrame() {};
/// Perform an integration step of duration 'timeStep'.
virtual bool proceedDeltaTime(double curTime,float timeStep);
bool proceedDeltaTimeOneStep(float timeStep);
virtual bool proceedDeltaTimeOneStep(float timeStep);
virtual void setFixedTimeStep(bool useFixedTimeStep,float fixedTimeStep){};
//returns 0.f if no fixed timestep is used

3
Extras/PhysicsInterface/CcdPhysics/ParallelPhysicsEnvironment.h
View File

@@ -35,7 +35,8 @@ class ParallelPhysicsEnvironment : public CcdPhysicsEnvironment
/// Perform an integration step of duration 'timeStep'.
bool proceedDeltaTimeOneStep(float timeStep);
virtual bool proceedDeltaTimeOneStep(float timeStep);
};