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
8a897a5
..
061fe4d
100644
(file)
--- a/
src/object/camera.hpp
+++ b/
src/object/camera.hpp
@@
-50,7
+50,7
@@
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
+ /// reset camera pos
i
tion
void reset(const Vector& tuxpos);
/** return camera position */
void reset(const Vector& tuxpos);
/** return camera position */
@@
-86,6
+86,11
@@
public:
};
CameraMode mode;
};
CameraMode mode;
+ /**
+ * get the coordinates of the point directly in the center of this camera
+ */
+ Vector get_center() const;
+
private:
void update_scroll_normal(float elapsed_time);
void update_scroll_autoscroll(float elapsed_time);
private:
void update_scroll_normal(float elapsed_time);
void update_scroll_autoscroll(float elapsed_time);
@@
-94,7
+99,7
@@
private:
void shake();
/**
void shake();
/**
- * The camera basically provides look
e
ahead on the left or right side
+ * The camera basically provides lookahead on the left or right side
* or is undecided.
*/
enum LookaheadMode {
* or is undecided.
*/
enum LookaheadMode {
@@
-108,6
+113,9
@@
private:
// normal mode
LookaheadMode lookahead_mode;
float changetime;
// normal mode
LookaheadMode lookahead_mode;
float changetime;
+ Vector lookahead_pos;
+ Vector peek_pos;
+ Vector cached_translation;
// autoscroll mode
std::auto_ptr<Path> autoscroll_path;
// autoscroll mode
std::auto_ptr<Path> autoscroll_path;