Changeset 9000 in orxonox.OLD for trunk

Timestamp:

Jul 2, 2006, 6:43:15 AM (18 years ago)

Author:

bensch

Message:

nicer, better radar

Location:

trunk/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.cc (modified) (3 diffs)

trunk/src/util/hud.cc

@@ -185 +185 @@
     printf("UPDATING RADAR\n");
     this->_radar->setCenterNode(State::getPlayer()->getPlayable());
-    this->_radar->addEntityList(&State::getObjectManager()->getObjectList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color::red);
+    this->_radar->addEntityList(&State::getObjectManager()->getObjectList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color(.4, .4, 1.0));
     this->_radar->setAbsCoor2D(0.8 * this->resX, 0.1 * this->resY);
     this->_radar->setWidgetSize(0.2 * this->resX, 0.2 * this->resY);

trunk/src/world_entities/elements/glgui_radar.cc

@@ -53 +53 @@
   void GLGuiRadar::addEntityList(const std::list<WorldEntity*>* entityList, const Color& color)
   {
+    for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
+      if (_dotLists[i].entityList == entityList)
+        return;
+
     GLGuiRadar::DotList dotList;
     dotList.dotColor = color;
@@ -108 +112 @@
         if (_centerNode->distance(*it) < this->_range)
         {
-          this->_dotLists[i].positions.push_back(Vector2D(this->getSizeX2D() / 2.0f, this->getSizeY2D() / 2.0f) + Vector2D(_centerNode->getAbsCoor().x - (*it)->getAbsCoor().x, _centerNode->getAbsCoor().z - (*it)->getAbsCoor().z)* (this->getSizeX2D() / 2.0f /_range));
+          this->_dotLists[i].positions.push_back(Vector2D(this->getSizeX2D() / 2.0f, this->getSizeY2D() / 2.0f) + Vector2D((_centerNode->getAbsCoor().x - (*it)->getAbsCoor().x) * this->getSizeX2D(), (_centerNode->getAbsCoor().z - (*it)->getAbsCoor().z) * this->getSizeY2D())/ (2.0f * _range));
         }
 
@@ -133 +137 @@
       }
     }
-
     this->endDraw();
   }