Changeset 1614

Timestamp:

Jun 21, 2008, 2:35:24 PM (16 years ago)

Author:

rgrieder

Message:

• Dots on the Radar actually disappear now when a Ship gets destroyed…
• svn save to keep History of HUDText when renaming AND moving

Location:

code/branches/hud

Files:

• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/Radar.cc (modified) (6 diffs)
• src/orxonox/Radar.h (modified) (4 diffs)
• src/orxonox/RadarListener.cc (copied) (copied from code/branches/hud/src/orxonox/RadarViewable.cc) (1 diff)
• src/orxonox/RadarListener.h (copied) (copied from code/branches/hud/src/orxonox/RadarViewable.h) (1 diff)
• src/orxonox/RadarViewable.cc (modified) (1 diff)
• src/orxonox/RadarViewable.h (modified) (2 diffs)
• src/orxonox/overlays/HUDText.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDText.cc) (5 diffs)
• src/orxonox/overlays/HUDText.h (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDText.h) (3 diffs)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (6 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
• src/orxonox/overlays/OverlayGroup.cc (modified) (3 diffs)
• src/orxonox/overlays/OverlayGroup.h (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDBar.cc (modified) (5 diffs)
• src/orxonox/overlays/hud/HUDBar.h (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDFPSText.cc (modified) (1 diff)
• src/orxonox/overlays/hud/HUDNavigation.cc (modified) (4 diffs)
• src/orxonox/overlays/hud/HUDNavigation.h (modified) (3 diffs)
• src/orxonox/overlays/hud/HUDRTRText.cc (modified) (1 diff)
• src/orxonox/overlays/hud/HUDRadar.cc (modified) (8 diffs)
• src/orxonox/overlays/hud/HUDRadar.h (modified) (5 diffs)
• src/orxonox/overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
• src/orxonox/overlays/hud/HUDSpeedBar.h (modified) (1 diff)
• src/orxonox/overlays/hud/RadarObject.cc (deleted)
• src/orxonox/overlays/hud/RadarObject.h (deleted)
• src/orxonox/tools/TextureGenerator.cc (modified) (2 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

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

@@ -130 +130 @@
 }
 
+namespace Ogre
+{
+    // some got forgotten in OgrePrerequisites
+    class BorderPanelOverlayElement;
+    class PanelOverlayElement;
+    class TextAreaOverlayElement;
+}
+
 
 #endif /* _OrxonoxPrereqs_H__ */

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

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Felix Schulthess
  *
  */
@@ -38 +38 @@
 #include "objects/SpaceShip.h"
 #include "core/CoreIncludes.h"
+#include "RadarListener.h"
 //#include "core/ConfigValueIncludes.h"
 
 namespace orxonox
 {
-    RadarListener::RadarListener()
-    {
-        RegisterRootObject(RadarListener);
-    }
-
     SetConsoleCommand(Radar, cycleNavigationFocus, true).setAccessLevel(AccessLevel::User);
     SetConsoleCommand(Radar, releaseNavigationFocus, true).setAccessLevel(AccessLevel::User);
@@ -86 +82 @@
     }
 
-    /*void Radar::unregisterObject(RadarViewable* object)
-    {
-        if (this->focus_ == object)
-            this->focus_ = 0;
-        // TODO: check for focus
-    }*/
-
     const RadarViewable* Radar::getFocus()
     {
@@ -119 +108 @@
         for (Iterator<RadarListener> itListener = ObjectList<RadarListener>::begin(); itListener; ++itListener)
         {
+            (*itListener)->radarTick(dt);
+
             for (Iterator<RadarViewable> itElement = ObjectList<RadarViewable>::begin(); itElement; ++itElement)
             {
@@ -124 +115 @@
                     (*itListener)->displayObject(*itElement, *itElement == this->focus_);
             }
-
-            (*itListener)->radarTick(dt);
-
-            if (this->focus_ == 0)
-                (*itListener)->hideMarker();
         }
     }
@@ -190 +176 @@
     }
 
+    void Radar::listObjects() const
+    {
+        COUT(3) << "List of RadarObjects:\n";
+        // iterate through all Radar Objects
+        unsigned int i = 0;
+        for (Iterator<RadarViewable> it = ObjectList<RadarViewable>::start(); it; ++it, ++i)
+        {
+            COUT(3) << i++ << ": " << (*it)->getWorldPosition() << std::endl;
+        }
+    }
+
 
     /*static*/ Radar& Radar::getInstance()

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

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Felix Schulthess
  *
  */
@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
 #include <string>
 #include "core/Iterator.h"
@@ -45 +46 @@
 namespace orxonox
 {
-    class _OrxonoxExport RadarListener : virtual public OrxonoxClass
-    {
-    public:
-        RadarListener();
-        virtual ~RadarListener() { }
-
-        virtual void displayObject(RadarViewable* viewable, bool bIsMarked) = 0;
-        virtual void hideMarker() = 0;
-        virtual float getRadarSensitivity() = 0;
-        virtual void radarTick(float dt) = 0;
-    };
-
     /**
     @brief This class merely ensures that no one can inherit from Radar.
@@ -73 +62 @@
         ~Radar();
 
-        //void unregisterObject(RadarViewable* object);
         const RadarViewable* getFocus();
         RadarViewable::Shape addObjectDescription(const std::string name);
+
+        void listObjects() const;
 
         static Radar& getInstance();

code/branches/hud/src/orxonox/RadarListener.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "RadarViewable.h"
-#include "core/Debug.h"
-#include "Radar.h"
+#include "RadarListener.h"
 
 namespace orxonox
 {
-    /**
-        @brief Constructor.
-    */
-    RadarViewable::RadarViewable()
-        : radarObjectCamouflage_(0.0f)
-        , radarObjectType_(Dot)
-        , radarObject_(0)
-        , radarObjectDescription_("staticObject")
+    RadarListener::RadarListener()
     {
-        RegisterRootObject(RadarViewable);
+        RegisterRootObject(RadarListener);
     }
-
-    void RadarViewable::setRadarObjectDescription(const std::string& str)
-    {
-        Radar* radar = Radar::getInstancePtr();
-        if (radar)
-            this->radarObjectType_ = radar->addObjectDescription(str);
-        else
-        {
-            CCOUT(2) << "Attempting to access the radar, but the radar is non existent." << std::endl;
-        }
-        this->radarObjectDescription_ = str;
-    }
-
-    /*void RadarViewable::unregisterFromRadar()
-    {
-        Radar* radar = Radar::getInstancePtr();
-        if (radar)
-            radar->unregisterObject(this);
-        else
-        {
-            CCOUT(2) << "Attempting to unregister an object to the radar, but the radar is non existent." << std::endl;
-        }
-    }*/
 }

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

@@ -27 +27 @@
  */
 
-#ifndef _RadarViewable_H__
-#define _RadarViewable_H__
+#ifndef _RadarListener_H__
+#define _RadarListener_H__
 
 #include "OrxonoxPrereqs.h"
-#include <string>
 #include "core/OrxonoxClass.h"
-#include "util/Math.h"
 
 namespace orxonox
 {
-    /**
-    @brief Interface for receiving window events.
-    */
-    class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
+    class _OrxonoxExport RadarListener : virtual public OrxonoxClass
     {
     public:
-        enum Shape
-        {
-            Square,
-            Dot,
-            Triangle
-        };
+        RadarListener();
+        virtual ~RadarListener() { }
 
-    public:
-        RadarViewable();
-        virtual ~RadarViewable() { }//unregisterFromRadar(); }
-
-        float getRadarObjectCamouflage() const { return this->radarObjectCamouflage_; }
-        void setRadarObjectCamouflage(float camouflage) { this->radarObjectCamouflage_ = camouflage; }
-
-        const ColourValue& getRadarObjectColour() const { return this->radarObjectColour_; }
-        void setRadarObjectColour(const ColourValue& colour) { this->radarObjectColour_ = colour; }
-
-        const std::string& getRadarObjectDescription() const { return this->radarObjectDescription_; }
-        void setRadarObjectDescription(const std::string& str);
-
-        const WorldEntity* getWorldEntity() const { return this->radarObject_; }
-        const Vector3& getWorldPosition() const { validate(); return this->radarObject_->getWorldPosition(); }
-        Vector3 getOrientedVelocity() const
-            { validate(); return this->radarObject_->getOrientation() * this->radarObject_->getVelocity(); }
-
-        Shape getRadarObjectType() const { return this->radarObjectType_; }
-
-    protected:
-        WorldEntity* radarObject_;
-        //void unregisterFromRadar();
-
-    private:
-        void validate() const { if (!this->radarObject_)
-        { COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl; assert(0); } }
-
-        float radarObjectCamouflage_;
-        Shape radarObjectType_;
-        std::string radarObjectDescription_;
-        ColourValue radarObjectColour_;
+        virtual void displayObject(RadarViewable* viewable, bool bIsMarked) = 0;
+        virtual float getRadarSensitivity() = 0;
+        virtual void radarTick(float dt) = 0;
     };
 }
 
-#endif /* _RadarViewable_H__ */
+#endif /* _RadarListener_H__ */

code/branches/hud/src/orxonox/RadarViewable.cc

@@ -57 +57 @@
         this->radarObjectDescription_ = str;
     }
-
-    /*void RadarViewable::unregisterFromRadar()
-    {
-        Radar* radar = Radar::getInstancePtr();
-        if (radar)
-            radar->unregisterObject(this);
-        else
-        {
-            CCOUT(2) << "Attempting to unregister an object to the radar, but the radar is non existent." << std::endl;
-        }
-    }*/
 }

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

