Changeset 6880 for code/branches

Timestamp:

May 10, 2010, 3:58:08 PM (15 years ago)

Author:

rgrieder

Message:

HUDNavigation: Fixed a few bugs, add to background and fixed size issues.

File:

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

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

@@ -251 +251 @@
                         // down
                         float position = -pos.x / pos.y + 1.0f;
-                        tempRadarViewable->second.first->setPosition((position - tempRadarViewable->second.first->getWidth()) * 0.5f, 1.0f - navMarker_->getHeight());
+                        tempRadarViewable->second.first->setPosition((position - tempRadarViewable->second.first->getWidth()) * 0.5f, 1.0f - tempRadarViewable->second.first->getHeight());
                         tempRadarViewable->second.first->setUV(0.0f, 0.5f, 0.5f, 1.0f);
                         tempRadarViewable->second.second->setLeft((position - textLength) * 0.5f);
@@ -296 +296 @@
             }
                   
-        tempRadarViewable->second.first->show();
-        tempRadarViewable->second.second->show();
-        COUT(0) << "ShowGUITest z300" << std::endl;
-        }
+    tempRadarViewable->second.first->show();
+    tempRadarViewable->second.second->show();
+    }
 
     }
@@ -360 +359 @@
                                          .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberString()));
 
-    
+    float xScale = this->getActualSize().x;
+    float yScale = this->getActualSize().y;
+
+    panel->setDimensions(navMarkerSize_ * xScale, navMarkerSize_ * yScale);
+    text->setCharHeight(text->getCharHeight() * yScale);
 
     activeObjectList_[object] = std::make_pair (panel, text) ;
+
+    this->background_->addChild(panel);
+    this->background_->addChild(text);
 
 //      background_->addChild(activeObjectList_[object].first);
@@ -369 +375 @@
 }
 
-void HUDNavigation::removeObject(RadarViewable* viewable) {
-    assert(activeObjectList_.find(viewable)!=activeObjectList_.end());
-    activeObjectList_.erase(viewable);
+void HUDNavigation::removeObject(RadarViewable* viewable)
+{
+    activeObjectListType::iterator it = activeObjectList_.find(viewable);
+
+    if (activeObjectList_.find(viewable) != activeObjectList_.end())
+    {
+        // Remove overlays from Ogre
+        this->background_->removeChild(it->second.first->getName());
+        this->background_->removeChild(it->second.second->getName());
+
+        activeObjectList_.erase(viewable);
+    }
 }