Changeset 1410 for code/branches/network/src/orxonox/hud/Navigation.cc

Timestamp:

May 24, 2008, 3:38:39 PM (16 years ago)

Author:

rgrieder

Message:

• converted tabs to spaces in HUD
• adjusted msvc project

File:

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

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

@@ -26 +26 @@
 */
 
+#include "OrxonoxStableHeaders.h"
+#include "Navigation.h"
+
 #include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
 #include <OgreStringConverter.h>
-#include <GraphicsEngine.h>
+
+#include "GraphicsEngine.h"
+// TODO: remove the SpaceShip and CameraHandler dependencies
 #include "objects/SpaceShip.h"
 #include "objects/CameraHandler.h"
+#include "RadarObject.h"
+#include "RadarOverlayElement.h"
 #include "HUD.h"
-#include "Navigation.h"
 
 namespace orxonox
@@ -53 +57 @@
 
     void Navigation::init(){
-                om = &OverlayManager::getSingleton();
-                navCam_ = NULL;
+        om = &OverlayManager::getSingleton();
+        navCam_ = NULL;
         // create nav text
         navText_ = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "navText"));
@@ -73 +77 @@
         navText_->hide();
         container_->addChild(navMarker_);
-        }
-
-        void Navigation::update(){
+    }
+
+    void Navigation::update(){
         if(focus_ == NULL) return;
         navCamPos_ = SpaceShip::getLocalShip()->getPosition();
         currentDir_ = SpaceShip::getLocalShip()->getDir();
-                currentOrth_ = SpaceShip::getLocalShip()->getOrth();
+        currentOrth_ = SpaceShip::getLocalShip()->getOrth();
 
         windowW_ = GraphicsEngine::getSingleton().getWindowWidth();
@@ -168 +172 @@
             navText_->setPosition(xPos+navMarker_->getWidth()/2, yPos+navMarker_->getHeight()/2);
         }
-        }
+    }
 
     void Navigation::cycleFocus(){
-            if(focus_ == NULL){
+        if(focus_ == NULL){
             focus_ = HUD::getSingleton().getFirstRadarObject();
-            }
+        }
         else{
             focus_->panel_->setMaterialName("Orxonox/RedDot");
@@ -188 +192 @@
             focus_->panel_->setMaterialName("Orxonox/WhiteDot");
         }
-        }
-
-        float Navigation::getDist2Focus(){
-            if(focus_ == NULL) return(0.0);
-            return((focus_->pos_-SpaceShip::getLocalShip()->getPosition()).length());
-        }
+    }
+
+    float Navigation::getDist2Focus(){
+        if(focus_ == NULL) return(0.0);
+        return((focus_->pos_-SpaceShip::getLocalShip()->getPosition()).length());
+    }
 }