@@ -52 +52 @@
     public:
         RadarViewable();
-        virtual ~RadarViewable() { }//unregisterFromRadar(); }
+        virtual ~RadarViewable() { }
 
         float getRadarObjectCamouflage() const { return this->radarObjectCamouflage_; }
@@ -72 +72 @@
     protected:
         WorldEntity* radarObject_;
-        //void unregisterFromRadar();
 
     private:

code/branches/hud/src/orxonox/overlays/HUDText.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
 
 #include "util/Convert.h"
@@ -41 +43 @@
 
   HUDText::HUDText()
-    : background_(0)
-    , text_(0)
+    : text_(0)
   {
     RegisterObject(HUDText);
@@ -53 +54 @@
       if (this->text_)
           OverlayManager::getSingleton().destroyOverlayElement(this->text_);
-      if (this->background_)
-          OverlayManager::getSingleton().destroyOverlayElement(this->background_);
     }
   }
@@ -64 +63 @@
     if (mode == XMLPort::LoadObject)
     {
-      // create background
-      this->background_ = static_cast<PanelOverlayElement*>(
-              OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background"));
-
       this->text_ = static_cast<TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("TextArea", getName() + "_Text"));
       this->text_->setCharHeight(1.0f);
       this->text_->setFontName("Monofur");
 
-      this->overlay_->add2D(this->background_);
       this->background_->addChild(this->text_);
     }
 
