#include "video/surface.hpp"
#include "video/texture.hpp"
#include "video/texture_manager.hpp"
-#include "video/video_systems.hpp"
+#include "video/video_system.hpp"
-DrawingContext::DrawingContext(Renderer& renderer, Lightmap& lightmap) :
- renderer(renderer),
- lightmap(lightmap),
+DrawingContext::DrawingContext(VideoSystem& video_system_) :
+ video_system(video_system_),
transformstack(),
transform(),
blend_stack(),
}
void
-DrawingContext::clear_drawing_requests(DrawingRequests& requests)
+DrawingContext::clear_drawing_requests(DrawingRequests& requests_)
{
- for(auto& request : requests)
+ for(auto& request : requests_)
{
if (request->request_data)
{
}
request->~DrawingRequest();
}
- requests.clear();
+ requests_.clear();
}
void
}
void
-DrawingContext::draw_surface_part(SurfacePtr 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->srcrect = srcrect;
+ surfacepartrequest->dstsize = dstrect.get_size();
surfacepartrequest->surface = surface.get();
- // 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;
- }
request->request_data = surfacepartrequest;
requests->push_back(request);
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& lightmap = video_system.get_lightmap();
+
lightmap.start_draw(ambient_color);
handle_drawing_requests(lightmap_requests);
lightmap.end_draw();
drawing_requests.push_back(request);
}
- clear_drawing_requests(lightmap_requests);
-
+ Renderer& renderer = video_system.get_renderer();
+ renderer.start_draw();
handle_drawing_requests(drawing_requests);
+ renderer.end_draw();
+
+ clear_drawing_requests(lightmap_requests);
clear_drawing_requests(drawing_requests);
obstack_free(&obst, NULL);
};
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) {
break;
case TEXT:
{
- const TextRequest* textrequest = (TextRequest*) request.request_data;
+ const TextRequest* textrequest = static_cast<TextRequest*>(request.request_data);
textrequest->font->draw(&renderer, textrequest->text, request.pos,
textrequest->alignment, request.drawing_effect, request.color, request.alpha);
}
break;
case TEXT:
{
- const TextRequest* textrequest = (TextRequest*) request.request_data;
+ const TextRequest* textrequest = static_cast<TextRequest*>(request.request_data);
textrequest->font->draw(&renderer, textrequest->text, request.pos,
textrequest->alignment, request.drawing_effect, request.color, request.alpha);
}
}
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;
}
}