Changeset 8992 in orxonox.OLD for trunk

Timestamp:

Jul 2, 2006, 5:00:49 AM (18 years ago)

Author:

bensch

Message:

more radar work

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.h (modified) (3 diffs)

trunk/src/lib/event/event_handler.cc

@@ -357 +357 @@
   else
   {
-//     SDL_WM_GrabInput(SDL_GRAB_ON);
-//     SDL_ShowCursor(SDL_DISABLE);
+     SDL_WM_GrabInput(SDL_GRAB_ON);
+     SDL_ShowCursor(SDL_DISABLE);
   }
 }

trunk/src/world_entities/elements/glgui_radar.cc

@@ -36 +36 @@
 
 
+
+  void GLGuiRadar::setAttenuation(Attenuation attenuation)
+  {
+    this->_attenuation = attenuation;
+  }
+
+
+  void GLGuiRadar::tick(float dt)
+  {
+
+  }
+
+
+  void GLGuiRadar::draw() const
+  {
+
+
+  }
+
+
   void GLGuiRadar::resize()
   {

trunk/src/world_entities/elements/glgui_radar.h

@@ -17 +17 @@
   class GLGuiRadar : public GLGuiWidget
   {
+  public:
+    typedef enum {
+      Linear,
+      Exponential,
+    } Attenuation;
 
   public:
@@ -23 +28 @@
 
     void setRange(float range);
+
+    void setUpdateInterval(float updateInterval) { this->_updateInterval = updateInterval; };
+    void setAttenuation(Attenuation attenuation);
+
     float range() const { return this->_range; }
+
+
+    void tick(float dt);
+    void draw() const;
 
   protected:
@@ -33 +46 @@
     typedef struct
     {
-
-      Color                     dotColor;
-      std::list<WorldEntity*>&  entityList;
-      std::vector<Vector2D>     position;
-    } DotList;
+      Color                           dotColor;
+      const std::list<WorldEntity*>&  entityList;
+      std::vector<Vector2D>           position;
+    }
+    DotList;
 
     std::vector<DotList>        _dotLists;
 
+    Attenuation                 _attenuation;
     float                       _range;
 
+
+    float                       _updateInterval;
+    float                       _timePassed;
   };
 }