diff --git a/data/slope.bullet b/data/slope.bullet index df44889da..01617a5c3 100644 Binary files a/data/slope.bullet and b/data/slope.bullet differ diff --git a/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp b/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp index 15431c940..bc73c6f08 100644 --- a/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp +++ b/examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp @@ -528,6 +528,11 @@ bool GwenUserInterface::keyboardCallback(int bulletKey, int state) //convert 'Bullet' keys into 'Gwen' keys switch (bulletKey) { + case B3G_RETURN: + { + gwenKey = Gwen::Key::Return; + break; + } case B3G_LEFT_ARROW: { gwenKey = Gwen::Key::Left; diff --git a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp index dd76aafec..b0e11cd42 100644 --- a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp +++ b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp @@ -360,16 +360,10 @@ static void saveCurrentSettings(int currentEntry,const char* startFileName) if (enable_experimental_opencl) { fprintf(f,"--enable_experimental_opencl\n"); - } else - { - fprintf(f,"//enable_experimental_opencl\n"); } if (sUseOpenGL2 ) { fprintf(f,"--opengl2\n"); - } else - { - fprintf(f,"//opengl2\n"); } fclose(f); @@ -926,13 +920,8 @@ bool OpenGLExampleBrowser::requestedExit() void OpenGLExampleBrowser::update(float deltaTime) { -/* if (sCurrentDemo) - { - sCurrentDemo->stepSimulation(deltaTime); - } - */ - assert(glGetError()==GL_NO_ERROR); + assert(glGetError()==GL_NO_ERROR); s_instancingRenderer->init(); DrawGridData dg; dg.upAxis = s_app->getUpAxis();