Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp
index 28b15fc..a8b7fc4 100644 (file)
--- a/src/video/drawing_context.hpp
+++ b/src/video/drawing_context.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,36 +12,29 @@
 //  GNU General Public License for more details.
 //
 //  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
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <vector>
-#include <string>
-#include <memory>
+#ifndef HEADER_SUPERTUX_VIDEO_DRAWING_CONTEXT_HPP
+#define HEADER_SUPERTUX_VIDEO_DRAWING_CONTEXT_HPP
 
-//#include <stdint.h>
-
-//#include "obstack/obstack.h"
-//#include "math/vector.hpp"
-//#include "math/rect.hpp"
-#include "drawing_request.hpp"
-#include "font.hpp"
-#include "color.hpp"
+#include <memory>
+#include <string>
+#include <vector>
 
-#include <unison/video/Texture.hpp>
-#include <unison/video/Window.hpp>
-#include <unison/video/DisplayList.hpp>
+#include <stdint.h>
 
-class Vector;
-class Rect;
+#include "math/rect.hpp"
+#include "math/vector.hpp"
+#include "obstack/obstack.h"
+#include "video/color.hpp"
+#include "video/drawing_request.hpp"
+#include "video/font.hpp"
+#include "video/texture.hpp"
 
 class Surface;
-/*class Texture;
-struct DrawingRequest;
+class Texture;
 class Renderer;
-class Lightmap;*/
+class Lightmap;
 
 /**
  * This class provides functions for drawing things on screen. It also
@@ -69,19 +60,22 @@ public:
                          const Vector& size, const Vector& dest, int layer);
   /// Draws a text.
   void draw_text(const Font* font, const std::string& text,
-                 const Vector& position, FontAlignment alignment, int layer);
+                 const Vector& position, FontAlignment alignment, int layer, Color color = Color(1.0,1.0,1.0));
 
   /// 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);
+                        const Vector& position, int layer, Color color = Color(1.0,1.0,1.0));
   /// Draws a color gradient onto the whole screen */
   void draw_gradient(const Color& from, const Color& to, int layer);
   /// Fills a rectangle.
   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,8 +123,10 @@ private:
     DrawingEffect drawing_effect;
     float alpha;
 
-    Transform()
-      : drawing_effect(NO_EFFECT), alpha(1.0f)
+    Transform() :
+      translation(),
+      drawing_effect(NO_EFFECT), 
+      alpha(1.0f)
     { }
 
     Vector apply(const Vector& v) const
@@ -139,15 +135,8 @@ private:
     }
   };
 
-  Unison::Video::Surface lightmap;
-  std::vector<std::pair<Unison::Video::Point, Color *> > get_light_requests;
-
-  std::map<int, Unison::Video::DisplayList> normal_list;
-  std::map<int, Unison::Video::DisplayList> lightmap_list;
-  std::map<int, Unison::Video::DisplayList> *draw_target;
-
-  //Renderer *renderer;
-  //Lightmap *lightmap;
+  Renderer *renderer;
+  Lightmap *lightmap;
 
   /// the transform stack
   std::vector<Transform> transformstack;
@@ -157,24 +146,29 @@ private:
   std::vector<Blend> blend_stack;
   Blend blend_mode;
 
-  /*typedef std::vector<DrawingRequest*> DrawingRequests;
+  typedef std::vector<DrawingRequest*> DrawingRequests;
 
   void handle_drawing_requests(DrawingRequests& requests);
 
   DrawingRequests drawing_requests;
   DrawingRequests lightmap_requests;
 
-  DrawingRequests* requests;*/
+  DrawingRequests* requests;
   Color ambient_color;
 
   Target target;
   std::vector<Target> target_stack;
 
   /* obstack holding the memory of the drawing requests */
-  //struct obstack obst;
+  struct obstack obst;
 
   bool screenshot_requested; /**< true if a screenshot should be taken after the next frame has been rendered */
+
+private:
+  DrawingContext(const DrawingContext&);
+  DrawingContext& operator=(const DrawingContext&);
 };
 
 #endif
 
+/* EOF */