// 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>
-
-#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 "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"
-
-#include "math/vector.hpp"
-#include "math/rect.hpp"
-
-#include <unison/video/Renderers.hpp>
+#include "texture.hpp"
+#include "texture_manager.hpp"
+#include "obstack/obstackpp.hpp"
-/*static inline int next_po2(int val)
+static inline int next_po2(int val)
{
int result = 1;
while(result < val)
result *= 2;
return result;
-}*/
+}
-DrawingContext::DrawingContext()
- /*renderer(0), lightmap(0), ambient_color(1.0f, 1.0f, 1.0f, 1.0f), target(NORMAL), screenshot_requested(false)*/
+DrawingContext::DrawingContext() :
+ renderer(0), lightmap(0), ambient_color(1.0f, 1.0f, 1.0f, 1.0f), target(NORMAL), screenshot_requested(false)
{
- ambient_color = Color(1.0f, 1.0f, 1.0f, 1.0f);
- target = NORMAL;
- screenshot_requested = false;
- draw_target = &normal_list;
- /*requests = &drawing_requests;
- obstack_init(&obst);*/
+ requests = &drawing_requests;
+ obstack_init(&obst);
}
DrawingContext::~DrawingContext()
{
- /*delete renderer;
+ delete renderer;
delete lightmap;
- obstack_free(&obst, NULL);*/
+ obstack_free(&obst, NULL);
}
void
DrawingContext::init_renderer()
{
- Unison::Video::Renderers::get().set_renderer(config->video);
- Unison::Video::Window::get().set_logical_size(Unison::Video::Area(SCREEN_WIDTH, SCREEN_HEIGHT));
- Unison::Video::Window::get().open(Unison::Video::Area(config->screenwidth, config->screenheight), config->use_fullscreen);
- lightmap = Unison::Video::Surface(Unison::Video::Area(SCREEN_WIDTH, SCREEN_HEIGHT));
- /*delete renderer;
+ delete renderer;
delete lightmap;
renderer = new_renderer();
- lightmap = new_lightmap();*/
+ lightmap = new_lightmap();
}
void
{
assert(surface != 0);
- Unison::Video::RenderOptions options;
- options.color = color.to_unison_color();
- options.alpha = (unsigned char) transform.alpha * 0xff;
- options.blend = blend.to_unison_blend();
- options.h_flip = surface->get_flipx() != (transform.drawing_effect == HORIZONTAL_FLIP);
- options.v_flip = (transform.drawing_effect == VERTICAL_FLIP);
-
- Vector transformed = transform.apply(position);
- Unison::Video::Point dst_pos((int) transformed.x, (int) transformed.y);
-
- (*draw_target)[layer].blit_section(surface->get_texture(), dst_pos, options);
-
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = SURFACE;
request->request_data = const_cast<Surface*> (surface);
- requests->push_back(request);*/
+ requests->push_back(request);
}
void
{
assert(surface != 0);
- Unison::Video::TextureSection texture = surface->get_texture();
- texture.clip_rect.pos.x += (int) source.x;
- texture.clip_rect.pos.y += (int) source.y;
- texture.clip_rect.size.x += (unsigned int) size.x;
- texture.clip_rect.size.y += (unsigned int) size.y;
-
- Unison::Video::RenderOptions options;
- options.alpha = (unsigned char) transform.alpha * 0xff;
- options.h_flip = surface->get_flipx() != (transform.drawing_effect == HORIZONTAL_FLIP);
- options.v_flip = (transform.drawing_effect == VERTICAL_FLIP);
-
- Vector transformed = transform.apply(dest);
- Unison::Video::Point dst_pos((int) transformed.x, (int) transformed.y);
-
- (*draw_target)[layer].blit_section(texture, dst_pos, options);
-
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = SURFACE_PART;
}
request->request_data = surfacepartrequest;
- requests->push_back(request);*/
+ requests->push_back(request);
}
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)
{
- font->draw((*draw_target)[layer], text, transform.apply(position),
- alignment, transform.drawing_effect, transform.alpha);
-
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = TEXT;
request->layer = layer;
request->drawing_effect = transform.drawing_effect;
request->alpha = transform.alpha;
+ request->color = color;
TextRequest* textrequest = new(obst) TextRequest();
textrequest->font = font;
textrequest->alignment = alignment;
request->request_data = textrequest;
- requests->push_back(request);*/
+ requests->push_back(request);
}
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);
-}
-
-namespace
-{
- class GradientRequest : public Unison::Video::DisplayList::Request
- {
- public:
- GradientRequest(const Color &top, const Color &bottom) :
- top(top),
- bottom(bottom)
- {
- }
-
- void do_request(Unison::Video::Blittable *dst) const
- {
- for(int y = 0;y < SCREEN_HEIGHT;++y)
- {
- Unison::Video::Color color;
- color.red = (Uint8)((((float)(top.red-bottom.red)/(0-SCREEN_HEIGHT)) * y + top.red) * 255);
- color.green = (Uint8)((((float)(top.green-bottom.green)/(0-SCREEN_HEIGHT)) * y + top.green) * 255);
- color.green = (Uint8)((((float)(top.blue-bottom.blue)/(0-SCREEN_HEIGHT)) * y + top.blue) * 255);
- color.alpha = (Uint8)((((float)(top.alpha-bottom.alpha)/(0-SCREEN_HEIGHT)) * y + top.alpha) * 255);
- dst->fill(color, Unison::Video::Rect(0, y, SCREEN_WIDTH, 1));
- }
- }
- private:
- Color top;
- Color bottom;
- };
+ ALIGN_CENTER, layer, color);
}
void
DrawingContext::draw_gradient(const Color& top, const Color& bottom, int layer)
{
- (*draw_target)[layer].add_request(new GradientRequest(top, bottom));
-
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = GRADIENT;
gradientrequest->bottom = bottom;
request->request_data = gradientrequest;
- requests->push_back(request);*/
+ requests->push_back(request);
}
void
DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
const Color& color, int layer)
{
- Vector transformed = transform.apply(topleft);
-
- Unison::Video::Rect rect;
- rect.pos = Unison::Video::Point((int) transformed.x, (int) transformed.y);
- rect.size.x = (unsigned int) size.x;
- rect.size.y = (unsigned int) size.y;
-
- (*draw_target)[layer].fill_blend(color.to_unison_color(), rect);
-
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = FILLRECT;
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);*/
+ requests->push_back(request);
}
void
DrawingContext::draw_filled_rect(const Rect& rect, const Color& color,
int layer)
{
- Vector transformed = transform.apply(rect.p1);
-
- Unison::Video::Rect unison_rect;
- unison_rect.pos.x = (int) transformed.x;
- unison_rect.pos.y = (int) transformed.y;
- unison_rect.size.x = (unsigned int) rect.get_width();
- unison_rect.size.y = (unsigned int) rect.get_height();
-
- (*draw_target)[layer].fill_blend(color.to_unison_color(), unison_rect);
+ draw_filled_rect(rect, color, 0.0f, layer);
+}
- /*DrawingRequest* request = new(obst) DrawingRequest();
+void
+DrawingContext::draw_filled_rect(const Rect& 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
return;
}
- /*DrawingRequest* request = new(obst) DrawingRequest();
+ DrawingRequest* request = new(obst) DrawingRequest();
request->target = target;
request->type = GETLIGHT;
- request->pos = transform.apply(position);*/
+ request->pos = transform.apply(position);
//There is no light offscreen.
- if(position.x >= SCREEN_WIDTH || position.y >= SCREEN_HEIGHT
- || position.x < 0 || position.y < 0){
+ if(request->pos.x >= SCREEN_WIDTH || request->pos.y >= SCREEN_HEIGHT
+ || request->pos.x < 0 || request->pos.y < 0){
*color = Color( 0, 0, 0);
return;
}
- Vector transformed = transform.apply(position);
- Unison::Video::Point pos((int) transformed.x, (int) transformed.y);
- get_light_requests.push_back(std::make_pair(pos, color));
-
- /*request->layer = LAYER_GUI; //make sure all get_light requests are handled last.
+ request->layer = LAYER_GUI; //make sure all get_light requests are handled last.
GetLightRequest* getlightrequest = new(obst) GetLightRequest();
getlightrequest->color_ptr = color;
request->request_data = getlightrequest;
- lightmap_requests.push_back(request);*/
+ lightmap_requests.push_back(request);
}
void
// PART1: create lightmap
if(use_lightmap) {
- lightmap.fill(ambient_color.to_unison_color());
- lightmap.draw(lightmap_list);
- //lightmap->start_draw(ambient_color);
- //handle_drawing_requests(lightmap_requests);
- //lightmap->end_draw();
+ 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();
- Unison::Video::Window::get().draw(normal_list);
-
- //handle_drawing_requests(drawing_requests);
- if(use_lightmap) {
- Unison::Video::Window::get().blit(lightmap, Unison::Video::Point(), Unison::Video::Rect(), Unison::Video::BLEND_MOD);
- //lightmap->do_draw();
- }
- //obstack_free(&obst, NULL);
- //obstack_init(&obst);
+ handle_drawing_requests(drawing_requests);
+ drawing_requests.clear();
+ obstack_free(&obst, NULL);
+ obstack_init(&obst);
// if a screenshot was requested, take one
if (screenshot_requested) {
- // FIXME renderer->do_take_screenshot();
+ renderer->do_take_screenshot();
screenshot_requested = false;
}
- //renderer->flip();
- Unison::Video::Window::get().flip();
-
- normal_list.clear();
- lightmap_list.clear();
+ renderer->flip();
}
-/*class RequestPtrCompare
+class RequestPtrCompare
: public std::binary_function<const DrawingRequest*,
- std::vector<std::pair<Unison::Video::Point, Color *> > get_light_requests;
const DrawingRequest*,
bool>
{
{
const TextRequest* textrequest = (TextRequest*) request.request_data;
textrequest->font->draw(renderer, textrequest->text, request.pos,
- textrequest->alignment, request.drawing_effect, request.alpha);
+ 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;
{
const TextRequest* textrequest = (TextRequest*) request.request_data;
textrequest->font->draw(renderer, textrequest->text, request.pos,
- textrequest->alignment, request.drawing_effect, request.alpha);
+ 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
DrawingContext::push_transform()
{
this->target = target;
if(target == LIGHTMAP) {
- draw_target = &lightmap_list;
+ requests = &lightmap_requests;
} else {
assert(target == NORMAL);
- draw_target = &normal_list;
+ requests = &drawing_requests;
}
}
projects / supertux.git / blobdiff