- changed blitting code to not do sin/cos math when doing an unrotated blit, might...

[supertux.git] / src / video / drawing_context.cpp

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 428454d..62c6ee3 100644 (file)
--- a/src/video/drawing_context.cpp
+++ b/src/video/drawing_context.cpp
@@ -29,17 +29,15 @@
 
 #include "drawing_context.hpp"
 #include "drawing_request.hpp"
-#include "gl_renderer.hpp"
-#include "gl_lightmap.hpp"
-#include "sdl_renderer.hpp"
-#include "sdl_lightmap.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
 
 static inline int next_po2(int val)
 {
@@ -68,23 +66,11 @@ DrawingContext::~DrawingContext()
 void
 DrawingContext::init_renderer()
 {
-  if(renderer)
-    delete renderer;
-  if(lightmap)
-    delete lightmap;
+  delete renderer;
+  delete lightmap;
 
-#ifdef HAVE_OPENGL
-  if(config->video == "opengl")
-  {
-    renderer = new GL::Renderer();
-    lightmap = new GL::Lightmap();
-  }
-  else
-#endif
-  {
-    renderer = new SDL::Renderer();
-    lightmap = new SDL::Lightmap();
-  }
+  renderer = new_renderer();
+  lightmap = new_lightmap();
 }
 
 void
@@ -233,6 +219,7 @@ DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
   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);
@@ -242,12 +229,18 @@ void
 DrawingContext::draw_filled_rect(const Rect& 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)
+{
   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;
@@ -256,9 +249,10 @@ DrawingContext::draw_filled_rect(const Rect& rect, const Color& color,
   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
@@ -309,8 +303,10 @@ DrawingContext::do_drawing()
     handle_drawing_requests(lightmap_requests);
     lightmap->end_draw();
   }
+  lightmap_requests.clear();
 
   handle_drawing_requests(drawing_requests);
+  drawing_requests.clear();
   if(use_lightmap) {
     lightmap->do_draw();
   }
@@ -360,7 +356,11 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests)
             renderer->draw_gradient(request);
             break;
           case TEXT:
-            renderer->draw_text(request);
+            {
+              const TextRequest* textrequest = (TextRequest*) request.request_data;
+              textrequest->font->draw(renderer, textrequest->text, request.pos,
+                  textrequest->alignment, request.drawing_effect, request.alpha);
+            }
             break;
           case FILLRECT:
             renderer->draw_filled_rect(request);
@@ -382,7 +382,11 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests)
             lightmap->draw_gradient(request);
             break;
           case TEXT:
-            lightmap->draw_text(request);
+            {
+              const TextRequest* textrequest = (TextRequest*) request.request_data;
+              textrequest->font->draw(renderer, textrequest->text, request.pos,
+                  textrequest->alignment, request.drawing_effect, request.alpha);
+            }
             break;
           case FILLRECT:
             lightmap->draw_filled_rect(request);
@@ -394,7 +398,6 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests)
         break;
     }
   }
-  requests.clear();
 }
 
 void