Changeset 8906 for code/branches

Timestamp:

Oct 26, 2011, 4:10:30 PM (13 years ago)

Author:

mspaling

Message:

names added in hud

Location:

code/branches/hud/src

Files:

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

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

@@ -173 +173 @@
             // Get Distance to HumanController and save it in the TextAreaOverlayElement.
             int dist = listIt->second;
-            it->second.text_->setCaption ( multi_cast<std::string> ( dist ) );
-            float textLength = multi_cast<std::string> ( dist ).size() * it->second.text_->getCharHeight() * 0.3f;
+
+            //it->second.text_->setCaption ( multi_cast<std::string> ( dist ) ); //display distance next to cursor
+            //float textLength = multi_cast<std::string> ( dist ).size() * it->second.text_->getCharHeight() * 0.3f;
+            
+            it->second.text_->setCaption(it->first->getRVName()); //display name next to cursor
+            float textLength = it->first->getRVName().size() * it->second.text_->getCharHeight() * 0.3f;
 
             // Transform to screen coordinates
@@ -191 +195 @@
             else
                 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(it->first->getRVName()); //only for test purposes
 
             if ( outOfView )

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

@@ -171 +171 @@
 
         this->changedControllableEntity();
+                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
+        if (spaceship != NULL)
+        {
+            spaceship->setRVName(this->getName());
+        }
     }
 
@@ -190 +195 @@
 
         this->changedControllableEntity();
-
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
-                if (spaceship != NULL)
-                {
-                        spaceship->setRVName(this->getName());
-                }
     }
 

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

@@ -69 +69 @@
                                 }
                         }
-
                 std::string getRVName() const
                         { return this->RVName; }