Changeset 6899

Timestamp:

May 13, 2010, 1:19:04 PM (14 years ago)

Author:

scheusso

Message:

some cleaning up
still segfault when terminating

Location:

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

Files:

• HUDNavigation.cc (modified) (7 diffs)
• HUDNavigation.h (modified) (1 diff)

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

@@ -99 +99 @@
     if (this->isInitialized())
     {
+        activeObjectListType::iterator it;
+        for( it = activeObjectList_.begin(); it!=activeObjectList_.end(); ++it )
+        {
+            removeObject(it->first);
+        }
         activeObjectList_.clear();
-        respawnObjectSet_.clear();
     }
 }
@@ -173 +177 @@
 //         float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3f;
 
-    if (!activeObjectList_.empty()) {
+    if (!activeObjectList_.empty())
+    {
         for (tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
         {
@@ -293 +298 @@
             }
 
-             tempRadarViewable->second.first->show();
-             tempRadarViewable->second.second->show();
+            tempRadarViewable->second.first->show();
+            tempRadarViewable->second.second->show();
+//             tempRadarViewable->second.second->hide();
         }
 
@@ -315 +321 @@
        scales with scale(). Here we obviously have to adjust this.
 */
-void HUDNavigation::sizeChanged() {
+void HUDNavigation::sizeChanged()
+{
     // use size to compensate for aspect ratio if enabled.
     float xScale = this->getActualSize().x;
@@ -336 +343 @@
 
 
-void HUDNavigation::addObject(RadarViewable* object) {
+void HUDNavigation::addObject(RadarViewable* object)
+{
     if (object == dynamic_cast<RadarViewable*>(this->getOwner()))
         return;
@@ -382 +390 @@
         this->background_->removeChild(it->second.first->getName());
         this->background_->removeChild(it->second.second->getName());
+        // correctly destroy the overlay elements
+        Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.first);
+        Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.second);
 
         activeObjectList_.erase(viewable);
@@ -387 +398 @@
 }
 
-void HUDNavigation::changedOwner() {
-     
-
- 
-    respawnObjectSet_ = this->getOwner()->getScene()->getRadar()->getRadarObjects();
+void HUDNavigation::changedOwner()
+{
+    respawnObjectSetType respawnObjectSet = this->getOwner()->getScene()->getRadar()->getRadarObjects();
     respawnObjectSetType::iterator respawnObjectSetIt_;
-    for (respawnObjectSetIt_ = respawnObjectSet_.begin(); respawnObjectSetIt_ != respawnObjectSet_.end();
-            ++respawnObjectSetIt_)
-    {
-        if (!(*respawnObjectSetIt_)->isHumanShip_)  HUDNavigation::addObject(*respawnObjectSetIt_);
+    for (respawnObjectSetIt_ = respawnObjectSet.begin(); respawnObjectSetIt_ != respawnObjectSet.end(); ++respawnObjectSetIt_)
+    {
+        if (!(*respawnObjectSetIt_)->isHumanShip_)
+            this->addObject(*respawnObjectSetIt_);
     }
 

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

@@ -115 +115 @@
         
     typedef std::set<RadarViewable*> respawnObjectSetType;
-    respawnObjectSetType respawnObjectSet_;