Changeset 1392 for code/trunk/src/orxonox/hud/RadarOverlayElement.cc

Timestamp:

May 23, 2008, 4:38:02 PM (16 years ago)

Author:

FelixSchulthess

Message:

moved #includes to .cc from .h where possible

File:

• code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 *
 */
-
+#include <string.h>
+
+
+#include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgreStringConverter.h>
+#include <OgrePanelOverlayElement.h>
+
+#include "GraphicsEngine.h"
+#include "core/Tickable.h"
+#include "core/ConsoleCommand.h"
+#include "objects/SpaceShip.h"
 #include "RadarOverlayElement.h"
 
@@ -33 +44 @@
     using namespace Ogre;
 
-    RadarOverlayElement::RadarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
+    RadarOverlayElement::RadarOverlayElement(const String& name):PanelOverlayElement(name){
     }
 
@@ -39 +50 @@
     }
 
-    void RadarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
+    void RadarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, OverlayContainer* container){
         // some initial data
-                om = &Ogre::OverlayManager::getSingleton();
+                om = &OverlayManager::getSingleton();
         dimRel_ = dimRel;
         leftRel_ = leftRel;
@@ -52 +63 @@
         // create nav marker ...
         navMarker_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel", "NavMarker"));
-        navMarker_->setMetricsMode(Ogre::GMM_PIXELS);
+        navMarker_->setMetricsMode(GMM_PIXELS);
         navMarker_->setMaterialName("Orxonox/NavMarker");
         navMarker_->setDimensions(16,16);
@@ -67 +78 @@
         plane = Plane(currentDir_, shipPos_);
 
-        setMetricsMode(Ogre::GMM_PIXELS);
+        setMetricsMode(GMM_PIXELS);
         setMaterialName("Orxonox/Radar");
         resize();
@@ -189 +200 @@
         float RadarOverlayElement::calcPhi(RadarObject* obj){
             // project difference vector on our plane...
-            Ogre::Vector3 proj = plane.projectVector(obj->pos_ - shipPos_);
+            Vector3 proj = plane.projectVector(obj->pos_ - shipPos_);
             // ...and find out the angle
             return(acos((currentOrth_.dotProduct(proj))/