Changeset 2140 for code/branches

Timestamp:

Nov 5, 2008, 12:38:04 AM (16 years ago)

Author:

rgrieder

Message:

Stats overlay should now be loaded. Could not test it yet because of still missing media files.

Location:

code/branches/overlay/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• overlays/stats/Stats.cc (modified) (1 diff)

code/branches/overlay/src/orxonox/gamestates/GSLevel.cc

@@ -60 +60 @@
         , radar_(0)
         , startFile_(0)
+        , stats_(0)
         , cameraManager_(0)
         , levelManager_(0)
@@ -93 +94 @@
             // Start the Radar
             this->radar_ = new Radar();
+
+            stats_ = new XMLFile(Settings::getDataPath() + "overlay/stats.oxo");
+            Loader::open(stats_);
         }
 

code/branches/overlay/src/orxonox/gamestates/GSLevel.h

@@ -68 +68 @@
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
         XMLFile*              startFile_;        //!< current hard coded default level
+        XMLFile*              stats_;
         CameraManager*        cameraManager_;
         LevelManager*         levelManager_;

code/branches/overlay/src/orxonox/overlays/stats/Stats.cc

@@ -35 +35 @@
 #include <OgreOverlayManager.h>
 #include <OgreOverlayContainer.h>
-#include <OgreFontManager.h>
-#include <OgreFont.h>
 
-#include "util/Math.h"
 #include "util/Convert.h"
 #include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
-#include "core/input/InputManager.h"
-#include "core/input/SimpleInputState.h"
-#include "core/input/InputBuffer.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox
 {
-    //CreateFactory(Stats);
+    CreateFactory(Stats);
 
     /**