-    XMLPortParam(HUDText, "material", setBackgroundMaterial, getBackgroundMaterial, xmlElement, mode);
     XMLPortParam(HUDText, "font", setFont, getFont, xmlElement, mode);
     XMLPortParam(HUDText, "caption", setCaption, getCaption, xmlElement, mode);
@@ -84 +77 @@
       this->text_->setCaption(this->caption_);
     }
-  }
-
-  void HUDText::setBackgroundMaterial(const std::string& material)
-  {
-    if (this->background_ && material != "")
-      this->background_->setMaterialName(material);
-  }
-
-  std::string HUDText::getBackgroundMaterial() const
-  {
-    if (this->background_)
-      return this->background_->getMaterialName();
-    else
-      return "";
   }
 

code/branches/hud/src/orxonox/overlays/HUDText.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include <OgrePrerequisites.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-
-#include "util/Math.h"
 #include "overlays/OrxonoxOverlay.h"
 
@@ -50 +47 @@
 
   protected:
-    void setBackgroundMaterial(const std::string& material);
-    std::string getBackgroundMaterial() const;
     void setCaption(const std::string& caption);
     const std::string& getCaption() const;
@@ -58 +53 @@
 
     Ogre::TextAreaOverlayElement* text_;
+
   private:
     std::string caption_;
-    Ogre::PanelOverlayElement* background_;
   };
 }

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h>
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
@@ -41 +42 @@
   OrxonoxOverlay::OrxonoxOverlay()
     : overlay_(0)
+    , background_(0)
     , windowAspectRatio_(1.0f)
     , bCorrectAspect_(false)
@@ -50 +52 @@
   {
     RegisterObject(OrxonoxOverlay);
+  }
+
+  OrxonoxOverlay::~OrxonoxOverlay()
+  {
+    if (this->background_)
+      Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->background_);
   }
 
@@ -63 +71 @@
       this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(),
             GraphicsEngine::getSingleton().getWindowHeight());
+
+      // create background
+      this->background_ = static_cast<Ogre::PanelOverlayElement*>(
+          Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getUniqueNumberStr() + "_Background"));
+      this->overlay_->add2D(this->background_);
     }
 
@@ -70 +83 @@
     XMLPortParam(OrxonoxOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
     XMLPortParam(OrxonoxOverlay, "position", setPosition, getPosition, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "background", setBackgroundMaterial, getBackgroundMaterial, xmlElement, mode);
 
     if (mode == XMLPort::LoadObject)
@@ -83 +97 @@
   }
 
-  OrxonoxOverlay::~OrxonoxOverlay()
+  void OrxonoxOverlay::setBackgroundMaterial(const std::string& material)
   {
+    if (this->background_ && material != "")
+      this->background_->setMaterialName(material);
+  }
+
+  std::string OrxonoxOverlay::getBackgroundMaterial() const
+  {
+    if (this->background_)
+      return this->background_->getMaterialName();
+    else
+      return "";
   }
 

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.h

