Changeset 8993 in orxonox.OLD for trunk

Timestamp:

Jul 2, 2006, 5:30:14 AM (18 years ago)

Author:

bensch

Message:

radar should provide the right data now

Location:

trunk/src/world_entities/elements

Files:

• glgui_radar.cc (modified) (6 diffs)
• glgui_radar.h (modified) (3 diffs)

trunk/src/world_entities/elements/glgui_radar.cc

@@ -17 +17 @@
 
 #include "glgui_radar.h"
+#include "world_entity.h"
 
 namespace OrxGui
@@ -24 +25 @@
    */
   GLGuiRadar::GLGuiRadar ()
-  {
-  }
+  {}
 
 
@@ -32 +32 @@
    */
   GLGuiRadar::~GLGuiRadar ()
+  {}
+
+  void GLGuiRadar::init()
   {
+    this->_updateInterval = 1.0f;
+    this->_timePassed = 0.0f;
+    this->_range = 100.0f;
+    this->_centerNode = NULL;
   }
 
+  void GLGuiRadar::setCenterNode(const PNode* center)
+  {
+    this->_centerNode = center;
+  }
+
+  void GLGuiRadar::addEntityList(const std::list<WorldEntity*>* entityList, const Color& color)
+  {
+    GLGuiRadar::DotList dotList;
+    dotList.dotColor = color;
+    dotList.entityList = entityList;
+
+    this->_dotLists.push_back(dotList);
+  }
+
+  void GLGuiRadar::removeEntityList(const std::list<WorldEntity*>* entityList)
+  {
+    std::vector<DotList>::iterator it;
+    for (it = this->_dotLists.begin(); it != this->_dotLists.end(); ++it)
+      if ((*it).entityList == entityList)
+      {
+        this->_dotLists.erase(it);
+        break;
+      }
+  }
 
 
@@ -45 +76 @@
   void GLGuiRadar::tick(float dt)
   {
+    _timePassed+=dt;
 
+    if (_timePassed > _updateInterval)
+    {
+      _timePassed-=_updateInterval;
+      this->updateRadar();
+    }
+
+  }
+
+  void GLGuiRadar::updateRadar()
+  {
+    if (_centerNode == NULL)
+    {
+      for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
+        this->_dotLists[i].positions.clear();
+      return;
+    }
+
+    std::list<WorldEntity*>::const_iterator it;
+    for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
+    {
+      this->_dotLists[i].positions.clear();
+
+      for (it = _dotLists[i].entityList->begin(); it != _dotLists[i].entityList->end(); ++it)
+      {
+        if (_centerNode->distance(*it) < this->_range)
+        {
+          this->_dotLists[i].positions.push_back(Vector2D(50, 50) + Vector2D(_centerNode->getAbsCoor().x - (*it)->getAbsCoor().x, _centerNode->getAbsCoor().y - (*it)->getAbsCoor().y)/_range * 50);
+        }
+
+      }
+
+    }
   }
 
@@ -51 +115 @@
   void GLGuiRadar::draw() const
   {
-
-
+    for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
+    {
+      for (unsigned int j = 0; j < this->_dotLists[i].positions.size(); ++j)
+      {
+      }
+    }
   }
 
@@ -63 +131 @@
 
   void GLGuiRadar::showing()
-  {
-  }
+  {}
 
   void GLGuiRadar::hiding()
-  {
-  }
-}
+{}}

trunk/src/world_entities/elements/glgui_radar.h

@@ -9 +9 @@
 #include "glgui_widget.h"
 
+class PNode;
 class WorldEntity;
 
@@ -27 +28 @@
     virtual ~GLGuiRadar();
 
+    void addEntityList(const std::list<WorldEntity*>* entityList, const Color& color);
+    void removeEntityList(const std::list<WorldEntity*>* entityList);
+
     void setRange(float range);
 
+    void setCenterNode(const PNode* center);
     void setUpdateInterval(float updateInterval) { this->_updateInterval = updateInterval; };
     void setAttenuation(Attenuation attenuation);
 
+
     float range() const { return this->_range; }
 
+    void updateRadar();
 
     void tick(float dt);
@@ -44 +51 @@
 
   private:
+    void init();
+
+  private:
     typedef struct
     {
       Color                           dotColor;
-      const std::list<WorldEntity*>&  entityList;
-      std::vector<Vector2D>           position;
+      const std::list<WorldEntity*>*  entityList;
+      std::vector<Vector2D>           positions;
     }
     DotList;
 
-    std::vector<DotList>        _dotLists;
+    const PNode*                      _centerNode;
+    std::vector<DotList>              _dotLists;
 
-    Attenuation                 _attenuation;
-    float                       _range;
+    Attenuation                       _attenuation;
+    float                             _range;
 
 
-    float                       _updateInterval;
-    float                       _timePassed;
+    float                             _updateInterval;
+    float                             _timePassed;
   };
 }