Changeset 1613 for code/branches/hud/src/orxonox/Radar.h

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

code/branches/hud/src/orxonox/Radar.h

@@ -38 +38 @@
 
 #include <string>
+#include "core/Iterator.h"
 #include "core/OrxonoxClass.h"
 #include "objects/Tickable.h"
+#include "RadarViewable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport RadarListener : public OrxonoxClass
+    class _OrxonoxExport RadarListener : virtual public OrxonoxClass
     {
     public:
@@ -49 +51 @@
         virtual ~RadarListener() { }
 
-        virtual void displayObject(RadarViewable* viewable) = 0;
+        virtual void displayObject(RadarViewable* viewable, bool bIsMarked) = 0;
+        virtual void hideMarker() = 0;
         virtual float getRadarSensitivity() = 0;
+        virtual void radarTick(float dt) = 0;
     };
 
@@ -69 +73 @@
         ~Radar();
 
-        void unregisterObject(RadarViewable* object);
-
-        void tick(float dt);
+        //void unregisterObject(RadarViewable* object);
+        const RadarViewable* getFocus();
+        RadarViewable::Shape addObjectDescription(const std::string name);
 
         static Radar& getInstance();
         static Radar* getInstancePtr() { return instance_s; }
 
+        static void cycleNavigationFocus();
+        static void releaseNavigationFocus();
+
     private:
         Radar(Radar& instance);
+        void tick(float dt);
+
+        void releaseFocus();
+        void updateFocus();
+        void cycleFocus();
+
+        Iterator<RadarViewable> itFocus_;
+        RadarViewable* focus_;
+        std::map<std::string, RadarViewable::Shape> objectTypes_;
+        int objectTypeCounter_; 
 
         static Radar* instance_s;