summaryrefslogtreecommitdiff
path: root/scene/2d/parallax_background.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 12:48:47 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 12:48:47 -0300
commit6f9631fc5151b3267c6fcea5f70249fc36814db8 (patch)
tree2aa06230d95846602aa731967264c1619baa2a39 /scene/2d/parallax_background.h
parent63033aa646f7a49fbcecbc8cc30077cf268be10c (diff)
parentbe0f7563fbff581ca072504978bedc6a55e180f1 (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d/parallax_background.h')
-rw-r--r--scene/2d/parallax_background.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/2d/parallax_background.h b/scene/2d/parallax_background.h
index 363236b2ad..8dede07a16 100644
--- a/scene/2d/parallax_background.h
+++ b/scene/2d/parallax_background.h
@@ -44,6 +44,7 @@ class ParallaxBackground : public CanvasLayer {
String group_name;
Point2 limit_begin;
Point2 limit_end;
+ bool ignore_camera_zoom;
void _update_scroll();
protected:
@@ -72,6 +73,9 @@ public:
void set_limit_end(const Point2& p_ofs);
Point2 get_limit_end() const;
+ void set_ignore_camera_zoom(bool ignore);
+ bool is_ignore_camera_zoom();
+
ParallaxBackground();
};