Changeset 9257 for code/trunk

Timestamp:

May 28, 2012, 12:28:44 PM (13 years ago)

Author:

landauf

Message:

renamed RVName to radarname
cast to RadarViewable instead of SpaceShip to set the name (in PlayerInfo)

Location:

code/trunk

Files:

• data/levels/missionOne.oxw (modified) (8 diffs)
• data/levels/underAttack.oxw (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (7 diffs)
• src/orxonox/infos/PlayerInfo.cc (modified) (5 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/trunk/data/levels/missionOne.oxw

@@ -509 +509 @@
 
 <!-- @Objects: 4 boxes (uncontrolled pawns) -->
-    <Pawn team=1 health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+    <Pawn team=1 health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box radarname = "Box 4" >
         <events>
           <visibility>
@@ -523 +523 @@
     </Pawn>
 
-    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 3">
+    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box radarname = "Box 3">
         <events>
           <visibility>
@@ -537 +537 @@
     </Pawn>
 
-    <Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 2">
+    <Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 radarname = "Box 2">
         <events>
           <visibility>
@@ -551 +551 @@
     </Pawn>
 
-    <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 1">
+    <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 radarname = "Box 1">
         <events>
           <visibility>
@@ -635 +635 @@
 
 <!-- @Objects: 2 pirates moving in squares, nonlethal -->
-                <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" RVName="Pirate">
+                <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate">
                             <events>
                                 <visibility>
@@ -656 +656 @@
                 </SpaceShip>
 
-                <SpaceShip position="0,2000,400" lookat="0,0,0" name="movingtarget" RVName="Pirate">
+                <SpaceShip position="0,2000,400" lookat="0,0,0" name="movingtarget" radarname="Pirate">
                             <events>
                                 <visibility>
@@ -977 +977 @@
 <!-- @Objects: HYDROGEN FARMER & DOCKING -->
     <SpaceShip
-        team     = 0
-        position = "-48900,100,0"
-        roll     = 90   yaw=0  pitch=20
-        mass     = 10000
-        health   = 100000 initialhealth=100000 maxhealth="100000"
-        name     = "HydroFarmer"
-        RVName   = "Hydrogen Farmer" >
+        team      = 0
+        position  = "-48900,100,0"
+        roll      = 90   yaw=0  pitch=20
+        mass      = 10000
+        health    = 100000 initialhealth=100000 maxhealth="100000"
+        name      = "HydroFarmer"
+        radarname = "Hydrogen Farmer" >
       <attached>
         <!-- Docking -->
@@ -1066 +1066 @@
         reloadwaittime      = "1"
         name                = "cruiser"
-        RVName              = "Spacecruiser" >
+        radarname           = "Spacecruiser" >
       <attached>
         <DockingTarget name="spaceShip" />

code/trunk/data/levels/underAttack.oxw

@@ -56 +56 @@
       maxhealth         = 10000
       initialhealth     = 10000
-      RVName            = "Transporter"
+      radarname         = "Transporter"
     >
 

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

@@ -79 +79 @@
     this->setTextSize ( 0.05f );
     this->setNavMarkerSize ( 0.05f );
-    this->setDetectionLimit( 10000.0f ); 
+    this->setDetectionLimit( 10000.0f );
 }
 
@@ -101 +101 @@
     XMLPortParam ( HUDNavigation, "textSize",      setTextSize,      getTextSize,      xmlelement, mode );
     XMLPortParam ( HUDNavigation, "navMarkerSize", setNavMarkerSize, getNavMarkerSize, xmlelement, mode );
-    XMLPortParam ( HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode ); 
+    XMLPortParam ( HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode );
 }
 
@@ -146 +146 @@
 
 float HUDNavigation::getArrowSizeX(int dist)
-{    
-    if (dist < 600) 
+{
+    if (dist < 600)
         dist = 600;
     return this->getActualSize().x * 900 * navMarkerSize_ / dist;
@@ -153 +153 @@
 
 float HUDNavigation::getArrowSizeY(int dist)
-{    
+{
     if (dist < 600)
-        dist = 600;   
+        dist = 600;
     return this->getActualSize().y * 900 * navMarkerSize_ / dist;
 }
@@ -184 +184 @@
         ObjectMap::iterator it = activeObjectList_.find ( listIt->first );
         closeEnough_ = listIt->second < detectionLimit_ ;
-        // display radarviewables on HUD if the marker limit and max-distance is not exceeded 
-        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) ) 
+        // display radarviewables on HUD if the marker limit and max-distance is not exceeded
+        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) )
         {
 
@@ -201 +201 @@
             //display name next to cursor
             else{
-            it->second.text_->setCaption(it->first->getRVName()); 
-            textLength = it->first->getRVName().size() * it->second.text_->getCharHeight() * 0.3f;
+            it->second.text_->setCaption(it->first->getRadarName());
+            textLength = it->first->getRadarName().size() * it->second.text_->getCharHeight() * 0.3f;
             }
 
@@ -311 +311 @@
             it->second.text_->show();
         }
-        else // do not display on HUD 
+        else // do not display on HUD
         {
             it->second.panel_->hide();

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "controllers/Controller.h"
-#include "worldentities/pawns/SpaceShip.h"
+#include "interfaces/RadarViewable.h"
 
 namespace orxonox
@@ -58 +58 @@
 
         this->registerVariables();
-        
+
     }
 
@@ -154 +154 @@
         while (this->previousControllableEntity_.size() > 0)
             this->stopTemporaryControl();
-        
+
         if (this->controllableEntity_)
             this->stopControl();
@@ -172 +172 @@
 
         this->changedControllableEntity();
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
-        if (spaceship != NULL)
-        {
-            spaceship->setRVName(this->getName());
-        }
+
+                RadarViewable* radarviewable = orxonox_cast<RadarViewable*>(entity);
+        if (radarviewable != NULL)
+            radarviewable->setRadarName(this->getName());
     }
 
@@ -244 +243 @@
         if(this->isHumanPlayer()) // TODO: Multiplayer?
             this->controllableEntity_->destroyHud(); // HACK-ish
-        
+
 //        this->controllableEntity_ = this->previousControllableEntity_.back();
         do {

code/trunk/src/orxonox/interfaces/RadarViewable.cc

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

code/trunk/src/orxonox/interfaces/RadarViewable.h

@@ -61 +61 @@
         virtual ~RadarViewable();
 
-                virtual void setRVName(std::string name)
+                virtual void setRadarName(const std::string& name)
                         {
-                                if (this->RVName != name)
+                                if (this->radarName_ != name)
                                 {
-                                        this->RVName = name;
+                                        this->radarName_ = name;
                                         this->settingsChanged();
                                 }
                         }
-                std::string getRVName() const
-                        { return this->RVName; }
+                const std::string& getRadarName() const
+                        { return this->radarName_; }
 
         inline void setRadarObjectCamouflage(float camouflage)
@@ -163 +163 @@
         ColourValue radarObjectColour_;
         float scale_;
-                std::string RVName;
+                std::string radarName_;
     };
 }

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -130 +130 @@
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
 
-        XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
+        XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
     }