[Orxonox-commit 2170] r6886 - code/branches/hudelements/src/modules/overlays/hud

sfluecki at orxonox.net sfluecki at orxonox.net
Mon May 10 16:26:04 CEST 2010


Author: sfluecki
Date: 2010-05-10 16:26:04 +0200 (Mon, 10 May 2010)
New Revision: 6886

Modified:
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
Log:
HUDNavigation constructor corrected

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-10 14:24:18 UTC (rev 6885)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-10 14:26:04 UTC (rev 6886)
@@ -54,7 +54,16 @@
         : OrxonoxOverlay(creator)
 {
     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()
 //             .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberString()));
@@ -286,11 +295,11 @@
                 tempRadarViewable->second.first->setLeft((pos.x + 1.0f - tempRadarViewable->second.first->getWidth()) * 0.5f);
                 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);
             }
@@ -300,7 +309,7 @@
     }
 
     }
-    
+
 }
 
 




More information about the Orxonox-commit mailing list