summaryrefslogtreecommitdiffstats
path: root/core/os/input.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
commit118eed485e8f928a5a0dab530ae93211afa10525 (patch)
tree83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /core/os/input.cpp
parentce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff)
downloadredot-engine-118eed485e8f928a5a0dab530ae93211afa10525.tar.gz
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
Diffstat (limited to 'core/os/input.cpp')
-rw-r--r--core/os/input.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp
index 8bcb7959b9..c662fafe79 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -49,39 +49,39 @@ Input::MouseMode Input::get_mouse_mode() const {
void Input::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("is_key_pressed","scancode"),&Input::is_key_pressed);
- ObjectTypeDB::bind_method(_MD("is_mouse_button_pressed","button"),&Input::is_mouse_button_pressed);
- ObjectTypeDB::bind_method(_MD("is_joy_button_pressed","device","button"),&Input::is_joy_button_pressed);
- ObjectTypeDB::bind_method(_MD("is_action_pressed","action"),&Input::is_action_pressed);
- ObjectTypeDB::bind_method(_MD("is_action_just_pressed","action"),&Input::is_action_just_pressed);
- ObjectTypeDB::bind_method(_MD("is_action_just_released","action"),&Input::is_action_just_released);
- ObjectTypeDB::bind_method(_MD("add_joy_mapping","mapping", "update_existing"),&Input::add_joy_mapping, DEFVAL(false));
- ObjectTypeDB::bind_method(_MD("remove_joy_mapping","guid"),&Input::remove_joy_mapping);
- ObjectTypeDB::bind_method(_MD("is_joy_known","device"),&Input::is_joy_known);
- ObjectTypeDB::bind_method(_MD("get_joy_axis","device","axis"),&Input::get_joy_axis);
- ObjectTypeDB::bind_method(_MD("get_joy_name","device"),&Input::get_joy_name);
- ObjectTypeDB::bind_method(_MD("get_joy_guid","device"),&Input::get_joy_guid);
- ObjectTypeDB::bind_method(_MD("get_connected_joysticks"),&Input::get_connected_joysticks);
- ObjectTypeDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength);
- ObjectTypeDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration);
- ObjectTypeDB::bind_method(_MD("get_joy_button_string", "button_index"), &Input::get_joy_button_string);
- ObjectTypeDB::bind_method(_MD("get_joy_button_index_from_string", "button"), &Input::get_joy_button_index_from_string);
- ObjectTypeDB::bind_method(_MD("get_joy_axis_string", "axis_index"), &Input::get_joy_axis_string);
- ObjectTypeDB::bind_method(_MD("get_joy_axis_index_from_string", "axis"), &Input::get_joy_axis_index_from_string);
- ObjectTypeDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0));
- ObjectTypeDB::bind_method(_MD("stop_joy_vibration", "device"), &Input::stop_joy_vibration);
- ObjectTypeDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer);
- ObjectTypeDB::bind_method(_MD("get_magnetometer"),&Input::get_magnetometer);
- ObjectTypeDB::bind_method(_MD("get_gyroscope"),&Input::get_gyroscope);
- //ObjectTypeDB::bind_method(_MD("get_mouse_pos"),&Input::get_mouse_pos); - this is not the function you want
- 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);
- ObjectTypeDB::bind_method(_MD("warp_mouse_pos","to"),&Input::warp_mouse_pos);
- ObjectTypeDB::bind_method(_MD("action_press","action"),&Input::action_press);
- ObjectTypeDB::bind_method(_MD("action_release","action"),&Input::action_release);
- ObjectTypeDB::bind_method(_MD("set_custom_mouse_cursor","image:Texture","hotspot"),&Input::set_custom_mouse_cursor,DEFVAL(Vector2()));
+ ClassDB::bind_method(_MD("is_key_pressed","scancode"),&Input::is_key_pressed);
+ ClassDB::bind_method(_MD("is_mouse_button_pressed","button"),&Input::is_mouse_button_pressed);
+ ClassDB::bind_method(_MD("is_joy_button_pressed","device","button"),&Input::is_joy_button_pressed);
+ ClassDB::bind_method(_MD("is_action_pressed","action"),&Input::is_action_pressed);
+ ClassDB::bind_method(_MD("is_action_just_pressed","action"),&Input::is_action_just_pressed);
+ ClassDB::bind_method(_MD("is_action_just_released","action"),&Input::is_action_just_released);
+ ClassDB::bind_method(_MD("add_joy_mapping","mapping", "update_existing"),&Input::add_joy_mapping, DEFVAL(false));
+ ClassDB::bind_method(_MD("remove_joy_mapping","guid"),&Input::remove_joy_mapping);
+ ClassDB::bind_method(_MD("is_joy_known","device"),&Input::is_joy_known);
+ ClassDB::bind_method(_MD("get_joy_axis","device","axis"),&Input::get_joy_axis);
+ ClassDB::bind_method(_MD("get_joy_name","device"),&Input::get_joy_name);
+ ClassDB::bind_method(_MD("get_joy_guid","device"),&Input::get_joy_guid);
+ ClassDB::bind_method(_MD("get_connected_joysticks"),&Input::get_connected_joysticks);
+ ClassDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength);
+ ClassDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration);
+ ClassDB::bind_method(_MD("get_joy_button_string", "button_index"), &Input::get_joy_button_string);
+ ClassDB::bind_method(_MD("get_joy_button_index_from_string", "button"), &Input::get_joy_button_index_from_string);
+ ClassDB::bind_method(_MD("get_joy_axis_string", "axis_index"), &Input::get_joy_axis_string);
+ ClassDB::bind_method(_MD("get_joy_axis_index_from_string", "axis"), &Input::get_joy_axis_index_from_string);
+ ClassDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0));
+ ClassDB::bind_method(_MD("stop_joy_vibration", "device"), &Input::stop_joy_vibration);
+ ClassDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer);
+ ClassDB::bind_method(_MD("get_magnetometer"),&Input::get_magnetometer);
+ ClassDB::bind_method(_MD("get_gyroscope"),&Input::get_gyroscope);
+ //ClassDB::bind_method(_MD("get_mouse_pos"),&Input::get_mouse_pos); - this is not the function you want
+ ClassDB::bind_method(_MD("get_mouse_speed"),&Input::get_mouse_speed);
+ ClassDB::bind_method(_MD("get_mouse_button_mask"),&Input::get_mouse_button_mask);
+ ClassDB::bind_method(_MD("set_mouse_mode","mode"),&Input::set_mouse_mode);
+ ClassDB::bind_method(_MD("get_mouse_mode"),&Input::get_mouse_mode);
+ ClassDB::bind_method(_MD("warp_mouse_pos","to"),&Input::warp_mouse_pos);
+ ClassDB::bind_method(_MD("action_press","action"),&Input::action_press);
+ ClassDB::bind_method(_MD("action_release","action"),&Input::action_release);
+ ClassDB::bind_method(_MD("set_custom_mouse_cursor","image:Texture","hotspot"),&Input::set_custom_mouse_cursor,DEFVAL(Vector2()));
BIND_CONSTANT( MOUSE_MODE_VISIBLE );
BIND_CONSTANT( MOUSE_MODE_HIDDEN );