@@ -39 +39 @@
 namespace orxonox
 {
-  class _OrxonoxExport OrxonoxOverlay : public BaseObject, public WindowEventListener
-  {
+    class _OrxonoxExport OrxonoxOverlay : public BaseObject, public WindowEventListener
+    {
     public:
-      Ogre::Overlay* getOverlay() { return this->overlay_; }
-      OrxonoxOverlay();
-      virtual ~OrxonoxOverlay();
+        Ogre::Overlay* getOverlay() { return this->overlay_; }
+        OrxonoxOverlay();
+        virtual ~OrxonoxOverlay();
 
-      virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-      void setAspectCorrection(bool val);
-      bool getAspectCorrection() { return this->bCorrectAspect_; }
+        void show() { this->setVisibility(true); }
+        void hide() { this->setVisibility(false); }
 
-      /** Sets the position of this overlay. */
-      void setPosition(Vector2 pos) { this->position_ = pos; this->positionChanged(); }
+        void setAspectCorrection(bool val);
+        bool getAspectCorrection() { return this->bCorrectAspect_; }
 
-      /** Gets the current position. */
-      Vector2 getPosition() const { return this->position_; }
+        /** Sets the position of this overlay. */
+        void setPosition(Vector2 pos) { this->position_ = pos; this->positionChanged(); }
 
-      /** Scrolls the overlay by the offsets provided. */
-      void scroll(Vector2 scroll) { this->position_ += scroll; this->positionChanged(); }
+        /** Gets the current position. */
+        Vector2 getPosition() const { return this->position_; }
 
-      /** Sets the origin point of this overlay. */
-      void setOrigin(Vector2 pos) { this->origin_ = pos; this->positionChanged(); }
+        /** Scrolls the overlay by the offsets provided. */
+        void scroll(Vector2 scroll) { this->position_ += scroll; this->positionChanged(); }
 
-      /** Gets the origin point of this overlay */
-      Vector2 getOrigin() const { return this->origin_; }
+        /** Sets the origin point of this overlay. */
+        void setOrigin(Vector2 pos) { this->origin_ = pos; this->positionChanged(); }
 
-      /** Sets the rotation applied to this overlay.*/
-      void setRotation(const Ogre::Radian& angle) { this->angle_ = angle; this->angleChanged(); }
+        /** Gets the origin point of this overlay */
+        Vector2 getOrigin() const { return this->origin_; }
 
-      /** Gets the rotation applied to this overlay, in degrees.*/
-      const Radian& getRotation() const { return this->angle_; }
+        /** Sets the rotation applied to this overlay.*/
+        void setRotation(const Ogre::Radian& angle) { this->angle_ = angle; this->angleChanged(); }
 
-      /** Adds the passed in angle to the rotation applied to this overlay. */
-      void rotate(const Radian& angle) { this->angle_ += angle; this->angleChanged(); }
+        /** Gets the rotation applied to this overlay, in degrees.*/
+        const Radian& getRotation() const { return this->angle_; }
 
-      /** Sets the size of this overlay. */
-      void setSize(const Vector2& size) { this->size_ = size; this->sizeChanged(); }
+        /** Adds the passed in angle to the rotation applied to this overlay. */
+        void rotate(const Radian& angle) { this->angle_ += angle; this->angleChanged(); }
 
-      /** Gets the current size (not corrected) */
-      Vector2 getUncorrectedSize() const { return this->size_; }
+        /** Sets the size of this overlay. */
+        void setSize(const Vector2& size) { this->size_ = size; this->sizeChanged(); }
 
-      /** Gets the current size (corrected) */
-      Vector2 getSize() const { return this->size_ * this->sizeCorrection_; }
+        /** Gets the current size (not corrected) */
+        Vector2 getUncorrectedSize() const { return this->size_; }
 
-      /** Gets the current size correction */
-      Vector2 getSizeCorrection() const { return this->sizeCorrection_; }
+        /** Gets the current size (corrected) */
+        Vector2 getSize() const { return this->size_ * this->sizeCorrection_; }
 
-      /** Scales the overlay */
-      void scale(Vector2 scale) { this->size_ *= scale; this->sizeChanged(); }
+        /** Gets the current size correction */
+        Vector2 getSizeCorrection() const { return this->sizeCorrection_; }
+
+        /** Scales the overlay */
+        void scale(Vector2 scale) { this->size_ *= scale; this->sizeChanged(); }
 
     protected:
-      virtual void changedVisibility();
-      virtual void sizeChanged();
-      virtual void angleChanged();
-      virtual void positionChanged();
-      float getWindowAspectRatio() { return windowAspectRatio_; } 
+        virtual void changedVisibility();
+        virtual void sizeChanged();
+        virtual void angleChanged();
+        virtual void positionChanged();
+        float getWindowAspectRatio() { return windowAspectRatio_; }
 
-      Ogre::Overlay* overlay_;
+        void setBackgroundMaterial(const std::string& material);
+        std::string getBackgroundMaterial() const;
+
+        Ogre::Overlay* overlay_;
+        Ogre::PanelOverlayElement* background_;
 
     private:
-      void windowResized(int newWidth, int newHeight);
+        void windowResized(int newWidth, int newHeight);
 
-      float windowAspectRatio_;
-      bool bCorrectAspect_;
-      Vector2 size_;
-      Vector2 sizeCorrection_;
-      Radian angle_;
-      Vector2 position_;
-      Vector2 origin_;
+        float windowAspectRatio_;
+        bool bCorrectAspect_;
+        Vector2 size_;
+        Vector2 sizeCorrection_;
+        Radian angle_;
+        Vector2 position_;
+        Vector2 origin_;
 
-      static unsigned int hudOverlayCounter_s;
+        static unsigned int hudOverlayCounter_s;
   };
 }

code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

@@ -41 +41 @@
 
   SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
-
-  OverlayGroup* OverlayGroup::hudInstance_s = 0;
+  SetConsoleCommand(OverlayGroup, scaleGroup, false).setAccessLevel(AccessLevel::User);
 
   using namespace Ogre;
@@ -50 +49 @@
   {
     RegisterObject(OverlayGroup);
-
-    // Singleton like in Ogre. Constructor and destructor are public,
-    // but the assert prevents from having multiple instances.
-    assert(hudInstance_s == 0);
-    hudInstance_s = this;
   }
 
   OverlayGroup::~OverlayGroup()
   {
-    if (this->isInitialized())
-    {
-    }
-
-    hudInstance_s = 0;
   }
 
@@ -104 +93 @@
   }
 
