Changeset 7050

Timestamp:

May 31, 2010, 3:17:25 PM (14 years ago)

Author:

sfluecki

Message:

Added a ConfigValue to limit the amount of marked entities

Location:

code/branches/presentation3/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (7 diffs)
• HUDNavigation.h (modified) (2 diffs)

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

@@ -46 +46 @@
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/WorldEntity.h"
-#include "interfaces/RadarViewable.h"
+#include "core/ConfigValueIncludes.h"
 // #include <boost/bind/bind_template.hpp>
 
@@ -57 +57 @@
 
 }
+
+void HUDNavigation::setConfigValues()
+{
+  SetConfigValue(markerLimit_, 3);
+}
+
 CreateFactory ( HUDNavigation );
 
@@ -63 +69 @@
 {
     RegisterObject ( HUDNavigation );
+    this->setConfigValues();
 
     // Set default values
@@ -132 +139 @@
 }
 
+
+
 void HUDNavigation::tick ( float dt )
 {
@@ -142 +151 @@
 
 
-    //TODO: sort list 'sortedObjectList_' according to distance.$
     for ( sortedList::iterator listIt = sortedObjectList_.begin(); listIt != sortedObjectList_.end(); ++listIt )
     {
@@ -338 +346 @@
     sortedObjectList_.push_front ( std::make_pair ( object, ( unsigned int ) 0 ) );
 
-    //TODO: hide elements
+
 }
 
@@ -380 +388 @@
 void HUDNavigation::changedOwner()
 {
-    // TODO: Delete old objects?
+    
     const std::set<RadarViewable*>& respawnObjects = this->getOwner()->getScene()->getRadar()->getRadarObjects();
     for ( std::set<RadarViewable*>::const_iterator it = respawnObjects.begin(); it != respawnObjects.end(); ++it )

code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h

@@ -49 +49 @@
     virtual ~HUDNavigation();
 
+    void setConfigValues();
+    
     virtual void XMLPort ( Element& xmlElement, XMLPort::Mode mode );
     virtual void tick ( float dt );
@@ -98 +100 @@
     float textSize_;
 
-    static const unsigned int markerLimit_ = 5; //TODO: is it possible to set this over the console and/or the IG-Setting
+    unsigned int markerLimit_;; //TODO: is it possible to set this over the console and/or the IG-Setting