Delayed root hatching

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

diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp
index df31225..296ea8e 100644 (file)
--- a/src/video/drawing_context.hpp
+++ b/src/video/drawing_context.hpp
@@ -16,19 +16,19 @@
 //  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
 
 #include <vector>
 #include <string>
+#include <memory>
+
 #include <stdint.h>
 
 #include <GL/gl.h>
-#include <SDL.h>
-#include <stdint.h>
-#include <memory>
+#include <SDL_video.h>
 
+#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
@@ -124,6 +126,9 @@ 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
   };
@@ -131,6 +136,13 @@ public:
   void pop_target();
   void set_target(Target target);
 
+  void set_ambient_color( Color new_color );
+
+  /**
+   * requests that a screenshot be taken after the next frame has been rendered
+   */
+  void take_screenshot();
+
 private:
   class Transform
   {
@@ -157,74 +169,23 @@ private:
   std::vector<Blend> blend_stack;
   Blend blend_mode;
 
-  enum RequestType
-  {
-    SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT
-  };
+  typedef std::vector<DrawingRequest*> DrawingRequests;
 
-  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);
+  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;
+  void do_take_screenshot();
 
   DrawingRequests drawing_requests;
   DrawingRequests lightmap_requests;
 
   DrawingRequests* requests;
+  Color ambient_color;
 
   SDL_Surface* screen;
   Target target;
@@ -232,6 +193,12 @@ 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;
+
+  bool screenshot_requested; /**< true if a screenshot should be taken after the next frame has been rendered */
 };
 
 #endif
+