-Added lookat/get_angle_to functions in 2D, and a demo, closes #1843

-Added get_viewport().get_mouse_pos() to replace Input.get_mouse_pos(), closes #1838

2 files changed, 7 insertions, 0 deletions

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 4d9feb3af1..3bb64e54c6 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1177,6 +1177,11 @@ void Viewport::_vp_unhandled_input(const InputEvent& p_ev) {
 
 }
 
+Vector2 Viewport::get_mouse_pos() const {
+
+	return (get_final_transform().affine_inverse() * _get_input_pre_xform()).xform(Input::get_singleton()->get_mouse_pos());
+}
+
 void Viewport::warp_mouse(const Vector2& p_pos) {
 
 	Vector2 gpos = (get_final_transform().affine_inverse() * _get_input_pre_xform()).affine_inverse().xform(p_pos);
@@ -1377,6 +1382,7 @@ void Viewport::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("is_audio_listener_2d","enable"), &Viewport::is_audio_listener_2d);
 	ObjectTypeDB::bind_method(_MD("set_render_target_to_screen_rect"), &Viewport::set_render_target_to_screen_rect);
 
+	ObjectTypeDB::bind_method(_MD("get_mouse_pos"), &Viewport::get_mouse_pos);
 	ObjectTypeDB::bind_method(_MD("warp_mouse","to_pos"), &Viewport::warp_mouse);
 
 	ADD_PROPERTY( PropertyInfo(Variant::RECT2,"rect"), _SCS("set_rect"), _SCS("get_rect") );
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index fba6725610..c3c339ac5d 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -252,6 +252,7 @@ public:
 	void set_render_target_to_screen_rect(const Rect2& p_rect);
 	Rect2 get_render_target_to_screen_rect() const;
 
+	Vector2 get_mouse_pos() const;
 	void warp_mouse(const Vector2& p_pos);
 
 	void set_physics_object_picking(bool p_enable);