Changeset 8875 for code/branches/ai2/src/orxonox

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/orxonox

Files:

• LevelManager.cc (modified) (3 diffs)
• interfaces/RadarViewable.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (1 diff)

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: