// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "video/drawing_context.hpp"
+
#include <algorithm>
#include <config.h>
-#include "video/drawing_context.hpp"
-
+#include "math/sizef.hpp"
#include "supertux/gameconfig.hpp"
#include "supertux/globals.hpp"
#include "util/obstackpp.hpp"
#include "video/surface.hpp"
#include "video/texture.hpp"
#include "video/texture_manager.hpp"
-#include "video/video_systems.hpp"
+#include "video/video_system.hpp"
-static inline int next_po2(int val)
-{
- int result = 1;
- while(result < val)
- result *= 2;
-
- return result;
-}
-
-DrawingContext::DrawingContext() :
- renderer(0),
- lightmap(0),
+DrawingContext::DrawingContext(VideoSystem& video_system_) :
+ video_system(video_system_),
transformstack(),
transform(),
blend_stack(),
DrawingContext::~DrawingContext()
{
- delete renderer;
- delete lightmap;
+ clear_drawing_requests(lightmap_requests);
+ clear_drawing_requests(drawing_requests);
obstack_free(&obst, NULL);
}
void
-DrawingContext::init_renderer()
+DrawingContext::clear_drawing_requests(DrawingRequests& requests_)
{
- delete renderer;
- delete lightmap;
-
- renderer = new_renderer();
- lightmap = new_lightmap();
+ for(auto& request : requests_)
+ {
+ if (request->request_data)
+ {
+ request->request_data->~DrawingRequestData();
+ }
+ request->~DrawingRequest();
+ }
+ requests_.clear();
}
void
-DrawingContext::draw_surface(const Surface* surface, const Vector& position,
+DrawingContext::draw_surface(SurfacePtr surface, const Vector& position,
float angle, const Color& color, const Blend& blend,
int layer)
{
request->color = color;
request->blend = blend;
- request->request_data = const_cast<Surface*> (surface);
+ SurfaceRequest* surfacerequest = new(obst) SurfaceRequest();
+ surfacerequest->surface = surface.get();
+ request->request_data = surfacerequest;
requests->push_back(request);
}
void
-DrawingContext::draw_surface(const Surface* surface, const Vector& position,
+DrawingContext::draw_surface(SurfacePtr surface, const Vector& position,
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)
+DrawingContext::draw_surface_part(SurfacePtr surface,
+ const Rectf& srcrect, const Rectf& dstrect,
+ int layer)
{
assert(surface != 0);
request->target = target;
request->type = SURFACE_PART;
- request->pos = transform.apply(dest);
+ request->pos = transform.apply(dstrect.p1);
request->layer = layer;
request->drawing_effect = transform.drawing_effect;
request->alpha = transform.alpha;
SurfacePartRequest* surfacepartrequest = new(obst) SurfacePartRequest();
- surfacepartrequest->size = size;
- surfacepartrequest->source = source;
- surfacepartrequest->surface = surface;
-
- // clip on screen borders
- if(request->pos.x < 0) {
- surfacepartrequest->size.x += request->pos.x;
- if(surfacepartrequest->size.x <= 0)
- return;
- surfacepartrequest->source.x -= request->pos.x;
- request->pos.x = 0;
- }
- if(request->pos.y < 0) {
- surfacepartrequest->size.y += request->pos.y;
- if(surfacepartrequest->size.y <= 0)
- return;
- surfacepartrequest->source.y -= request->pos.y;
- request->pos.y = 0;
- }
+ surfacepartrequest->srcrect = srcrect;
+ surfacepartrequest->dstsize = dstrect.get_size();
+ surfacepartrequest->surface = surface.get();
+
request->request_data = surfacepartrequest;
requests->push_back(request);
}
void
-DrawingContext::draw_text(const Font* font, const std::string& text,
+DrawingContext::draw_text(FontPtr font, const std::string& text,
const Vector& position, FontAlignment alignment, int layer, Color color)
{
DrawingRequest* request = new(obst) DrawingRequest();
request->color = color;
TextRequest* textrequest = new(obst) TextRequest();
- textrequest->font = font;
+ textrequest->font = font.get();
textrequest->text = text;
textrequest->alignment = alignment;
request->request_data = textrequest;
}
void
-DrawingContext::draw_center_text(const Font* font, const std::string& text,
+DrawingContext::draw_center_text(FontPtr font, const std::string& text,
const Vector& position, int layer, Color color)
{
draw_text(font, text, Vector(position.x + SCREEN_WIDTH/2, position.y),
}
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 Rect& rect, const Color& color, float radius, int layer)
+DrawingContext::draw_filled_rect(const Rectf& rect, const Color& color, float radius, int layer)
{
DrawingRequest* request = new(obst) DrawingRequest();
fillrectrequest->radius = radius;
request->request_data = fillrectrequest;
- requests->push_back(request);
+ requests->push_back(request);
}
void
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);
+ requests->push_back(request);
+}
+
+Rectf
+DrawingContext::get_cliprect() const
+{
+ return Rectf(get_translation().x, get_translation().y,
+ get_translation().x + SCREEN_WIDTH,
+ get_translation().y + SCREEN_HEIGHT);
}
void
target_stack.clear();
//Use Lightmap if ambient color is not white.
- bool use_lightmap = ( ambient_color.red != 1.0f || ambient_color.green != 1.0f ||
- ambient_color.blue != 1.0f );
+ bool use_lightmap = ( ambient_color.red != 1.0f ||
+ ambient_color.green != 1.0f ||
+ ambient_color.blue != 1.0f );
// PART1: create lightmap
if(use_lightmap) {
- lightmap->start_draw(ambient_color);
+ Lightmap& lightmap = video_system.get_lightmap();
+
+ lightmap.start_draw(ambient_color);
handle_drawing_requests(lightmap_requests);
- lightmap->end_draw();
+ lightmap.end_draw();
DrawingRequest* request = new(obst) DrawingRequest();
request->target = NORMAL;
request->layer = LAYER_HUD - 1;
drawing_requests.push_back(request);
}
- lightmap_requests.clear();
+ Renderer& renderer = video_system.get_renderer();
+ renderer.start_draw();
handle_drawing_requests(drawing_requests);
- drawing_requests.clear();
+ renderer.end_draw();
+
+ clear_drawing_requests(lightmap_requests);
+ clear_drawing_requests(drawing_requests);
+
obstack_free(&obst, NULL);
obstack_init(&obst);
// if a screenshot was requested, take one
if (screenshot_requested) {
- renderer->do_take_screenshot();
+ renderer.do_take_screenshot();
screenshot_requested = false;
}
- renderer->flip();
+ renderer.flip();
}
class RequestPtrCompare
};
void
-DrawingContext::handle_drawing_requests(DrawingRequests& requests)
+DrawingContext::handle_drawing_requests(DrawingRequests& requests_)
{
- std::stable_sort(requests.begin(), requests.end(), RequestPtrCompare());
+ std::stable_sort(requests_.begin(), requests_.end(), RequestPtrCompare());
+
+ Renderer& renderer = video_system.get_renderer();
+ Lightmap& lightmap = video_system.get_lightmap();
DrawingRequests::const_iterator i;
- for(i = requests.begin(); i != requests.end(); ++i) {
+ for(i = requests_.begin(); i != requests_.end(); ++i) {
const DrawingRequest& request = **i;
switch(request.target) {
case NORMAL:
switch(request.type) {
case SURFACE:
- renderer->draw_surface(request);
+ renderer.draw_surface(request);
break;
case SURFACE_PART:
- renderer->draw_surface_part(request);
+ renderer.draw_surface_part(request);
break;
case GRADIENT:
- renderer->draw_gradient(request);
+ renderer.draw_gradient(request);
break;
case TEXT:
{
const TextRequest* textrequest = (TextRequest*) request.request_data;
- textrequest->font->draw(renderer, textrequest->text, request.pos,
+ 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);
+ renderer.draw_filled_rect(request);
break;
case INVERSEELLIPSE:
- renderer->draw_inverse_ellipse(request);
+ renderer.draw_inverse_ellipse(request);
break;
case DRAW_LIGHTMAP:
- lightmap->do_draw();
+ lightmap.do_draw();
break;
case GETLIGHT:
- lightmap->get_light(request);
+ lightmap.get_light(request);
break;
}
break;
case LIGHTMAP:
switch(request.type) {
case SURFACE:
- lightmap->draw_surface(request);
+ lightmap.draw_surface(request);
break;
case SURFACE_PART:
- lightmap->draw_surface_part(request);
+ lightmap.draw_surface_part(request);
break;
case GRADIENT:
- lightmap->draw_gradient(request);
+ lightmap.draw_gradient(request);
break;
case TEXT:
{
const TextRequest* textrequest = (TextRequest*) request.request_data;
- textrequest->font->draw(renderer, textrequest->text, request.pos,
+ 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);
+ lightmap.draw_filled_rect(request);
break;
case INVERSEELLIPSE:
assert(!"InverseEllipse doesn't make sense on the lightmap");
break;
case DRAW_LIGHTMAP:
- lightmap->do_draw();
+ lightmap.do_draw();
break;
case GETLIGHT:
- lightmap->get_light(request);
+ lightmap.get_light(request);
break;
}
break;
}
void
-DrawingContext::set_target(Target target)
+DrawingContext::set_target(Target target_)
{
- this->target = target;
- if(target == LIGHTMAP) {
+ this->target = target_;
+ if(target_ == LIGHTMAP) {
requests = &lightmap_requests;
} else {
- assert(target == NORMAL);
+ assert(target_ == NORMAL);
requests = &drawing_requests;
}
}
ambient_color = new_color;
}
-void
+void
DrawingContext::take_screenshot()
{
screenshot_requested = true;
projects / supertux.git / blobdiff