Changeset 1406 for code/branches/network/src/orxonox/hud/RadarObject.cc

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.cc (modified) (5 diffs)

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

@@ -29 +29 @@
 #include "RadarObject.h"
 
+#include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h>
+#include <OgreStringConverter.h>
+#include <util/Math.h>
+
 namespace orxonox
 {
@@ -35 +41 @@
         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);
@@ -41 +47 @@
         }
 
-        RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
+        RadarObject::RadarObject(OverlayContainer* container, Vector3 pos){
                 container_ = container;
                 pos_ = pos;
@@ -51 +57 @@
         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);
@@ -63 +69 @@
         }
 }
-
-/* my local clipboard...
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-*/