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

re-enable enter key in example browser

Browse Source
This commit is contained in:
Erwin Coumans
2015-08-04 22:03:53 -07:00
parent b316f30040
commit 250068d5eb
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/slope.bullet
View File

Binary file not shown.

5
examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
View File

@@ -528,6 +528,11 @@ bool GwenUserInterface::keyboardCallback(int bulletKey, int state)
//convert 'Bullet' keys into 'Gwen' keys //convert 'Bullet' keys into 'Gwen' keys
switch (bulletKey) switch (bulletKey)
{ {
case B3G_RETURN:
{
gwenKey = Gwen::Key::Return;
break;
}
case B3G_LEFT_ARROW: case B3G_LEFT_ARROW:
{ {
gwenKey = Gwen::Key::Left; gwenKey = Gwen::Key::Left;

11
examples/ExampleBrowser/OpenGLExampleBrowser.cpp
View File

@@ -360,16 +360,10 @@ static void saveCurrentSettings(int currentEntry,const char* startFileName)
if (enable_experimental_opencl) if (enable_experimental_opencl)
{ {
fprintf(f,"--enable_experimental_opencl\n"); fprintf(f,"--enable_experimental_opencl\n");
} else
{
fprintf(f,"//enable_experimental_opencl\n");
} }
if (sUseOpenGL2 ) if (sUseOpenGL2 )
{ {
fprintf(f,"--opengl2\n"); fprintf(f,"--opengl2\n");
} else
{
fprintf(f,"//opengl2\n");
} }
fclose(f); fclose(f);
@@ -926,11 +920,6 @@ bool OpenGLExampleBrowser::requestedExit()
void OpenGLExampleBrowser::update(float deltaTime) void OpenGLExampleBrowser::update(float deltaTime)
{ {
/* if (sCurrentDemo)
{
sCurrentDemo->stepSimulation(deltaTime);
}
*/
assert(glGetError()==GL_NO_ERROR); assert(glGetError()==GL_NO_ERROR);
s_instancingRenderer->init(); s_instancingRenderer->init();