-// $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
// 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.
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <functional>
#include <algorithm>
-#include <cassert>
-#include <iostream>
-#include <SDL_image.h>
-#include <sstream>
-#include <iomanip>
-#include <physfs.h>
-
-#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 "obstack/obstackpp.hpp"
-#define LIGHTMAP_DIV 5
+#include <config.h>
+
+#include "video/drawing_context.hpp"
+
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
+#include "util/obstackpp.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)
{
}
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);
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;
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);
void
DrawingContext::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)
{
DrawingRequest* request = new(obst) DrawingRequest();
request->layer = layer;
request->drawing_effect = transform.drawing_effect;
request->alpha = transform.alpha;
+ request->color = color;
TextRequest* textrequest = new(obst) TextRequest();
textrequest->font = font;
void
DrawingContext::draw_center_text(const Font* font, const std::string& text,
- const Vector& position, int layer)
+ const Vector& position, int layer, Color color)
{
draw_text(font, text, Vector(position.x + SCREEN_WIDTH/2, position.y),
- ALIGN_CENTER, layer);
+ ALIGN_CENTER, layer, color);
}
void
fillrectrequest->size = size;
fillrectrequest->color = color;
fillrectrequest->color.alpha = color.alpha * transform.alpha;
+ fillrectrequest->radius = 0.0f;
request->request_data = fillrectrequest;
requests->push_back(request);
}
void
-DrawingContext::draw_filled_rect(const Rect& rect, const Color& color,
+DrawingContext::draw_filled_rect(const Rectf& rect, const Color& color,
int layer)
{
+ draw_filled_rect(rect, color, 0.0f, layer);
+}
+
+void
+DrawingContext::draw_filled_rect(const Rectf& rect, const Color& color, float radius, int layer)
+{
DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
- request->type = FILLRECT;
- request->pos = transform.apply(rect.p1);
- request->layer = layer;
+ request->type = FILLRECT;
+ request->pos = transform.apply(rect.p1);
+ request->layer = layer;
request->drawing_effect = transform.drawing_effect;
request->alpha = transform.alpha;
fillrectrequest->size = Vector(rect.get_width(), rect.get_height());
fillrectrequest->color = color;
fillrectrequest->color.alpha = color.alpha * transform.alpha;
+ fillrectrequest->radius = radius;
request->request_data = fillrectrequest;
- requests->push_back(request);
+ requests->push_back(request);
+}
+
+void
+DrawingContext::draw_inverse_ellipse(const Vector& pos, const Vector& size, const Color& color, int layer)
+{
+ DrawingRequest* request = new(obst) DrawingRequest();
+
+ request->target = target;
+ request->type = INVERSEELLIPSE;
+ request->pos = transform.apply(pos);
+ request->layer = layer;
+
+ request->drawing_effect = transform.drawing_effect;
+ request->alpha = transform.alpha;
+
+ InverseEllipseRequest* ellipse = new(obst)InverseEllipseRequest;
+
+ ellipse->color = color;
+ ellipse->color.alpha = color.alpha * transform.alpha;
+ ellipse->size = size;
+ request->request_data = ellipse;
+
+ requests->push_back(request);
}
void
//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;
}
void
DrawingContext::do_drawing()
{
-#ifdef DEBUG
assert(transformstack.empty());
assert(target_stack.empty());
-#endif
transformstack.clear();
target_stack.clear();
lightmap->start_draw(ambient_color);
handle_drawing_requests(lightmap_requests);
lightmap->end_draw();
+
+ DrawingRequest* request = new(obst) DrawingRequest();
+ request->target = NORMAL;
+ request->type = DRAW_LIGHTMAP;
+ request->layer = LAYER_HUD - 1;
+ drawing_requests.push_back(request);
}
+ lightmap_requests.clear();
handle_drawing_requests(drawing_requests);
- if(use_lightmap) {
- lightmap->do_draw();
- }
+ drawing_requests.clear();
obstack_free(&obst, NULL);
obstack_init(&obst);
}
class RequestPtrCompare
- : public std::binary_function<const DrawingRequest*,
- const DrawingRequest*,
- bool>
{
public:
bool operator()(const DrawingRequest* r1, const DrawingRequest* r2) const
renderer->draw_gradient(request);
break;
case TEXT:
- renderer->draw_text(request);
- 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;
+ case INVERSEELLIPSE:
+ renderer->draw_inverse_ellipse(request);
+ break;
+ case DRAW_LIGHTMAP:
+ lightmap->do_draw();
+ break;
case GETLIGHT:
lightmap->get_light(request);
break;
lightmap->draw_gradient(request);
break;
case TEXT:
- lightmap->draw_text(request);
- 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;
+ case INVERSEELLIPSE:
+ assert(!"InverseEllipse doesn't make sense on the lightmap");
+ break;
+ case DRAW_LIGHTMAP:
+ lightmap->do_draw();
+ break;
case GETLIGHT:
lightmap->get_light(request);
break;
break;
}
}
- requests.clear();
}
void
screenshot_requested = true;
}
+/* EOF */