Changeset 1388 for code/trunk

Timestamp:

May 22, 2008, 5:39:19 PM (17 years ago)

Author:

FelixSchulthess

Message:

more static hud functions

Location:

code/trunk

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (3 diffs)
• src/orxonox/hud/HUD.h (modified) (1 diff)

code/trunk/bin/levels/sample.oxw

@@ -12 +12 @@
 <Skybox src="Orxonox/Starbox" />
 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<Model position="1500,0,100" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="2000,1000,1000" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
 <Model position="0,4200,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
 <Model position="0,0,6800" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>

code/trunk/src/orxonox/hud/HUD.cc

@@ -67 +67 @@
         test->setCaption("init");
 
-        // test2
+        // creating text to display fps
         fpsText = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "fpsText"));
         fpsText->show();
@@ -102 +102 @@
         speedoBar->init(0.01, 0.90, 0.4, container);
         radar->init(0.5, 0.9, 0.2, container);
-        radar->addObject(Vector3(1500.0, 0.0, 100.0));
+        radar->addObject(Vector3(2000.0, 1000.0, 1000.0));
         radar->addObject(Vector3(0.0, 4000.0, 0.0));
         radar->addObject(Vector3(0.0, 0.0, 6800.0));
@@ -137 +137 @@
     }
 
+    /*static*/void HUD::setEnergy(float value){
+        HUD::getSingleton().energyBar->setValue(value);
+    }
+
     /*static*/void HUD::cycleRadarFocus(){
         HUD::getSingleton().radar->cycleFocus();

code/trunk/src/orxonox/hud/HUD.h

@@ -64 +64 @@
             static HUD& getSingleton();
             static void setFPS(float fps);
+            static void setEnergy(float value);
             static void cycleRadarFocus();
     };