Changeset 1661 for code/branches/gui/src/orxonox

Timestamp:

Aug 18, 2008, 9:17:30 PM (16 years ago)

Author:

rgrieder

Message:

started implementing the GameStates. Not much for now, but most of the Orxonox.cc code has been copied to GSRoot, GSGraphics and GSLevel.
There is no level currently, but the main menu is shown. This is more of an svn save because I would really like to have Member ConsoleCommands.

Location:

code/branches/gui/src/orxonox

Files:

• Main.cc (modified) (4 diffs)
• Orxonox.cc (modified) (1 diff)
• gamestates (added)
• gamestates/GSGUI.cc (added)
• gamestates/GSGUI.h (added)
• gamestates/GSGraphics.cc (added)
• gamestates/GSGraphics.h (added)
• gamestates/GSLevel.cc (added)
• gamestates/GSLevel.h (added)
• gamestates/GSRoot.cc (added)
• gamestates/GSRoot.h (added)
• gui/GUIManager.cc (modified) (3 diffs)
• gui/GUIManager.h (modified) (1 diff)

code/branches/gui/src/orxonox/Main.cc

@@ -45 +45 @@
 #include "Settings.h"
 #include "Orxonox.h"
+
+#include "gamestates/GSRoot.h"
+#include "gamestates/GSGraphics.h"
+#include "gamestates/GSLevel.h"
+#include "gamestates/GSGUI.h"
 
 using namespace orxonox;
@@ -140 +145 @@
     state2->addChild(state3);
     state2->addChild(state5);
-    state3->addChild(state1);
     state6->addChild(state2);
+
+    state6->removeChild("state2");
 
     state5->requestState("state3");
@@ -160 +166 @@
     COUT(2) << std::endl;*/
 
+
+    GSRoot root;
+    GSGraphics graphics;
+    GSLevel level;
+    GSGUI gui;
+
+    root.addChild(&graphics);
+    graphics.addChild(&level);
+    graphics.addChild(&gui);
+
+    root.requestState("gui");
+    root.tick(0.0f);
+    root.requestState("");
 
 
@@ -169 +188 @@
         orxonoxInstance.start(macBundlePath());
 #else
-        orxonoxInstance.start();
+        //orxonoxInstance.start();
 #endif
     }

code/branches/gui/src/orxonox/Orxonox.cc

@@ -43 +43 @@
 //****** OGRE ******
 #include <OgreFrameListener.h>
-#include <OgreOverlay.h>
-#include <OgreOverlayManager.h>
 #include <OgreRoot.h>
 #include <OgreTimer.h>

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -84 +84 @@
 
         if (backgroundSceneManager_)
+        {
+            // We have to make sure the SceneManager is not anymore referenced.
+            // For the case that the target SceneManager was yet another one, it
+            // wouldn't matter anyway since this is the destructor.
+            guiRenderer_->setTargetSceneManager(0);
             Ogre::Root::getSingleton().destroySceneManager(backgroundSceneManager_);
+        }
 
         InputManager::getInstance().destroyState("gui");
@@ -218 +224 @@
         {
             if (state_ == OnDisplay)
-                _hideGUI();
+                hideGUI();
 
             COUT(3) << "Loading GUI " << name << std::endl;
@@ -264 +270 @@
     }
 
-    void GUIManager::_hideGUI()
+    void GUIManager::hideGUI()
     {
         if (this->state_ != OnDisplay)

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -71 +71 @@
         }
         void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
-        void _hideGUI(); // tolua_export
+        void hideGUI(); // tolua_export
 
         Ogre::Camera* getCamera() { return this->backgroundCamera_; }