-  /*static*/ OverlayGroup& OverlayGroup::getHUD()
-  {
-    assert(hudInstance_s);
-    return *hudInstance_s;
-  }
 
   /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
   {
-    if (OverlayGroup::getHUD().hudElements_.find(name) != OverlayGroup::getHUD().hudElements_.end())
+    for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
     {
-      OverlayGroup::getHUD().hudElements_[name]->setVisibility(!OverlayGroup::getHUD().hudElements_[name]->isVisible());
+        if ((*it)->getName() == name)
+            (*it)->setVisibility(!((*it)->isVisible()));
     }
   }
 
+  /*static*/ void OverlayGroup::scaleGroup(const std::string& name, float scale)
+  {
+    for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+    {
+        if ((*it)->getName() == name)
+            (*it)->scale(Vector2(scale, scale));
+    }
+  }
 }

code/branches/hud/src/orxonox/overlays/OverlayGroup.h

@@ -54 +54 @@
 
         static void toggleVisibility(const std::string& name);
-        static OverlayGroup& getHUD();
+        static void scaleGroup(const std::string& name, float scale);
 
       private:
@@ -64 +64 @@
         std::map<std::string, OrxonoxOverlay*> hudElements_;
         Vector2 scale_;
-
-        static OverlayGroup* hudInstance_s;
     };
 }

code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc

@@ -35 +35 @@
 #include <OgreMaterialManager.h>
 #include <OgreTechnique.h>
+#include <OgrePanelOverlayElement.h>
 
 #include "util/Convert.h"
@@ -45 +46 @@
 
     HUDBar::HUDBar()
+        : bar_(0)
+        , textureUnitState_(0)
     {
         RegisterObject(HUDBar);
-
-        this->bar_ = 0;
-        this->background_ = 0;
-        this->textureUnitState_ = 0;
-
-        barWidth_s = 0.88f;
-        barHeight_s = 1.0f;
-        barOffsetLeft_s = 0.06f;
-        barOffsetTop_s = 0.0f;
-
-        this->value_ = -1;
-        this->autoColour_ = true;
-        this->right2Left_ = false; // default is left to right progress
     }
 
@@ -68 +58 @@
             if (this->bar_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->bar_);
+            // FIXME: Check whether we have to delete the textureUnitState_;
         }
     }
@@ -77 +68 @@
         if (mode == XMLPort::LoadObject)
         {
-            // create background
-            this->background_ = static_cast<PanelOverlayElement*>(
-                    OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background_" + getUniqueNumberStr()));
-            this->background_->setMaterialName("Orxonox/BarBackground");
-            this->overlay_->add2D(this->background_);
-
             // create new material
             std::string materialname = "barmaterial" + getConvertedValue<unsigned int, std::string>(materialcount_s++);
@@ -93 +78 @@
 
             // create bar
+            barWidth_s = 0.88f;
+            barHeight_s = 1.0f;
+            barOffsetLeft_s = 0.06f;
+            barOffsetTop_s = 0.0f;
             this->bar_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "Bar" + getUniqueNumberStr()));
             this->bar_->setMaterialName(materialname);
             this->background_->addChild(bar_);
-        }
 
