projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Finish work on Path through the Clouds
[supertux.git]
/
src
/
object
/
camera.hpp
diff --git
a/src/object/camera.hpp
b/src/object/camera.hpp
index
5ce5db4
..
061fe4d
100644
(file)
--- a/
src/object/camera.hpp
+++ b/
src/object/camera.hpp
@@
-1,7
+1,7
@@
// $Id$
//
// $Id$
//
-// SuperTux
- A Jump'n Run
-// Copyright (C) 200
4 Matthias Braun <matze@braunis.de
+// SuperTux
+// Copyright (C) 200
6 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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-21,23
+21,28
@@
#include <vector>
#include <cassert>
#include <vector>
#include <cassert>
+#include <memory>
#include "math/vector.hpp"
#include "game_object.hpp"
#include "video/drawing_context.hpp"
#include "serializable.hpp"
#include "timer.hpp"
#include "math/vector.hpp"
#include "game_object.hpp"
#include "video/drawing_context.hpp"
#include "serializable.hpp"
#include "timer.hpp"
+#include "script_interface.hpp"
namespace lisp {
class Lisp;
}
class Sector;
namespace lisp {
class Lisp;
}
class Sector;
+class Path;
+class PathWalker;
+class CameraConfig;
-class Camera : public GameObject, public Serializable
+class Camera : public GameObject, public Serializable
, public ScriptInterface
{
public:
{
public:
- Camera(Sector* sector);
+ Camera(Sector* sector
, std::string name = ""
);
virtual ~Camera();
/// parse camera mode from lisp file
virtual ~Camera();
/// parse camera mode from lisp file
@@
-45,17
+50,18
@@
public:
/// write camera mode to a lisp file
virtual void write(lisp::Writer& writer);
/// write camera mode to a lisp file
virtual void write(lisp::Writer& writer);
- /// reset camera postion
- v
irtual v
oid reset(const Vector& tuxpos);
+ /// reset camera pos
i
tion
+ void reset(const Vector& tuxpos);
/** return camera position */
const Vector& get_translation() const;
virtual void update(float elapsed_time);
/** return camera position */
const Vector& get_translation() const;
virtual void update(float elapsed_time);
- virtual void draw(DrawingContext& )
- {
- }
+ virtual void draw(DrawingContext& );
+
+ virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
+ virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
// shake camera in a direction 1 time
void shake(float speed, float x, float y);
// shake camera in a direction 1 time
void shake(float speed, float x, float y);
@@
-66,48
+72,68
@@
public:
translation.y = scroll_y;
}
translation.y = scroll_y;
}
+ /**
+ * scroll the upper left edge of the camera in scrolltime seconds
+ * to the position goal
+ */
+ void scroll_to(const Vector& goal, float scrolltime);
+
+ void reload_config();
+
enum CameraMode
{
enum CameraMode
{
- NORMAL, AUTOSCROLL, MANUAL
+ NORMAL, AUTOSCROLL,
SCROLLTO,
MANUAL
};
CameraMode mode;
};
CameraMode mode;
+ /**
+ * get the coordinates of the point directly in the center of this camera
+ */
+ Vector get_center() const;
+
private:
private:
- void scroll_normal(float elapsed_time);
- void scroll_autoscroll(float elapsed_time);
- void keep_in_bounds();
+ void update_scroll_normal(float elapsed_time);
+ void update_scroll_autoscroll(float elapsed_time);
+ void update_scroll_to(float elapsed_time);
+ void keep_in_bounds(Vector& vector);
void shake();
void shake();
- enum LeftRightScrollChange
- {
- NONE, LEFT, RIGHT
+ /**
+ * The camera basically provides lookahead on the left or right side
+ * or is undecided.
+ */
+ enum LookaheadMode {
+ LOOKAHEAD_NONE, LOOKAHEAD_LEFT, LOOKAHEAD_RIGHT
};
};
-
+
Vector translation;
Sector* sector;
// normal mode
Vector translation;
Sector* sector;
// normal mode
- bool do_backscrolling;
- LeftRightScrollChange scrollchange;
+ LookaheadMode lookahead_mode;
+ float changetime;
+ Vector lookahead_pos;
+ Vector peek_pos;
+ Vector cached_translation;
// autoscroll mode
// autoscroll mode
- class ScrollPoint {
- public:
- Vector position;
- float speed;
- };
- std::vector<ScrollPoint> scrollpoints;
- size_t auto_idx;
- float auto_t;
- Vector current_dir;
+ std::auto_ptr<Path> autoscroll_path;
+ std::auto_ptr<PathWalker> autoscroll_walker;
// shaking
Timer shaketimer;
float shakespeed;
float shakedepth_x;
float shakedepth_y;
// shaking
Timer shaketimer;
float shakespeed;
float shakedepth_x;
float shakedepth_y;
+
+ // scrollto mode
+ Vector scroll_from;
+ Vector scroll_goal;
+ float scroll_to_pos;
+ float scrollspeed;
+
+ CameraConfig *config;
};
#endif /*SUPERTUX_CAMERA_H*/
};
#endif /*SUPERTUX_CAMERA_H*/
-