Remove bogus assert

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

diff --git a/src/video/drawing_request.hpp b/src/video/drawing_request.hpp
index 1007ab9..60043c9 100644 (file)
--- a/src/video/drawing_request.hpp
+++ b/src/video/drawing_request.hpp
@@ -23,80 +23,107 @@
 
 #include <stdint.h>
 
+#include "math/rectf.hpp"
+#include "math/sizef.hpp"
 #include "math/vector.hpp"
 #include "video/color.hpp"
+#include "video/drawing_context.hpp"
 #include "video/font.hpp"
 #include "video/glutil.hpp"
 
 class Surface;
 
-// 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
+enum RequestType
+{
+  SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT, INVERSEELLIPSE, DRAW_LIGHTMAP, GETLIGHT
 };
 
-class Blend
+struct DrawingRequestData
 {
-public:
-  GLenum sfactor;
-  GLenum dfactor;
-
-  Blend()
-    : sfactor(GL_SRC_ALPHA), dfactor(GL_ONE_MINUS_SRC_ALPHA)
+  virtual ~DrawingRequestData()
   {}
+};
 
-  Blend(GLenum s, GLenum d)
-    : sfactor(s), dfactor(d)
+struct SurfaceRequest : public DrawingRequestData
+{
+  SurfaceRequest() :
+    surface()
   {}
-};
 
-enum Target {
-  NORMAL, LIGHTMAP
-};
+  const Surface* surface;
 
-enum RequestType
-{
-  SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT, INVERSEELLIPSE, DRAW_LIGHTMAP, GETLIGHT
+private:
+  SurfaceRequest(const SurfaceRequest&) = delete;
+  SurfaceRequest& operator=(const SurfaceRequest&) = delete;
 };
 
-struct SurfacePartRequest
+struct SurfacePartRequest : public DrawingRequestData
 {
+  SurfacePartRequest() :
+    surface(),
+    srcrect(),
+    dstsize()
+  {}
+
   const Surface* surface;
-  Vector source, size;
+  Rectf srcrect;
+  Sizef dstsize;
+
+private:
+  SurfacePartRequest(const SurfacePartRequest&) = delete;
+  SurfacePartRequest& operator=(const SurfacePartRequest&) = delete;
 };
 
-struct TextRequest
+struct TextRequest : public DrawingRequestData
 {
+  TextRequest() :
+    font(),
+    text(),
+    alignment()
+  {}
+
   const Font* font;
   std::string text;
   FontAlignment alignment;
+
+private:
+  TextRequest(const TextRequest&);
+  TextRequest& operator=(const TextRequest&);
 };
 
-struct GradientRequest
+struct GradientRequest : public DrawingRequestData
 {
-  Color top, bottom;
+  GradientRequest()  :
+    top(),
+    bottom(),
+    size()
+  {}
+
+  Color top;
+  Color bottom;
   Vector size;
 };
 
-struct FillRectRequest
+struct FillRectRequest : public DrawingRequestData
 {
+  FillRectRequest() :
+    color(),
+    size(),
+    radius()
+  {}
+
   Color  color;
   Vector size;
   float  radius;
 };
 
-struct InverseEllipseRequest
+struct InverseEllipseRequest : public DrawingRequestData
 {
+  InverseEllipseRequest() :
+    color(),
+    size()
+  {}
+
   Color  color;
   Vector size;
 };
@@ -114,7 +141,7 @@ struct DrawingRequest
   float angle;
   Color color;
 
-  void* request_data;
+  DrawingRequestData* request_data;
 
   DrawingRequest() :
     target(),
@@ -135,9 +162,15 @@ struct DrawingRequest
   }
 };
 
-struct GetLightRequest
+struct GetLightRequest : public DrawingRequestData
 {
+  GetLightRequest() : color_ptr() {}
+
   Color* color_ptr;
+
+private:
+  GetLightRequest(const GetLightRequest&) = delete;
+  GetLightRequest& operator=(const GetLightRequest&) = delete;
 };
 
 #endif