Changeset 8994 in orxonox.OLD

Timestamp:

Jul 2, 2006, 5:38:44 AM (18 years ago)

Author:

bensch

Message:

compiling radar

Location:

trunk/src

Files:

• util/hud.cc (modified) (3 diffs)
• util/hud.h (modified) (3 diffs)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/elements/glgui_radar.cc (modified) (1 diff)

trunk/src/util/hud.cc

@@ -26 +26 @@
 #include "glgui_inputline.h"
 #include "specials/glgui_notifier.h"
+#include "elements/glgui_radar.h"
 
 /**
@@ -49 +50 @@
   notifier->setAbsCoor2D(100,100);
 
+  this->radar = new OrxGui::GLGuiRadar();
+
   this->subscribeEvent(ES_ALL, EV_VIDEO_RESIZE);
 
@@ -62 +65 @@
   delete this->inputLine;
   delete this->notifier;
+
+  delete this->radar;
   // delete what has to be deleted here
 }

trunk/src/util/hud.h

@@ -9 +9 @@
 #include "element_2d.h"
 #include "event_listener.h"
+
+
 // FORWARD DECLARATION
-class TiXmlElement;
-
 class WeaponManager;
 namespace OrxGui {
@@ -17 +17 @@
   class GLGuiNotifier;
   class GLGuiInputLine;
-
+  class GLGuiRadar;
 }
 
@@ -62 +62 @@
   OrxGui::GLGuiNotifier*   notifier;
   OrxGui::GLGuiInputLine*  inputLine;
+  OrxGui::GLGuiRadar*      radar;
 
   WeaponManager*           weaponManager;

trunk/src/world_entities/Makefile.am

@@ -32 +32 @@
                 \
                 \
-                elements/glgui_energywidget.cc \
-                elements/glgui_radar.cc
-
+                elements/glgui_energywidget.cc
 
 
@@ -66 +64 @@
                 \
                 elements/glgui_energywidget.h \
-                elements/glgui_radar.h \
                 \
                 \

trunk/src/world_entities/WorldEntities.am

@@ -56 +56 @@
                 world_entities/elements/image_entity.cc \
                 world_entities/elements/text_element.cc \
+                world_entities/elements/glgui_radar.cc \
                 \
                 world_entities/effects/lightning_bolt.cc \
@@ -115 +116 @@
                 elements/image_entity.h \
                 elements/text_element.h \
+                elements/glgui_radar.h \
                 \
                 effects/lightning_bolt.h \

trunk/src/world_entities/elements/glgui_radar.cc

@@ -115 +115 @@
   void GLGuiRadar::draw() const
   {
+    this->beginDraw();
+    GLGuiWidget::draw();
+
     for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
     {
+      glColor4fv(&_dotLists[i].dotColor[0]);
       for (unsigned int j = 0; j < this->_dotLists[i].positions.size(); ++j)
       {
+        glBegin(GL_POINTS);
+
+        glVertex2f(this->_dotLists[i].positions[i].x, this->_dotLists[i].positions[i].y);
+
+        glEnd();
       }
     }
+
+    this->endDraw();
   }