Changeset 1406 for code/branches/network/src/orxonox/hud/RadarOverlayElement.h

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/RadarOverlayElement.h (modified) (3 diffs)

code/branches/network/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
@@ -52 +41 @@
             Ogre::OverlayManager* om;               // our one and only overlay manager
             Ogre::OverlayContainer* container_;     // pointer to the container we're in
-            Vector3 initialDir_;                        // direction of nose
             Vector3 currentDir_;
-            Vector3 initialOrth_;                   // direction of normal
             Vector3 currentOrth_;
             Vector3 shipPos_;                       // position of ship
-            Ogre::Plane plane;                      // plane perpendicular to dir
 
             Ogre::Real leftRel_, topRel_, dimRel_;  // relative position/dimension
@@ -69 +55 @@
                         void resize();
             void update();
-            void updateNavMarker();
-            void addObject(Vector3 pos);
             void listObjects();
-            float getDist2Focus();
-            float calcRadius(RadarObject* obj);
-            float calcPhi(RadarObject* obj);
-            bool calcRight(RadarObject* obj);
 
-            Ogre::PanelOverlayElement* navMarker_;  // marker to help navigating
-                        RadarObject* firstRadarObject_;         // start of linked list
-                        RadarObject* lastRadarObject_;          // end of linked list
-                        RadarObject* focus_;                    // object that is focussed
-
-            static RadarOverlayElement* instance_s;
-            static void cycleFocus();
+            static float calcRadius(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
+            static float calcPhi(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
+            static bool calcRight(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
         };
 }