Changeset 1609

Timestamp:

Jun 17, 2008, 11:38:23 PM (16 years ago)

Author:

rgrieder

Message:

svn save, just in case…
(doesn't compile at all!)

Location:

code/branches/hud

Files:

• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/Radar.cc (added)
• src/orxonox/Radar.h (added)
• src/orxonox/objects/WorldEntity.h (modified) (2 diffs)
• src/orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• src/orxonox/overlays/hud/HUDBar.cc (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDRadar.cc (modified) (7 diffs)
• src/orxonox/overlays/hud/HUDRadar.h (modified) (2 diffs)
• src/orxonox/overlays/hud/OverlayElementFactories.h (deleted)
• src/orxonox/overlays/hud/RadarViewable.cc (added)
• src/orxonox/overlays/hud/RadarViewable.h (added)
• src/orxonox/tools/TextureGenerator.cc (added)
• src/orxonox/tools/TextureGenerator.h (added)
• src/util/Math.cc (modified) (2 diffs)
• src/util/Math.h (modified) (2 diffs)
• src/util/UtilPrereqs.h (modified) (1 diff)
• visual_studio/orxonox_vc8.suo (modified) (previous)
• visual_studio/vc8/orxonox.vcproj (modified) (6 diffs)

code/branches/hud/src/orxonox/CMakeLists.txt

@@ -3 +3 @@
   Main.cc
   Orxonox.cc
+  Radar.cc
   Settings.cc
 
@@ -18 +19 @@
   overlays/hud/HUDText.cc
   overlays/hud/RadarObject.cc
+  overlays/hud/RadarViewable.cc
 
   tolua/tolua_bind.cc

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

@@ -76 +76 @@
   class Orxonox;
 
+  class RadarViewable;
+  class Radar;
+  class RadarListener;
+
   // objects
   class Ambient;

code/branches/hud/src/orxonox/objects/WorldEntity.h

@@ -73 +73 @@
             inline const Vector3& getPosition() const
                 { return this->node_->getPosition(); }
+            inline const Vector3& getWorldPosition() const
+                { return this->node_->getWorldPosition(); }
 
             inline void translate(const Vector3 &d, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
@@ -100 +102 @@
             inline const Ogre::Quaternion& getOrientation()
               { return this->node_->getOrientation(); }
+            inline const Ogre::Quaternion& getWorldOrientation()
+              { return this->node_->getWorldOrientation(); }
             inline void setOrientation(const Ogre::Quaternion& quat)
               { this->node_->setOrientation(quat); }

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

@@ -70 +70 @@
     BaseObject::XMLPort(xmlElement, mode);
 
+    XMLPortParam(OverlayGroup, "scale", scale, getScale, xmlElement, mode);
     XMLPortObject(OverlayGroup, OrxonoxOverlay, "", addElement, getElement, xmlElement, mode, false, true);
-    XMLPortParam(OverlayGroup, "scale", scale, getScale, xmlElement, mode);
   }
 

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

@@ -79 +79 @@
             // create background
             this->background_ = static_cast<PanelOverlayElement*>(
-                    OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background"));
+                    OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background_" + getUniqueNumberStr()));
             this->background_->setMaterialName("Orxonox/BarBackground");
             this->overlay_->add2D(this->background_);
@@ -93 +93 @@
 
             // create bar
-            this->bar_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "Bar"));
+            this->bar_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "Bar" + getUniqueNumberStr()));
             this->bar_->setMaterialName(materialname);
             this->background_->addChild(bar_);

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

@@ -32 +32 @@
 #include <assert.h>
 #include <OgreOverlayManager.h>
+#include <OgreMaterialManager.h>
 
 #include "core/ConsoleCommand.h"
-#include "util/Math.h"
 #include "objects/SpaceShip.h"
 #include "objects/WorldEntity.h"
-#include "RadarObject.h"
+#include "RadarViewable.h"
 
 namespace orxonox
 {
     CreateFactory(HUDRadar);
+    CreateFactory(RadarColour);
+    CreateFactory(RadarShape);
 
     HUDRadar* HUDRadar::instance_s = 0;
@@ -62 +64 @@
             if (this->background_)
                 OverlayManager::getSingleton().destroyOverlayElement(this->background_);
+            while (this->radarDots_.size() > 0)
+            {
+                OverlayManager::getSingleton().destroyOverlayElement(this->radarDots_[this->radarDots_.size() - 1]);
+                this->radarDots_.pop_back();
+            }
         }
 
