From 6bfa60c365ad5531033a1ded3a2705c0a5bd33db Mon Sep 17 00:00:00 2001
From: erwincoumans <erwincoumans@erwin-UBUNTU1210.(none)>
Date: Thu, 23 May 2013 10:23:08 -0700
Subject: [PATCH] tweak demo a bit and add 'exit' to X11 window

---
 Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp | 4 ++--
 btgui/OpenGLWindow/X11OpenGLWindow.cpp       | 7 ++++---
 btgui/OpenGLWindow/X11OpenGLWindow.h         | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp b/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
index 628175ac0..a394952fd 100644
--- a/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
+++ b/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp
@@ -104,8 +104,8 @@ int	GpuConvexScene::createDynamicsObjects2(const ConstructionInfo& ci, const flo
 					{
 						//mass=0.f;
 					}
-					//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((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);
 
 					b3Quaternion orn(0,0,0,1);
 
diff --git a/btgui/OpenGLWindow/X11OpenGLWindow.cpp b/btgui/OpenGLWindow/X11OpenGLWindow.cpp
index 2975ca341..f1efad955 100644
--- a/btgui/OpenGLWindow/X11OpenGLWindow.cpp
+++ b/btgui/OpenGLWindow/X11OpenGLWindow.cpp
@@ -49,7 +49,8 @@ struct InternalData2
 
 
 X11OpenGLWindow::X11OpenGLWindow()
-:m_OpenGLInitialized(false)
+:m_OpenGLInitialized(false),
+m_requestedExit(false)
 {
     m_data = new InternalData2;
 }
@@ -371,12 +372,12 @@ float   X11OpenGLWindow::getTimeInSeconds()
 
 bool    X11OpenGLWindow::requestedExit() const
 {
-    return false;
+    return m_requestedExit;
 }
 
 void    X11OpenGLWindow::setRequestExit()
 {
-
+	m_requestedExit=true;
 }
 
 void X11OpenGLWindow::setRenderCallback( b3RenderCallback renderCallback)
diff --git a/btgui/OpenGLWindow/X11OpenGLWindow.h b/btgui/OpenGLWindow/X11OpenGLWindow.h
index 7bfa219ff..1714fa2d1 100644
--- a/btgui/OpenGLWindow/X11OpenGLWindow.h
+++ b/btgui/OpenGLWindow/X11OpenGLWindow.h
@@ -10,6 +10,7 @@ class X11OpenGLWindow : public b3gWindowInterface
 
 	struct InternalData2*   m_data;
         bool m_OpenGLInitialized;
+	bool m_requestedExit;
 
 protected: