X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Fbackground.cpp;h=7b0d75f00164b8a7bf85be1acec26f2c4acfe45a;hb=35fa1ef8cc5d73d7b6d0a13873e3eadf35d873f5;hp=f74b748ba49f197da51e855021b1c28c316c58f0;hpb=729bc6717bf68314dc9fad25db3a9f728062263e;p=supertux.git

diff --git a/src/object/background.cpp b/src/object/background.cpp
index f74b748ba..7b0d75f00 100644
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -15,11 +15,20 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "object/background.hpp"
+
+#include <iostream>
+#include <math.h>
+#include <stdexcept>
+
+#include "math/sizef.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/log.hpp"
 #include "util/reader.hpp"
 
 Background::Background() :
+  alignment(NO_ALIGNMENT),
   layer(LAYER_BACKGROUND0),
   imagefile_top(),
   imagefile(),
@@ -27,6 +36,8 @@ Background::Background() :
   pos(),
   speed(),
   speed_y(),
+  scroll_speed(),
+  scroll_offset(),
   image_top(),
   image(),
   image_bottom()
@@ -34,6 +45,7 @@ Background::Background() :
 }
 
 Background::Background(const Reader& reader) :
+  alignment(NO_ALIGNMENT),
   layer(LAYER_BACKGROUND0),
   imagefile_top(),
   imagefile(),
@@ -41,6 +53,8 @@ Background::Background(const Reader& reader) :
   pos(),
   speed(),
   speed_y(),
+  scroll_speed(),
+  scroll_offset(),
   image_top(),
   image(),
   image_bottom()
@@ -55,12 +69,53 @@ Background::Background(const Reader& reader) :
   speed = 1.0;
   speed_y = 1.0;
 
-  reader.get("layer", layer);
+  std::string alignment_str;
+  if (reader.get("alignment", alignment_str))
+  {
+    if (alignment_str == "left")
+    {
+      alignment = LEFT_ALIGNMENT;
+    }
+    else if (alignment_str == "right")
+    {
+      alignment = RIGHT_ALIGNMENT;
+    }
+    else if (alignment_str == "top")
+    {
+      alignment = TOP_ALIGNMENT;
+    }
+    else if (alignment_str == "bottom")
+    {
+      alignment = BOTTOM_ALIGNMENT;
+    }
+    else if (alignment_str == "none")
+    {
+      alignment = NO_ALIGNMENT;
+    }
+    else
+    {
+      log_warning << "Background: invalid alignment: '" << alignment_str << "'" << std::endl;
+      alignment = NO_ALIGNMENT;
+    }
+  }
+
+  reader.get("scroll-offset-x", scroll_offset.x);
+  reader.get("scroll-offset-y", scroll_offset.y);
+
+  reader.get("scroll-speed-x", scroll_speed.x);
+  reader.get("scroll-speed-y", scroll_speed.y);
+
+  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");
 
   set_image(imagefile, speed);
-  reader.get("speed-y", speed_y);
+  if (!reader.get("speed-y", speed_y))
+  {
+    speed_y = speed;
+  }
+
   if (reader.get("image-top", imagefile_top)) {
     image_top = Surface::create(imagefile_top);
   }
@@ -74,47 +129,110 @@ Background::~Background()
 }
 
 void
-Background::update(float)
+Background::update(float delta)
 {
+  scroll_offset += scroll_speed * delta;
 }
 
 void
-Background::set_image(const std::string& name, float speed)
+Background::set_image(const std::string& name_, float speed_)
 {
-  this->imagefile = name;
-  this->speed = speed;
+  this->imagefile = name_;
+  this->speed = speed_;
 
-  image = Surface::create(name);
+  image = Surface::create(name_);
 }
 
 void
-Background::draw(DrawingContext& context)
+Background::draw_image(DrawingContext& context, const Vector& pos_)
 {
-  if(image.get() == NULL)
-    return;
+  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();
 
-  int w = (int) image->get_width();
-  int h = (int) image->get_height();
-  int sx = int(pos.x-context.get_translation().x * speed) % w - w;
-  int sy = int(pos.y-context.get_translation().y * speed_y) % h - h;
-  int center_image_py = int(pos.y-context.get_translation().y * speed_y);
-  int bottom_image_py = int(pos.y-context.get_translation().y * speed_y) + h;
-  context.push_transform();
-  context.set_translation(Vector(0, 0));
-  for(int x = sx; x < SCREEN_WIDTH; x += w) {
-    for(int y = sy; y < SCREEN_HEIGHT; y += h) {
-      if (image_top.get() != NULL && (y < center_image_py)) {
-        context.draw_surface(image_top.get(), Vector(x, y), layer);
-        continue;
+  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)
+      {
+        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, p, layer);
       }
-      if (image_bottom.get() != NULL && (y >= bottom_image_py)) {
-        context.draw_surface(image_bottom.get(), Vector(x, y), layer);
-        continue;
+      break;
+
+    case RIGHT_ALIGNMENT:
+      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, p, layer);
       }
-      context.draw_surface(image.get(), Vector(x, y), layer);
-    }
+      break;
+
+    case TOP_ALIGNMENT:
+      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, p, layer);
+      }
+      break;
+
+    case BOTTOM_ALIGNMENT:
+      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, p, layer);
+      }
+      break;
+
+    case NO_ALIGNMENT:
+      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,
+                   pos_.y + y * image->get_height() - image->get_height()/2);
+
+          if (image_top.get() != NULL && (y < 0))
+          {
+            context.draw_surface(image_top, p, layer);
+          }
+          else if (image_bottom.get() != NULL && (y > 0))
+          {
+            context.draw_surface(image_bottom, p, layer);
+          }
+          else
+          {
+            context.draw_surface(image, p, layer);
+          }
+        }
+      break;
   }
-  context.pop_transform();
+}
+
+void
+Background::draw(DrawingContext& context)
+{
+  if(image.get() == NULL)
+    return;
+
+  Sizef level_size(Sector::current()->get_width(),
+                   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,
+                       context.get_translation().y - translation_range.height / 2.0f);
+
+  // FIXME: We are not handling 'pos'
+  draw_image(context, Vector(level_size.width / 2.0f, level_size.height / 2.0f) + center_offset * (1.0f - speed));
 }
 
 /* EOF */