Changeset 6873

Timestamp:

May 10, 2010, 2:21:36 PM (15 years ago)

Author:

sfluecki

Message:

für reto

Location:

code/branches/hudelements/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (9 diffs)
• HUDNavigation.h (modified) (2 diffs)

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

@@ -91 +91 @@
     HUDNavigation::~HUDNavigation()
     {
+      
         if (this->isInitialized())
         {
-            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->navMarker_);
-            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->navText_);
+          if(!activeObjectList_.empty()) 
+           {
+            for(tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
+            {
+              Ogre::OverlayManager::getSingleton().destroyOverlayElement(tempRadarViewable->second.first);
+              Ogre::OverlayManager::getSingleton().destroyOverlayElement(tempRadarViewable->second.second);
 //            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->aimMarker_);
+            }
+          }
         }
     }
@@ -172 +179 @@
       for(tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
         {
+          COUT(0) << "check 174" << std::endl;
         
         //get Distance to HumanController and save it in the TextAreaOverlayElement.
@@ -178 +186 @@
         float textLength = multi_cast<std::string>(dist).size() * tempRadarViewable->second.second->getCharHeight() * 0.3f;
          
+         COUT(0) << "check 181" << std::endl;
+      
         orxonox::Camera* cam = CameraManager::getInstance().getActiveCamera();
         if (!cam)
@@ -185 +195 @@
         Vector3 pos = transform * tempRadarViewable->first->getRVWorldPosition();
 
+         COUT(0) << "check 190" << std::endl;
+         
         bool outOfView;
         if (pos.z > 1.0)
@@ -208 +220 @@
                 wasOutOfView_ = true;
             }
+            
+             COUT(0) << "check 174" << std::endl;
 
             if (pos.x < pos.y)
@@ -232 +246 @@
             else
             {
+               COUT(0) << "check 241" << std::endl;
                 if (pos.y < -pos.x)
                 {
@@ -254 +269 @@
         else
         {
-          
+           COUT(0) << "check 264" << std::endl;
           
             // object is in view
@@ -300 +315 @@
     void HUDNavigation::sizeChanged(){
             // use size to compensate for aspect ratio if enabled.
-        float xScale = this->getActualSize().x;
-        float yScale = this->getActualSize().y;
-        if (this->navMarker_)
-            navMarker_->setDimensions(navMarkerSize_ * xScale, navMarkerSize_ * yScale);
-//         if (this->aimMarker_)
-//             aimMarker_->setDimensions(aimMarkerSize_ * xScale, aimMarkerSize_ * yScale);
-        if (this->navText_)
-            navText_->setCharHeight(navText_->getCharHeight() * yScale);
+        float xScale = this->getActualSize().x;
+        float yScale = this->getActualSize().y;
+        
+         if(!activeObjectList_.empty()) 
+        {
+          for(tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
+          {
+
+             if (tempRadarViewable->second.first)
+              tempRadarViewable->second.first->setDimensions(navMarkerSize_ * xScale, navMarkerSize_ * yScale);
+//            if (this->aimMarker_)
+//            aimMarker_->setDimensions(aimMarkerSize_ * xScale, aimMarkerSize_ * yScale);
+             if (tempRadarViewable->second.second)
+              tempRadarViewable->second.second->setCharHeight(tempRadarViewable->second.second->getCharHeight() * yScale);
+          }
+        }
     }
     
@@ -339 +362 @@
 //      background_->addChild(activeObjectList_[object].first);
 //      background_->addChild(activeObjectList_[object].second);
+        COUT(0) << "check 357" << std::endl;
     }
     

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

@@ -72 +72 @@
 
         // XMLPort accessors
-        void setNavMarkerSize(float size) { this->navMarkerSize_ = size; this->sizeChanged(); } 
-        float getNavMarkerSize() const    { return this->navMarkerSize_; }
+        void setNavMarkerSize(float size) { navMarkerSize_ = size; 
+                                            this->sizeChanged(); } 
+        float getNavMarkerSize() const    { return navMarkerSize_; }
 
 /*
@@ -108 +109 @@
         
         std::string fontName_;
-        int textSize_;
-        
+        float textSize_;
+
     };