[Orxonox-commit 4284] r8955 - in code/branches/hud: data/overlays src/modules/overlays/hud

[mspaling at orxonox.net]

Author: mspaling
Date: 2011-11-30 16:57:35 +0100 (Wed, 30 Nov 2011)
New Revision: 8955

Modified:
   code/branches/hud/data/overlays/HUDTemplates3.oxo
   code/branches/hud/src/modules/overlays/hud/CMakeLists.txt
   code/branches/hud/src/modules/overlays/hud/HUDNavigation.h
Log:
worked on EnemyHealthBar

Modified: code/branches/hud/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/hud/data/overlays/HUDTemplates3.oxo	2011-11-30 15:17:00 UTC (rev 8954)
+++ code/branches/hud/data/overlays/HUDTemplates3.oxo	2011-11-30 15:57:35 UTC (rev 8955)
@@ -77,6 +77,27 @@
       <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     </HUDBoostBar>
 
+    <HUDEnemyHealthBar
+     name              = "EnemyHealthBar"
+     background        = "Orxonox/HealthBarBackground"
+     size              = "0.35, 0.0875"
+     position          = "0.5 , 0.1 "
+     pickpoint         = "0, 1"
+     bartexture        = "healthbar_bar.png"
+     textfont          = "VeraMono"
+     textusebarcolour  = true
+     textsize          = 0.039
+     textoffset        = "0.315, 0.05"
+     textpickpoint     = "0, 0"
+     textalign         = "right"
+     correctaspect     = false
+     textcorrectaspect = false
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </HUDHealthBar>
+
     <HUDNavigation
      name          = "Navigation"
      correctaspect = true

Modified: code/branches/hud/src/modules/overlays/hud/CMakeLists.txt
===================================================================
--- code/branches/hud/src/modules/overlays/hud/CMakeLists.txt	2011-11-30 15:17:00 UTC (rev 8954)
+++ code/branches/hud/src/modules/overlays/hud/CMakeLists.txt	2011-11-30 15:57:35 UTC (rev 8955)
@@ -6,6 +6,7 @@
   HUDBoostBar.cc
   HUDHealthBar.cc
   HUDTimer.cc
+  HUDEnemyHealthBar.cc
   ChatOverlay.cc
   AnnounceMessage.cc
   KillMessage.cc

Modified: code/branches/hud/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/hud/src/modules/overlays/hud/HUDNavigation.h	2011-11-30 15:17:00 UTC (rev 8954)
+++ code/branches/hud/src/modules/overlays/hud/HUDNavigation.h	2011-11-30 15:57:35 UTC (rev 8955)
@@ -67,6 +67,8 @@
     inline float getRadarSensitivity() const
     { return 1.0f; }
 
+    unsigned int getMarkerLimit() { return this->markerLimit_; }
+
 private:
     struct ObjectInfo
     {
@@ -85,6 +87,7 @@
     float getNavMarkerSize() const
     { return navMarkerSize_; }
 
+
     void setTextSize ( float size );
     float getTextSize() const;
 
@@ -105,7 +108,7 @@
     float textSize_;
     bool showDistance;
 
-    unsigned int markerLimit_;; //TODO: is it possible to set this over the console and/or the IG-Setting
+    unsigned int markerLimit_;;
 
 
 };