Changeset 4317 in orxonox.OLD

Timestamp:

May 27, 2005, 12:44:55 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: threads work

Location:

orxonox/branches/physics/src/subprojects/particles

Files:

• framework.cc (modified) (3 diffs)
• framework.h (modified) (2 diffs)

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -294 +294 @@
 }
 
+Framework* Framework::singletonRef = NULL;
+
+Framework* Framework::getInstance(void)
+{
+  if (Framework::singletonRef == NULL)
+    Framework::singletonRef = new Framework();
+  return Framework::singletonRef;
+}
 
 Framework::Framework()
@@ -358 +366 @@
   
   guiMainWindow = new Window("ParticlesFUN");
-  
+  {
+    Box* windowBox = new Box('v');
+    {
+      Button* quitButton = new Button("quit");
+      windowBox->fill(quitButton);
+    }
+    guiMainWindow->fill(windowBox);
+  }
   Window::mainWindow->showall();
   mainloopGUI();
@@ -370 +385 @@
   pthread_t guiThread;
 
-  Framework* framework = new Framework();
+  Framework* framework = Framework::getInstance();
 
   pthread_create(&guiThread, NULL, Framework::initGui,(void*) argv);

orxonox/branches/physics/src/subprojects/particles/framework.h

@@ -13 +13 @@
 class Framework {
  private:
+  Framework();
+  static Framework* singletonRef;
+
   Camera* camera;
   
+
   int movement [4];
   
@@ -24 +28 @@
 
  public:
-  Framework();
   ~Framework();
   
+  static Framework* getInstance(void);
+
   void initModule();
   bool mainLoop();