Changeset 8988 for code/branches/presentation2011/src/orxonox

Timestamp:

Dec 14, 2011, 4:45:22 PM (14 years ago)

Author:

smerkli

Message:

merged hud branch

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/NewHumanController.h (modified) (1 diff)
• src/orxonox/infos/PlayerInfo.cc (modified) (2 diffs)
• src/orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• src/orxonox/interfaces/RadarViewable.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/presentation2011/src/orxonox/controllers/NewHumanController.h

@@ -69 +69 @@
             virtual void doResumeControl();
 
+            float getCurrentYaw(){ return this->currentYaw_; }
+            float getCurrentPitch(){ return this->currentPitch_; }
+
 
         protected:

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

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

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

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

code/branches/presentation2011/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 +163 @@
         ColourValue radarObjectColour_;
         float scale_;
+                std::string RVName;
     };
 }

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

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
-
-
+   
+        XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
     }