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

add RtMini test/library (works under Windows)

Browse Source 
minor cleanups
This commit is contained in:
erwin coumans
2013-03-30 00:14:46 -07:00
parent a1aa281622
commit 8797524bd6
16 changed files with 4698 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
demo/gpudemo/main_opengl3core.cpp
View File

@@ -64,22 +64,22 @@ btAlignedObjectArray<const char*> demoNames;
int selectedDemo = 0;
GpuDemo::CreateFunc* allDemos[]=
{
GpuConvexScene::MyCreateFunc,
ConcaveScene::MyCreateFunc,
GpuConvexScene::MyCreateFunc,
GpuCompoundScene::MyCreateFunc,
PairBench::MyCreateFunc,
GpuRigidBodyDemo::MyCreateFunc,
//GpuRigidBodyDemo::MyCreateFunc,
//BroadphaseBenchmark::CreateFunc,
//GpuBoxDemo::CreateFunc,
PairBench::MyCreateFunc,
ParticleDemo::MyCreateFunc,
//ParticleDemo::MyCreateFunc,
//SpheresDemo::CreateFunc,
@@ -381,7 +381,11 @@ int main(int argc, char* argv[])
args.GetCmdLineArgument("selected_demo",selectedDemo);
useNewBatchingKernel = args.CheckCmdLineFlag("new_batching");
if (args.CheckCmdLineFlag("new_batching"))
{
useNewBatchingKernel = true;
}
bool benchmark=args.CheckCmdLineFlag("benchmark");
dump_timings=args.CheckCmdLineFlag("dump_timings");
ci.useOpenCL = !args.CheckCmdLineFlag("disable_opencl");
@@ -563,6 +567,7 @@ int main(int argc, char* argv[])
ci.m_instancingRenderer = new GLInstancingRenderer(maxObjectCapacity);//render.getInstancingRenderer();
ci.m_window = window;
ci.m_gui = gui;
ci.m_instancingRenderer->init();
ci.m_instancingRenderer->InitShaders();
@@ -615,11 +620,6 @@ int main(int argc, char* argv[])
window->startRendering();
char msg[1024];
int numInstances = 0;//ci.m_instancingRenderer->getNumInstances();
sprintf(msg,"Num objects = %d",numInstances);
gui->setStatusBarMessage(msg,true);
glClearColor(0.6,0.6,0.6,1);
glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT);
glEnable(GL_DEPTH_TEST);