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

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

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 5afd926..8a4a9c0 100644 (file)
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -32,10 +32,10 @@
 #include "sector.hpp"
 #include "main.hpp"
 #include "object_factory.hpp"
+#include "msg.hpp"
 
 Camera::Camera(Sector* newsector)
-  : sector(newsector), do_backscrolling(true), scrollchange(NONE),
-    auto_idx(0), auto_t(0)
+  : sector(newsector), do_backscrolling(true), scrollchange(NONE)
 {
   mode = NORMAL;
 }
@@ -63,30 +63,15 @@ Camera::parse(const lisp::Lisp& reader)
     reader.get("backscrolling", do_backscrolling);
   } else if(modename == "autoscroll") {
     mode = AUTOSCROLL;
+    std::string use_path;
     
-    const lisp::Lisp* path_lisp = reader.get_lisp("path");
-    if(!path_lisp)
-      throw std::runtime_error("No path specified in autoscroll camera.");
-
-    lisp::ListIterator iter(path_lisp);
-    float speed = .5;
-    while(iter.next()) {
-      if(iter.item() != "point") {
-        std::cerr << "Warning: unknown token '" << iter.item() 
-          << "' in camera path.\n";
-        continue;
-      }
-      const lisp::Lisp* point_lisp = iter.lisp();
-
-      ScrollPoint point;
-      if(!point_lisp->get("x", point.position.x) ||
-         !point_lisp->get("y", point.position.y)) {
-        throw std::runtime_error("x and y missing in point of camerapath");
-      }
-      point_lisp->get("speed", speed);
-      point.speed = speed;
-      scrollpoints.push_back(point);
+    if (!reader.get("path", use_path)) throw std::runtime_error("No path specified in autoscroll camera.");
+
+    autoscrollPath = Path::GetByName(use_path);
+    if (autoscrollPath == NULL) { 
+      msg_warning("Path for autoscroll camera not found! Make sure that the name is spelled correctly and that the path is initialized before the platform in the level file!");
     }
+
   } else if(modename == "manual") {
     mode = MANUAL;
   } else {
@@ -106,17 +91,7 @@ Camera::write(lisp::Writer& writer)
     writer.write_bool("backscrolling", do_backscrolling);
   } else if(mode == AUTOSCROLL) {
     writer.write_string("mode", "autoscroll");
-    writer.start_list("path");
-    for(std::vector<ScrollPoint>::iterator i = scrollpoints.begin();
-        i != scrollpoints.end(); ++i) {
-      writer.start_list("point");
-      writer.write_float("x", i->position.x);
-      writer.write_float("y", i->position.y);
-      writer.write_float("speed", i->speed);
-      writer.end_list("point");
-    }
-
-    writer.end_list("path");
+    writer.write_string("path", autoscrollPath->GetName());
   } else if(mode == MANUAL) {
     writer.write_string("mode", "manual");
   }
@@ -166,7 +141,7 @@ Camera::update(float elapsed_time)
       update_scroll_normal(elapsed_time);
       break;
     case AUTOSCROLL:
-      update_scroll_autoscroll(elapsed_time);
+      update_scroll_autoscroll();
       break;
     case SCROLLTO:
       update_scroll_to(elapsed_time);
@@ -294,37 +269,14 @@ Camera::update_scroll_normal(float elapsed_time)
 }
 
 void
-Camera::update_scroll_autoscroll(float elapsed_time)
+Camera::update_scroll_autoscroll()
 {
   Player* player = sector->player;
   
   if(player->is_dying())
     return;
 
-  if(auto_t - elapsed_time >= 0) {
-    translation += current_dir * elapsed_time;
-    auto_t -= elapsed_time;
-  } else {
-    // do the rest of the old movement
-    translation += current_dir * auto_t;
-    elapsed_time -= auto_t;
-    auto_t = 0;
-
-    // construct path for next point
-    if(auto_idx+1 >= scrollpoints.size()) {
-      keep_in_bounds(translation);
-      return;
-    }
-    Vector distance = scrollpoints[auto_idx+1].position 
-                      - scrollpoints[auto_idx].position;
-    current_dir = distance.unit() * scrollpoints[auto_idx].speed;
-    auto_t = distance.norm() / scrollpoints[auto_idx].speed;
-
-    // do movement for the remaining time
-    translation += current_dir * elapsed_time;
-    auto_t -= elapsed_time;
-    auto_idx++;
-  }
+  translation = autoscrollPath->GetPosition();
 
   keep_in_bounds(translation);
   shake();