Fixed resize handling of lightmaps, they are now recreated on resize()

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

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 2351261..f600246 100644 (file)
--- a/src/video/drawing_context.cpp
+++ b/src/video/drawing_context.cpp
@@ -29,11 +29,10 @@
 #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(),
@@ -318,6 +317,8 @@ DrawingContext::do_drawing()
 
   // 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();
@@ -328,6 +329,8 @@ DrawingContext::do_drawing()
     request->layer = LAYER_HUD - 1;
     drawing_requests.push_back(request);
   }
+
+  Renderer& renderer = video_system.get_renderer();
   renderer.start_draw();
   handle_drawing_requests(drawing_requests);
   renderer.end_draw();
@@ -361,6 +364,9 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests_)
 {
   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) {
     const DrawingRequest& request = **i;