-        XMLPortParamLoadOnly(HUDBar, "value", setValue, xmlElement, mode);
+            this->setValue(0);
+            this->autoColour_ = true;
+            this->right2Left_ = false; // default is left to right progress
 
-        if (mode == XMLPort::LoadObject)
-        {
             this->addColour(0.7, ColourValue(0.2, 0.7, 0.2));
             this->addColour(0.4, ColourValue(0.7, 0.5, 0.2));
             this->addColour(0.1, ColourValue(0.7, 0.2, 0.2));
         }
+
+        XMLPortParamLoadOnly(HUDBar, "value", setValue, xmlElement, mode);
     }
 

code/branches/hud/src/orxonox/overlays/hud/HUDBar.h

@@ -34 +34 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
 #include <OgrePrerequisites.h>
-#include <OgrePanelOverlayElement.h>
-
 #include "util/Math.h"
 #include "overlays/OrxonoxOverlay.h"
@@ -67 +66 @@
       float value_;                       // progress of bar
       Ogre::PanelOverlayElement* bar_;
-      Ogre::PanelOverlayElement* background_;
       Ogre::TextureUnitState* textureUnitState_;
       std::map<float, ColourValue> colours_;

code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "HUDFPSText.h"
+#include <OgreTextAreaOverlayElement.h>
 #include "GraphicsEngine.h"
 #include "util/Convert.h"

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreStringConverter.h>
-
-//#include "GraphicsEngine.h"
-// TODO: remove the SpaceShip and CameraHandler dependencies
-#include "core/Debug.h"
-#include "core/CoreIncludes.h"
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
+
+#include "util/Math.h"
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
 #include "objects/Projectile.h"
 #include "objects/CameraHandler.h"
-#include "overlays/OverlayGroup.h"
 #include "Radar.h"
 
@@ -68 +65 @@
         if (this->isInitialized())
         {
-            if (this->container_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->container_);
             if (this->navMarker_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->navMarker_);
@@ -76 +71 @@
             if (this->aimMarker_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->aimMarker_);
+            if (this->container_)
+                OverlayManager::getSingleton().destroyOverlayElement(this->container_);
         }
 
@@ -87 +84 @@
         if (mode == XMLPort::LoadObject)
         {
-            // create container
+            // create container because we cannot add a Text element to an Overlay
             container_ = static_cast<OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_navContainer"));
 

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.h

@@ -33 +33 @@
 
 #include <OgrePrerequisites.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
 #include "overlays/OrxonoxOverlay.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -50 +47 @@
         void tick(float dt);
 
-        //void cycleFocus();
         float getDist2Focus() const;
-
-        /*inline RadarObject* getFocus() const
-            { return this->focus_; }
-        void releaseFocus();*/
-
-        /*static void cycleNavigationFocus();
-        static void releaseNavigationFocus();
-        static HUDNavigation& getInstance();*/
 
       protected:
@@ -88 +76 @@
         Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
         bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
-
-        //static HUDNavigation* instance_s;
   };
 }

code/branches/hud/src/orxonox/overlays/hud/HUDRTRText.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "HUDRTRText.h"
+#include <OgreTextAreaOverlayElement.h>
 #include "GraphicsEngine.h"
 #include "util/Convert.h"

code/branches/hud/src/orxonox/overlays/hud/HUDRadar.cc

@@ -22 +22 @@
  *   Author:
  *      Yuning Chai
+ *      Felix Schulthess
  *   Co-authors:
- *      Felix Schulthess
+ *      Reto Grieder
  *
  */
@@ -30 +31 @@
 #include "HUDRadar.h"
 
-#include <assert.h>
 #include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
+#include <OgrePanelOverlayElement.h>
 
+#include "util/Math.h"
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
 #include "objects/WorldEntity.h"
 #include "tools/TextureGenerator.h"
-#include "RadarViewable.h"
+#include "Radar.h"
 
 namespace orxonox
 {
     CreateFactory(HUDRadar);
-    CreateFactory(RadarShape);
 
     using namespace Ogre;
 
     HUDRadar::HUDRadar()
-      : background_(0)
-      , marker_(0)
-      , sensitivity_(1.0f)
+        : marker_(0)
     {
         RegisterObject(HUDRadar);
@@ -59 +57 @@
         if (this->isInitialized())
         {
-            /*if (this->background_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->background_);
-            while (this->radarDots_.size() > 0)
+            if (this->marker_)
+                OverlayManager::getSingleton().destroyOverlayElement(this->marker_);
+            for (std::vector<Ogre::PanelOverlayElement*>::iterator it = this->radarDots_.begin();
+                it != this->radarDots_.end(); ++it)
             {
-                OverlayManager::getSingleton().destroyOverlayElement(this->radarDots_[this->radarDots_.size() - 1]);
-                this->radarDots_.pop_back();
-            }*/
+                OverlayManager::getSingleton().destroyOverlayElement(*it);
+            }
         }
     }
