X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbackground.cpp;h=b8d0ecc945d3998e849967bcdba0600031e66986;hb=6c61f312a1f5a768e202195ca18ed5a51974bdcc;hp=ed51950f3ee98976c1e43e62f941702560e8405b;hpb=308f11e38981077626fe0ea9887094f3c28b02f9;p=supertux.git

diff --git a/src/background.cpp b/src/background.cpp
index ed51950f3..b8d0ecc94 100644
--- a/src/background.cpp
+++ b/src/background.cpp
@@ -18,10 +18,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "background.h"
-#include "globals.h"
+#include "app/globals.h"
 #include "camera.h"
-#include "screen/drawing_context.h"
-#include "lispwriter.h"
+#include "video/drawing_context.h"
+#include "utils/lispwriter.h"
 
 Background::Background()
   : type(INVALID), image(0)
@@ -36,13 +36,10 @@ Background::Background(LispReader& reader)
     set_image(imagefile, speed);
   }
 
-  int tr, tg, tb, br, bg, bb;
-  if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg)
-      && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br)
-      && reader.read_int("bottom_green", br)
-      && reader.read_int("bottom_blue", bb)) {
-    set_gradient(Color(tr, tg, tb), Color(br, bg, bb));
-  }
+  std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color;
+  if(reader.read_int_vector("top_color", bkgd_top_color) &&
+     reader.read_int_vector("bottom_color", bkgd_bottom_color))
+    set_gradient(Color(bkgd_top_color), Color(bkgd_bottom_color));
 }
 
 Background::~Background()
@@ -62,12 +59,15 @@ Background::write(LispWriter& writer)
     writer.write_string("image", imagefile);
     writer.write_float("speed", speed);
   } else if(type == GRADIENT) {
-    writer.write_int("top_red", gradient_top.red);
-    writer.write_int("top_green", gradient_top.green);
-    writer.write_int("top_blue", gradient_top.blue);
-    writer.write_int("bottom_red", gradient_bottom.red);
-    writer.write_int("bottom_green", gradient_bottom.green);
-    writer.write_int("bottom_blue", gradient_bottom.blue);
+    std::vector <unsigned int> 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);
+    writer.write_int_vector("top_color", bkgd_top_color);
+    writer.write_int_vector("bottom_color", bkgd_bottom_color);
   }
   
   writer.end_list("background");
@@ -86,7 +86,7 @@ Background::set_image(const std::string& name, float speed)
   this->speed = speed;
 
   delete image;
-  image = new Surface(datadir + "/images/background/" + name, IGNORE_ALPHA);
+  image = new Surface(datadir + "/images/background/" + name, false);
 }
 
 void
@@ -95,13 +95,26 @@ Background::set_gradient(Color top, Color bottom)
   type = GRADIENT;
   gradient_top = top;
   gradient_bottom = bottom;
+
+  delete image;
+  image = new Surface(top, bottom, screen->w, screen->h);
 }
 
 void
 Background::draw(DrawingContext& context)
 {
   if(type == GRADIENT) {
-    context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0);
+    /* In case we are using OpenGL just draw the gradient, else (software mode)
+        use the cache. */
+    if(use_gl)
+      context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0);
+    else
+      {
+      context.push_transform();
+      context.set_translation(Vector(0, 0));
+      context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0);
+      context.pop_transform();
+      }
   } else if(type == IMAGE) {
     int sx = int(-context.get_translation().x * speed)
       % image->w - image->w;