Changeset 1392 for code/trunk/src/orxonox

Timestamp:

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

Author:

FelixSchulthess

Message:

moved #includes to .cc from .h where possible

Location:

code/trunk/src/orxonox/hud

Files:

• BarOverlayElement.cc (modified) (5 diffs)
• BarOverlayElement.h (modified) (1 diff)
• HUD.cc (modified) (1 diff)
• HUD.h (modified) (1 diff)
• RadarObject.cc (modified) (4 diffs)
• RadarObject.h (modified) (1 diff)
• RadarOverlayElement.cc (modified) (6 diffs)
• RadarOverlayElement.h (modified) (1 diff)

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

@@ -27 +27 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
 #include "GraphicsEngine.h"
 #include "BarOverlayElement.h"
@@ -36 +34 @@
   using namespace Ogre;
 
-    BarOverlayElement::BarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
+    BarOverlayElement::BarOverlayElement(const String& name):PanelOverlayElement(name){
         name_ = name;
     }
@@ -42 +40 @@
     BarOverlayElement::~BarOverlayElement(){}
 
-    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
+    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, OverlayContainer* container){
         // init some values...
         container_ = container;
-        om = &Ogre::OverlayManager::getSingleton();
+        om = &OverlayManager::getSingleton();
         value_ = 0;
         color_ = 2;
@@ -53 +51 @@
         topRel_ = topRel;
         dimRel_ = dimRel;
-        
+
         // create background...
         background_ = static_cast<OverlayContainer*>(om->createOverlayElement("Panel", name_+"container"));
         background_->show();
         container_->addChild(background_);
-        background_->setMetricsMode(Ogre::GMM_PIXELS);
+        background_->setMetricsMode(GMM_PIXELS);
         background_->setMaterialName("Orxonox/BarBackground");
 
@@ -65 +63 @@
 
         show();
-        setMetricsMode(Ogre::GMM_PIXELS);
+        setMetricsMode(GMM_PIXELS);
         setMaterialName("Orxonox/Green");
         background_->addChild(this);

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

@@ -30 +30 @@
 #define _BAR_H__
 
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
+
 #include <OgrePanelOverlayElement.h>
-
 #include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"
-
-
 
 namespace orxonox

code/trunk/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

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

@@ -30 +30 @@
 #define _HUD_H__
 
-#include <string.h>
-#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <OgrePrerequisites.h>
-
 #include "OrxonoxPrereqs.h"
 #include "core/Tickable.h"

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

@@ -26 +26 @@
 */
 
+#include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h>
+#include <OgreStringConverter.h>
+#include <util/Math.h>
 #include "RadarObject.h"
 
@@ -34 +39 @@
         int RadarObject::count = 0;             // initialize static variable
 
-        RadarObject::RadarObject(Ogre::OverlayContainer* container){
+        RadarObject::RadarObject(OverlayContainer* container){
                 container_ = container;
                 pos_ = Vector3(0.0, 0.0, 0.0);
@@ -40 +45 @@
         }
 
-        RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
+        RadarObject::RadarObject(OverlayContainer* container, Vector3 pos){
                 container_ = container;
                 pos_ = pos;
@@ -50 +55 @@
         void RadarObject::init(){
             next = NULL;
-                om = &Ogre::OverlayManager::getSingleton();
+                om = &OverlayManager::getSingleton();
                 panel_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel",
-                        "Object"+Ogre::StringConverter::toString(count)));
+                        "Object"+StringConverter::toString(count)));
                 panel_->setMaterialName("Orxonox/RedDot");
                 panel_->setDimensions(3,3);

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

@@ -29 +29 @@
 #define _RADAR2_H__
 
-#include <string.h>
 #include <OgrePrerequisites.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-#include <OgreStringConverter.h>
-
-#include <util/Math.h>
 #include "../OrxonoxPrereqs.h"
 

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))/

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

@@ -29 +29 @@
 #define _RADAR_H__
 
-#include <string.h>
-#include <OgreOverlayManager.h>
-#include <OgreStringConverter.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
+#include <util/Math.h>
 #include <OgrePrerequisites.h>
-
-#include <util/Math.h>
-#include <string.h>
-#include "core/Tickable.h"
-#include "core/ConsoleCommand.h"
-#include "objects/SpaceShip.h"
 #include "../OrxonoxPrereqs.h"
 #include "RadarObject.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox