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

Timestamp:

Apr 12, 2008, 4:08:29 PM (16 years ago)

Author:

rgrieder

Message:

• singletonized GraphicsEngine —> Orxonox.h has to included only twice —> better compile performance —> Everything graphic related can now be accessed with GraphicsEngine::getSingleton()
• asylumized Fighter (SpaceShip with weapon system integrated)
• removed weapon system from build

File:

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

code/trunk/src/orxonox/Orxonox.cc

@@ -27 +27 @@
 
 /**
- @file  Orxonox.cc
+ @file
  @brief Orxonox Main Class
  */
@@ -33 +33 @@
 // Precompiled Headers
 #include "OrxonoxStableHeaders.h"
+
+//****** STD *******
+//#include <iostream>
+//#include <exception>
+#include <deque>
 
 //****** OGRE ******
@@ -39 +44 @@
 #include <OgreOverlay.h>
 #include <OgreOverlayManager.h>
+#include <OgreRoot.h>
 #include <OgreTimer.h>
 #include <OgreWindowEventUtilities.h>
 
-//****** STD *******
-//#include <iostream>
-//#include <exception>
-#include <deque>
-
 //***** ORXONOX ****
-//misc
+// util
 //#include "util/Sleep.h"
 #include "util/ArgReader.h"
 
-// audio
-#include "audio/AudioManager.h"
-
-// network
-#include "network/Server.h"
-#include "network/Client.h"
-network::Client *client_g;
-network::Server *server_g;
-
-// objects
+// core
 #include "core/Debug.h"
 #include "core/Factory.h"
 #include "core/Loader.h"
 #include "core/Tickable.h"
+#include "core/InputManager.h"
+
+// audio
+#include "audio/AudioManager.h"
+
+// network
+#include "network/Server.h"
+#include "network/Client.h"
+
+// objects and tools
+#include "tools/Timer.h"
 #include "hud/HUD.h"
-#include "tools/Timer.h"
-#include "objects/weapon/BulletManager.h"
-
-#include "core/InputManager.h"
+//#include "objects/weapon/BulletManager.h"
 
 #include "Orxonox.h"
+
+// FIXME: is this really file scope?
+// globals for the server or client
+network::Client *client_g;
+network::Server *server_g;
 
 namespace orxonox
@@ -86 +91 @@
   Orxonox::Orxonox()
   {
-    this->ogre_ = new GraphicsEngine();
+    this->ogre_ = &GraphicsEngine::getSingleton();
     this->timer_ = 0;
     this->dataPath_ = "";
@@ -103 +108 @@
   {
     // keep in mind: the order of deletion is very important!
-    if (this->bulletMgr_)
-      delete this->bulletMgr_;
+//    if (this->bulletMgr_)
+//      delete this->bulletMgr_;
     if (this->orxonoxHUD_)
       delete this->orxonoxHUD_;
@@ -113 +118 @@
     if (this->timer_)
       delete this->timer_;
-    if (this->ogre_)
-      delete this->ogre_;
+    GraphicsEngine::getSingleton().destroy();
 
     if (client_g)
@@ -251 +255 @@
     auMan_ = new audio::AudioManager();
 
-    bulletMgr_ = new BulletManager();
+    //bulletMgr_ = new BulletManager();
     
     Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
@@ -298 +302 @@
     auMan_ = new audio::AudioManager();
 
-    bulletMgr_ = new BulletManager();
+    //bulletMgr_ = new BulletManager();
 
     // load this file from config
@@ -342 +346 @@
     About the loop: The design is almost exactly like the one in ogre, so that
     if any part of ogre registers a framelisteners, it will still behave
-    correctly. Furthermore I have taken over the time smoothing feature from
-    ogre. If turned on (see orxonox constructor), it will calculate the dt_n by
-    means of the recent most dt_n-1, dt_n-2, etc.
+    correctly. Furthermore the time smoothing feature from ogre has been
+    implemented too. If turned on (see orxonox constructor), it will calculate
+    the dt_n by means of the recent most dt_n-1, dt_n-2, etc.
   */
   void Orxonox::startRenderLoop()
   {
+    // first check whether ogre root object has been created
+    if (Ogre::Root::getSingletonPtr() == 0)
+    {
+      COUT(2) << "Error: Could not start rendering. No Ogre root object found" << std::endl;
+      return;
+    }
+
     // Contains the times of recently fired events
     // eventTimes[4] is the list for the times required for the fps counter
@@ -389 +400 @@
       // don't forget to call _fireFrameStarted in ogre to make sure
       // everything goes smoothly
-      ogre_->frameStarted(evt);
+      Ogre::Root::getSingleton()._fireFrameStarted(evt);
 
       // server still renders at the moment
       //if (mode_ != SERVER)
-      ogre_->renderOneFrame(); // only render in non-server mode
+      Ogre::Root::getSingleton()._updateAllRenderTargets(); // only render in non-server mode
 
       // get current time
@@ -403 +414 @@
 
       // again, just to be sure ogre works fine
-      ogre_->frameEnded(evt);
+      Ogre::Root::getSingleton()._fireFrameEnded(evt);
           }
   }