// $Id$
//
-// SuperTux - A Jump'n Run
-// Copyright (C) 2004 Matthias Braun <matze@braunis.de
+// SuperTux
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
#include <config.h>
#include <stdexcept>
#include <sstream>
#include <cmath>
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
-#include "lisp/list_iterator.h"
-#include "camera.h"
-#include "player.h"
-#include "tilemap.h"
-#include "gameloop.h"
-#include "app/globals.h"
-#include "sector.h"
-#include "object_factory.h"
-
-using namespace SuperTux;
-
-Camera::Camera(Sector* newsector)
- : sector(newsector), do_backscrolling(true), scrollchange(NONE),
- auto_idx(0), auto_t(0)
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "lisp/list_iterator.hpp"
+#include "lisp/parser.hpp"
+#include "scripting/camera.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "camera.hpp"
+#include "player.hpp"
+#include "tilemap.hpp"
+#include "game_session.hpp"
+#include "sector.hpp"
+#include "main.hpp"
+#include "object_factory.hpp"
+#include "log.hpp"
+#include "path.hpp"
+#include "path_walker.hpp"
+
+/* this is the fractional distance toward the peek
+ position to move each frame; lower is slower,
+ 0 is never get there, 1 is instant */
+static const float PEEK_ARRIVE_RATIO = 0.1;
+
+class CameraConfig
{
- mode = NORMAL;
+public:
+ // 0 = No, 1 = Fix, 2 = Mario/Yoshi, 3 = Kirby
+ int ymode;
+ // as above, 4 = super metroid like
+ int xmode;
+ float kirby_rectsize_x;
+ float kirby_rectsize_y;
+ // where to fix the player (used for Yoshi and Fix camera)
+ float target_y;
+ float target_x;
+ // maximum scrolling speed in Y direction
+ float max_speed_y;
+ float max_speed_x;
+ // factor to dynamically increase max_speed_x based on player speed
+ float dynamic_max_speed_x;
+
+ // time the player has to face into the other direction before we assume a
+ // changed direction
+ float dirchange_time;
+ // edge_x
+ float edge_x;
+ // when too change from noscroll mode back to lookahead left/right mode
+ // set to <= 0 to disable noscroll mode
+ float sensitive_x;
+
+ float clamp_y;
+ float clamp_x;
+
+ float dynamic_speed_sm;
+
+ CameraConfig() {
+ xmode = 4;
+ ymode = 3;
+ target_x = .5f;
+ target_y = .5f;
+ max_speed_y = 100;
+ max_speed_x = 100;
+ clamp_x = 0.1666f;
+ clamp_y = 0.3f;
+ kirby_rectsize_x = 0.2f;
+ kirby_rectsize_y = 0.34f;
+ edge_x = 0.4f;
+ sensitive_x = -1;
+ dynamic_max_speed_x = 1.0;
+ dirchange_time = 0.2f;
+ dynamic_speed_sm = 0.8f;
+ }
+
+ void load(const std::string& filename)
+ {
+ lisp::Parser parser;
+ const lisp::Lisp* root = parser.parse(filename);
+ const lisp::Lisp* camconfig = root->get_lisp("camera-config");
+ if(camconfig == NULL)
+ throw std::runtime_error("file is not a camera config file.");
+
+ camconfig->get("xmode", xmode);
+ camconfig->get("ymode", ymode);
+ camconfig->get("target-x", target_x);
+ camconfig->get("target-y", target_y);
+ camconfig->get("max-speed-x", max_speed_x);
+ camconfig->get("max-speed-y", max_speed_y);
+ camconfig->get("dynamic-max-speed-x", dynamic_max_speed_x);
+ camconfig->get("dirchange-time", dirchange_time);
+ camconfig->get("clamp-x", clamp_x);
+ camconfig->get("clamp-y", clamp_y);
+ camconfig->get("kirby-rectsize-x", kirby_rectsize_x);
+ camconfig->get("kirby-rectsize-y", kirby_rectsize_y);
+ camconfig->get("edge-x", edge_x);
+ camconfig->get("sensitive-x", sensitive_x);
+ camconfig->get("dynamic-speed-sm", dynamic_speed_sm);
+ }
+};
+
+Camera::Camera(Sector* newsector, std::string name)
+ : mode(NORMAL), sector(newsector), lookahead_mode(LOOKAHEAD_NONE)
+{
+ this->name = name;
+ config = new CameraConfig();
+ reload_config();
}
Camera::~Camera()
{
+ delete config;
+}
+
+void
+Camera::expose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+ if(name.empty()) return;
+ Scripting::Camera* interface = new Scripting::Camera(this);
+ expose_object(vm, table_idx, interface, name, true);
+}
+
+void
+Camera::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+ if(name.empty()) return;
+ Scripting::unexpose_object(vm, table_idx, name);
+}
+
+void
+Camera::draw(DrawingContext& )
+{
}
const Vector&
Camera::parse(const lisp::Lisp& reader)
{
std::string modename;
-
+
reader.get("mode", modename);
if(modename == "normal") {
mode = NORMAL;
-
- do_backscrolling = true;
- reader.get("backscrolling", do_backscrolling);
} else if(modename == "autoscroll") {
- printf("autoscroll.\n");
mode = AUTOSCROLL;
-
- 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();
+ const lisp::Lisp* pathLisp = reader.get_lisp("path");
+ if(pathLisp == NULL)
+ throw std::runtime_error("No path specified in autoscroll camera.");
- 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);
- }
+ autoscroll_path.reset(new Path());
+ autoscroll_path->read(*pathLisp);
+ autoscroll_walker.reset(new PathWalker(autoscroll_path.get()));
} else if(modename == "manual") {
mode = MANUAL;
} else {
Camera::write(lisp::Writer& writer)
{
writer.start_list("camera");
-
+
if(mode == NORMAL) {
writer.write_string("mode", "normal");
- 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");
+ autoscroll_path->write(writer);
} else if(mode == MANUAL) {
writer.write_string("mode", "manual");
}
-
+
writer.end_list("camera");
}
void
Camera::reset(const Vector& tuxpos)
{
- translation.x = tuxpos.x - SCREEN_WIDTH/3 * 2;
+ translation.x = tuxpos.x - SCREEN_WIDTH/2;
translation.y = tuxpos.y - SCREEN_HEIGHT/2;
+
shakespeed = 0;
shaketimer.stop();
- keep_in_bounds();
+ keep_in_bounds(translation);
+
+ cached_translation = translation;
}
void
shakespeed = M_PI/2 / time;
}
-static const float EPSILON = .00001;
-static const float max_speed_y = 140;
+void
+Camera::scroll_to(const Vector& goal, float scrolltime)
+{
+ scroll_from = translation;
+ scroll_goal = goal;
+ keep_in_bounds(scroll_goal);
+
+ scroll_to_pos = 0;
+ scrollspeed = 1.0 / scrolltime;
+ mode = SCROLLTO;
+}
+
+static const float EPSILON = .00001f;
+static const float MAX_SPEED_Y = 140;
void
-Camera::action(float elapsed_time)
+Camera::update(float elapsed_time)
{
- if(mode == NORMAL)
- scroll_normal(elapsed_time);
- else if(mode == AUTOSCROLL)
- scroll_autoscroll(elapsed_time);
+ switch(mode) {
+ case NORMAL:
+ update_scroll_normal(elapsed_time);
+ break;
+ case AUTOSCROLL:
+ update_scroll_autoscroll(elapsed_time);
+ break;
+ case SCROLLTO:
+ update_scroll_to(elapsed_time);
+ break;
+ default:
+ break;
+ }
+ shake();
}
void
-Camera::keep_in_bounds()
+Camera::reload_config()
{
- float width = sector->solids->get_width() * 32;
- float height = sector->solids->get_height() * 32;
+ try {
+ config->load("camera.cfg");
+ } catch(std::exception &e) {
+ log_debug << "Couldn't load camera.cfg, using defaults ("
+ << e.what() << ")" << std::endl;
+ }
+}
+
+float clamp(float val, float min, float max)
+{
+ if(val < min)
+ return min;
+ if(val > max)
+ return max;
+
+ return val;
+}
+
+void
+Camera::keep_in_bounds(Vector& translation)
+{
+ float width = sector->get_width();
+ float height = sector->get_height();
// don't scroll before the start or after the level's end
- if(translation.y > height - SCREEN_HEIGHT)
- translation.y = height - SCREEN_HEIGHT;
- if(translation.y < 0)
- translation.y = 0;
- if(translation.x > width - SCREEN_WIDTH)
- translation.x = width - SCREEN_WIDTH;
- if(translation.x < 0)
- translation.x = 0;
+ translation.x = clamp(translation.x, 0, width - SCREEN_WIDTH);
+ translation.y = clamp(translation.y, 0, height - SCREEN_HEIGHT);
+
+ if (height < SCREEN_HEIGHT)
+ translation.y = height/2.0 - SCREEN_HEIGHT/2.0;
+ if (width < SCREEN_WIDTH)
+ translation.x = width/2.0 - SCREEN_WIDTH/2.0;
}
void
}
void
-Camera::scroll_normal(float elapsed_time)
+Camera::update_scroll_normal(float elapsed_time)
{
- assert(sector != 0);
+ const CameraConfig& config = *(this->config);
Player* player = sector->player;
-
+ const Vector& player_pos = Vector(player->get_bbox().get_middle().x,
+ player->get_bbox().get_bottom());
+ static Vector last_player_pos = player_pos;
+ Vector player_delta = player_pos - last_player_pos;
+ last_player_pos = player_pos;
+
// check that we don't have division by zero later
if(elapsed_time < EPSILON)
return;
/****** Vertical Scrolling part ******/
- bool do_y_scrolling = true;
+ int xmode = config.xmode;
+ int ymode = config.ymode;
- if(player->is_dying() || sector->solids->get_height() == 19)
- do_y_scrolling = false;
+ if(player->is_dying() || sector->get_height() == 19*32) {
+ ymode = 0;
+ }
+ if(player->is_dying())
+ xmode = 0;
- if(do_y_scrolling) {
+ if(ymode == 1) {
+ cached_translation.y = player_pos.y - SCREEN_HEIGHT * config.target_y;
+ }
+ if(ymode == 2) {
// target_y is the high we target our scrolling at. This is not always the
// high of the player, but if he is jumping upwards we should use the
// position where he last touched the ground. (this probably needs
target_y = player->last_ground_y + player->get_bbox().get_height();
else
target_y = player->get_bbox().p2.y;
+ target_y -= SCREEN_HEIGHT * config.target_y;
// delta_y is the distance we'd have to travel to directly reach target_y
- float delta_y = translation.y - (target_y - SCREEN_HEIGHT/2);
+ float delta_y = cached_translation.y - target_y;
// speed is the speed the camera would need to reach target_y in this frame
float speed_y = delta_y / elapsed_time;
// limit the camera speed when jumping upwards
- if(player->fall_mode != Player::FALLING
+ if(player->fall_mode != Player::FALLING
&& player->fall_mode != Player::TRAMPOLINE_JUMP) {
- if(speed_y > max_speed_y)
- speed_y = max_speed_y;
- else if(speed_y < -max_speed_y)
- speed_y = -max_speed_y;
+ speed_y = clamp(speed_y, -config.max_speed_y, config.max_speed_y);
+ }
+
+ // scroll with calculated speed
+ cached_translation.y -= speed_y * elapsed_time;
+ }
+ if(ymode == 3) {
+ float halfsize = config.kirby_rectsize_y * 0.5f;
+ cached_translation.y = clamp(cached_translation.y,
+ player_pos.y - SCREEN_HEIGHT * (0.5f + halfsize),
+ player_pos.y - SCREEN_HEIGHT * (0.5f - halfsize));
+ }
+ if(ymode == 4) {
+ float upperend = SCREEN_HEIGHT * config.edge_x;
+ float lowerend = SCREEN_HEIGHT * (1 - config.edge_x);
+
+ if (player_delta.y < -EPSILON) {
+ // walking left
+ lookahead_pos.y -= player_delta.y * config.dynamic_speed_sm;
+
+ if(lookahead_pos.y > lowerend) {
+ lookahead_pos.y = lowerend;
+ }
+ } else if (player_delta.y > EPSILON) {
+ // walking right
+ lookahead_pos.y -= player_delta.y * config.dynamic_speed_sm;
+ if(lookahead_pos.y < upperend) {
+ lookahead_pos.y = upperend;
+ }
+ }
+
+ // adjust for level ends
+ if (player_pos.y < upperend) {
+ lookahead_pos.y = upperend;
+ }
+ if (player_pos.y > sector->get_width() - upperend) {
+ lookahead_pos.y = lowerend;
}
- // finally scroll with calculated speed
- translation.y -= speed_y * elapsed_time;
+ cached_translation.y = player_pos.y - lookahead_pos.y;
+ }
+
+ translation.y = cached_translation.y;
+
+ if(ymode != 0) {
+ float top_edge, bottom_edge;
+ if(config.clamp_y <= 0) {
+ top_edge = 0;
+ bottom_edge = SCREEN_HEIGHT;
+ } else {
+ top_edge = SCREEN_HEIGHT*config.clamp_y;
+ bottom_edge = SCREEN_HEIGHT*(1-config.clamp_y);
+ }
+
+ float peek_to = 0;
+ float translation_compensation = player_pos.y - translation.y;
+
+ if(player->peeking_direction_y() == ::UP) {
+ peek_to = bottom_edge - translation_compensation;
+ } else if(player->peeking_direction_y() == ::DOWN) {
+ peek_to = top_edge - translation_compensation;
+ }
+
+ float peek_move = (peek_to - peek_pos.y) * PEEK_ARRIVE_RATIO;
+ if(fabs(peek_move) < 1.0) {
+ peek_move = 0.0;
+ }
+
+ peek_pos.y += peek_move;
+
+ translation.y -= peek_pos.y;
+
+ if(config.clamp_y > 0) {
+ translation.y = clamp(translation.y,
+ player_pos.y - SCREEN_HEIGHT * (1-config.clamp_y),
+ player_pos.y - SCREEN_HEIGHT * config.clamp_y);
+ cached_translation.y = clamp(cached_translation.y,
+ player_pos.y - SCREEN_HEIGHT * (1-config.clamp_y),
+ player_pos.y - SCREEN_HEIGHT * config.clamp_y);
+ }
}
/****** Horizontal scrolling part *******/
- // our camera is either in leftscrolling, rightscrolling or nonscrollingmode.
-
- // when suddenly changing directions while scrolling into the other direction.
- // abort scrolling, since tux might be going left/right at a relatively small
- // part of the map (like when jumping upwards)
- if((player->dir == ::LEFT && scrollchange == RIGHT)
- || (player->dir == ::RIGHT && scrollchange == LEFT))
- scrollchange = NONE;
- // when in left 1/3rd of screen scroll left
- if(player->get_bbox().get_middle().x < translation.x + SCREEN_WIDTH/3 - 16
- && do_backscrolling)
- scrollchange = LEFT;
- // scroll right when in right 1/3rd of screen
- else if(player->get_bbox().get_middle().x > translation.x + SCREEN_WIDTH/3*2+16)
- scrollchange = RIGHT;
-
- // calculate our scroll target depending on scroll mode
- float target_x;
- if(scrollchange == LEFT)
- target_x = player->get_bbox().get_middle().x - SCREEN_WIDTH/3*2;
- else if(scrollchange == RIGHT)
- target_x = player->get_bbox().get_middle().x - SCREEN_WIDTH/3;
- else
- target_x = translation.x;
-
- // that's the distance we would have to travel to reach target_x
- float delta_x = translation.x - target_x;
- // the speed we'd need to travel to reach target_x in this frame
- float speed_x = delta_x / elapsed_time;
-
- // limit our speed
- float maxv = 130 + (fabsf(player->physic.get_velocity_x() * 1.3));
- if(speed_x > maxv)
- speed_x = maxv;
- else if(speed_x < -maxv)
- speed_x = -maxv;
-
- // apply scrolling
- translation.x -= speed_x * elapsed_time;
-
- keep_in_bounds();
- shake();
+ if(xmode == 1) {
+ cached_translation.x = player_pos.x - SCREEN_WIDTH * config.target_x;
+ }
+ if(xmode == 2) {
+ // our camera is either in leftscrolling, rightscrolling or
+ // nonscrollingmode.
+ //
+ // when suddenly changing directions while scrolling into the other
+ // direction abort scrolling, since tux might be going left/right at a
+ // relatively small part of the map (like when jumping upwards)
+
+ // Find out direction in which the player moves
+ LookaheadMode walkDirection;
+ if (player_delta.x < -EPSILON) walkDirection = LOOKAHEAD_LEFT;
+ else if (player_delta.x > EPSILON) walkDirection = LOOKAHEAD_RIGHT;
+ else if (player->dir == ::LEFT) walkDirection = LOOKAHEAD_LEFT;
+ else walkDirection = LOOKAHEAD_RIGHT;
+
+ float LEFTEND, RIGHTEND;
+ if(config.sensitive_x > 0) {
+ LEFTEND = SCREEN_WIDTH * config.sensitive_x;
+ RIGHTEND = SCREEN_WIDTH * (1-config.sensitive_x);
+ } else {
+ LEFTEND = SCREEN_WIDTH;
+ RIGHTEND = 0;
+ }
+
+ if(lookahead_mode == LOOKAHEAD_NONE) {
+ /* if we're undecided then look if we crossed the left or right
+ * "sensitive" area */
+ if(player_pos.x < cached_translation.x + LEFTEND) {
+ lookahead_mode = LOOKAHEAD_LEFT;
+ } else if(player_pos.x > cached_translation.x + RIGHTEND) {
+ lookahead_mode = LOOKAHEAD_RIGHT;
+ }
+ /* at the ends of a level it's obvious which way we will go */
+ if(player_pos.x < SCREEN_WIDTH*0.5) {
+ lookahead_mode = LOOKAHEAD_RIGHT;
+ } else if(player_pos.x >= sector->get_width() - SCREEN_WIDTH*0.5) {
+ lookahead_mode = LOOKAHEAD_LEFT;
+ }
+
+ changetime = -1;
+ } else if(lookahead_mode != walkDirection) {
+ /* player changed direction while camera was scrolling...
+ * he has to do this for a certain time to add robustness against
+ * sudden changes */
+ if(changetime < 0) {
+ changetime = game_time;
+ } else if(game_time - changetime > config.dirchange_time) {
+ if(lookahead_mode == LOOKAHEAD_LEFT &&
+ player_pos.x > cached_translation.x + RIGHTEND) {
+ lookahead_mode = LOOKAHEAD_RIGHT;
+ } else if(lookahead_mode == LOOKAHEAD_RIGHT &&
+ player_pos.x < cached_translation.x + LEFTEND) {
+ lookahead_mode = LOOKAHEAD_LEFT;
+ } else {
+ lookahead_mode = LOOKAHEAD_NONE;
+ }
+ }
+ } else {
+ changetime = -1;
+ }
+
+ LEFTEND = SCREEN_WIDTH * config.edge_x;
+ RIGHTEND = SCREEN_WIDTH * (1-config.edge_x);
+
+ // calculate our scroll target depending on scroll mode
+ float target_x;
+ if(lookahead_mode == LOOKAHEAD_LEFT)
+ target_x = player_pos.x - RIGHTEND;
+ else if(lookahead_mode == LOOKAHEAD_RIGHT)
+ target_x = player_pos.x - LEFTEND;
+ else
+ target_x = cached_translation.x;
+
+ // that's the distance we would have to travel to reach target_x
+ float delta_x = cached_translation.x - target_x;
+ // the speed we'd need to travel to reach target_x in this frame
+ float speed_x = delta_x / elapsed_time;
+
+ // limit our speed
+ float player_speed_x = player_delta.x / elapsed_time;
+ float maxv = config.max_speed_x + (fabsf(player_speed_x * config.dynamic_max_speed_x));
+ speed_x = clamp(speed_x, -maxv, maxv);
+
+ // apply scrolling
+ cached_translation.x -= speed_x * elapsed_time;
+ }
+ if(xmode == 3) {
+ float halfsize = config.kirby_rectsize_x * 0.5f;
+ cached_translation.x = clamp(cached_translation.x,
+ player_pos.x - SCREEN_WIDTH * (0.5f + halfsize),
+ player_pos.x - SCREEN_WIDTH * (0.5f - halfsize));
+ }
+ if(xmode == 4) {
+ float LEFTEND = SCREEN_WIDTH * config.edge_x;
+ float RIGHTEND = SCREEN_WIDTH * (1 - config.edge_x);
+
+ if (player_delta.x < -EPSILON) {
+ // walking left
+ lookahead_pos.x -= player_delta.x * config.dynamic_speed_sm;
+ if(lookahead_pos.x > RIGHTEND) {
+ lookahead_pos.x = RIGHTEND;
+ }
+
+ } else if (player_delta.x > EPSILON) {
+ // walking right
+ lookahead_pos.x -= player_delta.x * config.dynamic_speed_sm;
+ if(lookahead_pos.x < LEFTEND) {
+ lookahead_pos.x = LEFTEND;
+ }
+ }
+
+ // adjust for level ends
+ if (player_pos.x < LEFTEND) {
+ lookahead_pos.x = LEFTEND;
+ }
+ if (player_pos.x > sector->get_width() - LEFTEND) {
+ lookahead_pos.x = RIGHTEND;
+ }
+
+ cached_translation.x = player_pos.x - lookahead_pos.x;
+ }
+
+ translation.x = cached_translation.x;
+
+ if(xmode != 0) {
+ float left_edge, right_edge;
+ if(config.clamp_x <= 0) {
+ left_edge = 0;
+ right_edge = SCREEN_WIDTH;
+ } else {
+ left_edge = SCREEN_WIDTH*config.clamp_x;
+ right_edge = SCREEN_WIDTH*(1-config.clamp_x);
+ }
+
+ float peek_to = 0;
+ float translation_compensation = player_pos.x - translation.x;
+
+ if(player->peeking_direction_x() == ::LEFT) {
+ peek_to = right_edge - translation_compensation;
+ } else if(player->peeking_direction_x() == ::RIGHT) {
+ peek_to = left_edge - translation_compensation;
+ }
+
+ float peek_move = (peek_to - peek_pos.x) * PEEK_ARRIVE_RATIO;
+ if(fabs(peek_move) < 1.0) {
+ peek_move = 0.0;
+ }
+
+ peek_pos.x += peek_move;
+
+ translation.x -= peek_pos.x;
+
+ if(config.clamp_x > 0) {
+ translation.x = clamp(translation.x,
+ player_pos.x - SCREEN_WIDTH * (1-config.clamp_x),
+ player_pos.x - SCREEN_WIDTH * config.clamp_x);
+
+ cached_translation.x = clamp(cached_translation.x,
+ player_pos.x - SCREEN_WIDTH * (1-config.clamp_x),
+ player_pos.x - SCREEN_WIDTH * config.clamp_x);
+ }
+ }
+
+ keep_in_bounds(translation);
+ keep_in_bounds(cached_translation);
}
void
-Camera::scroll_autoscroll(float elapsed_time)
+Camera::update_scroll_autoscroll(float elapsed_time)
{
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();
- 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 = autoscroll_walker->advance(elapsed_time);
+
+ keep_in_bounds(translation);
+}
+
+void
+Camera::update_scroll_to(float elapsed_time)
+{
+ scroll_to_pos += elapsed_time * scrollspeed;
+ if(scroll_to_pos >= 1.0) {
+ mode = MANUAL;
+ translation = scroll_goal;
+ return;
}
- keep_in_bounds();
- shake();
+ translation = scroll_from + (scroll_goal - scroll_from) * scroll_to_pos;
+}
+
+Vector
+Camera::get_center() const {
+ return translation + Vector(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
}