Changeset 8896 for code/branches

Timestamp:

Oct 19, 2011, 4:16:25 PM (13 years ago)

Author:

mspaling

Message:

Names for RadarViewablese added for later use in HUD

Location:

code/branches/hud/src

Files:

• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (2 diffs)
• orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (2 diffs)

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

@@ -192 +192 @@
                 outOfView = pos.x < -1.0 || pos.x > 1.0 || pos.y < -1.0 || pos.y > 1.0;
             // Get Distance to HumanController and save it in the TextAreaOverlayElement.
-            it->second.text_->setCaption ( multi_cast<std::string> ( dist ) );
+            //it->second.text_->setCaption ( multi_cast<std::string> ( dist ) );
+                        it->second.text_->setCaption(it->first->getRVName());
 
             if ( outOfView )

code/branches/hud/src/orxonox/infos/PlayerInfo.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "controllers/Controller.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
@@ -189 +190 @@
 
         this->changedControllableEntity();
+
+                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
+                if (spaceship != NULL)
+                {
+                        spaceship->setRVName(this->getName());
+                }
     }
 

code/branches/hud/src/orxonox/interfaces/RadarViewable.cc

@@ -51 +51 @@
         , radarObjectDescription_("staticObject")
         , scale_(1.0f)
+                , RVName("")
     {
         RegisterRootObject(RadarViewable);

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

@@ -60 +60 @@
         RadarViewable(BaseObject* creator, const WorldEntity* wePtr);
         virtual ~RadarViewable();
+
+                virtual void setRVName(std::string name)
+                        {
+                                if (this->RVName != name)
+                                {
+                                        this->RVName = name;
+                                        this->settingsChanged();
+                                }
+                        }
+
+                std::string getRVName() const
+                        { return this->RVName; }
 
         inline void setRadarObjectCamouflage(float camouflage)
@@ -152 +164 @@
         ColourValue radarObjectColour_;
         float scale_;
+                std::string RVName;
     };
 }