Changeset 6886

Timestamp:

May 10, 2010, 4:26:04 PM (14 years ago)

Author:

sfluecki

Message:

HUDNavigation constructor corrected

File:

• code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) (3 diffs)

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

@@ -55 +55 @@
 {
     RegisterObject(HUDNavigation);
-
+    
+     
+     const std::set<RadarViewable*>& respawnObjectSet_ = this->getOwner()->getScene()->getRadar()->getRadarObjects();
+     std::set<RadarViewable*>::const_iterator respawnObjectSetIt_;
+     
+     if(!respawnObjectSet_.empty()){
+     for(respawnObjectSetIt_ = respawnObjectSet_.begin(); respawnObjectSetIt_ != respawnObjectSet_.end();
+         ++respawnObjectSetIt_){ addObject(*respawnObjectSetIt_);}
+     }
+    
 //         // create nav text
 //         navText_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
@@ -287 +296 @@
                 tempRadarViewable->second.first->setTop((-pos.y + 1.0f - tempRadarViewable->second.first->getHeight()) * 0.5f);
 
-                /*
-                            aimMarker_->show();
-                            aimMarker_->setLeft((aimpos.x + 1.0f - aimMarker_->getWidth()) * 0.5f);
-                            aimMarker_->setTop((-aimpos.y + 1.0f - aimMarker_->getHeight()) * 0.5f);
-                */
+
+//                 aimMarker_->show();
+//                 aimMarker_->setLeft((aimpos.x + 1.0f - aimMarker_->getWidth()) * 0.5f);
+//                 aimMarker_->setTop((-aimpos.y + 1.0f - aimMarker_->getHeight()) * 0.5f);
+//
                 tempRadarViewable->second.second->setLeft((pos.x + 1.0f + tempRadarViewable->second.first->getWidth()) * 0.5f);
                 tempRadarViewable->second.second->setTop((-pos.y + 1.0f + tempRadarViewable->second.first->getHeight()) * 0.5f);
@@ -301 +310 @@
 
     }
-    
+
 }