@@ -90 +88 @@
         if (mode == XMLPort::LoadObject)
         {
-            background_ = (Ogre::PanelOverlayElement*)Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background");
-            background_->setMaterialName("Orxonox/Radar");
-            overlay_->add2D(background_);
-
             marker_ = (Ogre::PanelOverlayElement*)Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Marker");
             marker_->setMaterialName("Orxonox/RadarMarker");
@@ -100 +94 @@
         }
     }
-
-    /*void HUDRadar::addShape(RadarShape* shape)
-    {
-        this->shapes_[shape->getIndex()] = shape;
-    }
-
-    RadarShape* HUDRadar::getShape(unsigned int index) const
-    {
-        if (index < this->shapes_.size())
-        {
-            std::map<unsigned int, RadarShape*>::const_iterator it = shapes_.begin();
-            for (unsigned int i = 0; i != index; ++it, ++i)
-                ;
-            return (*it).second;
-        }
-        else
-            return 0;
-    }*/
 
     void HUDRadar::displayObject(RadarViewable* object, bool bIsMarked)
@@ -131 +107 @@
         }
 
-        /*static int counter = 0;
-        if (++counter < 1120 && counter > 120)
-        {
-            // we have to create a new entry
-            Ogre::PanelOverlayElement* panel = static_cast<Ogre::PanelOverlayElement*>(
-                Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "RadarDot" + getUniqueNumberStr()));
-            // get right material
-            panel->setMaterialName("Orxonox/RadarSquare");
-            panel->setDimensions(0.03, 0.03);
-            panel->setPosition((1.0 + (rand() & 0xFF) / 256.0 - 0.001) * 0.5, (1.0 - (rand() & 0xFF) / 256.0 - 0.001) * 0.5);
-            panel->show();
-            this->overlay_->add2D(panel);
-            this->overlay_->show();
-        }*/
-
         // try to find a panel already created
         Ogre::PanelOverlayElement* panel;
-        std::map<RadarViewable*, Ogre::PanelOverlayElement*>::iterator it = this->radarDots_.find(object);
-        if (it == this->radarDots_.end())
+        //std::map<RadarViewable*, Ogre::PanelOverlayElement*>::iterator it = this->radarDots_.find(object);
+        if (itRadarDots_ == this->radarDots_.end())
         {
             // we have to create a new entry
             panel = static_cast<Ogre::PanelOverlayElement*>(
                 Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "RadarDot" + getUniqueNumberStr()));
-            radarDots_[object] = panel;
+            radarDots_.push_back(panel);
             // get right material
             panel->setMaterialName(TextureGenerator::getMaterialName(
                 shapeMaterials_[object->getRadarObjectType()], object->getRadarObjectColour()));
             this->overlay_->add2D(panel);
+            this->itRadarDots_ = this->radarDots_.end();
         }
         else
-            panel = (*it).second;
+        {
+            panel = *itRadarDots_;
+            ++itRadarDots_;
+            std::string materialName = TextureGenerator::getMaterialName(
+                shapeMaterials_[object->getRadarObjectType()], object->getRadarObjectColour());
+            if (materialName != panel->getMaterialName())
+                panel->setMaterialName(materialName);
+        }
 
         // set size to fit distance...
@@ -177 +146 @@
         {
             this->marker_->show();
-            this->marker_->setDimensions(size * 1.2, size * 1.2);
-            this->marker_->setPosition((1.0 + coord.x - size * 1.2) * 0.5, (1.0 - coord.y - size * 1.2) * 0.5);
+            this->marker_->setDimensions(size * 1.5, size * 1.5);
+            this->marker_->setPosition((1.0 + coord.x - size * 1.5) * 0.5, (1.0 - coord.y - size * 1.5) * 0.5);
         }
     }
@@ -184 +153 @@
     void HUDRadar::radarTick(float dt)
     {
+        this->itRadarDots_ = this->radarDots_.begin();
+        this->marker_->hide();
     }
-
-    /*void HUDRadar::tick(float dt)
-    {
-        // iterate through all RadarObjects
-        unsigned int i = 0;
-        for (Iterator<RadarViewable> it = ObjectList<RadarViewable>::start(); it; ++it, ++i)
-        {
-            if ((*it)->isVisibleOnRadar())
-            {
-            }
-        }
-    }*/
-
-    /*void HUDRadar::listObjects()
-    {
-        COUT(3) << "List of RadarObjects:\n";
-        // iterate through all Radar Objects
-        unsigned int i = 0;
-        for (Iterator<RadarViewable> it = ObjectList<RadarViewable>::start(); it; ++it, ++i)
-        {
-            COUT(3) << i++ << ": " << (*it)->getWorldEntity()->getWorldPosition() << std::endl;
-        }
-    }*/
 }

