Changeset 8955 for code/branches

Timestamp:

Nov 30, 2011, 4:57:35 PM (13 years ago)

Author:

mspaling

Message:

worked on EnemyHealthBar

Location:

code/branches/hud

Files:

• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.h (modified) (3 diffs)

code/branches/hud/data/overlays/HUDTemplates3.oxo

@@ -78 +78 @@
     </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"

code/branches/hud/src/modules/overlays/hud/CMakeLists.txt

@@ -7 +7 @@
   HUDHealthBar.cc
   HUDTimer.cc
+  HUDEnemyHealthBar.cc
   ChatOverlay.cc
   AnnounceMessage.cc

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

@@ -68 +68 @@
     { return 1.0f; }
 
+    unsigned int getMarkerLimit() { return this->markerLimit_; }
+
 private:
     struct ObjectInfo
@@ -85 +87 @@
     float getNavMarkerSize() const
     { return navMarkerSize_; }
+
 
     void setTextSize ( float size );
@@ -106 +109 @@
     bool showDistance;
 
-    unsigned int markerLimit_;; //TODO: is it possible to set this over the console and/or the IG-Setting
+    unsigned int markerLimit_;;