Changeset 1614 for code/branches/hud/src/orxonox/Radar.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/Radar.cc (modified) (6 diffs)

code/branches/hud/src/orxonox/Radar.cc

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Felix Schulthess
  *
  */
@@ -38 +38 @@
 #include "objects/SpaceShip.h"
 #include "core/CoreIncludes.h"
+#include "RadarListener.h"
 //#include "core/ConfigValueIncludes.h"
 
 namespace orxonox
 {
-    RadarListener::RadarListener()
-    {
-        RegisterRootObject(RadarListener);
-    }
-
     SetConsoleCommand(Radar, cycleNavigationFocus, true).setAccessLevel(AccessLevel::User);
     SetConsoleCommand(Radar, releaseNavigationFocus, true).setAccessLevel(AccessLevel::User);
@@ -86 +82 @@
     }
 
-    /*void Radar::unregisterObject(RadarViewable* object)
-    {
-        if (this->focus_ == object)
-            this->focus_ = 0;
-        // TODO: check for focus
-    }*/
-
     const RadarViewable* Radar::getFocus()
     {
@@ -119 +108 @@
         for (Iterator<RadarListener> itListener = ObjectList<RadarListener>::begin(); itListener; ++itListener)
         {
+            (*itListener)->radarTick(dt);
+
             for (Iterator<RadarViewable> itElement = ObjectList<RadarViewable>::begin(); itElement; ++itElement)
             {
@@ -124 +115 @@
                     (*itListener)->displayObject(*itElement, *itElement == this->focus_);
             }
-
-            (*itListener)->radarTick(dt);
-
-            if (this->focus_ == 0)
-                (*itListener)->hideMarker();
         }
     }
@@ -190 +176 @@
     }
 
+    void Radar::listObjects() const
+    {
+        COUT(3) << "List of RadarObjects:\n";
+        // iterate through all Radar Objects
+        unsigned int i = 0;
+        for (Iterator<RadarViewable> it = ObjectList<RadarViewable>::start(); it; ++it, ++i)
+        {
+            COUT(3) << i++ << ": " << (*it)->getWorldPosition() << std::endl;
+        }
+    }
+
 
     /*static*/ Radar& Radar::getInstance()