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

more work towards re-enabling grid broadphase.

Browse Source
This commit is contained in:
erwincoumans
2013-11-10 22:00:35 -08:00
parent ad8585f184
commit b0c43520e3
8 changed files with 929 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos3/GpuDemos/GpuDemo.h
View File

@@ -48,9 +48,9 @@ public:
arraySizeZ(10),
#else
arraySizeX(1),
arraySizeY(1),
arraySizeZ(1),
arraySizeX(30),
arraySizeY(30),
arraySizeZ(30),
#endif
m_useConcaveMesh(false),
gapX(16.3),

3
Demos3/GpuDemos/rigidbody/GpuRigidBodyDemo.cpp
View File

@@ -115,7 +115,8 @@ void GpuRigidBodyDemo::initPhysics(const ConstructionInfo& ci)
m_data->m_config.m_maxConvexBodies = b3Max(m_data->m_config.m_maxConvexBodies,ci.arraySizeX*ci.arraySizeY*ci.arraySizeZ+10);
m_data->m_config.m_maxConvexShapes = m_data->m_config.m_maxConvexBodies;
m_data->m_config.m_maxBroadphasePairs = 16*m_data->m_config.m_maxConvexBodies;
int maxPairsPerBody = 128;
m_data->m_config.m_maxBroadphasePairs = maxPairsPerBody*m_data->m_config.m_maxConvexBodies;
m_data->m_config.m_maxContactCapacity = m_data->m_config.m_maxBroadphasePairs;

1
Demos3/SimpleOpenGL3/main.cpp
View File

@@ -1,6 +1,7 @@
#include "../../btgui/OpenGLWindow/SimpleOpenGL3App.h"
#include "Bullet3Common/b3Vector3.h"
#include "assert.h"
#include <stdio.h>
int main(int argc, char* argv[])
{