Changeset 1406 for code/branches/network/src/orxonox/hud/HUD.cc

Timestamp:

May 24, 2008, 1:39:05 PM (16 years ago)

Author:

rgrieder

Message:

• merged Felix's changes from trunk to network branch
• added "svn:eol-style native" property to keybindings.ini

File:

• code/branches/network/src/orxonox/hud/HUD.cc (modified) (5 diffs)

code/branches/network/src/orxonox/hud/HUD.cc

@@ -26 +26 @@
 */
 
-
+#include <string.h>
 #include "OrxonoxStableHeaders.h"
 #include <OgreOverlay.h>
 #include <OgreOverlayContainer.h>
 #include <OgreOverlayManager.h>
-#include <OgreSceneNode.h>
-#include <OgreEntity.h>
 #include <OgreStringConverter.h>
+
 #include "core/Debug.h"
+#include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
-#include "HUD.h"
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
 #include "OverlayElementFactories.h"
+#include "HUD.h"
 
 namespace orxonox
 {
+    ConsoleCommandShortcut(HUD, cycleNavigationFocus, AccessLevel::User);
+
     using namespace Ogre;
 
-    HUD::HUD(int zoom){
+    HUD::HUD(){
         om = &Ogre::OverlayManager::getSingleton();
+        firstRadarObject = NULL;
+        lastRadarObject = NULL;
 
                 // create Factories
@@ -56 +60 @@
         orxonoxHUD = om->create("Orxonox/HUD");
         container = static_cast<Ogre::OverlayContainer*>(om->createOverlayElement("Panel", "Orxonox/HUD/container"));
-        // test
-        test = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "test123"));
-        test->show();
-        test->setMetricsMode(Ogre::GMM_RELATIVE);
-        test->setDimensions(0.8, 0.8);
-        test->setPosition(0.02, 0.02);
-        test->setFontName("Console");
-        test->setCaption("init");
+
+        // creating text to display fps
+        fpsText = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "fpsText"));
+        fpsText->show();
+        fpsText->setMetricsMode(Ogre::GMM_PIXELS);
+        fpsText->setDimensions(0.001, 0.001);
+        fpsText->setPosition(10, 10);
+        fpsText->setFontName("Console");
+        fpsText->setCharHeight(20);
+        fpsText->setCaption("init");
 
         // create energy bar
@@ -75 +81 @@
         radar->show();
 
+        // create Navigation
+        nav = new Navigation(container);
+
                 // set up screen-wide container
         container->show();
@@ -85 +94 @@
         container->setHeight(1.0);
         container->setMetricsMode(Ogre::GMM_RELATIVE);
-        container->addChild(test);
+        container->addChild(fpsText);
+
         energyBar->init(0.01, 0.94, 0.4, container);
         energyBar->setValue(1);
+
         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(0.0, 4000.0, 0.0));
-        radar->addObject(Vector3(0.0, 0.0, 6800.0));
-        RadarOverlayElement::cycleFocus();
+        addRadarObject(Vector3(2000.0, 0.0, 0.0));
+        addRadarObject(Vector3(0.0, 2000.0, 0.0));
+        addRadarObject(Vector3(0.0, 0.0, 2000.0));
+    }
+
+    HUD::~HUD(){
+        //todo: clean up objects
     }
 
     void HUD::tick(float dt)
     {
-        int d = radar->getDist2Focus()/10;
-        if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
-        else test->setCaption("");
-
         energyBar->resize();
 
@@ -113 +124 @@
         radar->resize();
         radar->update();
+
+        nav->update();
     }
 
-    HUD::~HUD(void){
+    void HUD::addRadarObject(Vector3 pos){
+        // check if this is the first RadarObject to create
+        if(firstRadarObject == NULL){
+            firstRadarObject = new RadarObject(container, pos);
+            lastRadarObject = firstRadarObject;
+        }
+        else{ // if not, append to list
+            lastRadarObject->next = new RadarObject(container, pos);
+            lastRadarObject = lastRadarObject->next;
+        }
+    }
+
+    RadarObject* HUD::getFirstRadarObject(){
+        return firstRadarObject;
+    }
+
+    /*static*/HUD& HUD::getSingleton(){
+        static HUD theInstance;
+        return theInstance;
+    }
+
+    /*static*/void HUD::setFPS(float fps){
+        HUD::getSingleton().fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+    }
+
+    /*static*/void HUD::setEnergy(float value){
+        HUD::getSingleton().energyBar->setValue(value);
+    }
+
+    /*static*/void HUD::cycleNavigationFocus(){
+        HUD::getSingleton().nav->cycleFocus();
     }
 }