Changeset 1407 for code/trunk/src/orxonox/hud/RadarObject.cc

Timestamp:

May 24, 2008, 1:49:54 PM (16 years ago)

Author:

rgrieder

Message:

• reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

File:

• code/trunk/src/orxonox/hud/RadarObject.cc (modified) (5 diffs)

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"
 
@@ -39 +34 @@
         int RadarObject::count = 0;             // initialize static variable
 
-        RadarObject::RadarObject(OverlayContainer* container){
+        RadarObject::RadarObject(Ogre::OverlayContainer* container){
                 container_ = container;
                 pos_ = Vector3(0.0, 0.0, 0.0);
@@ -45 +40 @@
         }
 
-        RadarObject::RadarObject(OverlayContainer* container, Vector3 pos){
+        RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
                 container_ = container;
                 pos_ = pos;
@@ -55 +50 @@
         void RadarObject::init(){
             next = NULL;
-                om = &OverlayManager::getSingleton();
+                om = &Ogre::OverlayManager::getSingleton();
                 panel_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel",
-                        "Object"+StringConverter::toString(count)));
+                        "Object"+Ogre::StringConverter::toString(count)));
                 panel_->setMaterialName("Orxonox/RedDot");
                 panel_->setDimensions(3,3);
@@ -67 +62 @@
         }
 }
+
+/* my local clipboard...
+COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
+COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
+COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
+*/