Changeset 6897

Timestamp:

May 11, 2010, 2:56:32 PM (14 years ago)

Author:

sfluecki

Message:

Updates in der reinitialisierung von HUDNavigation → changes in constructor & destructor of HUDNavigation.cc / apparently there is still a segfault when starting the game.

Location:

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

Files:

• HUDNavigation.cc (modified) (5 diffs)
• HUDNavigation.h (modified) (3 diffs)
• HUDRadar.cc (modified) (1 diff)

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

@@ -46 +46 @@
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/WorldEntity.h"
+#include "interfaces/RadarViewable.h"
 
 namespace orxonox
@@ -55 +56 @@
 {
     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_);}
-     }
+
+    setFont("Monofur");
+    setTextSize(0.05f);
+    setNavMarkerSize(0.05f);
+
+    respawnObjectSet_ = this->getOwner()->getScene()->getRadar()->getRadarObjects();  
+
+    for (respawnObjectSetIt_ = respawnObjectSet_.begin(); respawnObjectSetIt_ != respawnObjectSet_.end();
+            ++respawnObjectSetIt_)
+    {
+        if (!(*respawnObjectSetIt_)->isHumanShip_)  addObject(*respawnObjectSetIt_);
+    }
     
 //         // create nav text
@@ -74 +78 @@
 //         navMarker_->setMaterialName("Orxonox/NavArrows");
 
-    /*
-            // create aim marker
-            aimMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDNavigation_aimMarker_" + getUniqueNumberString()));
-            aimMarker_->setMaterialName("Orxonox/NavCrosshair");
-            this->wasOutOfView_ = true; // Ensure the material is changed right the first time..
-
-
-    */
-    /*
-            background_->addChild(navMarker_);*/
+        /*
+                // create aim marker
+                aimMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                    .createOverlayElement("Panel", "HUDNavigation_aimMarker_" + getUniqueNumberString()));
+                aimMarker_->setMaterialName("Orxonox/NavCrosshair");
+                this->wasOutOfView_ = true; // Ensure the material is changed right the first time..
+
+
+        */
+        /*
+                background_->addChild(navMarker_);*/
 //        background_->addChild(aimMarker_);
 //         background_->addChild(navText_);
 
-    // hide at first
+        // hide at first
 //         this->setVisible(false);
 
 
-    setFont("Monofur");
-    setTextSize(0.05f);
-    setNavMarkerSize(0.05f);
+
 //         setAimMarkerSize(0.04f);
-}
-
-HUDNavigation::~HUDNavigation()
-{
+    
+}
+
+HUDNavigation::~HUDNavigation() {
 
     if (this->isInitialized())
     {
-        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_);
-            }
-        }
-    }
-}
-
-void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode)
-{
+        activeObjectList_.clear();
+        respawnObjectSet_.clear();
+    }
+}
+
+void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode) {
     SUPER(HUDNavigation, XMLPort, xmlElement, mode);
 
@@ -304 +298 @@
                 tempRadarViewable->second.second->setTop((-pos.y + 1.0f + tempRadarViewable->second.first->getHeight()) * 0.5f);
             }
-                  
-    tempRadarViewable->second.first->show();
-    tempRadarViewable->second.second->show();
-    }
+
+            tempRadarViewable->second.first->show();
+            tempRadarViewable->second.second->show();
+        }
 
     }
@@ -398 +392 @@
 }
 
+// void HUDRadar::changedOwner() {
+//     SUPER(HUDRadar, changedOwner);
+//
+//     this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
+//     assert(this->radarObjects_.size()==0);
+//     this->gatherObjects();
+// }
+
 //      void updateActiveObjectList(map activeObjectList_){}
 //

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

@@ -33 +33 @@
 #include <map>
 #include "overlays/OverlaysPrereqs.h"
+#include "interfaces/RadarViewable.h"
 
 #include "interfaces/RadarListener.h"
@@ -57 +58 @@
     inline float getRadarSensitivity() const {return 1.0f;}
     inline void radarTick(float dt) {}
+//     virtual void changedOwner();
 
 
@@ -111 +113 @@
     activeObjectListType activeObjectList_;
     activeObjectListType::iterator tempRadarViewable;
+    
+    typedef std::set<RadarViewable*> respawnObjectSetType;
+    respawnObjectSetType respawnObjectSet_;
+    respawnObjectSetType::iterator respawnObjectSetIt_;
 
     std::string fontName_;

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

@@ -188 +188 @@
     void HUDRadar::changedOwner()
     {
-        SUPER(HUDRadar, changedOwner);
+    SUPER(HUDRadar, changedOwner);
 
-        this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
-        assert(this->radarObjects_.size()==0);
-        this->gatherObjects();
-    }
+    this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
+    assert(this->radarObjects_.size()==0);
+    this->gatherObjects();
 }
+}