diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-12 00:51:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-12 00:51:08 -0300 |
| commit | 83cb84753fb17d0c3e4dbe15388279ee93f97e3e (patch) | |
| tree | 202b22d5061cc3b79d2ffca8280d50e1ad107a72 /scene/3d/collision_object.cpp | |
| parent | c84d618b4ea944e5c386d21f45265f9cb6fa783e (diff) | |
| download | redot-engine-83cb84753fb17d0c3e4dbe15388279ee93f97e3e.tar.gz | |
Renamed most signals so they refer to:
-An action being requested to the user in present tense: (ie, draw, gui_input, etc)
-A notification that an action happened, in past tense (ie, area_entered, modal_closed, etc).
Diffstat (limited to 'scene/3d/collision_object.cpp')
| -rw-r--r-- | scene/3d/collision_object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index 29df7e6395..0660d0bdad 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -190,7 +190,7 @@ void CollisionObject::_mouse_enter() { if (get_script_instance()) { get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_enter); } - emit_signal(SceneStringNames::get_singleton()->mouse_enter); + emit_signal(SceneStringNames::get_singleton()->mouse_entered); } @@ -199,7 +199,7 @@ void CollisionObject::_mouse_exit() { if (get_script_instance()) { get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_exit); } - emit_signal(SceneStringNames::get_singleton()->mouse_exit); + emit_signal(SceneStringNames::get_singleton()->mouse_exited); } @@ -247,8 +247,8 @@ void CollisionObject::_bind_methods() { BIND_VMETHOD( MethodInfo("_input_event",PropertyInfo(Variant::OBJECT,"camera"),PropertyInfo(Variant::INPUT_EVENT,"event"),PropertyInfo(Variant::VECTOR3,"click_pos"),PropertyInfo(Variant::VECTOR3,"click_normal"),PropertyInfo(Variant::INT,"shape_idx"))); ADD_SIGNAL( MethodInfo("input_event",PropertyInfo(Variant::OBJECT,"camera"),PropertyInfo(Variant::INPUT_EVENT,"event"),PropertyInfo(Variant::VECTOR3,"click_pos"),PropertyInfo(Variant::VECTOR3,"click_normal"),PropertyInfo(Variant::INT,"shape_idx"))); - ADD_SIGNAL( MethodInfo("mouse_enter")); - ADD_SIGNAL( MethodInfo("mouse_exit")); + ADD_SIGNAL( MethodInfo("mouse_entered")); + ADD_SIGNAL( MethodInfo("mouse_exited")); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"input_ray_pickable"),_SCS("set_ray_pickable"),_SCS("is_ray_pickable")); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"input_capture_on_drag"),_SCS("set_capture_input_on_drag"),_SCS("get_capture_input_on_drag")); |