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

tweak demo a bit and add 'exit' to X11 window

Browse Source
This commit is contained in:
erwincoumans
2013-05-23 10:23:08 -07:00
parent a2553cbdad
commit 6bfa60c365
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
View File

@@ -104,8 +104,8 @@ int GpuConvexScene::createDynamicsObjects2(const ConstructionInfo& ci, const flo
{ {
//mass=0.f; //mass=0.f;
} }
//b3Vector3 position((j&1)+i*2.2,1+j*2.,(j&1)+k*2.2); b3Vector3 position((j&1)+i*2.2,1+j*2.,(j&1)+k*2.2);
b3Vector3 position(i*2.2,10+j*1.9,k*2.2); //b3Vector3 position(i*2.2,10+j*1.9,k*2.2);
b3Quaternion orn(0,0,0,1); b3Quaternion orn(0,0,0,1);

7
btgui/OpenGLWindow/X11OpenGLWindow.cpp
View File

@@ -49,7 +49,8 @@ struct InternalData2
X11OpenGLWindow::X11OpenGLWindow() X11OpenGLWindow::X11OpenGLWindow()
:m_OpenGLInitialized(false) :m_OpenGLInitialized(false),
m_requestedExit(false)
{ {
m_data = new InternalData2; m_data = new InternalData2;
} }
@@ -371,12 +372,12 @@ float X11OpenGLWindow::getTimeInSeconds()
bool X11OpenGLWindow::requestedExit() const bool X11OpenGLWindow::requestedExit() const
{ {
return false; return m_requestedExit;
} }
void X11OpenGLWindow::setRequestExit() void X11OpenGLWindow::setRequestExit()
{ {
m_requestedExit=true;
} }
void X11OpenGLWindow::setRenderCallback( b3RenderCallback renderCallback) void X11OpenGLWindow::setRenderCallback( b3RenderCallback renderCallback)

1
btgui/OpenGLWindow/X11OpenGLWindow.h
View File

@@ -10,6 +10,7 @@ class X11OpenGLWindow : public b3gWindowInterface
struct InternalData2* m_data; struct InternalData2* m_data;
bool m_OpenGLInitialized; bool m_OpenGLInitialized;
bool m_requestedExit;
protected: protected: