Background can now render three images: Top, Center and Bottom

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

diff --git a/src/object/background.cpp b/src/object/background.cpp
index 7c43cfa..8e4e2ab 100644 (file)
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -26,19 +26,33 @@
 #include "object_factory.hpp"
 #include "resources.hpp"
 #include "main.hpp"
+#include "msg.hpp"
 
 Background::Background()
-  : type(INVALID), layer(LAYER_BACKGROUND0), image(0)
+  : type(INVALID), layer(LAYER_BACKGROUND0), image_top(0), image(0), image_bottom(0)
 {
 }
 
 Background::Background(const lisp::Lisp& reader)
-  : type(INVALID), layer(LAYER_BACKGROUND0), image(0)
+  : type(INVALID), layer(LAYER_BACKGROUND0), image_top(0), image(0), image_bottom(0)
 {
+  // read position, defaults to (0,0)
+  float px = 0;
+  float py = 0;
+  reader.get("x", px);
+  reader.get("y", py);
+  this->pos = Vector(px,py);
+
+  speed = 1.0;
+  speed_y = 1.0;
+
   reader.get("layer", layer);
   if(reader.get("image", imagefile) 
       && reader.get("speed", speed)) {
     set_image(imagefile, speed);
+    reader.get("speed-y", speed_y);
+    if (reader.get("image-top", imagefile_top)) image_top = new Surface(imagefile_top);
+    if (reader.get("image-bottom", imagefile_bottom)) image_bottom = new Surface(imagefile_bottom);
   } else {
     std::vector<float> bkgd_top_color, bkgd_bottom_color;
     if(reader.get_vector("top_color", bkgd_top_color) &&
@@ -62,16 +76,19 @@ Background::write(lisp::Writer& writer)
   writer.start_list("background");
 
   if(type == IMAGE) {
+    if (image_top) writer.write_string("image-top", imagefile_top);
     writer.write_string("image", imagefile);
+    if (image_bottom) writer.write_string("image-bottom", imagefile_bottom);
     writer.write_float("speed", speed);
+    writer.write_float("speed-y", speed_y);
   } else if(type == GRADIENT) {
     std::vector<float> bkgd_top_color, bkgd_bottom_color;
     bkgd_top_color.push_back(gradient_top.red);
     bkgd_top_color.push_back(gradient_top.green);
     bkgd_top_color.push_back(gradient_top.blue);
-    bkgd_bottom_color.push_back(gradient_top.red);
-    bkgd_bottom_color.push_back(gradient_top.green);
-    bkgd_bottom_color.push_back(gradient_top.blue);
+    bkgd_bottom_color.push_back(gradient_bottom.red);
+    bkgd_bottom_color.push_back(gradient_bottom.green);
+    bkgd_bottom_color.push_back(gradient_bottom.blue);
     writer.write_float_vector("top_color", bkgd_top_color);
     writer.write_float_vector("bottom_color", bkgd_bottom_color);
   }
@@ -93,7 +110,7 @@ Background::set_image(const std::string& name, float speed)
   this->speed = speed;
 
   delete image;
-  image = new Surface("images/background/" + name);
+  image = new Surface(name);
 }
 
 void
@@ -102,6 +119,13 @@ Background::set_gradient(Color top, Color bottom)
   type = GRADIENT;
   gradient_top = top;
   gradient_bottom = bottom;
+  
+  if (gradient_top.red > 1.0 || gradient_top.green > 1.0
+   || gradient_top.blue > 1.0 || gradient_top.alpha > 1.0)
+    msg_warning("top gradient color has values above 1.0");
+  if (gradient_bottom.red > 1.0 || gradient_bottom.green > 1.0
+   || gradient_bottom.blue > 1.0 || gradient_bottom.alpha > 1.0)
+    msg_warning("bottom gradient color has values above 1.0");
 
   delete image;
   image = NULL;
@@ -121,13 +145,25 @@ Background::draw(DrawingContext& context)
     
     int w = (int) image->get_width();
     int h = (int) image->get_height();
-    int sx = int(-context.get_translation().x * speed) % w - w;
-    int sy = int(-context.get_translation().y * speed) % h - h;
+    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)
+    for(int x = sx; x < SCREEN_WIDTH; x += w) {
+      for(int y = sy; y < SCREEN_HEIGHT; y += h) {
+       if (image_top && (y < center_image_py)) {
+          context.draw_surface(image_top, Vector(x, y), layer);
+         continue;
+       } 
+       if (image_bottom && (y >= bottom_image_py)) {
+          context.draw_surface(image_bottom, Vector(x, y), layer);
+         continue;
+       }
         context.draw_surface(image, Vector(x, y), layer);
+      }
+    }
     context.pop_transform();
   }
 }