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

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.h (modified) (1 diff)

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

@@ -26 +26 @@
 */
 
-#ifndef _NAVIGATION_H__
-#define _NAVIGATION_H__
+#ifndef _Navigation_H__
+#define _Navigation_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <OgrePrerequisites.h>
-#include "../OrxonoxPrereqs.h"
-#include <OgrePlane.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
 #include "util/Math.h"
-#include "RadarObject.h"
 
 namespace orxonox
 {
+
     class _OrxonoxExport Navigation
     {
-        private:
-                Ogre::OverlayManager* om;                                   // our one and only overlay manager
-            Ogre::OverlayContainer* container_;
-            Ogre::PanelOverlayElement* navMarker_;      // the panel used to show the arrow
-            Ogre::TextAreaOverlayElement* navText_;     // displaying distance
-            Ogre::Camera* navCam_;
-                Vector3 navCamPos_;                            // position of ship
-                Vector3 currentDir_;
-            Vector3 currentOrth_;
-                int windowW_, windowH_;
-                void init();
-                void updateMarker();
+      private:
+        Ogre::OverlayManager* om;                                           // our one and only overlay manager
+        Ogre::OverlayContainer* container_;
+        Ogre::PanelOverlayElement* navMarker_;      // the panel used to show the arrow
+        Ogre::TextAreaOverlayElement* navText_;     // displaying distance
+        Ogre::Camera* navCam_;
+        Vector3 navCamPos_;                         // position of ship
+        Vector3 currentDir_;
+        Vector3 currentOrth_;
+        int windowW_, windowH_;
+        void init();
+        void updateMarker();
 
-        public:
-                Navigation(Ogre::OverlayContainer* container);
-                Navigation(Ogre::OverlayContainer* container, RadarObject* focus);
-                ~Navigation();
-                        RadarObject* focus_;                        // next pointer of linked list
+      public:
+        Navigation(Ogre::OverlayContainer* container);
+        Navigation(Ogre::OverlayContainer* container, RadarObject* focus);
+        ~Navigation();
+        RadarObject* focus_;                        // next pointer of linked list
 
-                void update();
-                void cycleFocus();
-                float getDist2Focus();
-        };
+        void update();
+        void cycleFocus();
+        float getDist2Focus();
+  };
 }
 
-#endif
+#endif /* _Navigation_H__ */