X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Fdrawing_context.cpp;h=90cb1db285afdd6fdbebef3548d8981b25a71cb6;hb=53209e9747f4c830eeeb926d3a44918ed86621ba;hp=613a3de861b7e27b40232f8760b0e6465b80d915;hpb=70fd1ef1e47747d377979c96c3bb0500519fd063;p=supertux.git diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp index 613a3de86..90cb1db28 100644 --- a/src/video/drawing_context.cpp +++ b/src/video/drawing_context.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// 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,22 +12,23 @@ // 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. +// along with this program. If not, see . + +#include #include -#include "drawing_context.hpp" - -#include "drawing_request.hpp" -#include "video_systems.hpp" -#include "renderer.hpp" -#include "lightmap.hpp" -#include "surface.hpp" -#include "main.hpp" -#include "gameconfig.hpp" -#include "texture.hpp" -#include "texture_manager.hpp" +#include "video/drawing_context.hpp" + #include "obstack/obstackpp.hpp" +#include "supertux/gameconfig.hpp" +#include "supertux/globals.hpp" +#include "video/drawing_request.hpp" +#include "video/lightmap.hpp" +#include "video/renderer.hpp" +#include "video/surface.hpp" +#include "video/texture.hpp" +#include "video/texture_manager.hpp" +#include "video/video_systems.hpp" static inline int next_po2(int val) { @@ -41,7 +40,20 @@ static inline int next_po2(int val) } DrawingContext::DrawingContext() : - renderer(0), lightmap(0), ambient_color(1.0f, 1.0f, 1.0f, 1.0f), target(NORMAL), screenshot_requested(false) + renderer(0), + lightmap(0), + transformstack(), + transform(), + blend_stack(), + blend_mode(), + drawing_requests(), + lightmap_requests(), + requests(), + ambient_color(1.0f, 1.0f, 1.0f, 1.0f), + target(NORMAL), + target_stack(), + obst(), + screenshot_requested(false) { requests = &drawing_requests; obstack_init(&obst); @@ -79,8 +91,8 @@ DrawingContext::draw_surface(const Surface* surface, const Vector& position, request->pos = transform.apply(position); if(request->pos.x >= SCREEN_WIDTH || request->pos.y >= SCREEN_HEIGHT - || request->pos.x + surface->get_width() < 0 - || request->pos.y + surface->get_height() < 0) + || request->pos.x + surface->get_width() < 0 + || request->pos.y + surface->get_height() < 0) return; request->layer = layer; @@ -97,14 +109,14 @@ DrawingContext::draw_surface(const Surface* surface, const Vector& position, void DrawingContext::draw_surface(const Surface* surface, const Vector& position, - int layer) + int layer) { draw_surface(surface, position, 0.0f, Color(1.0f, 1.0f, 1.0f), Blend(), layer); } void DrawingContext::draw_surface_part(const Surface* surface, const Vector& source, - const Vector& size, const Vector& dest, int layer) + const Vector& size, const Vector& dest, int layer) { assert(surface != 0); @@ -144,7 +156,7 @@ DrawingContext::draw_surface_part(const Surface* surface, const Vector& source, void DrawingContext::draw_text(const Font* font, const std::string& text, - const Vector& position, FontAlignment alignment, int layer, Color color) + const Vector& position, FontAlignment alignment, int layer, Color color) { DrawingRequest* request = new(obst) DrawingRequest(); @@ -167,10 +179,10 @@ DrawingContext::draw_text(const Font* font, const std::string& text, void DrawingContext::draw_center_text(const Font* font, const std::string& text, - const Vector& position, int layer, Color color) + const Vector& position, int layer, Color color) { draw_text(font, text, Vector(position.x + SCREEN_WIDTH/2, position.y), - ALIGN_CENTER, layer, color); + ALIGN_CENTER, layer, color); } void @@ -287,7 +299,7 @@ DrawingContext::get_light(const Vector& position, Color* color) //There is no light offscreen. if(request->pos.x >= SCREEN_WIDTH || request->pos.y >= SCREEN_HEIGHT - || request->pos.x < 0 || request->pos.y < 0){ + || request->pos.x < 0 || request->pos.y < 0){ *color = Color( 0, 0, 0); return; } @@ -342,9 +354,6 @@ DrawingContext::do_drawing() } class RequestPtrCompare - : public std::binary_function { public: bool operator()(const DrawingRequest* r1, const DrawingRequest* r2) const @@ -375,12 +384,12 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests) renderer->draw_gradient(request); break; case TEXT: - { - const TextRequest* textrequest = (TextRequest*) request.request_data; - textrequest->font->draw(renderer, textrequest->text, request.pos, - textrequest->alignment, request.drawing_effect, request.color, request.alpha); - } - break; + { + const TextRequest* textrequest = (TextRequest*) request.request_data; + textrequest->font->draw(renderer, textrequest->text, request.pos, + textrequest->alignment, request.drawing_effect, request.color, request.alpha); + } + break; case FILLRECT: renderer->draw_filled_rect(request); break; @@ -407,12 +416,12 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests) lightmap->draw_gradient(request); break; case TEXT: - { - const TextRequest* textrequest = (TextRequest*) request.request_data; - textrequest->font->draw(renderer, textrequest->text, request.pos, - textrequest->alignment, request.drawing_effect, request.color, request.alpha); - } - break; + { + const TextRequest* textrequest = (TextRequest*) request.request_data; + textrequest->font->draw(renderer, textrequest->text, request.pos, + textrequest->alignment, request.drawing_effect, request.color, request.alpha); + } + break; case FILLRECT: lightmap->draw_filled_rect(request); break; @@ -507,3 +516,4 @@ DrawingContext::take_screenshot() screenshot_requested = true; } +/* EOF */