report when compound pair capacity is exceeded (and avoid crash)
add tetrahedron, reorganized demos
This commit is contained in:
@@ -106,16 +106,12 @@ GpuDemo::CreateFunc* allDemos[]=
|
||||
|
||||
|
||||
|
||||
ConcaveScene::MyCreateFunc,
|
||||
|
||||
|
||||
ConcaveSphereScene::MyCreateFunc,
|
||||
|
||||
ConcaveCompoundScene::MyCreateFunc,
|
||||
|
||||
// GpuCompoundPlaneScene::MyCreateFunc,
|
||||
|
||||
|
||||
GpuConstraintsDemo::MyCreateFunc,
|
||||
GpuCompoundPlaneScene::MyCreateFunc,
|
||||
|
||||
GpuTetraScene::MyCreateFunc,
|
||||
|
||||
|
||||
@@ -680,7 +680,7 @@ b3Vector3 childPositions[3] = {
|
||||
{
|
||||
float mass = 1;//j==0? 0.f : 1.f;
|
||||
|
||||
b3Vector3 position(i*ci.gapX,50+j*ci.gapY,k*ci.gapZ);
|
||||
b3Vector3 position((-ci.arraySizeX/2+i)*ci.gapX,50+j*ci.gapY,(-ci.arraySizeZ/2+k)*ci.gapZ);
|
||||
//b3Quaternion orn(0,0,0,1);
|
||||
b3Quaternion orn(b3Vector3(1,0,0),0.7);
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public:
|
||||
virtual ~ConcaveScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBConcave";
|
||||
return "BoxTrimesh";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
virtual ~ConcaveSphereScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "ConcaveSphere";
|
||||
return "SphereTrimesh";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
virtual ~ConcaveCompoundScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBConcaveCompound";
|
||||
return "CompoundConcave";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
|
||||
@@ -11,7 +11,7 @@ public:
|
||||
virtual ~GpuCompoundScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GpuCompound";
|
||||
return "CompoundOnSphere";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
virtual ~GpuCompoundPlaneScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GpuCompoundPlane";
|
||||
return "CompoundOnPlane";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
virtual ~GpuConvexScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBConvex";
|
||||
return "Tetrahedra";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
virtual ~GpuConvexPlaneScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBConvexPlane";
|
||||
return "ConvexOnPlane";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -72,7 +72,7 @@ public:
|
||||
virtual ~GpuBoxPlaneScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBBoxPlane";
|
||||
return "BoxPlane";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
@@ -97,7 +97,7 @@ void createFromTetGenData(const char* ele,
|
||||
public:
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GpuTetraScene";
|
||||
return "TetraBreakable";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
|
||||
@@ -11,7 +11,7 @@ public:
|
||||
virtual ~GpuSphereScene(){}
|
||||
virtual const char* getName()
|
||||
{
|
||||
return "GRBSphere";
|
||||
return "BoxOnSphere";
|
||||
}
|
||||
|
||||
static GpuDemo* MyCreateFunc()
|
||||
|
||||
Reference in New Issue
Block a user