From a29bfdf91251a41be7eadacae0e0f0c2f63568a7 Mon Sep 17 00:00:00 2001
From: rafalcieslak <rafalcieslak256@gmail.com>
Date: Mon, 10 Feb 2014 13:55:12 +0100
Subject: [PATCH 1/2] Implemented Camera2D.Rotating property

---
 scene/2d/camera_2d.cpp | 26 +++++++++++++++++++++++++-
 scene/2d/camera_2d.h   |  4 ++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index 1920ce00816..dea3e578941 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -131,9 +131,14 @@ Matrix32 Camera2D::get_camera_transform()  {
 	}
 
 
-	Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
+    Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
 	screen_offset+=offset;
 
+	float angle = get_global_transform().get_rotation();
+	if(rotating){
+		screen_offset = screen_offset.rotated(angle);
+	}
+
 	Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size);
 	if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT])
 		screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x;
@@ -151,6 +156,9 @@ Matrix32 Camera2D::get_camera_transform()  {
 	camera_screen_center=screen_rect.pos+screen_rect.size*0.5;
 
 	Matrix32 xform;
+	if(rotating){
+		xform.set_rotation(angle);
+	}
 	xform.scale_basis(zoom);
 	xform.set_origin(screen_rect.pos/*.floor()*/);
 
@@ -251,6 +259,17 @@ bool Camera2D::is_centered() const {
 	return centered;
 }
 
+void Camera2D::set_rotating(bool p_rotating){
+
+	rotating=p_rotating;
+	_update_scroll();
+}
+
+bool Camera2D::is_rotating() const {
+
+	return rotating;
+}
+
 
 void Camera2D::_make_current(Object *p_which) {
 
@@ -394,6 +413,9 @@ void Camera2D::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_centered","centered"),&Camera2D::set_centered);
 	ObjectTypeDB::bind_method(_MD("is_centered"),&Camera2D::is_centered);
 
+	ObjectTypeDB::bind_method(_MD("set_rotating","rotating"),&Camera2D::set_rotating);
+	ObjectTypeDB::bind_method(_MD("is_rotating"),&Camera2D::is_rotating);
+
 	ObjectTypeDB::bind_method(_MD("make_current"),&Camera2D::make_current);
 	ObjectTypeDB::bind_method(_MD("_make_current"),&Camera2D::_make_current);
 
@@ -436,6 +458,7 @@ void Camera2D::_bind_methods() {
 
 	ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),_SCS("set_offset"),_SCS("get_offset"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"centered"),_SCS("set_centered"),_SCS("is_centered"));
+	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"rotating"),_SCS("set_rotating"),_SCS("is_rotating"));
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"current"),_SCS("_set_current"),_SCS("is_current"));
 	ADD_PROPERTY( PropertyInfo(Variant::REAL,"smoothing"),_SCS("set_follow_smoothing"),_SCS("get_follow_smoothing") );
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"zoom"),_SCS("set_zoom"),_SCS("get_zoom") );
@@ -462,6 +485,7 @@ Camera2D::Camera2D() {
 
 
 	centered=true;
+	rotating=false;
 	current=false;
 	limit[MARGIN_LEFT]=-10000000;
 	limit[MARGIN_TOP]=-10000000;
diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h
index 9d06df2d1b8..116169cac1b 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;
 

From 0366d6cb83e0da170a9647714edf1e6bce38c953 Mon Sep 17 00:00:00 2001
From: rafalcieslak <rafalcieslak256@gmail.com>
Date: Mon, 10 Feb 2014 14:00:26 +0100
Subject: [PATCH 2/2] Fixed accidentally broken identation

---
 scene/2d/camera_2d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index dea3e578941..acae3e62c43 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -131,7 +131,7 @@ Matrix32 Camera2D::get_camera_transform()  {
 	}
 
 
-    Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
+	Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
 	screen_offset+=offset;
 
 	float angle = get_global_transform().get_rotation();