diff --git a/Demos3/bullet2/BasicDemo/main.cpp b/Demos3/bullet2/BasicDemo/main.cpp index e0d919054..8d90b8416 100644 --- a/Demos3/bullet2/BasicDemo/main.cpp +++ b/Demos3/bullet2/BasicDemo/main.cpp @@ -112,7 +112,15 @@ public: { float halfExtents[]={1,1,1,1}; - float color[]={0,1,0,1}; + b3Vector4 colors[4] = + { + b3MakeVector4(1,0,0,1), + b3MakeVector4(0,1,0,1), + b3MakeVector4(0,1,1,1), + b3MakeVector4(1,1,0,1), + }; + + btTransform startTransform; startTransform.setIdentity(); @@ -127,9 +135,13 @@ public: { for(int j = 0;jm_instancingRenderer->registerGraphicsInstance(cubeShapeId,startTransform.getOrigin(),startTransform.getRotation(),color,halfExtents); @@ -177,8 +189,14 @@ int main(int argc, char* argv[]) { float dt = 1./120.f; +#ifdef BT_DEBUG + char* name = "Bullet 2 CPU BasicDemo (Debug build=SLOW)"; +#else + char* name = "Bullet 2 CPU BasicDemo"; +#endif + - SimpleOpenGL3App* app = new SimpleOpenGL3App("Bullet 2 CPU BasicDemo",1024,768); + SimpleOpenGL3App* app = new SimpleOpenGL3App(name,1024,768); app->m_instancingRenderer->setCameraDistance(40); app->m_instancingRenderer->setCameraPitch(0); app->m_instancingRenderer->setCameraTargetPosition(b3MakeVector3(0,0,0)); diff --git a/win32_binary/App_Bullet3_OpenCL_Demos_clew_vs2010.exe b/win32_binary/App_Bullet3_OpenCL_Demos_clew_vs2010.exe deleted file mode 100644 index f1ff130c1..000000000 Binary files a/win32_binary/App_Bullet3_OpenCL_Demos_clew_vs2010.exe and /dev/null differ diff --git a/win32_binary/App_ImplicitCloth_vs2010.exe b/win32_binary/App_ImplicitCloth_vs2010.exe deleted file mode 100644 index e5c610293..000000000 Binary files a/win32_binary/App_ImplicitCloth_vs2010.exe and /dev/null differ diff --git a/win32_binary/App_SimpleOpenGL3_vs2010.exe b/win32_binary/App_SimpleOpenGL3_vs2010.exe deleted file mode 100644 index e83f17971..000000000 Binary files a/win32_binary/App_SimpleOpenGL3_vs2010.exe and /dev/null differ diff --git a/win32_binary/App_ThreadingTest_vs2010.exe b/win32_binary/App_ThreadingTest_vs2010.exe deleted file mode 100644 index 55f18ec3e..000000000 Binary files a/win32_binary/App_ThreadingTest_vs2010.exe and /dev/null differ diff --git a/win32_binary/OpenCL_GUI_Intialize_clew_vs2010.exe b/win32_binary/OpenCL_GUI_Intialize_clew_vs2010.exe deleted file mode 100644 index 015ffe7a4..000000000 Binary files a/win32_binary/OpenCL_GUI_Intialize_clew_vs2010.exe and /dev/null differ diff --git a/win32_binary/Test_OpenCL_Primitives_clew_vs2010.exe b/win32_binary/Test_OpenCL_Primitives_clew_vs2010.exe deleted file mode 100644 index 5cb133119..000000000 Binary files a/win32_binary/Test_OpenCL_Primitives_clew_vs2010.exe and /dev/null differ diff --git a/win32_binary/Test_OpenCL_RadixSortBenchmark_clew_vs2010.exe b/win32_binary/Test_OpenCL_RadixSortBenchmark_clew_vs2010.exe deleted file mode 100644 index 385ce05b0..000000000 Binary files a/win32_binary/Test_OpenCL_RadixSortBenchmark_clew_vs2010.exe and /dev/null differ diff --git a/win32_binary/Test_OpenCL_kernel_launch_clew_vs2010.exe b/win32_binary/Test_OpenCL_kernel_launch_clew_vs2010.exe deleted file mode 100644 index e72085245..000000000 Binary files a/win32_binary/Test_OpenCL_kernel_launch_clew_vs2010.exe and /dev/null differ