From 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 13 Mar 2014 22:57:24 -0300 Subject: -fix bug in cache for atlas import/export -fix some menus -fixed bug in out transition curves -detect and remove file:/// in collada -remove multiscript for now -remove dependencies on mouse in OS, moved to Input -avoid fscache from screwing up (fix might make it slower, but it works) -funcref was missing, it's there now --- core/os/input.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/os/input.cpp') diff --git a/core/os/input.cpp b/core/os/input.cpp index 3266e4cc10..e732eac323 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -56,6 +56,7 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer); ObjectTypeDB::bind_method(_MD("get_mouse_pos"),&Input::get_mouse_pos); ObjectTypeDB::bind_method(_MD("get_mouse_speed"),&Input::get_mouse_speed); + ObjectTypeDB::bind_method(_MD("get_mouse_button_mask"),&Input::get_mouse_button_mask); ObjectTypeDB::bind_method(_MD("set_mouse_mode","mode"),&Input::set_mouse_mode); ObjectTypeDB::bind_method(_MD("get_mouse_mode"),&Input::get_mouse_mode); @@ -280,6 +281,12 @@ Point2 InputDefault::get_mouse_speed() const { return mouse_speed_track.speed; } +int InputDefault::get_mouse_button_mask() const { + + OS::get_singleton()->get_mouse_button_state(); +} + + void InputDefault::iteration(float p_step) { -- cgit v1.2.3 From c573adb8293dc53bf2ba17a0342b10f39965fbf5 Mon Sep 17 00:00:00 2001 From: Samuel Batista Date: Fri, 14 Mar 2014 00:01:27 -0400 Subject: Fixing compile error related to missing return value from input.cpp --- core/os/input.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/os/input.cpp') diff --git a/core/os/input.cpp b/core/os/input.cpp index e732eac323..d7c0d86d64 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -283,7 +283,7 @@ Point2 InputDefault::get_mouse_speed() const { int InputDefault::get_mouse_button_mask() const { - OS::get_singleton()->get_mouse_button_state(); + return OS::get_singleton()->get_mouse_button_state(); } -- cgit v1.2.3