Changeset 1562 for code/trunk/src/orxonox/hud/RadarObject.h

Timestamp:

Jun 7, 2008, 3:39:48 PM (16 years ago)

Author:

landauf

Message:

• AI ships are now displayed with a point with its teamcolour on the radar.
• It's now possible to assign an arbitrary colour (and even a texture) to a RadarObject. But be aware the system has to create a new material for every colour (not for every object), so please use deterministic colours to reduce the amount of used materials to a bearable number.

File:

• code/trunk/src/orxonox/hud/RadarObject.h (modified) (3 diffs)

code/trunk/src/orxonox/hud/RadarObject.h

@@ -30 +30 @@
 #define _RadarObject_H__
 
+#include <map>
+
 #include <OgrePrerequisites.h>
 #include <OgreSceneNode.h>
@@ -40 +42 @@
     class _OrxonoxExport RadarObject
     {
-      private:
-        Ogre::OverlayManager* om;                               // our one and only overlay manager
-        Ogre::SceneNode* node_;                                 // node of object
-        int colour_;
+      public:
+        RadarObject(Ogre::OverlayContainer* container, Ogre::SceneNode* node, const ColourValue& colour = ColourValue(0.5, 0.5, 0.5, 1), const std::string& texturename = "white.tga");
+        ~RadarObject();
 
-      public:
-        RadarObject(Ogre::OverlayContainer* container, Ogre::SceneNode* node, int colour = 0);
-        ~RadarObject();
-        void setColour(int colour);
-        void resetColour();
+        void setMaterial(const ColourValue& colour, const std::string& texturename);
+        inline void setColour(const ColourValue& colour)
+            { this->setMaterial(colour, this->texturename_); }
+        inline void setTexture(const std::string& texturename)
+            { this->setMaterial(this->colour_, texturename); }
+        inline void resetMaterial()
+            { this->setMaterial(this->colour_, this->texturename_); }
+
         Vector3 getPosition();
         Ogre::SceneNode* getNode();
@@ -58 +62 @@
         Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot
 
-        static int count;
-        static const int RED = 0;
-        static const int YELLOW = 1;
-        static const int GREEN = 2;
-        static const int BLUE = 3;
-        static const int WHITE = 99;            // used if object got nav focus
+      private:
+        static std::map<std::string, std::map<ColourValue, std::string> > materials_s;
+        unsigned static int count_s;
+        Ogre::SceneNode* node_;                                 // node of object
+        ColourValue colour_;
+        std::string texturename_;
   };
 }