diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-03-27 10:37:30 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-03-27 10:37:30 +0400 |
| commit | af9573e9eaf9314e9d07575802d34c17bb1091b3 (patch) | |
| tree | 2724acf7c45b2f829407e17a8d766905c1d762cd /source/gameengine | |
| parent | 75ce4ca859f7949193015462b5a203137656a7de (diff) | |
Synchronized Bullet physics to latest version.
- Changed license from MIT to ZLib.
- Added 3D Sweep and Prune contribution
- More stable native constraint solver
Sorry for any inconvenience caused by this checkin.
All Blender buildsystems require update: added files and moved files.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 995fbb2a1e8..9694d5cb38e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -6,6 +6,8 @@ #include "Dynamics/RigidBody.h" #include "BroadphaseCollision/BroadphaseInterface.h" #include "BroadphaseCollision/SimpleBroadphase.h" +#include "BroadphaseCollision/AxisSweep3.h" + #include "CollisionDispatch/CollisionWorld.h" #include "CollisionShapes/ConvexShape.h" @@ -302,7 +304,16 @@ m_solverType(-1) if(!broadphase) - broadphase = new SimpleBroadphase(); + { + + //todo: calculate/let user specify this world sizes + SimdVector3 worldMin(-10000,-10000,-10000); + SimdVector3 worldMax(10000,10000,10000); + + broadphase = new AxisSweep3(worldMin,worldMax); + + //broadphase = new SimpleBroadphase(); + } setSolverType(0); |