From: Wolfgang Becker Date: Sat, 18 Nov 2006 12:21:19 +0000 (+0000) Subject: Made lightmap as big as screen to prevent rounding errors. X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7152961047a1f2b33a9f6d1a77b4eaa7f54b06bc;p=supertux.git Made lightmap as big as screen to prevent rounding errors. SVN-Revision: 4443 --- diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp index 2c6061dc8..5256a0aa7 100644 --- 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 4 +#define LIGHTMAP_DIV 1 static inline int next_po2(int val) { @@ -265,9 +265,11 @@ DrawingContext::get_light(DrawingRequest& request) for( int i = 0; i<3; i++) pixels[i] = 0.0f; //set to black - //TODO: hacky. Make coordinate conversion more generic - glReadPixels((GLint) request.pos.x / 4, 600-(GLint)request.pos.y / 4, 1, 1, GL_RGB, GL_FLOAT, pixels); - *(getlightrequest->color_ptr) = Color( pixels[0], pixels[1], pixels[2]); + float posX = request.pos.x /LIGHTMAP_DIV; + float posY = SCREEN_HEIGHT - request.pos.y / LIGHTMAP_DIV; + 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]); delete getlightrequest;