@@ -70 +77 @@
     {
         OrxonoxOverlay::XMLPort(xmlElement, mode);
+
+        XMLPortObject(HUDRadar, RadarColour, "shapes", addShape, getShape, xmlElement, mode, false, true);
 
         if (mode == XMLPort::LoadObject)
@@ -77 +86 @@
             overlay_->add2D(background_);
 
-            WorldEntity* object;
+            // create an array of all possible materials
+            unsigned int iMaterial = 0;
+            for (std::map<unsigned int, RadarShape*>::const_iterator itShape = shapes_.begin(); itShape != shapes_.end(); ++itShape)
+            {
+                Ogre::MaterialPtr originalMaterial = (Ogre::MaterialPtr)(Ogre::MaterialManager::getSingleton().getByName((*itShape).second->getAttribute()));
+                for (std::map<unsigned int, RadarColour*>::const_iterator itColour = colours_.begin(); itColour != colours_.end(); ++itColour)
+                {
+                    Ogre::MaterialPtr newMaterial = originalMaterial->clone((*itShape).second->getAttribute() + convertToString(iMaterial++));
+                    newMaterial->getTechnique(0)->getPass(0)->setAmbient((*itColour).second->getAttribute()); 
+                    materialNames_[(*itShape).first + ((*itColour).first << 8)] = newMaterial->getName();
+                }
+            }
+
+            /*WorldEntity* object;
             object = new WorldEntity();
             object->setPosition(2000.0, 0.0, 0.0);
@@ -89 +111 @@
             object = new WorldEntity();
             object->setPosition(10000.0,16000.0,0.0);
-            addRadarObject(object);
-        }
-
+            addRadarObject(object);*/
+        }
+    }
+
+    void HUDRadar::addColour(RadarColour* colour)
+    {
+        this->colours_[colour->getIndex()] = colour;
+    }
+
+    RadarColour* HUDRadar::getColour(unsigned int index) const
+    {
+        if (index < this->colours_.size())
+        {
+            std::map<unsigned int, RadarColour*>::const_iterator it = colours_.begin();
+            for (unsigned int i = 0; i != index; ++it, ++i)
+                ;
+            return (*it).second;
+        }
+        else
+            return 0;
+    }
+
+    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;
     }
 
@@ -97 +154 @@
     {
         // iterate through all RadarObjects
-        for(std::list<RadarObject*>::iterator it = getRadarObjects().begin(); it!= getRadarObjects().end(); it++)
-        {
-            // calc position on radar...
-            // set size to fit distance...
-            float size = 1.0/(((*it)->getPosition() - SpaceShip::getLocalShip()->getPosition()).length());
-            size = clamp(size * 100.0f, 0.02f, 0.12f);
-            (*it)->getPanel()->setDimensions(size, size);
-
-            Vector2 coord = get2DViewcoordinates(SpaceShip::getLocalShip()->getPosition(), SpaceShip::getLocalShip()->getDir(), SpaceShip::getLocalShip()->getOrth(), (*it)->getPosition());
-            coord *= Ogre::Math::PI / 3.5; // small adjustment to make it fit the texture
-            (*it)->getPanel()->setPosition((1.0 + coord.x) * 0.5, (1.0 - coord.y) * 0.5);
+        unsigned int i = 0;
+        for (Iterator<RadarViewable> it = ObjectList<RadarViewable>::start(); it; ++it, ++i)
+        {
+            if ((*it)->isVisibleOnRadar())
+            {
+                WorldEntity* object = (*it)->getWorldEntity();
+                // Just to be sure that we actually have a WorldEntity
+                // We could do a dynamic_cast, but that's a lot slower
+                assert(object);
+
+                // set size to fit distance...
+                float size = 1.0/((object->getWorldPosition() - SpaceShip::getLocalShip()->getPosition()).length());
+                size = clamp(size * 100.0f, 0.02f, 0.12f);
+                if (i == radarDots_.size())
+                {
+                    // we have to create a new panel
+                    radarDots_.push_back(static_cast<Ogre::PanelOverlayElement*>(
+                        Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "RadarDot" + convertToString(i))));
+                }
+                radarDots_[i]->setDimensions(size, size);
+
+                // calc position on radar...
+                Vector2 coord = get2DViewcoordinates(SpaceShip::getLocalShip()->getPosition(), SpaceShip::getLocalShip()->getDir(), SpaceShip::getLocalShip()->getOrth(), object->getWorldPosition());
+                coord *= Ogre::Math::PI / 3.5; // small adjustment to make it fit the texture
+                radarDots_[i]->setPosition((1.0 + coord.x) * 0.5, (1.0 - coord.y) * 0.5);
+
+                // apply the right material
+                RadarPoint description = (*it)->getDescription();
+                radarDots_[i]->setMaterialName(materialNames_[description.shape_ + (description.colour_ << 8)]);
+            }
         }
     }
