Changeset 8996 in orxonox.OLD for trunk

Timestamp:

Jul 2, 2006, 6:25:54 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: RADAR RENDERS

Location:

trunk/src

Files:

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

trunk/src/util/hud.cc

@@ -27 +27 @@
 #include "specials/glgui_notifier.h"
 #include "elements/glgui_radar.h"
+
+
+
+/// HACK
+#include "player.h"
+#include "playable.h"
 
 /**
@@ -128 +134 @@
 
   this->updateWeaponManager();
-//  this->updateResolution();
+  //  this->updateResolution();
 }
 
@@ -174 +180 @@
   this->notifier->setWidgetSize(0.25 * this->resX, 0.6 * this->resY);
 
-  this->_radar->setAbsCoor2D(0.8 * this->resX, 0.1 * this->resY);
-  this->_radar->setWidgetSize(0.2 * this->resX, 0.2 * this->resY);
-  this->_radar->show();
+
+  if (State::getPlayer() && State::getPlayer()->getPlayable() && State::getObjectManager())
+  {
+    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->setAbsCoor2D(0.8 * this->resX, 0.1 * this->resY);
+    this->_radar->setWidgetSize(0.2 * this->resX, 0.2 * this->resY);
+    this->_radar->show();
+  }
+
 
   if (this->energyWidget != NULL)

trunk/src/world_entities/elements/glgui_radar.cc

@@ -19 +19 @@
 #include "world_entity.h"
 
+#include "debug.h"
+
 namespace OrxGui
 {
@@ -25 +27 @@
    */
   GLGuiRadar::GLGuiRadar ()
-  {}
+  {
+    this->init();
+  }
 
 
@@ -78 +82 @@
     _timePassed+=dt;
 
-    if (_timePassed > _updateInterval)
+    //if (_timePassed > _updateInterval)
     {
-      _timePassed-=_updateInterval;
+      _timePassed = 0 ; //-=_updateInterval;
       this->updateRadar();
     }
@@ -104 +108 @@
         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);
+          this->_dotLists[i].positions.push_back(Vector2D(50, 50) + Vector2D(_centerNode->getAbsCoor().x - (*it)->getAbsCoor().x, _centerNode->getAbsCoor().y - (*it)->getAbsCoor().y)* (50.0 /_range));
         }
 
@@ -118 +122 @@
     GLGuiWidget::draw();
 
+    glPointSize(2.0f);
     for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
     {
@@ -124 +129 @@
       {
         glBegin(GL_POINTS);
-
-        glVertex2f(this->_dotLists[i].positions[i].x, this->_dotLists[i].positions[i].y);
-
+        glVertex2f(this->_dotLists[i].positions[j].x, this->_dotLists[i].positions[j].y);
         glEnd();
       }

trunk/src/world_entities/elements/glgui_radar.h

@@ -42 +42 @@
     void updateRadar();
 
-    void tick(float dt);
+    virtual void tick(float dt);
     void draw() const;