X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Fdrawing_context.hpp;h=5f392ef0e7bfda86fbb5212d2d0dcb0cdcf29c13;hb=43db9a6c44b6ee544e7694d1bb234ba559b0849c;hp=fee4981867fb8c8b0bcb7619c12708412583c708;hpb=f7659d1e6e1268e6fec002e806a8a469408aa335;p=supertux.git diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp index fee498186..5f392ef0e 100644 --- a/src/video/drawing_context.hpp +++ b/src/video/drawing_context.hpp @@ -16,57 +16,26 @@ // 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 #include -#include +#include -#include -#include #include -#include +#include "obstack/obstack.h" #include "math/vector.hpp" #include "math/rect.hpp" -#include "surface.hpp" -#include "font.hpp" #include "color.hpp" +#include "font.hpp" +#include "drawing_request.hpp" class Surface; class Texture; - -// 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 @@ -78,6 +47,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); @@ -90,19 +61,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(); @@ -125,15 +99,23 @@ public: /// return currently set alpha float get_alpha() const; - enum Target { - NORMAL, LIGHTMAP - }; + /// on next update, set color to lightmap's color at position + void get_light(const Vector& position, Color* color ); + + typedef ::Target Target; + static const Target NORMAL = ::NORMAL; + static const Target LIGHTMAP = ::LIGHTMAP; void push_target(); 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 { @@ -152,6 +134,9 @@ private: } }; + Renderer *renderer; + Lightmap *lightmap; + /// the transform stack std::vector transformstack; /// the currently active transform @@ -160,70 +145,9 @@ private: std::vector blend_stack; Blend blend_mode; - enum RequestType - { - SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT, LIGHTMAPREQUEST - }; - - 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 DrawingRequests; + typedef std::vector 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 draw_lightmap(DrawingRequest& request); DrawingRequests drawing_requests; DrawingRequests lightmap_requests; @@ -231,12 +155,14 @@ private: DrawingRequests* requests; Color ambient_color; - SDL_Surface* screen; Target target; std::vector 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; + + bool screenshot_requested; /**< true if a screenshot should be taken after the next frame has been rendered */ }; #endif +