Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

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

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 5256a0a..61e6432 100644 (file)
--- a/src/video/drawing_context.cpp
+++ b/src/video/drawing_context.cpp
@@ -33,7 +33,7 @@
 #include "glutil.hpp"
 #include "texture.hpp"
 #include "texture_manager.hpp"
-#define LIGHTMAP_DIV 1
+#define LIGHTMAP_DIV 5
 
 static inline int next_po2(int val)
 {
@@ -245,11 +245,19 @@ DrawingContext::get_light(const Vector& position, Color* color)
     *color = Color( 1.0f, 1.0f, 1.0f);
     return;
   }
+
   DrawingRequest request;
   request.type = GETLIGHT;
   request.pos = transform.apply(position);
-  request.layer = LAYER_GUI; //make sure all get_light requests are handled last.
 
+  //There is no light offscreen.
+  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;
+  }
+
+  request.layer = LAYER_GUI; //make sure all get_light requests are handled last.
   GetLightRequest* getlightrequest = new GetLightRequest;
   getlightrequest->color_ptr = color;
   request.request_data = getlightrequest;
@@ -265,12 +273,11 @@ DrawingContext::get_light(DrawingRequest& request)
   for( int i = 0; i<3; i++)
     pixels[i] = 0.0f; //set to black
 
-  float posX = request.pos.x /LIGHTMAP_DIV;
-  float posY = SCREEN_HEIGHT - request.pos.y / LIGHTMAP_DIV;
+  float posX = request.pos.x * lightmap_width / SCREEN_WIDTH;
+  float posY = screen->h - request.pos.y * lightmap_height / SCREEN_HEIGHT;
   glReadPixels((GLint) posX, (GLint) posY , 1, 1, GL_RGB, GL_FLOAT, pixels);
-    *(getlightrequest->color_ptr) = Color( pixels[0], pixels[1], pixels[2]);  
-  //draw_filled_rect( Vector(posX, posY), Vector(1,1), Color( 1.0f, 1.0f, 1.0f) ,LAYER_GUI);
-  //printf("get_light %f/%f r%f g%f b%f\n", request.pos.x, request.pos.y, pixels[0], pixels[1], pixels[2]);
+    *(getlightrequest->color_ptr) = Color( pixels[0], pixels[1], pixels[2]);
+  //printf("get_light %f/%f =>%f/%f r%f g%f b%f\n", request.pos.x, request.pos.y, posX, posY, pixels[0], pixels[1], pixels[2]);
 
   delete getlightrequest;
 }
@@ -442,7 +449,7 @@ DrawingContext::handle_drawing_requests(DrawingRequests& requests)
       case SURFACE:
       {
         const Surface* surface = (const Surface*) i->request_data;
-        if (i->angle == 0.0f && 
+        if (i->angle == 0.0f &&
             i->color.red == 1.0f && i->color.green == 1.0f  &&
             i->color.blue == 1.0f &&  i->color.alpha == 1.0f  )
           surface->draw(i->pos.x, i->pos.y, i->alpha, i->drawing_effect);