Changeset 1614 for code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

Timestamp:

Jun 21, 2008, 2:35:24 PM (16 years ago)

Author:

rgrieder

Message:

• Dots on the Radar actually disappear now when a Ship gets destroyed…
• svn save to keep History of HUDText when renaming AND moving

File:

• code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc (modified) (4 diffs)

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreStringConverter.h>
-
-//#include "GraphicsEngine.h"
-// TODO: remove the SpaceShip and CameraHandler dependencies
-#include "core/Debug.h"
-#include "core/CoreIncludes.h"
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
+
+#include "util/Math.h"
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
 #include "objects/Projectile.h"
 #include "objects/CameraHandler.h"
-#include "overlays/OverlayGroup.h"
 #include "Radar.h"
 
@@ -68 +65 @@
         if (this->isInitialized())
         {
-            if (this->container_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->container_);
             if (this->navMarker_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->navMarker_);
@@ -76 +71 @@
             if (this->aimMarker_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->aimMarker_);
+            if (this->container_)
+                OverlayManager::getSingleton().destroyOverlayElement(this->container_);
         }
 
@@ -87 +84 @@
         if (mode == XMLPort::LoadObject)
         {
-            // create container
+            // create container because we cannot add a Text element to an Overlay
             container_ = static_cast<OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_navContainer"));