Add distance to target to display

Author: lukemaurer

Display.cpp

@@ -11,6 +11,7 @@
 
 #include "Airplane.h"
 #include "Level.h"
+#include "Target.h"
 #include "World.h"
 
 static const Ogre::String
@@ -19,6 +20,7 @@ static const Ogre::String
     OVERLAY_NAME = "Fly/HUD",
     INFO_BAR_NAME = "Fly/InfoBar",
     LEVEL_TEXT_BOX_NAME = "Fly/LevelName",
+    DISTANCE_TEXT_BOX_NAME = "Fly/Distance",
     STATS_PANEL_NAME = "Fly/StatsPanel",
     POSITION_TEXT_BOX_NAME = "Fly/Position",
     VELOCITY_TEXT_BOX_NAME = "Fly/Velocity",
@@ -34,6 +36,7 @@ Display::Display(Game * game) :
     overlay(overlayMgr()->getByName(OVERLAY_NAME)),
     infoBar(overlay->getChild(INFO_BAR_NAME)),
     levelTextBox(getTextArea(LEVEL_TEXT_BOX_NAME, infoBar)),
+    distanceTextBox(getTextArea(DISTANCE_TEXT_BOX_NAME, infoBar)),
     statsPanel(overlay->getChild(STATS_PANEL_NAME)),
     positionTextBox(getTextArea(POSITION_TEXT_BOX_NAME)),
     velocityTextBox(getTextArea(VELOCITY_TEXT_BOX_NAME)),
@@ -63,7 +66,10 @@ template<typename T> static inline Ogre::String toString(T x) { return Ogre::Str
 void Display::update(float dt) {
     const Airplane * const player = game->getWorld()->getPlayer();
     const AirplaneState& state = player->getState();
+    
     levelTextBox->setCaption(game->getCurrentLevel()->getName());
+    distanceTextBox->setCaption(toString(game->getWorld()->getTarget()->displacement(player).length()) + "m");
+    
     positionTextBox->setCaption(toString(state.position));
     velocityTextBox->setCaption(toString(state.velocity));
     speedTextBox->setCaption(toString(state.velocity.length()));

Display.h

@@ -11,7 +11,8 @@ class Display {
 
     Ogre::OverlayContainer * const infoBar;
     Ogre::TextAreaOverlayElement * const levelTextBox;
-    
+    Ogre::TextAreaOverlayElement * const distanceTextBox;
+
     Ogre::OverlayContainer * const statsPanel;
     Ogre::TextAreaOverlayElement * const positionTextBox;
     Ogre::TextAreaOverlayElement * const velocityTextBox;

Target.cpp

@@ -1,5 +1,6 @@
 #include "Target.h"
 
+#include "Airplane.h"
 
 Target::Target(Ogre::SceneNode * sceneNode) : sceneNode(sceneNode){
 
@@ -13,3 +14,7 @@ Target::Target(Ogre::SceneNode * sceneNode) : sceneNode(sceneNode){
 }
 
 Target::~Target() { }
+
+Ogre::Vector3 Target::displacement(const Airplane * airplane) const {
+    return sceneNode->getPosition() - airplane->getPosition();
+}

Target.h

@@ -6,4 +6,6 @@ class Target{
 public: 
     Target(Ogre::SceneNode *);
     ~Target();
+    
+    Ogre::Vector3 displacement(const Airplane *) const;
 };

World.h

@@ -27,6 +27,9 @@ class World : public Object {
     Airplane * getPlayer() { return player; }
     const Airplane * getPlayer() const { return player; }
 
+    Target * getTarget() { return target; }
+    const Target * getTarget() const { return target; }
+    
     static const Ogre::String GROUND_NODE_NAME;
 
 private:

data/ui/scripts/hud.overlay

@@ -15,6 +15,13 @@ template element TextArea(Fly/Label) : Fly/TextBox
     colour_bottom 1 1 1
 }
 
+template element TextArea(Fly/InfoLabel) : Fly/Label
+{
+    top 0.01
+    height 0.05
+    char_height 0.04
+}
+        
 template element TextArea(Fly/MaxedTextBox) : Fly/TextBox
 {
     colour 1 0 0
@@ -30,14 +37,24 @@ Fly/HUD
         height 0.05
         material StatsPanel_Material
 
-        element TextArea(Fly/LevelName) : Fly/Label
+        element TextArea(Fly/LevelName) : Fly/InfoLabel
         {
-            top 0.01
             left 0.375
             width 0.2
-            height 0.05
             alignment center
-            char_height 0.04
+        }
+        
+        element TextArea(Fly/DistanceLabel) : Fly/InfoLabel
+        {
+            left 0.7
+            width 0.1
+            caption To Target:
+        }
+        
+        element TextArea(Fly/Distance) : Fly/InfoLabel
+        {
+            left 0.825
+            width 0.075
         }
     }