#include <string>
#include <memory>
-//#include <stdint.h>
+#include <stdint.h>
-//#include "obstack/obstack.h"
-//#include "math/vector.hpp"
-//#include "math/rect.hpp"
-#include "drawing_request.hpp"
-#include "font.hpp"
+#include "obstack/obstack.h"
+#include "math/vector.hpp"
+#include "math/rect.hpp"
#include "color.hpp"
-
-#include <unison/video/Texture.hpp>
-#include <unison/video/Window.hpp>
-#include <unison/video/DisplayList.hpp>
-
-class Vector;
-class Rect;
+#include "font.hpp"
+#include "drawing_request.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
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();
}
};
- 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;
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 */
};