Changeset 5813 for code/branches/core5/src/modules

Timestamp:

Sep 27, 2009, 7:28:09 PM (15 years ago)

Author:

rgrieder

Message:

Moved Radar Management from GSLevel to Scene.

Location:

code/branches/core5/src/modules

Files:

• gamestates/GSLevel.cc (modified) (4 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• overlays/hud/HUDNavigation.cc (modified) (3 diffs)

code/branches/core5/src/modules/gamestates/GSLevel.cc

@@ -48 +48 @@
 
 #include "tools/interfaces/Tickable.h"
-#include "Radar.h"
 #include "CameraManager.h"
 #include "LevelManager.h"
@@ -67 +66 @@
         , guiMouseOnlyInputState_(0)
         , guiKeysOnlyInputState_(0)
-        , radar_(0)
         , cameraManager_(0)
     {
@@ -104 +102 @@
             // create the global CameraManager
             this->cameraManager_ = new CameraManager(GraphicsManager::getInstance().getViewport());
-
-            // Start the Radar
-            this->radar_ = new Radar();
         }
 
@@ -186 +181 @@
         if (GameMode::isMaster())
             this->unloadLevel();
-
-        if (this->radar_)
-        {
-            this->radar_->destroy();
-            this->radar_ = 0;
-        }
 
         if (this->cameraManager_)

code/branches/core5/src/modules/gamestates/GSLevel.h

@@ -67 +67 @@
         InputState*              guiMouseOnlyInputState_;  //!< input state if we only need the mouse to use the GUI
         InputState*              guiKeysOnlyInputState_;   //!< input state if we only need the keys to use the GUI
-        Radar*                   radar_;                   //!< represents the Radar (not the HUD part)
         CameraManager*           cameraManager_;           //!< camera manager for this level
         PlayerManager*           playerManager_;           //!< player manager for this level

code/branches/core5/src/modules/overlays/hud/HUDNavigation.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "Scene.h"
 #include "Radar.h"
 
@@ -130 +131 @@
         SUPER(HUDNavigation, tick, dt);
 
-        if (!Radar::getInstance().getFocus())
+        // Get radar
+        Radar* radar = this->getOwner()->getScene()->getRadar();
+
+        if (!radar->getFocus())
         {
             this->overlay_->hide();
@@ -150 +154 @@
 */
         // transform to screen coordinates
-        Vector3 pos = /*transformationMatrix * */Radar::getInstance().getFocus()->getRVWorldPosition();
+        Vector3 pos = /*transformationMatrix * */radar->getFocus()->getRVWorldPosition();
 
         bool outOfView;