- Use obstacks for memory allocation for lispfiles and DrawingRequests,

[supertux.git] / src / video / drawing_context.hpp

diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp
index a8c7e56..de882a7 100644 (file)
--- a/src/video/drawing_context.hpp
+++ b/src/video/drawing_context.hpp
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_DRAWINGCONTEXT_H
 #define SUPERTUX_DRAWINGCONTEXT_H
 
@@ -29,6 +28,7 @@
 #include <stdint.h>
 #include <memory>
 
+#include "obstack/obstack.h"
 #include "math/vector.hpp"
 #include "math/rect.hpp"
 #include "surface.hpp"
@@ -37,6 +37,7 @@
 
 class Surface;
 class Texture;
+struct DrawingRequest;
 
 // some constants for predefined layer values
 enum {
@@ -49,7 +50,8 @@ enum {
   LAYER_FOREGROUNDTILES = 200,
   LAYER_FOREGROUND0 = 300,
   LAYER_FOREGROUND1 = 400,
-  LAYER_GUI         = 500
+  LAYER_HUD = 500,
+  LAYER_GUI         = 600
 };
 
 class Blend
@@ -57,7 +59,7 @@ class Blend
 public:
   GLenum sfactor;
   GLenum dfactor;
-  
+
   Blend()
     : sfactor(GL_SRC_ALPHA), dfactor(GL_ONE_MINUS_SRC_ALPHA)
   {}
@@ -78,10 +80,10 @@ public:
   ~DrawingContext();
 
   /// Adds a drawing request for a surface into the request list.
-  void draw_surface(const Surface* surface, const Vector& position, 
+  void draw_surface(const Surface* surface, const Vector& position,
                     int layer);
   /// Adds a drawing request for a surface into the request list.
-  void draw_surface(const Surface* surface, const Vector& position, 
+  void draw_surface(const Surface* surface, const Vector& position,
                     float angle, const Color& color, const Blend& blend,
                     int layer);
   /// Adds a drawing request for part of a surface.
@@ -90,7 +92,7 @@ public:
   /// Draws a text.
   void draw_text(const Font* font, const std::string& text,
                  const Vector& position, FontAlignment alignment, int layer);
-  
+
   /// Draws text on screen center (feed Vector.x with a 0).
   /// This is the same as draw_text() with a SCREEN_WIDTH/2 position and
   /// alignment set to LEFT_ALLIGN
@@ -102,19 +104,19 @@ public:
   void draw_filled_rect(const Vector& topleft, const Vector& size,
                         const Color& color, int layer);
   void draw_filled_rect(const Rect& rect, const Color& color, int layer);
-  
+
   /// Processes all pending drawing requests and flushes the list.
   void do_drawing();
-  
+
   const Vector& get_translation() const
   {  return transform.translation;  }
-  
+
   void set_translation(const Vector& newtranslation)
   {  transform.translation = newtranslation;  }
-  
+
   void push_transform();
   void pop_transform();
-  
+
   /// Apply that effect in the next draws (effects are listed on surface.h).
   void set_drawing_effect(DrawingEffect effect);
   /// return currently applied drawing effect
@@ -124,13 +126,18 @@ public:
   /// return currently set alpha
   float get_alpha() const;
 
+  /// on next update, set color to lightmap's color at position
+  void get_light(const Vector& position, Color* color );
+
   enum Target {
     NORMAL, LIGHTMAP
   };
   void push_target();
   void pop_target();
   void set_target(Target target);
-  
+
+  void set_ambient_color( Color new_color );
+
 private:
   class Transform
   {
@@ -138,17 +145,17 @@ private:
     Vector translation;
     DrawingEffect drawing_effect;
     float alpha;
-    
+
     Transform()
       : drawing_effect(NO_EFFECT), alpha(1.0f)
     { }
-    
+
     Vector apply(const Vector& v) const
     {
       return v - translation;
     }
   };
-  
+
   /// the transform stack
   std::vector<Transform> transformstack;
   /// the currently active transform
@@ -156,75 +163,23 @@ private:
 
   std::vector<Blend> blend_stack;
   Blend blend_mode;
-  
-  enum RequestType
-  {
-    SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT
-  };
-  
-  struct SurfacePartRequest
-  {
-    const Surface* surface;
-    Vector source, size;
-  };
-  
-  struct TextRequest
-  {
-    const Font* font;
-    std::string text;
-    FontAlignment alignment;
-  };
-  
-  struct GradientRequest
-  {
-    Color top, bottom;
-    Vector size;
-  };
-  
-  struct FillRectRequest
-  {
-    Color color;
-    Vector size;
-  };
-  
-  struct DrawingRequest
-  {
-    RequestType type;
-    Vector pos;                
-    
-    int layer;
-    DrawingEffect drawing_effect;
-    float alpha;
-    Blend blend;
-    float angle;
-    Color color;
-
-    void* request_data;
-
-    DrawingRequest()
-      : angle(0.0f),
-        color(1.0f, 1.0f, 1.0f, 1.0f)
-    {}
-    
-    bool operator<(const DrawingRequest& other) const
-    {
-      return layer < other.layer;
-    }
-  };
 
-  typedef std::vector<DrawingRequest> DrawingRequests;
-  
-  void handle_drawing_requests(DrawingRequests& requests);
-  void draw_surface_part(DrawingRequest& request);
-  void draw_text(DrawingRequest& request);
-  void draw_text_center(DrawingRequest& request);
-  void draw_gradient(DrawingRequest& request);
-  void draw_filled_rect(DrawingRequest& request);
-  
+  typedef std::vector<DrawingRequest*> DrawingRequests;
+
+  void handle_drawing_requests(DrawingRequests& requests) const;
+  void draw_surface_part(const DrawingRequest& request) const;
+  void draw_text(const DrawingRequest& request) const;
+  void draw_text_center(const DrawingRequest& request) const;
+  void draw_gradient(const DrawingRequest& request) const;
+  void draw_filled_rect(const DrawingRequest& request) const;
+  void draw_lightmap(const DrawingRequest& request) const;
+  void get_light(const DrawingRequest& request) const;
+
   DrawingRequests drawing_requests;
   DrawingRequests lightmap_requests;
 
   DrawingRequests* requests;
+  Color ambient_color;
 
   SDL_Surface* screen;
   Target target;
@@ -232,6 +187,10 @@ private:
   Texture* lightmap;
   int lightmap_width, lightmap_height;
   float lightmap_uv_right, lightmap_uv_bottom;
+
+  /* obstack holding the memory of the drawing requests */
+  struct obstack obst;
 };
 
 #endif
+