diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-21 19:17:50 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-21 19:17:50 +0400 |
| commit | 1c29d02305685a942742846c757775800202a52a (patch) | |
| tree | 516370cd730151a5a6246a713f1622e40b0b287d /extern/bullet2/src/BulletCollision/BroadphaseCollision | |
| parent | 92829e821f345596edec123e06187186e2471027 (diff) | |
BGE real-time soft bodies, step 2 / 3: create a btSoftBody. Next step is hooking up / deform graphics mesh and choose collision shape.
Note: feature is still disabled.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/BroadphaseCollision')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp | 5 | ||||
| -rw-r--r-- | extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp index e711078f4e2..e00fc6aa5e3 100644 --- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp +++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp @@ -119,7 +119,7 @@ void Process(const btDbvtNode* n) // btDbvtBroadphase::btDbvtBroadphase(btOverlappingPairCache* paircache) { -m_deferedcollide = true;//false; +m_deferedcollide = false; m_needcleanup = true; m_releasepaircache = (paircache!=0)?false:true; m_prediction = 1/(btScalar)2; @@ -164,7 +164,7 @@ btBroadphaseProxy* btDbvtBroadphase::createProxy( const btVector3& aabbMin, void* userPtr, short int collisionFilterGroup, short int collisionFilterMask, - btDispatcher* dispatcher, + btDispatcher* /*dispatcher*/, void* /*multiSapProxy*/) { btDbvtProxy* proxy=new(btAlignedAlloc(sizeof(btDbvtProxy),16)) btDbvtProxy( userPtr, @@ -180,6 +180,7 @@ if(!m_deferedcollide) btDbvtTreeCollider collider(this); collider.proxy=proxy; btDbvt::collideTV(m_sets[0].m_root,proxy->aabb,collider); + btDbvt::collideTV(m_sets[1].m_root,proxy->aabb,collider); } return(proxy); } diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h index 4576e48f3f4..1f16043a7a8 100644 --- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h +++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h @@ -86,7 +86,6 @@ int m_gid; // Gen id bool m_releasepaircache; // Release pair cache on delete bool m_deferedcollide; // Defere dynamic/static collision to collide call bool m_needcleanup; // Need to run cleanup? -bool m_initialize; // Initialization #if DBVT_BP_PROFILE btClock m_clock; struct { |