Changeset 1577 for code/trunk/src/orxonox/Orxonox.cc

Timestamp:

Jun 9, 2008, 6:21:04 PM (16 years ago)

Author:

rgrieder

Message:

• cleaned up InGameConsole a little bit
• adjusted noise (has a config value noiseSize_)
• replaced panel cursor with text area cursor
• initialise()/destroy() concept like in other Singletons
• therefore console is initialised and destroyed via Orxonox class (earlier message colouring)
• replace linear console scroll with exponential one (no, it doesn't take infinite time to reach 0 )

UPDATE YOUR MEDIA REPOSITORY!

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (11 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -70 +70 @@
 // objects and tools
 #include "hud/HUD.h"
+#include "console/InGameConsole.h"
 #include "objects/Tickable.h"
 #include "tools/ParticleInterface.h"
@@ -76 +77 @@
 #include "Settings.h"
 
-// FIXME: is this really file scope?
 // globals for the server or client
-network::Client *client_g = 0;
-network::Server *server_g = 0;
+static network::Client *client_g = 0;
+static network::Server *server_g = 0;
 
 namespace orxonox
@@ -121 +121 @@
     //if (this->auMan_)
     //  delete this->auMan_;
+    InGameConsole::getInstance().destroy();
     if (this->timer_)
       delete this->timer_;
@@ -263 +264 @@
         return false;
 
+      // TODO: Spread this so that this call only initialises things needed for the Console
+      if (!ogre_->initialiseResources())
+        return false;
+
+      // Load the InGameConsole
+      InGameConsole::getInstance().initialise();
+
       // Calls the InputManager which sets up the input devices.
       // The render window width and height are used to set up the mouse movement.
@@ -269 +277 @@
         return false;
 
-      // TODO: Spread this so that this call only initialises things needed for the GUI
-      if (!ogre_->initialiseResources())
-        return false;
-
       // TOOD: load the GUI here
       // set InputManager to GUI mode
@@ -315 +319 @@
   /**
    * Loads everything in the scene except for the actual objects.
-   * This includes HUD, Console..
+   * This includes HUD, audio..
    */
   bool Orxonox::loadPlayground()
@@ -331 +335 @@
     orxonoxHUD_ = &HUD::getSingleton();
     orxonoxHUD_->initialise();
+
     return true;
   }
@@ -339 +344 @@
   bool Orxonox::serverLoad()
   {
-    COUT(2) << "Loading level in server mode" << std::endl;
+    COUT(0) << "Loading level in server mode" << std::endl;
 
     //server_g = new network::Server(serverPort_);
@@ -357 +362 @@
   bool Orxonox::clientLoad()
   {
-    COUT(2) << "Loading level in client mode" << std::endl;\
+    COUT(0) << "Loading level in client mode" << std::endl;\
 
     if (serverIp_.compare("") == 0)
@@ -377 +382 @@
   bool Orxonox::standaloneLoad()
   {
-    COUT(2) << "Loading level in standalone mode" << std::endl;
+    COUT(0) << "Loading level in standalone mode" << std::endl;
 
     if (!loadScene())
@@ -500 +505 @@
       // again, just to be sure ogre works fine
       ogreRoot._fireFrameEnded(evt);
-      //msleep(200);
+      //msleep(500);
     }