Changeset 8875 for code/branches/ai2/src

Timestamp:

Sep 4, 2011, 10:27:17 PM (13 years ago)

Author:

jo

Message:

Radar fix: pawns were not displayed when their visibility/activity changed from 'invisible' to 'visible'.

Location:

code/branches/ai2/src

Files:

• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• modules/overlays/hud/HUDRadar.cc (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (3 diffs)
• orxonox/interfaces/RadarViewable.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

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

@@ -164 +164 @@
 
     unsigned int markerCount_ = 0;
-    bool closeEnough_ = false; //inly display objects that are close enough to be relevant for the player
+    bool closeEnough_ = false; //only display objects that are close enough to be relevant for the player
 //         for (ObjectMap::iterator it = activeObjectList_.begin(); it != activeObjectList_.end(); ++it)
     for ( sortedList::iterator listIt = sortedObjectList_.begin(); listIt != sortedObjectList_.end(); ++markerCount_, ++listIt )
     {
         ObjectMap::iterator it = activeObjectList_.find ( listIt->first );
-        if( detectionLimit_ < 0 )
-            closeEnough_ = true ;
-        else
-            closeEnough_ = listIt->second < detectionLimit_ ;
-        if ( markerCount_ < markerLimit_ && closeEnough_ ) // display on HUD íf statement is true
+        closeEnough_ = listIt->second < detectionLimit_ ;
+        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) ) // display on HUD if the statement is true
         {
 

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

@@ -124 +124 @@
 
     void HUDRadar::objectChanged( RadarViewable* rv )
-    {
-        if(rv == dynamic_cast<RadarViewable*>(this->owner_)) //case: player changed
-            return;
-        if( showObject(rv) == false ) //case: (radar) invisible object changed
-            return;
-        if( this->radarObjects_.find(rv) == this->radarObjects_.end() ) // if (radar) invisibility becomes (radar) visible
-            this->addObject(rv);
-        assert( this->radarObjects_.find(rv) != this->radarObjects_.end() );
-        Ogre::PanelOverlayElement* panel = this->radarObjects_[rv];
-        panel->setMaterialName(TextureGenerator::getMaterialName(
-            shapeMaterials_[rv->getRadarObjectShape()], rv->getRadarObjectColour()));
+    {// The new implementation behaves more precisely, since inactive RadarViewables are not displayed anymore.
+        this->removeObject(rv);
+        this->addObject(rv);
     }
 

code/branches/ai2/src/orxonox/LevelManager.cc

@@ -87 +87 @@
     void LevelManager::setConfigValues()
     {
-        SetConfigValue(defaultLevelName_, "presentationDM.oxw")
+        SetConfigValue(defaultLevelName_, "missionOne.oxw")
             .description("Sets the pre selection of the level in the main menu.");
     }
@@ -158 +158 @@
         if (this->levels_.size() > 0)
         {
-            // Activate the level that is the first in the list of levels whose activity has been requested. 
+            // Activate the level that is the first in the list of levels whose activity has been requested.
             this->levels_.front()->setActive(true);
             // Make every player enter the newly activated level.
@@ -272 +272 @@
                 Loader::unload(&file);
 
-                if(info == NULL) 
+                if(info == NULL)
                 {
                     // Create a default LevelInfoItem object that merely contains the name

code/branches/ai2/src/orxonox/interfaces/RadarViewable.h

@@ -38 +38 @@
 #include "core/OrxonoxClass.h"
 #include "core/SmartPtr.h"
-
+//TODO: if a RadarViewable changes visibility or activity, the event is not correctly working
 namespace orxonox
 {

code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -452 +452 @@
         this->isHumanShip_ = true;
     }
+
+    void Pawn::changedActivity(void)
+    {
+        SUPER(Pawn, changedActivity);
+
+        this->setRadarVisibility(this->isActive());
+    }
+
+    void Pawn::changedVisibility(void)
+    {
+        SUPER(Pawn, changedVisibility);
+        //this->setVisible(this->isVisible());
+        this->setRadarVisibility(this->isVisible());
+    }
+
 }

code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h

@@ -170 +170 @@
             virtual const Vector3& getCarrierPosition(void) const
                 { return this->getWorldPosition(); };
+            virtual void changedActivity(void); //!< To enable radarviewability when the activity is changed
+            virtual void changedVisibility(void); //!< To enable proper radarviewability when the visibility is changed
 
         protected: