diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
commit | b607687a3182ef2fa9955d71abe86b31bdc1f99f (patch) | |
tree | 388b6fa3c4ee2a38114208d8f8faab751ae23361 /scene/2d/camera_2d.h | |
parent | 58cda02a389759d18176216c06f375d364cefef1 (diff) | |
parent | 4ff524b5c9227d0eeae2a8d9761add7465c03710 (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d/camera_2d.h')
-rw-r--r-- | scene/2d/camera_2d.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h index 9d06df2d1b..116169cac1 100644 --- a/scene/2d/camera_2d.h +++ b/scene/2d/camera_2d.h @@ -50,6 +50,7 @@ protected: Vector2 offset;
Vector2 zoom;
bool centered;
+ bool rotating;
bool current;
float smoothing;
int limit[4];
@@ -79,6 +80,9 @@ public: void set_centered(bool p_centered);
bool is_centered() const;
+ void set_rotating(bool p_rotating);
+ bool is_rotating() const;
+
void set_limit(Margin p_margin,int p_limit);
int get_limit(Margin p_margin) const;
|