Changeset 1613 for code/branches/hud/src/orxonox/objects/SpaceShip.cc

Timestamp:

Jun 20, 2008, 12:05:12 AM (16 years ago)

Author:

rgrieder

Message:

• Radar now working like before
• but more of a svn save..

There is class called Radar which takes care of the focus and all objects that can be displayed on a Radar.
The actual visual implementation is in HUDRadar.
To make a object radar viewable, simply implement RadarViewable and set the WorldEntitiy pointer in the constructor (assertation will fail otherwise!).
You can also set a camouflage value between 0 and 1 that tells how good a radar can see an object.
The HUDRadar (or another one) on the other side has a sensitivity between 0 and 1. So only if the sensitivity is higher than the camouflage value, the object gets displayed.

File:

• code/branches/hud/src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)

code/branches/hud/src/orxonox/objects/SpaceShip.cc

@@ -42 +42 @@
 #include "core/Debug.h"
 #include "GraphicsEngine.h"
-#include "core/input/InputManager.h"
+//#include "core/input/InputManager.h"
 #include "tools/ParticleInterface.h"
 #include "RotatingProjectile.h"
@@ -49 +49 @@
 #include "core/ConsoleCommand.h"
 #include "network/Client.h"
-#include "overlays/hud/HUDRadar.h"
 
 namespace orxonox
@@ -133 +132 @@
         this->health_ = 100;
 
+        this->radarObject_ = static_cast<WorldEntity*>(this);
+
         COUT(3) << "Info: SpaceShip was loaded" << std::endl;
     }
@@ -144 +145 @@
             if (this->tt2_)
                 delete this->tt2_;
-
-            if (setMouseEventCallback_)
-                InputManager::removeMouseHandler("SpaceShip");
-
             if (this->cam_)
                 delete this->cam_;
-
-            if (!this->myShip_)
-                HUDRadar::getInstance().removeRadarObject(this);
         }
     }
@@ -161 +155 @@
           myShip_=true;
         else
-          HUDRadar::getInstance().addRadarObject(this, this->getProjectileColour());
+          this->setRadarObjectColour(this->getProjectileColour());
       }
       if(Model::create())