Removed trailing whitespace from all *.?pp files

[supertux.git] / src / video / sdl / sdl_lightmap.cpp

diff --git a/src/video/sdl/sdl_lightmap.cpp b/src/video/sdl/sdl_lightmap.cpp
index 09a8343..641e8ad 100644 (file)
--- a/src/video/sdl/sdl_lightmap.cpp
+++ b/src/video/sdl/sdl_lightmap.cpp
@@ -20,17 +20,19 @@
 #include "video/sdl/sdl_surface_data.hpp"
 #include "video/sdl/sdl_texture.hpp"
 #include "video/sdl/sdl_renderer.hpp"
+#include "video/sdl/sdl_painter.hpp"
 
 SDLLightmap::SDLLightmap() :
   renderer(static_cast<SDLRenderer*>(Renderer::instance())->get_sdl_renderer()),
+  texture(),
   width(),
   height(),
   LIGHTMAP_DIV()
 {
   LIGHTMAP_DIV = 8;
 
-  width = 800; //screen->w / LIGHTMAP_DIV;
-  height = 600; //screen->h / LIGHTMAP_DIV;
+  width = SCREEN_WIDTH;
+  height = SCREEN_HEIGHT;
 
   SDL_Renderer* renderer = static_cast<SDLRenderer*>(Renderer::instance())->get_sdl_renderer();
   texture = SDL_CreateTexture(renderer,
@@ -54,7 +56,7 @@ void
 SDLLightmap::start_draw(const Color &ambient_color)
 {
   SDL_SetRenderTarget(renderer, texture);
- 
+
   Uint8 r = static_cast<Uint8>(ambient_color.red * 255);
   Uint8 g = static_cast<Uint8>(ambient_color.green * 255);
   Uint8 b = static_cast<Uint8>(ambient_color.blue * 255);
@@ -86,84 +88,54 @@ SDLLightmap::do_draw()
 void
 SDLLightmap::draw_surface(const DrawingRequest& request)
 {
-  //FIXME: support parameters request.alpha, request.angle, request.blend
-  const Surface* surface = (const Surface*) request.request_data;
-  boost::shared_ptr<SDLTexture> sdltexture = boost::dynamic_pointer_cast<SDLTexture>(surface->get_texture());
-
-  SDL_Rect dst_rect;
-  dst_rect.x = request.pos.x;
-  dst_rect.y = request.pos.y;
-  dst_rect.w = sdltexture->get_image_width();
-  dst_rect.h = sdltexture->get_image_height();
-
-  SDL_SetTextureBlendMode(sdltexture->get_texture(), SDL_BLENDMODE_ADD);
-  SDL_RenderCopy(renderer, sdltexture->get_texture(), NULL, &dst_rect);
+  SDLPainter::draw_surface(renderer, request);
 }
 
 void
 SDLLightmap::draw_surface_part(const DrawingRequest& request)
 {
-  //FIXME: support parameters request.alpha, request.angle, request.blend
-  const Surface* surface = (const Surface*) request.request_data;
-  boost::shared_ptr<SDLTexture> sdltexture = boost::dynamic_pointer_cast<SDLTexture>(surface->get_texture());
-
-  SDL_Rect dst_rect;
-  dst_rect.x = request.pos.x;
-  dst_rect.y = request.pos.y;
-  dst_rect.w = sdltexture->get_image_width();
-  dst_rect.h = sdltexture->get_image_height();
-
-  SDL_SetTextureBlendMode(sdltexture->get_texture(), SDL_BLENDMODE_ADD);
-  SDL_RenderCopy(renderer, sdltexture->get_texture(), NULL, &dst_rect);
+  SDLPainter::draw_surface_part(renderer, request);
 }
 
 void
 SDLLightmap::draw_gradient(const DrawingRequest& request)
 {
-  log_info << "draw_gradient" << std::endl;
+  SDLPainter::draw_gradient(renderer, request);
 }
 
 void
 SDLLightmap::draw_filled_rect(const DrawingRequest& request)
 {
-  log_info << "draw_filled_rect" << std::endl;
-
-  const FillRectRequest* fillrectrequest
-    = (FillRectRequest*) request.request_data;
-
-  SDL_Rect rect;
-  rect.x = request.pos.x;
-  rect.y = request.pos.y;
-  rect.w = fillrectrequest->size.x;
-  rect.h = fillrectrequest->size.y;
-
-  Uint8 r = static_cast<Uint8>(fillrectrequest->color.red * 255);
-  Uint8 g = static_cast<Uint8>(fillrectrequest->color.green * 255);
-  Uint8 b = static_cast<Uint8>(fillrectrequest->color.blue * 255);
-  Uint8 a = static_cast<Uint8>(fillrectrequest->color.alpha * 255);
-
-  log_info << fillrectrequest->color.red << " " << fillrectrequest->color.green << std::endl;
-
-  if((rect.w != 0) && (rect.h != 0))
-  {
-    SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_ADD);
-    SDL_SetRenderDrawColor(renderer, r, g, b, a);
-    SDL_RenderFillRect(renderer, &rect);
-  }
+  SDLPainter::draw_filled_rect(renderer, request);
 }
 
 void
 SDLLightmap::get_light(const DrawingRequest& request) const
 {
-#if OLD_SDL1
-  const GetLightRequest* getlightrequest 
+  const GetLightRequest* getlightrequest
     = (GetLightRequest*) request.request_data;
 
-  int x = (int) (request.pos.x * width / SCREEN_WIDTH);
-  int y = (int) (request.pos.y * height / SCREEN_HEIGHT);
-  int loc = y * width + x;
-  *(getlightrequest->color_ptr) = Color(((float)red_channel[loc])/255, ((float)green_channel[loc])/255, ((float)blue_channel[loc])/255);
-#endif
+  SDL_Rect rect;
+  rect.x = static_cast<int>(request.pos.x * width / SCREEN_WIDTH);
+  rect.y = static_cast<int>(request.pos.y * height / SCREEN_HEIGHT);
+  rect.w = 1;
+  rect.h = 1;
+
+  SDL_SetRenderTarget(renderer, texture);
+  Uint8 pixel[4];
+  int ret = SDL_RenderReadPixels(renderer, &rect,
+                                 SDL_PIXELFORMAT_RGB888,
+                                 pixel,
+                                 1);
+  if (ret != 0)
+  {
+    log_warning << "failed to read pixels: " << SDL_GetError() << std::endl;
+  }
+  SDL_SetRenderTarget(renderer, 0);
+
+  *(getlightrequest->color_ptr) = Color(pixel[2] / 255.0f,
+                                        pixel[1] / 255.0f,
+                                        pixel[0] / 255.0f);
 }
 
 /* EOF */