Changeset 10769 for code/branches/cpp11_v2/src/modules/overlays
- Timestamp:
- Nov 7, 2015, 10:23:42 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/modules/overlays/hud
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
r10768 r10769 187 187 const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix(); 188 188 189 for (std::list<std::pair<RadarViewable*, unsigned int> 189 for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt) 190 190 listIt->second = (int)((listIt->first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f); 191 191 … … 209 209 bool nextHasToBeSelected = false; 210 210 211 for (std::list<std::pair<RadarViewable*, unsigned int> 211 for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++markerCount, ++listIt) 212 212 { 213 213 … … 641 641 } 642 642 643 for (std::list<std::pair<RadarViewable*, unsigned int> 643 for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt) 644 644 { 645 645 if ((listIt->first) == viewable) -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
r10291 r10769 141 141 142 142 std::map<RadarViewable*, ObjectInfo> activeObjectList_; 143 std::list<std::pair<RadarViewable*, unsigned int> 143 std::list<std::pair<RadarViewable*, unsigned int>> sortedObjectList_; 144 144 145 145 float healthMarkerSize_;
Note: See TracChangeset
for help on using the changeset viewer.