Changeset 1456 for code/branches/network/src/orxonox/hud/HUD.cc

Timestamp:

May 28, 2008, 7:12:28 PM (16 years ago)

Author:

FelixSchulthess

Message:

using a std::set for the radar objects, which still has a the small problem, that the first radar object is selected twice when cycling through radar objects

File:

• code/branches/network/src/orxonox/hud/HUD.cc (modified) (3 diffs)

code/branches/network/src/orxonox/hud/HUD.cc

@@ -31 +31 @@
 
 #include <string>
+#include <set>
 #include <OgreOverlay.h>
 #include <OgreOverlayContainer.h>
@@ -57 +58 @@
         om = &Ogre::OverlayManager::getSingleton();
         sm = GraphicsEngine::getSingleton().getSceneManager();
-        firstRadarObject = NULL;
-        lastRadarObject = NULL;
         showFPS = true;
         showRenderTime = true;
@@ -178 +177 @@
 
     void HUD::addRadarObject(SceneNode* node, int colour){
-        // check if this is the first RadarObject to create
-        if(firstRadarObject == NULL){
-            firstRadarObject = new RadarObject(container, node, colour);
-            lastRadarObject = firstRadarObject;
-        }
-        else{ // if not, append to list
-            lastRadarObject->next = new RadarObject(container, node, colour);
-            lastRadarObject = lastRadarObject->next;
-        }
-    }
-
-    RadarObject* HUD::getFirstRadarObject(){
-        return firstRadarObject;
+        RadarObject* obj = new RadarObject(container, node, colour);
+        roSet.insert(obj);
+//        // check if this is the first RadarObject to create
+//        if(firstRadarObject == NULL){
+//            firstRadarObject = new RadarObject(container, node, colour);
+//            lastRadarObject = firstRadarObject;
+//        }
+//        else{ // if not, append to list
+//            lastRadarObject->next = new RadarObject(container, node, colour);
+//            lastRadarObject = lastRadarObject->next;
+//        }
+    }
+
+    void HUD::removeRadarObject(SceneNode* node){
+        for(std::set<RadarObject*>::iterator it=roSet.begin(); it!=roSet.end(); it++){
+            if((*it)->getNode() == node) {
+                delete (*it);
+                roSet.erase(it);
+            }
+        }
     }