Changeset 9495 for code/branches

Timestamp:

Dec 10, 2012, 2:48:10 PM (12 years ago)

Author:

mottetb

Message:

fertig

Location:

code/branches/spaceNavigation/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (6 diffs)
• HUDNavigation.h (modified) (1 diff)

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

@@ -190 +190 @@
         bool closeEnough = false; // only display objects that are close enough to be relevant for the player
 
+        // if the selected object doesn't exist any more or is now out of range select the closest object
+        std::map<RadarViewable*, ObjectInfo>::iterator selectedActiveObject = this->activeObjectList_.find(this->selectedTarget_);
+        if(selectedActiveObject == this->activeObjectList_.end())
+        {
+            this->closestTarget_ = true;
+        }
+        else if(this->detectionLimit_ < (this->selectedTarget_->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f)
+        {
+            this->closestTarget_ = true;
+            selectedActiveObject->second.selected_ = false;
+        }
+
         bool nextHasToBeSelected = false;
 
@@ -223 +235 @@
                     {
                         it->second.selected_ = true;
+                        this->selectedTarget_ = it->first;
                     }
                     else if(it->second.selected_)
@@ -235 +248 @@
                     if(nextHasToBeSelected){
                         it->second.selected_ = true;
+                        this->selectedTarget_ = it->first;
                         nextHasToBeSelected = false;
                     }
@@ -252 +266 @@
                                 // otherwise select the closest object
                                 this->activeObjectList_.find(this->sortedObjectList_.begin()->first)->second.selected_ = true;
+                                this->selectedTarget_ = it->first;
                                 nextHasToBeSelected = false;
                             }
@@ -564 +579 @@
         {
             HUDNavigation::localHUD_s->closestTarget_ = true;
-            orxout() << "selectClosestTarget" << std::endl;
         }
     }
@@ -573 +587 @@
         {
             HUDNavigation::localHUD_s->nextTarget_ = true;
-            orxout() << "selectNextTarget" << std::endl;
         }
     }

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

@@ -127 +127 @@
             bool showDistance_;
 
+            RadarViewable* selectedTarget_;
+
             bool closestTarget_;
             bool nextTarget_;