@@ -113 +189 @@
     void HUDRadar::listObjects()
     {
-        int i = 0;
         COUT(3) << "List of RadarObjects:\n";
         // iterate through all Radar Objects
-        for(std::list<RadarObject*>::const_iterator it = getRadarObjects().begin(); it != getRadarObjects().end(); ++it)
-        {
-            COUT(3) << i++ << ": " << (*it)->getPosition() << std::endl;
-        }
-    }
-
-    void HUDRadar::addRadarObject(WorldEntity* object, const ColourValue& colour)
-    {
-        RadarObject* obj = new RadarObject(overlay_, object, colour);
-        roSet_.insert(roSet_.end(), obj);
-    }
-
-    void HUDRadar::removeRadarObject(WorldEntity* object)
-    {
-        for(std::list<RadarObject*>::iterator it=roSet_.begin(); it!=roSet_.end(); ++it)
-        {
-            if ((*it)->getObject() == object)
-            {
-                /*if (this->nav_ && this->nav_->getFocus() == (*it))
-                    this->nav_->releaseFocus();*/
-
-                delete (*it);
-                roSet_.erase(it);
-                return;
-            }
+        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

@@ -36 +36 @@
 #include "overlays/OrxonoxOverlay.h"
 #include "objects/Tickable.h"
+#include "core/BaseObject.h"
+#include "util/Math.h"
+#include "core/Debug.h"
+#include "Radar.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public Tickable
+    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 Tickable, public RadarListener
     {
       public:
@@ -47 +100 @@
         void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
+        void addShape(RadarShape* shape);
+        RadarShape* getShape(unsigned int index) const;
+
         void tick(float dt);
 
         void listObjects();
 
-        inline std::list<RadarObject*>& getRadarObjects()
-            { return this->roSet_; }
+      private:
+        void addColour(RadarColour* colour);
+        RadarColour* getColour(unsigned int index) const;
 
-        void addRadarObject(WorldEntity* object, const ColourValue& colour = ColourValue(0.5, 0.5, 0.5, 1));
-        void removeRadarObject(WorldEntity* object);
+        std::map<unsigned int, std::string> materialNames_;
+        std::map<unsigned int, RadarColour*> colours_;
+        std::map<unsigned int, RadarShape*> shapes_;
 
-        static HUDRadar& getInstance();
-
-      private:
-        HUDRadar(HUDRadar& instance);
-
-        std::list<RadarObject*> roSet_;
         Ogre::PanelOverlayElement* background_;
-
-        static HUDRadar* instance_s;
+        std::map<RadarViewable*, Ogre::PanelOverlayElement*> radarDots_;
     };
 }

code/branches/hud/src/util/Math.cc

@@ -30 +30 @@
 
 #include "Math.h"
+#include "Convert.h"
 
 /**
@@ -123 +124 @@
     return (targetposition + targetvelocity * time);
 }
+
+unsigned long getUniqueNumber()
+{
+    static unsigned long aNumber = 135;
+    return aNumber++;
+}
+
+std::string getUniqueNumberStr()
+{
+    return convertToString(getUniqueNumber());
+}

code/branches/hud/src/util/Math.h

@@ -33 +33 @@
 
 #include <ostream>
+#include <string>
 
 #include <OgreMath.h>
@@ -163 +164 @@
 }
 
+_UtilExport unsigned long getUniqueNumber();
+_UtilExport std::string getUniqueNumberStr();
+
 class _UtilExport IntVector2
 {

code/branches/hud/src/util/UtilPrereqs.h

@@ -61 +61 @@
 //-----------------------------------------------------------------------
 class ArgReader;
-class Convert;
 class MultiTypePrimitive;
 class MultiTypeString;

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

@@ -185 +185 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\Radar.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\Settings.cc"
                                 >
@@ -393 +397 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\tools\ParticleInterface.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\tools\TextureGenerator.cc"
                                         >
                                 </File>
@@ -480 +488 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\RadarObject.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\RadarViewable.cc"
                                                 >
                                         </File>
@@ -507 +519 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\Radar.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\Settings.h"
                                 >
@@ -622 +638 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\tools\TextureGenerator.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.h"
                                         >
@@ -686 +706 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\RadarObject.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\RadarViewable.h"
                                                 >
                                         </File>