Changeset 9484 for code/branches/spaceNavigation

Timestamp:

Dec 3, 2012, 3:57:02 PM (12 years ago)

Author:

mottetb

Message:

hallo

Location:

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

Files:

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

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

@@ -216 +216 @@
                 }
 
-
                 // Selected object
                 if(this->closestTarget_) {
@@ -223 +222 @@
                     {
                         it->second.selected_ = true;
-                    } else {
+                        orxout() << "Closest object selected" << std::endl;
+                    }
+                    else if(it->second.selected_)
+                    {
                         it->second.selected_ = false;
-                    }
-                    closestTarget_ = false;
-                    orxout() << "Closest object selected" << std::endl;
-                }
+                        orxout() << "Previous object unselected" << std::endl;
+                    }
+
+                }
+                // select the next closest object
                 else if(this->nextTarget_)
                 {
-                    // select the next closest object
                     if(nextHasToBeSelected){
                         it->second.selected_ = true;
                         nextHasToBeSelected = false;
-                        this->nextTarget_ = false;
+                        orxout() << "Next object selected" << std::endl;
                     }
                     else if(it->second.selected_)
@@ -241 +243 @@
                         nextHasToBeSelected = true;
                         it->second.selected_ = false;
-                    }
-                    else if(markerCount + 1 >= markerLimit_)
-                    {
-                        // this object is the last one that is marked, then select the closest
-                        this->activeObjectList_.find(this->sortedObjectList_.begin()->first)->second.selected_ = true;
-                        nextHasToBeSelected = false;
-                    }
+                        orxout() << "Previous object unselected" << std::endl;
+
+                        listIt++;
+
+                        if (markerCount + 1 >= this->markerLimit_ ||
+                                (listIt->second > this->detectionLimit_
+                                && detectionLimit_ >= 0))
+                        {
+                            this->activeObjectList_.find(this->sortedObjectList_.begin()->first)->second.selected_ = true;
+                            nextHasToBeSelected = false;
+                        }
+
+                        listIt--;
+                    }
+
+
                 }
 
@@ -398 +409 @@
             }
         }
+
+        this->closestTarget_ = false;
+        this->nextTarget_ = false;
     }
 

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

@@ -130 +130 @@
             bool nextTarget_;
 
-            static const float LIGHTNING_GUN_SPEED_ = 700.0f;
-            static const float HSW01_SPEED_ = 2500.0f;
             static HUDNavigation* localHUD_s; //!< This is used as a filter. Only the local HUD should be influenced by the static Console Command functions.