Changeset 1406 for code/branches/network/src/orxonox/hud/RadarObject.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/RadarObject.h (modified) (2 diffs)

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

@@ -28 +28 @@
 #ifndef _RADAR2_H__
 #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"
 
@@ -55 +47 @@
             int index_;                             // index number of object
                 Vector3 pos_;                                                   // position in space
-                        Ogre::Real radius_, phi_;                               // position on radar
                         Ogre::OverlayContainer* container_;
                         Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot