move b3RaycastInfo.h so it can be used without OpenCL dependency
add b3Assert to make sure m_maxShapeCapacityInBytes is not exceeded in GLInstancingRenderer prepare for CpuSoftClothDemo
This commit is contained in:
@@ -100,12 +100,14 @@ struct EmptyDemo : public CpuDemo
|
||||
};
|
||||
#include "rendering/RenderDemo.h"
|
||||
#include "rigidbody/RigidBodyDemo.h"
|
||||
#include "deformable/CpuSoftBodyDemo.h"
|
||||
|
||||
|
||||
b3AlignedObjectArray<const char*> demoNames;
|
||||
int selectedDemo = 0;
|
||||
CpuDemo::CreateFunc* allDemos[]=
|
||||
{
|
||||
//CpuSoftClothDemo::MyCreateFunc,
|
||||
RigidBodyDemo::MyCreateFunc,
|
||||
RenderDemo::MyCreateFunc,
|
||||
EmptyDemo::MyCreateFunc,
|
||||
@@ -627,7 +629,7 @@ int main(int argc, char* argv[])
|
||||
|
||||
|
||||
int maxObjectCapacity=1024*1024;//128*1024;
|
||||
int maxShapeCapacityInBytes=128*1024;
|
||||
int maxShapeCapacityInBytes=10*1024*1024;
|
||||
|
||||
//maxObjectCapacity = b3Max(maxObjectCapacity,ci.arraySizeX*ci.arraySizeX*ci.arraySizeX+10);
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ struct RigidBodyDemo : public CpuDemo
|
||||
{
|
||||
|
||||
struct b3DynamicBvhBroadphase* m_bp;
|
||||
struct b3CpuNarrowPhase* m_np;
|
||||
class b3CpuNarrowPhase* m_np;
|
||||
|
||||
struct b3CpuRigidBodyPipeline* m_rb;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "GpuRigidBodyDemo.h"
|
||||
#include "Bullet3Common/b3AlignedObjectArray.h"
|
||||
#include "Bullet3OpenCL/Raycast/b3RaycastInfo.h"
|
||||
#include "Bullet3Collision/NarrowPhaseCollision/b3RaycastInfo.h"
|
||||
|
||||
class GpuConvexScene : public GpuRigidBodyDemo
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user