code/branches/hud/src/orxonox/overlays/hud/HUDRadar.h

@@ -22 +22 @@
  *   Author:
  *      Yuning Chai
+ *      Felix Schulthess
  *   Co-authors:
- *      Felix Schulthess
+ *      Reto Grieder
  *
  */
@@ -32 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <vector>
+#include <map>
 #include <OgrePrerequisites.h>
-#include <OgrePanelOverlayElement.h>
 #include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
-#include "core/BaseObject.h"
-#include "util/Math.h"
-#include "core/Debug.h"
-#include "Radar.h"
+#include "RadarListener.h"
+#include "RadarViewable.h"
 
 namespace orxonox
 {
-    template <class T, int Dummy>
-    class _OrxonoxExport RadarAttribute : public BaseObject
-    {
-      public:
-        RadarAttribute();
-        ~RadarAttribute() { }
-
-        void XMLPort(Element& xmlElement, XMLPort::Mode mode);
-        void loadAttribute(Element& xmlElement, XMLPort::Mode mode);
-
-        void setAttribute(const T& attribute) { this->attribute_ = attribute; }
-        const T& getAttribute() const { return this->attribute_; }
-
-        void setIndex(unsigned int index); 
-        unsigned int getIndex() { return this->index_; }
-
-      private:
-        unsigned int index_;
-        T attribute_;
-    };
-
-    template <class T, int Dummy>
-    void RadarAttribute<T, Dummy>::setIndex(unsigned int index)
-    {
-        if (index > 0xFF)
-        {
-            COUT(1) << "Shape index was larger than 255 while parsing a RadarAttribute. "
-              << "Using random number!!!" << std::endl;
-            this->index_ = rand() & 0xFF;
-        }
-        else
-            this->index_ = index;
-    }
-
-    typedef RadarAttribute<std::string, 1> RadarShape;
-
-    template <>
-    RadarShape::RadarAttribute() : index_(0)
-        { RegisterObject(RadarShape); }
-
-    template <>
-    void RadarShape::XMLPort(Element& xmlElement, XMLPort::Mode mode)
-    {
-        BaseObject::XMLPort(xmlElement, mode);
-        XMLPortParam(RadarShape, "shape", setAttribute, getAttribute, xmlElement, mode);
-        XMLPortParam(RadarShape, "index", setIndex, getIndex, xmlElement, mode);
-    }
-
-
-    class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public RadarListener//, public Tickable
+    class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public RadarListener
     {
       public:
@@ -99 +49 @@
 
         void XMLPort(Element& xmlElement, XMLPort::Mode mode);
-
-        /*void addShape(RadarShape* shape);
-        RadarShape* getShape(unsigned int index) const;*/
 
         float getRadarSensitivity() const { return this->sensitivity_; }
@@ -112 +59 @@
         void setMaximumDotSize(float size) { this->maximumDotSize_ = size; }
 
-        //void tick(float dt);
-
-        //void listObjects();
-
       private:
         void displayObject(RadarViewable* viewable, bool bIsMarked);
-        void hideMarker() { this->marker_->hide(); }
         float getRadarSensitivity() { return 1.0f; }
         void radarTick(float dt);
@@ -124 +66 @@
         std::map<RadarViewable::Shape, std::string> shapeMaterials_;
 
-        Ogre::PanelOverlayElement* background_;
-        std::map<RadarViewable*, Ogre::PanelOverlayElement*> radarDots_;
+        std::vector<Ogre::PanelOverlayElement*> radarDots_;
+        std::vector<Ogre::PanelOverlayElement*>::iterator itRadarDots_;
         Ogre::PanelOverlayElement* marker_;
 

code/branches/hud/src/orxonox/overlays/hud/HUDSpeedBar.cc

@@ -21 +21 @@
  *
  *   Author:
+ *      Felix Schulthess
  *      Reto Grieder
  *   Co-authors:

code/branches/hud/src/orxonox/overlays/hud/HUDSpeedBar.h

@@ -21 +21 @@
  *
  *   Author:
+ *      Felix Schulthess
  *      Reto Grieder
  *   Co-authors:

code/branches/hud/src/orxonox/tools/TextureGenerator.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      Reto Grieder
+ *      ...
  *
  */
@@ -29 +29 @@
 /**
     @file
-    @brief Implementation of the Settings class.
+    @brief Implementation of the TextureGenerator.
 */
 

code/branches/hud/visual_studio/vc8/orxonox.vcproj

@@ -189 +189 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\RadarListener.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\RadarViewable.cc"
                                 >
@@ -534 +538 @@
                         <File
                                 RelativePath="..\..\src\orxonox\Radar.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\RadarListener.h"
                                 >
                         </File>