X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Fdrawing_context.hpp;h=46f6d27bb0934087597bd6c17ddc3a47fc2e3fcd;hb=38105c22495d9439b30221732dd5d7b89f328a0c;hp=b742b37262929b22ae82d0b38a7bcaa5cfd040b4;hpb=a93bdf2bb864dc6ba7f9722b151e432fcab57240;p=supertux.git

diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp
index b742b3726..46f6d27bb 100644
--- a/src/video/drawing_context.hpp
+++ b/src/video/drawing_context.hpp
@@ -21,53 +21,25 @@
 
 #include <vector>
 #include <string>
-#include <stdint.h>
+#include <memory>
 
-#include <GL/gl.h>
-#include <SDL.h>
 #include <stdint.h>
-#include <memory>
 
+#include <SDL_video.h>
+
+#include "glutil.hpp"
 #include "obstack/obstack.h"
 #include "math/vector.hpp"
 #include "math/rect.hpp"
-#include "surface.hpp"
+#include "drawing_request.hpp"
 #include "font.hpp"
 #include "color.hpp"
 
 class Surface;
 class Texture;
 struct DrawingRequest;
-
-// some constants for predefined layer values
-enum {
-  LAYER_BACKGROUND0 = -300,
-  LAYER_BACKGROUND1 = -200,
-  LAYER_BACKGROUNDTILES = -100,
-  LAYER_TILES = 0,
-  LAYER_OBJECTS = 50,
-  LAYER_FLOATINGOBJECTS = 150,
-  LAYER_FOREGROUNDTILES = 200,
-  LAYER_FOREGROUND0 = 300,
-  LAYER_FOREGROUND1 = 400,
-  LAYER_HUD = 500,
-  LAYER_GUI         = 600
-};
-
-class Blend
-{
-public:
-  GLenum sfactor;
-  GLenum dfactor;
-
-  Blend()
-    : sfactor(GL_SRC_ALPHA), dfactor(GL_ONE_MINUS_SRC_ALPHA)
-  {}
-
-  Blend(GLenum s, GLenum d)
-    : sfactor(s), dfactor(d)
-  {}
-};
+class Renderer;
+class Lightmap;
 
 /**
  * This class provides functions for drawing things on screen. It also
@@ -79,6 +51,8 @@ public:
   DrawingContext();
   ~DrawingContext();
 
+  void init_renderer();
+
   /// Adds a drawing request for a surface into the request list.
   void draw_surface(const Surface* surface, const Vector& position,
                     int layer);
@@ -95,7 +69,7 @@ public:
 
   /// 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
+  /// alignment set to LEFT_ALIGN
   void draw_center_text(const Font* font, const std::string& text,
                         const Vector& position, int layer);
   /// Draws a color gradient onto the whole screen */
@@ -104,6 +78,9 @@ 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);
+  void draw_filled_rect(const Rect& rect, const Color& color, float radius, int layer);
+
+  void draw_inverse_ellipse(const Vector& pos, const Vector& size, const Color& color, int layer);
 
   /// Processes all pending drawing requests and flushes the list.
   void do_drawing();
@@ -129,9 +106,9 @@ public:
   /// on next update, set color to lightmap's color at position
   void get_light(const Vector& position, Color* color );
 
-  enum Target {
-    NORMAL, LIGHTMAP
-  };
+  typedef ::Target Target;
+  static const Target NORMAL = ::NORMAL;
+  static const Target LIGHTMAP = ::LIGHTMAP;
   void push_target();
   void pop_target();
   void set_target(Target target);
@@ -161,6 +138,9 @@ private:
     }
   };
 
+  Renderer *renderer;
+  Lightmap *lightmap;
+
   /// the transform stack
   std::vector<Transform> transformstack;
   /// the currently active transform
@@ -171,15 +151,7 @@ private:
 
   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;
-  void do_take_screenshot();
+  void handle_drawing_requests(DrawingRequests& requests);
 
   DrawingRequests drawing_requests;
   DrawingRequests lightmap_requests;
@@ -187,12 +159,8 @@ private:
   DrawingRequests* requests;
   Color ambient_color;
 
-  SDL_Surface* screen;
   Target target;
   std::vector<Target> target_stack;
-  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;