Removed trailing whitespace from all *.?pp files

[supertux.git] / src / object / background.cpp

diff --git a/src/object/background.cpp b/src/object/background.cpp
index 09d147c..f49e05c 100644 (file)
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -17,6 +17,9 @@
 #include "object/background.hpp"
 
 #include <iostream>
+#include <math.h>
+#include <stdexcept>
+
 #include "math/sizef.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
@@ -102,7 +105,8 @@ Background::Background(const Reader& reader) :
   reader.get("scroll-speed-x", scroll_speed.x);
   reader.get("scroll-speed-y", scroll_speed.y);
 
-  reader.get("layer", layer);
+  layer = reader_get_layer (reader, /* default = */ LAYER_BACKGROUND0);
+
   if(!reader.get("image", imagefile) || !reader.get("speed", speed))
     throw std::runtime_error("Must specify image and speed for background");
 
@@ -145,69 +149,69 @@ Background::draw_image(DrawingContext& context, const Vector& pos)
   Sizef level(Sector::current()->get_width(), Sector::current()->get_height());
   Sizef screen(SCREEN_WIDTH, SCREEN_HEIGHT);
   Sizef parallax_image_size = (1.0f - speed) * screen + level * speed;
+  Rectf cliprect = context.get_cliprect();
 
-  // FIXME: Implement proper clipping here
-  int start_x = -parallax_image_size.width  / 2.0f / image->get_width()  - 1;
-  int end_x   =  parallax_image_size.width  / 2.0f / image->get_width()  + 1;
-  int start_y = -parallax_image_size.height / 2.0f / image->get_height() - 1;
-  int end_y   =  parallax_image_size.height / 2.0f / image->get_height() + 1;
+  int start_x = static_cast<int>(floorf((cliprect.get_left()  - (pos.x - image->get_width() /2.0f)) / image->get_width()));
+  int end_x   = static_cast<int>(ceilf((cliprect.get_right()  - (pos.x + image->get_width() /2.0f)) / image->get_width()))+1;
+  int start_y = static_cast<int>(floorf((cliprect.get_top()   - (pos.y - image->get_height()/2.0f)) / image->get_height()));
+  int end_y   = static_cast<int>(ceilf((cliprect.get_bottom() - (pos.y + image->get_height()/2.0f)) / image->get_height()))+1;
 
   switch(alignment)
   {
     case LEFT_ALIGNMENT:
-      for(int y = start_y; y <= end_y; ++y)
+      for(int y = start_y; y < end_y; ++y)
       {
         Vector p(pos.x - parallax_image_size.width / 2.0f,
                  pos.y + y * image->get_height()  - image->get_height() / 2.0f);
-        context.draw_surface(image.get(), p, layer);
+        context.draw_surface(image, p, layer);
       }
       break;
 
     case RIGHT_ALIGNMENT:
-      for(int y = start_y; y <= end_y; ++y)
+      for(int y = start_y; y < end_y; ++y)
       {
         Vector p(pos.x + parallax_image_size.width / 2.0f - image->get_width(),
                  pos.y + y * image->get_height() - image->get_height() / 2.0f);
-        context.draw_surface(image.get(), p, layer);
+        context.draw_surface(image, p, layer);
       }
       break;
 
     case TOP_ALIGNMENT:
-      for(int x = start_x; x <= end_x; ++x)
+      for(int x = start_x; x < end_x; ++x)
       {
-        Vector p(pos.x + x * image->get_width() - image->get_width() / 2.0f, 
-                 pos.y - parallax_image_size.height / 2.0f);       
-        context.draw_surface(image.get(), p, layer);
+        Vector p(pos.x + x * image->get_width() - image->get_width() / 2.0f,
+                 pos.y - parallax_image_size.height / 2.0f);
+        context.draw_surface(image, p, layer);
       }
       break;
 
     case BOTTOM_ALIGNMENT:
-      for(int x = start_x; x <= end_x; ++x)
+      for(int x = start_x; x < end_x; ++x)
       {
-        Vector p(pos.x + x * image->get_width()  - image->get_width() / 2.0f, 
-                 pos.y - image->get_height() + parallax_image_size.height / 2.0f);       
-        context.draw_surface(image.get(), p, layer);
+        Vector p(pos.x + x * image->get_width()  - image->get_width() / 2.0f,
+                 pos.y - image->get_height() + parallax_image_size.height / 2.0f);
+        context.draw_surface(image, p, layer);
       }
       break;
 
     case NO_ALIGNMENT:
-      for(int y = start_y; y <= end_y; ++y)
-        for(int x = start_x; x <= end_x; ++x)
+      for(int y = start_y; y < end_y; ++y)
+        for(int x = start_x; x < end_x; ++x)
         {
-          Vector p(pos.x + x * image->get_width()  - image->get_width()/2, 
+          Vector p(pos.x + x * image->get_width()  - image->get_width()/2,
                    pos.y + y * image->get_height() - image->get_height()/2);
 
           if (image_top.get() != NULL && (y < 0))
           {
-            context.draw_surface(image_top.get(), p, layer);
+            context.draw_surface(image_top, p, layer);
           }
           else if (image_bottom.get() != NULL && (y > 0))
           {
-            context.draw_surface(image_bottom.get(), p, layer);
+            context.draw_surface(image_bottom, p, layer);
           }
           else
           {
-            context.draw_surface(image.get(), p, layer);
+            context.draw_surface(image, p, layer);
           }
         }
       break;
@@ -224,7 +228,7 @@ Background::draw(DrawingContext& context)
                    Sector::current()->get_height());
   Sizef screen(SCREEN_WIDTH, SCREEN_HEIGHT);
   Sizef translation_range = level_size - screen;
-  Vector center_offset(context.get_translation().x - translation_range.width  / 2.0f, 
+  Vector center_offset(context.get_translation().x - translation_range.width  / 2.0f,
                        context.get_translation().y - translation_range.height / 2.0f);
 
   // FIXME: We are not handling 'pos'