diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 12:47:24 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 12:50:02 +0100 |
| commit | 411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (patch) | |
| tree | a3c28058efb7a80faed23bff683fe0931859ed52 | |
| parent | bf64df4427836a4e7a5060ee11d75eea6da79b14 (diff) | |
Rename the _MD macro to D_METHOD
This new name also makes its purpose a little clearer
This is a step towards fixing #56
297 files changed, 5654 insertions, 5652 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 636a3f07c1..7bd652349d 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -110,12 +110,12 @@ bool _ResourceLoader::has(const String &p_path) { void _ResourceLoader::_bind_methods() { - ClassDB::bind_method(_MD("load_interactive:ResourceInteractiveLoader","path","type_hint"),&_ResourceLoader::load_interactive,DEFVAL("")); - ClassDB::bind_method(_MD("load:Resource","path","type_hint", "p_no_cache"),&_ResourceLoader::load,DEFVAL(""), DEFVAL(false)); - ClassDB::bind_method(_MD("get_recognized_extensions_for_type","type"),&_ResourceLoader::get_recognized_extensions_for_type); - ClassDB::bind_method(_MD("set_abort_on_missing_resources","abort"),&_ResourceLoader::set_abort_on_missing_resources); - ClassDB::bind_method(_MD("get_dependencies","path"),&_ResourceLoader::get_dependencies); - ClassDB::bind_method(_MD("has","path"),&_ResourceLoader::has); + ClassDB::bind_method(D_METHOD("load_interactive:ResourceInteractiveLoader","path","type_hint"),&_ResourceLoader::load_interactive,DEFVAL("")); + ClassDB::bind_method(D_METHOD("load:Resource","path","type_hint", "p_no_cache"),&_ResourceLoader::load,DEFVAL(""), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_recognized_extensions_for_type","type"),&_ResourceLoader::get_recognized_extensions_for_type); + ClassDB::bind_method(D_METHOD("set_abort_on_missing_resources","abort"),&_ResourceLoader::set_abort_on_missing_resources); + ClassDB::bind_method(D_METHOD("get_dependencies","path"),&_ResourceLoader::get_dependencies); + ClassDB::bind_method(D_METHOD("has","path"),&_ResourceLoader::has); } _ResourceLoader::_ResourceLoader() { @@ -148,8 +148,8 @@ _ResourceSaver *_ResourceSaver::singleton=NULL; void _ResourceSaver::_bind_methods() { - ClassDB::bind_method(_MD("save","path","resource:Resource","flags"),&_ResourceSaver::save,DEFVAL(0)); - ClassDB::bind_method(_MD("get_recognized_extensions","type"),&_ResourceSaver::get_recognized_extensions); + ClassDB::bind_method(D_METHOD("save","path","resource:Resource","flags"),&_ResourceSaver::save,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_recognized_extensions","type"),&_ResourceSaver::get_recognized_extensions); BIND_CONSTANT(FLAG_RELATIVE_PATHS); BIND_CONSTANT(FLAG_BUNDLE_RESOURCES); @@ -973,145 +973,145 @@ _OS *_OS::singleton=NULL; void _OS::_bind_methods() { - //ClassDB::bind_method(_MD("get_mouse_pos"),&_OS::get_mouse_pos); - //ClassDB::bind_method(_MD("is_mouse_grab_enabled"),&_OS::is_mouse_grab_enabled); + //ClassDB::bind_method(D_METHOD("get_mouse_pos"),&_OS::get_mouse_pos); + //ClassDB::bind_method(D_METHOD("is_mouse_grab_enabled"),&_OS::is_mouse_grab_enabled); - ClassDB::bind_method(_MD("set_clipboard","clipboard"),&_OS::set_clipboard); - ClassDB::bind_method(_MD("get_clipboard"),&_OS::get_clipboard); + ClassDB::bind_method(D_METHOD("set_clipboard","clipboard"),&_OS::set_clipboard); + ClassDB::bind_method(D_METHOD("get_clipboard"),&_OS::get_clipboard); //will not delete for now, just unexpose - //ClassDB::bind_method(_MD("set_video_mode","size","fullscreen","resizable","screen"),&_OS::set_video_mode,DEFVAL(0)); - //ClassDB::bind_method(_MD("get_video_mode_size","screen"),&_OS::get_video_mode,DEFVAL(0)); - //ClassDB::bind_method(_MD("is_video_mode_fullscreen","screen"),&_OS::is_video_mode_fullscreen,DEFVAL(0)); - //ClassDB::bind_method(_MD("is_video_mode_resizable","screen"),&_OS::is_video_mode_resizable,DEFVAL(0)); - //ClassDB::bind_method(_MD("get_fullscreen_mode_list","screen"),&_OS::get_fullscreen_mode_list,DEFVAL(0)); - - - ClassDB::bind_method(_MD("get_screen_count"),&_OS::get_screen_count); - ClassDB::bind_method(_MD("get_current_screen"),&_OS::get_current_screen); - ClassDB::bind_method(_MD("set_current_screen","screen"),&_OS::set_current_screen); - ClassDB::bind_method(_MD("get_screen_position","screen"),&_OS::get_screen_position,DEFVAL(0)); - ClassDB::bind_method(_MD("get_screen_size","screen"),&_OS::get_screen_size,DEFVAL(0)); - ClassDB::bind_method(_MD("get_screen_dpi","screen"),&_OS::get_screen_dpi,DEFVAL(0)); - ClassDB::bind_method(_MD("get_window_position"),&_OS::get_window_position); - ClassDB::bind_method(_MD("set_window_position","position"),&_OS::set_window_position); - ClassDB::bind_method(_MD("get_window_size"),&_OS::get_window_size); - ClassDB::bind_method(_MD("set_window_size","size"),&_OS::set_window_size); - ClassDB::bind_method(_MD("set_window_fullscreen","enabled"),&_OS::set_window_fullscreen); - ClassDB::bind_method(_MD("is_window_fullscreen"),&_OS::is_window_fullscreen); - ClassDB::bind_method(_MD("set_window_resizable","enabled"),&_OS::set_window_resizable); - ClassDB::bind_method(_MD("is_window_resizable"),&_OS::is_window_resizable); - ClassDB::bind_method(_MD("set_window_minimized", "enabled"),&_OS::set_window_minimized); - ClassDB::bind_method(_MD("is_window_minimized"),&_OS::is_window_minimized); - ClassDB::bind_method(_MD("set_window_maximized", "enabled"),&_OS::set_window_maximized); - ClassDB::bind_method(_MD("is_window_maximized"),&_OS::is_window_maximized); - ClassDB::bind_method(_MD("request_attention"), &_OS::request_attention); - - ClassDB::bind_method(_MD("set_borderless_window", "borderless"), &_OS::set_borderless_window); - ClassDB::bind_method(_MD("get_borderless_window"), &_OS::get_borderless_window); - - ClassDB::bind_method(_MD("set_screen_orientation","orientation"),&_OS::set_screen_orientation); - ClassDB::bind_method(_MD("get_screen_orientation"),&_OS::get_screen_orientation); - - ClassDB::bind_method(_MD("set_keep_screen_on","enabled"),&_OS::set_keep_screen_on); - ClassDB::bind_method(_MD("is_keep_screen_on"),&_OS::is_keep_screen_on); - - - ClassDB::bind_method(_MD("has_touchscreen_ui_hint"),&_OS::has_touchscreen_ui_hint); - - ClassDB::bind_method(_MD("set_window_title","title"),&_OS::set_window_title); - - ClassDB::bind_method(_MD("set_low_processor_usage_mode","enable"),&_OS::set_low_processor_usage_mode); - ClassDB::bind_method(_MD("is_in_low_processor_usage_mode"),&_OS::is_in_low_processor_usage_mode); - - ClassDB::bind_method(_MD("get_processor_count"),&_OS::get_processor_count); - - ClassDB::bind_method(_MD("get_executable_path"),&_OS::get_executable_path); - ClassDB::bind_method(_MD("execute","path","arguments","blocking","output"),&_OS::execute,DEFVAL(Array())); - ClassDB::bind_method(_MD("kill","pid"),&_OS::kill); - ClassDB::bind_method(_MD("shell_open","uri"),&_OS::shell_open); - ClassDB::bind_method(_MD("get_process_ID"),&_OS::get_process_ID); - - ClassDB::bind_method(_MD("get_environment","environment"),&_OS::get_environment); - ClassDB::bind_method(_MD("has_environment","environment"),&_OS::has_environment); - - ClassDB::bind_method(_MD("get_name"),&_OS::get_name); - ClassDB::bind_method(_MD("get_cmdline_args"),&_OS::get_cmdline_args); - - ClassDB::bind_method(_MD("get_datetime","utc"),&_OS::get_datetime,DEFVAL(false)); - ClassDB::bind_method(_MD("get_date","utc"),&_OS::get_date,DEFVAL(false)); - ClassDB::bind_method(_MD("get_time","utc"),&_OS::get_time,DEFVAL(false)); - ClassDB::bind_method(_MD("get_time_zone_info"),&_OS::get_time_zone_info); - ClassDB::bind_method(_MD("get_unix_time"),&_OS::get_unix_time); - ClassDB::bind_method(_MD("get_datetime_from_unix_time", "unix_time_val"), + //ClassDB::bind_method(D_METHOD("set_video_mode","size","fullscreen","resizable","screen"),&_OS::set_video_mode,DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("get_video_mode_size","screen"),&_OS::get_video_mode,DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("is_video_mode_fullscreen","screen"),&_OS::is_video_mode_fullscreen,DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("is_video_mode_resizable","screen"),&_OS::is_video_mode_resizable,DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("get_fullscreen_mode_list","screen"),&_OS::get_fullscreen_mode_list,DEFVAL(0)); + + + ClassDB::bind_method(D_METHOD("get_screen_count"),&_OS::get_screen_count); + ClassDB::bind_method(D_METHOD("get_current_screen"),&_OS::get_current_screen); + ClassDB::bind_method(D_METHOD("set_current_screen","screen"),&_OS::set_current_screen); + ClassDB::bind_method(D_METHOD("get_screen_position","screen"),&_OS::get_screen_position,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_screen_size","screen"),&_OS::get_screen_size,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_screen_dpi","screen"),&_OS::get_screen_dpi,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_window_position"),&_OS::get_window_position); + ClassDB::bind_method(D_METHOD("set_window_position","position"),&_OS::set_window_position); + ClassDB::bind_method(D_METHOD("get_window_size"),&_OS::get_window_size); + ClassDB::bind_method(D_METHOD("set_window_size","size"),&_OS::set_window_size); + ClassDB::bind_method(D_METHOD("set_window_fullscreen","enabled"),&_OS::set_window_fullscreen); + ClassDB::bind_method(D_METHOD("is_window_fullscreen"),&_OS::is_window_fullscreen); + ClassDB::bind_method(D_METHOD("set_window_resizable","enabled"),&_OS::set_window_resizable); + ClassDB::bind_method(D_METHOD("is_window_resizable"),&_OS::is_window_resizable); + ClassDB::bind_method(D_METHOD("set_window_minimized", "enabled"),&_OS::set_window_minimized); + ClassDB::bind_method(D_METHOD("is_window_minimized"),&_OS::is_window_minimized); + ClassDB::bind_method(D_METHOD("set_window_maximized", "enabled"),&_OS::set_window_maximized); + ClassDB::bind_method(D_METHOD("is_window_maximized"),&_OS::is_window_maximized); + ClassDB::bind_method(D_METHOD("request_attention"), &_OS::request_attention); + + ClassDB::bind_method(D_METHOD("set_borderless_window", "borderless"), &_OS::set_borderless_window); + ClassDB::bind_method(D_METHOD("get_borderless_window"), &_OS::get_borderless_window); + + ClassDB::bind_method(D_METHOD("set_screen_orientation","orientation"),&_OS::set_screen_orientation); + ClassDB::bind_method(D_METHOD("get_screen_orientation"),&_OS::get_screen_orientation); + + ClassDB::bind_method(D_METHOD("set_keep_screen_on","enabled"),&_OS::set_keep_screen_on); + ClassDB::bind_method(D_METHOD("is_keep_screen_on"),&_OS::is_keep_screen_on); + + + ClassDB::bind_method(D_METHOD("has_touchscreen_ui_hint"),&_OS::has_touchscreen_ui_hint); + + ClassDB::bind_method(D_METHOD("set_window_title","title"),&_OS::set_window_title); + + ClassDB::bind_method(D_METHOD("set_low_processor_usage_mode","enable"),&_OS::set_low_processor_usage_mode); + ClassDB::bind_method(D_METHOD("is_in_low_processor_usage_mode"),&_OS::is_in_low_processor_usage_mode); + + ClassDB::bind_method(D_METHOD("get_processor_count"),&_OS::get_processor_count); + + ClassDB::bind_method(D_METHOD("get_executable_path"),&_OS::get_executable_path); + ClassDB::bind_method(D_METHOD("execute","path","arguments","blocking","output"),&_OS::execute,DEFVAL(Array())); + ClassDB::bind_method(D_METHOD("kill","pid"),&_OS::kill); + ClassDB::bind_method(D_METHOD("shell_open","uri"),&_OS::shell_open); + ClassDB::bind_method(D_METHOD("get_process_ID"),&_OS::get_process_ID); + + ClassDB::bind_method(D_METHOD("get_environment","environment"),&_OS::get_environment); + ClassDB::bind_method(D_METHOD("has_environment","environment"),&_OS::has_environment); + + ClassDB::bind_method(D_METHOD("get_name"),&_OS::get_name); + ClassDB::bind_method(D_METHOD("get_cmdline_args"),&_OS::get_cmdline_args); + + ClassDB::bind_method(D_METHOD("get_datetime","utc"),&_OS::get_datetime,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_date","utc"),&_OS::get_date,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_time","utc"),&_OS::get_time,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_time_zone_info"),&_OS::get_time_zone_info); + ClassDB::bind_method(D_METHOD("get_unix_time"),&_OS::get_unix_time); + ClassDB::bind_method(D_METHOD("get_datetime_from_unix_time", "unix_time_val"), &_OS::get_datetime_from_unix_time); - ClassDB::bind_method(_MD("get_unix_time_from_datetime", "datetime"), + ClassDB::bind_method(D_METHOD("get_unix_time_from_datetime", "datetime"), &_OS::get_unix_time_from_datetime); - ClassDB::bind_method(_MD("get_system_time_secs"), &_OS::get_system_time_secs); + ClassDB::bind_method(D_METHOD("get_system_time_secs"), &_OS::get_system_time_secs); - ClassDB::bind_method(_MD("set_icon","icon"),&_OS::set_icon); + ClassDB::bind_method(D_METHOD("set_icon","icon"),&_OS::set_icon); - ClassDB::bind_method(_MD("get_exit_code"),&_OS::get_exit_code); - ClassDB::bind_method(_MD("set_exit_code","code"),&_OS::set_exit_code); + ClassDB::bind_method(D_METHOD("get_exit_code"),&_OS::get_exit_code); + ClassDB::bind_method(D_METHOD("set_exit_code","code"),&_OS::set_exit_code); - ClassDB::bind_method(_MD("delay_usec","usec"),&_OS::delay_usec); - ClassDB::bind_method(_MD("delay_msec","msec"),&_OS::delay_msec); - ClassDB::bind_method(_MD("get_ticks_msec"),&_OS::get_ticks_msec); - ClassDB::bind_method(_MD("get_splash_tick_msec"),&_OS::get_splash_tick_msec); - ClassDB::bind_method(_MD("get_locale"),&_OS::get_locale); - ClassDB::bind_method(_MD("get_latin_keyboard_variant"),&_OS::get_latin_keyboard_variant); - ClassDB::bind_method(_MD("get_model_name"),&_OS::get_model_name); + ClassDB::bind_method(D_METHOD("delay_usec","usec"),&_OS::delay_usec); + ClassDB::bind_method(D_METHOD("delay_msec","msec"),&_OS::delay_msec); + ClassDB::bind_method(D_METHOD("get_ticks_msec"),&_OS::get_ticks_msec); + ClassDB::bind_method(D_METHOD("get_splash_tick_msec"),&_OS::get_splash_tick_msec); + ClassDB::bind_method(D_METHOD("get_locale"),&_OS::get_locale); + ClassDB::bind_method(D_METHOD("get_latin_keyboard_variant"),&_OS::get_latin_keyboard_variant); + ClassDB::bind_method(D_METHOD("get_model_name"),&_OS::get_model_name); - ClassDB::bind_method(_MD("can_draw"),&_OS::can_draw); - ClassDB::bind_method(_MD("is_stdout_verbose"),&_OS::is_stdout_verbose); + ClassDB::bind_method(D_METHOD("can_draw"),&_OS::can_draw); + ClassDB::bind_method(D_METHOD("is_stdout_verbose"),&_OS::is_stdout_verbose); - ClassDB::bind_method(_MD("can_use_threads"),&_OS::can_use_threads); + ClassDB::bind_method(D_METHOD("can_use_threads"),&_OS::can_use_threads); - ClassDB::bind_method(_MD("is_debug_build"),&_OS::is_debug_build); + ClassDB::bind_method(D_METHOD("is_debug_build"),&_OS::is_debug_build); - //ClassDB::bind_method(_MD("get_mouse_button_state"),&_OS::get_mouse_button_state); + //ClassDB::bind_method(D_METHOD("get_mouse_button_state"),&_OS::get_mouse_button_state); - ClassDB::bind_method(_MD("dump_memory_to_file","file"),&_OS::dump_memory_to_file); - ClassDB::bind_method(_MD("dump_resources_to_file","file"),&_OS::dump_resources_to_file); - ClassDB::bind_method(_MD("has_virtual_keyboard"),&_OS::has_virtual_keyboard); - ClassDB::bind_method(_MD("show_virtual_keyboard", "existing_text"),&_OS::show_virtual_keyboard,DEFVAL("")); - ClassDB::bind_method(_MD("hide_virtual_keyboard"),&_OS::hide_virtual_keyboard); - ClassDB::bind_method(_MD("print_resources_in_use","short"),&_OS::print_resources_in_use,DEFVAL(false)); - ClassDB::bind_method(_MD("print_all_resources","tofile"),&_OS::print_all_resources,DEFVAL("")); + ClassDB::bind_method(D_METHOD("dump_memory_to_file","file"),&_OS::dump_memory_to_file); + ClassDB::bind_method(D_METHOD("dump_resources_to_file","file"),&_OS::dump_resources_to_file); + ClassDB::bind_method(D_METHOD("has_virtual_keyboard"),&_OS::has_virtual_keyboard); + ClassDB::bind_method(D_METHOD("show_virtual_keyboard", "existing_text"),&_OS::show_virtual_keyboard,DEFVAL("")); + ClassDB::bind_method(D_METHOD("hide_virtual_keyboard"),&_OS::hide_virtual_keyboard); + ClassDB::bind_method(D_METHOD("print_resources_in_use","short"),&_OS::print_resources_in_use,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("print_all_resources","tofile"),&_OS::print_all_resources,DEFVAL("")); - ClassDB::bind_method(_MD("get_static_memory_usage"),&_OS::get_static_memory_usage); - ClassDB::bind_method(_MD("get_static_memory_peak_usage"),&_OS::get_static_memory_peak_usage); - ClassDB::bind_method(_MD("get_dynamic_memory_usage"),&_OS::get_dynamic_memory_usage); + ClassDB::bind_method(D_METHOD("get_static_memory_usage"),&_OS::get_static_memory_usage); + ClassDB::bind_method(D_METHOD("get_static_memory_peak_usage"),&_OS::get_static_memory_peak_usage); + ClassDB::bind_method(D_METHOD("get_dynamic_memory_usage"),&_OS::get_dynamic_memory_usage); - ClassDB::bind_method(_MD("get_data_dir"),&_OS::get_data_dir); - ClassDB::bind_method(_MD("get_system_dir","dir"),&_OS::get_system_dir); - ClassDB::bind_method(_MD("get_unique_ID"),&_OS::get_unique_ID); + ClassDB::bind_method(D_METHOD("get_data_dir"),&_OS::get_data_dir); + ClassDB::bind_method(D_METHOD("get_system_dir","dir"),&_OS::get_system_dir); + ClassDB::bind_method(D_METHOD("get_unique_ID"),&_OS::get_unique_ID); - ClassDB::bind_method(_MD("is_ok_left_and_cancel_right"),&_OS::is_ok_left_and_cancel_right); + ClassDB::bind_method(D_METHOD("is_ok_left_and_cancel_right"),&_OS::is_ok_left_and_cancel_right); - ClassDB::bind_method(_MD("print_all_textures_by_size"),&_OS::print_all_textures_by_size); - ClassDB::bind_method(_MD("print_resources_by_type","types"),&_OS::print_resources_by_type); + ClassDB::bind_method(D_METHOD("print_all_textures_by_size"),&_OS::print_all_textures_by_size); + ClassDB::bind_method(D_METHOD("print_resources_by_type","types"),&_OS::print_resources_by_type); - ClassDB::bind_method(_MD("native_video_play","path","volume","audio_track","subtitle_track"),&_OS::native_video_play); - ClassDB::bind_method(_MD("native_video_is_playing"),&_OS::native_video_is_playing); - ClassDB::bind_method(_MD("native_video_stop"),&_OS::native_video_stop); - ClassDB::bind_method(_MD("native_video_pause"),&_OS::native_video_pause); - ClassDB::bind_method(_MD("native_video_unpause"),&_OS::native_video_unpause); + ClassDB::bind_method(D_METHOD("native_video_play","path","volume","audio_track","subtitle_track"),&_OS::native_video_play); + ClassDB::bind_method(D_METHOD("native_video_is_playing"),&_OS::native_video_is_playing); + ClassDB::bind_method(D_METHOD("native_video_stop"),&_OS::native_video_stop); + ClassDB::bind_method(D_METHOD("native_video_pause"),&_OS::native_video_pause); + ClassDB::bind_method(D_METHOD("native_video_unpause"),&_OS::native_video_unpause); - ClassDB::bind_method(_MD("get_scancode_string","code"),&_OS::get_scancode_string); - ClassDB::bind_method(_MD("is_scancode_unicode","code"),&_OS::is_scancode_unicode); - ClassDB::bind_method(_MD("find_scancode_from_string","string"),&_OS::find_scancode_from_string); + ClassDB::bind_method(D_METHOD("get_scancode_string","code"),&_OS::get_scancode_string); + ClassDB::bind_method(D_METHOD("is_scancode_unicode","code"),&_OS::is_scancode_unicode); + ClassDB::bind_method(D_METHOD("find_scancode_from_string","string"),&_OS::find_scancode_from_string); - ClassDB::bind_method(_MD("set_use_file_access_save_and_swap","enabled"),&_OS::set_use_file_access_save_and_swap); + ClassDB::bind_method(D_METHOD("set_use_file_access_save_and_swap","enabled"),&_OS::set_use_file_access_save_and_swap); - ClassDB::bind_method(_MD("alert","text","title"),&_OS::alert,DEFVAL("Alert!")); + ClassDB::bind_method(D_METHOD("alert","text","title"),&_OS::alert,DEFVAL("Alert!")); - ClassDB::bind_method(_MD("set_thread_name","name"),&_OS::set_thread_name); + ClassDB::bind_method(D_METHOD("set_thread_name","name"),&_OS::set_thread_name); - ClassDB::bind_method(_MD("set_use_vsync","enable"),&_OS::set_use_vsync); - ClassDB::bind_method(_MD("is_vsync_enabled"),&_OS::is_vsync_enabled); + ClassDB::bind_method(D_METHOD("set_use_vsync","enable"),&_OS::set_use_vsync); + ClassDB::bind_method(D_METHOD("is_vsync_enabled"),&_OS::is_vsync_enabled); BIND_CONSTANT( DAY_SUNDAY ); BIND_CONSTANT( DAY_MONDAY ); @@ -1333,29 +1333,29 @@ int _Geometry::get_uv84_normal_bit(const Vector3& p_vector) { void _Geometry::_bind_methods() { - ClassDB::bind_method(_MD("build_box_planes","extents"),&_Geometry::build_box_planes); - ClassDB::bind_method(_MD("build_cylinder_planes","radius","height","sides","axis"),&_Geometry::build_cylinder_planes,DEFVAL(Vector3::AXIS_Z)); - ClassDB::bind_method(_MD("build_capsule_planes","radius","height","sides","lats","axis"),&_Geometry::build_capsule_planes,DEFVAL(Vector3::AXIS_Z)); - ClassDB::bind_method(_MD("segment_intersects_circle","segment_from","segment_to","circle_pos","circle_radius"),&_Geometry::segment_intersects_circle); - ClassDB::bind_method(_MD("segment_intersects_segment_2d","from_a","to_a","from_b","to_b"),&_Geometry::segment_intersects_segment_2d); + ClassDB::bind_method(D_METHOD("build_box_planes","extents"),&_Geometry::build_box_planes); + ClassDB::bind_method(D_METHOD("build_cylinder_planes","radius","height","sides","axis"),&_Geometry::build_cylinder_planes,DEFVAL(Vector3::AXIS_Z)); + ClassDB::bind_method(D_METHOD("build_capsule_planes","radius","height","sides","lats","axis"),&_Geometry::build_capsule_planes,DEFVAL(Vector3::AXIS_Z)); + ClassDB::bind_method(D_METHOD("segment_intersects_circle","segment_from","segment_to","circle_pos","circle_radius"),&_Geometry::segment_intersects_circle); + ClassDB::bind_method(D_METHOD("segment_intersects_segment_2d","from_a","to_a","from_b","to_b"),&_Geometry::segment_intersects_segment_2d); - ClassDB::bind_method(_MD("get_closest_points_between_segments_2d","p1","q1","p2","q2"),&_Geometry::get_closest_points_between_segments_2d); - ClassDB::bind_method(_MD("get_closest_points_between_segments","p1","p2","q1","q2"),&_Geometry::get_closest_points_between_segments); + ClassDB::bind_method(D_METHOD("get_closest_points_between_segments_2d","p1","q1","p2","q2"),&_Geometry::get_closest_points_between_segments_2d); + ClassDB::bind_method(D_METHOD("get_closest_points_between_segments","p1","p2","q1","q2"),&_Geometry::get_closest_points_between_segments); - ClassDB::bind_method(_MD("get_closest_point_to_segment","point","s1","s2"),&_Geometry::get_closest_point_to_segment); + ClassDB::bind_method(D_METHOD("get_closest_point_to_segment","point","s1","s2"),&_Geometry::get_closest_point_to_segment); - ClassDB::bind_method(_MD("get_uv84_normal_bit","normal"),&_Geometry::get_uv84_normal_bit); + ClassDB::bind_method(D_METHOD("get_uv84_normal_bit","normal"),&_Geometry::get_uv84_normal_bit); - ClassDB::bind_method(_MD("ray_intersects_triangle","from","dir","a","b","c"),&_Geometry::ray_intersects_triangle); - ClassDB::bind_method(_MD("segment_intersects_triangle","from","to","a","b","c"),&_Geometry::segment_intersects_triangle); - ClassDB::bind_method(_MD("segment_intersects_sphere","from","to","spos","sradius"),&_Geometry::segment_intersects_sphere); - ClassDB::bind_method(_MD("segment_intersects_cylinder","from","to","height","radius"),&_Geometry::segment_intersects_cylinder); - ClassDB::bind_method(_MD("segment_intersects_convex","from","to","planes"),&_Geometry::segment_intersects_convex); - ClassDB::bind_method(_MD("point_is_inside_triangle","point","a","b","c"),&_Geometry::point_is_inside_triangle); + ClassDB::bind_method(D_METHOD("ray_intersects_triangle","from","dir","a","b","c"),&_Geometry::ray_intersects_triangle); + ClassDB::bind_method(D_METHOD("segment_intersects_triangle","from","to","a","b","c"),&_Geometry::segment_intersects_triangle); + ClassDB::bind_method(D_METHOD("segment_intersects_sphere","from","to","spos","sradius"),&_Geometry::segment_intersects_sphere); + ClassDB::bind_method(D_METHOD("segment_intersects_cylinder","from","to","height","radius"),&_Geometry::segment_intersects_cylinder); + ClassDB::bind_method(D_METHOD("segment_intersects_convex","from","to","planes"),&_Geometry::segment_intersects_convex); + ClassDB::bind_method(D_METHOD("point_is_inside_triangle","point","a","b","c"),&_Geometry::point_is_inside_triangle); - ClassDB::bind_method(_MD("triangulate_polygon","polygon"),&_Geometry::triangulate_polygon); + ClassDB::bind_method(D_METHOD("triangulate_polygon","polygon"),&_Geometry::triangulate_polygon); - ClassDB::bind_method(_MD("make_atlas","sizes"),&_Geometry::make_atlas); + ClassDB::bind_method(D_METHOD("make_atlas","sizes"),&_Geometry::make_atlas); } @@ -1735,52 +1735,52 @@ uint64_t _File::get_modified_time(const String &p_file) const { void _File::_bind_methods() { - ClassDB::bind_method(_MD("open_encrypted","path","mode_flags","key"),&_File::open_encrypted); - ClassDB::bind_method(_MD("open_encrypted_with_pass","path","mode_flags","pass"),&_File::open_encrypted_pass); - - ClassDB::bind_method(_MD("open","path","flags"),&_File::open); - ClassDB::bind_method(_MD("close"),&_File::close); - ClassDB::bind_method(_MD("is_open"),&_File::is_open); - ClassDB::bind_method(_MD("seek","pos"),&_File::seek); - ClassDB::bind_method(_MD("seek_end","pos"),&_File::seek_end,DEFVAL(0)); - ClassDB::bind_method(_MD("get_pos"),&_File::get_pos); - ClassDB::bind_method(_MD("get_len"),&_File::get_len); - ClassDB::bind_method(_MD("eof_reached"),&_File::eof_reached); - ClassDB::bind_method(_MD("get_8"),&_File::get_8); - ClassDB::bind_method(_MD("get_16"),&_File::get_16); - ClassDB::bind_method(_MD("get_32"),&_File::get_32); - ClassDB::bind_method(_MD("get_64"),&_File::get_64); - ClassDB::bind_method(_MD("get_float"),&_File::get_float); - ClassDB::bind_method(_MD("get_double"),&_File::get_double); - ClassDB::bind_method(_MD("get_real"),&_File::get_real); - ClassDB::bind_method(_MD("get_buffer","len"),&_File::get_buffer); - ClassDB::bind_method(_MD("get_line"),&_File::get_line); - ClassDB::bind_method(_MD("get_as_text"),&_File::get_as_text); - ClassDB::bind_method(_MD("get_md5","path"),&_File::get_md5); - ClassDB::bind_method(_MD("get_sha256","path"),&_File::get_sha256); - ClassDB::bind_method(_MD("get_endian_swap"),&_File::get_endian_swap); - ClassDB::bind_method(_MD("set_endian_swap","enable"),&_File::set_endian_swap); - ClassDB::bind_method(_MD("get_error:Error"),&_File::get_error); - ClassDB::bind_method(_MD("get_var"),&_File::get_var); - ClassDB::bind_method(_MD("get_csv_line","delim"),&_File::get_csv_line,DEFVAL(",")); - - ClassDB::bind_method(_MD("store_8","value"),&_File::store_8); - ClassDB::bind_method(_MD("store_16","value"),&_File::store_16); - ClassDB::bind_method(_MD("store_32","value"),&_File::store_32); - ClassDB::bind_method(_MD("store_64","value"),&_File::store_64); - ClassDB::bind_method(_MD("store_float","value"),&_File::store_float); - ClassDB::bind_method(_MD("store_double","value"),&_File::store_double); - ClassDB::bind_method(_MD("store_real","value"),&_File::store_real); - ClassDB::bind_method(_MD("store_buffer","buffer"),&_File::store_buffer); - ClassDB::bind_method(_MD("store_line","line"),&_File::store_line); - ClassDB::bind_method(_MD("store_string","string"),&_File::store_string); - ClassDB::bind_method(_MD("store_var","value"),&_File::store_var); - - ClassDB::bind_method(_MD("store_pascal_string","string"),&_File::store_pascal_string); - ClassDB::bind_method(_MD("get_pascal_string"),&_File::get_pascal_string); - - ClassDB::bind_method(_MD("file_exists","path"),&_File::file_exists); - ClassDB::bind_method(_MD("get_modified_time", "file"),&_File::get_modified_time); + ClassDB::bind_method(D_METHOD("open_encrypted","path","mode_flags","key"),&_File::open_encrypted); + ClassDB::bind_method(D_METHOD("open_encrypted_with_pass","path","mode_flags","pass"),&_File::open_encrypted_pass); + + ClassDB::bind_method(D_METHOD("open","path","flags"),&_File::open); + ClassDB::bind_method(D_METHOD("close"),&_File::close); + ClassDB::bind_method(D_METHOD("is_open"),&_File::is_open); + ClassDB::bind_method(D_METHOD("seek","pos"),&_File::seek); + ClassDB::bind_method(D_METHOD("seek_end","pos"),&_File::seek_end,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_pos"),&_File::get_pos); + ClassDB::bind_method(D_METHOD("get_len"),&_File::get_len); + ClassDB::bind_method(D_METHOD("eof_reached"),&_File::eof_reached); + ClassDB::bind_method(D_METHOD("get_8"),&_File::get_8); + ClassDB::bind_method(D_METHOD("get_16"),&_File::get_16); + ClassDB::bind_method(D_METHOD("get_32"),&_File::get_32); + ClassDB::bind_method(D_METHOD("get_64"),&_File::get_64); + ClassDB::bind_method(D_METHOD("get_float"),&_File::get_float); + ClassDB::bind_method(D_METHOD("get_double"),&_File::get_double); + ClassDB::bind_method(D_METHOD("get_real"),&_File::get_real); + ClassDB::bind_method(D_METHOD("get_buffer","len"),&_File::get_buffer); + ClassDB::bind_method(D_METHOD("get_line"),&_File::get_line); + ClassDB::bind_method(D_METHOD("get_as_text"),&_File::get_as_text); + ClassDB::bind_method(D_METHOD("get_md5","path"),&_File::get_md5); + ClassDB::bind_method(D_METHOD("get_sha256","path"),&_File::get_sha256); + ClassDB::bind_method(D_METHOD("get_endian_swap"),&_File::get_endian_swap); + ClassDB::bind_method(D_METHOD("set_endian_swap","enable"),&_File::set_endian_swap); + ClassDB::bind_method(D_METHOD("get_error:Error"),&_File::get_error); + ClassDB::bind_method(D_METHOD("get_var"),&_File::get_var); + ClassDB::bind_method(D_METHOD("get_csv_line","delim"),&_File::get_csv_line,DEFVAL(",")); + + ClassDB::bind_method(D_METHOD("store_8","value"),&_File::store_8); + ClassDB::bind_method(D_METHOD("store_16","value"),&_File::store_16); + ClassDB::bind_method(D_METHOD("store_32","value"),&_File::store_32); + ClassDB::bind_method(D_METHOD("store_64","value"),&_File::store_64); + ClassDB::bind_method(D_METHOD("store_float","value"),&_File::store_float); + ClassDB::bind_method(D_METHOD("store_double","value"),&_File::store_double); + ClassDB::bind_method(D_METHOD("store_real","value"),&_File::store_real); + ClassDB::bind_method(D_METHOD("store_buffer","buffer"),&_File::store_buffer); + ClassDB::bind_method(D_METHOD("store_line","line"),&_File::store_line); + ClassDB::bind_method(D_METHOD("store_string","string"),&_File::store_string); + ClassDB::bind_method(D_METHOD("store_var","value"),&_File::store_var); + + ClassDB::bind_method(D_METHOD("store_pascal_string","string"),&_File::store_pascal_string); + ClassDB::bind_method(D_METHOD("get_pascal_string"),&_File::get_pascal_string); + + ClassDB::bind_method(D_METHOD("file_exists","path"),&_File::file_exists); + ClassDB::bind_method(D_METHOD("get_modified_time", "file"),&_File::get_modified_time); BIND_CONSTANT( READ ); BIND_CONSTANT( WRITE ); @@ -1970,25 +1970,25 @@ Error _Directory::remove(String p_name){ void _Directory::_bind_methods() { - ClassDB::bind_method(_MD("open:Error","path"),&_Directory::open); - ClassDB::bind_method(_MD("list_dir_begin", "skip_navigational", "skip_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false)); - ClassDB::bind_method(_MD("get_next"),&_Directory::get_next); - ClassDB::bind_method(_MD("current_is_dir"),&_Directory::current_is_dir); - ClassDB::bind_method(_MD("list_dir_end"),&_Directory::list_dir_end); - ClassDB::bind_method(_MD("get_drive_count"),&_Directory::get_drive_count); - ClassDB::bind_method(_MD("get_drive","idx"),&_Directory::get_drive); - ClassDB::bind_method(_MD("get_current_drive"),&_Directory::get_current_drive); - ClassDB::bind_method(_MD("change_dir:Error","todir"),&_Directory::change_dir); - ClassDB::bind_method(_MD("get_current_dir"),&_Directory::get_current_dir); - ClassDB::bind_method(_MD("make_dir:Error","path"),&_Directory::make_dir); - ClassDB::bind_method(_MD("make_dir_recursive:Error","path"),&_Directory::make_dir_recursive); - ClassDB::bind_method(_MD("file_exists","path"),&_Directory::file_exists); - ClassDB::bind_method(_MD("dir_exists","path"),&_Directory::dir_exists); - //ClassDB::bind_method(_MD("get_modified_time","file"),&_Directory::get_modified_time); - ClassDB::bind_method(_MD("get_space_left"),&_Directory::get_space_left); - ClassDB::bind_method(_MD("copy:Error","from","to"),&_Directory::copy); - ClassDB::bind_method(_MD("rename:Error","from","to"),&_Directory::rename); - ClassDB::bind_method(_MD("remove:Error","path"),&_Directory::remove); + ClassDB::bind_method(D_METHOD("open:Error","path"),&_Directory::open); + ClassDB::bind_method(D_METHOD("list_dir_begin", "skip_navigational", "skip_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_next"),&_Directory::get_next); + ClassDB::bind_method(D_METHOD("current_is_dir"),&_Directory::current_is_dir); + ClassDB::bind_method(D_METHOD("list_dir_end"),&_Directory::list_dir_end); + ClassDB::bind_method(D_METHOD("get_drive_count"),&_Directory::get_drive_count); + ClassDB::bind_method(D_METHOD("get_drive","idx"),&_Directory::get_drive); + ClassDB::bind_method(D_METHOD("get_current_drive"),&_Directory::get_current_drive); + ClassDB::bind_method(D_METHOD("change_dir:Error","todir"),&_Directory::change_dir); + ClassDB::bind_method(D_METHOD("get_current_dir"),&_Directory::get_current_dir); + ClassDB::bind_method(D_METHOD("make_dir:Error","path"),&_Directory::make_dir); + ClassDB::bind_method(D_METHOD("make_dir_recursive:Error","path"),&_Directory::make_dir_recursive); + ClassDB::bind_method(D_METHOD("file_exists","path"),&_Directory::file_exists); + ClassDB::bind_method(D_METHOD("dir_exists","path"),&_Directory::dir_exists); + //ClassDB::bind_method(D_METHOD("get_modified_time","file"),&_Directory::get_modified_time); + ClassDB::bind_method(D_METHOD("get_space_left"),&_Directory::get_space_left); + ClassDB::bind_method(D_METHOD("copy:Error","from","to"),&_Directory::copy); + ClassDB::bind_method(D_METHOD("rename:Error","from","to"),&_Directory::rename); + ClassDB::bind_method(D_METHOD("remove:Error","path"),&_Directory::remove); } @@ -2128,14 +2128,14 @@ String _Marshalls::base64_to_utf8(const String& p_str) { void _Marshalls::_bind_methods() { - ClassDB::bind_method(_MD("variant_to_base64:String","variant"),&_Marshalls::variant_to_base64); - ClassDB::bind_method(_MD("base64_to_variant:Variant","base64_str"),&_Marshalls::base64_to_variant); + ClassDB::bind_method(D_METHOD("variant_to_base64:String","variant"),&_Marshalls::variant_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_variant:Variant","base64_str"),&_Marshalls::base64_to_variant); - ClassDB::bind_method(_MD("raw_to_base64:String","array"),&_Marshalls::raw_to_base64); - ClassDB::bind_method(_MD("base64_to_raw:RawArray","base64_str"),&_Marshalls::base64_to_raw); + ClassDB::bind_method(D_METHOD("raw_to_base64:String","array"),&_Marshalls::raw_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_raw:RawArray","base64_str"),&_Marshalls::base64_to_raw); - ClassDB::bind_method(_MD("utf8_to_base64:String","utf8_str"),&_Marshalls::utf8_to_base64); - ClassDB::bind_method(_MD("base64_to_utf8:String","base64_str"),&_Marshalls::base64_to_utf8); + ClassDB::bind_method(D_METHOD("utf8_to_base64:String","utf8_str"),&_Marshalls::utf8_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_utf8:String","base64_str"),&_Marshalls::base64_to_utf8); }; @@ -2159,8 +2159,8 @@ Error _Semaphore::post() { void _Semaphore::_bind_methods() { - ClassDB::bind_method(_MD("wait:Error"),&_Semaphore::wait); - ClassDB::bind_method(_MD("post:Error"),&_Semaphore::post); + ClassDB::bind_method(D_METHOD("wait:Error"),&_Semaphore::wait); + ClassDB::bind_method(D_METHOD("post:Error"),&_Semaphore::post); } @@ -2196,9 +2196,9 @@ void _Mutex::unlock(){ void _Mutex::_bind_methods() { - ClassDB::bind_method(_MD("lock"),&_Mutex::lock); - ClassDB::bind_method(_MD("try_lock:Error"),&_Mutex::try_lock); - ClassDB::bind_method(_MD("unlock"),&_Mutex::unlock); + ClassDB::bind_method(D_METHOD("lock"),&_Mutex::lock); + ClassDB::bind_method(D_METHOD("try_lock:Error"),&_Mutex::try_lock); + ClassDB::bind_method(D_METHOD("unlock"),&_Mutex::unlock); } @@ -2318,10 +2318,10 @@ Variant _Thread::wait_to_finish() { void _Thread::_bind_methods() { - ClassDB::bind_method(_MD("start:Error","instance","method","userdata","priority"),&_Thread::start,DEFVAL(Variant()),DEFVAL(PRIORITY_NORMAL)); - ClassDB::bind_method(_MD("get_id"),&_Thread::get_id); - ClassDB::bind_method(_MD("is_active"),&_Thread::is_active); - ClassDB::bind_method(_MD("wait_to_finish:Variant"),&_Thread::wait_to_finish); + ClassDB::bind_method(D_METHOD("start:Error","instance","method","userdata","priority"),&_Thread::start,DEFVAL(Variant()),DEFVAL(PRIORITY_NORMAL)); + ClassDB::bind_method(D_METHOD("get_id"),&_Thread::get_id); + ClassDB::bind_method(D_METHOD("is_active"),&_Thread::is_active); + ClassDB::bind_method(D_METHOD("wait_to_finish:Variant"),&_Thread::wait_to_finish); BIND_CONSTANT( PRIORITY_LOW ); BIND_CONSTANT( PRIORITY_NORMAL ); @@ -2506,31 +2506,31 @@ bool _ClassDB::is_class_enabled(StringName p_class) const { void _ClassDB::_bind_methods() { - ClassDB::bind_method(_MD("get_class_list"),&_ClassDB::get_class_list); - ClassDB::bind_method(_MD("get_inheriters_from_class","class"),&_ClassDB::get_inheriters_from_class); - ClassDB::bind_method(_MD("get_parent_class","class"),&_ClassDB::get_parent_class); - ClassDB::bind_method(_MD("class_exists","class"),&_ClassDB::class_exists); - ClassDB::bind_method(_MD("is_parent_class","class","inherits"),&_ClassDB::is_parent_class); - ClassDB::bind_method(_MD("can_instance","class"),&_ClassDB::can_instance); - ClassDB::bind_method(_MD("instance:Variant","class"),&_ClassDB::instance); + ClassDB::bind_method(D_METHOD("get_class_list"),&_ClassDB::get_class_list); + ClassDB::bind_method(D_METHOD("get_inheriters_from_class","class"),&_ClassDB::get_inheriters_from_class); + ClassDB::bind_method(D_METHOD("get_parent_class","class"),&_ClassDB::get_parent_class); + ClassDB::bind_method(D_METHOD("class_exists","class"),&_ClassDB::class_exists); + ClassDB::bind_method(D_METHOD("is_parent_class","class","inherits"),&_ClassDB::is_parent_class); + ClassDB::bind_method(D_METHOD("can_instance","class"),&_ClassDB::can_instance); + ClassDB::bind_method(D_METHOD("instance:Variant","class"),&_ClassDB::instance); - ClassDB::bind_method(_MD("class_has_signal","class","signal"),&_ClassDB::has_signal); - ClassDB::bind_method(_MD("class_get_signal","class","signal"),&_ClassDB::get_signal); - ClassDB::bind_method(_MD("class_get_signal_list","class","no_inheritance"),&_ClassDB::get_signal_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_has_signal","class","signal"),&_ClassDB::has_signal); + ClassDB::bind_method(D_METHOD("class_get_signal","class","signal"),&_ClassDB::get_signal); + ClassDB::bind_method(D_METHOD("class_get_signal_list","class","no_inheritance"),&_ClassDB::get_signal_list,DEFVAL(false)); - ClassDB::bind_method(_MD("class_get_property_list","class","no_inheritance"),&_ClassDB::get_property_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_get_property_list","class","no_inheritance"),&_ClassDB::get_property_list,DEFVAL(false)); - ClassDB::bind_method(_MD("class_has_method","class","method","no_inheritance"),&_ClassDB::has_method,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_has_method","class","method","no_inheritance"),&_ClassDB::has_method,DEFVAL(false)); - ClassDB::bind_method(_MD("class_get_method_list","class","no_inheritance"),&_ClassDB::get_method_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_get_method_list","class","no_inheritance"),&_ClassDB::get_method_list,DEFVAL(false)); - ClassDB::bind_method(_MD("class_get_integer_constant_list","class","no_inheritance"),&_ClassDB::get_integer_constant_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_get_integer_constant_list","class","no_inheritance"),&_ClassDB::get_integer_constant_list,DEFVAL(false)); - ClassDB::bind_method(_MD("class_has_integer_constant","class","name"),&_ClassDB::has_integer_constant); - ClassDB::bind_method(_MD("class_get_integer_constant","class","name"),&_ClassDB::get_integer_constant); + ClassDB::bind_method(D_METHOD("class_has_integer_constant","class","name"),&_ClassDB::has_integer_constant); + ClassDB::bind_method(D_METHOD("class_get_integer_constant","class","name"),&_ClassDB::get_integer_constant); - ClassDB::bind_method(_MD("class_get_category","class"),&_ClassDB::get_category); - ClassDB::bind_method(_MD("is_class_enabled","class"),&_ClassDB::is_class_enabled); + ClassDB::bind_method(D_METHOD("class_get_category","class"),&_ClassDB::get_category); + ClassDB::bind_method(D_METHOD("is_class_enabled","class"),&_ClassDB::is_class_enabled); } @@ -2604,22 +2604,22 @@ Dictionary _Engine::get_version_info() const { void _Engine::_bind_methods() { - ClassDB::bind_method(_MD("set_iterations_per_second","iterations_per_second"),&_Engine::set_iterations_per_second); - ClassDB::bind_method(_MD("get_iterations_per_second"),&_Engine::get_iterations_per_second); - ClassDB::bind_method(_MD("set_target_fps","target_fps"),&_Engine::set_target_fps); - ClassDB::bind_method(_MD("get_target_fps"),&_Engine::get_target_fps); + ClassDB::bind_method(D_METHOD("set_iterations_per_second","iterations_per_second"),&_Engine::set_iterations_per_second); + ClassDB::bind_method(D_METHOD("get_iterations_per_second"),&_Engine::get_iterations_per_second); + ClassDB::bind_method(D_METHOD("set_target_fps","target_fps"),&_Engine::set_target_fps); + ClassDB::bind_method(D_METHOD("get_target_fps"),&_Engine::get_target_fps); - ClassDB::bind_method(_MD("set_time_scale","time_scale"),&_Engine::set_time_scale); - ClassDB::bind_method(_MD("get_time_scale"),&_Engine::get_time_scale); + ClassDB::bind_method(D_METHOD("set_time_scale","time_scale"),&_Engine::set_time_scale); + ClassDB::bind_method(D_METHOD("get_time_scale"),&_Engine::get_time_scale); - ClassDB::bind_method(_MD("get_custom_level"),&_Engine::get_custom_level); + ClassDB::bind_method(D_METHOD("get_custom_level"),&_Engine::get_custom_level); - ClassDB::bind_method(_MD("get_frames_drawn"),&_Engine::get_frames_drawn); - ClassDB::bind_method(_MD("get_frames_per_second"),&_Engine::get_frames_per_second); + ClassDB::bind_method(D_METHOD("get_frames_drawn"),&_Engine::get_frames_drawn); + ClassDB::bind_method(D_METHOD("get_frames_per_second"),&_Engine::get_frames_per_second); - ClassDB::bind_method(_MD("get_main_loop:MainLoop"),&_Engine::get_main_loop); + ClassDB::bind_method(D_METHOD("get_main_loop:MainLoop"),&_Engine::get_main_loop); - ClassDB::bind_method(_MD("get_version_info"),&_Engine::get_version_info); + ClassDB::bind_method(D_METHOD("get_version_info"),&_Engine::get_version_info); } diff --git a/core/class_db.cpp b/core/class_db.cpp index 2a3a12b127..2eff8c07c7 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -47,14 +47,14 @@ ParamDef::ParamDef(const Variant& p_variant) { used=true; val=p_variant; } -MethodDefinition _MD(const char* p_name) { +MethodDefinition D_METHOD(const char* p_name) { MethodDefinition md; md.name=StaticCString::create(p_name); return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -62,7 +62,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1) { return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -72,7 +72,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2) { return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -83,7 +83,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -95,7 +95,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -109,7 +109,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -123,7 +123,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -138,7 +138,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -154,7 +154,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9) { MethodDefinition md; md.name=StaticCString::create(p_name); @@ -171,7 +171,7 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co return md; } -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9,const char *p_arg10) { +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9,const char *p_arg10) { MethodDefinition md; md.name=StaticCString::create(p_name); diff --git a/core/class_db.h b/core/class_db.h index a09a42423b..6e02d0bf46 100644 --- a/core/class_db.h +++ b/core/class_db.h @@ -81,17 +81,17 @@ struct MethodDefinition { -MethodDefinition _MD(const char* p_name); -MethodDefinition _MD(const char* p_name,const char *p_arg1); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9); -MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9,const char *p_arg10); +MethodDefinition D_METHOD(const char* p_name); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9); +MethodDefinition D_METHOD(const char* p_name,const char *p_arg1,const char *p_arg2,const char *p_arg3,const char *p_arg4,const char *p_arg5,const char *p_arg6,const char *p_arg7,const char *p_arg8,const char *p_arg9,const char *p_arg10); #else @@ -99,11 +99,13 @@ MethodDefinition _MD(const char* p_name,const char *p_arg1,const char *p_arg2,co #ifdef NO_VARIADIC_MACROS -static _FORCE_INLINE_ const char* _MD(const char* m_name, ...) { return m_name; } +static _FORCE_INLINE_ const char* D_METHOD(const char* m_name, ...) { return m_name; } #else -#define _MD(m_c, ...) m_c +// When DEBUG_METHODS_ENABLED is set this will let the engine know +// the argument names for easier debugging. +#define D_METHOD(m_c, ...) m_c #endif diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp index d39db5044b..570cf114f7 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -527,7 +527,7 @@ void PHashTranslation::_get_property_list( List<PropertyInfo> *p_list) const{ } void PHashTranslation::_bind_methods() { - ClassDB::bind_method(_MD("generate","from:Translation"),&PHashTranslation::generate); + ClassDB::bind_method(D_METHOD("generate","from:Translation"),&PHashTranslation::generate); } PHashTranslation::PHashTranslation() diff --git a/core/func_ref.cpp b/core/func_ref.cpp index 1e8c229810..2233615e25 100644 --- a/core/func_ref.cpp +++ b/core/func_ref.cpp @@ -65,8 +65,8 @@ void FuncRef::_bind_methods() { } - ClassDB::bind_method(_MD("set_instance","instance"),&FuncRef::set_instance); - ClassDB::bind_method(_MD("set_function","name"),&FuncRef::set_function); + ClassDB::bind_method(D_METHOD("set_instance","instance"),&FuncRef::set_instance); + ClassDB::bind_method(D_METHOD("set_function","name"),&FuncRef::set_function); } diff --git a/core/globals.cpp b/core/globals.cpp index ed0b6f6d8b..0c35a9f89a 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -900,22 +900,22 @@ Variant GlobalConfig::property_get_revert(const String& p_name) { void GlobalConfig::_bind_methods() { - ClassDB::bind_method(_MD("has","name"),&GlobalConfig::has); - ClassDB::bind_method(_MD("set_order","name","pos"),&GlobalConfig::set_order); - ClassDB::bind_method(_MD("get_order","name"),&GlobalConfig::get_order); - ClassDB::bind_method(_MD("set_initial_value","name","value"),&GlobalConfig::set_initial_value); - ClassDB::bind_method(_MD("add_property_info", "hint"),&GlobalConfig::_add_property_info_bind); - ClassDB::bind_method(_MD("clear","name"),&GlobalConfig::clear); - ClassDB::bind_method(_MD("localize_path","path"),&GlobalConfig::localize_path); - ClassDB::bind_method(_MD("globalize_path","path"),&GlobalConfig::globalize_path); - ClassDB::bind_method(_MD("save"),&GlobalConfig::save); - ClassDB::bind_method(_MD("has_singleton","name"),&GlobalConfig::has_singleton); - ClassDB::bind_method(_MD("get_singleton","name"),&GlobalConfig::get_singleton_object); - ClassDB::bind_method(_MD("load_resource_pack","pack"),&GlobalConfig::_load_resource_pack); - ClassDB::bind_method(_MD("property_can_revert","name"),&GlobalConfig::property_can_revert); - ClassDB::bind_method(_MD("property_get_revert","name"),&GlobalConfig::property_get_revert); - - ClassDB::bind_method(_MD("save_custom","file"),&GlobalConfig::_save_custom_bnd); + ClassDB::bind_method(D_METHOD("has","name"),&GlobalConfig::has); + ClassDB::bind_method(D_METHOD("set_order","name","pos"),&GlobalConfig::set_order); + ClassDB::bind_method(D_METHOD("get_order","name"),&GlobalConfig::get_order); + ClassDB::bind_method(D_METHOD("set_initial_value","name","value"),&GlobalConfig::set_initial_value); + ClassDB::bind_method(D_METHOD("add_property_info", "hint"),&GlobalConfig::_add_property_info_bind); + ClassDB::bind_method(D_METHOD("clear","name"),&GlobalConfig::clear); + ClassDB::bind_method(D_METHOD("localize_path","path"),&GlobalConfig::localize_path); + ClassDB::bind_method(D_METHOD("globalize_path","path"),&GlobalConfig::globalize_path); + ClassDB::bind_method(D_METHOD("save"),&GlobalConfig::save); + ClassDB::bind_method(D_METHOD("has_singleton","name"),&GlobalConfig::has_singleton); + ClassDB::bind_method(D_METHOD("get_singleton","name"),&GlobalConfig::get_singleton_object); + ClassDB::bind_method(D_METHOD("load_resource_pack","pack"),&GlobalConfig::_load_resource_pack); + ClassDB::bind_method(D_METHOD("property_can_revert","name"),&GlobalConfig::property_can_revert); + ClassDB::bind_method(D_METHOD("property_get_revert","name"),&GlobalConfig::property_get_revert); + + ClassDB::bind_method(D_METHOD("save_custom","file"),&GlobalConfig::_save_custom_bnd); } diff --git a/core/input_map.cpp b/core/input_map.cpp index dcce13ba1b..249c75cea0 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -35,19 +35,19 @@ InputMap *InputMap::singleton=NULL; void InputMap::_bind_methods() { - ClassDB::bind_method(_MD("has_action","action"),&InputMap::has_action); - ClassDB::bind_method(_MD("get_action_id","action"),&InputMap::get_action_id); - ClassDB::bind_method(_MD("get_action_from_id","id"),&InputMap::get_action_from_id); - ClassDB::bind_method(_MD("get_actions"),&InputMap::_get_actions); - ClassDB::bind_method(_MD("add_action","action"),&InputMap::add_action); - ClassDB::bind_method(_MD("erase_action","action"),&InputMap::erase_action); - - ClassDB::bind_method(_MD("action_add_event","action","event"),&InputMap::action_add_event); - ClassDB::bind_method(_MD("action_has_event","action","event"),&InputMap::action_has_event); - ClassDB::bind_method(_MD("action_erase_event","action","event"),&InputMap::action_erase_event); - ClassDB::bind_method(_MD("get_action_list","action"),&InputMap::_get_action_list); - ClassDB::bind_method(_MD("event_is_action","event","action"),&InputMap::event_is_action); - ClassDB::bind_method(_MD("load_from_globals"),&InputMap::load_from_globals); + ClassDB::bind_method(D_METHOD("has_action","action"),&InputMap::has_action); + ClassDB::bind_method(D_METHOD("get_action_id","action"),&InputMap::get_action_id); + ClassDB::bind_method(D_METHOD("get_action_from_id","id"),&InputMap::get_action_from_id); + ClassDB::bind_method(D_METHOD("get_actions"),&InputMap::_get_actions); + ClassDB::bind_method(D_METHOD("add_action","action"),&InputMap::add_action); + ClassDB::bind_method(D_METHOD("erase_action","action"),&InputMap::erase_action); + + ClassDB::bind_method(D_METHOD("action_add_event","action","event"),&InputMap::action_add_event); + ClassDB::bind_method(D_METHOD("action_has_event","action","event"),&InputMap::action_has_event); + ClassDB::bind_method(D_METHOD("action_erase_event","action","event"),&InputMap::action_erase_event); + ClassDB::bind_method(D_METHOD("get_action_list","action"),&InputMap::_get_action_list); + ClassDB::bind_method(D_METHOD("event_is_action","event","action"),&InputMap::event_is_action); + ClassDB::bind_method(D_METHOD("load_from_globals"),&InputMap::load_from_globals); } diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index b944906e78..fdfcc3ae3a 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -209,19 +209,19 @@ Error ConfigFile::load(const String& p_path) { void ConfigFile::_bind_methods(){ - ClassDB::bind_method(_MD("set_value","section","key","value"),&ConfigFile::set_value); - ClassDB::bind_method(_MD("get_value:Variant","section","key","default"),&ConfigFile::get_value,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("set_value","section","key","value"),&ConfigFile::set_value); + ClassDB::bind_method(D_METHOD("get_value:Variant","section","key","default"),&ConfigFile::get_value,DEFVAL(Variant())); - ClassDB::bind_method(_MD("has_section","section"),&ConfigFile::has_section); - ClassDB::bind_method(_MD("has_section_key","section","key"),&ConfigFile::has_section_key); + ClassDB::bind_method(D_METHOD("has_section","section"),&ConfigFile::has_section); + ClassDB::bind_method(D_METHOD("has_section_key","section","key"),&ConfigFile::has_section_key); - ClassDB::bind_method(_MD("get_sections"),&ConfigFile::_get_sections); - ClassDB::bind_method(_MD("get_section_keys","section"),&ConfigFile::_get_section_keys); + ClassDB::bind_method(D_METHOD("get_sections"),&ConfigFile::_get_sections); + ClassDB::bind_method(D_METHOD("get_section_keys","section"),&ConfigFile::_get_section_keys); - ClassDB::bind_method(_MD("erase_section","section"),&ConfigFile::erase_section); + ClassDB::bind_method(D_METHOD("erase_section","section"),&ConfigFile::erase_section); - ClassDB::bind_method(_MD("load:Error","path"),&ConfigFile::load); - ClassDB::bind_method(_MD("save:Error","path"),&ConfigFile::save); + ClassDB::bind_method(D_METHOD("load:Error","path"),&ConfigFile::load); + ClassDB::bind_method(D_METHOD("save:Error","path"),&ConfigFile::save); } diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 750c458dac..5c54f16f13 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -636,31 +636,31 @@ Error HTTPClient::_get_http_data(uint8_t* p_buffer, int p_bytes,int &r_received) void HTTPClient::_bind_methods() { - ClassDB::bind_method(_MD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true)); - ClassDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection); - ClassDB::bind_method(_MD("get_connection:StreamPeer"),&HTTPClient::get_connection); - ClassDB::bind_method(_MD("request_raw","method","url","headers","body"),&HTTPClient::request_raw); - ClassDB::bind_method(_MD("request","method","url","headers","body"),&HTTPClient::request,DEFVAL(String())); - ClassDB::bind_method(_MD("send_body_text","body"),&HTTPClient::send_body_text); - ClassDB::bind_method(_MD("send_body_data","body"),&HTTPClient::send_body_data); - ClassDB::bind_method(_MD("close"),&HTTPClient::close); - - ClassDB::bind_method(_MD("has_response"),&HTTPClient::has_response); - ClassDB::bind_method(_MD("is_response_chunked"),&HTTPClient::is_response_chunked); - ClassDB::bind_method(_MD("get_response_code"),&HTTPClient::get_response_code); - ClassDB::bind_method(_MD("get_response_headers"),&HTTPClient::_get_response_headers); - ClassDB::bind_method(_MD("get_response_headers_as_dictionary"),&HTTPClient::_get_response_headers_as_dictionary); - ClassDB::bind_method(_MD("get_response_body_length"),&HTTPClient::get_response_body_length); - ClassDB::bind_method(_MD("read_response_body_chunk"),&HTTPClient::read_response_body_chunk); - ClassDB::bind_method(_MD("set_read_chunk_size","bytes"),&HTTPClient::set_read_chunk_size); - - ClassDB::bind_method(_MD("set_blocking_mode","enabled"),&HTTPClient::set_blocking_mode); - ClassDB::bind_method(_MD("is_blocking_mode_enabled"),&HTTPClient::is_blocking_mode_enabled); - - ClassDB::bind_method(_MD("get_status"),&HTTPClient::get_status); - ClassDB::bind_method(_MD("poll:Error"),&HTTPClient::poll); - - ClassDB::bind_method(_MD("query_string_from_dict:String","fields"),&HTTPClient::query_string_from_dict); + ClassDB::bind_method(D_METHOD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true)); + ClassDB::bind_method(D_METHOD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection); + ClassDB::bind_method(D_METHOD("get_connection:StreamPeer"),&HTTPClient::get_connection); + ClassDB::bind_method(D_METHOD("request_raw","method","url","headers","body"),&HTTPClient::request_raw); + ClassDB::bind_method(D_METHOD("request","method","url","headers","body"),&HTTPClient::request,DEFVAL(String())); + ClassDB::bind_method(D_METHOD("send_body_text","body"),&HTTPClient::send_body_text); + ClassDB::bind_method(D_METHOD("send_body_data","body"),&HTTPClient::send_body_data); + ClassDB::bind_method(D_METHOD("close"),&HTTPClient::close); + + ClassDB::bind_method(D_METHOD("has_response"),&HTTPClient::has_response); + ClassDB::bind_method(D_METHOD("is_response_chunked"),&HTTPClient::is_response_chunked); + ClassDB::bind_method(D_METHOD("get_response_code"),&HTTPClient::get_response_code); + ClassDB::bind_method(D_METHOD("get_response_headers"),&HTTPClient::_get_response_headers); + ClassDB::bind_method(D_METHOD("get_response_headers_as_dictionary"),&HTTPClient::_get_response_headers_as_dictionary); + ClassDB::bind_method(D_METHOD("get_response_body_length"),&HTTPClient::get_response_body_length); + ClassDB::bind_method(D_METHOD("read_response_body_chunk"),&HTTPClient::read_response_body_chunk); + ClassDB::bind_method(D_METHOD("set_read_chunk_size","bytes"),&HTTPClient::set_read_chunk_size); + + ClassDB::bind_method(D_METHOD("set_blocking_mode","enabled"),&HTTPClient::set_blocking_mode); + ClassDB::bind_method(D_METHOD("is_blocking_mode_enabled"),&HTTPClient::is_blocking_mode_enabled); + + ClassDB::bind_method(D_METHOD("get_status"),&HTTPClient::get_status); + ClassDB::bind_method(D_METHOD("poll:Error"),&HTTPClient::poll); + + ClassDB::bind_method(D_METHOD("query_string_from_dict:String","fields"),&HTTPClient::query_string_from_dict); BIND_CONSTANT( METHOD_GET ); diff --git a/core/io/ip.cpp b/core/io/ip.cpp index 13e5494dd4..d820273a14 100644 --- a/core/io/ip.cpp +++ b/core/io/ip.cpp @@ -218,13 +218,13 @@ Array IP::_get_local_addresses() const { void IP::_bind_methods() { - ClassDB::bind_method(_MD("resolve_hostname","host","ip_type"),&IP::resolve_hostname,DEFVAL(IP::TYPE_ANY)); - ClassDB::bind_method(_MD("resolve_hostname_queue_item","host","ip_type"),&IP::resolve_hostname_queue_item,DEFVAL(IP::TYPE_ANY)); - ClassDB::bind_method(_MD("get_resolve_item_status","id"),&IP::get_resolve_item_status); - ClassDB::bind_method(_MD("get_resolve_item_address","id"),&IP::get_resolve_item_address); - ClassDB::bind_method(_MD("erase_resolve_item","id"),&IP::erase_resolve_item); - ClassDB::bind_method(_MD("get_local_addresses"),&IP::_get_local_addresses); - ClassDB::bind_method(_MD("clear_cache"),&IP::clear_cache, DEFVAL("")); + ClassDB::bind_method(D_METHOD("resolve_hostname","host","ip_type"),&IP::resolve_hostname,DEFVAL(IP::TYPE_ANY)); + ClassDB::bind_method(D_METHOD("resolve_hostname_queue_item","host","ip_type"),&IP::resolve_hostname_queue_item,DEFVAL(IP::TYPE_ANY)); + ClassDB::bind_method(D_METHOD("get_resolve_item_status","id"),&IP::get_resolve_item_status); + ClassDB::bind_method(D_METHOD("get_resolve_item_address","id"),&IP::get_resolve_item_address); + ClassDB::bind_method(D_METHOD("erase_resolve_item","id"),&IP::erase_resolve_item); + ClassDB::bind_method(D_METHOD("get_local_addresses"),&IP::_get_local_addresses); + ClassDB::bind_method(D_METHOD("clear_cache"),&IP::clear_cache, DEFVAL("")); BIND_CONSTANT( RESOLVER_STATUS_NONE ); BIND_CONSTANT( RESOLVER_STATUS_WAITING ); diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp index 2981307af6..fb81a806e2 100644 --- a/core/io/networked_multiplayer_peer.cpp +++ b/core/io/networked_multiplayer_peer.cpp @@ -31,18 +31,18 @@ void NetworkedMultiplayerPeer::_bind_methods() { - ClassDB::bind_method(_MD("set_transfer_mode","mode"), &NetworkedMultiplayerPeer::set_transfer_mode ); - ClassDB::bind_method(_MD("set_target_peer","id"), &NetworkedMultiplayerPeer::set_target_peer ); + ClassDB::bind_method(D_METHOD("set_transfer_mode","mode"), &NetworkedMultiplayerPeer::set_transfer_mode ); + ClassDB::bind_method(D_METHOD("set_target_peer","id"), &NetworkedMultiplayerPeer::set_target_peer ); - ClassDB::bind_method(_MD("get_packet_peer"), &NetworkedMultiplayerPeer::get_packet_peer ); + ClassDB::bind_method(D_METHOD("get_packet_peer"), &NetworkedMultiplayerPeer::get_packet_peer ); - ClassDB::bind_method(_MD("poll"), &NetworkedMultiplayerPeer::poll ); + ClassDB::bind_method(D_METHOD("poll"), &NetworkedMultiplayerPeer::poll ); - ClassDB::bind_method(_MD("get_connection_status"), &NetworkedMultiplayerPeer::get_connection_status ); - ClassDB::bind_method(_MD("get_unique_id"), &NetworkedMultiplayerPeer::get_unique_id ); + ClassDB::bind_method(D_METHOD("get_connection_status"), &NetworkedMultiplayerPeer::get_connection_status ); + ClassDB::bind_method(D_METHOD("get_unique_id"), &NetworkedMultiplayerPeer::get_unique_id ); - ClassDB::bind_method(_MD("set_refuse_new_connections","enable"), &NetworkedMultiplayerPeer::set_refuse_new_connections ); - ClassDB::bind_method(_MD("is_refusing_new_connections"), &NetworkedMultiplayerPeer::is_refusing_new_connections ); + ClassDB::bind_method(D_METHOD("set_refuse_new_connections","enable"), &NetworkedMultiplayerPeer::set_refuse_new_connections ); + ClassDB::bind_method(D_METHOD("is_refusing_new_connections"), &NetworkedMultiplayerPeer::is_refusing_new_connections ); BIND_CONSTANT( TRANSFER_MODE_UNRELIABLE ); BIND_CONSTANT( TRANSFER_MODE_UNRELIABLE_ORDERED ); diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 5ff09f9fb0..aca095b6a5 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -126,12 +126,12 @@ Error PacketPeer::_get_packet_error() const { void PacketPeer::_bind_methods() { - ClassDB::bind_method(_MD("get_var:Variant"),&PacketPeer::_bnd_get_var); - ClassDB::bind_method(_MD("put_var", "var:Variant"),&PacketPeer::put_var); - ClassDB::bind_method(_MD("get_packet"),&PacketPeer::_get_packet); - ClassDB::bind_method(_MD("put_packet:Error", "buffer"),&PacketPeer::_put_packet); - ClassDB::bind_method(_MD("get_packet_error:Error"),&PacketPeer::_get_packet_error); - ClassDB::bind_method(_MD("get_available_packet_count"),&PacketPeer::get_available_packet_count); + ClassDB::bind_method(D_METHOD("get_var:Variant"),&PacketPeer::_bnd_get_var); + ClassDB::bind_method(D_METHOD("put_var", "var:Variant"),&PacketPeer::put_var); + ClassDB::bind_method(D_METHOD("get_packet"),&PacketPeer::_get_packet); + ClassDB::bind_method(D_METHOD("put_packet:Error", "buffer"),&PacketPeer::_put_packet); + ClassDB::bind_method(D_METHOD("get_packet_error:Error"),&PacketPeer::_get_packet_error); + ClassDB::bind_method(D_METHOD("get_available_packet_count"),&PacketPeer::get_available_packet_count); }; /***************/ @@ -145,7 +145,7 @@ void PacketPeerStream::_set_stream_peer(REF p_peer) { void PacketPeerStream::_bind_methods() { - ClassDB::bind_method(_MD("set_stream_peer","peer:StreamPeer"),&PacketPeerStream::_set_stream_peer); + ClassDB::bind_method(D_METHOD("set_stream_peer","peer:StreamPeer"),&PacketPeerStream::_set_stream_peer); } Error PacketPeerStream::_poll_buffer() const { diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp index 769a513bb3..c4a6fd79a8 100644 --- a/core/io/packet_peer_udp.cpp +++ b/core/io/packet_peer_udp.cpp @@ -53,14 +53,14 @@ Error PacketPeerUDP::_set_dest_address(const String& p_address, int p_port) { void PacketPeerUDP::_bind_methods() { - ClassDB::bind_method(_MD("listen:Error","port", "bind_address", "recv_buf_size"),&PacketPeerUDP::listen,DEFVAL("*"),DEFVAL(65536)); - ClassDB::bind_method(_MD("close"),&PacketPeerUDP::close); - ClassDB::bind_method(_MD("wait:Error"),&PacketPeerUDP::wait); - ClassDB::bind_method(_MD("is_listening"),&PacketPeerUDP::is_listening); - ClassDB::bind_method(_MD("get_packet_ip"),&PacketPeerUDP::_get_packet_ip); - //ClassDB::bind_method(_MD("get_packet_address"),&PacketPeerUDP::_get_packet_address); - ClassDB::bind_method(_MD("get_packet_port"),&PacketPeerUDP::get_packet_port); - ClassDB::bind_method(_MD("set_dest_address","host","port"),&PacketPeerUDP::_set_dest_address); + ClassDB::bind_method(D_METHOD("listen:Error","port", "bind_address", "recv_buf_size"),&PacketPeerUDP::listen,DEFVAL("*"),DEFVAL(65536)); + ClassDB::bind_method(D_METHOD("close"),&PacketPeerUDP::close); + ClassDB::bind_method(D_METHOD("wait:Error"),&PacketPeerUDP::wait); + ClassDB::bind_method(D_METHOD("is_listening"),&PacketPeerUDP::is_listening); + ClassDB::bind_method(D_METHOD("get_packet_ip"),&PacketPeerUDP::_get_packet_ip); + //ClassDB::bind_method(D_METHOD("get_packet_address"),&PacketPeerUDP::_get_packet_address); + ClassDB::bind_method(D_METHOD("get_packet_port"),&PacketPeerUDP::get_packet_port); + ClassDB::bind_method(D_METHOD("set_dest_address","host","port"),&PacketPeerUDP::_set_dest_address); } diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp index fb5875e4cc..2cd46843e8 100644 --- a/core/io/pck_packer.cpp +++ b/core/io/pck_packer.cpp @@ -52,9 +52,9 @@ static void _pad(FileAccess* p_file, int p_bytes) { void PCKPacker::_bind_methods() { - ClassDB::bind_method(_MD("pck_start","pck_name","alignment"),&PCKPacker::pck_start); - ClassDB::bind_method(_MD("add_file","pck_path","source_path"),&PCKPacker::add_file); - ClassDB::bind_method(_MD("flush","verbose"),&PCKPacker::flush); + ClassDB::bind_method(D_METHOD("pck_start","pck_name","alignment"),&PCKPacker::pck_start); + ClassDB::bind_method(D_METHOD("add_file","pck_path","source_path"),&PCKPacker::add_file); + ClassDB::bind_method(D_METHOD("flush","verbose"),&PCKPacker::flush); }; diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index fbf6a2cea2..3199f05ff8 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -86,11 +86,11 @@ void ResourceLoader::get_recognized_extensions_for_type(const String& p_type,Lis void ResourceInteractiveLoader::_bind_methods() { - ClassDB::bind_method(_MD("get_resource"),&ResourceInteractiveLoader::get_resource); - ClassDB::bind_method(_MD("poll"),&ResourceInteractiveLoader::poll); - ClassDB::bind_method(_MD("wait"),&ResourceInteractiveLoader::wait); - ClassDB::bind_method(_MD("get_stage"),&ResourceInteractiveLoader::get_stage); - ClassDB::bind_method(_MD("get_stage_count"),&ResourceInteractiveLoader::get_stage_count); + ClassDB::bind_method(D_METHOD("get_resource"),&ResourceInteractiveLoader::get_resource); + ClassDB::bind_method(D_METHOD("poll"),&ResourceInteractiveLoader::poll); + ClassDB::bind_method(D_METHOD("wait"),&ResourceInteractiveLoader::wait); + ClassDB::bind_method(D_METHOD("get_stage"),&ResourceInteractiveLoader::get_stage); + ClassDB::bind_method(D_METHOD("get_stage_count"),&ResourceInteractiveLoader::get_stage_count); } class ResourceInteractiveLoaderDefault : public ResourceInteractiveLoader { diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp index a2812edb81..a64ebf21fb 100644 --- a/core/io/stream_peer.cpp +++ b/core/io/stream_peer.cpp @@ -389,57 +389,57 @@ Variant StreamPeer::get_var(){ void StreamPeer::_bind_methods() { - ClassDB::bind_method(_MD("put_data","data"),&StreamPeer::_put_data); - ClassDB::bind_method(_MD("put_partial_data","data"),&StreamPeer::_put_partial_data); - - ClassDB::bind_method(_MD("get_data","bytes"),&StreamPeer::_get_data); - ClassDB::bind_method(_MD("get_partial_data","bytes"),&StreamPeer::_get_partial_data); - - ClassDB::bind_method(_MD("get_available_bytes"),&StreamPeer::get_available_bytes); - - ClassDB::bind_method(_MD("set_big_endian","enable"),&StreamPeer::set_big_endian); - ClassDB::bind_method(_MD("is_big_endian_enabled"),&StreamPeer::is_big_endian_enabled); - - ClassDB::bind_method(_MD("put_8","val"),&StreamPeer::put_8); - ClassDB::bind_method(_MD("put_u8","val"),&StreamPeer::put_u8); - ClassDB::bind_method(_MD("put_16","val"),&StreamPeer::put_16); - ClassDB::bind_method(_MD("put_u16","val"),&StreamPeer::put_u16); - ClassDB::bind_method(_MD("put_32","val"),&StreamPeer::put_32); - ClassDB::bind_method(_MD("put_u32","val"),&StreamPeer::put_u32); - ClassDB::bind_method(_MD("put_64","val"),&StreamPeer::put_64); - ClassDB::bind_method(_MD("put_u64","val"),&StreamPeer::put_u64); - ClassDB::bind_method(_MD("put_float","val"),&StreamPeer::put_float); - ClassDB::bind_method(_MD("put_double","val"),&StreamPeer::put_double); - ClassDB::bind_method(_MD("put_utf8_string","val"),&StreamPeer::put_utf8_string); - ClassDB::bind_method(_MD("put_var","val:Variant"),&StreamPeer::put_var); - - ClassDB::bind_method(_MD("get_8"),&StreamPeer::get_8); - ClassDB::bind_method(_MD("get_u8"),&StreamPeer::get_u8); - ClassDB::bind_method(_MD("get_16"),&StreamPeer::get_16); - ClassDB::bind_method(_MD("get_u16"),&StreamPeer::get_u16); - ClassDB::bind_method(_MD("get_32"),&StreamPeer::get_32); - ClassDB::bind_method(_MD("get_u32"),&StreamPeer::get_u32); - ClassDB::bind_method(_MD("get_64"),&StreamPeer::get_64); - ClassDB::bind_method(_MD("get_u64"),&StreamPeer::get_u64); - ClassDB::bind_method(_MD("get_float"),&StreamPeer::get_float); - ClassDB::bind_method(_MD("get_double"),&StreamPeer::get_double); - ClassDB::bind_method(_MD("get_string","bytes"),&StreamPeer::get_string); - ClassDB::bind_method(_MD("get_utf8_string","bytes"),&StreamPeer::get_utf8_string); - ClassDB::bind_method(_MD("get_var:Variant"),&StreamPeer::get_var); + ClassDB::bind_method(D_METHOD("put_data","data"),&StreamPeer::_put_data); + ClassDB::bind_method(D_METHOD("put_partial_data","data"),&StreamPeer::_put_partial_data); + + ClassDB::bind_method(D_METHOD("get_data","bytes"),&StreamPeer::_get_data); + ClassDB::bind_method(D_METHOD("get_partial_data","bytes"),&StreamPeer::_get_partial_data); + + ClassDB::bind_method(D_METHOD("get_available_bytes"),&StreamPeer::get_available_bytes); + + ClassDB::bind_method(D_METHOD("set_big_endian","enable"),&StreamPeer::set_big_endian); + ClassDB::bind_method(D_METHOD("is_big_endian_enabled"),&StreamPeer::is_big_endian_enabled); + + ClassDB::bind_method(D_METHOD("put_8","val"),&StreamPeer::put_8); + ClassDB::bind_method(D_METHOD("put_u8","val"),&StreamPeer::put_u8); + ClassDB::bind_method(D_METHOD("put_16","val"),&StreamPeer::put_16); + ClassDB::bind_method(D_METHOD("put_u16","val"),&StreamPeer::put_u16); + ClassDB::bind_method(D_METHOD("put_32","val"),&StreamPeer::put_32); + ClassDB::bind_method(D_METHOD("put_u32","val"),&StreamPeer::put_u32); + ClassDB::bind_method(D_METHOD("put_64","val"),&StreamPeer::put_64); + ClassDB::bind_method(D_METHOD("put_u64","val"),&StreamPeer::put_u64); + ClassDB::bind_method(D_METHOD("put_float","val"),&StreamPeer::put_float); + ClassDB::bind_method(D_METHOD("put_double","val"),&StreamPeer::put_double); + ClassDB::bind_method(D_METHOD("put_utf8_string","val"),&StreamPeer::put_utf8_string); + ClassDB::bind_method(D_METHOD("put_var","val:Variant"),&StreamPeer::put_var); + + ClassDB::bind_method(D_METHOD("get_8"),&StreamPeer::get_8); + ClassDB::bind_method(D_METHOD("get_u8"),&StreamPeer::get_u8); + ClassDB::bind_method(D_METHOD("get_16"),&StreamPeer::get_16); + ClassDB::bind_method(D_METHOD("get_u16"),&StreamPeer::get_u16); + ClassDB::bind_method(D_METHOD("get_32"),&StreamPeer::get_32); + ClassDB::bind_method(D_METHOD("get_u32"),&StreamPeer::get_u32); + ClassDB::bind_method(D_METHOD("get_64"),&StreamPeer::get_64); + ClassDB::bind_method(D_METHOD("get_u64"),&StreamPeer::get_u64); + ClassDB::bind_method(D_METHOD("get_float"),&StreamPeer::get_float); + ClassDB::bind_method(D_METHOD("get_double"),&StreamPeer::get_double); + ClassDB::bind_method(D_METHOD("get_string","bytes"),&StreamPeer::get_string); + ClassDB::bind_method(D_METHOD("get_utf8_string","bytes"),&StreamPeer::get_utf8_string); + ClassDB::bind_method(D_METHOD("get_var:Variant"),&StreamPeer::get_var); } //////////////////////////////// void StreamPeerBuffer::_bind_methods() { - ClassDB::bind_method(_MD("seek","pos"),&StreamPeerBuffer::seek); - ClassDB::bind_method(_MD("get_size"),&StreamPeerBuffer::get_size); - ClassDB::bind_method(_MD("get_pos"),&StreamPeerBuffer::get_pos); - ClassDB::bind_method(_MD("resize","size"),&StreamPeerBuffer::resize); - ClassDB::bind_method(_MD("set_data_array","data"),&StreamPeerBuffer::set_data_array); - ClassDB::bind_method(_MD("get_data_array"),&StreamPeerBuffer::get_data_array); - ClassDB::bind_method(_MD("clear"),&StreamPeerBuffer::clear); - ClassDB::bind_method(_MD("duplicate:StreamPeerBuffer"),&StreamPeerBuffer::duplicate); + ClassDB::bind_method(D_METHOD("seek","pos"),&StreamPeerBuffer::seek); + ClassDB::bind_method(D_METHOD("get_size"),&StreamPeerBuffer::get_size); + ClassDB::bind_method(D_METHOD("get_pos"),&StreamPeerBuffer::get_pos); + ClassDB::bind_method(D_METHOD("resize","size"),&StreamPeerBuffer::resize); + ClassDB::bind_method(D_METHOD("set_data_array","data"),&StreamPeerBuffer::set_data_array); + ClassDB::bind_method(D_METHOD("get_data_array"),&StreamPeerBuffer::get_data_array); + ClassDB::bind_method(D_METHOD("clear"),&StreamPeerBuffer::clear); + ClassDB::bind_method(D_METHOD("duplicate:StreamPeerBuffer"),&StreamPeerBuffer::duplicate); } diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp index fc535e94b0..5f7247bd7a 100644 --- a/core/io/stream_peer_ssl.cpp +++ b/core/io/stream_peer_ssl.cpp @@ -57,10 +57,10 @@ bool StreamPeerSSL::is_available() { void StreamPeerSSL::_bind_methods() { - ClassDB::bind_method(_MD("accept_stream:Error","stream:StreamPeer"),&StreamPeerSSL::accept_stream); - ClassDB::bind_method(_MD("connect_to_stream:Error","stream:StreamPeer","validate_certs","for_hostname"),&StreamPeerSSL::connect_to_stream,DEFVAL(false),DEFVAL(String())); - ClassDB::bind_method(_MD("get_status"),&StreamPeerSSL::get_status); - ClassDB::bind_method(_MD("disconnect_from_stream"),&StreamPeerSSL::disconnect_from_stream); + ClassDB::bind_method(D_METHOD("accept_stream:Error","stream:StreamPeer"),&StreamPeerSSL::accept_stream); + ClassDB::bind_method(D_METHOD("connect_to_stream:Error","stream:StreamPeer","validate_certs","for_hostname"),&StreamPeerSSL::connect_to_stream,DEFVAL(false),DEFVAL(String())); + ClassDB::bind_method(D_METHOD("get_status"),&StreamPeerSSL::get_status); + ClassDB::bind_method(D_METHOD("disconnect_from_stream"),&StreamPeerSSL::disconnect_from_stream); BIND_CONSTANT( STATUS_DISCONNECTED ); BIND_CONSTANT( STATUS_CONNECTED ); BIND_CONSTANT( STATUS_ERROR_NO_CERTIFICATE ); diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index 96594ef65a..cedc33079e 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -47,12 +47,12 @@ Error StreamPeerTCP::_connect(const String& p_address,int p_port) { void StreamPeerTCP::_bind_methods() { - ClassDB::bind_method(_MD("connect_to_host","host","port"),&StreamPeerTCP::_connect); - ClassDB::bind_method(_MD("is_connected_to_host"),&StreamPeerTCP::is_connected_to_host); - ClassDB::bind_method(_MD("get_status"),&StreamPeerTCP::get_status); - ClassDB::bind_method(_MD("get_connected_host"),&StreamPeerTCP::get_connected_host); - ClassDB::bind_method(_MD("get_connected_port"),&StreamPeerTCP::get_connected_port); - ClassDB::bind_method(_MD("disconnect_from_host"),&StreamPeerTCP::disconnect_from_host); + ClassDB::bind_method(D_METHOD("connect_to_host","host","port"),&StreamPeerTCP::_connect); + ClassDB::bind_method(D_METHOD("is_connected_to_host"),&StreamPeerTCP::is_connected_to_host); + ClassDB::bind_method(D_METHOD("get_status"),&StreamPeerTCP::get_status); + ClassDB::bind_method(D_METHOD("get_connected_host"),&StreamPeerTCP::get_connected_host); + ClassDB::bind_method(D_METHOD("get_connected_port"),&StreamPeerTCP::get_connected_port); + ClassDB::bind_method(D_METHOD("disconnect_from_host"),&StreamPeerTCP::disconnect_from_host); BIND_CONSTANT( STATUS_NONE ); BIND_CONSTANT( STATUS_CONNECTING ); diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp index cb82b3fc55..5127bd6e3b 100644 --- a/core/io/tcp_server.cpp +++ b/core/io/tcp_server.cpp @@ -46,10 +46,10 @@ TCP_Server* TCP_Server::create() { void TCP_Server::_bind_methods() { - ClassDB::bind_method(_MD("listen","port","bind_address"),&TCP_Server::listen,DEFVAL("*")); - ClassDB::bind_method(_MD("is_connection_available"),&TCP_Server::is_connection_available); - ClassDB::bind_method(_MD("take_connection"),&TCP_Server::take_connection); - ClassDB::bind_method(_MD("stop"),&TCP_Server::stop); + ClassDB::bind_method(D_METHOD("listen","port","bind_address"),&TCP_Server::listen,DEFVAL("*")); + ClassDB::bind_method(D_METHOD("is_connection_available"),&TCP_Server::is_connection_available); + ClassDB::bind_method(D_METHOD("take_connection"),&TCP_Server::take_connection); + ClassDB::bind_method(D_METHOD("stop"),&TCP_Server::stop); } diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index 0322f23056..1a4ff1a8d4 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -379,23 +379,23 @@ Error XMLParser::seek(uint64_t p_pos) { void XMLParser::_bind_methods() { - ClassDB::bind_method(_MD("read"),&XMLParser::read); - ClassDB::bind_method(_MD("get_node_type"),&XMLParser::get_node_type); - ClassDB::bind_method(_MD("get_node_name"),&XMLParser::get_node_name); - ClassDB::bind_method(_MD("get_node_data"),&XMLParser::get_node_data); - ClassDB::bind_method(_MD("get_node_offset"),&XMLParser::get_node_offset); - ClassDB::bind_method(_MD("get_attribute_count"),&XMLParser::get_attribute_count); - ClassDB::bind_method(_MD("get_attribute_name","idx"),&XMLParser::get_attribute_name); - ClassDB::bind_method(_MD("get_attribute_value","idx"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value); - ClassDB::bind_method(_MD("has_attribute","name"),&XMLParser::has_attribute); - ClassDB::bind_method(_MD("get_named_attribute_value","name"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value); - ClassDB::bind_method(_MD("get_named_attribute_value_safe","name"), &XMLParser::get_attribute_value_safe); - ClassDB::bind_method(_MD("is_empty"),&XMLParser::is_empty); - ClassDB::bind_method(_MD("get_current_line"),&XMLParser::get_current_line); - ClassDB::bind_method(_MD("skip_section"),&XMLParser::skip_section); - ClassDB::bind_method(_MD("seek","pos"),&XMLParser::seek); - ClassDB::bind_method(_MD("open","file"),&XMLParser::open); - ClassDB::bind_method(_MD("open_buffer","buffer"),&XMLParser::open_buffer); + ClassDB::bind_method(D_METHOD("read"),&XMLParser::read); + ClassDB::bind_method(D_METHOD("get_node_type"),&XMLParser::get_node_type); + ClassDB::bind_method(D_METHOD("get_node_name"),&XMLParser::get_node_name); + ClassDB::bind_method(D_METHOD("get_node_data"),&XMLParser::get_node_data); + ClassDB::bind_method(D_METHOD("get_node_offset"),&XMLParser::get_node_offset); + ClassDB::bind_method(D_METHOD("get_attribute_count"),&XMLParser::get_attribute_count); + ClassDB::bind_method(D_METHOD("get_attribute_name","idx"),&XMLParser::get_attribute_name); + ClassDB::bind_method(D_METHOD("get_attribute_value","idx"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value); + ClassDB::bind_method(D_METHOD("has_attribute","name"),&XMLParser::has_attribute); + ClassDB::bind_method(D_METHOD("get_named_attribute_value","name"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value); + ClassDB::bind_method(D_METHOD("get_named_attribute_value_safe","name"), &XMLParser::get_attribute_value_safe); + ClassDB::bind_method(D_METHOD("is_empty"),&XMLParser::is_empty); + ClassDB::bind_method(D_METHOD("get_current_line"),&XMLParser::get_current_line); + ClassDB::bind_method(D_METHOD("skip_section"),&XMLParser::skip_section); + ClassDB::bind_method(D_METHOD("seek","pos"),&XMLParser::seek); + ClassDB::bind_method(D_METHOD("open","file"),&XMLParser::open); + ClassDB::bind_method(D_METHOD("open_buffer","buffer"),&XMLParser::open_buffer); BIND_CONSTANT( NODE_NONE ); BIND_CONSTANT( NODE_ELEMENT ); diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index a1f471ebe3..7e31957e3e 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -407,23 +407,23 @@ PoolVector<int> AStar::get_id_path(int p_from_id, int p_to_id) { void AStar::_bind_methods() { - ClassDB::bind_method(_MD("get_available_point_id"),&AStar::get_available_point_id); - ClassDB::bind_method(_MD("add_point","id","pos","weight_scale"),&AStar::add_point,DEFVAL(1.0)); - ClassDB::bind_method(_MD("get_point_pos","id"),&AStar::get_point_pos); - ClassDB::bind_method(_MD("get_point_weight_scale","id"),&AStar::get_point_weight_scale); - ClassDB::bind_method(_MD("remove_point","id"),&AStar::remove_point); + ClassDB::bind_method(D_METHOD("get_available_point_id"),&AStar::get_available_point_id); + ClassDB::bind_method(D_METHOD("add_point","id","pos","weight_scale"),&AStar::add_point,DEFVAL(1.0)); + ClassDB::bind_method(D_METHOD("get_point_pos","id"),&AStar::get_point_pos); + ClassDB::bind_method(D_METHOD("get_point_weight_scale","id"),&AStar::get_point_weight_scale); + ClassDB::bind_method(D_METHOD("remove_point","id"),&AStar::remove_point); - ClassDB::bind_method(_MD("connect_points","id","to_id"),&AStar::connect_points); - ClassDB::bind_method(_MD("disconnect_points","id","to_id"),&AStar::disconnect_points); - ClassDB::bind_method(_MD("are_points_connected","id","to_id"),&AStar::are_points_connected); + ClassDB::bind_method(D_METHOD("connect_points","id","to_id"),&AStar::connect_points); + ClassDB::bind_method(D_METHOD("disconnect_points","id","to_id"),&AStar::disconnect_points); + ClassDB::bind_method(D_METHOD("are_points_connected","id","to_id"),&AStar::are_points_connected); - ClassDB::bind_method(_MD("clear"),&AStar::clear); + ClassDB::bind_method(D_METHOD("clear"),&AStar::clear); - ClassDB::bind_method(_MD("get_closest_point","to_pos"),&AStar::get_closest_point); - ClassDB::bind_method(_MD("get_closest_pos_in_segment","to_pos"),&AStar::get_closest_pos_in_segment); + ClassDB::bind_method(D_METHOD("get_closest_point","to_pos"),&AStar::get_closest_point); + ClassDB::bind_method(D_METHOD("get_closest_pos_in_segment","to_pos"),&AStar::get_closest_pos_in_segment); - ClassDB::bind_method(_MD("get_point_path","from_id","to_id"),&AStar::get_point_path); - ClassDB::bind_method(_MD("get_id_path","from_id","to_id"),&AStar::get_id_path); + ClassDB::bind_method(D_METHOD("get_point_path","from_id","to_id"),&AStar::get_point_path); + ClassDB::bind_method(D_METHOD("get_id_path","from_id","to_id"),&AStar::get_id_path); } diff --git a/core/object.cpp b/core/object.cpp index 26308dc64f..730b4209fe 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1675,31 +1675,31 @@ void Object::clear_internal_resource_paths() { void Object::_bind_methods() { - ClassDB::bind_method(_MD("get_class"),&Object::get_class); - ClassDB::bind_method(_MD("is_class","type"),&Object::is_class); - ClassDB::bind_method(_MD("set","property","value"),&Object::_set_bind); - ClassDB::bind_method(_MD("get","property"),&Object::_get_bind); - ClassDB::bind_method(_MD("get_property_list"),&Object::_get_property_list_bind); - ClassDB::bind_method(_MD("get_method_list"),&Object::_get_method_list_bind); - ClassDB::bind_method(_MD("notification","what","reversed"),&Object::notification,DEFVAL(false)); - ClassDB::bind_method(_MD("get_instance_ID"),&Object::get_instance_ID); - - ClassDB::bind_method(_MD("set_script","script:Script"),&Object::set_script); - ClassDB::bind_method(_MD("get_script:Script"),&Object::get_script); - - ClassDB::bind_method(_MD("set_meta","name","value"),&Object::set_meta); - ClassDB::bind_method(_MD("get_meta","name","value"),&Object::get_meta); - ClassDB::bind_method(_MD("has_meta","name"),&Object::has_meta); - ClassDB::bind_method(_MD("get_meta_list"),&Object::_get_meta_list_bind); + ClassDB::bind_method(D_METHOD("get_class"),&Object::get_class); + ClassDB::bind_method(D_METHOD("is_class","type"),&Object::is_class); + ClassDB::bind_method(D_METHOD("set","property","value"),&Object::_set_bind); + ClassDB::bind_method(D_METHOD("get","property"),&Object::_get_bind); + ClassDB::bind_method(D_METHOD("get_property_list"),&Object::_get_property_list_bind); + ClassDB::bind_method(D_METHOD("get_method_list"),&Object::_get_method_list_bind); + ClassDB::bind_method(D_METHOD("notification","what","reversed"),&Object::notification,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_instance_ID"),&Object::get_instance_ID); + + ClassDB::bind_method(D_METHOD("set_script","script:Script"),&Object::set_script); + ClassDB::bind_method(D_METHOD("get_script:Script"),&Object::get_script); + + ClassDB::bind_method(D_METHOD("set_meta","name","value"),&Object::set_meta); + ClassDB::bind_method(D_METHOD("get_meta","name","value"),&Object::get_meta); + ClassDB::bind_method(D_METHOD("has_meta","name"),&Object::has_meta); + ClassDB::bind_method(D_METHOD("get_meta_list"),&Object::_get_meta_list_bind); //todo reimplement this per language so all 5 arguments can be called - //ClassDB::bind_method(_MD("call","method","arg1","arg2","arg3","arg4"),&Object::_call_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant())); - //ClassDB::bind_method(_MD("call_deferred","method","arg1","arg2","arg3","arg4"),&Object::_call_deferred_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant())); + //ClassDB::bind_method(D_METHOD("call","method","arg1","arg2","arg3","arg4"),&Object::_call_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant())); + //ClassDB::bind_method(D_METHOD("call_deferred","method","arg1","arg2","arg3","arg4"),&Object::_call_deferred_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("add_user_signal","signal","arguments"),&Object::_add_user_signal,DEFVAL(Array())); - ClassDB::bind_method(_MD("has_user_signal","signal"),&Object::_has_user_signal); - //ClassDB::bind_method(_MD("emit_signal","signal","arguments"),&Object::_emit_signal,DEFVAL(Array())); + ClassDB::bind_method(D_METHOD("add_user_signal","signal","arguments"),&Object::_add_user_signal,DEFVAL(Array())); + ClassDB::bind_method(D_METHOD("has_user_signal","signal"),&Object::_has_user_signal); + //ClassDB::bind_method(D_METHOD("emit_signal","signal","arguments"),&Object::_emit_signal,DEFVAL(Array())); { @@ -1728,27 +1728,27 @@ void Object::_bind_methods() { ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_deferred",&Object::_call_deferred_bind,mi); } - ClassDB::bind_method(_MD("callv:Variant","method","arg_array"),&Object::callv); + ClassDB::bind_method(D_METHOD("callv:Variant","method","arg_array"),&Object::callv); - ClassDB::bind_method(_MD("has_method","method"),&Object::has_method); + ClassDB::bind_method(D_METHOD("has_method","method"),&Object::has_method); - ClassDB::bind_method(_MD("get_signal_list"),&Object::_get_signal_list); - ClassDB::bind_method(_MD("get_signal_connection_list","signal"),&Object::_get_signal_connection_list); + ClassDB::bind_method(D_METHOD("get_signal_list"),&Object::_get_signal_list); + ClassDB::bind_method(D_METHOD("get_signal_connection_list","signal"),&Object::_get_signal_connection_list); - ClassDB::bind_method(_MD("connect","signal","target:Object","method","binds","flags"),&Object::connect,DEFVAL(Array()),DEFVAL(0)); - ClassDB::bind_method(_MD("disconnect","signal","target:Object","method"),&Object::disconnect); - ClassDB::bind_method(_MD("is_connected","signal","target:Object","method"),&Object::is_connected); + ClassDB::bind_method(D_METHOD("connect","signal","target:Object","method","binds","flags"),&Object::connect,DEFVAL(Array()),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("disconnect","signal","target:Object","method"),&Object::disconnect); + ClassDB::bind_method(D_METHOD("is_connected","signal","target:Object","method"),&Object::is_connected); - ClassDB::bind_method(_MD("set_block_signals","enable"),&Object::set_block_signals); - ClassDB::bind_method(_MD("is_blocking_signals"),&Object::is_blocking_signals); - ClassDB::bind_method(_MD("set_message_translation","enable"),&Object::set_message_translation); - ClassDB::bind_method(_MD("can_translate_messages"),&Object::can_translate_messages); - ClassDB::bind_method(_MD("property_list_changed_notify"),&Object::property_list_changed_notify); + ClassDB::bind_method(D_METHOD("set_block_signals","enable"),&Object::set_block_signals); + ClassDB::bind_method(D_METHOD("is_blocking_signals"),&Object::is_blocking_signals); + ClassDB::bind_method(D_METHOD("set_message_translation","enable"),&Object::set_message_translation); + ClassDB::bind_method(D_METHOD("can_translate_messages"),&Object::can_translate_messages); + ClassDB::bind_method(D_METHOD("property_list_changed_notify"),&Object::property_list_changed_notify); - ClassDB::bind_method(_MD("XL_MESSAGE","message"),&Object::XL_MESSAGE); - ClassDB::bind_method(_MD("tr","message"),&Object::tr); + ClassDB::bind_method(D_METHOD("XL_MESSAGE","message"),&Object::XL_MESSAGE); + ClassDB::bind_method(D_METHOD("tr","message"),&Object::tr); - ClassDB::bind_method(_MD("is_queued_for_deletion"),&Object::is_queued_for_deletion); + ClassDB::bind_method(D_METHOD("is_queued_for_deletion"),&Object::is_queued_for_deletion); ClassDB::add_virtual_method("Object",MethodInfo("free"),false); diff --git a/core/os/input.cpp b/core/os/input.cpp index 4e7b037453..e20c966ff2 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -49,40 +49,40 @@ Input::MouseMode Input::get_mouse_mode() const { void Input::_bind_methods() { - 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_joypads"),&Input::get_connected_joypads); - 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_gravity"),&Input::get_gravity); - 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_last_mouse_speed"),&Input::get_last_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())); + ClassDB::bind_method(D_METHOD("is_key_pressed","scancode"),&Input::is_key_pressed); + ClassDB::bind_method(D_METHOD("is_mouse_button_pressed","button"),&Input::is_mouse_button_pressed); + ClassDB::bind_method(D_METHOD("is_joy_button_pressed","device","button"),&Input::is_joy_button_pressed); + ClassDB::bind_method(D_METHOD("is_action_pressed","action"),&Input::is_action_pressed); + ClassDB::bind_method(D_METHOD("is_action_just_pressed","action"),&Input::is_action_just_pressed); + ClassDB::bind_method(D_METHOD("is_action_just_released","action"),&Input::is_action_just_released); + ClassDB::bind_method(D_METHOD("add_joy_mapping","mapping", "update_existing"),&Input::add_joy_mapping, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("remove_joy_mapping","guid"),&Input::remove_joy_mapping); + ClassDB::bind_method(D_METHOD("is_joy_known","device"),&Input::is_joy_known); + ClassDB::bind_method(D_METHOD("get_joy_axis","device","axis"),&Input::get_joy_axis); + ClassDB::bind_method(D_METHOD("get_joy_name","device"),&Input::get_joy_name); + ClassDB::bind_method(D_METHOD("get_joy_guid","device"),&Input::get_joy_guid); + ClassDB::bind_method(D_METHOD("get_connected_joypads"),&Input::get_connected_joypads); + ClassDB::bind_method(D_METHOD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength); + ClassDB::bind_method(D_METHOD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration); + ClassDB::bind_method(D_METHOD("get_joy_button_string", "button_index"), &Input::get_joy_button_string); + ClassDB::bind_method(D_METHOD("get_joy_button_index_from_string", "button"), &Input::get_joy_button_index_from_string); + ClassDB::bind_method(D_METHOD("get_joy_axis_string", "axis_index"), &Input::get_joy_axis_string); + ClassDB::bind_method(D_METHOD("get_joy_axis_index_from_string", "axis"), &Input::get_joy_axis_index_from_string); + ClassDB::bind_method(D_METHOD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("stop_joy_vibration", "device"), &Input::stop_joy_vibration); + ClassDB::bind_method(D_METHOD("get_gravity"),&Input::get_gravity); + ClassDB::bind_method(D_METHOD("get_accelerometer"),&Input::get_accelerometer); + ClassDB::bind_method(D_METHOD("get_magnetometer"),&Input::get_magnetometer); + ClassDB::bind_method(D_METHOD("get_gyroscope"),&Input::get_gyroscope); + //ClassDB::bind_method(D_METHOD("get_mouse_pos"),&Input::get_mouse_pos); - this is not the function you want + ClassDB::bind_method(D_METHOD("get_last_mouse_speed"),&Input::get_last_mouse_speed); + ClassDB::bind_method(D_METHOD("get_mouse_button_mask"),&Input::get_mouse_button_mask); + ClassDB::bind_method(D_METHOD("set_mouse_mode","mode"),&Input::set_mouse_mode); + ClassDB::bind_method(D_METHOD("get_mouse_mode"),&Input::get_mouse_mode); + ClassDB::bind_method(D_METHOD("warp_mouse_pos","to"),&Input::warp_mouse_pos); + ClassDB::bind_method(D_METHOD("action_press","action"),&Input::action_press); + ClassDB::bind_method(D_METHOD("action_release","action"),&Input::action_release); + ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor","image:Texture","hotspot"),&Input::set_custom_mouse_cursor,DEFVAL(Vector2())); BIND_CONSTANT( MOUSE_MODE_VISIBLE ); BIND_CONSTANT( MOUSE_MODE_HIDDEN ); diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index 11396666d2..dcda8e8952 100644 --- a/core/os/main_loop.cpp +++ b/core/os/main_loop.cpp @@ -31,12 +31,12 @@ void MainLoop::_bind_methods() { - ClassDB::bind_method(_MD("input_event","ev"),&MainLoop::input_event); - ClassDB::bind_method(_MD("input_text","text"),&MainLoop::input_text); - ClassDB::bind_method(_MD("init"),&MainLoop::init); - ClassDB::bind_method(_MD("iteration","delta"),&MainLoop::iteration); - ClassDB::bind_method(_MD("idle","delta"),&MainLoop::idle); - ClassDB::bind_method(_MD("finish"),&MainLoop::finish); + ClassDB::bind_method(D_METHOD("input_event","ev"),&MainLoop::input_event); + ClassDB::bind_method(D_METHOD("input_text","text"),&MainLoop::input_text); + ClassDB::bind_method(D_METHOD("init"),&MainLoop::init); + ClassDB::bind_method(D_METHOD("iteration","delta"),&MainLoop::iteration); + ClassDB::bind_method(D_METHOD("idle","delta"),&MainLoop::idle); + ClassDB::bind_method(D_METHOD("finish"),&MainLoop::finish); BIND_VMETHOD( MethodInfo("_input_event",PropertyInfo(Variant::INPUT_EVENT,"ev")) ); BIND_VMETHOD( MethodInfo("_input_text",PropertyInfo(Variant::STRING,"text")) ); diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index c202f06b19..803a217fca 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -382,13 +382,13 @@ Variant PackedDataContainer::_iter_get(const Variant& p_iter){ void PackedDataContainer::_bind_methods() { - ClassDB::bind_method(_MD("_set_data"),&PackedDataContainer::_set_data); - ClassDB::bind_method(_MD("_get_data"),&PackedDataContainer::_get_data); - ClassDB::bind_method(_MD("_iter_init"),&PackedDataContainer::_iter_init); - ClassDB::bind_method(_MD("_iter_get"),&PackedDataContainer::_iter_get); - ClassDB::bind_method(_MD("_iter_next"),&PackedDataContainer::_iter_next); - ClassDB::bind_method(_MD("pack:Error","value"),&PackedDataContainer::pack); - ClassDB::bind_method(_MD("size"),&PackedDataContainer::size); + ClassDB::bind_method(D_METHOD("_set_data"),&PackedDataContainer::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&PackedDataContainer::_get_data); + ClassDB::bind_method(D_METHOD("_iter_init"),&PackedDataContainer::_iter_init); + ClassDB::bind_method(D_METHOD("_iter_get"),&PackedDataContainer::_iter_get); + ClassDB::bind_method(D_METHOD("_iter_next"),&PackedDataContainer::_iter_next); + ClassDB::bind_method(D_METHOD("pack:Error","value"),&PackedDataContainer::pack); + ClassDB::bind_method(D_METHOD("size"),&PackedDataContainer::size); ADD_PROPERTY( PropertyInfo(Variant::POOL_BYTE_ARRAY,"__data__"),"_set_data","_get_data"); } @@ -426,11 +426,11 @@ bool PackedDataContainerRef::_is_dictionary() const { void PackedDataContainerRef::_bind_methods() { - ClassDB::bind_method(_MD("size"),&PackedDataContainerRef::size); - ClassDB::bind_method(_MD("_iter_init"),&PackedDataContainerRef::_iter_init); - ClassDB::bind_method(_MD("_iter_get"),&PackedDataContainerRef::_iter_get); - ClassDB::bind_method(_MD("_iter_next"),&PackedDataContainerRef::_iter_next); - ClassDB::bind_method(_MD("_is_dictionary"),&PackedDataContainerRef::_is_dictionary); + ClassDB::bind_method(D_METHOD("size"),&PackedDataContainerRef::size); + ClassDB::bind_method(D_METHOD("_iter_init"),&PackedDataContainerRef::_iter_init); + ClassDB::bind_method(D_METHOD("_iter_get"),&PackedDataContainerRef::_iter_get); + ClassDB::bind_method(D_METHOD("_iter_next"),&PackedDataContainerRef::_iter_next); + ClassDB::bind_method(D_METHOD("_is_dictionary"),&PackedDataContainerRef::_is_dictionary); } diff --git a/core/reference.cpp b/core/reference.cpp index d21caf0839..5e8244d2ca 100644 --- a/core/reference.cpp +++ b/core/reference.cpp @@ -55,9 +55,9 @@ bool Reference::init_ref() { void Reference::_bind_methods() { - ClassDB::bind_method(_MD("init_ref"),&Reference::init_ref); - ClassDB::bind_method(_MD("reference"),&Reference::reference); - ClassDB::bind_method(_MD("unreference"),&Reference::unreference); + ClassDB::bind_method(D_METHOD("init_ref"),&Reference::init_ref); + ClassDB::bind_method(D_METHOD("reference"),&Reference::reference); + ClassDB::bind_method(D_METHOD("unreference"),&Reference::unreference); } int Reference::reference_get_count() const { @@ -127,7 +127,7 @@ WeakRef::WeakRef() { void WeakRef::_bind_methods() { - ClassDB::bind_method(_MD("get_ref:Object"),&WeakRef::get_ref); + ClassDB::bind_method(D_METHOD("get_ref:Object"),&WeakRef::get_ref); } #if 0 diff --git a/core/resource.cpp b/core/resource.cpp index a5863ba229..fe3cb2df92 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -327,18 +327,18 @@ Node* (*Resource::_get_local_scene_func)()=NULL; void Resource::_bind_methods() { - ClassDB::bind_method(_MD("set_path","path"),&Resource::_set_path); - ClassDB::bind_method(_MD("take_over_path","path"),&Resource::_take_over_path); - ClassDB::bind_method(_MD("get_path"),&Resource::get_path); - ClassDB::bind_method(_MD("set_name","name"),&Resource::set_name); - ClassDB::bind_method(_MD("get_name"),&Resource::get_name); - ClassDB::bind_method(_MD("get_rid"),&Resource::get_rid); - ClassDB::bind_method(_MD("set_local_to_scene","enable"),&Resource::set_local_to_scene); - ClassDB::bind_method(_MD("is_local_to_scene"),&Resource::is_local_to_scene); - ClassDB::bind_method(_MD("get_local_scene:Node"),&Resource::get_local_scene); - ClassDB::bind_method(_MD("setup_local_to_scene"),&Resource::setup_local_to_scene); - - ClassDB::bind_method(_MD("duplicate","subresources"),&Resource::duplicate,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_path","path"),&Resource::_set_path); + ClassDB::bind_method(D_METHOD("take_over_path","path"),&Resource::_take_over_path); + ClassDB::bind_method(D_METHOD("get_path"),&Resource::get_path); + ClassDB::bind_method(D_METHOD("set_name","name"),&Resource::set_name); + ClassDB::bind_method(D_METHOD("get_name"),&Resource::get_name); + ClassDB::bind_method(D_METHOD("get_rid"),&Resource::get_rid); + ClassDB::bind_method(D_METHOD("set_local_to_scene","enable"),&Resource::set_local_to_scene); + ClassDB::bind_method(D_METHOD("is_local_to_scene"),&Resource::is_local_to_scene); + ClassDB::bind_method(D_METHOD("get_local_scene:Node"),&Resource::get_local_scene); + ClassDB::bind_method(D_METHOD("setup_local_to_scene"),&Resource::setup_local_to_scene); + + ClassDB::bind_method(D_METHOD("duplicate","subresources"),&Resource::duplicate,DEFVAL(false)); ADD_SIGNAL( MethodInfo("changed") ); ADD_GROUP("Resource","resource_"); ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"resource_local_to_scene" ), "set_local_to_scene","is_local_to_scene"); diff --git a/core/script_language.cpp b/core/script_language.cpp index 52ae181c32..32db35d018 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -46,13 +46,13 @@ void Script::_notification( int p_what) { void Script::_bind_methods() { - ClassDB::bind_method(_MD("can_instance"),&Script::can_instance); - //ClassDB::bind_method(_MD("instance_create","base_object"),&Script::instance_create); - ClassDB::bind_method(_MD("instance_has","base_object"),&Script::instance_has); - ClassDB::bind_method(_MD("has_source_code"),&Script::has_source_code); - ClassDB::bind_method(_MD("get_source_code"),&Script::get_source_code); - ClassDB::bind_method(_MD("set_source_code","source"),&Script::set_source_code); - ClassDB::bind_method(_MD("reload","keep_state"),&Script::reload,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("can_instance"),&Script::can_instance); + //ClassDB::bind_method(D_METHOD("instance_create","base_object"),&Script::instance_create); + ClassDB::bind_method(D_METHOD("instance_has","base_object"),&Script::instance_has); + ClassDB::bind_method(D_METHOD("has_source_code"),&Script::has_source_code); + ClassDB::bind_method(D_METHOD("get_source_code"),&Script::get_source_code); + ClassDB::bind_method(D_METHOD("set_source_code","source"),&Script::set_source_code); + ClassDB::bind_method(D_METHOD("reload","keep_state"),&Script::reload,DEFVAL(false)); } diff --git a/core/translation.cpp b/core/translation.cpp index 79497f181b..655bfd36b8 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -915,15 +915,15 @@ int Translation::get_message_count() const { void Translation::_bind_methods() { - ClassDB::bind_method(_MD("set_locale","locale"),&Translation::set_locale); - ClassDB::bind_method(_MD("get_locale"),&Translation::get_locale); - ClassDB::bind_method(_MD("add_message","src_message","xlated_message"),&Translation::add_message); - ClassDB::bind_method(_MD("get_message","src_message"),&Translation::get_message); - ClassDB::bind_method(_MD("erase_message","src_message"),&Translation::erase_message); - ClassDB::bind_method(_MD("get_message_list"),&Translation::_get_message_list); - ClassDB::bind_method(_MD("get_message_count"),&Translation::get_message_count); - ClassDB::bind_method(_MD("_set_messages"),&Translation::_set_messages); - ClassDB::bind_method(_MD("_get_messages"),&Translation::_get_messages); + ClassDB::bind_method(D_METHOD("set_locale","locale"),&Translation::set_locale); + ClassDB::bind_method(D_METHOD("get_locale"),&Translation::get_locale); + ClassDB::bind_method(D_METHOD("add_message","src_message","xlated_message"),&Translation::add_message); + ClassDB::bind_method(D_METHOD("get_message","src_message"),&Translation::get_message); + ClassDB::bind_method(D_METHOD("erase_message","src_message"),&Translation::erase_message); + ClassDB::bind_method(D_METHOD("get_message_list"),&Translation::_get_message_list); + ClassDB::bind_method(D_METHOD("get_message_count"),&Translation::get_message_count); + ClassDB::bind_method(D_METHOD("_set_messages"),&Translation::_set_messages); + ClassDB::bind_method(D_METHOD("_get_messages"),&Translation::_get_messages); ADD_PROPERTY( PropertyInfo(Variant::POOL_STRING_ARRAY,"messages",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_messages", "_get_messages") ; ADD_PROPERTY( PropertyInfo(Variant::STRING,"locale"), "set_locale", "get_locale") ; @@ -1137,15 +1137,15 @@ StringName TranslationServer::tool_translate(const StringName& p_message) const void TranslationServer::_bind_methods() { - ClassDB::bind_method(_MD("set_locale","locale"),&TranslationServer::set_locale); - ClassDB::bind_method(_MD("get_locale"),&TranslationServer::get_locale); + ClassDB::bind_method(D_METHOD("set_locale","locale"),&TranslationServer::set_locale); + ClassDB::bind_method(D_METHOD("get_locale"),&TranslationServer::get_locale); - ClassDB::bind_method(_MD("translate","message"),&TranslationServer::translate); + ClassDB::bind_method(D_METHOD("translate","message"),&TranslationServer::translate); - ClassDB::bind_method(_MD("add_translation","translation:Translation"),&TranslationServer::add_translation); - ClassDB::bind_method(_MD("remove_translation","translation:Translation"),&TranslationServer::remove_translation); + ClassDB::bind_method(D_METHOD("add_translation","translation:Translation"),&TranslationServer::add_translation); + ClassDB::bind_method(D_METHOD("remove_translation","translation:Translation"),&TranslationServer::remove_translation); - ClassDB::bind_method(_MD("clear"),&TranslationServer::clear); + ClassDB::bind_method(D_METHOD("clear"),&TranslationServer::clear); } diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 1a0ccc4a7e..f91f1aa14b 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -485,11 +485,11 @@ Variant UndoRedo::_add_undo_method(const Variant** p_args, int p_argcount, Varia void UndoRedo::_bind_methods() { - ClassDB::bind_method(_MD("create_action","name","merge_mode"),&UndoRedo::create_action, DEFVAL(MERGE_DISABLE) ); - ClassDB::bind_method(_MD("commit_action"),&UndoRedo::commit_action); + ClassDB::bind_method(D_METHOD("create_action","name","merge_mode"),&UndoRedo::create_action, DEFVAL(MERGE_DISABLE) ); + ClassDB::bind_method(D_METHOD("commit_action"),&UndoRedo::commit_action); - //ClassDB::bind_method(_MD("add_do_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_do_method); - //ClassDB::bind_method(_MD("add_undo_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_undo_method); + //ClassDB::bind_method(D_METHOD("add_do_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_do_method); + //ClassDB::bind_method(D_METHOD("add_undo_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_undo_method); { MethodInfo mi; @@ -511,13 +511,13 @@ void UndoRedo::_bind_methods() { ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"add_undo_method",&UndoRedo::_add_undo_method,mi); } - ClassDB::bind_method(_MD("add_do_property","object", "property", "value:Variant"),&UndoRedo::add_do_property); - ClassDB::bind_method(_MD("add_undo_property","object", "property", "value:Variant"),&UndoRedo::add_undo_property); - ClassDB::bind_method(_MD("add_do_reference","object"),&UndoRedo::add_do_reference); - ClassDB::bind_method(_MD("add_undo_reference","object"),&UndoRedo::add_undo_reference); - ClassDB::bind_method(_MD("clear_history"),&UndoRedo::clear_history); - ClassDB::bind_method(_MD("get_current_action_name"),&UndoRedo::get_current_action_name); - ClassDB::bind_method(_MD("get_version"),&UndoRedo::get_version); + ClassDB::bind_method(D_METHOD("add_do_property","object", "property", "value:Variant"),&UndoRedo::add_do_property); + ClassDB::bind_method(D_METHOD("add_undo_property","object", "property", "value:Variant"),&UndoRedo::add_undo_property); + ClassDB::bind_method(D_METHOD("add_do_reference","object"),&UndoRedo::add_do_reference); + ClassDB::bind_method(D_METHOD("add_undo_reference","object"),&UndoRedo::add_undo_reference); + ClassDB::bind_method(D_METHOD("clear_history"),&UndoRedo::clear_history); + ClassDB::bind_method(D_METHOD("get_current_action_name"),&UndoRedo::get_current_action_name); + ClassDB::bind_method(D_METHOD("get_version"),&UndoRedo::get_version); BIND_CONSTANT(MERGE_DISABLE); BIND_CONSTANT(MERGE_ENDS); diff --git a/main/performance.cpp b/main/performance.cpp index 50ca594f8e..bc5d8c33c4 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -40,7 +40,7 @@ Performance *Performance::singleton=NULL; void Performance::_bind_methods() { - ClassDB::bind_method(_MD("get_monitor","monitor"),&Performance::get_monitor); + ClassDB::bind_method(D_METHOD("get_monitor","monitor"),&Performance::get_monitor); BIND_CONSTANT( TIME_FPS ); BIND_CONSTANT( TIME_PROCESS ); diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index 76d1afd2ac..d5d4689562 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -356,8 +356,8 @@ protected: static void _bind_methods() { - ClassDB::bind_method(_MD("_body_moved"),&TestPhysics2DMainLoop::_body_moved); - ClassDB::bind_method(_MD("_ray_query_callback"),&TestPhysics2DMainLoop::_ray_query_callback); + ClassDB::bind_method(D_METHOD("_body_moved"),&TestPhysics2DMainLoop::_body_moved); + ClassDB::bind_method(D_METHOD("_ray_query_callback"),&TestPhysics2DMainLoop::_ray_query_callback); } diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp index d10634e9ea..af555b7eb6 100644 --- a/modules/enet/networked_multiplayer_enet.cpp +++ b/modules/enet/networked_multiplayer_enet.cpp @@ -645,12 +645,12 @@ void NetworkedMultiplayerENet::enet_compressor_destroy(void * context){ void NetworkedMultiplayerENet::_bind_methods() { - ClassDB::bind_method(_MD("create_server","port","max_clients","in_bandwidth","out_bandwidth"),&NetworkedMultiplayerENet::create_server,DEFVAL(32),DEFVAL(0),DEFVAL(0)); - ClassDB::bind_method(_MD("create_client","ip","port","in_bandwidth","out_bandwidth"),&NetworkedMultiplayerENet::create_client,DEFVAL(0),DEFVAL(0)); - ClassDB::bind_method(_MD("close_connection"),&NetworkedMultiplayerENet::close_connection); - ClassDB::bind_method(_MD("set_compression_mode","mode"),&NetworkedMultiplayerENet::set_compression_mode); - ClassDB::bind_method(_MD("get_compression_mode"),&NetworkedMultiplayerENet::get_compression_mode); - ClassDB::bind_method(_MD("set_bind_ip", "ip"),&NetworkedMultiplayerENet::set_bind_ip); + ClassDB::bind_method(D_METHOD("create_server","port","max_clients","in_bandwidth","out_bandwidth"),&NetworkedMultiplayerENet::create_server,DEFVAL(32),DEFVAL(0),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("create_client","ip","port","in_bandwidth","out_bandwidth"),&NetworkedMultiplayerENet::create_client,DEFVAL(0),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("close_connection"),&NetworkedMultiplayerENet::close_connection); + ClassDB::bind_method(D_METHOD("set_compression_mode","mode"),&NetworkedMultiplayerENet::set_compression_mode); + ClassDB::bind_method(D_METHOD("get_compression_mode"),&NetworkedMultiplayerENet::get_compression_mode); + ClassDB::bind_method(D_METHOD("set_bind_ip", "ip"),&NetworkedMultiplayerENet::set_bind_ip); BIND_CONSTANT( COMPRESS_NONE ); BIND_CONSTANT( COMPRESS_RANGE_CODER ); diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index 51e2c1e2be..d7274b5b8e 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -1490,8 +1490,8 @@ Variant GDFunctionState::resume(const Variant& p_arg) { void GDFunctionState::_bind_methods() { - ClassDB::bind_method(_MD("resume:Variant","arg"),&GDFunctionState::resume,DEFVAL(Variant())); - ClassDB::bind_method(_MD("is_valid"),&GDFunctionState::is_valid); + ClassDB::bind_method(D_METHOD("resume:Variant","arg"),&GDFunctionState::resume,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("is_valid"),&GDFunctionState::is_valid); ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&GDFunctionState::_signal_callback,MethodInfo("_signal_callback")); } diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 89df7e962a..167ede4853 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -63,7 +63,7 @@ bool GDNativeClass::_get(const StringName& p_name,Variant &r_ret) const { void GDNativeClass::_bind_methods() { - ClassDB::bind_method(_MD("new"),&GDNativeClass::_new); + ClassDB::bind_method(D_METHOD("new"),&GDNativeClass::_new); } @@ -789,7 +789,7 @@ void GDScript::_bind_methods() { ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"new",&GDScript::_new,MethodInfo(Variant::OBJECT,"new")); - ClassDB::bind_method(_MD("get_as_byte_code"),&GDScript::get_as_byte_code); + ClassDB::bind_method(D_METHOD("get_as_byte_code"),&GDScript::get_as_byte_code); } diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 2dd7e951ab..1e6bd11154 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -1185,60 +1185,60 @@ void GridMap::_update_dirty_map_callback() { void GridMap::_bind_methods() { - ClassDB::bind_method(_MD("set_theme","theme:MeshLibrary"),&GridMap::set_theme); - ClassDB::bind_method(_MD("get_theme:MeshLibrary"),&GridMap::get_theme); + ClassDB::bind_method(D_METHOD("set_theme","theme:MeshLibrary"),&GridMap::set_theme); + ClassDB::bind_method(D_METHOD("get_theme:MeshLibrary"),&GridMap::get_theme); - ClassDB::bind_method(_MD("set_bake","enable"),&GridMap::set_bake); - ClassDB::bind_method(_MD("is_baking_enabled"),&GridMap::is_baking_enabled); + ClassDB::bind_method(D_METHOD("set_bake","enable"),&GridMap::set_bake); + ClassDB::bind_method(D_METHOD("is_baking_enabled"),&GridMap::is_baking_enabled); - ClassDB::bind_method(_MD("set_cell_size","size"),&GridMap::set_cell_size); - ClassDB::bind_method(_MD("get_cell_size"),&GridMap::get_cell_size); + ClassDB::bind_method(D_METHOD("set_cell_size","size"),&GridMap::set_cell_size); + ClassDB::bind_method(D_METHOD("get_cell_size"),&GridMap::get_cell_size); - ClassDB::bind_method(_MD("set_octant_size","size"),&GridMap::set_octant_size); - ClassDB::bind_method(_MD("get_octant_size"),&GridMap::get_octant_size); + ClassDB::bind_method(D_METHOD("set_octant_size","size"),&GridMap::set_octant_size); + ClassDB::bind_method(D_METHOD("get_octant_size"),&GridMap::get_octant_size); - ClassDB::bind_method(_MD("set_cell_item","x","y","z","item","orientation"),&GridMap::set_cell_item,DEFVAL(0)); - ClassDB::bind_method(_MD("get_cell_item","x","y","z"),&GridMap::get_cell_item); - ClassDB::bind_method(_MD("get_cell_item_orientation","x","y","z"),&GridMap::get_cell_item_orientation); + ClassDB::bind_method(D_METHOD("set_cell_item","x","y","z","item","orientation"),&GridMap::set_cell_item,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_cell_item","x","y","z"),&GridMap::get_cell_item); + ClassDB::bind_method(D_METHOD("get_cell_item_orientation","x","y","z"),&GridMap::get_cell_item_orientation); - //ClassDB::bind_method(_MD("_recreate_octants"),&GridMap::_recreate_octants); - ClassDB::bind_method(_MD("_update_dirty_map_callback"),&GridMap::_update_dirty_map_callback); - ClassDB::bind_method(_MD("resource_changed","resource"),&GridMap::resource_changed); + //ClassDB::bind_method(D_METHOD("_recreate_octants"),&GridMap::_recreate_octants); + ClassDB::bind_method(D_METHOD("_update_dirty_map_callback"),&GridMap::_update_dirty_map_callback); + ClassDB::bind_method(D_METHOD("resource_changed","resource"),&GridMap::resource_changed); - ClassDB::bind_method(_MD("set_center_x","enable"),&GridMap::set_center_x); - ClassDB::bind_method(_MD("get_center_x"),&GridMap::get_center_x); - ClassDB::bind_method(_MD("set_center_y","enable"),&GridMap::set_center_y); - ClassDB::bind_method(_MD("get_center_y"),&GridMap::get_center_y); - ClassDB::bind_method(_MD("set_center_z","enable"),&GridMap::set_center_z); - ClassDB::bind_method(_MD("get_center_z"),&GridMap::get_center_z); + ClassDB::bind_method(D_METHOD("set_center_x","enable"),&GridMap::set_center_x); + ClassDB::bind_method(D_METHOD("get_center_x"),&GridMap::get_center_x); + ClassDB::bind_method(D_METHOD("set_center_y","enable"),&GridMap::set_center_y); + ClassDB::bind_method(D_METHOD("get_center_y"),&GridMap::get_center_y); + ClassDB::bind_method(D_METHOD("set_center_z","enable"),&GridMap::set_center_z); + ClassDB::bind_method(D_METHOD("get_center_z"),&GridMap::get_center_z); - ClassDB::bind_method(_MD("set_clip","enabled","clipabove","floor","axis"),&GridMap::set_clip,DEFVAL(true),DEFVAL(0),DEFVAL(Vector3::AXIS_X)); + ClassDB::bind_method(D_METHOD("set_clip","enabled","clipabove","floor","axis"),&GridMap::set_clip,DEFVAL(true),DEFVAL(0),DEFVAL(Vector3::AXIS_X)); - ClassDB::bind_method(_MD("create_area","id","area"),&GridMap::create_area); - ClassDB::bind_method(_MD("area_get_bounds","area","bounds"),&GridMap::area_get_bounds); - ClassDB::bind_method(_MD("area_set_exterior_portal","area","enable"),&GridMap::area_set_exterior_portal); - ClassDB::bind_method(_MD("area_set_name","area","name"),&GridMap::area_set_name); - ClassDB::bind_method(_MD("area_get_name","area"),&GridMap::area_get_name); - ClassDB::bind_method(_MD("area_is_exterior_portal","area"),&GridMap::area_is_exterior_portal); - ClassDB::bind_method(_MD("area_set_portal_disable_distance","area","distance"),&GridMap::area_set_portal_disable_distance); - ClassDB::bind_method(_MD("area_get_portal_disable_distance","area"),&GridMap::area_get_portal_disable_distance); - ClassDB::bind_method(_MD("area_set_portal_disable_color","area","color"),&GridMap::area_set_portal_disable_color); - ClassDB::bind_method(_MD("area_get_portal_disable_color","area"),&GridMap::area_get_portal_disable_color); - ClassDB::bind_method(_MD("erase_area","area"),&GridMap::erase_area); - ClassDB::bind_method(_MD("get_unused_area_id","area"),&GridMap::get_unused_area_id); - ClassDB::bind_method(_MD("bake_geometry"),&GridMap::bake_geometry); + ClassDB::bind_method(D_METHOD("create_area","id","area"),&GridMap::create_area); + ClassDB::bind_method(D_METHOD("area_get_bounds","area","bounds"),&GridMap::area_get_bounds); + ClassDB::bind_method(D_METHOD("area_set_exterior_portal","area","enable"),&GridMap::area_set_exterior_portal); + ClassDB::bind_method(D_METHOD("area_set_name","area","name"),&GridMap::area_set_name); + ClassDB::bind_method(D_METHOD("area_get_name","area"),&GridMap::area_get_name); + ClassDB::bind_method(D_METHOD("area_is_exterior_portal","area"),&GridMap::area_is_exterior_portal); + ClassDB::bind_method(D_METHOD("area_set_portal_disable_distance","area","distance"),&GridMap::area_set_portal_disable_distance); + ClassDB::bind_method(D_METHOD("area_get_portal_disable_distance","area"),&GridMap::area_get_portal_disable_distance); + ClassDB::bind_method(D_METHOD("area_set_portal_disable_color","area","color"),&GridMap::area_set_portal_disable_color); + ClassDB::bind_method(D_METHOD("area_get_portal_disable_color","area"),&GridMap::area_get_portal_disable_color); + ClassDB::bind_method(D_METHOD("erase_area","area"),&GridMap::erase_area); + ClassDB::bind_method(D_METHOD("get_unused_area_id","area"),&GridMap::get_unused_area_id); + ClassDB::bind_method(D_METHOD("bake_geometry"),&GridMap::bake_geometry); - ClassDB::bind_method(_MD("_baked_light_changed"),&GridMap::_baked_light_changed); - ClassDB::bind_method(_MD("set_use_baked_light","use"),&GridMap::set_use_baked_light); - ClassDB::bind_method(_MD("is_using_baked_light","use"),&GridMap::is_using_baked_light); + ClassDB::bind_method(D_METHOD("_baked_light_changed"),&GridMap::_baked_light_changed); + ClassDB::bind_method(D_METHOD("set_use_baked_light","use"),&GridMap::set_use_baked_light); + ClassDB::bind_method(D_METHOD("is_using_baked_light","use"),&GridMap::is_using_baked_light); - ClassDB::bind_method(_MD("_get_baked_light_meshes"),&GridMap::_get_baked_light_meshes); + ClassDB::bind_method(D_METHOD("_get_baked_light_meshes"),&GridMap::_get_baked_light_meshes); ClassDB::set_method_flags("GridMap","bake_geometry",METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("clear"),&GridMap::clear); + ClassDB::bind_method(D_METHOD("clear"),&GridMap::clear); BIND_CONSTANT( INVALID_CELL_ITEM ); diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 0d57ffa394..d4c7cb7ca9 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -1189,7 +1189,7 @@ void GridMapEditor::_bind_methods() { ClassDB::bind_method("_area_selected",&GridMapEditor::_area_selected); ClassDB::bind_method("_floor_changed",&GridMapEditor::_floor_changed); - ClassDB::bind_method(_MD("_set_display_mode","mode"), &GridMapEditor::_set_display_mode); + ClassDB::bind_method(D_METHOD("_set_display_mode","mode"), &GridMapEditor::_set_display_mode); } diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index 9c08eaa409..6d80532110 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -1481,26 +1481,26 @@ RegEx::~RegEx() { void RegExMatch::_bind_methods() { - ClassDB::bind_method(_MD("expand","template"),&RegExMatch::expand); - ClassDB::bind_method(_MD("get_group_count"),&RegExMatch::get_group_count); - ClassDB::bind_method(_MD("get_group_array"),&RegExMatch::get_group_array); - ClassDB::bind_method(_MD("get_names"),&RegExMatch::get_names); - ClassDB::bind_method(_MD("get_name_dict"),&RegExMatch::get_name_dict); - ClassDB::bind_method(_MD("get_string","name"),&RegExMatch::get_string, DEFVAL(0)); - ClassDB::bind_method(_MD("get_start","name"),&RegExMatch::get_start, DEFVAL(0)); - ClassDB::bind_method(_MD("get_end","name"),&RegExMatch::get_end, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("expand","template"),&RegExMatch::expand); + ClassDB::bind_method(D_METHOD("get_group_count"),&RegExMatch::get_group_count); + ClassDB::bind_method(D_METHOD("get_group_array"),&RegExMatch::get_group_array); + ClassDB::bind_method(D_METHOD("get_names"),&RegExMatch::get_names); + ClassDB::bind_method(D_METHOD("get_name_dict"),&RegExMatch::get_name_dict); + ClassDB::bind_method(D_METHOD("get_string","name"),&RegExMatch::get_string, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_start","name"),&RegExMatch::get_start, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_end","name"),&RegExMatch::get_end, DEFVAL(0)); } void RegEx::_bind_methods() { - ClassDB::bind_method(_MD("clear"),&RegEx::clear); - ClassDB::bind_method(_MD("compile","pattern"),&RegEx::compile); - ClassDB::bind_method(_MD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1)); - ClassDB::bind_method(_MD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1)); - ClassDB::bind_method(_MD("is_valid"),&RegEx::is_valid); - ClassDB::bind_method(_MD("get_pattern"),&RegEx::get_pattern); - ClassDB::bind_method(_MD("get_group_count"),&RegEx::get_group_count); - ClassDB::bind_method(_MD("get_names"),&RegEx::get_names); + ClassDB::bind_method(D_METHOD("clear"),&RegEx::clear); + ClassDB::bind_method(D_METHOD("compile","pattern"),&RegEx::compile); + ClassDB::bind_method(D_METHOD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("is_valid"),&RegEx::is_valid); + ClassDB::bind_method(D_METHOD("get_pattern"),&RegEx::get_pattern); + ClassDB::bind_method(D_METHOD("get_group_count"),&RegEx::get_group_count); + ClassDB::bind_method(D_METHOD("get_names"),&RegEx::get_names); ADD_PROPERTY(PropertyInfo(Variant::STRING, "pattern"), "compile", "get_pattern"); } diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp index d4967cd805..ee7cbeece9 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp @@ -205,11 +205,11 @@ bool AudioStreamOGGVorbis::has_loop() const { void AudioStreamOGGVorbis::_bind_methods() { - ClassDB::bind_method(_MD("set_data","data"),&AudioStreamOGGVorbis::set_data); - ClassDB::bind_method(_MD("get_data"),&AudioStreamOGGVorbis::get_data); + ClassDB::bind_method(D_METHOD("set_data","data"),&AudioStreamOGGVorbis::set_data); + ClassDB::bind_method(D_METHOD("get_data"),&AudioStreamOGGVorbis::get_data); - ClassDB::bind_method(_MD("set_loop","enable"),&AudioStreamOGGVorbis::set_loop); - ClassDB::bind_method(_MD("has_loop"),&AudioStreamOGGVorbis::has_loop); + ClassDB::bind_method(D_METHOD("set_loop","enable"),&AudioStreamOGGVorbis::set_loop); + ClassDB::bind_method(D_METHOD("has_loop"),&AudioStreamOGGVorbis::has_loop); ADD_PROPERTY(PropertyInfo(Variant::POOL_BYTE_ARRAY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_data","get_data"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"loop",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_loop","has_loop"); diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 851212e720..ec09335b7d 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -104,11 +104,11 @@ Array VisualScriptNode::_get_default_input_values() const { void VisualScriptNode::_bind_methods() { - ClassDB::bind_method(_MD("get_visual_script:VisualScript"),&VisualScriptNode::get_visual_script); - ClassDB::bind_method(_MD("set_default_input_value","port_idx","value:Variant"),&VisualScriptNode::set_default_input_value); - ClassDB::bind_method(_MD("get_default_input_value:Variant","port_idx"),&VisualScriptNode::get_default_input_value); - ClassDB::bind_method(_MD("_set_default_input_values","values"),&VisualScriptNode::_set_default_input_values); - ClassDB::bind_method(_MD("_get_default_input_values"),&VisualScriptNode::_get_default_input_values); + ClassDB::bind_method(D_METHOD("get_visual_script:VisualScript"),&VisualScriptNode::get_visual_script); + ClassDB::bind_method(D_METHOD("set_default_input_value","port_idx","value:Variant"),&VisualScriptNode::set_default_input_value); + ClassDB::bind_method(D_METHOD("get_default_input_value:Variant","port_idx"),&VisualScriptNode::get_default_input_value); + ClassDB::bind_method(D_METHOD("_set_default_input_values","values"),&VisualScriptNode::_set_default_input_values); + ClassDB::bind_method(D_METHOD("_get_default_input_values"),&VisualScriptNode::_get_default_input_values); ADD_PROPERTY(PropertyInfo(Variant::ARRAY,"_default_input_values",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_default_input_values","_get_default_input_values"); ADD_SIGNAL(MethodInfo("ports_changed")); @@ -1317,63 +1317,63 @@ void VisualScript::_bind_methods() { - ClassDB::bind_method(_MD("_node_ports_changed"),&VisualScript::_node_ports_changed); - - ClassDB::bind_method(_MD("add_function","name"),&VisualScript::add_function); - ClassDB::bind_method(_MD("has_function","name"),&VisualScript::has_function); - ClassDB::bind_method(_MD("remove_function","name"),&VisualScript::remove_function); - ClassDB::bind_method(_MD("rename_function","name","new_name"),&VisualScript::rename_function); - ClassDB::bind_method(_MD("set_function_scroll","ofs"),&VisualScript::set_function_scroll); - ClassDB::bind_method(_MD("get_function_scroll"),&VisualScript::get_function_scroll); - - ClassDB::bind_method(_MD("add_node","func","id","node","pos"),&VisualScript::add_node,DEFVAL(Point2())); - ClassDB::bind_method(_MD("remove_node","func","id"),&VisualScript::remove_node); - ClassDB::bind_method(_MD("get_function_node_id","name"),&VisualScript::get_function_node_id); - - ClassDB::bind_method(_MD("get_node","func","id"),&VisualScript::get_node); - ClassDB::bind_method(_MD("has_node","func","id"),&VisualScript::has_node); - ClassDB::bind_method(_MD("set_node_pos","func","id","pos"),&VisualScript::set_node_pos); - ClassDB::bind_method(_MD("get_node_pos","func","id"),&VisualScript::get_node_pos); - - ClassDB::bind_method(_MD("sequence_connect","func","from_node","from_output","to_node"),&VisualScript::sequence_connect); - ClassDB::bind_method(_MD("sequence_disconnect","func","from_node","from_output","to_node"),&VisualScript::sequence_disconnect); - ClassDB::bind_method(_MD("has_sequence_connection","func","from_node","from_output","to_node"),&VisualScript::has_sequence_connection); - - ClassDB::bind_method(_MD("data_connect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_connect); - ClassDB::bind_method(_MD("data_disconnect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_disconnect); - ClassDB::bind_method(_MD("has_data_connection","func","from_node","from_port","to_node","to_port"),&VisualScript::has_data_connection); - - ClassDB::bind_method(_MD("add_variable","name","default_value","export"),&VisualScript::add_variable,DEFVAL(Variant()),DEFVAL(false)); - ClassDB::bind_method(_MD("has_variable","name"),&VisualScript::has_variable); - ClassDB::bind_method(_MD("remove_variable","name"),&VisualScript::remove_variable); - ClassDB::bind_method(_MD("set_variable_default_value","name","value"),&VisualScript::set_variable_default_value); - ClassDB::bind_method(_MD("get_variable_default_value","name"),&VisualScript::get_variable_default_value); - ClassDB::bind_method(_MD("set_variable_info","name","value"),&VisualScript::_set_variable_info); - ClassDB::bind_method(_MD("get_variable_info","name"),&VisualScript::_get_variable_info); - ClassDB::bind_method(_MD("set_variable_export","name","enable"),&VisualScript::set_variable_export); - ClassDB::bind_method(_MD("get_variable_export","name"),&VisualScript::get_variable_export); - ClassDB::bind_method(_MD("rename_variable","name","new_name"),&VisualScript::rename_variable); - - ClassDB::bind_method(_MD("add_custom_signal","name"),&VisualScript::add_custom_signal); - ClassDB::bind_method(_MD("has_custom_signal","name"),&VisualScript::has_custom_signal); - ClassDB::bind_method(_MD("custom_signal_add_argument","name","type","argname","index"),&VisualScript::custom_signal_add_argument,DEFVAL(-1)); - ClassDB::bind_method(_MD("custom_signal_set_argument_type","name","argidx","type"),&VisualScript::custom_signal_set_argument_type); - ClassDB::bind_method(_MD("custom_signal_get_argument_type","name","argidx"),&VisualScript::custom_signal_get_argument_type); - ClassDB::bind_method(_MD("custom_signal_set_argument_name","name","argidx","argname"),&VisualScript::custom_signal_set_argument_name); - ClassDB::bind_method(_MD("custom_signal_get_argument_name","name","argidx"),&VisualScript::custom_signal_get_argument_name); - ClassDB::bind_method(_MD("custom_signal_remove_argument","argidx"),&VisualScript::custom_signal_remove_argument); - ClassDB::bind_method(_MD("custom_signal_get_argument_count","name"),&VisualScript::custom_signal_get_argument_count); - ClassDB::bind_method(_MD("custom_signal_swap_argument","name","argidx","withidx"),&VisualScript::custom_signal_swap_argument); - ClassDB::bind_method(_MD("remove_custom_signal","name"),&VisualScript::remove_custom_signal); - ClassDB::bind_method(_MD("rename_custom_signal","name","new_name"),&VisualScript::rename_custom_signal); - - //ClassDB::bind_method(_MD("set_variable_info","name","info"),&VScript::set_variable_info); - //ClassDB::bind_method(_MD("get_variable_info","name"),&VScript::set_variable_info); - - ClassDB::bind_method(_MD("set_instance_base_type","type"),&VisualScript::set_instance_base_type); - - ClassDB::bind_method(_MD("_set_data","data"),&VisualScript::_set_data); - ClassDB::bind_method(_MD("_get_data"),&VisualScript::_get_data); + ClassDB::bind_method(D_METHOD("_node_ports_changed"),&VisualScript::_node_ports_changed); + + ClassDB::bind_method(D_METHOD("add_function","name"),&VisualScript::add_function); + ClassDB::bind_method(D_METHOD("has_function","name"),&VisualScript::has_function); + ClassDB::bind_method(D_METHOD("remove_function","name"),&VisualScript::remove_function); + ClassDB::bind_method(D_METHOD("rename_function","name","new_name"),&VisualScript::rename_function); + ClassDB::bind_method(D_METHOD("set_function_scroll","ofs"),&VisualScript::set_function_scroll); + ClassDB::bind_method(D_METHOD("get_function_scroll"),&VisualScript::get_function_scroll); + + ClassDB::bind_method(D_METHOD("add_node","func","id","node","pos"),&VisualScript::add_node,DEFVAL(Point2())); + ClassDB::bind_method(D_METHOD("remove_node","func","id"),&VisualScript::remove_node); + ClassDB::bind_method(D_METHOD("get_function_node_id","name"),&VisualScript::get_function_node_id); + + ClassDB::bind_method(D_METHOD("get_node","func","id"),&VisualScript::get_node); + ClassDB::bind_method(D_METHOD("has_node","func","id"),&VisualScript::has_node); + ClassDB::bind_method(D_METHOD("set_node_pos","func","id","pos"),&VisualScript::set_node_pos); + ClassDB::bind_method(D_METHOD("get_node_pos","func","id"),&VisualScript::get_node_pos); + + ClassDB::bind_method(D_METHOD("sequence_connect","func","from_node","from_output","to_node"),&VisualScript::sequence_connect); + ClassDB::bind_method(D_METHOD("sequence_disconnect","func","from_node","from_output","to_node"),&VisualScript::sequence_disconnect); + ClassDB::bind_method(D_METHOD("has_sequence_connection","func","from_node","from_output","to_node"),&VisualScript::has_sequence_connection); + + ClassDB::bind_method(D_METHOD("data_connect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_connect); + ClassDB::bind_method(D_METHOD("data_disconnect","func","from_node","from_port","to_node","to_port"),&VisualScript::data_disconnect); + ClassDB::bind_method(D_METHOD("has_data_connection","func","from_node","from_port","to_node","to_port"),&VisualScript::has_data_connection); + + ClassDB::bind_method(D_METHOD("add_variable","name","default_value","export"),&VisualScript::add_variable,DEFVAL(Variant()),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("has_variable","name"),&VisualScript::has_variable); + ClassDB::bind_method(D_METHOD("remove_variable","name"),&VisualScript::remove_variable); + ClassDB::bind_method(D_METHOD("set_variable_default_value","name","value"),&VisualScript::set_variable_default_value); + ClassDB::bind_method(D_METHOD("get_variable_default_value","name"),&VisualScript::get_variable_default_value); + ClassDB::bind_method(D_METHOD("set_variable_info","name","value"),&VisualScript::_set_variable_info); + ClassDB::bind_method(D_METHOD("get_variable_info","name"),&VisualScript::_get_variable_info); + ClassDB::bind_method(D_METHOD("set_variable_export","name","enable"),&VisualScript::set_variable_export); + ClassDB::bind_method(D_METHOD("get_variable_export","name"),&VisualScript::get_variable_export); + ClassDB::bind_method(D_METHOD("rename_variable","name","new_name"),&VisualScript::rename_variable); + + ClassDB::bind_method(D_METHOD("add_custom_signal","name"),&VisualScript::add_custom_signal); + ClassDB::bind_method(D_METHOD("has_custom_signal","name"),&VisualScript::has_custom_signal); + ClassDB::bind_method(D_METHOD("custom_signal_add_argument","name","type","argname","index"),&VisualScript::custom_signal_add_argument,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("custom_signal_set_argument_type","name","argidx","type"),&VisualScript::custom_signal_set_argument_type); + ClassDB::bind_method(D_METHOD("custom_signal_get_argument_type","name","argidx"),&VisualScript::custom_signal_get_argument_type); + ClassDB::bind_method(D_METHOD("custom_signal_set_argument_name","name","argidx","argname"),&VisualScript::custom_signal_set_argument_name); + ClassDB::bind_method(D_METHOD("custom_signal_get_argument_name","name","argidx"),&VisualScript::custom_signal_get_argument_name); + ClassDB::bind_method(D_METHOD("custom_signal_remove_argument","argidx"),&VisualScript::custom_signal_remove_argument); + ClassDB::bind_method(D_METHOD("custom_signal_get_argument_count","name"),&VisualScript::custom_signal_get_argument_count); + ClassDB::bind_method(D_METHOD("custom_signal_swap_argument","name","argidx","withidx"),&VisualScript::custom_signal_swap_argument); + ClassDB::bind_method(D_METHOD("remove_custom_signal","name"),&VisualScript::remove_custom_signal); + ClassDB::bind_method(D_METHOD("rename_custom_signal","name","new_name"),&VisualScript::rename_custom_signal); + + //ClassDB::bind_method(D_METHOD("set_variable_info","name","info"),&VScript::set_variable_info); + //ClassDB::bind_method(D_METHOD("get_variable_info","name"),&VScript::set_variable_info); + + ClassDB::bind_method(D_METHOD("set_instance_base_type","type"),&VisualScript::set_instance_base_type); + + ClassDB::bind_method(D_METHOD("_set_data","data"),&VisualScript::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&VisualScript::_get_data); ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_data","_get_data"); @@ -2436,9 +2436,9 @@ Variant VisualScriptFunctionState::resume(Array p_args) { void VisualScriptFunctionState::_bind_methods() { - ClassDB::bind_method(_MD("connect_to_signal","obj","signals","args"),&VisualScriptFunctionState::connect_to_signal); - ClassDB::bind_method(_MD("resume:Array","args"),&VisualScriptFunctionState::resume,DEFVAL(Variant())); - ClassDB::bind_method(_MD("is_valid"),&VisualScriptFunctionState::is_valid); + ClassDB::bind_method(D_METHOD("connect_to_signal","obj","signals","args"),&VisualScriptFunctionState::connect_to_signal); + ClassDB::bind_method(D_METHOD("resume:Array","args"),&VisualScriptFunctionState::resume,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("is_valid"),&VisualScriptFunctionState::is_valid); ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&VisualScriptFunctionState::_signal_callback,MethodInfo("_signal_callback")); } diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp index 5a00743ba0..cae0146aac 100644 --- a/modules/visual_script/visual_script_builtin_funcs.cpp +++ b/modules/visual_script/visual_script_builtin_funcs.cpp @@ -1166,8 +1166,8 @@ VisualScriptNodeInstance* VisualScriptBuiltinFunc::instance(VisualScriptInstance void VisualScriptBuiltinFunc::_bind_methods() { - ClassDB::bind_method(_MD("set_func","which"),&VisualScriptBuiltinFunc::set_func); - ClassDB::bind_method(_MD("get_func"),&VisualScriptBuiltinFunc::get_func); + ClassDB::bind_method(D_METHOD("set_func","which"),&VisualScriptBuiltinFunc::set_func); + ClassDB::bind_method(D_METHOD("get_func"),&VisualScriptBuiltinFunc::get_func); String cc; diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp index f6efc5c0b3..d2781c6dcc 100644 --- a/modules/visual_script/visual_script_flow_control.cpp +++ b/modules/visual_script/visual_script_flow_control.cpp @@ -81,10 +81,10 @@ bool VisualScriptReturn::is_return_value_enabled() const { void VisualScriptReturn::_bind_methods() { - ClassDB::bind_method(_MD("set_return_type","type"),&VisualScriptReturn::set_return_type); - ClassDB::bind_method(_MD("get_return_type"),&VisualScriptReturn::get_return_type); - ClassDB::bind_method(_MD("set_enable_return_value","enable"),&VisualScriptReturn::set_enable_return_value); - ClassDB::bind_method(_MD("is_return_value_enabled"),&VisualScriptReturn::is_return_value_enabled); + ClassDB::bind_method(D_METHOD("set_return_type","type"),&VisualScriptReturn::set_return_type); + ClassDB::bind_method(D_METHOD("get_return_type"),&VisualScriptReturn::get_return_type); + ClassDB::bind_method(D_METHOD("set_enable_return_value","enable"),&VisualScriptReturn::set_enable_return_value); + ClassDB::bind_method(D_METHOD("is_return_value_enabled"),&VisualScriptReturn::is_return_value_enabled); String argt="Any"; for(int i=1;i<Variant::VARIANT_MAX;i++) { @@ -544,8 +544,8 @@ int VisualScriptSequence::get_steps() const { void VisualScriptSequence::_bind_methods() { - ClassDB::bind_method(_MD("set_steps","steps"),&VisualScriptSequence::set_steps); - ClassDB::bind_method(_MD("get_steps"),&VisualScriptSequence::get_steps); + ClassDB::bind_method(D_METHOD("set_steps","steps"),&VisualScriptSequence::set_steps); + ClassDB::bind_method(D_METHOD("get_steps"),&VisualScriptSequence::get_steps); ADD_PROPERTY(PropertyInfo(Variant::INT,"steps",PROPERTY_HINT_RANGE,"1,64,1"),"set_steps","get_steps"); @@ -1893,11 +1893,11 @@ VisualScriptNodeInstance* VisualScriptTypeCast::instance(VisualScriptInstance* p void VisualScriptTypeCast::_bind_methods() { - ClassDB::bind_method(_MD("set_base_type","type"),&VisualScriptTypeCast::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptTypeCast::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","type"),&VisualScriptTypeCast::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptTypeCast::get_base_type); - ClassDB::bind_method(_MD("set_base_script","path"),&VisualScriptTypeCast::set_base_script); - ClassDB::bind_method(_MD("get_base_script"),&VisualScriptTypeCast::get_base_script); + ClassDB::bind_method(D_METHOD("set_base_script","path"),&VisualScriptTypeCast::set_base_script); + ClassDB::bind_method(D_METHOD("get_base_script"),&VisualScriptTypeCast::get_base_script); List<String> script_extensions; diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp index ae2d38de6d..5c8f52ebb1 100644 --- a/modules/visual_script/visual_script_func_nodes.cpp +++ b/modules/visual_script/visual_script_func_nodes.cpp @@ -687,38 +687,38 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo& property) const void VisualScriptFunctionCall::_bind_methods() { - ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptFunctionCall::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptFunctionCall::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","base_type"),&VisualScriptFunctionCall::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptFunctionCall::get_base_type); - ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptFunctionCall::set_base_script); - ClassDB::bind_method(_MD("get_base_script"),&VisualScriptFunctionCall::get_base_script); + ClassDB::bind_method(D_METHOD("set_base_script","base_script"),&VisualScriptFunctionCall::set_base_script); + ClassDB::bind_method(D_METHOD("get_base_script"),&VisualScriptFunctionCall::get_base_script); - ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptFunctionCall::set_basic_type); - ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptFunctionCall::get_basic_type); + ClassDB::bind_method(D_METHOD("set_basic_type","basic_type"),&VisualScriptFunctionCall::set_basic_type); + ClassDB::bind_method(D_METHOD("get_basic_type"),&VisualScriptFunctionCall::get_basic_type); - ClassDB::bind_method(_MD("set_singleton","singleton"),&VisualScriptFunctionCall::set_singleton); - ClassDB::bind_method(_MD("get_singleton"),&VisualScriptFunctionCall::get_singleton); + ClassDB::bind_method(D_METHOD("set_singleton","singleton"),&VisualScriptFunctionCall::set_singleton); + ClassDB::bind_method(D_METHOD("get_singleton"),&VisualScriptFunctionCall::get_singleton); - ClassDB::bind_method(_MD("set_function","function"),&VisualScriptFunctionCall::set_function); - ClassDB::bind_method(_MD("get_function"),&VisualScriptFunctionCall::get_function); + ClassDB::bind_method(D_METHOD("set_function","function"),&VisualScriptFunctionCall::set_function); + ClassDB::bind_method(D_METHOD("get_function"),&VisualScriptFunctionCall::get_function); - ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptFunctionCall::set_call_mode); - ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptFunctionCall::get_call_mode); + ClassDB::bind_method(D_METHOD("set_call_mode","mode"),&VisualScriptFunctionCall::set_call_mode); + ClassDB::bind_method(D_METHOD("get_call_mode"),&VisualScriptFunctionCall::get_call_mode); - ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptFunctionCall::set_base_path); - ClassDB::bind_method(_MD("get_base_path"),&VisualScriptFunctionCall::get_base_path); + ClassDB::bind_method(D_METHOD("set_base_path","base_path"),&VisualScriptFunctionCall::set_base_path); + ClassDB::bind_method(D_METHOD("get_base_path"),&VisualScriptFunctionCall::get_base_path); - ClassDB::bind_method(_MD("set_use_default_args","amount"),&VisualScriptFunctionCall::set_use_default_args); - ClassDB::bind_method(_MD("get_use_default_args"),&VisualScriptFunctionCall::get_use_default_args); + ClassDB::bind_method(D_METHOD("set_use_default_args","amount"),&VisualScriptFunctionCall::set_use_default_args); + ClassDB::bind_method(D_METHOD("get_use_default_args"),&VisualScriptFunctionCall::get_use_default_args); - ClassDB::bind_method(_MD("_set_argument_cache","argument_cache"),&VisualScriptFunctionCall::_set_argument_cache); - ClassDB::bind_method(_MD("_get_argument_cache"),&VisualScriptFunctionCall::_get_argument_cache); + ClassDB::bind_method(D_METHOD("_set_argument_cache","argument_cache"),&VisualScriptFunctionCall::_set_argument_cache); + ClassDB::bind_method(D_METHOD("_get_argument_cache"),&VisualScriptFunctionCall::_get_argument_cache); - ClassDB::bind_method(_MD("set_rpc_call_mode","mode"),&VisualScriptFunctionCall::set_rpc_call_mode); - ClassDB::bind_method(_MD("get_rpc_call_mode"),&VisualScriptFunctionCall::get_rpc_call_mode); + ClassDB::bind_method(D_METHOD("set_rpc_call_mode","mode"),&VisualScriptFunctionCall::set_rpc_call_mode); + ClassDB::bind_method(D_METHOD("get_rpc_call_mode"),&VisualScriptFunctionCall::get_rpc_call_mode); - ClassDB::bind_method(_MD("set_validate","enable"),&VisualScriptFunctionCall::set_validate); - ClassDB::bind_method(_MD("get_validate"),&VisualScriptFunctionCall::get_validate); + ClassDB::bind_method(D_METHOD("set_validate","enable"),&VisualScriptFunctionCall::set_validate); + ClassDB::bind_method(D_METHOD("get_validate"),&VisualScriptFunctionCall::get_validate); String bt; for(int i=0;i<Variant::VARIANT_MAX;i++) { @@ -1453,29 +1453,29 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo& property) const { void VisualScriptPropertySet::_bind_methods() { - ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertySet::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptPropertySet::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","base_type"),&VisualScriptPropertySet::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptPropertySet::get_base_type); - ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertySet::set_base_script); - ClassDB::bind_method(_MD("get_base_script"),&VisualScriptPropertySet::get_base_script); + ClassDB::bind_method(D_METHOD("set_base_script","base_script"),&VisualScriptPropertySet::set_base_script); + ClassDB::bind_method(D_METHOD("get_base_script"),&VisualScriptPropertySet::get_base_script); - ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertySet::set_basic_type); - ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertySet::get_basic_type); + ClassDB::bind_method(D_METHOD("set_basic_type","basic_type"),&VisualScriptPropertySet::set_basic_type); + ClassDB::bind_method(D_METHOD("get_basic_type"),&VisualScriptPropertySet::get_basic_type); - ClassDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertySet::_set_type_cache); - ClassDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertySet::_get_type_cache); + ClassDB::bind_method(D_METHOD("_set_type_cache","type_cache"),&VisualScriptPropertySet::_set_type_cache); + ClassDB::bind_method(D_METHOD("_get_type_cache"),&VisualScriptPropertySet::_get_type_cache); - ClassDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertySet::set_event_type); - ClassDB::bind_method(_MD("get_event_type"),&VisualScriptPropertySet::get_event_type); + ClassDB::bind_method(D_METHOD("set_event_type","event_type"),&VisualScriptPropertySet::set_event_type); + ClassDB::bind_method(D_METHOD("get_event_type"),&VisualScriptPropertySet::get_event_type); - ClassDB::bind_method(_MD("set_property","property"),&VisualScriptPropertySet::set_property); - ClassDB::bind_method(_MD("get_property"),&VisualScriptPropertySet::get_property); + ClassDB::bind_method(D_METHOD("set_property","property"),&VisualScriptPropertySet::set_property); + ClassDB::bind_method(D_METHOD("get_property"),&VisualScriptPropertySet::get_property); - ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertySet::set_call_mode); - ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertySet::get_call_mode); + ClassDB::bind_method(D_METHOD("set_call_mode","mode"),&VisualScriptPropertySet::set_call_mode); + ClassDB::bind_method(D_METHOD("get_call_mode"),&VisualScriptPropertySet::get_call_mode); - ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertySet::set_base_path); - ClassDB::bind_method(_MD("get_base_path"),&VisualScriptPropertySet::get_base_path); + ClassDB::bind_method(D_METHOD("set_base_path","base_path"),&VisualScriptPropertySet::set_base_path); + ClassDB::bind_method(D_METHOD("get_base_path"),&VisualScriptPropertySet::get_base_path); @@ -2117,30 +2117,30 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo& property) const { void VisualScriptPropertyGet::_bind_methods() { - ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptPropertyGet::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptPropertyGet::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","base_type"),&VisualScriptPropertyGet::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptPropertyGet::get_base_type); - ClassDB::bind_method(_MD("set_base_script","base_script"),&VisualScriptPropertyGet::set_base_script); - ClassDB::bind_method(_MD("get_base_script"),&VisualScriptPropertyGet::get_base_script); + ClassDB::bind_method(D_METHOD("set_base_script","base_script"),&VisualScriptPropertyGet::set_base_script); + ClassDB::bind_method(D_METHOD("get_base_script"),&VisualScriptPropertyGet::get_base_script); - ClassDB::bind_method(_MD("set_basic_type","basic_type"),&VisualScriptPropertyGet::set_basic_type); - ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptPropertyGet::get_basic_type); + ClassDB::bind_method(D_METHOD("set_basic_type","basic_type"),&VisualScriptPropertyGet::set_basic_type); + ClassDB::bind_method(D_METHOD("get_basic_type"),&VisualScriptPropertyGet::get_basic_type); - ClassDB::bind_method(_MD("_set_type_cache","type_cache"),&VisualScriptPropertyGet::_set_type_cache); - ClassDB::bind_method(_MD("_get_type_cache"),&VisualScriptPropertyGet::_get_type_cache); + ClassDB::bind_method(D_METHOD("_set_type_cache","type_cache"),&VisualScriptPropertyGet::_set_type_cache); + ClassDB::bind_method(D_METHOD("_get_type_cache"),&VisualScriptPropertyGet::_get_type_cache); - ClassDB::bind_method(_MD("set_event_type","event_type"),&VisualScriptPropertyGet::set_event_type); - ClassDB::bind_method(_MD("get_event_type"),&VisualScriptPropertyGet::get_event_type); + ClassDB::bind_method(D_METHOD("set_event_type","event_type"),&VisualScriptPropertyGet::set_event_type); + ClassDB::bind_method(D_METHOD("get_event_type"),&VisualScriptPropertyGet::get_event_type); - ClassDB::bind_method(_MD("set_property","property"),&VisualScriptPropertyGet::set_property); - ClassDB::bind_method(_MD("get_property"),&VisualScriptPropertyGet::get_property); + ClassDB::bind_method(D_METHOD("set_property","property"),&VisualScriptPropertyGet::set_property); + ClassDB::bind_method(D_METHOD("get_property"),&VisualScriptPropertyGet::get_property); - ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptPropertyGet::set_call_mode); - ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptPropertyGet::get_call_mode); + ClassDB::bind_method(D_METHOD("set_call_mode","mode"),&VisualScriptPropertyGet::set_call_mode); + ClassDB::bind_method(D_METHOD("get_call_mode"),&VisualScriptPropertyGet::get_call_mode); - ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptPropertyGet::set_base_path); - ClassDB::bind_method(_MD("get_base_path"),&VisualScriptPropertyGet::get_base_path); + ClassDB::bind_method(D_METHOD("set_base_path","base_path"),&VisualScriptPropertyGet::set_base_path); + ClassDB::bind_method(D_METHOD("get_base_path"),&VisualScriptPropertyGet::get_base_path); String bt; for(int i=0;i<Variant::VARIANT_MAX;i++) { @@ -2420,8 +2420,8 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo& property) const { void VisualScriptEmitSignal::_bind_methods() { - ClassDB::bind_method(_MD("set_signal","name"),&VisualScriptEmitSignal::set_signal); - ClassDB::bind_method(_MD("get_signal"),&VisualScriptEmitSignal::get_signal); + ClassDB::bind_method(D_METHOD("set_signal","name"),&VisualScriptEmitSignal::set_signal); + ClassDB::bind_method(D_METHOD("get_signal"),&VisualScriptEmitSignal::get_signal); ADD_PROPERTY(PropertyInfo(Variant::STRING,"signal/signal"),"set_signal","get_signal"); diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 6c6e6e41a4..2b5a180bbe 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -539,11 +539,11 @@ Variant::Type VisualScriptOperator::get_typed() const { void VisualScriptOperator::_bind_methods() { - ClassDB::bind_method(_MD("set_operator","op"),&VisualScriptOperator::set_operator); - ClassDB::bind_method(_MD("get_operator"),&VisualScriptOperator::get_operator); + ClassDB::bind_method(D_METHOD("set_operator","op"),&VisualScriptOperator::set_operator); + ClassDB::bind_method(D_METHOD("get_operator"),&VisualScriptOperator::get_operator); - ClassDB::bind_method(_MD("set_typed","type"),&VisualScriptOperator::set_typed); - ClassDB::bind_method(_MD("get_typed"),&VisualScriptOperator::get_typed); + ClassDB::bind_method(D_METHOD("set_typed","type"),&VisualScriptOperator::set_typed); + ClassDB::bind_method(D_METHOD("get_typed"),&VisualScriptOperator::get_typed); String types; for(int i=0;i<Variant::OP_MAX;i++) { @@ -717,8 +717,8 @@ void VisualScriptVariableGet::_validate_property(PropertyInfo& property) const { void VisualScriptVariableGet::_bind_methods() { - ClassDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableGet::set_variable); - ClassDB::bind_method(_MD("get_variable"),&VisualScriptVariableGet::get_variable); + ClassDB::bind_method(D_METHOD("set_variable","name"),&VisualScriptVariableGet::set_variable); + ClassDB::bind_method(D_METHOD("get_variable"),&VisualScriptVariableGet::get_variable); ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),"set_variable","get_variable"); @@ -853,8 +853,8 @@ void VisualScriptVariableSet::_validate_property(PropertyInfo& property) const { void VisualScriptVariableSet::_bind_methods() { - ClassDB::bind_method(_MD("set_variable","name"),&VisualScriptVariableSet::set_variable); - ClassDB::bind_method(_MD("get_variable"),&VisualScriptVariableSet::get_variable); + ClassDB::bind_method(D_METHOD("set_variable","name"),&VisualScriptVariableSet::set_variable); + ClassDB::bind_method(D_METHOD("get_variable"),&VisualScriptVariableSet::get_variable); ADD_PROPERTY(PropertyInfo(Variant::STRING,"variable/name"),"set_variable","get_variable"); @@ -995,11 +995,11 @@ void VisualScriptConstant::_validate_property(PropertyInfo& property) const { void VisualScriptConstant::_bind_methods() { - ClassDB::bind_method(_MD("set_constant_type","type"),&VisualScriptConstant::set_constant_type); - ClassDB::bind_method(_MD("get_constant_type"),&VisualScriptConstant::get_constant_type); + ClassDB::bind_method(D_METHOD("set_constant_type","type"),&VisualScriptConstant::set_constant_type); + ClassDB::bind_method(D_METHOD("get_constant_type"),&VisualScriptConstant::get_constant_type); - ClassDB::bind_method(_MD("set_constant_value","value"),&VisualScriptConstant::set_constant_value); - ClassDB::bind_method(_MD("get_constant_value"),&VisualScriptConstant::get_constant_value); + ClassDB::bind_method(D_METHOD("set_constant_value","value"),&VisualScriptConstant::set_constant_value); + ClassDB::bind_method(D_METHOD("get_constant_value"),&VisualScriptConstant::get_constant_value); String argt="Null"; for(int i=1;i<Variant::VARIANT_MAX;i++) { @@ -1123,8 +1123,8 @@ Ref<Resource> VisualScriptPreload::get_preload() const{ void VisualScriptPreload::_bind_methods() { - ClassDB::bind_method(_MD("set_preload","resource"),&VisualScriptPreload::set_preload); - ClassDB::bind_method(_MD("get_preload"),&VisualScriptPreload::get_preload); + ClassDB::bind_method(D_METHOD("set_preload","resource"),&VisualScriptPreload::set_preload); + ClassDB::bind_method(D_METHOD("get_preload"),&VisualScriptPreload::get_preload); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"resource",PROPERTY_HINT_RESOURCE_TYPE,"Resource"),"set_preload","get_preload"); @@ -1425,8 +1425,8 @@ VisualScriptNodeInstance* VisualScriptGlobalConstant::instance(VisualScriptInsta void VisualScriptGlobalConstant::_bind_methods() { - ClassDB::bind_method(_MD("set_global_constant","index"),&VisualScriptGlobalConstant::set_global_constant); - ClassDB::bind_method(_MD("get_global_constant"),&VisualScriptGlobalConstant::get_global_constant); + ClassDB::bind_method(D_METHOD("set_global_constant","index"),&VisualScriptGlobalConstant::set_global_constant); + ClassDB::bind_method(D_METHOD("get_global_constant"),&VisualScriptGlobalConstant::get_global_constant); String cc; @@ -1563,11 +1563,11 @@ void VisualScriptClassConstant::_validate_property(PropertyInfo& property) const void VisualScriptClassConstant::_bind_methods() { - ClassDB::bind_method(_MD("set_class_constant","name"),&VisualScriptClassConstant::set_class_constant); - ClassDB::bind_method(_MD("get_class_constant"),&VisualScriptClassConstant::get_class_constant); + ClassDB::bind_method(D_METHOD("set_class_constant","name"),&VisualScriptClassConstant::set_class_constant); + ClassDB::bind_method(D_METHOD("get_class_constant"),&VisualScriptClassConstant::get_class_constant); - ClassDB::bind_method(_MD("set_base_type","name"),&VisualScriptClassConstant::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptClassConstant::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","name"),&VisualScriptClassConstant::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptClassConstant::get_base_type); ADD_PROPERTY(PropertyInfo(Variant::STRING,"base_type",PROPERTY_HINT_TYPE_STRING,"Object"),"set_base_type","get_base_type"); ADD_PROPERTY(PropertyInfo(Variant::STRING,"constant",PROPERTY_HINT_ENUM,""),"set_class_constant","get_class_constant"); @@ -1703,11 +1703,11 @@ void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo& property) c void VisualScriptBasicTypeConstant::_bind_methods() { - ClassDB::bind_method(_MD("set_basic_type","name"),&VisualScriptBasicTypeConstant::set_basic_type); - ClassDB::bind_method(_MD("get_basic_type"),&VisualScriptBasicTypeConstant::get_basic_type); + ClassDB::bind_method(D_METHOD("set_basic_type","name"),&VisualScriptBasicTypeConstant::set_basic_type); + ClassDB::bind_method(D_METHOD("get_basic_type"),&VisualScriptBasicTypeConstant::get_basic_type); - ClassDB::bind_method(_MD("set_basic_type_constant","name"),&VisualScriptBasicTypeConstant::set_basic_type_constant); - ClassDB::bind_method(_MD("get_basic_type_constant"),&VisualScriptBasicTypeConstant::get_basic_type_constant); + ClassDB::bind_method(D_METHOD("set_basic_type_constant","name"),&VisualScriptBasicTypeConstant::set_basic_type_constant); + ClassDB::bind_method(D_METHOD("get_basic_type_constant"),&VisualScriptBasicTypeConstant::get_basic_type_constant); String argt="Null"; @@ -1831,8 +1831,8 @@ VisualScriptNodeInstance* VisualScriptMathConstant::instance(VisualScriptInstanc void VisualScriptMathConstant::_bind_methods() { - ClassDB::bind_method(_MD("set_math_constant","which"),&VisualScriptMathConstant::set_math_constant); - ClassDB::bind_method(_MD("get_math_constant"),&VisualScriptMathConstant::get_math_constant); + ClassDB::bind_method(D_METHOD("set_math_constant","which"),&VisualScriptMathConstant::set_math_constant); + ClassDB::bind_method(D_METHOD("get_math_constant"),&VisualScriptMathConstant::get_math_constant); String cc; @@ -1953,8 +1953,8 @@ VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output void VisualScriptEngineSingleton::_bind_methods() { - ClassDB::bind_method(_MD("set_singleton","name"),&VisualScriptEngineSingleton::set_singleton); - ClassDB::bind_method(_MD("get_singleton"),&VisualScriptEngineSingleton::get_singleton); + ClassDB::bind_method(D_METHOD("set_singleton","name"),&VisualScriptEngineSingleton::set_singleton); + ClassDB::bind_method(D_METHOD("get_singleton"),&VisualScriptEngineSingleton::get_singleton); String cc; @@ -2190,8 +2190,8 @@ void VisualScriptSceneNode::_validate_property(PropertyInfo& property) const { void VisualScriptSceneNode::_bind_methods() { - ClassDB::bind_method(_MD("set_node_path","path"),&VisualScriptSceneNode::set_node_path); - ClassDB::bind_method(_MD("get_node_path"),&VisualScriptSceneNode::get_node_path); + ClassDB::bind_method(D_METHOD("set_node_path","path"),&VisualScriptSceneNode::set_node_path); + ClassDB::bind_method(D_METHOD("get_node_path"),&VisualScriptSceneNode::get_node_path); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH,"node_path",PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE),"set_node_path","get_node_path"); } @@ -2401,8 +2401,8 @@ VisualScriptNodeInstance* VisualScriptResourcePath::instance(VisualScriptInstanc void VisualScriptResourcePath::_bind_methods() { - ClassDB::bind_method(_MD("set_resource_path","path"),&VisualScriptResourcePath::set_resource_path); - ClassDB::bind_method(_MD("get_resource_path"),&VisualScriptResourcePath::get_resource_path); + ClassDB::bind_method(D_METHOD("set_resource_path","path"),&VisualScriptResourcePath::set_resource_path); + ClassDB::bind_method(D_METHOD("get_resource_path"),&VisualScriptResourcePath::get_resource_path); ADD_PROPERTY(PropertyInfo(Variant::STRING,"path",PROPERTY_HINT_FILE),"set_resource_path","get_resource_path"); } @@ -3001,14 +3001,14 @@ VisualScriptNodeInstance* VisualScriptComment::instance(VisualScriptInstance* p_ void VisualScriptComment::_bind_methods() { - ClassDB::bind_method(_MD("set_title","title"),&VisualScriptComment::set_title); - ClassDB::bind_method(_MD("get_title"),&VisualScriptComment::get_title); + ClassDB::bind_method(D_METHOD("set_title","title"),&VisualScriptComment::set_title); + ClassDB::bind_method(D_METHOD("get_title"),&VisualScriptComment::get_title); - ClassDB::bind_method(_MD("set_description","description"),&VisualScriptComment::set_description); - ClassDB::bind_method(_MD("get_description"),&VisualScriptComment::get_description); + ClassDB::bind_method(D_METHOD("set_description","description"),&VisualScriptComment::set_description); + ClassDB::bind_method(D_METHOD("get_description"),&VisualScriptComment::get_description); - ClassDB::bind_method(_MD("set_size","size"),&VisualScriptComment::set_size); - ClassDB::bind_method(_MD("get_size"),&VisualScriptComment::get_size); + ClassDB::bind_method(D_METHOD("set_size","size"),&VisualScriptComment::set_size); + ClassDB::bind_method(D_METHOD("get_size"),&VisualScriptComment::get_size); ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),"set_title","get_title"); ADD_PROPERTY( PropertyInfo(Variant::STRING,"description",PROPERTY_HINT_MULTILINE_TEXT),"set_description","get_description"); @@ -3140,11 +3140,11 @@ VisualScriptNodeInstance* VisualScriptConstructor::instance(VisualScriptInstance void VisualScriptConstructor::_bind_methods() { - ClassDB::bind_method(_MD("set_constructor_type","type"),&VisualScriptConstructor::set_constructor_type); - ClassDB::bind_method(_MD("get_constructor_type"),&VisualScriptConstructor::get_constructor_type); + ClassDB::bind_method(D_METHOD("set_constructor_type","type"),&VisualScriptConstructor::set_constructor_type); + ClassDB::bind_method(D_METHOD("get_constructor_type"),&VisualScriptConstructor::get_constructor_type); - ClassDB::bind_method(_MD("set_constructor","constructor"),&VisualScriptConstructor::set_constructor); - ClassDB::bind_method(_MD("get_constructor"),&VisualScriptConstructor::get_constructor); + ClassDB::bind_method(D_METHOD("set_constructor","constructor"),&VisualScriptConstructor::set_constructor); + ClassDB::bind_method(D_METHOD("get_constructor"),&VisualScriptConstructor::get_constructor); ADD_PROPERTY( PropertyInfo(Variant::INT,"type",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_constructor_type","get_constructor_type"); ADD_PROPERTY( PropertyInfo(Variant::DICTIONARY,"constructor",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_constructor","get_constructor"); @@ -3283,11 +3283,11 @@ VisualScriptNodeInstance* VisualScriptLocalVar::instance(VisualScriptInstance* p void VisualScriptLocalVar::_bind_methods() { - ClassDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVar::set_var_name); - ClassDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVar::get_var_name); + ClassDB::bind_method(D_METHOD("set_var_name","name"),&VisualScriptLocalVar::set_var_name); + ClassDB::bind_method(D_METHOD("get_var_name"),&VisualScriptLocalVar::get_var_name); - ClassDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVar::set_var_type); - ClassDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVar::get_var_type); + ClassDB::bind_method(D_METHOD("set_var_type","type"),&VisualScriptLocalVar::set_var_type); + ClassDB::bind_method(D_METHOD("get_var_type"),&VisualScriptLocalVar::get_var_type); String argt="Any"; for(int i=1;i<Variant::VARIANT_MAX;i++) { @@ -3420,11 +3420,11 @@ VisualScriptNodeInstance* VisualScriptLocalVarSet::instance(VisualScriptInstance void VisualScriptLocalVarSet::_bind_methods() { - ClassDB::bind_method(_MD("set_var_name","name"),&VisualScriptLocalVarSet::set_var_name); - ClassDB::bind_method(_MD("get_var_name"),&VisualScriptLocalVarSet::get_var_name); + ClassDB::bind_method(D_METHOD("set_var_name","name"),&VisualScriptLocalVarSet::set_var_name); + ClassDB::bind_method(D_METHOD("get_var_name"),&VisualScriptLocalVarSet::get_var_name); - ClassDB::bind_method(_MD("set_var_type","type"),&VisualScriptLocalVarSet::set_var_type); - ClassDB::bind_method(_MD("get_var_type"),&VisualScriptLocalVarSet::get_var_type); + ClassDB::bind_method(D_METHOD("set_var_type","type"),&VisualScriptLocalVarSet::set_var_type); + ClassDB::bind_method(D_METHOD("get_var_type"),&VisualScriptLocalVarSet::get_var_type); String argt="Any"; for(int i=1;i<Variant::VARIANT_MAX;i++) { @@ -3630,11 +3630,11 @@ void VisualScriptInputAction::_validate_property(PropertyInfo& property) const { void VisualScriptInputAction::_bind_methods() { - ClassDB::bind_method(_MD("set_action_name","name"),&VisualScriptInputAction::set_action_name); - ClassDB::bind_method(_MD("get_action_name"),&VisualScriptInputAction::get_action_name); + ClassDB::bind_method(D_METHOD("set_action_name","name"),&VisualScriptInputAction::set_action_name); + ClassDB::bind_method(D_METHOD("get_action_name"),&VisualScriptInputAction::get_action_name); - ClassDB::bind_method(_MD("set_action_mode","mode"),&VisualScriptInputAction::set_action_mode); - ClassDB::bind_method(_MD("get_action_mode"),&VisualScriptInputAction::get_action_mode); + ClassDB::bind_method(D_METHOD("set_action_mode","mode"),&VisualScriptInputAction::set_action_mode); + ClassDB::bind_method(D_METHOD("get_action_mode"),&VisualScriptInputAction::get_action_mode); ADD_PROPERTY( PropertyInfo(Variant::STRING,"action"),"set_action_name","get_action_name"); ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Pressed,Released,JustPressed,JustReleased"),"set_action_mode","get_action_mode"); @@ -3834,14 +3834,14 @@ void VisualScriptDeconstruct::_validate_property(PropertyInfo& property) const { void VisualScriptDeconstruct::_bind_methods() { - ClassDB::bind_method(_MD("set_deconstruct_type","type"),&VisualScriptDeconstruct::set_deconstruct_type); - ClassDB::bind_method(_MD("get_deconstruct_type"),&VisualScriptDeconstruct::get_deconstruct_type); + ClassDB::bind_method(D_METHOD("set_deconstruct_type","type"),&VisualScriptDeconstruct::set_deconstruct_type); + ClassDB::bind_method(D_METHOD("get_deconstruct_type"),&VisualScriptDeconstruct::get_deconstruct_type); - ClassDB::bind_method(_MD("set_deconstruct_input_type","input_type"),&VisualScriptDeconstruct::set_deconstruct_input_type); - ClassDB::bind_method(_MD("get_deconstruct_input_type"),&VisualScriptDeconstruct::get_deconstruct_input_type); + ClassDB::bind_method(D_METHOD("set_deconstruct_input_type","input_type"),&VisualScriptDeconstruct::set_deconstruct_input_type); + ClassDB::bind_method(D_METHOD("get_deconstruct_input_type"),&VisualScriptDeconstruct::get_deconstruct_input_type); - ClassDB::bind_method(_MD("_set_elem_cache","_cache"),&VisualScriptDeconstruct::_set_elem_cache); - ClassDB::bind_method(_MD("_get_elem_cache"),&VisualScriptDeconstruct::_get_elem_cache); + ClassDB::bind_method(D_METHOD("_set_elem_cache","_cache"),&VisualScriptDeconstruct::_set_elem_cache); + ClassDB::bind_method(D_METHOD("_get_elem_cache"),&VisualScriptDeconstruct::_get_elem_cache); String argt="Any"; for(int i=1;i<Variant::VARIANT_MAX;i++) { diff --git a/modules/visual_script/visual_script_yield_nodes.cpp b/modules/visual_script/visual_script_yield_nodes.cpp index bd40a8ddcf..c079606674 100644 --- a/modules/visual_script/visual_script_yield_nodes.cpp +++ b/modules/visual_script/visual_script_yield_nodes.cpp @@ -157,11 +157,11 @@ void VisualScriptYield::_validate_property(PropertyInfo& property) const { void VisualScriptYield::_bind_methods() { - ClassDB::bind_method(_MD("set_yield_mode","mode"),&VisualScriptYield::set_yield_mode); - ClassDB::bind_method(_MD("get_yield_mode"),&VisualScriptYield::get_yield_mode); + ClassDB::bind_method(D_METHOD("set_yield_mode","mode"),&VisualScriptYield::set_yield_mode); + ClassDB::bind_method(D_METHOD("get_yield_mode"),&VisualScriptYield::get_yield_mode); - ClassDB::bind_method(_MD("set_wait_time","sec"),&VisualScriptYield::set_wait_time); - ClassDB::bind_method(_MD("get_wait_time"),&VisualScriptYield::get_wait_time); + ClassDB::bind_method(D_METHOD("set_wait_time","sec"),&VisualScriptYield::set_wait_time); + ClassDB::bind_method(D_METHOD("get_wait_time"),&VisualScriptYield::get_wait_time); ADD_PROPERTY(PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Frame,FixedFrame,Time",PROPERTY_USAGE_NOEDITOR),"set_yield_mode","get_yield_mode"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"wait_time"),"set_wait_time","get_wait_time"); @@ -468,17 +468,17 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo& property) const { void VisualScriptYieldSignal::_bind_methods() { - ClassDB::bind_method(_MD("set_base_type","base_type"),&VisualScriptYieldSignal::set_base_type); - ClassDB::bind_method(_MD("get_base_type"),&VisualScriptYieldSignal::get_base_type); + ClassDB::bind_method(D_METHOD("set_base_type","base_type"),&VisualScriptYieldSignal::set_base_type); + ClassDB::bind_method(D_METHOD("get_base_type"),&VisualScriptYieldSignal::get_base_type); - ClassDB::bind_method(_MD("set_signal","signal"),&VisualScriptYieldSignal::set_signal); - ClassDB::bind_method(_MD("get_signal"),&VisualScriptYieldSignal::get_signal); + ClassDB::bind_method(D_METHOD("set_signal","signal"),&VisualScriptYieldSignal::set_signal); + ClassDB::bind_method(D_METHOD("get_signal"),&VisualScriptYieldSignal::get_signal); - ClassDB::bind_method(_MD("set_call_mode","mode"),&VisualScriptYieldSignal::set_call_mode); - ClassDB::bind_method(_MD("get_call_mode"),&VisualScriptYieldSignal::get_call_mode); + ClassDB::bind_method(D_METHOD("set_call_mode","mode"),&VisualScriptYieldSignal::set_call_mode); + ClassDB::bind_method(D_METHOD("get_call_mode"),&VisualScriptYieldSignal::get_call_mode); - ClassDB::bind_method(_MD("set_base_path","base_path"),&VisualScriptYieldSignal::set_base_path); - ClassDB::bind_method(_MD("get_base_path"),&VisualScriptYieldSignal::get_base_path); + ClassDB::bind_method(D_METHOD("set_base_path","base_path"),&VisualScriptYieldSignal::set_base_path); + ClassDB::bind_method(D_METHOD("get_base_path"),&VisualScriptYieldSignal::get_base_path); diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index 9acda005f1..2923ef6a91 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -562,7 +562,7 @@ JavaObject::~JavaObject(){ void JavaClassWrapper::_bind_methods() { - ClassDB::bind_method(_MD("wrap:JavaClass","name"),&JavaClassWrapper::wrap); + ClassDB::bind_method(D_METHOD("wrap:JavaClass","name"),&JavaClassWrapper::wrap); } diff --git a/platform/bb10/payment_service.cpp b/platform/bb10/payment_service.cpp index 3138dc2c1d..131c9712a5 100644 --- a/platform/bb10/payment_service.cpp +++ b/platform/bb10/payment_service.cpp @@ -38,11 +38,11 @@ extern char* launch_dir_ptr; void PaymentService::_bind_methods() { - ClassDB::bind_method(_MD("request_product_info"),&PaymentService::request_product_info); - ClassDB::bind_method(_MD("purchase"),&PaymentService::purchase); + ClassDB::bind_method(D_METHOD("request_product_info"),&PaymentService::request_product_info); + ClassDB::bind_method(D_METHOD("purchase"),&PaymentService::purchase); - ClassDB::bind_method(_MD("get_pending_event_count"),&PaymentService::get_pending_event_count); - ClassDB::bind_method(_MD("pop_pending_event"),&PaymentService::pop_pending_event); + ClassDB::bind_method(D_METHOD("get_pending_event_count"),&PaymentService::get_pending_event_count); + ClassDB::bind_method(D_METHOD("pop_pending_event"),&PaymentService::pop_pending_event); }; Error PaymentService::request_product_info(Variant p_params) { diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm index de6ea73c20..4cfa64ae4b 100644 --- a/platform/iphone/game_center.mm +++ b/platform/iphone/game_center.mm @@ -48,18 +48,18 @@ extern "C" { GameCenter* GameCenter::instance = NULL; void GameCenter::_bind_methods() { - ClassDB::bind_method(_MD("connect"),&GameCenter::connect); - ClassDB::bind_method(_MD("is_connected"),&GameCenter::is_connected); - - ClassDB::bind_method(_MD("post_score"),&GameCenter::post_score); - ClassDB::bind_method(_MD("award_achievement"),&GameCenter::award_achievement); - ClassDB::bind_method(_MD("reset_achievements"),&GameCenter::reset_achievements); - ClassDB::bind_method(_MD("request_achievements"),&GameCenter::request_achievements); - ClassDB::bind_method(_MD("request_achievement_descriptions"),&GameCenter::request_achievement_descriptions); - ClassDB::bind_method(_MD("show_game_center"),&GameCenter::show_game_center); - - ClassDB::bind_method(_MD("get_pending_event_count"),&GameCenter::get_pending_event_count); - ClassDB::bind_method(_MD("pop_pending_event"),&GameCenter::pop_pending_event); + ClassDB::bind_method(D_METHOD("connect"),&GameCenter::connect); + ClassDB::bind_method(D_METHOD("is_connected"),&GameCenter::is_connected); + + ClassDB::bind_method(D_METHOD("post_score"),&GameCenter::post_score); + ClassDB::bind_method(D_METHOD("award_achievement"),&GameCenter::award_achievement); + ClassDB::bind_method(D_METHOD("reset_achievements"),&GameCenter::reset_achievements); + ClassDB::bind_method(D_METHOD("request_achievements"),&GameCenter::request_achievements); + ClassDB::bind_method(D_METHOD("request_achievement_descriptions"),&GameCenter::request_achievement_descriptions); + ClassDB::bind_method(D_METHOD("show_game_center"),&GameCenter::show_game_center); + + ClassDB::bind_method(D_METHOD("get_pending_event_count"),&GameCenter::get_pending_event_count); + ClassDB::bind_method(D_METHOD("pop_pending_event"),&GameCenter::pop_pending_event); }; diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm index 0d1825dd6b..a9b23baaeb 100644 --- a/platform/iphone/icloud.mm +++ b/platform/iphone/icloud.mm @@ -44,14 +44,14 @@ extern "C" { ICloud* ICloud::instance = NULL; void ICloud::_bind_methods() { - ClassDB::bind_method(_MD("remove_key"),&ICloud::remove_key); - ClassDB::bind_method(_MD("set_key_values"),&ICloud::set_key_values); - ClassDB::bind_method(_MD("get_key_value"),&ICloud::get_key_value); - ClassDB::bind_method(_MD("synchronize_key_values"),&ICloud::synchronize_key_values); - ClassDB::bind_method(_MD("get_all_key_values"),&ICloud::get_all_key_values); - - ClassDB::bind_method(_MD("get_pending_event_count"),&ICloud::get_pending_event_count); - ClassDB::bind_method(_MD("pop_pending_event"),&ICloud::pop_pending_event); + ClassDB::bind_method(D_METHOD("remove_key"),&ICloud::remove_key); + ClassDB::bind_method(D_METHOD("set_key_values"),&ICloud::set_key_values); + ClassDB::bind_method(D_METHOD("get_key_value"),&ICloud::get_key_value); + ClassDB::bind_method(D_METHOD("synchronize_key_values"),&ICloud::synchronize_key_values); + ClassDB::bind_method(D_METHOD("get_all_key_values"),&ICloud::get_all_key_values); + + ClassDB::bind_method(D_METHOD("get_pending_event_count"),&ICloud::get_pending_event_count); + ClassDB::bind_method(D_METHOD("pop_pending_event"),&ICloud::pop_pending_event); }; int ICloud::get_pending_event_count() { diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm index 050498c125..b63d7b42ab 100644 --- a/platform/iphone/in_app_store.mm +++ b/platform/iphone/in_app_store.mm @@ -66,13 +66,13 @@ NSMutableDictionary* pending_transactions = [NSMutableDictionary dictionary]; InAppStore* InAppStore::instance = NULL; void InAppStore::_bind_methods() { - ClassDB::bind_method(_MD("request_product_info"),&InAppStore::request_product_info); - ClassDB::bind_method(_MD("purchase"),&InAppStore::purchase); + ClassDB::bind_method(D_METHOD("request_product_info"),&InAppStore::request_product_info); + ClassDB::bind_method(D_METHOD("purchase"),&InAppStore::purchase); - ClassDB::bind_method(_MD("get_pending_event_count"),&InAppStore::get_pending_event_count); - ClassDB::bind_method(_MD("pop_pending_event"),&InAppStore::pop_pending_event); - ClassDB::bind_method(_MD("finish_transaction"),&InAppStore::finish_transaction); - ClassDB::bind_method(_MD("set_auto_finish_transaction"),&InAppStore::set_auto_finish_transaction); + ClassDB::bind_method(D_METHOD("get_pending_event_count"),&InAppStore::get_pending_event_count); + ClassDB::bind_method(D_METHOD("pop_pending_event"),&InAppStore::pop_pending_event); + ClassDB::bind_method(D_METHOD("finish_transaction"),&InAppStore::finish_transaction); + ClassDB::bind_method(D_METHOD("set_auto_finish_transaction"),&InAppStore::set_auto_finish_transaction); }; @interface ProductsDelegate : NSObject<SKProductsRequestDelegate> { diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm index a068d4aa31..4aca85dafc 100644 --- a/platform/iphone/ios.mm +++ b/platform/iphone/ios.mm @@ -32,7 +32,7 @@ void iOS::_bind_methods() { - ClassDB::bind_method(_MD("get_rate_url","app_id"),&iOS::get_rate_url); + ClassDB::bind_method(D_METHOD("get_rate_url","app_id"),&iOS::get_rate_url); }; String iOS::get_rate_url(int p_app_id) const { diff --git a/platform/javascript/javascript_eval.cpp b/platform/javascript/javascript_eval.cpp index 72b7ab06cd..d84c8bf040 100644 --- a/platform/javascript/javascript_eval.cpp +++ b/platform/javascript/javascript_eval.cpp @@ -156,7 +156,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { void JavaScript::_bind_methods() { - ClassDB::bind_method(_MD("eval", "code", "use_global_execution_context"), &JavaScript::eval, false); + ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScript::eval, false); } JavaScript::JavaScript() { diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index 510eaacccd..faecbf3e6d 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -222,32 +222,32 @@ void SpriteFrames::_set_animations(const Array& p_animations) { void SpriteFrames::_bind_methods() { - ClassDB::bind_method(_MD("add_animation","anim"),&SpriteFrames::add_animation); - ClassDB::bind_method(_MD("has_animation","anim"),&SpriteFrames::has_animation); - ClassDB::bind_method(_MD("remove_animation","anim"),&SpriteFrames::remove_animation); - ClassDB::bind_method(_MD("rename_animation","anim","newname"),&SpriteFrames::rename_animation); + ClassDB::bind_method(D_METHOD("add_animation","anim"),&SpriteFrames::add_animation); + ClassDB::bind_method(D_METHOD("has_animation","anim"),&SpriteFrames::has_animation); + ClassDB::bind_method(D_METHOD("remove_animation","anim"),&SpriteFrames::remove_animation); + ClassDB::bind_method(D_METHOD("rename_animation","anim","newname"),&SpriteFrames::rename_animation); - ClassDB::bind_method(_MD("set_animation_speed","anim","speed"),&SpriteFrames::set_animation_speed); - ClassDB::bind_method(_MD("get_animation_speed","anim"),&SpriteFrames::get_animation_speed); + ClassDB::bind_method(D_METHOD("set_animation_speed","anim","speed"),&SpriteFrames::set_animation_speed); + ClassDB::bind_method(D_METHOD("get_animation_speed","anim"),&SpriteFrames::get_animation_speed); - ClassDB::bind_method(_MD("set_animation_loop","anim","loop"),&SpriteFrames::set_animation_loop); - ClassDB::bind_method(_MD("get_animation_loop","anim"),&SpriteFrames::get_animation_loop); + ClassDB::bind_method(D_METHOD("set_animation_loop","anim","loop"),&SpriteFrames::set_animation_loop); + ClassDB::bind_method(D_METHOD("get_animation_loop","anim"),&SpriteFrames::get_animation_loop); - ClassDB::bind_method(_MD("add_frame","anim","frame","atpos"),&SpriteFrames::add_frame,DEFVAL(-1)); - ClassDB::bind_method(_MD("get_frame_count","anim"),&SpriteFrames::get_frame_count); - ClassDB::bind_method(_MD("get_frame","anim","idx"),&SpriteFrames::get_frame); - ClassDB::bind_method(_MD("set_frame","anim","idx","txt"),&SpriteFrames::set_frame); - ClassDB::bind_method(_MD("remove_frame","anim","idx"),&SpriteFrames::remove_frame); - ClassDB::bind_method(_MD("clear","anim"),&SpriteFrames::clear); - ClassDB::bind_method(_MD("clear_all"),&SpriteFrames::clear_all); + ClassDB::bind_method(D_METHOD("add_frame","anim","frame","atpos"),&SpriteFrames::add_frame,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("get_frame_count","anim"),&SpriteFrames::get_frame_count); + ClassDB::bind_method(D_METHOD("get_frame","anim","idx"),&SpriteFrames::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","anim","idx","txt"),&SpriteFrames::set_frame); + ClassDB::bind_method(D_METHOD("remove_frame","anim","idx"),&SpriteFrames::remove_frame); + ClassDB::bind_method(D_METHOD("clear","anim"),&SpriteFrames::clear); + ClassDB::bind_method(D_METHOD("clear_all"),&SpriteFrames::clear_all); - ClassDB::bind_method(_MD("_set_frames"),&SpriteFrames::_set_frames); - ClassDB::bind_method(_MD("_get_frames"),&SpriteFrames::_get_frames); + ClassDB::bind_method(D_METHOD("_set_frames"),&SpriteFrames::_set_frames); + ClassDB::bind_method(D_METHOD("_get_frames"),&SpriteFrames::_get_frames); ADD_PROPERTYNZ( PropertyInfo(Variant::ARRAY,"frames",PROPERTY_HINT_NONE,"",0),"_set_frames","_get_frames"); //compatibility - ClassDB::bind_method(_MD("_set_animations"),&SpriteFrames::_set_animations); - ClassDB::bind_method(_MD("_get_animations"),&SpriteFrames::_get_animations); + ClassDB::bind_method(D_METHOD("_set_animations"),&SpriteFrames::_set_animations); + ClassDB::bind_method(D_METHOD("_get_animations"),&SpriteFrames::_get_animations); ADD_PROPERTYNZ( PropertyInfo(Variant::ARRAY,"animations",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_animations","_get_animations"); //compatibility @@ -653,36 +653,36 @@ String AnimatedSprite::get_configuration_warning() const { void AnimatedSprite::_bind_methods() { - ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite::set_sprite_frames); - ClassDB::bind_method(_MD("get_sprite_frames:SpriteFrames"),&AnimatedSprite::get_sprite_frames); + ClassDB::bind_method(D_METHOD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite::set_sprite_frames); + ClassDB::bind_method(D_METHOD("get_sprite_frames:SpriteFrames"),&AnimatedSprite::get_sprite_frames); - ClassDB::bind_method(_MD("set_animation","animation"),&AnimatedSprite::set_animation); - ClassDB::bind_method(_MD("get_animation"),&AnimatedSprite::get_animation); + ClassDB::bind_method(D_METHOD("set_animation","animation"),&AnimatedSprite::set_animation); + ClassDB::bind_method(D_METHOD("get_animation"),&AnimatedSprite::get_animation); - ClassDB::bind_method(_MD("_set_playing","playing"),&AnimatedSprite::_set_playing); - ClassDB::bind_method(_MD("_is_playing"),&AnimatedSprite::_is_playing); + ClassDB::bind_method(D_METHOD("_set_playing","playing"),&AnimatedSprite::_set_playing); + ClassDB::bind_method(D_METHOD("_is_playing"),&AnimatedSprite::_is_playing); - ClassDB::bind_method(_MD("play","anim"),&AnimatedSprite::play,DEFVAL(StringName())); - ClassDB::bind_method(_MD("stop"),&AnimatedSprite::stop); - ClassDB::bind_method(_MD("is_playing"),&AnimatedSprite::is_playing); + ClassDB::bind_method(D_METHOD("play","anim"),&AnimatedSprite::play,DEFVAL(StringName())); + ClassDB::bind_method(D_METHOD("stop"),&AnimatedSprite::stop); + ClassDB::bind_method(D_METHOD("is_playing"),&AnimatedSprite::is_playing); - ClassDB::bind_method(_MD("set_centered","centered"),&AnimatedSprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&AnimatedSprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&AnimatedSprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&AnimatedSprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&AnimatedSprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&AnimatedSprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&AnimatedSprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&AnimatedSprite::get_offset); - ClassDB::bind_method(_MD("set_flip_h","flip_h"),&AnimatedSprite::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&AnimatedSprite::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","flip_h"),&AnimatedSprite::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&AnimatedSprite::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","flip_v"),&AnimatedSprite::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&AnimatedSprite::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","flip_v"),&AnimatedSprite::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&AnimatedSprite::is_flipped_v); - ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite::set_frame); - ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&AnimatedSprite::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&AnimatedSprite::get_frame); - ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed); + ClassDB::bind_method(D_METHOD("_res_changed"),&AnimatedSprite::_res_changed); ADD_SIGNAL(MethodInfo("frame_changed")); ADD_SIGNAL(MethodInfo("animation_finished")); diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 35d8a161c1..68228520b3 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -587,62 +587,62 @@ bool Area2D::get_layer_mask_bit(int p_bit) const{ void Area2D::_bind_methods() { - ClassDB::bind_method(_MD("_body_enter_tree","id"),&Area2D::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree","id"),&Area2D::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_body_enter_tree","id"),&Area2D::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree","id"),&Area2D::_body_exit_tree); - ClassDB::bind_method(_MD("_area_enter_tree","id"),&Area2D::_area_enter_tree); - ClassDB::bind_method(_MD("_area_exit_tree","id"),&Area2D::_area_exit_tree); + ClassDB::bind_method(D_METHOD("_area_enter_tree","id"),&Area2D::_area_enter_tree); + ClassDB::bind_method(D_METHOD("_area_exit_tree","id"),&Area2D::_area_exit_tree); - ClassDB::bind_method(_MD("set_space_override_mode","enable"),&Area2D::set_space_override_mode); - ClassDB::bind_method(_MD("get_space_override_mode"),&Area2D::get_space_override_mode); + ClassDB::bind_method(D_METHOD("set_space_override_mode","enable"),&Area2D::set_space_override_mode); + ClassDB::bind_method(D_METHOD("get_space_override_mode"),&Area2D::get_space_override_mode); - ClassDB::bind_method(_MD("set_gravity_is_point","enable"),&Area2D::set_gravity_is_point); - ClassDB::bind_method(_MD("is_gravity_a_point"),&Area2D::is_gravity_a_point); + ClassDB::bind_method(D_METHOD("set_gravity_is_point","enable"),&Area2D::set_gravity_is_point); + ClassDB::bind_method(D_METHOD("is_gravity_a_point"),&Area2D::is_gravity_a_point); - ClassDB::bind_method(_MD("set_gravity_distance_scale","distance_scale"),&Area2D::set_gravity_distance_scale); - ClassDB::bind_method(_MD("get_gravity_distance_scale"),&Area2D::get_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("set_gravity_distance_scale","distance_scale"),&Area2D::set_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("get_gravity_distance_scale"),&Area2D::get_gravity_distance_scale); - ClassDB::bind_method(_MD("set_gravity_vector","vector"),&Area2D::set_gravity_vector); - ClassDB::bind_method(_MD("get_gravity_vector"),&Area2D::get_gravity_vector); + ClassDB::bind_method(D_METHOD("set_gravity_vector","vector"),&Area2D::set_gravity_vector); + ClassDB::bind_method(D_METHOD("get_gravity_vector"),&Area2D::get_gravity_vector); - ClassDB::bind_method(_MD("set_gravity","gravity"),&Area2D::set_gravity); - ClassDB::bind_method(_MD("get_gravity"),&Area2D::get_gravity); + ClassDB::bind_method(D_METHOD("set_gravity","gravity"),&Area2D::set_gravity); + ClassDB::bind_method(D_METHOD("get_gravity"),&Area2D::get_gravity); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&Area2D::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&Area2D::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&Area2D::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&Area2D::get_linear_damp); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&Area2D::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&Area2D::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&Area2D::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&Area2D::get_angular_damp); - ClassDB::bind_method(_MD("set_priority","priority"),&Area2D::set_priority); - ClassDB::bind_method(_MD("get_priority"),&Area2D::get_priority); + ClassDB::bind_method(D_METHOD("set_priority","priority"),&Area2D::set_priority); + ClassDB::bind_method(D_METHOD("get_priority"),&Area2D::get_priority); - ClassDB::bind_method(_MD("set_collision_mask","collision_mask"),&Area2D::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&Area2D::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","collision_mask"),&Area2D::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&Area2D::get_collision_mask); - ClassDB::bind_method(_MD("set_layer_mask","layer_mask"),&Area2D::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&Area2D::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","layer_mask"),&Area2D::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&Area2D::get_layer_mask); - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&Area2D::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&Area2D::get_collision_mask_bit); + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&Area2D::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&Area2D::get_collision_mask_bit); - ClassDB::bind_method(_MD("set_layer_mask_bit","bit","value"),&Area2D::set_layer_mask_bit); - ClassDB::bind_method(_MD("get_layer_mask_bit","bit"),&Area2D::get_layer_mask_bit); + ClassDB::bind_method(D_METHOD("set_layer_mask_bit","bit","value"),&Area2D::set_layer_mask_bit); + ClassDB::bind_method(D_METHOD("get_layer_mask_bit","bit"),&Area2D::get_layer_mask_bit); - ClassDB::bind_method(_MD("set_monitoring","enable"),&Area2D::set_monitoring); - ClassDB::bind_method(_MD("is_monitoring"),&Area2D::is_monitoring); + ClassDB::bind_method(D_METHOD("set_monitoring","enable"),&Area2D::set_monitoring); + ClassDB::bind_method(D_METHOD("is_monitoring"),&Area2D::is_monitoring); - ClassDB::bind_method(_MD("set_monitorable","enable"),&Area2D::set_monitorable); - ClassDB::bind_method(_MD("is_monitorable"),&Area2D::is_monitorable); + ClassDB::bind_method(D_METHOD("set_monitorable","enable"),&Area2D::set_monitorable); + ClassDB::bind_method(D_METHOD("is_monitorable"),&Area2D::is_monitorable); - ClassDB::bind_method(_MD("get_overlapping_bodies"),&Area2D::get_overlapping_bodies); - ClassDB::bind_method(_MD("get_overlapping_areas"),&Area2D::get_overlapping_areas); + ClassDB::bind_method(D_METHOD("get_overlapping_bodies"),&Area2D::get_overlapping_bodies); + ClassDB::bind_method(D_METHOD("get_overlapping_areas"),&Area2D::get_overlapping_areas); - ClassDB::bind_method(_MD("overlaps_body","body"),&Area2D::overlaps_body); - ClassDB::bind_method(_MD("overlaps_area","area"),&Area2D::overlaps_area); + ClassDB::bind_method(D_METHOD("overlaps_body","body"),&Area2D::overlaps_body); + ClassDB::bind_method(D_METHOD("overlaps_area","area"),&Area2D::overlaps_area); - ClassDB::bind_method(_MD("_body_inout"),&Area2D::_body_inout); - ClassDB::bind_method(_MD("_area_inout"),&Area2D::_area_inout); + ClassDB::bind_method(D_METHOD("_body_inout"),&Area2D::_body_inout); + ClassDB::bind_method(D_METHOD("_area_inout"),&Area2D::_area_inout); ADD_SIGNAL( MethodInfo("body_shape_entered",PropertyInfo(Variant::INT,"body_id"),PropertyInfo(Variant::OBJECT,"body",PROPERTY_HINT_RESOURCE_TYPE,"PhysicsBody2D"),PropertyInfo(Variant::INT,"body_shape"),PropertyInfo(Variant::INT,"area_shape"))); diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp index 1fdd1b9eef..eaa33fe70a 100644 --- a/scene/2d/back_buffer_copy.cpp +++ b/scene/2d/back_buffer_copy.cpp @@ -77,11 +77,11 @@ BackBufferCopy::CopyMode BackBufferCopy::get_copy_mode() const{ void BackBufferCopy::_bind_methods() { - ClassDB::bind_method(_MD("set_rect","rect"),&BackBufferCopy::set_rect); - ClassDB::bind_method(_MD("get_rect"),&BackBufferCopy::get_rect); + ClassDB::bind_method(D_METHOD("set_rect","rect"),&BackBufferCopy::set_rect); + ClassDB::bind_method(D_METHOD("get_rect"),&BackBufferCopy::get_rect); - ClassDB::bind_method(_MD("set_copy_mode","copy_mode"),&BackBufferCopy::set_copy_mode); - ClassDB::bind_method(_MD("get_copy_mode"),&BackBufferCopy::get_copy_mode); + ClassDB::bind_method(D_METHOD("set_copy_mode","copy_mode"),&BackBufferCopy::set_copy_mode); + ClassDB::bind_method(D_METHOD("get_copy_mode"),&BackBufferCopy::get_copy_mode); ADD_PROPERTY( PropertyInfo(Variant::INT,"copy_mode",PROPERTY_HINT_ENUM,"Disabled,Rect,Viewport"),"set_copy_mode","get_copy_mode"); ADD_PROPERTY( PropertyInfo(Variant::RECT2,"rect"),"set_rect","get_rect"); diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 2e7926c51b..9ae2315867 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -590,65 +590,65 @@ Node* Camera2D::get_custom_viewport() const { void Camera2D::_bind_methods() { - ClassDB::bind_method(_MD("set_offset","offset"),&Camera2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Camera2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Camera2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Camera2D::get_offset); - ClassDB::bind_method(_MD("set_anchor_mode","anchor_mode"),&Camera2D::set_anchor_mode); - ClassDB::bind_method(_MD("get_anchor_mode"),&Camera2D::get_anchor_mode); + ClassDB::bind_method(D_METHOD("set_anchor_mode","anchor_mode"),&Camera2D::set_anchor_mode); + ClassDB::bind_method(D_METHOD("get_anchor_mode"),&Camera2D::get_anchor_mode); - ClassDB::bind_method(_MD("set_rotating","rotating"),&Camera2D::set_rotating); - ClassDB::bind_method(_MD("is_rotating"),&Camera2D::is_rotating); + ClassDB::bind_method(D_METHOD("set_rotating","rotating"),&Camera2D::set_rotating); + ClassDB::bind_method(D_METHOD("is_rotating"),&Camera2D::is_rotating); - ClassDB::bind_method(_MD("make_current"),&Camera2D::make_current); - ClassDB::bind_method(_MD("clear_current"),&Camera2D::clear_current); - ClassDB::bind_method(_MD("_make_current"),&Camera2D::_make_current); + ClassDB::bind_method(D_METHOD("make_current"),&Camera2D::make_current); + ClassDB::bind_method(D_METHOD("clear_current"),&Camera2D::clear_current); + ClassDB::bind_method(D_METHOD("_make_current"),&Camera2D::_make_current); - ClassDB::bind_method(_MD("_update_scroll"),&Camera2D::_update_scroll); + ClassDB::bind_method(D_METHOD("_update_scroll"),&Camera2D::_update_scroll); - ClassDB::bind_method(_MD("_set_current","current"),&Camera2D::_set_current); - ClassDB::bind_method(_MD("is_current"),&Camera2D::is_current); + ClassDB::bind_method(D_METHOD("_set_current","current"),&Camera2D::_set_current); + ClassDB::bind_method(D_METHOD("is_current"),&Camera2D::is_current); - ClassDB::bind_method(_MD("set_limit","margin","limit"),&Camera2D::set_limit); - ClassDB::bind_method(_MD("get_limit","margin"),&Camera2D::get_limit); + ClassDB::bind_method(D_METHOD("set_limit","margin","limit"),&Camera2D::set_limit); + ClassDB::bind_method(D_METHOD("get_limit","margin"),&Camera2D::get_limit); - ClassDB::bind_method(_MD("set_limit_smoothing_enabled","limit_smoothing_enabled"),&Camera2D::set_limit_smoothing_enabled); - ClassDB::bind_method(_MD("is_limit_smoothing_enabled"),&Camera2D::is_limit_smoothing_enabled); + ClassDB::bind_method(D_METHOD("set_limit_smoothing_enabled","limit_smoothing_enabled"),&Camera2D::set_limit_smoothing_enabled); + ClassDB::bind_method(D_METHOD("is_limit_smoothing_enabled"),&Camera2D::is_limit_smoothing_enabled); - ClassDB::bind_method(_MD("set_v_drag_enabled","enabled"),&Camera2D::set_v_drag_enabled); - ClassDB::bind_method(_MD("is_v_drag_enabled"),&Camera2D::is_v_drag_enabled); + ClassDB::bind_method(D_METHOD("set_v_drag_enabled","enabled"),&Camera2D::set_v_drag_enabled); + ClassDB::bind_method(D_METHOD("is_v_drag_enabled"),&Camera2D::is_v_drag_enabled); - ClassDB::bind_method(_MD("set_h_drag_enabled","enabled"),&Camera2D::set_h_drag_enabled); - ClassDB::bind_method(_MD("is_h_drag_enabled"),&Camera2D::is_h_drag_enabled); + ClassDB::bind_method(D_METHOD("set_h_drag_enabled","enabled"),&Camera2D::set_h_drag_enabled); + ClassDB::bind_method(D_METHOD("is_h_drag_enabled"),&Camera2D::is_h_drag_enabled); - ClassDB::bind_method(_MD("set_v_offset","ofs"),&Camera2D::set_v_offset); - ClassDB::bind_method(_MD("get_v_offset"),&Camera2D::get_v_offset); + ClassDB::bind_method(D_METHOD("set_v_offset","ofs"),&Camera2D::set_v_offset); + ClassDB::bind_method(D_METHOD("get_v_offset"),&Camera2D::get_v_offset); - ClassDB::bind_method(_MD("set_h_offset","ofs"),&Camera2D::set_h_offset); - ClassDB::bind_method(_MD("get_h_offset"),&Camera2D::get_h_offset); + ClassDB::bind_method(D_METHOD("set_h_offset","ofs"),&Camera2D::set_h_offset); + ClassDB::bind_method(D_METHOD("get_h_offset"),&Camera2D::get_h_offset); - ClassDB::bind_method(_MD("set_drag_margin","margin","drag_margin"),&Camera2D::set_drag_margin); - ClassDB::bind_method(_MD("get_drag_margin","margin"),&Camera2D::get_drag_margin); + ClassDB::bind_method(D_METHOD("set_drag_margin","margin","drag_margin"),&Camera2D::set_drag_margin); + ClassDB::bind_method(D_METHOD("get_drag_margin","margin"),&Camera2D::get_drag_margin); - ClassDB::bind_method(_MD("get_camera_pos"),&Camera2D::get_camera_pos); - ClassDB::bind_method(_MD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); + ClassDB::bind_method(D_METHOD("get_camera_pos"),&Camera2D::get_camera_pos); + ClassDB::bind_method(D_METHOD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); - ClassDB::bind_method(_MD("set_zoom","zoom"),&Camera2D::set_zoom); - ClassDB::bind_method(_MD("get_zoom"),&Camera2D::get_zoom); + ClassDB::bind_method(D_METHOD("set_zoom","zoom"),&Camera2D::set_zoom); + ClassDB::bind_method(D_METHOD("get_zoom"),&Camera2D::get_zoom); - ClassDB::bind_method(_MD("set_custom_viewport","viewport:Viewport"),&Camera2D::set_custom_viewport); - ClassDB::bind_method(_MD("get_custom_viewport:Viewport"),&Camera2D::get_custom_viewport); + ClassDB::bind_method(D_METHOD("set_custom_viewport","viewport:Viewport"),&Camera2D::set_custom_viewport); + ClassDB::bind_method(D_METHOD("get_custom_viewport:Viewport"),&Camera2D::get_custom_viewport); - ClassDB::bind_method(_MD("set_follow_smoothing","follow_smoothing"),&Camera2D::set_follow_smoothing); - ClassDB::bind_method(_MD("get_follow_smoothing"),&Camera2D::get_follow_smoothing); + ClassDB::bind_method(D_METHOD("set_follow_smoothing","follow_smoothing"),&Camera2D::set_follow_smoothing); + ClassDB::bind_method(D_METHOD("get_follow_smoothing"),&Camera2D::get_follow_smoothing); - ClassDB::bind_method(_MD("set_enable_follow_smoothing","follow_smoothing"),&Camera2D::set_enable_follow_smoothing); - ClassDB::bind_method(_MD("is_follow_smoothing_enabled"),&Camera2D::is_follow_smoothing_enabled); + ClassDB::bind_method(D_METHOD("set_enable_follow_smoothing","follow_smoothing"),&Camera2D::set_enable_follow_smoothing); + ClassDB::bind_method(D_METHOD("is_follow_smoothing_enabled"),&Camera2D::is_follow_smoothing_enabled); - ClassDB::bind_method(_MD("force_update_scroll"),&Camera2D::force_update_scroll); - ClassDB::bind_method(_MD("reset_smoothing"),&Camera2D::reset_smoothing); - ClassDB::bind_method(_MD("align"),&Camera2D::align); + ClassDB::bind_method(D_METHOD("force_update_scroll"),&Camera2D::force_update_scroll); + ClassDB::bind_method(D_METHOD("reset_smoothing"),&Camera2D::reset_smoothing); + ClassDB::bind_method(D_METHOD("align"),&Camera2D::align); - ClassDB::bind_method(_MD("_set_old_smoothing","follow_smoothing"),&Camera2D::_set_old_smoothing); + ClassDB::bind_method(D_METHOD("_set_old_smoothing","follow_smoothing"),&Camera2D::_set_old_smoothing); ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),"set_offset","get_offset"); ADD_PROPERTY( PropertyInfo(Variant::INT,"anchor_mode",PROPERTY_HINT_ENUM,"Fixed TopLeft,Drag Center"),"set_anchor_mode","get_anchor_mode"); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 6e5885a410..3574a39940 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -135,10 +135,10 @@ Variant CanvasItemMaterial::get_shader_param(const StringName& p_param) const{ void CanvasItemMaterial::_bind_methods() { - ClassDB::bind_method(_MD("set_shader","shader:Shader"),&CanvasItemMaterial::set_shader); - ClassDB::bind_method(_MD("get_shader:Shader"),&CanvasItemMaterial::get_shader); - ClassDB::bind_method(_MD("set_shader_param","param","value"),&CanvasItemMaterial::set_shader_param); - ClassDB::bind_method(_MD("get_shader_param","param"),&CanvasItemMaterial::get_shader_param); + ClassDB::bind_method(D_METHOD("set_shader","shader:Shader"),&CanvasItemMaterial::set_shader); + ClassDB::bind_method(D_METHOD("get_shader:Shader"),&CanvasItemMaterial::get_shader); + ClassDB::bind_method(D_METHOD("set_shader_param","param","value"),&CanvasItemMaterial::set_shader_param); + ClassDB::bind_method(D_METHOD("get_shader_param","param"),&CanvasItemMaterial::get_shader_param); @@ -905,88 +905,88 @@ Vector2 CanvasItem::get_local_mouse_pos() const{ void CanvasItem::_bind_methods() { - ClassDB::bind_method(_MD("_toplevel_raise_self"),&CanvasItem::_toplevel_raise_self); - ClassDB::bind_method(_MD("_update_callback"),&CanvasItem::_update_callback); - - ClassDB::bind_method(_MD("edit_set_state","state"),&CanvasItem::edit_set_state); - ClassDB::bind_method(_MD("edit_get_state:Variant"),&CanvasItem::edit_get_state); - ClassDB::bind_method(_MD("edit_set_rect","rect"),&CanvasItem::edit_set_rect); - ClassDB::bind_method(_MD("edit_rotate","degrees"),&CanvasItem::edit_rotate); - - ClassDB::bind_method(_MD("get_item_rect"),&CanvasItem::get_item_rect); - ClassDB::bind_method(_MD("get_item_and_children_rect"),&CanvasItem::get_item_and_children_rect); - //ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - - ClassDB::bind_method(_MD("get_canvas_item"),&CanvasItem::get_canvas_item); - - ClassDB::bind_method(_MD("set_visible"),&CanvasItem::set_visible); - ClassDB::bind_method(_MD("is_visible"),&CanvasItem::is_visible); - ClassDB::bind_method(_MD("is_visible_in_tree"),&CanvasItem::is_visible_in_tree); - ClassDB::bind_method(_MD("show"),&CanvasItem::show); - ClassDB::bind_method(_MD("hide"),&CanvasItem::hide); - - ClassDB::bind_method(_MD("update"),&CanvasItem::update); - - ClassDB::bind_method(_MD("set_as_toplevel","enable"),&CanvasItem::set_as_toplevel); - ClassDB::bind_method(_MD("is_set_as_toplevel"),&CanvasItem::is_set_as_toplevel); - - ClassDB::bind_method(_MD("set_light_mask","light_mask"),&CanvasItem::set_light_mask); - ClassDB::bind_method(_MD("get_light_mask"),&CanvasItem::get_light_mask); - - ClassDB::bind_method(_MD("set_modulate","modulate"),&CanvasItem::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&CanvasItem::get_modulate); - ClassDB::bind_method(_MD("set_self_modulate","self_modulate"),&CanvasItem::set_self_modulate); - ClassDB::bind_method(_MD("get_self_modulate"),&CanvasItem::get_self_modulate); - - ClassDB::bind_method(_MD("set_draw_behind_parent","enable"),&CanvasItem::set_draw_behind_parent); - ClassDB::bind_method(_MD("is_draw_behind_parent_enabled"),&CanvasItem::is_draw_behind_parent_enabled); - - ClassDB::bind_method(_MD("_set_on_top","on_top"),&CanvasItem::_set_on_top); - ClassDB::bind_method(_MD("_is_on_top"),&CanvasItem::_is_on_top); - //ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - - ClassDB::bind_method(_MD("draw_line","from","to","color","width","antialiased"),&CanvasItem::draw_line,DEFVAL(1.0),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_rect","rect","color"),&CanvasItem::draw_rect); - ClassDB::bind_method(_MD("draw_circle","pos","radius","color"),&CanvasItem::draw_circle); - ClassDB::bind_method(_MD("draw_texture","texture:Texture","pos","modulate"),&CanvasItem::draw_texture,DEFVAL(Color(1,1,1,1))); - ClassDB::bind_method(_MD("draw_texture_rect","texture:Texture","rect","tile","modulate","transpose"),&CanvasItem::draw_texture_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_texture_rect_region","texture:Texture","rect","src_rect","modulate","transpose"),&CanvasItem::draw_texture_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_style_box","style_box:StyleBox","rect"),&CanvasItem::draw_style_box); - ClassDB::bind_method(_MD("draw_primitive","points","colors","uvs","texture:Texture","width"),&CanvasItem::draw_primitive,DEFVAL(Variant()),DEFVAL(1.0)); - ClassDB::bind_method(_MD("draw_polygon","points","colors","uvs","texture:Texture"),&CanvasItem::draw_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("draw_colored_polygon","points","color","uvs","texture:Texture"),&CanvasItem::draw_colored_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("draw_string","font:Font","pos","text","modulate","clip_w"),&CanvasItem::draw_string,DEFVAL(Color(1,1,1)),DEFVAL(-1)); - ClassDB::bind_method(_MD("draw_char","font:Font","pos","char","next","modulate"),&CanvasItem::draw_char,DEFVAL(Color(1,1,1))); - - ClassDB::bind_method(_MD("draw_set_transform","pos","rot","scale"),&CanvasItem::draw_set_transform); - ClassDB::bind_method(_MD("draw_set_transform_matrix","xform"),&CanvasItem::draw_set_transform_matrix); - ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - ClassDB::bind_method(_MD("get_global_transform"),&CanvasItem::get_global_transform); - ClassDB::bind_method(_MD("get_global_transform_with_canvas"),&CanvasItem::get_global_transform_with_canvas); - ClassDB::bind_method(_MD("get_viewport_transform"),&CanvasItem::get_viewport_transform); - ClassDB::bind_method(_MD("get_viewport_rect"),&CanvasItem::get_viewport_rect); - ClassDB::bind_method(_MD("get_canvas_transform"),&CanvasItem::get_canvas_transform); - ClassDB::bind_method(_MD("get_local_mouse_pos"),&CanvasItem::get_local_mouse_pos); - ClassDB::bind_method(_MD("get_global_mouse_pos"),&CanvasItem::get_global_mouse_pos); - ClassDB::bind_method(_MD("get_canvas"),&CanvasItem::get_canvas); - ClassDB::bind_method(_MD("get_world_2d"),&CanvasItem::get_world_2d); - //ClassDB::bind_method(_MD("get_viewport"),&CanvasItem::get_viewport); - - ClassDB::bind_method(_MD("set_material","material:CanvasItemMaterial"),&CanvasItem::set_material); - ClassDB::bind_method(_MD("get_material:CanvasItemMaterial"),&CanvasItem::get_material); - - ClassDB::bind_method(_MD("set_use_parent_material","enable"),&CanvasItem::set_use_parent_material); - ClassDB::bind_method(_MD("get_use_parent_material"),&CanvasItem::get_use_parent_material); - - ClassDB::bind_method(_MD("set_notify_local_transform","enable"),&CanvasItem::set_notify_local_transform); - ClassDB::bind_method(_MD("is_local_transform_notification_enabled"),&CanvasItem::is_local_transform_notification_enabled); - - ClassDB::bind_method(_MD("set_notify_transform","enable"),&CanvasItem::set_notify_transform); - ClassDB::bind_method(_MD("is_transform_notification_enabled"),&CanvasItem::is_transform_notification_enabled); - - ClassDB::bind_method(_MD("make_canvas_pos_local","screen_point"), + ClassDB::bind_method(D_METHOD("_toplevel_raise_self"),&CanvasItem::_toplevel_raise_self); + ClassDB::bind_method(D_METHOD("_update_callback"),&CanvasItem::_update_callback); + + ClassDB::bind_method(D_METHOD("edit_set_state","state"),&CanvasItem::edit_set_state); + ClassDB::bind_method(D_METHOD("edit_get_state:Variant"),&CanvasItem::edit_get_state); + ClassDB::bind_method(D_METHOD("edit_set_rect","rect"),&CanvasItem::edit_set_rect); + ClassDB::bind_method(D_METHOD("edit_rotate","degrees"),&CanvasItem::edit_rotate); + + ClassDB::bind_method(D_METHOD("get_item_rect"),&CanvasItem::get_item_rect); + ClassDB::bind_method(D_METHOD("get_item_and_children_rect"),&CanvasItem::get_item_and_children_rect); + //ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + + ClassDB::bind_method(D_METHOD("get_canvas_item"),&CanvasItem::get_canvas_item); + + ClassDB::bind_method(D_METHOD("set_visible"),&CanvasItem::set_visible); + ClassDB::bind_method(D_METHOD("is_visible"),&CanvasItem::is_visible); + ClassDB::bind_method(D_METHOD("is_visible_in_tree"),&CanvasItem::is_visible_in_tree); + ClassDB::bind_method(D_METHOD("show"),&CanvasItem::show); + ClassDB::bind_method(D_METHOD("hide"),&CanvasItem::hide); + + ClassDB::bind_method(D_METHOD("update"),&CanvasItem::update); + + ClassDB::bind_method(D_METHOD("set_as_toplevel","enable"),&CanvasItem::set_as_toplevel); + ClassDB::bind_method(D_METHOD("is_set_as_toplevel"),&CanvasItem::is_set_as_toplevel); + + ClassDB::bind_method(D_METHOD("set_light_mask","light_mask"),&CanvasItem::set_light_mask); + ClassDB::bind_method(D_METHOD("get_light_mask"),&CanvasItem::get_light_mask); + + ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&CanvasItem::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&CanvasItem::get_modulate); + ClassDB::bind_method(D_METHOD("set_self_modulate","self_modulate"),&CanvasItem::set_self_modulate); + ClassDB::bind_method(D_METHOD("get_self_modulate"),&CanvasItem::get_self_modulate); + + ClassDB::bind_method(D_METHOD("set_draw_behind_parent","enable"),&CanvasItem::set_draw_behind_parent); + ClassDB::bind_method(D_METHOD("is_draw_behind_parent_enabled"),&CanvasItem::is_draw_behind_parent_enabled); + + ClassDB::bind_method(D_METHOD("_set_on_top","on_top"),&CanvasItem::_set_on_top); + ClassDB::bind_method(D_METHOD("_is_on_top"),&CanvasItem::_is_on_top); + //ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + + ClassDB::bind_method(D_METHOD("draw_line","from","to","color","width","antialiased"),&CanvasItem::draw_line,DEFVAL(1.0),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_rect","rect","color"),&CanvasItem::draw_rect); + ClassDB::bind_method(D_METHOD("draw_circle","pos","radius","color"),&CanvasItem::draw_circle); + ClassDB::bind_method(D_METHOD("draw_texture","texture:Texture","pos","modulate"),&CanvasItem::draw_texture,DEFVAL(Color(1,1,1,1))); + ClassDB::bind_method(D_METHOD("draw_texture_rect","texture:Texture","rect","tile","modulate","transpose"),&CanvasItem::draw_texture_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_texture_rect_region","texture:Texture","rect","src_rect","modulate","transpose"),&CanvasItem::draw_texture_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_style_box","style_box:StyleBox","rect"),&CanvasItem::draw_style_box); + ClassDB::bind_method(D_METHOD("draw_primitive","points","colors","uvs","texture:Texture","width"),&CanvasItem::draw_primitive,DEFVAL(Variant()),DEFVAL(1.0)); + ClassDB::bind_method(D_METHOD("draw_polygon","points","colors","uvs","texture:Texture"),&CanvasItem::draw_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("draw_colored_polygon","points","color","uvs","texture:Texture"),&CanvasItem::draw_colored_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("draw_string","font:Font","pos","text","modulate","clip_w"),&CanvasItem::draw_string,DEFVAL(Color(1,1,1)),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("draw_char","font:Font","pos","char","next","modulate"),&CanvasItem::draw_char,DEFVAL(Color(1,1,1))); + + ClassDB::bind_method(D_METHOD("draw_set_transform","pos","rot","scale"),&CanvasItem::draw_set_transform); + ClassDB::bind_method(D_METHOD("draw_set_transform_matrix","xform"),&CanvasItem::draw_set_transform_matrix); + ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + ClassDB::bind_method(D_METHOD("get_global_transform"),&CanvasItem::get_global_transform); + ClassDB::bind_method(D_METHOD("get_global_transform_with_canvas"),&CanvasItem::get_global_transform_with_canvas); + ClassDB::bind_method(D_METHOD("get_viewport_transform"),&CanvasItem::get_viewport_transform); + ClassDB::bind_method(D_METHOD("get_viewport_rect"),&CanvasItem::get_viewport_rect); + ClassDB::bind_method(D_METHOD("get_canvas_transform"),&CanvasItem::get_canvas_transform); + ClassDB::bind_method(D_METHOD("get_local_mouse_pos"),&CanvasItem::get_local_mouse_pos); + ClassDB::bind_method(D_METHOD("get_global_mouse_pos"),&CanvasItem::get_global_mouse_pos); + ClassDB::bind_method(D_METHOD("get_canvas"),&CanvasItem::get_canvas); + ClassDB::bind_method(D_METHOD("get_world_2d"),&CanvasItem::get_world_2d); + //ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasItem::get_viewport); + + ClassDB::bind_method(D_METHOD("set_material","material:CanvasItemMaterial"),&CanvasItem::set_material); + ClassDB::bind_method(D_METHOD("get_material:CanvasItemMaterial"),&CanvasItem::get_material); + + ClassDB::bind_method(D_METHOD("set_use_parent_material","enable"),&CanvasItem::set_use_parent_material); + ClassDB::bind_method(D_METHOD("get_use_parent_material"),&CanvasItem::get_use_parent_material); + + ClassDB::bind_method(D_METHOD("set_notify_local_transform","enable"),&CanvasItem::set_notify_local_transform); + ClassDB::bind_method(D_METHOD("is_local_transform_notification_enabled"),&CanvasItem::is_local_transform_notification_enabled); + + ClassDB::bind_method(D_METHOD("set_notify_transform","enable"),&CanvasItem::set_notify_transform); + ClassDB::bind_method(D_METHOD("is_transform_notification_enabled"),&CanvasItem::is_transform_notification_enabled); + + ClassDB::bind_method(D_METHOD("make_canvas_pos_local","screen_point"), &CanvasItem::make_canvas_pos_local); - ClassDB::bind_method(_MD("make_input_local","event"),&CanvasItem::make_input_local); + ClassDB::bind_method(D_METHOD("make_input_local","event"),&CanvasItem::make_input_local); BIND_VMETHOD(MethodInfo("_draw")); diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp index 3c84edf1e3..ecc11ea60f 100644 --- a/scene/2d/canvas_modulate.cpp +++ b/scene/2d/canvas_modulate.cpp @@ -62,8 +62,8 @@ void CanvasModulate::_notification(int p_what) { void CanvasModulate::_bind_methods(){ - ClassDB::bind_method(_MD("set_color","color"),&CanvasModulate::set_color); - ClassDB::bind_method(_MD("get_color"),&CanvasModulate::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&CanvasModulate::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&CanvasModulate::get_color); ADD_PROPERTY(PropertyInfo(Variant::COLOR,"color"),"set_color","get_color"); } diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 18313f8fa3..7b935e0d59 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -221,20 +221,20 @@ void CollisionObject2D::_update_pickable() { void CollisionObject2D::_bind_methods() { - ClassDB::bind_method(_MD("add_shape","shape:Shape2D","transform"),&CollisionObject2D::add_shape,DEFVAL(Transform2D())); - ClassDB::bind_method(_MD("get_shape_count"),&CollisionObject2D::get_shape_count); - ClassDB::bind_method(_MD("set_shape","shape_idx","shape:Shape"),&CollisionObject2D::set_shape); - ClassDB::bind_method(_MD("set_shape_transform","shape_idx","transform"),&CollisionObject2D::set_shape_transform); - ClassDB::bind_method(_MD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject2D::set_shape_as_trigger); - ClassDB::bind_method(_MD("get_shape:Shape2D","shape_idx"),&CollisionObject2D::get_shape); - ClassDB::bind_method(_MD("get_shape_transform","shape_idx"),&CollisionObject2D::get_shape_transform); - ClassDB::bind_method(_MD("is_shape_set_as_trigger","shape_idx"),&CollisionObject2D::is_shape_set_as_trigger); - ClassDB::bind_method(_MD("remove_shape","shape_idx"),&CollisionObject2D::remove_shape); - ClassDB::bind_method(_MD("clear_shapes"),&CollisionObject2D::clear_shapes); - ClassDB::bind_method(_MD("get_rid"),&CollisionObject2D::get_rid); - - ClassDB::bind_method(_MD("set_pickable","enabled"),&CollisionObject2D::set_pickable); - ClassDB::bind_method(_MD("is_pickable"),&CollisionObject2D::is_pickable); + ClassDB::bind_method(D_METHOD("add_shape","shape:Shape2D","transform"),&CollisionObject2D::add_shape,DEFVAL(Transform2D())); + ClassDB::bind_method(D_METHOD("get_shape_count"),&CollisionObject2D::get_shape_count); + ClassDB::bind_method(D_METHOD("set_shape","shape_idx","shape:Shape"),&CollisionObject2D::set_shape); + ClassDB::bind_method(D_METHOD("set_shape_transform","shape_idx","transform"),&CollisionObject2D::set_shape_transform); + ClassDB::bind_method(D_METHOD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject2D::set_shape_as_trigger); + ClassDB::bind_method(D_METHOD("get_shape:Shape2D","shape_idx"),&CollisionObject2D::get_shape); + ClassDB::bind_method(D_METHOD("get_shape_transform","shape_idx"),&CollisionObject2D::get_shape_transform); + ClassDB::bind_method(D_METHOD("is_shape_set_as_trigger","shape_idx"),&CollisionObject2D::is_shape_set_as_trigger); + ClassDB::bind_method(D_METHOD("remove_shape","shape_idx"),&CollisionObject2D::remove_shape); + ClassDB::bind_method(D_METHOD("clear_shapes"),&CollisionObject2D::clear_shapes); + ClassDB::bind_method(D_METHOD("get_rid"),&CollisionObject2D::get_rid); + + ClassDB::bind_method(D_METHOD("set_pickable","enabled"),&CollisionObject2D::set_pickable); + ClassDB::bind_method(D_METHOD("is_pickable"),&CollisionObject2D::is_pickable); BIND_VMETHOD( MethodInfo("_input_event",PropertyInfo(Variant::OBJECT,"viewport"),PropertyInfo(Variant::INPUT_EVENT,"event"),PropertyInfo(Variant::INT,"shape_idx"))); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 2a57bd7616..85241a79e0 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -314,21 +314,21 @@ String CollisionPolygon2D::get_configuration_warning() const { void CollisionPolygon2D::_bind_methods() { - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionPolygon2D::_add_to_collision_object); - ClassDB::bind_method(_MD("set_polygon","polygon"),&CollisionPolygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&CollisionPolygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionPolygon2D::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&CollisionPolygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&CollisionPolygon2D::get_polygon); - ClassDB::bind_method(_MD("set_build_mode","build_mode"),&CollisionPolygon2D::set_build_mode); - ClassDB::bind_method(_MD("get_build_mode"),&CollisionPolygon2D::get_build_mode); + ClassDB::bind_method(D_METHOD("set_build_mode","build_mode"),&CollisionPolygon2D::set_build_mode); + ClassDB::bind_method(D_METHOD("get_build_mode"),&CollisionPolygon2D::get_build_mode); - ClassDB::bind_method(_MD("set_trigger","trigger"),&CollisionPolygon2D::set_trigger); - ClassDB::bind_method(_MD("is_trigger"),&CollisionPolygon2D::is_trigger); + ClassDB::bind_method(D_METHOD("set_trigger","trigger"),&CollisionPolygon2D::set_trigger); + ClassDB::bind_method(D_METHOD("is_trigger"),&CollisionPolygon2D::is_trigger); - ClassDB::bind_method(_MD("_set_shape_range","shape_range"),&CollisionPolygon2D::_set_shape_range); - ClassDB::bind_method(_MD("_get_shape_range"),&CollisionPolygon2D::_get_shape_range); + ClassDB::bind_method(D_METHOD("_set_shape_range","shape_range"),&CollisionPolygon2D::_set_shape_range); + ClassDB::bind_method(D_METHOD("_get_shape_range"),&CollisionPolygon2D::_get_shape_range); - ClassDB::bind_method(_MD("get_collision_object_first_shape"),&CollisionPolygon2D::get_collision_object_first_shape); - ClassDB::bind_method(_MD("get_collision_object_last_shape"),&CollisionPolygon2D::get_collision_object_last_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_first_shape"),&CollisionPolygon2D::get_collision_object_first_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_last_shape"),&CollisionPolygon2D::get_collision_object_last_shape); ADD_PROPERTY( PropertyInfo(Variant::INT,"build_mode",PROPERTY_HINT_ENUM,"Solids,Segments"),"set_build_mode","get_build_mode"); ADD_PROPERTY( PropertyInfo(Variant::POOL_VECTOR2_ARRAY,"polygon"),"set_polygon","get_polygon"); diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 60f072e49d..37a49577b5 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -218,17 +218,17 @@ String CollisionShape2D::get_configuration_warning() const { void CollisionShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_shape","shape"),&CollisionShape2D::set_shape); - ClassDB::bind_method(_MD("get_shape"),&CollisionShape2D::get_shape); - ClassDB::bind_method(_MD("_shape_changed"),&CollisionShape2D::_shape_changed); - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionShape2D::_add_to_collision_object); - ClassDB::bind_method(_MD("set_trigger","enable"),&CollisionShape2D::set_trigger); - ClassDB::bind_method(_MD("is_trigger"),&CollisionShape2D::is_trigger); + ClassDB::bind_method(D_METHOD("set_shape","shape"),&CollisionShape2D::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&CollisionShape2D::get_shape); + ClassDB::bind_method(D_METHOD("_shape_changed"),&CollisionShape2D::_shape_changed); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionShape2D::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("set_trigger","enable"),&CollisionShape2D::set_trigger); + ClassDB::bind_method(D_METHOD("is_trigger"),&CollisionShape2D::is_trigger); - ClassDB::bind_method(_MD("_set_update_shape_index","index"),&CollisionShape2D::_set_update_shape_index); - ClassDB::bind_method(_MD("_get_update_shape_index"),&CollisionShape2D::_get_update_shape_index); + ClassDB::bind_method(D_METHOD("_set_update_shape_index","index"),&CollisionShape2D::_set_update_shape_index); + ClassDB::bind_method(D_METHOD("_get_update_shape_index"),&CollisionShape2D::_get_update_shape_index); - ClassDB::bind_method(_MD("get_collision_object_shape_index"),&CollisionShape2D::get_collision_object_shape_index); + ClassDB::bind_method(D_METHOD("get_collision_object_shape_index"),&CollisionShape2D::get_collision_object_shape_index); ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"shape",PROPERTY_HINT_RESOURCE_TYPE,"Shape2D"),"set_shape","get_shape"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"trigger"),"set_trigger","is_trigger"); diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index 6e69e4bd7d..6754eb3981 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -128,17 +128,17 @@ bool Joint2D::get_exclude_nodes_from_collision() const{ void Joint2D::_bind_methods() { - ClassDB::bind_method( _MD("set_node_a","node"), &Joint2D::set_node_a ); - ClassDB::bind_method( _MD("get_node_a"), &Joint2D::get_node_a ); + ClassDB::bind_method( D_METHOD("set_node_a","node"), &Joint2D::set_node_a ); + ClassDB::bind_method( D_METHOD("get_node_a"), &Joint2D::get_node_a ); - ClassDB::bind_method( _MD("set_node_b","node"), &Joint2D::set_node_b ); - ClassDB::bind_method( _MD("get_node_b"), &Joint2D::get_node_b ); + ClassDB::bind_method( D_METHOD("set_node_b","node"), &Joint2D::set_node_b ); + ClassDB::bind_method( D_METHOD("get_node_b"), &Joint2D::get_node_b ); - ClassDB::bind_method( _MD("set_bias","bias"), &Joint2D::set_bias ); - ClassDB::bind_method( _MD("get_bias"), &Joint2D::get_bias ); + ClassDB::bind_method( D_METHOD("set_bias","bias"), &Joint2D::set_bias ); + ClassDB::bind_method( D_METHOD("get_bias"), &Joint2D::get_bias ); - ClassDB::bind_method( _MD("set_exclude_nodes_from_collision","enable"), &Joint2D::set_exclude_nodes_from_collision ); - ClassDB::bind_method( _MD("get_exclude_nodes_from_collision"), &Joint2D::get_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("set_exclude_nodes_from_collision","enable"), &Joint2D::set_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("get_exclude_nodes_from_collision"), &Joint2D::get_exclude_nodes_from_collision ); ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "node_a"), "set_node_a","get_node_a") ; ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "node_b"), "set_node_b","get_node_b") ; @@ -225,8 +225,8 @@ real_t PinJoint2D::get_softness() const { void PinJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_softness","softness"), &PinJoint2D::set_softness); - ClassDB::bind_method(_MD("get_softness"), &PinJoint2D::get_softness); + ClassDB::bind_method(D_METHOD("set_softness","softness"), &PinJoint2D::set_softness); + ClassDB::bind_method(D_METHOD("get_softness"), &PinJoint2D::get_softness); ADD_PROPERTY( PropertyInfo( Variant::REAL, "softness", PROPERTY_HINT_EXP_RANGE,"0.00,16,0.01"), "set_softness", "get_softness"); } @@ -321,10 +321,10 @@ real_t GrooveJoint2D::get_initial_offset() const { void GrooveJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&GrooveJoint2D::set_length); - ClassDB::bind_method(_MD("get_length"),&GrooveJoint2D::get_length); - ClassDB::bind_method(_MD("set_initial_offset","offset"),&GrooveJoint2D::set_initial_offset); - ClassDB::bind_method(_MD("get_initial_offset"),&GrooveJoint2D::get_initial_offset); + ClassDB::bind_method(D_METHOD("set_length","length"),&GrooveJoint2D::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&GrooveJoint2D::get_length); + ClassDB::bind_method(D_METHOD("set_initial_offset","offset"),&GrooveJoint2D::set_initial_offset); + ClassDB::bind_method(D_METHOD("get_initial_offset"),&GrooveJoint2D::get_initial_offset); ADD_PROPERTY( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_length","get_length"); ADD_PROPERTY( PropertyInfo( Variant::REAL, "initial_offset", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_initial_offset","get_initial_offset"); @@ -453,14 +453,14 @@ real_t DampedSpringJoint2D::get_damping() const { void DampedSpringJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&DampedSpringJoint2D::set_length); - ClassDB::bind_method(_MD("get_length"),&DampedSpringJoint2D::get_length); - ClassDB::bind_method(_MD("set_rest_length","rest_length"),&DampedSpringJoint2D::set_rest_length); - ClassDB::bind_method(_MD("get_rest_length"),&DampedSpringJoint2D::get_rest_length); - ClassDB::bind_method(_MD("set_stiffness","stiffness"),&DampedSpringJoint2D::set_stiffness); - ClassDB::bind_method(_MD("get_stiffness"),&DampedSpringJoint2D::get_stiffness); - ClassDB::bind_method(_MD("set_damping","damping"),&DampedSpringJoint2D::set_damping); - ClassDB::bind_method(_MD("get_damping"),&DampedSpringJoint2D::get_damping); + ClassDB::bind_method(D_METHOD("set_length","length"),&DampedSpringJoint2D::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&DampedSpringJoint2D::get_length); + ClassDB::bind_method(D_METHOD("set_rest_length","rest_length"),&DampedSpringJoint2D::set_rest_length); + ClassDB::bind_method(D_METHOD("get_rest_length"),&DampedSpringJoint2D::get_rest_length); + ClassDB::bind_method(D_METHOD("set_stiffness","stiffness"),&DampedSpringJoint2D::set_stiffness); + ClassDB::bind_method(D_METHOD("get_stiffness"),&DampedSpringJoint2D::get_stiffness); + ClassDB::bind_method(D_METHOD("set_damping","damping"),&DampedSpringJoint2D::set_damping); + ClassDB::bind_method(D_METHOD("get_damping"),&DampedSpringJoint2D::get_damping); ADD_PROPERTY( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_length","get_length"); ADD_PROPERTY( PropertyInfo( Variant::REAL, "rest_length", PROPERTY_HINT_EXP_RANGE,"0,65535,1"), "set_rest_length","get_rest_length"); diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 2f89026367..d7f5a890e8 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -365,67 +365,67 @@ String Light2D::get_configuration_warning() const { void Light2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&Light2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&Light2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&Light2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&Light2D::is_enabled); - ClassDB::bind_method(_MD("set_editor_only","editor_only"), &Light2D::set_editor_only ); - ClassDB::bind_method(_MD("is_editor_only"), &Light2D::is_editor_only ); + ClassDB::bind_method(D_METHOD("set_editor_only","editor_only"), &Light2D::set_editor_only ); + ClassDB::bind_method(D_METHOD("is_editor_only"), &Light2D::is_editor_only ); - ClassDB::bind_method(_MD("set_texture","texture"),&Light2D::set_texture); - ClassDB::bind_method(_MD("get_texture"),&Light2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&Light2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&Light2D::get_texture); - ClassDB::bind_method(_MD("set_texture_offset","texture_offset"),&Light2D::set_texture_offset); - ClassDB::bind_method(_MD("get_texture_offset"),&Light2D::get_texture_offset); + ClassDB::bind_method(D_METHOD("set_texture_offset","texture_offset"),&Light2D::set_texture_offset); + ClassDB::bind_method(D_METHOD("get_texture_offset"),&Light2D::get_texture_offset); - ClassDB::bind_method(_MD("set_color","color"),&Light2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Light2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Light2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Light2D::get_color); - ClassDB::bind_method(_MD("set_height","height"),&Light2D::set_height); - ClassDB::bind_method(_MD("get_height"),&Light2D::get_height); + ClassDB::bind_method(D_METHOD("set_height","height"),&Light2D::set_height); + ClassDB::bind_method(D_METHOD("get_height"),&Light2D::get_height); - ClassDB::bind_method(_MD("set_energy","energy"),&Light2D::set_energy); - ClassDB::bind_method(_MD("get_energy"),&Light2D::get_energy); + ClassDB::bind_method(D_METHOD("set_energy","energy"),&Light2D::set_energy); + ClassDB::bind_method(D_METHOD("get_energy"),&Light2D::get_energy); - ClassDB::bind_method(_MD("set_texture_scale","texture_scale"),&Light2D::set_texture_scale); - ClassDB::bind_method(_MD("get_texture_scale"),&Light2D::get_texture_scale); + ClassDB::bind_method(D_METHOD("set_texture_scale","texture_scale"),&Light2D::set_texture_scale); + ClassDB::bind_method(D_METHOD("get_texture_scale"),&Light2D::get_texture_scale); - ClassDB::bind_method(_MD("set_z_range_min","z"),&Light2D::set_z_range_min); - ClassDB::bind_method(_MD("get_z_range_min"),&Light2D::get_z_range_min); + ClassDB::bind_method(D_METHOD("set_z_range_min","z"),&Light2D::set_z_range_min); + ClassDB::bind_method(D_METHOD("get_z_range_min"),&Light2D::get_z_range_min); - ClassDB::bind_method(_MD("set_z_range_max","z"),&Light2D::set_z_range_max); - ClassDB::bind_method(_MD("get_z_range_max"),&Light2D::get_z_range_max); + ClassDB::bind_method(D_METHOD("set_z_range_max","z"),&Light2D::set_z_range_max); + ClassDB::bind_method(D_METHOD("get_z_range_max"),&Light2D::get_z_range_max); - ClassDB::bind_method(_MD("set_layer_range_min","layer"),&Light2D::set_layer_range_min); - ClassDB::bind_method(_MD("get_layer_range_min"),&Light2D::get_layer_range_min); + ClassDB::bind_method(D_METHOD("set_layer_range_min","layer"),&Light2D::set_layer_range_min); + ClassDB::bind_method(D_METHOD("get_layer_range_min"),&Light2D::get_layer_range_min); - ClassDB::bind_method(_MD("set_layer_range_max","layer"),&Light2D::set_layer_range_max); - ClassDB::bind_method(_MD("get_layer_range_max"),&Light2D::get_layer_range_max); + ClassDB::bind_method(D_METHOD("set_layer_range_max","layer"),&Light2D::set_layer_range_max); + ClassDB::bind_method(D_METHOD("get_layer_range_max"),&Light2D::get_layer_range_max); - ClassDB::bind_method(_MD("set_item_cull_mask","item_cull_mask"),&Light2D::set_item_cull_mask); - ClassDB::bind_method(_MD("get_item_cull_mask"),&Light2D::get_item_cull_mask); + ClassDB::bind_method(D_METHOD("set_item_cull_mask","item_cull_mask"),&Light2D::set_item_cull_mask); + ClassDB::bind_method(D_METHOD("get_item_cull_mask"),&Light2D::get_item_cull_mask); - ClassDB::bind_method(_MD("set_item_shadow_cull_mask","item_shadow_cull_mask"),&Light2D::set_item_shadow_cull_mask); - ClassDB::bind_method(_MD("get_item_shadow_cull_mask"),&Light2D::get_item_shadow_cull_mask); + ClassDB::bind_method(D_METHOD("set_item_shadow_cull_mask","item_shadow_cull_mask"),&Light2D::set_item_shadow_cull_mask); + ClassDB::bind_method(D_METHOD("get_item_shadow_cull_mask"),&Light2D::get_item_shadow_cull_mask); - ClassDB::bind_method(_MD("set_mode","mode"),&Light2D::set_mode); - ClassDB::bind_method(_MD("get_mode"),&Light2D::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&Light2D::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&Light2D::get_mode); - ClassDB::bind_method(_MD("set_shadow_enabled","enabled"),&Light2D::set_shadow_enabled); - ClassDB::bind_method(_MD("is_shadow_enabled"),&Light2D::is_shadow_enabled); + ClassDB::bind_method(D_METHOD("set_shadow_enabled","enabled"),&Light2D::set_shadow_enabled); + ClassDB::bind_method(D_METHOD("is_shadow_enabled"),&Light2D::is_shadow_enabled); - ClassDB::bind_method(_MD("set_shadow_buffer_size","size"),&Light2D::set_shadow_buffer_size); - ClassDB::bind_method(_MD("get_shadow_buffer_size"),&Light2D::get_shadow_buffer_size); + ClassDB::bind_method(D_METHOD("set_shadow_buffer_size","size"),&Light2D::set_shadow_buffer_size); + ClassDB::bind_method(D_METHOD("get_shadow_buffer_size"),&Light2D::get_shadow_buffer_size); - ClassDB::bind_method(_MD("set_shadow_gradient_length","multiplier"),&Light2D::set_shadow_gradient_length); - ClassDB::bind_method(_MD("get_shadow_gradient_length"),&Light2D::get_shadow_gradient_length); + ClassDB::bind_method(D_METHOD("set_shadow_gradient_length","multiplier"),&Light2D::set_shadow_gradient_length); + ClassDB::bind_method(D_METHOD("get_shadow_gradient_length"),&Light2D::get_shadow_gradient_length); - ClassDB::bind_method(_MD("set_shadow_filter","filter"),&Light2D::set_shadow_filter); - ClassDB::bind_method(_MD("get_shadow_filter"),&Light2D::get_shadow_filter); + ClassDB::bind_method(D_METHOD("set_shadow_filter","filter"),&Light2D::set_shadow_filter); + ClassDB::bind_method(D_METHOD("get_shadow_filter"),&Light2D::get_shadow_filter); - ClassDB::bind_method(_MD("set_shadow_color","shadow_color"),&Light2D::set_shadow_color); - ClassDB::bind_method(_MD("get_shadow_color"),&Light2D::get_shadow_color); + ClassDB::bind_method(D_METHOD("set_shadow_color","shadow_color"),&Light2D::set_shadow_color); + ClassDB::bind_method(D_METHOD("get_shadow_color"),&Light2D::get_shadow_color); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 299fdc0331..6a024fe330 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -78,14 +78,14 @@ RID OccluderPolygon2D::get_rid() const { void OccluderPolygon2D::_bind_methods() { - ClassDB::bind_method(_MD("set_closed","closed"),&OccluderPolygon2D::set_closed); - ClassDB::bind_method(_MD("is_closed"),&OccluderPolygon2D::is_closed); + ClassDB::bind_method(D_METHOD("set_closed","closed"),&OccluderPolygon2D::set_closed); + ClassDB::bind_method(D_METHOD("is_closed"),&OccluderPolygon2D::is_closed); - ClassDB::bind_method(_MD("set_cull_mode","cull_mode"),&OccluderPolygon2D::set_cull_mode); - ClassDB::bind_method(_MD("get_cull_mode"),&OccluderPolygon2D::get_cull_mode); + ClassDB::bind_method(D_METHOD("set_cull_mode","cull_mode"),&OccluderPolygon2D::set_cull_mode); + ClassDB::bind_method(D_METHOD("get_cull_mode"),&OccluderPolygon2D::get_cull_mode); - ClassDB::bind_method(_MD("set_polygon","polygon"),&OccluderPolygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&OccluderPolygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&OccluderPolygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&OccluderPolygon2D::get_polygon); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"closed"),"set_closed","is_closed"); ADD_PROPERTY( PropertyInfo(Variant::INT,"cull_mode",PROPERTY_HINT_ENUM,"Disabled,ClockWise,CounterClockWise"),"set_cull_mode","get_cull_mode"); @@ -224,11 +224,11 @@ String LightOccluder2D::get_configuration_warning() const { void LightOccluder2D::_bind_methods() { - ClassDB::bind_method(_MD("set_occluder_polygon","polygon:OccluderPolygon2D"),&LightOccluder2D::set_occluder_polygon); - ClassDB::bind_method(_MD("get_occluder_polygon:OccluderPolygon2D"),&LightOccluder2D::get_occluder_polygon); + ClassDB::bind_method(D_METHOD("set_occluder_polygon","polygon:OccluderPolygon2D"),&LightOccluder2D::set_occluder_polygon); + ClassDB::bind_method(D_METHOD("get_occluder_polygon:OccluderPolygon2D"),&LightOccluder2D::get_occluder_polygon); - ClassDB::bind_method(_MD("set_occluder_light_mask","mask"),&LightOccluder2D::set_occluder_light_mask); - ClassDB::bind_method(_MD("get_occluder_light_mask"),&LightOccluder2D::get_occluder_light_mask); + ClassDB::bind_method(D_METHOD("set_occluder_light_mask","mask"),&LightOccluder2D::set_occluder_light_mask); + ClassDB::bind_method(D_METHOD("get_occluder_light_mask"),&LightOccluder2D::get_occluder_light_mask); #ifdef DEBUG_ENABLED ClassDB::bind_method("_poly_changed",&LightOccluder2D::_poly_changed); diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index 91d6d341d7..3da29ef385 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -236,46 +236,46 @@ void Line2D::_gradient_changed() { // static void Line2D::_bind_methods() { - ClassDB::bind_method(_MD("set_points","points"), &Line2D::set_points); - ClassDB::bind_method(_MD("get_points"), &Line2D::get_points); + ClassDB::bind_method(D_METHOD("set_points","points"), &Line2D::set_points); + ClassDB::bind_method(D_METHOD("get_points"), &Line2D::get_points); - ClassDB::bind_method(_MD("set_point_pos","i", "pos"), &Line2D::set_point_pos); - ClassDB::bind_method(_MD("get_point_pos", "i"), &Line2D::get_point_pos); + ClassDB::bind_method(D_METHOD("set_point_pos","i", "pos"), &Line2D::set_point_pos); + ClassDB::bind_method(D_METHOD("get_point_pos", "i"), &Line2D::get_point_pos); - ClassDB::bind_method(_MD("get_point_count"), &Line2D::get_point_count); + ClassDB::bind_method(D_METHOD("get_point_count"), &Line2D::get_point_count); - ClassDB::bind_method(_MD("add_point", "pos"), &Line2D::add_point); - ClassDB::bind_method(_MD("remove_point", "i"), &Line2D::remove_point); + ClassDB::bind_method(D_METHOD("add_point", "pos"), &Line2D::add_point); + ClassDB::bind_method(D_METHOD("remove_point", "i"), &Line2D::remove_point); - ClassDB::bind_method(_MD("set_width","width"), &Line2D::set_width); - ClassDB::bind_method(_MD("get_width"), &Line2D::get_width); + ClassDB::bind_method(D_METHOD("set_width","width"), &Line2D::set_width); + ClassDB::bind_method(D_METHOD("get_width"), &Line2D::get_width); - ClassDB::bind_method(_MD("set_default_color", "color"), &Line2D::set_default_color); - ClassDB::bind_method(_MD("get_default_color"), &Line2D::get_default_color); + ClassDB::bind_method(D_METHOD("set_default_color", "color"), &Line2D::set_default_color); + ClassDB::bind_method(D_METHOD("get_default_color"), &Line2D::get_default_color); - ClassDB::bind_method(_MD("set_gradient", "color"), &Line2D::set_gradient); - ClassDB::bind_method(_MD("get_gradient"), &Line2D::get_gradient); + ClassDB::bind_method(D_METHOD("set_gradient", "color"), &Line2D::set_gradient); + ClassDB::bind_method(D_METHOD("get_gradient"), &Line2D::get_gradient); - ClassDB::bind_method(_MD("set_texture", "texture"), &Line2D::set_texture); - ClassDB::bind_method(_MD("get_texture"), &Line2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture", "texture"), &Line2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"), &Line2D::get_texture); - ClassDB::bind_method(_MD("set_texture_mode", "mode"), &Line2D::set_texture_mode); - ClassDB::bind_method(_MD("get_texture_mode"), &Line2D::get_texture_mode); + ClassDB::bind_method(D_METHOD("set_texture_mode", "mode"), &Line2D::set_texture_mode); + ClassDB::bind_method(D_METHOD("get_texture_mode"), &Line2D::get_texture_mode); - ClassDB::bind_method(_MD("set_joint_mode", "mode"), &Line2D::set_joint_mode); - ClassDB::bind_method(_MD("get_joint_mode"), &Line2D::get_joint_mode); + ClassDB::bind_method(D_METHOD("set_joint_mode", "mode"), &Line2D::set_joint_mode); + ClassDB::bind_method(D_METHOD("get_joint_mode"), &Line2D::get_joint_mode); - ClassDB::bind_method(_MD("set_begin_cap_mode", "mode"), &Line2D::set_begin_cap_mode); - ClassDB::bind_method(_MD("get_begin_cap_mode"), &Line2D::get_begin_cap_mode); + ClassDB::bind_method(D_METHOD("set_begin_cap_mode", "mode"), &Line2D::set_begin_cap_mode); + ClassDB::bind_method(D_METHOD("get_begin_cap_mode"), &Line2D::get_begin_cap_mode); - ClassDB::bind_method(_MD("set_end_cap_mode", "mode"), &Line2D::set_end_cap_mode); - ClassDB::bind_method(_MD("get_end_cap_mode"), &Line2D::get_end_cap_mode); + ClassDB::bind_method(D_METHOD("set_end_cap_mode", "mode"), &Line2D::set_end_cap_mode); + ClassDB::bind_method(D_METHOD("get_end_cap_mode"), &Line2D::get_end_cap_mode); - ClassDB::bind_method(_MD("set_sharp_limit", "limit"), &Line2D::set_sharp_limit); - ClassDB::bind_method(_MD("get_sharp_limit"), &Line2D::get_sharp_limit); + ClassDB::bind_method(D_METHOD("set_sharp_limit", "limit"), &Line2D::set_sharp_limit); + ClassDB::bind_method(D_METHOD("get_sharp_limit"), &Line2D::get_sharp_limit); - ClassDB::bind_method(_MD("set_round_precision", "precision"), &Line2D::set_round_precision); - ClassDB::bind_method(_MD("get_round_precision"), &Line2D::get_round_precision); + ClassDB::bind_method(D_METHOD("set_round_precision", "precision"), &Line2D::set_round_precision); + ClassDB::bind_method(D_METHOD("get_round_precision"), &Line2D::get_round_precision); ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "points"), "set_points", "get_points"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "width"), "set_width", "get_width"); @@ -300,7 +300,7 @@ void Line2D::_bind_methods() { BIND_CONSTANT(LINE_TEXTURE_NONE); BIND_CONSTANT(LINE_TEXTURE_TILE); - ClassDB::bind_method(_MD("_gradient_changed"), &Line2D::_gradient_changed); + ClassDB::bind_method(D_METHOD("_gradient_changed"), &Line2D::_gradient_changed); } diff --git a/scene/2d/navigation2d.cpp b/scene/2d/navigation2d.cpp index ec1109b41b..7f48749dc3 100644 --- a/scene/2d/navigation2d.cpp +++ b/scene/2d/navigation2d.cpp @@ -804,13 +804,13 @@ Object* Navigation2D::get_closest_point_owner(const Vector2& p_point) { void Navigation2D::_bind_methods() { - ClassDB::bind_method(_MD("navpoly_create","mesh:NavigationPolygon","xform","owner"),&Navigation2D::navpoly_create,DEFVAL(Variant())); - ClassDB::bind_method(_MD("navpoly_set_transform","id","xform"),&Navigation2D::navpoly_set_transform); - ClassDB::bind_method(_MD("navpoly_remove","id"),&Navigation2D::navpoly_remove); + ClassDB::bind_method(D_METHOD("navpoly_create","mesh:NavigationPolygon","xform","owner"),&Navigation2D::navpoly_create,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("navpoly_set_transform","id","xform"),&Navigation2D::navpoly_set_transform); + ClassDB::bind_method(D_METHOD("navpoly_remove","id"),&Navigation2D::navpoly_remove); - ClassDB::bind_method(_MD("get_simple_path","start","end","optimize"),&Navigation2D::get_simple_path,DEFVAL(true)); - ClassDB::bind_method(_MD("get_closest_point","to_point"),&Navigation2D::get_closest_point); - ClassDB::bind_method(_MD("get_closest_point_owner","to_point"),&Navigation2D::get_closest_point_owner); + ClassDB::bind_method(D_METHOD("get_simple_path","start","end","optimize"),&Navigation2D::get_simple_path,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("get_closest_point","to_point"),&Navigation2D::get_closest_point); + ClassDB::bind_method(D_METHOD("get_closest_point_owner","to_point"),&Navigation2D::get_closest_point_owner); } diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index a647134c85..9dbbd34ae9 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -247,28 +247,28 @@ void NavigationPolygon::make_polygons_from_outlines(){ void NavigationPolygon::_bind_methods() { - ClassDB::bind_method(_MD("set_vertices","vertices"),&NavigationPolygon::set_vertices); - ClassDB::bind_method(_MD("get_vertices"),&NavigationPolygon::get_vertices); + ClassDB::bind_method(D_METHOD("set_vertices","vertices"),&NavigationPolygon::set_vertices); + ClassDB::bind_method(D_METHOD("get_vertices"),&NavigationPolygon::get_vertices); - ClassDB::bind_method(_MD("add_polygon","polygon"),&NavigationPolygon::add_polygon); - ClassDB::bind_method(_MD("get_polygon_count"),&NavigationPolygon::get_polygon_count); - ClassDB::bind_method(_MD("get_polygon","idx"),&NavigationPolygon::get_polygon); - ClassDB::bind_method(_MD("clear_polygons"),&NavigationPolygon::clear_polygons); + ClassDB::bind_method(D_METHOD("add_polygon","polygon"),&NavigationPolygon::add_polygon); + ClassDB::bind_method(D_METHOD("get_polygon_count"),&NavigationPolygon::get_polygon_count); + ClassDB::bind_method(D_METHOD("get_polygon","idx"),&NavigationPolygon::get_polygon); + ClassDB::bind_method(D_METHOD("clear_polygons"),&NavigationPolygon::clear_polygons); - ClassDB::bind_method(_MD("add_outline","outline"),&NavigationPolygon::add_outline); - ClassDB::bind_method(_MD("add_outline_at_index","outline","index"),&NavigationPolygon::add_outline_at_index); - ClassDB::bind_method(_MD("get_outline_count"),&NavigationPolygon::get_outline_count); - ClassDB::bind_method(_MD("set_outline","idx","outline"),&NavigationPolygon::set_outline); - ClassDB::bind_method(_MD("get_outline","idx"),&NavigationPolygon::get_outline); - ClassDB::bind_method(_MD("remove_outline","idx"),&NavigationPolygon::remove_outline); - ClassDB::bind_method(_MD("clear_outlines"),&NavigationPolygon::clear_outlines); - ClassDB::bind_method(_MD("make_polygons_from_outlines"),&NavigationPolygon::make_polygons_from_outlines); + ClassDB::bind_method(D_METHOD("add_outline","outline"),&NavigationPolygon::add_outline); + ClassDB::bind_method(D_METHOD("add_outline_at_index","outline","index"),&NavigationPolygon::add_outline_at_index); + ClassDB::bind_method(D_METHOD("get_outline_count"),&NavigationPolygon::get_outline_count); + ClassDB::bind_method(D_METHOD("set_outline","idx","outline"),&NavigationPolygon::set_outline); + ClassDB::bind_method(D_METHOD("get_outline","idx"),&NavigationPolygon::get_outline); + ClassDB::bind_method(D_METHOD("remove_outline","idx"),&NavigationPolygon::remove_outline); + ClassDB::bind_method(D_METHOD("clear_outlines"),&NavigationPolygon::clear_outlines); + ClassDB::bind_method(D_METHOD("make_polygons_from_outlines"),&NavigationPolygon::make_polygons_from_outlines); - ClassDB::bind_method(_MD("_set_polygons","polygons"),&NavigationPolygon::_set_polygons); - ClassDB::bind_method(_MD("_get_polygons"),&NavigationPolygon::_get_polygons); + ClassDB::bind_method(D_METHOD("_set_polygons","polygons"),&NavigationPolygon::_set_polygons); + ClassDB::bind_method(D_METHOD("_get_polygons"),&NavigationPolygon::_get_polygons); - ClassDB::bind_method(_MD("_set_outlines","outlines"),&NavigationPolygon::_set_outlines); - ClassDB::bind_method(_MD("_get_outlines"),&NavigationPolygon::_get_outlines); + ClassDB::bind_method(D_METHOD("_set_outlines","outlines"),&NavigationPolygon::_set_outlines); + ClassDB::bind_method(D_METHOD("_get_outlines"),&NavigationPolygon::_get_outlines); ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY,"vertices",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_vertices","get_vertices"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY,"polygons",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_polygons","_get_polygons"); @@ -480,13 +480,13 @@ String NavigationPolygonInstance::get_configuration_warning() const { void NavigationPolygonInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_navigation_polygon","navpoly:NavigationPolygon"),&NavigationPolygonInstance::set_navigation_polygon); - ClassDB::bind_method(_MD("get_navigation_polygon:NavigationPolygon"),&NavigationPolygonInstance::get_navigation_polygon); + ClassDB::bind_method(D_METHOD("set_navigation_polygon","navpoly:NavigationPolygon"),&NavigationPolygonInstance::set_navigation_polygon); + ClassDB::bind_method(D_METHOD("get_navigation_polygon:NavigationPolygon"),&NavigationPolygonInstance::get_navigation_polygon); - ClassDB::bind_method(_MD("set_enabled","enabled"),&NavigationPolygonInstance::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&NavigationPolygonInstance::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&NavigationPolygonInstance::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&NavigationPolygonInstance::is_enabled); - ClassDB::bind_method(_MD("_navpoly_changed"),&NavigationPolygonInstance::_navpoly_changed); + ClassDB::bind_method(D_METHOD("_navpoly_changed"),&NavigationPolygonInstance::_navpoly_changed); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"navpoly",PROPERTY_HINT_RESOURCE_TYPE,"NavigationPolygon"),"set_navigation_polygon","get_navigation_polygon"); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 245fe2f296..710f9731c5 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -423,50 +423,50 @@ void Node2D::_bind_methods() { // TODO: Obsolete those two methods (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_get_rotd"),&Node2D::_get_rotd); - ClassDB::bind_method(_MD("_set_rotd","degrees"),&Node2D::_set_rotd); - - ClassDB::bind_method(_MD("set_position","pos"),&Node2D::set_position); - ClassDB::bind_method(_MD("set_rotation","radians"),&Node2D::set_rotation); - ClassDB::bind_method(_MD("set_rotation_in_degrees","degrees"),&Node2D::set_rotation_in_degrees); - ClassDB::bind_method(_MD("set_scale","scale"),&Node2D::set_scale); - - ClassDB::bind_method(_MD("get_position"),&Node2D::get_position); - ClassDB::bind_method(_MD("get_rotation"),&Node2D::get_rotation); - ClassDB::bind_method(_MD("get_rotation_in_degrees"),&Node2D::get_rotation_in_degrees); - ClassDB::bind_method(_MD("get_scale"),&Node2D::get_scale); - - ClassDB::bind_method(_MD("rotate","radians"),&Node2D::rotate); - ClassDB::bind_method(_MD("move_local_x","delta","scaled"),&Node2D::move_x,DEFVAL(false)); - ClassDB::bind_method(_MD("move_local_y","delta","scaled"),&Node2D::move_y,DEFVAL(false)); - ClassDB::bind_method(_MD("translate","offset"),&Node2D::translate); - ClassDB::bind_method(_MD("global_translate","offset"),&Node2D::global_translate); - ClassDB::bind_method(_MD("scale","ratio"),&Node2D::scale); - - ClassDB::bind_method(_MD("set_global_position","pos"),&Node2D::set_global_position); - ClassDB::bind_method(_MD("get_global_position"),&Node2D::get_global_position); - ClassDB::bind_method(_MD("set_global_rotation","radians"),&Node2D::set_global_rotation); - ClassDB::bind_method(_MD("get_global_rotation"),&Node2D::get_global_rotation); - ClassDB::bind_method(_MD("set_global_rotation_in_degrees","degrees"),&Node2D::set_global_rotation_in_degrees); - ClassDB::bind_method(_MD("get_global_rotation_in_degrees"),&Node2D::get_global_rotation_in_degrees); - ClassDB::bind_method(_MD("set_global_scale","scale"),&Node2D::set_global_scale); - ClassDB::bind_method(_MD("get_global_scale"),&Node2D::get_global_scale); - - ClassDB::bind_method(_MD("set_transform","xform"),&Node2D::set_transform); - ClassDB::bind_method(_MD("set_global_transform","xform"),&Node2D::set_global_transform); - - ClassDB::bind_method(_MD("look_at","point"),&Node2D::look_at); - ClassDB::bind_method(_MD("get_angle_to","point"),&Node2D::get_angle_to); - - ClassDB::bind_method(_MD("set_z","z"),&Node2D::set_z); - ClassDB::bind_method(_MD("get_z"),&Node2D::get_z); - - ClassDB::bind_method(_MD("set_z_as_relative","enable"),&Node2D::set_z_as_relative); - ClassDB::bind_method(_MD("is_z_relative"),&Node2D::is_z_relative); - - ClassDB::bind_method(_MD("edit_set_pivot","pivot"),&Node2D::edit_set_pivot); - - ClassDB::bind_method(_MD("get_relative_transform_to_parent","parent"),&Node2D::get_relative_transform_to_parent); + ClassDB::bind_method(D_METHOD("_get_rotd"),&Node2D::_get_rotd); + ClassDB::bind_method(D_METHOD("_set_rotd","degrees"),&Node2D::_set_rotd); + + ClassDB::bind_method(D_METHOD("set_position","pos"),&Node2D::set_position); + ClassDB::bind_method(D_METHOD("set_rotation","radians"),&Node2D::set_rotation); + ClassDB::bind_method(D_METHOD("set_rotation_in_degrees","degrees"),&Node2D::set_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_scale","scale"),&Node2D::set_scale); + + ClassDB::bind_method(D_METHOD("get_position"),&Node2D::get_position); + ClassDB::bind_method(D_METHOD("get_rotation"),&Node2D::get_rotation); + ClassDB::bind_method(D_METHOD("get_rotation_in_degrees"),&Node2D::get_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("get_scale"),&Node2D::get_scale); + + ClassDB::bind_method(D_METHOD("rotate","radians"),&Node2D::rotate); + ClassDB::bind_method(D_METHOD("move_local_x","delta","scaled"),&Node2D::move_x,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("move_local_y","delta","scaled"),&Node2D::move_y,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("translate","offset"),&Node2D::translate); + ClassDB::bind_method(D_METHOD("global_translate","offset"),&Node2D::global_translate); + ClassDB::bind_method(D_METHOD("scale","ratio"),&Node2D::scale); + + ClassDB::bind_method(D_METHOD("set_global_position","pos"),&Node2D::set_global_position); + ClassDB::bind_method(D_METHOD("get_global_position"),&Node2D::get_global_position); + ClassDB::bind_method(D_METHOD("set_global_rotation","radians"),&Node2D::set_global_rotation); + ClassDB::bind_method(D_METHOD("get_global_rotation"),&Node2D::get_global_rotation); + ClassDB::bind_method(D_METHOD("set_global_rotation_in_degrees","degrees"),&Node2D::set_global_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("get_global_rotation_in_degrees"),&Node2D::get_global_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_global_scale","scale"),&Node2D::set_global_scale); + ClassDB::bind_method(D_METHOD("get_global_scale"),&Node2D::get_global_scale); + + ClassDB::bind_method(D_METHOD("set_transform","xform"),&Node2D::set_transform); + ClassDB::bind_method(D_METHOD("set_global_transform","xform"),&Node2D::set_global_transform); + + ClassDB::bind_method(D_METHOD("look_at","point"),&Node2D::look_at); + ClassDB::bind_method(D_METHOD("get_angle_to","point"),&Node2D::get_angle_to); + + ClassDB::bind_method(D_METHOD("set_z","z"),&Node2D::set_z); + ClassDB::bind_method(D_METHOD("get_z"),&Node2D::get_z); + + ClassDB::bind_method(D_METHOD("set_z_as_relative","enable"),&Node2D::set_z_as_relative); + ClassDB::bind_method(D_METHOD("is_z_relative"),&Node2D::is_z_relative); + + ClassDB::bind_method(D_METHOD("edit_set_pivot","pivot"),&Node2D::edit_set_pivot); + + ClassDB::bind_method(D_METHOD("get_relative_transform_to_parent","parent"),&Node2D::get_relative_transform_to_parent); ADD_GROUP("Transform",""); ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2,"position"),"set_position","get_position"); diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index 2011b91b71..9336dc51af 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -189,19 +189,19 @@ Vector2 ParallaxBackground::get_final_offset() const { void ParallaxBackground::_bind_methods() { - ClassDB::bind_method(_MD("_camera_moved"),&ParallaxBackground::_camera_moved); - ClassDB::bind_method(_MD("set_scroll_offset","ofs"),&ParallaxBackground::set_scroll_offset); - ClassDB::bind_method(_MD("get_scroll_offset"),&ParallaxBackground::get_scroll_offset); - ClassDB::bind_method(_MD("set_scroll_base_offset","ofs"),&ParallaxBackground::set_scroll_base_offset); - ClassDB::bind_method(_MD("get_scroll_base_offset"),&ParallaxBackground::get_scroll_base_offset); - ClassDB::bind_method(_MD("set_scroll_base_scale","scale"),&ParallaxBackground::set_scroll_base_scale); - ClassDB::bind_method(_MD("get_scroll_base_scale"),&ParallaxBackground::get_scroll_base_scale); - ClassDB::bind_method(_MD("set_limit_begin","ofs"),&ParallaxBackground::set_limit_begin); - ClassDB::bind_method(_MD("get_limit_begin"),&ParallaxBackground::get_limit_begin); - ClassDB::bind_method(_MD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); - ClassDB::bind_method(_MD("get_limit_end"),&ParallaxBackground::get_limit_end); - ClassDB::bind_method(_MD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); - ClassDB::bind_method(_MD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); + ClassDB::bind_method(D_METHOD("_camera_moved"),&ParallaxBackground::_camera_moved); + ClassDB::bind_method(D_METHOD("set_scroll_offset","ofs"),&ParallaxBackground::set_scroll_offset); + ClassDB::bind_method(D_METHOD("get_scroll_offset"),&ParallaxBackground::get_scroll_offset); + ClassDB::bind_method(D_METHOD("set_scroll_base_offset","ofs"),&ParallaxBackground::set_scroll_base_offset); + ClassDB::bind_method(D_METHOD("get_scroll_base_offset"),&ParallaxBackground::get_scroll_base_offset); + ClassDB::bind_method(D_METHOD("set_scroll_base_scale","scale"),&ParallaxBackground::set_scroll_base_scale); + ClassDB::bind_method(D_METHOD("get_scroll_base_scale"),&ParallaxBackground::get_scroll_base_scale); + ClassDB::bind_method(D_METHOD("set_limit_begin","ofs"),&ParallaxBackground::set_limit_begin); + ClassDB::bind_method(D_METHOD("get_limit_begin"),&ParallaxBackground::get_limit_begin); + ClassDB::bind_method(D_METHOD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); + ClassDB::bind_method(D_METHOD("get_limit_end"),&ParallaxBackground::get_limit_end); + ClassDB::bind_method(D_METHOD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); + ClassDB::bind_method(D_METHOD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); ADD_GROUP("Scroll","scroll_"); diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 8d7f38b6bb..37d8fb52f1 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -150,12 +150,12 @@ String ParallaxLayer::get_configuration_warning() const { void ParallaxLayer::_bind_methods() { - ClassDB::bind_method(_MD("set_motion_scale","scale"),&ParallaxLayer::set_motion_scale); - ClassDB::bind_method(_MD("get_motion_scale"),&ParallaxLayer::get_motion_scale); - ClassDB::bind_method(_MD("set_motion_offset","offset"),&ParallaxLayer::set_motion_offset); - ClassDB::bind_method(_MD("get_motion_offset"),&ParallaxLayer::get_motion_offset); - ClassDB::bind_method(_MD("set_mirroring","mirror"),&ParallaxLayer::set_mirroring); - ClassDB::bind_method(_MD("get_mirroring"),&ParallaxLayer::get_mirroring); + ClassDB::bind_method(D_METHOD("set_motion_scale","scale"),&ParallaxLayer::set_motion_scale); + ClassDB::bind_method(D_METHOD("get_motion_scale"),&ParallaxLayer::get_motion_scale); + ClassDB::bind_method(D_METHOD("set_motion_offset","offset"),&ParallaxLayer::set_motion_offset); + ClassDB::bind_method(D_METHOD("get_motion_offset"),&ParallaxLayer::get_motion_offset); + ClassDB::bind_method(D_METHOD("set_mirroring","mirror"),&ParallaxLayer::set_mirroring); + ClassDB::bind_method(D_METHOD("get_mirroring"),&ParallaxLayer::get_mirroring); ADD_GROUP("Motion","motion_"); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"motion_scale"),"set_motion_scale","get_motion_scale"); diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp index 020ba0fcc1..da49f1b420 100644 --- a/scene/2d/particles_2d.cpp +++ b/scene/2d/particles_2d.cpp @@ -113,23 +113,23 @@ void ParticleAttractor2D::_set_owner(Particles2D* p_owner) { void ParticleAttractor2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&ParticleAttractor2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&ParticleAttractor2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&ParticleAttractor2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&ParticleAttractor2D::is_enabled); - ClassDB::bind_method(_MD("set_radius","radius"),&ParticleAttractor2D::set_radius); - ClassDB::bind_method(_MD("get_radius"),&ParticleAttractor2D::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&ParticleAttractor2D::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&ParticleAttractor2D::get_radius); - ClassDB::bind_method(_MD("set_disable_radius","radius"),&ParticleAttractor2D::set_disable_radius); - ClassDB::bind_method(_MD("get_disable_radius"),&ParticleAttractor2D::get_disable_radius); + ClassDB::bind_method(D_METHOD("set_disable_radius","radius"),&ParticleAttractor2D::set_disable_radius); + ClassDB::bind_method(D_METHOD("get_disable_radius"),&ParticleAttractor2D::get_disable_radius); - ClassDB::bind_method(_MD("set_gravity","gravity"),&ParticleAttractor2D::set_gravity); - ClassDB::bind_method(_MD("get_gravity"),&ParticleAttractor2D::get_gravity); + ClassDB::bind_method(D_METHOD("set_gravity","gravity"),&ParticleAttractor2D::set_gravity); + ClassDB::bind_method(D_METHOD("get_gravity"),&ParticleAttractor2D::get_gravity); - ClassDB::bind_method(_MD("set_absorption","absorption"),&ParticleAttractor2D::set_absorption); - ClassDB::bind_method(_MD("get_absorption"),&ParticleAttractor2D::get_absorption); + ClassDB::bind_method(D_METHOD("set_absorption","absorption"),&ParticleAttractor2D::set_absorption); + ClassDB::bind_method(D_METHOD("get_absorption"),&ParticleAttractor2D::get_absorption); - ClassDB::bind_method(_MD("set_particles_path","path"),&ParticleAttractor2D::set_particles_path); - ClassDB::bind_method(_MD("get_particles_path"),&ParticleAttractor2D::get_particles_path); + ClassDB::bind_method(D_METHOD("set_particles_path","path"),&ParticleAttractor2D::set_particles_path); + ClassDB::bind_method(D_METHOD("get_particles_path"),&ParticleAttractor2D::get_particles_path); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"radius",PROPERTY_HINT_RANGE,"0.1,16000,0.1"),"set_radius","get_radius"); @@ -1017,80 +1017,80 @@ void Particles2D::reset() { void Particles2D::_bind_methods() { - ClassDB::bind_method(_MD("set_emitting","active"),&Particles2D::set_emitting); - ClassDB::bind_method(_MD("is_emitting"),&Particles2D::is_emitting); + ClassDB::bind_method(D_METHOD("set_emitting","active"),&Particles2D::set_emitting); + ClassDB::bind_method(D_METHOD("is_emitting"),&Particles2D::is_emitting); - ClassDB::bind_method(_MD("set_amount","amount"),&Particles2D::set_amount); - ClassDB::bind_method(_MD("get_amount"),&Particles2D::get_amount); + ClassDB::bind_method(D_METHOD("set_amount","amount"),&Particles2D::set_amount); + ClassDB::bind_method(D_METHOD("get_amount"),&Particles2D::get_amount); - ClassDB::bind_method(_MD("set_lifetime","lifetime"),&Particles2D::set_lifetime); - ClassDB::bind_method(_MD("get_lifetime"),&Particles2D::get_lifetime); + ClassDB::bind_method(D_METHOD("set_lifetime","lifetime"),&Particles2D::set_lifetime); + ClassDB::bind_method(D_METHOD("get_lifetime"),&Particles2D::get_lifetime); - ClassDB::bind_method(_MD("set_time_scale","time_scale"),&Particles2D::set_time_scale); - ClassDB::bind_method(_MD("get_time_scale"),&Particles2D::get_time_scale); + ClassDB::bind_method(D_METHOD("set_time_scale","time_scale"),&Particles2D::set_time_scale); + ClassDB::bind_method(D_METHOD("get_time_scale"),&Particles2D::get_time_scale); - ClassDB::bind_method(_MD("set_pre_process_time","time"),&Particles2D::set_pre_process_time); - ClassDB::bind_method(_MD("get_pre_process_time"),&Particles2D::get_pre_process_time); + ClassDB::bind_method(D_METHOD("set_pre_process_time","time"),&Particles2D::set_pre_process_time); + ClassDB::bind_method(D_METHOD("get_pre_process_time"),&Particles2D::get_pre_process_time); - ClassDB::bind_method(_MD("set_emit_timeout","value"),&Particles2D::set_emit_timeout); - ClassDB::bind_method(_MD("get_emit_timeout"),&Particles2D::get_emit_timeout); + ClassDB::bind_method(D_METHOD("set_emit_timeout","value"),&Particles2D::set_emit_timeout); + ClassDB::bind_method(D_METHOD("get_emit_timeout"),&Particles2D::get_emit_timeout); - ClassDB::bind_method(_MD("set_param","param","value"),&Particles2D::set_param); - ClassDB::bind_method(_MD("get_param","param"),&Particles2D::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&Particles2D::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&Particles2D::get_param); - ClassDB::bind_method(_MD("set_randomness","param","value"),&Particles2D::set_randomness); - ClassDB::bind_method(_MD("get_randomness","param"),&Particles2D::get_randomness); + ClassDB::bind_method(D_METHOD("set_randomness","param","value"),&Particles2D::set_randomness); + ClassDB::bind_method(D_METHOD("get_randomness","param"),&Particles2D::get_randomness); - ClassDB::bind_method(_MD("set_texture:Texture","texture"),&Particles2D::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&Particles2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture:Texture","texture"),&Particles2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&Particles2D::get_texture); - ClassDB::bind_method(_MD("set_color","color"),&Particles2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Particles2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Particles2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Particles2D::get_color); - ClassDB::bind_method(_MD("set_color_ramp:ColorRamp","color_ramp"),&Particles2D::set_color_ramp); - ClassDB::bind_method(_MD("get_color_ramp:ColorRamp"),&Particles2D::get_color_ramp); + ClassDB::bind_method(D_METHOD("set_color_ramp:ColorRamp","color_ramp"),&Particles2D::set_color_ramp); + ClassDB::bind_method(D_METHOD("get_color_ramp:ColorRamp"),&Particles2D::get_color_ramp); - ClassDB::bind_method(_MD("set_emissor_offset","offset"),&Particles2D::set_emissor_offset); - ClassDB::bind_method(_MD("get_emissor_offset"),&Particles2D::get_emissor_offset); + ClassDB::bind_method(D_METHOD("set_emissor_offset","offset"),&Particles2D::set_emissor_offset); + ClassDB::bind_method(D_METHOD("get_emissor_offset"),&Particles2D::get_emissor_offset); - ClassDB::bind_method(_MD("set_flip_h","enable"),&Particles2D::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&Particles2D::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","enable"),&Particles2D::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&Particles2D::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","enable"),&Particles2D::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&Particles2D::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","enable"),&Particles2D::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&Particles2D::is_flipped_v); - ClassDB::bind_method(_MD("set_h_frames","enable"),&Particles2D::set_h_frames); - ClassDB::bind_method(_MD("get_h_frames"),&Particles2D::get_h_frames); + ClassDB::bind_method(D_METHOD("set_h_frames","enable"),&Particles2D::set_h_frames); + ClassDB::bind_method(D_METHOD("get_h_frames"),&Particles2D::get_h_frames); - ClassDB::bind_method(_MD("set_v_frames","enable"),&Particles2D::set_v_frames); - ClassDB::bind_method(_MD("get_v_frames"),&Particles2D::get_v_frames); + ClassDB::bind_method(D_METHOD("set_v_frames","enable"),&Particles2D::set_v_frames); + ClassDB::bind_method(D_METHOD("get_v_frames"),&Particles2D::get_v_frames); - ClassDB::bind_method(_MD("set_emission_half_extents","extents"),&Particles2D::set_emission_half_extents); - ClassDB::bind_method(_MD("get_emission_half_extents"),&Particles2D::get_emission_half_extents); + ClassDB::bind_method(D_METHOD("set_emission_half_extents","extents"),&Particles2D::set_emission_half_extents); + ClassDB::bind_method(D_METHOD("get_emission_half_extents"),&Particles2D::get_emission_half_extents); - ClassDB::bind_method(_MD("set_color_phases","phases"),&Particles2D::set_color_phases); - ClassDB::bind_method(_MD("get_color_phases"),&Particles2D::get_color_phases); + ClassDB::bind_method(D_METHOD("set_color_phases","phases"),&Particles2D::set_color_phases); + ClassDB::bind_method(D_METHOD("get_color_phases"),&Particles2D::get_color_phases); - ClassDB::bind_method(_MD("set_color_phase_color","phase","color"),&Particles2D::set_color_phase_color); - ClassDB::bind_method(_MD("get_color_phase_color","phase"),&Particles2D::get_color_phase_color); + ClassDB::bind_method(D_METHOD("set_color_phase_color","phase","color"),&Particles2D::set_color_phase_color); + ClassDB::bind_method(D_METHOD("get_color_phase_color","phase"),&Particles2D::get_color_phase_color); - ClassDB::bind_method(_MD("set_color_phase_pos","phase","pos"),&Particles2D::set_color_phase_pos); - ClassDB::bind_method(_MD("get_color_phase_pos","phase"),&Particles2D::get_color_phase_pos); + ClassDB::bind_method(D_METHOD("set_color_phase_pos","phase","pos"),&Particles2D::set_color_phase_pos); + ClassDB::bind_method(D_METHOD("get_color_phase_pos","phase"),&Particles2D::get_color_phase_pos); - ClassDB::bind_method(_MD("pre_process","time"),&Particles2D::pre_process); - ClassDB::bind_method(_MD("reset"),&Particles2D::reset); + ClassDB::bind_method(D_METHOD("pre_process","time"),&Particles2D::pre_process); + ClassDB::bind_method(D_METHOD("reset"),&Particles2D::reset); - ClassDB::bind_method(_MD("set_use_local_space","enable"),&Particles2D::set_use_local_space); - ClassDB::bind_method(_MD("is_using_local_space"),&Particles2D::is_using_local_space); + ClassDB::bind_method(D_METHOD("set_use_local_space","enable"),&Particles2D::set_use_local_space); + ClassDB::bind_method(D_METHOD("is_using_local_space"),&Particles2D::is_using_local_space); - ClassDB::bind_method(_MD("set_initial_velocity","velocity"),&Particles2D::set_initial_velocity); - ClassDB::bind_method(_MD("get_initial_velocity"),&Particles2D::get_initial_velocity); + ClassDB::bind_method(D_METHOD("set_initial_velocity","velocity"),&Particles2D::set_initial_velocity); + ClassDB::bind_method(D_METHOD("get_initial_velocity"),&Particles2D::get_initial_velocity); - ClassDB::bind_method(_MD("set_explosiveness","amount"),&Particles2D::set_explosiveness); - ClassDB::bind_method(_MD("get_explosiveness"),&Particles2D::get_explosiveness); + ClassDB::bind_method(D_METHOD("set_explosiveness","amount"),&Particles2D::set_explosiveness); + ClassDB::bind_method(D_METHOD("get_explosiveness"),&Particles2D::get_explosiveness); - ClassDB::bind_method(_MD("set_emission_points","points"),&Particles2D::set_emission_points); - ClassDB::bind_method(_MD("get_emission_points"),&Particles2D::get_emission_points); + ClassDB::bind_method(D_METHOD("set_emission_points","points"),&Particles2D::set_emission_points); + ClassDB::bind_method(D_METHOD("get_emission_points"),&Particles2D::get_emission_points); ADD_PROPERTY(PropertyInfo(Variant::INT,"config/amount",PROPERTY_HINT_EXP_RANGE,"1,1024"),"set_amount","get_amount") ; ADD_PROPERTY(PropertyInfo(Variant::REAL,"config/lifetime",PROPERTY_HINT_EXP_RANGE,"0.1,3600,0.1"),"set_lifetime","get_lifetime") ; diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 7b6c11dd8c..63531ae599 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -85,9 +85,9 @@ Ref<Curve2D> Path2D::get_curve() const{ void Path2D::_bind_methods() { - ClassDB::bind_method(_MD("set_curve","curve:Curve2D"),&Path2D::set_curve); - ClassDB::bind_method(_MD("get_curve:Curve2D","curve"),&Path2D::get_curve); - ClassDB::bind_method(_MD("_curve_changed"),&Path2D::_curve_changed); + ClassDB::bind_method(D_METHOD("set_curve","curve:Curve2D"),&Path2D::set_curve); + ClassDB::bind_method(D_METHOD("get_curve:Curve2D","curve"),&Path2D::get_curve); + ClassDB::bind_method(D_METHOD("_curve_changed"),&Path2D::_curve_changed); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve2D"), "set_curve","get_curve"); } @@ -252,26 +252,26 @@ String PathFollow2D::get_configuration_warning() const { void PathFollow2D::_bind_methods() { - ClassDB::bind_method(_MD("set_offset","offset"),&PathFollow2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&PathFollow2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&PathFollow2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&PathFollow2D::get_offset); - ClassDB::bind_method(_MD("set_h_offset","h_offset"),&PathFollow2D::set_h_offset); - ClassDB::bind_method(_MD("get_h_offset"),&PathFollow2D::get_h_offset); + ClassDB::bind_method(D_METHOD("set_h_offset","h_offset"),&PathFollow2D::set_h_offset); + ClassDB::bind_method(D_METHOD("get_h_offset"),&PathFollow2D::get_h_offset); - ClassDB::bind_method(_MD("set_v_offset","v_offset"),&PathFollow2D::set_v_offset); - ClassDB::bind_method(_MD("get_v_offset"),&PathFollow2D::get_v_offset); + ClassDB::bind_method(D_METHOD("set_v_offset","v_offset"),&PathFollow2D::set_v_offset); + ClassDB::bind_method(D_METHOD("get_v_offset"),&PathFollow2D::get_v_offset); - ClassDB::bind_method(_MD("set_unit_offset","unit_offset"),&PathFollow2D::set_unit_offset); - ClassDB::bind_method(_MD("get_unit_offset"),&PathFollow2D::get_unit_offset); + ClassDB::bind_method(D_METHOD("set_unit_offset","unit_offset"),&PathFollow2D::set_unit_offset); + ClassDB::bind_method(D_METHOD("get_unit_offset"),&PathFollow2D::get_unit_offset); - ClassDB::bind_method(_MD("set_rotate","enable"),&PathFollow2D::set_rotate); - ClassDB::bind_method(_MD("is_rotating"),&PathFollow2D::is_rotating); + ClassDB::bind_method(D_METHOD("set_rotate","enable"),&PathFollow2D::set_rotate); + ClassDB::bind_method(D_METHOD("is_rotating"),&PathFollow2D::is_rotating); - ClassDB::bind_method(_MD("set_cubic_interpolation","enable"),&PathFollow2D::set_cubic_interpolation); - ClassDB::bind_method(_MD("get_cubic_interpolation"),&PathFollow2D::get_cubic_interpolation); + ClassDB::bind_method(D_METHOD("set_cubic_interpolation","enable"),&PathFollow2D::set_cubic_interpolation); + ClassDB::bind_method(D_METHOD("get_cubic_interpolation"),&PathFollow2D::get_cubic_interpolation); - ClassDB::bind_method(_MD("set_loop","loop"),&PathFollow2D::set_loop); - ClassDB::bind_method(_MD("has_loop"),&PathFollow2D::has_loop); + ClassDB::bind_method(D_METHOD("set_loop","loop"),&PathFollow2D::set_loop); + ClassDB::bind_method(D_METHOD("has_loop"),&PathFollow2D::has_loop); } diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 23891ececb..0ffaf81e3d 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -81,26 +81,26 @@ uint32_t PhysicsBody2D::_get_layers() const{ void PhysicsBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_collision_layer","mask"),&PhysicsBody2D::set_collision_layer); - ClassDB::bind_method(_MD("get_collision_layer"),&PhysicsBody2D::get_collision_layer); - ClassDB::bind_method(_MD("set_collision_mask","mask"),&PhysicsBody2D::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&PhysicsBody2D::get_collision_mask); - - - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&PhysicsBody2D::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&PhysicsBody2D::get_collision_mask_bit); - - ClassDB::bind_method(_MD("set_collision_layer_bit","bit","value"),&PhysicsBody2D::set_collision_layer_bit); - ClassDB::bind_method(_MD("get_collision_layer_bit","bit"),&PhysicsBody2D::get_collision_layer_bit); - - ClassDB::bind_method(_MD("_set_layers","mask"),&PhysicsBody2D::_set_layers); - ClassDB::bind_method(_MD("_get_layers"),&PhysicsBody2D::_get_layers); - ClassDB::bind_method(_MD("set_one_way_collision_direction","dir"),&PhysicsBody2D::set_one_way_collision_direction); - ClassDB::bind_method(_MD("get_one_way_collision_direction"),&PhysicsBody2D::get_one_way_collision_direction); - ClassDB::bind_method(_MD("set_one_way_collision_max_depth","depth"),&PhysicsBody2D::set_one_way_collision_max_depth); - ClassDB::bind_method(_MD("get_one_way_collision_max_depth"),&PhysicsBody2D::get_one_way_collision_max_depth); - ClassDB::bind_method(_MD("add_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::add_collision_exception_with); - ClassDB::bind_method(_MD("remove_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::remove_collision_exception_with); + ClassDB::bind_method(D_METHOD("set_collision_layer","mask"),&PhysicsBody2D::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"),&PhysicsBody2D::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&PhysicsBody2D::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&PhysicsBody2D::get_collision_mask); + + + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&PhysicsBody2D::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&PhysicsBody2D::get_collision_mask_bit); + + ClassDB::bind_method(D_METHOD("set_collision_layer_bit","bit","value"),&PhysicsBody2D::set_collision_layer_bit); + ClassDB::bind_method(D_METHOD("get_collision_layer_bit","bit"),&PhysicsBody2D::get_collision_layer_bit); + + ClassDB::bind_method(D_METHOD("_set_layers","mask"),&PhysicsBody2D::_set_layers); + ClassDB::bind_method(D_METHOD("_get_layers"),&PhysicsBody2D::_get_layers); + ClassDB::bind_method(D_METHOD("set_one_way_collision_direction","dir"),&PhysicsBody2D::set_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("get_one_way_collision_direction"),&PhysicsBody2D::get_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("set_one_way_collision_max_depth","depth"),&PhysicsBody2D::set_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("get_one_way_collision_max_depth"),&PhysicsBody2D::get_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("add_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::add_collision_exception_with); + ClassDB::bind_method(D_METHOD("remove_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::remove_collision_exception_with); ADD_PROPERTY(PropertyInfo(Variant::INT,"layers",PROPERTY_HINT_LAYERS_2D_PHYSICS,"",0),"_set_layers","_get_layers"); //for backwards compat ADD_GROUP("Collision","collision_"); @@ -271,15 +271,15 @@ real_t StaticBody2D::get_bounce() const{ void StaticBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_constant_linear_velocity","vel"),&StaticBody2D::set_constant_linear_velocity); - ClassDB::bind_method(_MD("set_constant_angular_velocity","vel"),&StaticBody2D::set_constant_angular_velocity); - ClassDB::bind_method(_MD("get_constant_linear_velocity"),&StaticBody2D::get_constant_linear_velocity); - ClassDB::bind_method(_MD("get_constant_angular_velocity"),&StaticBody2D::get_constant_angular_velocity); - ClassDB::bind_method(_MD("set_friction","friction"),&StaticBody2D::set_friction); - ClassDB::bind_method(_MD("get_friction"),&StaticBody2D::get_friction); + ClassDB::bind_method(D_METHOD("set_constant_linear_velocity","vel"),&StaticBody2D::set_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("set_constant_angular_velocity","vel"),&StaticBody2D::set_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("get_constant_linear_velocity"),&StaticBody2D::get_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("get_constant_angular_velocity"),&StaticBody2D::get_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&StaticBody2D::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&StaticBody2D::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&StaticBody2D::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&StaticBody2D::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&StaticBody2D::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&StaticBody2D::get_bounce); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2,"constant_linear_velocity"),"set_constant_linear_velocity","get_constant_linear_velocity"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"constant_angular_velocity"),"set_constant_angular_velocity","get_constant_angular_velocity"); @@ -882,75 +882,75 @@ bool RigidBody2D::is_contact_monitor_enabled() const { void RigidBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_mode","mode"),&RigidBody2D::set_mode); - ClassDB::bind_method(_MD("get_mode"),&RigidBody2D::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&RigidBody2D::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&RigidBody2D::get_mode); - ClassDB::bind_method(_MD("set_mass","mass"),&RigidBody2D::set_mass); - ClassDB::bind_method(_MD("get_mass"),&RigidBody2D::get_mass); + ClassDB::bind_method(D_METHOD("set_mass","mass"),&RigidBody2D::set_mass); + ClassDB::bind_method(D_METHOD("get_mass"),&RigidBody2D::get_mass); - ClassDB::bind_method(_MD("get_inertia"),&RigidBody2D::get_inertia); - ClassDB::bind_method(_MD("set_inertia","inertia"),&RigidBody2D::set_inertia); + ClassDB::bind_method(D_METHOD("get_inertia"),&RigidBody2D::get_inertia); + ClassDB::bind_method(D_METHOD("set_inertia","inertia"),&RigidBody2D::set_inertia); - ClassDB::bind_method(_MD("set_weight","weight"),&RigidBody2D::set_weight); - ClassDB::bind_method(_MD("get_weight"),&RigidBody2D::get_weight); + ClassDB::bind_method(D_METHOD("set_weight","weight"),&RigidBody2D::set_weight); + ClassDB::bind_method(D_METHOD("get_weight"),&RigidBody2D::get_weight); - ClassDB::bind_method(_MD("set_friction","friction"),&RigidBody2D::set_friction); - ClassDB::bind_method(_MD("get_friction"),&RigidBody2D::get_friction); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&RigidBody2D::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&RigidBody2D::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&RigidBody2D::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&RigidBody2D::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&RigidBody2D::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&RigidBody2D::get_bounce); - ClassDB::bind_method(_MD("set_gravity_scale","gravity_scale"),&RigidBody2D::set_gravity_scale); - ClassDB::bind_method(_MD("get_gravity_scale"),&RigidBody2D::get_gravity_scale); + ClassDB::bind_method(D_METHOD("set_gravity_scale","gravity_scale"),&RigidBody2D::set_gravity_scale); + ClassDB::bind_method(D_METHOD("get_gravity_scale"),&RigidBody2D::get_gravity_scale); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&RigidBody2D::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&RigidBody2D::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&RigidBody2D::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&RigidBody2D::get_linear_damp); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&RigidBody2D::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&RigidBody2D::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&RigidBody2D::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&RigidBody2D::get_angular_damp); - ClassDB::bind_method(_MD("set_linear_velocity","linear_velocity"),&RigidBody2D::set_linear_velocity); - ClassDB::bind_method(_MD("get_linear_velocity"),&RigidBody2D::get_linear_velocity); + ClassDB::bind_method(D_METHOD("set_linear_velocity","linear_velocity"),&RigidBody2D::set_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&RigidBody2D::get_linear_velocity); - ClassDB::bind_method(_MD("set_angular_velocity","angular_velocity"),&RigidBody2D::set_angular_velocity); - ClassDB::bind_method(_MD("get_angular_velocity"),&RigidBody2D::get_angular_velocity); + ClassDB::bind_method(D_METHOD("set_angular_velocity","angular_velocity"),&RigidBody2D::set_angular_velocity); + ClassDB::bind_method(D_METHOD("get_angular_velocity"),&RigidBody2D::get_angular_velocity); - ClassDB::bind_method(_MD("set_max_contacts_reported","amount"),&RigidBody2D::set_max_contacts_reported); - ClassDB::bind_method(_MD("get_max_contacts_reported"),&RigidBody2D::get_max_contacts_reported); + ClassDB::bind_method(D_METHOD("set_max_contacts_reported","amount"),&RigidBody2D::set_max_contacts_reported); + ClassDB::bind_method(D_METHOD("get_max_contacts_reported"),&RigidBody2D::get_max_contacts_reported); - ClassDB::bind_method(_MD("set_use_custom_integrator","enable"),&RigidBody2D::set_use_custom_integrator); - ClassDB::bind_method(_MD("is_using_custom_integrator"),&RigidBody2D::is_using_custom_integrator); + ClassDB::bind_method(D_METHOD("set_use_custom_integrator","enable"),&RigidBody2D::set_use_custom_integrator); + ClassDB::bind_method(D_METHOD("is_using_custom_integrator"),&RigidBody2D::is_using_custom_integrator); - ClassDB::bind_method(_MD("set_contact_monitor","enabled"),&RigidBody2D::set_contact_monitor); - ClassDB::bind_method(_MD("is_contact_monitor_enabled"),&RigidBody2D::is_contact_monitor_enabled); + ClassDB::bind_method(D_METHOD("set_contact_monitor","enabled"),&RigidBody2D::set_contact_monitor); + ClassDB::bind_method(D_METHOD("is_contact_monitor_enabled"),&RigidBody2D::is_contact_monitor_enabled); - ClassDB::bind_method(_MD("set_continuous_collision_detection_mode","mode"),&RigidBody2D::set_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("get_continuous_collision_detection_mode"),&RigidBody2D::get_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("set_continuous_collision_detection_mode","mode"),&RigidBody2D::set_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("get_continuous_collision_detection_mode"),&RigidBody2D::get_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("set_axis_velocity","axis_velocity"),&RigidBody2D::set_axis_velocity); - ClassDB::bind_method(_MD("apply_impulse","offset","impulse"),&RigidBody2D::apply_impulse); + ClassDB::bind_method(D_METHOD("set_axis_velocity","axis_velocity"),&RigidBody2D::set_axis_velocity); + ClassDB::bind_method(D_METHOD("apply_impulse","offset","impulse"),&RigidBody2D::apply_impulse); - ClassDB::bind_method(_MD("set_applied_force","force"),&RigidBody2D::set_applied_force); - ClassDB::bind_method(_MD("get_applied_force"),&RigidBody2D::get_applied_force); + ClassDB::bind_method(D_METHOD("set_applied_force","force"),&RigidBody2D::set_applied_force); + ClassDB::bind_method(D_METHOD("get_applied_force"),&RigidBody2D::get_applied_force); - ClassDB::bind_method(_MD("set_applied_torque","torque"),&RigidBody2D::set_applied_torque); - ClassDB::bind_method(_MD("get_applied_torque"),&RigidBody2D::get_applied_torque); + ClassDB::bind_method(D_METHOD("set_applied_torque","torque"),&RigidBody2D::set_applied_torque); + ClassDB::bind_method(D_METHOD("get_applied_torque"),&RigidBody2D::get_applied_torque); - ClassDB::bind_method(_MD("add_force","offset","force"),&RigidBody2D::add_force); + ClassDB::bind_method(D_METHOD("add_force","offset","force"),&RigidBody2D::add_force); - ClassDB::bind_method(_MD("set_sleeping","sleeping"),&RigidBody2D::set_sleeping); - ClassDB::bind_method(_MD("is_sleeping"),&RigidBody2D::is_sleeping); + ClassDB::bind_method(D_METHOD("set_sleeping","sleeping"),&RigidBody2D::set_sleeping); + ClassDB::bind_method(D_METHOD("is_sleeping"),&RigidBody2D::is_sleeping); - ClassDB::bind_method(_MD("set_can_sleep","able_to_sleep"),&RigidBody2D::set_can_sleep); - ClassDB::bind_method(_MD("is_able_to_sleep"),&RigidBody2D::is_able_to_sleep); + ClassDB::bind_method(D_METHOD("set_can_sleep","able_to_sleep"),&RigidBody2D::set_can_sleep); + ClassDB::bind_method(D_METHOD("is_able_to_sleep"),&RigidBody2D::is_able_to_sleep); - ClassDB::bind_method(_MD("test_motion","motion","margin","result:Physics2DTestMotionResult"),&RigidBody2D::_test_motion,DEFVAL(0.08),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("test_motion","motion","margin","result:Physics2DTestMotionResult"),&RigidBody2D::_test_motion,DEFVAL(0.08),DEFVAL(Variant())); - ClassDB::bind_method(_MD("_direct_state_changed"),&RigidBody2D::_direct_state_changed); - ClassDB::bind_method(_MD("_body_enter_tree"),&RigidBody2D::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree"),&RigidBody2D::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_direct_state_changed"),&RigidBody2D::_direct_state_changed); + ClassDB::bind_method(D_METHOD("_body_enter_tree"),&RigidBody2D::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree"),&RigidBody2D::_body_exit_tree); - ClassDB::bind_method(_MD("get_colliding_bodies"),&RigidBody2D::get_colliding_bodies); + ClassDB::bind_method(D_METHOD("get_colliding_bodies"),&RigidBody2D::get_colliding_bodies); BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:Physics2DDirectBodyState"))); @@ -1388,29 +1388,29 @@ float KinematicBody2D::get_collision_margin() const{ void KinematicBody2D::_bind_methods() { - ClassDB::bind_method(_MD("move","rel_vec"),&KinematicBody2D::move); - ClassDB::bind_method(_MD("move_to","position"),&KinematicBody2D::move_to); - ClassDB::bind_method(_MD("move_and_slide","linear_velocity","floor_normal","slope_stop_min_velocity","max_bounces"),&KinematicBody2D::move_and_slide,DEFVAL(Vector2(0,0)),DEFVAL(5),DEFVAL(4)); + ClassDB::bind_method(D_METHOD("move","rel_vec"),&KinematicBody2D::move); + ClassDB::bind_method(D_METHOD("move_to","position"),&KinematicBody2D::move_to); + ClassDB::bind_method(D_METHOD("move_and_slide","linear_velocity","floor_normal","slope_stop_min_velocity","max_bounces"),&KinematicBody2D::move_and_slide,DEFVAL(Vector2(0,0)),DEFVAL(5),DEFVAL(4)); - ClassDB::bind_method(_MD("test_move","from","rel_vec"),&KinematicBody2D::test_move); - ClassDB::bind_method(_MD("get_travel"),&KinematicBody2D::get_travel); - ClassDB::bind_method(_MD("revert_motion"),&KinematicBody2D::revert_motion); + ClassDB::bind_method(D_METHOD("test_move","from","rel_vec"),&KinematicBody2D::test_move); + ClassDB::bind_method(D_METHOD("get_travel"),&KinematicBody2D::get_travel); + ClassDB::bind_method(D_METHOD("revert_motion"),&KinematicBody2D::revert_motion); - ClassDB::bind_method(_MD("is_colliding"),&KinematicBody2D::is_colliding); + ClassDB::bind_method(D_METHOD("is_colliding"),&KinematicBody2D::is_colliding); - ClassDB::bind_method(_MD("get_collision_pos"),&KinematicBody2D::get_collision_pos); - ClassDB::bind_method(_MD("get_collision_normal"),&KinematicBody2D::get_collision_normal); - ClassDB::bind_method(_MD("get_collider_velocity"),&KinematicBody2D::get_collider_velocity); - ClassDB::bind_method(_MD("get_collider:Variant"),&KinematicBody2D::_get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&KinematicBody2D::get_collider_shape); - ClassDB::bind_method(_MD("get_collider_metadata:Variant"),&KinematicBody2D::get_collider_metadata); - ClassDB::bind_method(_MD("get_move_and_slide_colliders"),&KinematicBody2D::get_move_and_slide_colliders); - ClassDB::bind_method(_MD("is_move_and_slide_on_floor"),&KinematicBody2D::is_move_and_slide_on_floor); - ClassDB::bind_method(_MD("is_move_and_slide_on_ceiling"),&KinematicBody2D::is_move_and_slide_on_ceiling); - ClassDB::bind_method(_MD("is_move_and_slide_on_wall"),&KinematicBody2D::is_move_and_slide_on_wall); + ClassDB::bind_method(D_METHOD("get_collision_pos"),&KinematicBody2D::get_collision_pos); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&KinematicBody2D::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider_velocity"),&KinematicBody2D::get_collider_velocity); + ClassDB::bind_method(D_METHOD("get_collider:Variant"),&KinematicBody2D::_get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&KinematicBody2D::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collider_metadata:Variant"),&KinematicBody2D::get_collider_metadata); + ClassDB::bind_method(D_METHOD("get_move_and_slide_colliders"),&KinematicBody2D::get_move_and_slide_colliders); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_floor"),&KinematicBody2D::is_move_and_slide_on_floor); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_ceiling"),&KinematicBody2D::is_move_and_slide_on_ceiling); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_wall"),&KinematicBody2D::is_move_and_slide_on_wall); - ClassDB::bind_method(_MD("set_collision_margin","pixels"),&KinematicBody2D::set_collision_margin); - ClassDB::bind_method(_MD("get_collision_margin","pixels"),&KinematicBody2D::get_collision_margin); + ClassDB::bind_method(D_METHOD("set_collision_margin","pixels"),&KinematicBody2D::set_collision_margin); + ClassDB::bind_method(D_METHOD("get_collision_margin","pixels"),&KinematicBody2D::get_collision_margin); ADD_PROPERTY( PropertyInfo(Variant::REAL,"collision/margin",PROPERTY_HINT_RANGE,"0.001,256,0.001"),"set_collision_margin","get_collision_margin"); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index d71f21ba67..ec6729844b 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -333,42 +333,42 @@ Vector2 Polygon2D::get_offset() const { void Polygon2D::_bind_methods() { - ClassDB::bind_method(_MD("set_polygon","polygon"),&Polygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&Polygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&Polygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&Polygon2D::get_polygon); - ClassDB::bind_method(_MD("set_uv","uv"),&Polygon2D::set_uv); - ClassDB::bind_method(_MD("get_uv"),&Polygon2D::get_uv); + ClassDB::bind_method(D_METHOD("set_uv","uv"),&Polygon2D::set_uv); + ClassDB::bind_method(D_METHOD("get_uv"),&Polygon2D::get_uv); - ClassDB::bind_method(_MD("set_color","color"),&Polygon2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Polygon2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Polygon2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Polygon2D::get_color); - ClassDB::bind_method(_MD("set_vertex_colors","vertex_colors"),&Polygon2D::set_vertex_colors); - ClassDB::bind_method(_MD("get_vertex_colors"),&Polygon2D::get_vertex_colors); + ClassDB::bind_method(D_METHOD("set_vertex_colors","vertex_colors"),&Polygon2D::set_vertex_colors); + ClassDB::bind_method(D_METHOD("get_vertex_colors"),&Polygon2D::get_vertex_colors); - ClassDB::bind_method(_MD("set_texture","texture"),&Polygon2D::set_texture); - ClassDB::bind_method(_MD("get_texture"),&Polygon2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&Polygon2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&Polygon2D::get_texture); - ClassDB::bind_method(_MD("set_texture_offset","texture_offset"),&Polygon2D::set_texture_offset); - ClassDB::bind_method(_MD("get_texture_offset"),&Polygon2D::get_texture_offset); + ClassDB::bind_method(D_METHOD("set_texture_offset","texture_offset"),&Polygon2D::set_texture_offset); + ClassDB::bind_method(D_METHOD("get_texture_offset"),&Polygon2D::get_texture_offset); - ClassDB::bind_method(_MD("set_texture_rotation","texture_rotation"),&Polygon2D::set_texture_rotation); - ClassDB::bind_method(_MD("get_texture_rotation"),&Polygon2D::get_texture_rotation); + ClassDB::bind_method(D_METHOD("set_texture_rotation","texture_rotation"),&Polygon2D::set_texture_rotation); + ClassDB::bind_method(D_METHOD("get_texture_rotation"),&Polygon2D::get_texture_rotation); - ClassDB::bind_method(_MD("_set_texture_rotationd","texture_rotation"),&Polygon2D::_set_texture_rotationd); - ClassDB::bind_method(_MD("_get_texture_rotationd"),&Polygon2D::_get_texture_rotationd); + ClassDB::bind_method(D_METHOD("_set_texture_rotationd","texture_rotation"),&Polygon2D::_set_texture_rotationd); + ClassDB::bind_method(D_METHOD("_get_texture_rotationd"),&Polygon2D::_get_texture_rotationd); - ClassDB::bind_method(_MD("set_texture_scale","texture_scale"),&Polygon2D::set_texture_scale); - ClassDB::bind_method(_MD("get_texture_scale"),&Polygon2D::get_texture_scale); + ClassDB::bind_method(D_METHOD("set_texture_scale","texture_scale"),&Polygon2D::set_texture_scale); + ClassDB::bind_method(D_METHOD("get_texture_scale"),&Polygon2D::get_texture_scale); - ClassDB::bind_method(_MD("set_invert","invert"),&Polygon2D::set_invert); - ClassDB::bind_method(_MD("get_invert"),&Polygon2D::get_invert); + ClassDB::bind_method(D_METHOD("set_invert","invert"),&Polygon2D::set_invert); + ClassDB::bind_method(D_METHOD("get_invert"),&Polygon2D::get_invert); - ClassDB::bind_method(_MD("set_invert_border","invert_border"),&Polygon2D::set_invert_border); - ClassDB::bind_method(_MD("get_invert_border"),&Polygon2D::get_invert_border); + ClassDB::bind_method(D_METHOD("set_invert_border","invert_border"),&Polygon2D::set_invert_border); + ClassDB::bind_method(D_METHOD("get_invert_border"),&Polygon2D::get_invert_border); - ClassDB::bind_method(_MD("set_offset","offset"),&Polygon2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Polygon2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Polygon2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Polygon2D::get_offset); diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index 2fa2dac8bb..72247811dc 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -263,36 +263,36 @@ void RayCast2D::clear_exceptions(){ void RayCast2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&RayCast2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&RayCast2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&RayCast2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&RayCast2D::is_enabled); - ClassDB::bind_method(_MD("set_cast_to","local_point"),&RayCast2D::set_cast_to); - ClassDB::bind_method(_MD("get_cast_to"),&RayCast2D::get_cast_to); + ClassDB::bind_method(D_METHOD("set_cast_to","local_point"),&RayCast2D::set_cast_to); + ClassDB::bind_method(D_METHOD("get_cast_to"),&RayCast2D::get_cast_to); - ClassDB::bind_method(_MD("is_colliding"),&RayCast2D::is_colliding); - ClassDB::bind_method(_MD("force_raycast_update"),&RayCast2D::force_raycast_update); + ClassDB::bind_method(D_METHOD("is_colliding"),&RayCast2D::is_colliding); + ClassDB::bind_method(D_METHOD("force_raycast_update"),&RayCast2D::force_raycast_update); - ClassDB::bind_method(_MD("get_collider"),&RayCast2D::get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&RayCast2D::get_collider_shape); - ClassDB::bind_method(_MD("get_collision_point"),&RayCast2D::get_collision_point); - ClassDB::bind_method(_MD("get_collision_normal"),&RayCast2D::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider"),&RayCast2D::get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&RayCast2D::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collision_point"),&RayCast2D::get_collision_point); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&RayCast2D::get_collision_normal); - ClassDB::bind_method(_MD("add_exception_rid","rid"),&RayCast2D::add_exception_rid); - ClassDB::bind_method(_MD("add_exception","node"),&RayCast2D::add_exception); + ClassDB::bind_method(D_METHOD("add_exception_rid","rid"),&RayCast2D::add_exception_rid); + ClassDB::bind_method(D_METHOD("add_exception","node"),&RayCast2D::add_exception); - ClassDB::bind_method(_MD("remove_exception_rid","rid"),&RayCast2D::remove_exception_rid); - ClassDB::bind_method(_MD("remove_exception","node"),&RayCast2D::remove_exception); + ClassDB::bind_method(D_METHOD("remove_exception_rid","rid"),&RayCast2D::remove_exception_rid); + ClassDB::bind_method(D_METHOD("remove_exception","node"),&RayCast2D::remove_exception); - ClassDB::bind_method(_MD("clear_exceptions"),&RayCast2D::clear_exceptions); + ClassDB::bind_method(D_METHOD("clear_exceptions"),&RayCast2D::clear_exceptions); - ClassDB::bind_method(_MD("set_layer_mask","mask"),&RayCast2D::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&RayCast2D::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","mask"),&RayCast2D::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&RayCast2D::get_layer_mask); - ClassDB::bind_method(_MD("set_type_mask","mask"),&RayCast2D::set_type_mask); - ClassDB::bind_method(_MD("get_type_mask"),&RayCast2D::get_type_mask); + ClassDB::bind_method(D_METHOD("set_type_mask","mask"),&RayCast2D::set_type_mask); + ClassDB::bind_method(D_METHOD("get_type_mask"),&RayCast2D::get_type_mask); - ClassDB::bind_method(_MD("set_exclude_parent_body","mask"),&RayCast2D::set_exclude_parent_body); - ClassDB::bind_method(_MD("get_exclude_parent_body"),&RayCast2D::get_exclude_parent_body); + ClassDB::bind_method(D_METHOD("set_exclude_parent_body","mask"),&RayCast2D::set_exclude_parent_body); + ClassDB::bind_method(D_METHOD("get_exclude_parent_body"),&RayCast2D::get_exclude_parent_body); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"exclude_parent"),"set_exclude_parent_body","get_exclude_parent_body"); diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index 90d8879f42..e1f360c0c1 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -118,8 +118,8 @@ String RemoteTransform2D::get_configuration_warning() const { void RemoteTransform2D::_bind_methods() { - ClassDB::bind_method(_MD("set_remote_node","path"),&RemoteTransform2D::set_remote_node); - ClassDB::bind_method(_MD("get_remote_node"),&RemoteTransform2D::get_remote_node); + ClassDB::bind_method(D_METHOD("set_remote_node","path"),&RemoteTransform2D::set_remote_node); + ClassDB::bind_method(D_METHOD("get_remote_node"),&RemoteTransform2D::get_remote_node); ADD_PROPERTY( PropertyInfo(Variant::NODE_PATH,"remote_path"),"set_remote_node","get_remote_node"); } diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index 8fc76247c5..efe23e67f2 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -359,33 +359,33 @@ bool TouchScreenButton::is_passby_press_enabled() const{ void TouchScreenButton::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture"),&TouchScreenButton::set_texture); - ClassDB::bind_method(_MD("get_texture"),&TouchScreenButton::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&TouchScreenButton::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&TouchScreenButton::get_texture); - ClassDB::bind_method(_MD("set_texture_pressed","texture_pressed"),&TouchScreenButton::set_texture_pressed); - ClassDB::bind_method(_MD("get_texture_pressed"),&TouchScreenButton::get_texture_pressed); + ClassDB::bind_method(D_METHOD("set_texture_pressed","texture_pressed"),&TouchScreenButton::set_texture_pressed); + ClassDB::bind_method(D_METHOD("get_texture_pressed"),&TouchScreenButton::get_texture_pressed); - ClassDB::bind_method(_MD("set_bitmask","bitmask"),&TouchScreenButton::set_bitmask); - ClassDB::bind_method(_MD("get_bitmask"),&TouchScreenButton::get_bitmask); + ClassDB::bind_method(D_METHOD("set_bitmask","bitmask"),&TouchScreenButton::set_bitmask); + ClassDB::bind_method(D_METHOD("get_bitmask"),&TouchScreenButton::get_bitmask); - ClassDB::bind_method(_MD("set_shape","shape"),&TouchScreenButton::set_shape); - ClassDB::bind_method(_MD("get_shape"),&TouchScreenButton::get_shape); + ClassDB::bind_method(D_METHOD("set_shape","shape"),&TouchScreenButton::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&TouchScreenButton::get_shape); - ClassDB::bind_method(_MD("set_shape_centered","bool"),&TouchScreenButton::set_shape_centered); - ClassDB::bind_method(_MD("is_shape_centered"),&TouchScreenButton::is_shape_centered); + ClassDB::bind_method(D_METHOD("set_shape_centered","bool"),&TouchScreenButton::set_shape_centered); + ClassDB::bind_method(D_METHOD("is_shape_centered"),&TouchScreenButton::is_shape_centered); - ClassDB::bind_method(_MD("set_action","action"),&TouchScreenButton::set_action); - ClassDB::bind_method(_MD("get_action"),&TouchScreenButton::get_action); + ClassDB::bind_method(D_METHOD("set_action","action"),&TouchScreenButton::set_action); + ClassDB::bind_method(D_METHOD("get_action"),&TouchScreenButton::get_action); - ClassDB::bind_method(_MD("set_visibility_mode","mode"),&TouchScreenButton::set_visibility_mode); - ClassDB::bind_method(_MD("get_visibility_mode"),&TouchScreenButton::get_visibility_mode); + ClassDB::bind_method(D_METHOD("set_visibility_mode","mode"),&TouchScreenButton::set_visibility_mode); + ClassDB::bind_method(D_METHOD("get_visibility_mode"),&TouchScreenButton::get_visibility_mode); - ClassDB::bind_method(_MD("set_passby_press","enabled"),&TouchScreenButton::set_passby_press); - ClassDB::bind_method(_MD("is_passby_press_enabled"),&TouchScreenButton::is_passby_press_enabled); + ClassDB::bind_method(D_METHOD("set_passby_press","enabled"),&TouchScreenButton::set_passby_press); + ClassDB::bind_method(D_METHOD("is_passby_press_enabled"),&TouchScreenButton::is_passby_press_enabled); - ClassDB::bind_method(_MD("is_pressed"),&TouchScreenButton::is_pressed); + ClassDB::bind_method(D_METHOD("is_pressed"),&TouchScreenButton::is_pressed); - ClassDB::bind_method(_MD("_input"),&TouchScreenButton::_input); + ClassDB::bind_method(D_METHOD("_input"),&TouchScreenButton::_input); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),"set_texture","get_texture"); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"pressed",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),"set_texture_pressed","get_texture_pressed"); diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index b8a0a2dcd1..26c2756acd 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -294,35 +294,35 @@ void Sprite::_validate_property(PropertyInfo& property) const { void Sprite::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&Sprite::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture:Texture"),&Sprite::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&Sprite::get_texture); - ClassDB::bind_method(_MD("set_centered","centered"),&Sprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&Sprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&Sprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&Sprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&Sprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Sprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Sprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Sprite::get_offset); - ClassDB::bind_method(_MD("set_flip_h","flip_h"),&Sprite::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&Sprite::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","flip_h"),&Sprite::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&Sprite::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","flip_v"),&Sprite::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&Sprite::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","flip_v"),&Sprite::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&Sprite::is_flipped_v); - ClassDB::bind_method(_MD("set_region","enabled"),&Sprite::set_region); - ClassDB::bind_method(_MD("is_region"),&Sprite::is_region); + ClassDB::bind_method(D_METHOD("set_region","enabled"),&Sprite::set_region); + ClassDB::bind_method(D_METHOD("is_region"),&Sprite::is_region); - ClassDB::bind_method(_MD("set_region_rect","rect"),&Sprite::set_region_rect); - ClassDB::bind_method(_MD("get_region_rect"),&Sprite::get_region_rect); + ClassDB::bind_method(D_METHOD("set_region_rect","rect"),&Sprite::set_region_rect); + ClassDB::bind_method(D_METHOD("get_region_rect"),&Sprite::get_region_rect); - ClassDB::bind_method(_MD("set_frame","frame"),&Sprite::set_frame); - ClassDB::bind_method(_MD("get_frame"),&Sprite::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&Sprite::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&Sprite::get_frame); - ClassDB::bind_method(_MD("set_vframes","vframes"),&Sprite::set_vframes); - ClassDB::bind_method(_MD("get_vframes"),&Sprite::get_vframes); + ClassDB::bind_method(D_METHOD("set_vframes","vframes"),&Sprite::set_vframes); + ClassDB::bind_method(D_METHOD("get_vframes"),&Sprite::get_vframes); - ClassDB::bind_method(_MD("set_hframes","hframes"),&Sprite::set_hframes); - ClassDB::bind_method(_MD("get_hframes"),&Sprite::get_hframes); + ClassDB::bind_method(D_METHOD("set_hframes","hframes"),&Sprite::set_hframes); + ClassDB::bind_method(D_METHOD("get_hframes"),&Sprite::get_hframes); ADD_SIGNAL(MethodInfo("frame_changed")); ADD_SIGNAL(MethodInfo("texture_changed")); @@ -552,17 +552,17 @@ String ViewportSprite::get_configuration_warning() const { void ViewportSprite::_bind_methods() { - ClassDB::bind_method(_MD("set_viewport_path","path"),&ViewportSprite::set_viewport_path); - ClassDB::bind_method(_MD("get_viewport_path"),&ViewportSprite::get_viewport_path); + ClassDB::bind_method(D_METHOD("set_viewport_path","path"),&ViewportSprite::set_viewport_path); + ClassDB::bind_method(D_METHOD("get_viewport_path"),&ViewportSprite::get_viewport_path); - ClassDB::bind_method(_MD("set_centered","centered"),&ViewportSprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&ViewportSprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&ViewportSprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&ViewportSprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&ViewportSprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&ViewportSprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&ViewportSprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&ViewportSprite::get_offset); - ClassDB::bind_method(_MD("set_modulate","modulate"),&ViewportSprite::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&ViewportSprite::get_modulate); + ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&ViewportSprite::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&ViewportSprite::get_modulate); ADD_PROPERTYNZ( PropertyInfo( Variant::NODE_PATH, "viewport"), "set_viewport_path","get_viewport_path"); ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "centered"), "set_centered","is_centered"); diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index be4661fc3f..5de0b93ed9 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -1189,78 +1189,78 @@ void TileMap::set_light_mask(int p_light_mask) { void TileMap::_bind_methods() { - ClassDB::bind_method(_MD("set_tileset","tileset:TileSet"),&TileMap::set_tileset); - ClassDB::bind_method(_MD("get_tileset:TileSet"),&TileMap::get_tileset); + ClassDB::bind_method(D_METHOD("set_tileset","tileset:TileSet"),&TileMap::set_tileset); + ClassDB::bind_method(D_METHOD("get_tileset:TileSet"),&TileMap::get_tileset); - ClassDB::bind_method(_MD("set_mode","mode"),&TileMap::set_mode); - ClassDB::bind_method(_MD("get_mode"),&TileMap::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&TileMap::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&TileMap::get_mode); - ClassDB::bind_method(_MD("set_half_offset","half_offset"),&TileMap::set_half_offset); - ClassDB::bind_method(_MD("get_half_offset"),&TileMap::get_half_offset); + ClassDB::bind_method(D_METHOD("set_half_offset","half_offset"),&TileMap::set_half_offset); + ClassDB::bind_method(D_METHOD("get_half_offset"),&TileMap::get_half_offset); - ClassDB::bind_method(_MD("set_custom_transform","custom_transform"),&TileMap::set_custom_transform); - ClassDB::bind_method(_MD("get_custom_transform"),&TileMap::get_custom_transform); + ClassDB::bind_method(D_METHOD("set_custom_transform","custom_transform"),&TileMap::set_custom_transform); + ClassDB::bind_method(D_METHOD("get_custom_transform"),&TileMap::get_custom_transform); - ClassDB::bind_method(_MD("set_cell_size","size"),&TileMap::set_cell_size); - ClassDB::bind_method(_MD("get_cell_size"),&TileMap::get_cell_size); + ClassDB::bind_method(D_METHOD("set_cell_size","size"),&TileMap::set_cell_size); + ClassDB::bind_method(D_METHOD("get_cell_size"),&TileMap::get_cell_size); - ClassDB::bind_method(_MD("_set_old_cell_size","size"),&TileMap::_set_old_cell_size); - ClassDB::bind_method(_MD("_get_old_cell_size"),&TileMap::_get_old_cell_size); + ClassDB::bind_method(D_METHOD("_set_old_cell_size","size"),&TileMap::_set_old_cell_size); + ClassDB::bind_method(D_METHOD("_get_old_cell_size"),&TileMap::_get_old_cell_size); - ClassDB::bind_method(_MD("set_quadrant_size","size"),&TileMap::set_quadrant_size); - ClassDB::bind_method(_MD("get_quadrant_size"),&TileMap::get_quadrant_size); + ClassDB::bind_method(D_METHOD("set_quadrant_size","size"),&TileMap::set_quadrant_size); + ClassDB::bind_method(D_METHOD("get_quadrant_size"),&TileMap::get_quadrant_size); - ClassDB::bind_method(_MD("set_tile_origin","origin"),&TileMap::set_tile_origin); - ClassDB::bind_method(_MD("get_tile_origin"),&TileMap::get_tile_origin); + ClassDB::bind_method(D_METHOD("set_tile_origin","origin"),&TileMap::set_tile_origin); + ClassDB::bind_method(D_METHOD("get_tile_origin"),&TileMap::get_tile_origin); - ClassDB::bind_method(_MD("set_center_x","enable"),&TileMap::set_center_x); - ClassDB::bind_method(_MD("get_center_x"),&TileMap::get_center_x); + ClassDB::bind_method(D_METHOD("set_center_x","enable"),&TileMap::set_center_x); + ClassDB::bind_method(D_METHOD("get_center_x"),&TileMap::get_center_x); - ClassDB::bind_method(_MD("set_center_y","enable"),&TileMap::set_center_y); - ClassDB::bind_method(_MD("get_center_y"),&TileMap::get_center_y); + ClassDB::bind_method(D_METHOD("set_center_y","enable"),&TileMap::set_center_y); + ClassDB::bind_method(D_METHOD("get_center_y"),&TileMap::get_center_y); - ClassDB::bind_method(_MD("set_y_sort_mode","enable"),&TileMap::set_y_sort_mode); - ClassDB::bind_method(_MD("is_y_sort_mode_enabled"),&TileMap::is_y_sort_mode_enabled); + ClassDB::bind_method(D_METHOD("set_y_sort_mode","enable"),&TileMap::set_y_sort_mode); + ClassDB::bind_method(D_METHOD("is_y_sort_mode_enabled"),&TileMap::is_y_sort_mode_enabled); - ClassDB::bind_method(_MD("set_collision_use_kinematic","use_kinematic"),&TileMap::set_collision_use_kinematic); - ClassDB::bind_method(_MD("get_collision_use_kinematic"),&TileMap::get_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("set_collision_use_kinematic","use_kinematic"),&TileMap::set_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("get_collision_use_kinematic"),&TileMap::get_collision_use_kinematic); - ClassDB::bind_method(_MD("set_collision_layer","mask"),&TileMap::set_collision_layer); - ClassDB::bind_method(_MD("get_collision_layer"),&TileMap::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_layer","mask"),&TileMap::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"),&TileMap::get_collision_layer); - ClassDB::bind_method(_MD("set_collision_mask","mask"),&TileMap::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&TileMap::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&TileMap::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&TileMap::get_collision_mask); - ClassDB::bind_method(_MD("set_collision_friction","value"),&TileMap::set_collision_friction); - ClassDB::bind_method(_MD("get_collision_friction"),&TileMap::get_collision_friction); + ClassDB::bind_method(D_METHOD("set_collision_friction","value"),&TileMap::set_collision_friction); + ClassDB::bind_method(D_METHOD("get_collision_friction"),&TileMap::get_collision_friction); - ClassDB::bind_method(_MD("set_collision_bounce","value"),&TileMap::set_collision_bounce); - ClassDB::bind_method(_MD("get_collision_bounce"),&TileMap::get_collision_bounce); + ClassDB::bind_method(D_METHOD("set_collision_bounce","value"),&TileMap::set_collision_bounce); + ClassDB::bind_method(D_METHOD("get_collision_bounce"),&TileMap::get_collision_bounce); - ClassDB::bind_method(_MD("set_occluder_light_mask","mask"),&TileMap::set_occluder_light_mask); - ClassDB::bind_method(_MD("get_occluder_light_mask"),&TileMap::get_occluder_light_mask); + ClassDB::bind_method(D_METHOD("set_occluder_light_mask","mask"),&TileMap::set_occluder_light_mask); + ClassDB::bind_method(D_METHOD("get_occluder_light_mask"),&TileMap::get_occluder_light_mask); - ClassDB::bind_method(_MD("set_cell","x","y","tile","flip_x","flip_y","transpose"),&TileMap::set_cell,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("set_cellv","pos","tile","flip_x","flip_y","transpose"),&TileMap::set_cellv,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("get_cell","x","y"),&TileMap::get_cell); - ClassDB::bind_method(_MD("get_cellv","pos"),&TileMap::get_cellv); - ClassDB::bind_method(_MD("is_cell_x_flipped","x","y"),&TileMap::is_cell_x_flipped); - ClassDB::bind_method(_MD("is_cell_y_flipped","x","y"),&TileMap::is_cell_y_flipped); - ClassDB::bind_method(_MD("is_cell_transposed","x","y"),&TileMap::is_cell_transposed); + ClassDB::bind_method(D_METHOD("set_cell","x","y","tile","flip_x","flip_y","transpose"),&TileMap::set_cell,DEFVAL(false),DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_cellv","pos","tile","flip_x","flip_y","transpose"),&TileMap::set_cellv,DEFVAL(false),DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_cell","x","y"),&TileMap::get_cell); + ClassDB::bind_method(D_METHOD("get_cellv","pos"),&TileMap::get_cellv); + ClassDB::bind_method(D_METHOD("is_cell_x_flipped","x","y"),&TileMap::is_cell_x_flipped); + ClassDB::bind_method(D_METHOD("is_cell_y_flipped","x","y"),&TileMap::is_cell_y_flipped); + ClassDB::bind_method(D_METHOD("is_cell_transposed","x","y"),&TileMap::is_cell_transposed); - ClassDB::bind_method(_MD("clear"),&TileMap::clear); + ClassDB::bind_method(D_METHOD("clear"),&TileMap::clear); - ClassDB::bind_method(_MD("get_used_cells"),&TileMap::get_used_cells); + ClassDB::bind_method(D_METHOD("get_used_cells"),&TileMap::get_used_cells); - ClassDB::bind_method(_MD("map_to_world","mappos","ignore_half_ofs"),&TileMap::map_to_world,DEFVAL(false)); - ClassDB::bind_method(_MD("world_to_map","worldpos"),&TileMap::world_to_map); + ClassDB::bind_method(D_METHOD("map_to_world","mappos","ignore_half_ofs"),&TileMap::map_to_world,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("world_to_map","worldpos"),&TileMap::world_to_map); - ClassDB::bind_method(_MD("_clear_quadrants"),&TileMap::_clear_quadrants); - ClassDB::bind_method(_MD("_recreate_quadrants"),&TileMap::_recreate_quadrants); - ClassDB::bind_method(_MD("_update_dirty_quadrants"),&TileMap::_update_dirty_quadrants); + ClassDB::bind_method(D_METHOD("_clear_quadrants"),&TileMap::_clear_quadrants); + ClassDB::bind_method(D_METHOD("_recreate_quadrants"),&TileMap::_recreate_quadrants); + ClassDB::bind_method(D_METHOD("_update_dirty_quadrants"),&TileMap::_update_dirty_quadrants); - ClassDB::bind_method(_MD("_set_tile_data"),&TileMap::_set_tile_data); - ClassDB::bind_method(_MD("_get_tile_data"),&TileMap::_get_tile_data); + ClassDB::bind_method(D_METHOD("_set_tile_data"),&TileMap::_set_tile_data); + ClassDB::bind_method(D_METHOD("_get_tile_data"),&TileMap::_get_tile_data); ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Square,Isometric,Custom"),"set_mode","get_mode"); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"tile_set",PROPERTY_HINT_RESOURCE_TYPE,"TileSet"),"set_tileset","get_tileset"); diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index 1068c83d97..64ab333e48 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -129,9 +129,9 @@ bool VisibilityNotifier2D::is_on_screen() const { void VisibilityNotifier2D::_bind_methods(){ - ClassDB::bind_method(_MD("set_rect","rect"),&VisibilityNotifier2D::set_rect); - ClassDB::bind_method(_MD("get_rect"),&VisibilityNotifier2D::get_rect); - ClassDB::bind_method(_MD("is_on_screen"),&VisibilityNotifier2D::is_on_screen); + ClassDB::bind_method(D_METHOD("set_rect","rect"),&VisibilityNotifier2D::set_rect); + ClassDB::bind_method(D_METHOD("get_rect"),&VisibilityNotifier2D::get_rect); + ClassDB::bind_method(D_METHOD("is_on_screen"),&VisibilityNotifier2D::is_on_screen); ADD_PROPERTY( PropertyInfo(Variant::RECT2,"rect"),"set_rect","get_rect"); @@ -355,9 +355,9 @@ String VisibilityEnabler2D::get_configuration_warning() const { void VisibilityEnabler2D::_bind_methods(){ - ClassDB::bind_method(_MD("set_enabler","enabler","enabled"),&VisibilityEnabler2D::set_enabler); - ClassDB::bind_method(_MD("is_enabler_enabled","enabler"),&VisibilityEnabler2D::is_enabler_enabled); - ClassDB::bind_method(_MD("_node_removed"),&VisibilityEnabler2D::_node_removed); + ClassDB::bind_method(D_METHOD("set_enabler","enabler","enabled"),&VisibilityEnabler2D::set_enabler); + ClassDB::bind_method(D_METHOD("is_enabler_enabled","enabler"),&VisibilityEnabler2D::is_enabler_enabled); + ClassDB::bind_method(D_METHOD("_node_removed"),&VisibilityEnabler2D::_node_removed); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"pause_animations"),"set_enabler","is_enabler_enabled", ENABLER_PAUSE_ANIMATIONS ); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"freeze_bodies"),"set_enabler","is_enabler_enabled", ENABLER_FREEZE_BODIES); diff --git a/scene/2d/y_sort.cpp b/scene/2d/y_sort.cpp index bcef093ef5..cb9a494e87 100644 --- a/scene/2d/y_sort.cpp +++ b/scene/2d/y_sort.cpp @@ -43,8 +43,8 @@ bool YSort::is_sort_enabled() const { void YSort::_bind_methods() { - ClassDB::bind_method(_MD("set_sort_enabled","enabled"),&YSort::set_sort_enabled); - ClassDB::bind_method(_MD("is_sort_enabled"),&YSort::is_sort_enabled); + ClassDB::bind_method(D_METHOD("set_sort_enabled","enabled"),&YSort::set_sort_enabled); + ClassDB::bind_method(D_METHOD("is_sort_enabled"),&YSort::is_sort_enabled); ADD_GROUP("Sort","sort_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"sort_enabled"),"set_sort_enabled","is_sort_enabled"); diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 2511992057..92ac091fc5 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -576,63 +576,63 @@ bool Area::get_layer_mask_bit(int p_bit) const{ void Area::_bind_methods() { - ClassDB::bind_method(_MD("_body_enter_tree","id"),&Area::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree","id"),&Area::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_body_enter_tree","id"),&Area::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree","id"),&Area::_body_exit_tree); - ClassDB::bind_method(_MD("_area_enter_tree","id"),&Area::_area_enter_tree); - ClassDB::bind_method(_MD("_area_exit_tree","id"),&Area::_area_exit_tree); + ClassDB::bind_method(D_METHOD("_area_enter_tree","id"),&Area::_area_enter_tree); + ClassDB::bind_method(D_METHOD("_area_exit_tree","id"),&Area::_area_exit_tree); - ClassDB::bind_method(_MD("set_space_override_mode","enable"),&Area::set_space_override_mode); - ClassDB::bind_method(_MD("get_space_override_mode"),&Area::get_space_override_mode); + ClassDB::bind_method(D_METHOD("set_space_override_mode","enable"),&Area::set_space_override_mode); + ClassDB::bind_method(D_METHOD("get_space_override_mode"),&Area::get_space_override_mode); - ClassDB::bind_method(_MD("set_gravity_is_point","enable"),&Area::set_gravity_is_point); - ClassDB::bind_method(_MD("is_gravity_a_point"),&Area::is_gravity_a_point); + ClassDB::bind_method(D_METHOD("set_gravity_is_point","enable"),&Area::set_gravity_is_point); + ClassDB::bind_method(D_METHOD("is_gravity_a_point"),&Area::is_gravity_a_point); - ClassDB::bind_method(_MD("set_gravity_distance_scale","distance_scale"),&Area::set_gravity_distance_scale); - ClassDB::bind_method(_MD("get_gravity_distance_scale"),&Area::get_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("set_gravity_distance_scale","distance_scale"),&Area::set_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("get_gravity_distance_scale"),&Area::get_gravity_distance_scale); - ClassDB::bind_method(_MD("set_gravity_vector","vector"),&Area::set_gravity_vector); - ClassDB::bind_method(_MD("get_gravity_vector"),&Area::get_gravity_vector); + ClassDB::bind_method(D_METHOD("set_gravity_vector","vector"),&Area::set_gravity_vector); + ClassDB::bind_method(D_METHOD("get_gravity_vector"),&Area::get_gravity_vector); - ClassDB::bind_method(_MD("set_gravity","gravity"),&Area::set_gravity); - ClassDB::bind_method(_MD("get_gravity"),&Area::get_gravity); + ClassDB::bind_method(D_METHOD("set_gravity","gravity"),&Area::set_gravity); + ClassDB::bind_method(D_METHOD("get_gravity"),&Area::get_gravity); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&Area::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&Area::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&Area::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&Area::get_angular_damp); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&Area::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&Area::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&Area::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&Area::get_linear_damp); - ClassDB::bind_method(_MD("set_priority","priority"),&Area::set_priority); - ClassDB::bind_method(_MD("get_priority"),&Area::get_priority); + ClassDB::bind_method(D_METHOD("set_priority","priority"),&Area::set_priority); + ClassDB::bind_method(D_METHOD("get_priority"),&Area::get_priority); - ClassDB::bind_method(_MD("set_collision_mask","collision_mask"),&Area::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&Area::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","collision_mask"),&Area::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&Area::get_collision_mask); - ClassDB::bind_method(_MD("set_layer_mask","layer_mask"),&Area::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&Area::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","layer_mask"),&Area::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&Area::get_layer_mask); - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&Area::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&Area::get_collision_mask_bit); + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&Area::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&Area::get_collision_mask_bit); - ClassDB::bind_method(_MD("set_layer_mask_bit","bit","value"),&Area::set_layer_mask_bit); - ClassDB::bind_method(_MD("get_layer_mask_bit","bit"),&Area::get_layer_mask_bit); + ClassDB::bind_method(D_METHOD("set_layer_mask_bit","bit","value"),&Area::set_layer_mask_bit); + ClassDB::bind_method(D_METHOD("get_layer_mask_bit","bit"),&Area::get_layer_mask_bit); - ClassDB::bind_method(_MD("set_monitorable","enable"),&Area::set_monitorable); - ClassDB::bind_method(_MD("is_monitorable"),&Area::is_monitorable); + ClassDB::bind_method(D_METHOD("set_monitorable","enable"),&Area::set_monitorable); + ClassDB::bind_method(D_METHOD("is_monitorable"),&Area::is_monitorable); - ClassDB::bind_method(_MD("set_monitoring","enable"),&Area::set_monitoring); - ClassDB::bind_method(_MD("is_monitoring"),&Area::is_monitoring); + ClassDB::bind_method(D_METHOD("set_monitoring","enable"),&Area::set_monitoring); + ClassDB::bind_method(D_METHOD("is_monitoring"),&Area::is_monitoring); - ClassDB::bind_method(_MD("get_overlapping_bodies"),&Area::get_overlapping_bodies); - ClassDB::bind_method(_MD("get_overlapping_areas"),&Area::get_overlapping_areas); + ClassDB::bind_method(D_METHOD("get_overlapping_bodies"),&Area::get_overlapping_bodies); + ClassDB::bind_method(D_METHOD("get_overlapping_areas"),&Area::get_overlapping_areas); - ClassDB::bind_method(_MD("overlaps_body","body"),&Area::overlaps_body); - ClassDB::bind_method(_MD("overlaps_area","area"),&Area::overlaps_area); + ClassDB::bind_method(D_METHOD("overlaps_body","body"),&Area::overlaps_body); + ClassDB::bind_method(D_METHOD("overlaps_area","area"),&Area::overlaps_area); - ClassDB::bind_method(_MD("_body_inout"),&Area::_body_inout); - ClassDB::bind_method(_MD("_area_inout"),&Area::_area_inout); + ClassDB::bind_method(D_METHOD("_body_inout"),&Area::_body_inout); + ClassDB::bind_method(D_METHOD("_area_inout"),&Area::_area_inout); ADD_SIGNAL( MethodInfo("body_shape_entered",PropertyInfo(Variant::INT,"body_id"),PropertyInfo(Variant::OBJECT,"body"),PropertyInfo(Variant::INT,"body_shape"),PropertyInfo(Variant::INT,"area_shape"))); diff --git a/scene/3d/baked_light_instance.cpp b/scene/3d/baked_light_instance.cpp index 884ac7ec9a..e20d8faafd 100644 --- a/scene/3d/baked_light_instance.cpp +++ b/scene/3d/baked_light_instance.cpp @@ -1718,23 +1718,23 @@ void BakedLight::_debug_mesh_light() { void BakedLight::_bind_methods() { - ClassDB::bind_method(_MD("set_cell_subdiv","steps"),&BakedLight::set_cell_subdiv); - ClassDB::bind_method(_MD("get_cell_subdiv"),&BakedLight::get_cell_subdiv); + ClassDB::bind_method(D_METHOD("set_cell_subdiv","steps"),&BakedLight::set_cell_subdiv); + ClassDB::bind_method(D_METHOD("get_cell_subdiv"),&BakedLight::get_cell_subdiv); - ClassDB::bind_method(_MD("bake"),&BakedLight::bake); + ClassDB::bind_method(D_METHOD("bake"),&BakedLight::bake); ClassDB::set_method_flags(get_class_static(),_scs_create("bake"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("bake_lights"),&BakedLight::bake_lights); + ClassDB::bind_method(D_METHOD("bake_lights"),&BakedLight::bake_lights); ClassDB::set_method_flags(get_class_static(),_scs_create("bake_lights"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("bake_radiance"),&BakedLight::bake_radiance); + ClassDB::bind_method(D_METHOD("bake_radiance"),&BakedLight::bake_radiance); ClassDB::set_method_flags(get_class_static(),_scs_create("bake_radiance"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("debug_mesh_albedo"),&BakedLight::_debug_mesh_albedo); + ClassDB::bind_method(D_METHOD("debug_mesh_albedo"),&BakedLight::_debug_mesh_albedo); ClassDB::set_method_flags(get_class_static(),_scs_create("debug_mesh_albedo"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("debug_mesh_light"),&BakedLight::_debug_mesh_light); + ClassDB::bind_method(D_METHOD("debug_mesh_light"),&BakedLight::_debug_mesh_light); ClassDB::set_method_flags(get_class_static(),_scs_create("debug_mesh_light"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); ADD_PROPERTY(PropertyInfo(Variant::INT,"cell_subdiv"),"set_cell_subdiv","get_cell_subdiv"); @@ -1797,11 +1797,11 @@ DVector<Face3> BakedLightSampler::get_faces(uint32_t p_usage_flags) const { void BakedLightSampler::_bind_methods() { - ClassDB::bind_method(_MD("set_param","param","value"),&BakedLightSampler::set_param); - ClassDB::bind_method(_MD("get_param","param"),&BakedLightSampler::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&BakedLightSampler::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&BakedLightSampler::get_param); - ClassDB::bind_method(_MD("set_resolution","resolution"),&BakedLightSampler::set_resolution); - ClassDB::bind_method(_MD("get_resolution"),&BakedLightSampler::get_resolution); + ClassDB::bind_method(D_METHOD("set_resolution","resolution"),&BakedLightSampler::set_resolution); + ClassDB::bind_method(D_METHOD("get_resolution"),&BakedLightSampler::get_resolution); BIND_CONSTANT( PARAM_RADIUS ); diff --git a/scene/3d/body_shape.cpp b/scene/3d/body_shape.cpp index 849c78973a..af3fe3c0a4 100644 --- a/scene/3d/body_shape.cpp +++ b/scene/3d/body_shape.cpp @@ -414,18 +414,18 @@ String CollisionShape::get_configuration_warning() const { void CollisionShape::_bind_methods() { //not sure if this should do anything - ClassDB::bind_method(_MD("resource_changed","resource"),&CollisionShape::resource_changed); - ClassDB::bind_method(_MD("set_shape","shape"),&CollisionShape::set_shape); - ClassDB::bind_method(_MD("get_shape"),&CollisionShape::get_shape); - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionShape::_add_to_collision_object); - ClassDB::bind_method(_MD("set_trigger","enable"),&CollisionShape::set_trigger); - ClassDB::bind_method(_MD("is_trigger"),&CollisionShape::is_trigger); - ClassDB::bind_method(_MD("make_convex_from_brothers"),&CollisionShape::make_convex_from_brothers); + ClassDB::bind_method(D_METHOD("resource_changed","resource"),&CollisionShape::resource_changed); + ClassDB::bind_method(D_METHOD("set_shape","shape"),&CollisionShape::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&CollisionShape::get_shape); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionShape::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("set_trigger","enable"),&CollisionShape::set_trigger); + ClassDB::bind_method(D_METHOD("is_trigger"),&CollisionShape::is_trigger); + ClassDB::bind_method(D_METHOD("make_convex_from_brothers"),&CollisionShape::make_convex_from_brothers); ClassDB::set_method_flags("CollisionShape","make_convex_from_brothers",METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("_set_update_shape_index","index"),&CollisionShape::_set_update_shape_index); - ClassDB::bind_method(_MD("_get_update_shape_index"),&CollisionShape::_get_update_shape_index); + ClassDB::bind_method(D_METHOD("_set_update_shape_index","index"),&CollisionShape::_set_update_shape_index); + ClassDB::bind_method(D_METHOD("_get_update_shape_index"),&CollisionShape::_get_update_shape_index); - ClassDB::bind_method(_MD("get_collision_object_shape_index"),&CollisionShape::get_collision_object_shape_index); + ClassDB::bind_method(D_METHOD("get_collision_object_shape_index"),&CollisionShape::get_collision_object_shape_index); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape"), "set_shape", "get_shape"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"trigger"),"set_trigger","is_trigger"); diff --git a/scene/3d/bone_attachment.cpp b/scene/3d/bone_attachment.cpp index 825cf1c535..1a2680e3b8 100644 --- a/scene/3d/bone_attachment.cpp +++ b/scene/3d/bone_attachment.cpp @@ -139,6 +139,6 @@ BoneAttachment::BoneAttachment() } void BoneAttachment::_bind_methods(){ - ClassDB::bind_method(_MD("set_bone_name","bone_name"),&BoneAttachment::set_bone_name); - ClassDB::bind_method(_MD("get_bone_name"),&BoneAttachment::get_bone_name); + ClassDB::bind_method(D_METHOD("set_bone_name","bone_name"),&BoneAttachment::set_bone_name); + ClassDB::bind_method(D_METHOD("get_bone_name"),&BoneAttachment::get_bone_name); } diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index 5bd2c771ee..2e04f2d8bc 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -548,34 +548,34 @@ Camera::KeepAspect Camera::get_keep_aspect_mode() const{ void Camera::_bind_methods() { - ClassDB::bind_method( _MD("project_ray_normal","screen_point"), &Camera::project_ray_normal); - ClassDB::bind_method( _MD("project_local_ray_normal","screen_point"), &Camera::project_local_ray_normal); - ClassDB::bind_method( _MD("project_ray_origin","screen_point"), &Camera::project_ray_origin); - ClassDB::bind_method( _MD("unproject_position","world_point"), &Camera::unproject_position); - ClassDB::bind_method( _MD("is_position_behind","world_point"), &Camera::is_position_behind); - ClassDB::bind_method( _MD("project_position","screen_point"), &Camera::project_position); - ClassDB::bind_method( _MD("set_perspective","fov","z_near","z_far"),&Camera::set_perspective ); - ClassDB::bind_method( _MD("set_orthogonal","size","z_near","z_far"),&Camera::set_orthogonal ); - ClassDB::bind_method( _MD("make_current"),&Camera::make_current ); - ClassDB::bind_method( _MD("clear_current"),&Camera::clear_current ); - ClassDB::bind_method( _MD("is_current"),&Camera::is_current ); - ClassDB::bind_method( _MD("get_camera_transform"),&Camera::get_camera_transform ); - ClassDB::bind_method( _MD("get_fov"),&Camera::get_fov ); - ClassDB::bind_method( _MD("get_size"),&Camera::get_size ); - ClassDB::bind_method( _MD("get_zfar"),&Camera::get_zfar ); - ClassDB::bind_method( _MD("get_znear"),&Camera::get_znear ); - ClassDB::bind_method( _MD("get_projection"),&Camera::get_projection ); - ClassDB::bind_method( _MD("set_h_offset","ofs"),&Camera::set_h_offset ); - ClassDB::bind_method( _MD("get_h_offset"),&Camera::get_h_offset ); - ClassDB::bind_method( _MD("set_v_offset","ofs"),&Camera::set_v_offset ); - ClassDB::bind_method( _MD("get_v_offset"),&Camera::get_v_offset ); - ClassDB::bind_method( _MD("set_cull_mask","mask"),&Camera::set_cull_mask ); - ClassDB::bind_method( _MD("get_cull_mask"),&Camera::get_cull_mask ); - ClassDB::bind_method( _MD("set_environment","env:Environment"),&Camera::set_environment ); - ClassDB::bind_method( _MD("get_environment:Environment"),&Camera::get_environment ); - ClassDB::bind_method( _MD("set_keep_aspect_mode","mode"),&Camera::set_keep_aspect_mode ); - ClassDB::bind_method( _MD("get_keep_aspect_mode"),&Camera::get_keep_aspect_mode ); - //ClassDB::bind_method( _MD("_camera_make_current"),&Camera::_camera_make_current ); + ClassDB::bind_method(D_METHOD("project_ray_normal","screen_point"), &Camera::project_ray_normal); + ClassDB::bind_method(D_METHOD("project_local_ray_normal","screen_point"), &Camera::project_local_ray_normal); + ClassDB::bind_method(D_METHOD("project_ray_origin","screen_point"), &Camera::project_ray_origin); + ClassDB::bind_method(D_METHOD("unproject_position","world_point"), &Camera::unproject_position); + ClassDB::bind_method(D_METHOD("is_position_behind","world_point"), &Camera::is_position_behind); + ClassDB::bind_method(D_METHOD("project_position","screen_point"), &Camera::project_position); + ClassDB::bind_method(D_METHOD("set_perspective","fov","z_near","z_far"),&Camera::set_perspective ); + ClassDB::bind_method(D_METHOD("set_orthogonal","size","z_near","z_far"),&Camera::set_orthogonal ); + ClassDB::bind_method(D_METHOD("make_current"),&Camera::make_current ); + ClassDB::bind_method(D_METHOD("clear_current"),&Camera::clear_current ); + ClassDB::bind_method(D_METHOD("is_current"),&Camera::is_current ); + ClassDB::bind_method(D_METHOD("get_camera_transform"),&Camera::get_camera_transform ); + ClassDB::bind_method(D_METHOD("get_fov"),&Camera::get_fov ); + ClassDB::bind_method(D_METHOD("get_size"),&Camera::get_size ); + ClassDB::bind_method(D_METHOD("get_zfar"),&Camera::get_zfar ); + ClassDB::bind_method(D_METHOD("get_znear"),&Camera::get_znear ); + ClassDB::bind_method(D_METHOD("get_projection"),&Camera::get_projection ); + ClassDB::bind_method(D_METHOD("set_h_offset","ofs"),&Camera::set_h_offset ); + ClassDB::bind_method(D_METHOD("get_h_offset"),&Camera::get_h_offset ); + ClassDB::bind_method(D_METHOD("set_v_offset","ofs"),&Camera::set_v_offset ); + ClassDB::bind_method(D_METHOD("get_v_offset"),&Camera::get_v_offset ); + ClassDB::bind_method(D_METHOD("set_cull_mask","mask"),&Camera::set_cull_mask ); + ClassDB::bind_method(D_METHOD("get_cull_mask"),&Camera::get_cull_mask ); + ClassDB::bind_method(D_METHOD("set_environment","env:Environment"),&Camera::set_environment ); + ClassDB::bind_method(D_METHOD("get_environment:Environment"),&Camera::get_environment ); + ClassDB::bind_method(D_METHOD("set_keep_aspect_mode","mode"),&Camera::set_keep_aspect_mode ); + ClassDB::bind_method(D_METHOD("get_keep_aspect_mode"),&Camera::get_keep_aspect_mode ); + //ClassDB::bind_method(D_METHOD("_camera_make_current"),&Camera::_camera_make_current ); BIND_CONSTANT( PROJECTION_PERSPECTIVE ); BIND_CONSTANT( PROJECTION_ORTHOGONAL ); diff --git a/scene/3d/character_camera.cpp b/scene/3d/character_camera.cpp index 211619d0df..424a7fc79c 100644 --- a/scene/3d/character_camera.cpp +++ b/scene/3d/character_camera.cpp @@ -634,30 +634,30 @@ float CharacterCamera::get_autoturn_speed() const { void CharacterCamera::_bind_methods() { - ClassDB::bind_method(_MD("set_camera_type","type"),&CharacterCamera::set_camera_type); - ClassDB::bind_method(_MD("get_camera_type"),&CharacterCamera::get_camera_type); - ClassDB::bind_method(_MD("set_orbit","orbit"),&CharacterCamera::set_orbit); - ClassDB::bind_method(_MD("get_orbit"),&CharacterCamera::get_orbit); - ClassDB::bind_method(_MD("set_orbit_x","x"),&CharacterCamera::set_orbit_x); - ClassDB::bind_method(_MD("set_orbit_y","y"),&CharacterCamera::set_orbit_y); - ClassDB::bind_method(_MD("set_min_orbit_x","x"),&CharacterCamera::set_min_orbit_x); - ClassDB::bind_method(_MD("get_min_orbit_x"),&CharacterCamera::get_min_orbit_x); - ClassDB::bind_method(_MD("set_max_orbit_x","x"),&CharacterCamera::set_max_orbit_x); - ClassDB::bind_method(_MD("get_max_orbit_x"),&CharacterCamera::get_max_orbit_x); - ClassDB::bind_method(_MD("rotate_orbit"),&CharacterCamera::rotate_orbit); - ClassDB::bind_method(_MD("set_distance","distance"),&CharacterCamera::set_distance); - ClassDB::bind_method(_MD("get_distance"),&CharacterCamera::get_distance); - ClassDB::bind_method(_MD("set_clip","enable"),&CharacterCamera::set_clip); - ClassDB::bind_method(_MD("has_clip"),&CharacterCamera::has_clip); - ClassDB::bind_method(_MD("set_autoturn","enable"),&CharacterCamera::set_autoturn); - ClassDB::bind_method(_MD("has_autoturn"),&CharacterCamera::has_autoturn); - ClassDB::bind_method(_MD("set_autoturn_tolerance","degrees"),&CharacterCamera::set_autoturn_tolerance); - ClassDB::bind_method(_MD("get_autoturn_tolerance"),&CharacterCamera::get_autoturn_tolerance); - ClassDB::bind_method(_MD("set_autoturn_speed","speed"),&CharacterCamera::set_autoturn_speed); - ClassDB::bind_method(_MD("get_autoturn_speed"),&CharacterCamera::get_autoturn_speed); - ClassDB::bind_method(_MD("set_use_lookat_target","use","lookat"),&CharacterCamera::set_use_lookat_target, DEFVAL(Vector3())); - - ClassDB::bind_method(_MD("_ray_collision"),&CharacterCamera::_ray_collision); + ClassDB::bind_method(D_METHOD("set_camera_type","type"),&CharacterCamera::set_camera_type); + ClassDB::bind_method(D_METHOD("get_camera_type"),&CharacterCamera::get_camera_type); + ClassDB::bind_method(D_METHOD("set_orbit","orbit"),&CharacterCamera::set_orbit); + ClassDB::bind_method(D_METHOD("get_orbit"),&CharacterCamera::get_orbit); + ClassDB::bind_method(D_METHOD("set_orbit_x","x"),&CharacterCamera::set_orbit_x); + ClassDB::bind_method(D_METHOD("set_orbit_y","y"),&CharacterCamera::set_orbit_y); + ClassDB::bind_method(D_METHOD("set_min_orbit_x","x"),&CharacterCamera::set_min_orbit_x); + ClassDB::bind_method(D_METHOD("get_min_orbit_x"),&CharacterCamera::get_min_orbit_x); + ClassDB::bind_method(D_METHOD("set_max_orbit_x","x"),&CharacterCamera::set_max_orbit_x); + ClassDB::bind_method(D_METHOD("get_max_orbit_x"),&CharacterCamera::get_max_orbit_x); + ClassDB::bind_method(D_METHOD("rotate_orbit"),&CharacterCamera::rotate_orbit); + ClassDB::bind_method(D_METHOD("set_distance","distance"),&CharacterCamera::set_distance); + ClassDB::bind_method(D_METHOD("get_distance"),&CharacterCamera::get_distance); + ClassDB::bind_method(D_METHOD("set_clip","enable"),&CharacterCamera::set_clip); + ClassDB::bind_method(D_METHOD("has_clip"),&CharacterCamera::has_clip); + ClassDB::bind_method(D_METHOD("set_autoturn","enable"),&CharacterCamera::set_autoturn); + ClassDB::bind_method(D_METHOD("has_autoturn"),&CharacterCamera::has_autoturn); + ClassDB::bind_method(D_METHOD("set_autoturn_tolerance","degrees"),&CharacterCamera::set_autoturn_tolerance); + ClassDB::bind_method(D_METHOD("get_autoturn_tolerance"),&CharacterCamera::get_autoturn_tolerance); + ClassDB::bind_method(D_METHOD("set_autoturn_speed","speed"),&CharacterCamera::set_autoturn_speed); + ClassDB::bind_method(D_METHOD("get_autoturn_speed"),&CharacterCamera::get_autoturn_speed); + ClassDB::bind_method(D_METHOD("set_use_lookat_target","use","lookat"),&CharacterCamera::set_use_lookat_target, DEFVAL(Vector3())); + + ClassDB::bind_method(D_METHOD("_ray_collision"),&CharacterCamera::_ray_collision); BIND_CONSTANT( CAMERA_FIXED ); BIND_CONSTANT( CAMERA_FOLLOW ); diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index ba105aa8c2..09fe7cd2fc 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -228,22 +228,22 @@ bool CollisionObject::is_ray_pickable() const { void CollisionObject::_bind_methods() { - ClassDB::bind_method(_MD("add_shape","shape:Shape","transform"),&CollisionObject::add_shape,DEFVAL(Transform())); - ClassDB::bind_method(_MD("get_shape_count"),&CollisionObject::get_shape_count); - ClassDB::bind_method(_MD("set_shape","shape_idx","shape:Shape"),&CollisionObject::set_shape); - ClassDB::bind_method(_MD("set_shape_transform","shape_idx","transform"),&CollisionObject::set_shape_transform); -// ClassDB::bind_method(_MD("set_shape_transform","shape_idx","transform"),&CollisionObject::set_shape_transform); - ClassDB::bind_method(_MD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject::set_shape_as_trigger); - ClassDB::bind_method(_MD("is_shape_set_as_trigger","shape_idx"),&CollisionObject::is_shape_set_as_trigger); - ClassDB::bind_method(_MD("get_shape:Shape","shape_idx"),&CollisionObject::get_shape); - ClassDB::bind_method(_MD("get_shape_transform","shape_idx"),&CollisionObject::get_shape_transform); - ClassDB::bind_method(_MD("remove_shape","shape_idx"),&CollisionObject::remove_shape); - ClassDB::bind_method(_MD("clear_shapes"),&CollisionObject::clear_shapes); - ClassDB::bind_method(_MD("set_ray_pickable","ray_pickable"),&CollisionObject::set_ray_pickable); - ClassDB::bind_method(_MD("is_ray_pickable"),&CollisionObject::is_ray_pickable); - ClassDB::bind_method(_MD("set_capture_input_on_drag","enable"),&CollisionObject::set_capture_input_on_drag); - ClassDB::bind_method(_MD("get_capture_input_on_drag"),&CollisionObject::get_capture_input_on_drag); - ClassDB::bind_method(_MD("get_rid"),&CollisionObject::get_rid); + ClassDB::bind_method(D_METHOD("add_shape","shape:Shape","transform"),&CollisionObject::add_shape,DEFVAL(Transform())); + ClassDB::bind_method(D_METHOD("get_shape_count"),&CollisionObject::get_shape_count); + ClassDB::bind_method(D_METHOD("set_shape","shape_idx","shape:Shape"),&CollisionObject::set_shape); + ClassDB::bind_method(D_METHOD("set_shape_transform","shape_idx","transform"),&CollisionObject::set_shape_transform); +// ClassDB::bind_method(D_METHOD("set_shape_transform","shape_idx","transform"),&CollisionObject::set_shape_transform); + ClassDB::bind_method(D_METHOD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject::set_shape_as_trigger); + ClassDB::bind_method(D_METHOD("is_shape_set_as_trigger","shape_idx"),&CollisionObject::is_shape_set_as_trigger); + ClassDB::bind_method(D_METHOD("get_shape:Shape","shape_idx"),&CollisionObject::get_shape); + ClassDB::bind_method(D_METHOD("get_shape_transform","shape_idx"),&CollisionObject::get_shape_transform); + ClassDB::bind_method(D_METHOD("remove_shape","shape_idx"),&CollisionObject::remove_shape); + ClassDB::bind_method(D_METHOD("clear_shapes"),&CollisionObject::clear_shapes); + ClassDB::bind_method(D_METHOD("set_ray_pickable","ray_pickable"),&CollisionObject::set_ray_pickable); + ClassDB::bind_method(D_METHOD("is_ray_pickable"),&CollisionObject::is_ray_pickable); + ClassDB::bind_method(D_METHOD("set_capture_input_on_drag","enable"),&CollisionObject::set_capture_input_on_drag); + ClassDB::bind_method(D_METHOD("get_capture_input_on_drag"),&CollisionObject::get_capture_input_on_drag); + ClassDB::bind_method(D_METHOD("get_rid"),&CollisionObject::get_rid); 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"))); diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index bc08dc76c8..82637c2488 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -275,22 +275,22 @@ String CollisionPolygon::get_configuration_warning() const { void CollisionPolygon::_bind_methods() { - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionPolygon::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionPolygon::_add_to_collision_object); - ClassDB::bind_method(_MD("set_build_mode","build_mode"),&CollisionPolygon::set_build_mode); - ClassDB::bind_method(_MD("get_build_mode"),&CollisionPolygon::get_build_mode); + ClassDB::bind_method(D_METHOD("set_build_mode","build_mode"),&CollisionPolygon::set_build_mode); + ClassDB::bind_method(D_METHOD("get_build_mode"),&CollisionPolygon::get_build_mode); - ClassDB::bind_method(_MD("set_depth","depth"),&CollisionPolygon::set_depth); - ClassDB::bind_method(_MD("get_depth"),&CollisionPolygon::get_depth); + ClassDB::bind_method(D_METHOD("set_depth","depth"),&CollisionPolygon::set_depth); + ClassDB::bind_method(D_METHOD("get_depth"),&CollisionPolygon::get_depth); - ClassDB::bind_method(_MD("set_polygon","polygon"),&CollisionPolygon::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&CollisionPolygon::get_polygon); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&CollisionPolygon::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&CollisionPolygon::get_polygon); - ClassDB::bind_method(_MD("_set_shape_range","shape_range"),&CollisionPolygon::_set_shape_range); - ClassDB::bind_method(_MD("_get_shape_range"),&CollisionPolygon::_get_shape_range); + ClassDB::bind_method(D_METHOD("_set_shape_range","shape_range"),&CollisionPolygon::_set_shape_range); + ClassDB::bind_method(D_METHOD("_get_shape_range"),&CollisionPolygon::_get_shape_range); - ClassDB::bind_method(_MD("get_collision_object_first_shape"),&CollisionPolygon::get_collision_object_first_shape); - ClassDB::bind_method(_MD("get_collision_object_last_shape"),&CollisionPolygon::get_collision_object_last_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_first_shape"),&CollisionPolygon::get_collision_object_first_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_last_shape"),&CollisionPolygon::get_collision_object_last_shape); ADD_PROPERTY( PropertyInfo(Variant::INT,"build_mode",PROPERTY_HINT_ENUM,"Solids,Triangles"),"set_build_mode","get_build_mode"); ADD_PROPERTY( PropertyInfo(Variant::REAL,"depth"),"set_depth","get_depth"); diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index 51376c7693..4ce714818f 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -115,32 +115,32 @@ RID GIProbeData::get_rid() const { void GIProbeData::_bind_methods() { - ClassDB::bind_method(_MD("set_bounds","bounds"),&GIProbeData::set_bounds); - ClassDB::bind_method(_MD("get_bounds"),&GIProbeData::get_bounds); + ClassDB::bind_method(D_METHOD("set_bounds","bounds"),&GIProbeData::set_bounds); + ClassDB::bind_method(D_METHOD("get_bounds"),&GIProbeData::get_bounds); - ClassDB::bind_method(_MD("set_cell_size","cell_size"),&GIProbeData::set_cell_size); - ClassDB::bind_method(_MD("get_cell_size"),&GIProbeData::get_cell_size); + ClassDB::bind_method(D_METHOD("set_cell_size","cell_size"),&GIProbeData::set_cell_size); + ClassDB::bind_method(D_METHOD("get_cell_size"),&GIProbeData::get_cell_size); - ClassDB::bind_method(_MD("set_to_cell_xform","to_cell_xform"),&GIProbeData::set_to_cell_xform); - ClassDB::bind_method(_MD("get_to_cell_xform"),&GIProbeData::get_to_cell_xform); + ClassDB::bind_method(D_METHOD("set_to_cell_xform","to_cell_xform"),&GIProbeData::set_to_cell_xform); + ClassDB::bind_method(D_METHOD("get_to_cell_xform"),&GIProbeData::get_to_cell_xform); - ClassDB::bind_method(_MD("set_dynamic_data","dynamic_data"),&GIProbeData::set_dynamic_data); - ClassDB::bind_method(_MD("get_dynamic_data"),&GIProbeData::get_dynamic_data); + ClassDB::bind_method(D_METHOD("set_dynamic_data","dynamic_data"),&GIProbeData::set_dynamic_data); + ClassDB::bind_method(D_METHOD("get_dynamic_data"),&GIProbeData::get_dynamic_data); - ClassDB::bind_method(_MD("set_dynamic_range","dynamic_range"),&GIProbeData::set_dynamic_range); - ClassDB::bind_method(_MD("get_dynamic_range"),&GIProbeData::get_dynamic_range); + ClassDB::bind_method(D_METHOD("set_dynamic_range","dynamic_range"),&GIProbeData::set_dynamic_range); + ClassDB::bind_method(D_METHOD("get_dynamic_range"),&GIProbeData::get_dynamic_range); - ClassDB::bind_method(_MD("set_energy","energy"),&GIProbeData::set_energy); - ClassDB::bind_method(_MD("get_energy"),&GIProbeData::get_energy); + ClassDB::bind_method(D_METHOD("set_energy","energy"),&GIProbeData::set_energy); + ClassDB::bind_method(D_METHOD("get_energy"),&GIProbeData::get_energy); - ClassDB::bind_method(_MD("set_propagation","propagation"),&GIProbeData::set_propagation); - ClassDB::bind_method(_MD("get_propagation"),&GIProbeData::get_propagation); + ClassDB::bind_method(D_METHOD("set_propagation","propagation"),&GIProbeData::set_propagation); + ClassDB::bind_method(D_METHOD("get_propagation"),&GIProbeData::get_propagation); - ClassDB::bind_method(_MD("set_interior","interior"),&GIProbeData::set_interior); - ClassDB::bind_method(_MD("is_interior"),&GIProbeData::is_interior); + ClassDB::bind_method(D_METHOD("set_interior","interior"),&GIProbeData::set_interior); + ClassDB::bind_method(D_METHOD("is_interior"),&GIProbeData::is_interior); - ClassDB::bind_method(_MD("set_compress","compress"),&GIProbeData::set_compress); - ClassDB::bind_method(_MD("is_compressed"),&GIProbeData::is_compressed); + ClassDB::bind_method(D_METHOD("set_compress","compress"),&GIProbeData::set_compress); + ClassDB::bind_method(D_METHOD("is_compressed"),&GIProbeData::is_compressed); ADD_PROPERTY(PropertyInfo(Variant::RECT3,"bounds",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_bounds","get_bounds"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"cell_size",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_cell_size","get_cell_size"); @@ -1384,32 +1384,32 @@ PoolVector<Face3> GIProbe::get_faces(uint32_t p_usage_flags) const { void GIProbe::_bind_methods() { - ClassDB::bind_method(_MD("set_probe_data","data"),&GIProbe::set_probe_data); - ClassDB::bind_method(_MD("get_probe_data"),&GIProbe::get_probe_data); + ClassDB::bind_method(D_METHOD("set_probe_data","data"),&GIProbe::set_probe_data); + ClassDB::bind_method(D_METHOD("get_probe_data"),&GIProbe::get_probe_data); - ClassDB::bind_method(_MD("set_subdiv","subdiv"),&GIProbe::set_subdiv); - ClassDB::bind_method(_MD("get_subdiv"),&GIProbe::get_subdiv); + ClassDB::bind_method(D_METHOD("set_subdiv","subdiv"),&GIProbe::set_subdiv); + ClassDB::bind_method(D_METHOD("get_subdiv"),&GIProbe::get_subdiv); - ClassDB::bind_method(_MD("set_extents","extents"),&GIProbe::set_extents); - ClassDB::bind_method(_MD("get_extents"),&GIProbe::get_extents); + ClassDB::bind_method(D_METHOD("set_extents","extents"),&GIProbe::set_extents); + ClassDB::bind_method(D_METHOD("get_extents"),&GIProbe::get_extents); - ClassDB::bind_method(_MD("set_dynamic_range","max"),&GIProbe::set_dynamic_range); - ClassDB::bind_method(_MD("get_dynamic_range"),&GIProbe::get_dynamic_range); + ClassDB::bind_method(D_METHOD("set_dynamic_range","max"),&GIProbe::set_dynamic_range); + ClassDB::bind_method(D_METHOD("get_dynamic_range"),&GIProbe::get_dynamic_range); - ClassDB::bind_method(_MD("set_energy","max"),&GIProbe::set_energy); - ClassDB::bind_method(_MD("get_energy"),&GIProbe::get_energy); + ClassDB::bind_method(D_METHOD("set_energy","max"),&GIProbe::set_energy); + ClassDB::bind_method(D_METHOD("get_energy"),&GIProbe::get_energy); - ClassDB::bind_method(_MD("set_propagation","max"),&GIProbe::set_propagation); - ClassDB::bind_method(_MD("get_propagation"),&GIProbe::get_propagation); + ClassDB::bind_method(D_METHOD("set_propagation","max"),&GIProbe::set_propagation); + ClassDB::bind_method(D_METHOD("get_propagation"),&GIProbe::get_propagation); - ClassDB::bind_method(_MD("set_interior","enable"),&GIProbe::set_interior); - ClassDB::bind_method(_MD("is_interior"),&GIProbe::is_interior); + ClassDB::bind_method(D_METHOD("set_interior","enable"),&GIProbe::set_interior); + ClassDB::bind_method(D_METHOD("is_interior"),&GIProbe::is_interior); - ClassDB::bind_method(_MD("set_compress","enable"),&GIProbe::set_compress); - ClassDB::bind_method(_MD("is_compressed"),&GIProbe::is_compressed); + ClassDB::bind_method(D_METHOD("set_compress","enable"),&GIProbe::set_compress); + ClassDB::bind_method(D_METHOD("is_compressed"),&GIProbe::is_compressed); - ClassDB::bind_method(_MD("bake","from_node","create_visual_debug"),&GIProbe::bake,DEFVAL(Variant()),DEFVAL(false)); - ClassDB::bind_method(_MD("debug_bake"),&GIProbe::_debug_bake); + ClassDB::bind_method(D_METHOD("bake","from_node","create_visual_debug"),&GIProbe::bake,DEFVAL(Variant()),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("debug_bake"),&GIProbe::_debug_bake); ClassDB::set_method_flags(get_class_static(),_scs_create("debug_bake"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); ADD_PROPERTY( PropertyInfo(Variant::INT,"subdiv",PROPERTY_HINT_ENUM,"64,128,256,512"),"set_subdiv","get_subdiv"); diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp index 08fc1f59e8..6adbbe9ccf 100644 --- a/scene/3d/immediate_geometry.cpp +++ b/scene/3d/immediate_geometry.cpp @@ -154,16 +154,16 @@ void ImmediateGeometry::add_sphere(int p_lats, int p_lons, float p_radius, bool void ImmediateGeometry::_bind_methods() { - ClassDB::bind_method(_MD("begin","primitive","texture:Texture"),&ImmediateGeometry::begin,DEFVAL(Ref<Texture>())); - ClassDB::bind_method(_MD("set_normal","normal"),&ImmediateGeometry::set_normal); - ClassDB::bind_method(_MD("set_tangent","tangent"),&ImmediateGeometry::set_tangent); - ClassDB::bind_method(_MD("set_color","color"),&ImmediateGeometry::set_color); - ClassDB::bind_method(_MD("set_uv","uv"),&ImmediateGeometry::set_uv); - ClassDB::bind_method(_MD("set_uv2","uv"),&ImmediateGeometry::set_uv2); - ClassDB::bind_method(_MD("add_vertex","pos"),&ImmediateGeometry::add_vertex); - ClassDB::bind_method(_MD("add_sphere","lats","lons","radius","add_uv"),&ImmediateGeometry::add_sphere,DEFVAL(true)); - ClassDB::bind_method(_MD("end"),&ImmediateGeometry::end); - ClassDB::bind_method(_MD("clear"),&ImmediateGeometry::clear); + ClassDB::bind_method(D_METHOD("begin","primitive","texture:Texture"),&ImmediateGeometry::begin,DEFVAL(Ref<Texture>())); + ClassDB::bind_method(D_METHOD("set_normal","normal"),&ImmediateGeometry::set_normal); + ClassDB::bind_method(D_METHOD("set_tangent","tangent"),&ImmediateGeometry::set_tangent); + ClassDB::bind_method(D_METHOD("set_color","color"),&ImmediateGeometry::set_color); + ClassDB::bind_method(D_METHOD("set_uv","uv"),&ImmediateGeometry::set_uv); + ClassDB::bind_method(D_METHOD("set_uv2","uv"),&ImmediateGeometry::set_uv2); + ClassDB::bind_method(D_METHOD("add_vertex","pos"),&ImmediateGeometry::add_vertex); + ClassDB::bind_method(D_METHOD("add_sphere","lats","lons","radius","add_uv"),&ImmediateGeometry::add_sphere,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("end"),&ImmediateGeometry::end); + ClassDB::bind_method(D_METHOD("clear"),&ImmediateGeometry::clear); } diff --git a/scene/3d/interpolated_camera.cpp b/scene/3d/interpolated_camera.cpp index 021bf5b925..15ee971b7e 100644 --- a/scene/3d/interpolated_camera.cpp +++ b/scene/3d/interpolated_camera.cpp @@ -134,15 +134,15 @@ real_t InterpolatedCamera::get_speed() const { void InterpolatedCamera::_bind_methods() { - ClassDB::bind_method(_MD("set_target_path","target_path"),&InterpolatedCamera::set_target_path); - ClassDB::bind_method(_MD("get_target_path"),&InterpolatedCamera::get_target_path); - ClassDB::bind_method(_MD("set_target","target:Camera"),&InterpolatedCamera::_set_target); + ClassDB::bind_method(D_METHOD("set_target_path","target_path"),&InterpolatedCamera::set_target_path); + ClassDB::bind_method(D_METHOD("get_target_path"),&InterpolatedCamera::get_target_path); + ClassDB::bind_method(D_METHOD("set_target","target:Camera"),&InterpolatedCamera::_set_target); - ClassDB::bind_method(_MD("set_speed","speed"),&InterpolatedCamera::set_speed); - ClassDB::bind_method(_MD("get_speed"),&InterpolatedCamera::get_speed); + ClassDB::bind_method(D_METHOD("set_speed","speed"),&InterpolatedCamera::set_speed); + ClassDB::bind_method(D_METHOD("get_speed"),&InterpolatedCamera::get_speed); - ClassDB::bind_method(_MD("set_interpolation_enabled","target_path"),&InterpolatedCamera::set_interpolation_enabled); - ClassDB::bind_method(_MD("is_interpolation_enabled"),&InterpolatedCamera::is_interpolation_enabled); + ClassDB::bind_method(D_METHOD("set_interpolation_enabled","target_path"),&InterpolatedCamera::set_interpolation_enabled); + ClassDB::bind_method(D_METHOD("is_interpolation_enabled"),&InterpolatedCamera::is_interpolation_enabled); ADD_PROPERTY( PropertyInfo(Variant::NODE_PATH,"target"), "set_target_path", "get_target_path") ; ADD_PROPERTY( PropertyInfo(Variant::REAL,"speed"), "set_speed", "get_speed") ; diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index ac3f1da031..11eaa2ed33 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -221,27 +221,27 @@ bool Light::is_editor_only() const{ void Light::_bind_methods() { - ClassDB::bind_method(_MD("set_editor_only","editor_only"), &Light::set_editor_only ); - ClassDB::bind_method(_MD("is_editor_only"), &Light::is_editor_only ); + ClassDB::bind_method(D_METHOD("set_editor_only","editor_only"), &Light::set_editor_only ); + ClassDB::bind_method(D_METHOD("is_editor_only"), &Light::is_editor_only ); - ClassDB::bind_method(_MD("set_param","param","value"), &Light::set_param ); - ClassDB::bind_method(_MD("get_param","param"), &Light::get_param ); + ClassDB::bind_method(D_METHOD("set_param","param","value"), &Light::set_param ); + ClassDB::bind_method(D_METHOD("get_param","param"), &Light::get_param ); - ClassDB::bind_method(_MD("set_shadow","enabled"), &Light::set_shadow ); - ClassDB::bind_method(_MD("has_shadow"), &Light::has_shadow ); + ClassDB::bind_method(D_METHOD("set_shadow","enabled"), &Light::set_shadow ); + ClassDB::bind_method(D_METHOD("has_shadow"), &Light::has_shadow ); - ClassDB::bind_method(_MD("set_negative","enabled"), &Light::set_negative ); - ClassDB::bind_method(_MD("is_negative"), &Light::is_negative ); + ClassDB::bind_method(D_METHOD("set_negative","enabled"), &Light::set_negative ); + ClassDB::bind_method(D_METHOD("is_negative"), &Light::is_negative ); - ClassDB::bind_method(_MD("set_cull_mask","cull_mask"), &Light::set_cull_mask ); - ClassDB::bind_method(_MD("get_cull_mask"), &Light::get_cull_mask ); + ClassDB::bind_method(D_METHOD("set_cull_mask","cull_mask"), &Light::set_cull_mask ); + ClassDB::bind_method(D_METHOD("get_cull_mask"), &Light::get_cull_mask ); - ClassDB::bind_method(_MD("set_color","color"), &Light::set_color ); - ClassDB::bind_method(_MD("get_color"), &Light::get_color ); + ClassDB::bind_method(D_METHOD("set_color","color"), &Light::set_color ); + ClassDB::bind_method(D_METHOD("get_color"), &Light::get_color ); - ClassDB::bind_method(_MD("set_shadow_color","shadow_color"), &Light::set_shadow_color ); - ClassDB::bind_method(_MD("get_shadow_color"), &Light::get_shadow_color ); + ClassDB::bind_method(D_METHOD("set_shadow_color","shadow_color"), &Light::set_shadow_color ); + ClassDB::bind_method(D_METHOD("get_shadow_color"), &Light::get_shadow_color ); ADD_GROUP("Light","light_"); ADD_PROPERTY( PropertyInfo( Variant::COLOR, "light_color",PROPERTY_HINT_COLOR_NO_ALPHA), "set_color", "get_color"); @@ -352,11 +352,11 @@ bool DirectionalLight::is_blend_splits_enabled() const { void DirectionalLight::_bind_methods() { - ClassDB::bind_method( _MD("set_shadow_mode","mode"),&DirectionalLight::set_shadow_mode); - ClassDB::bind_method( _MD("get_shadow_mode"),&DirectionalLight::get_shadow_mode); + ClassDB::bind_method( D_METHOD("set_shadow_mode","mode"),&DirectionalLight::set_shadow_mode); + ClassDB::bind_method( D_METHOD("get_shadow_mode"),&DirectionalLight::get_shadow_mode); - ClassDB::bind_method( _MD("set_blend_splits","enabled"),&DirectionalLight::set_blend_splits); - ClassDB::bind_method( _MD("is_blend_splits_enabled"),&DirectionalLight::is_blend_splits_enabled); + ClassDB::bind_method( D_METHOD("set_blend_splits","enabled"),&DirectionalLight::set_blend_splits); + ClassDB::bind_method( D_METHOD("is_blend_splits_enabled"),&DirectionalLight::is_blend_splits_enabled); ADD_GROUP("Directional Shadow","directional_shadow_"); ADD_PROPERTY( PropertyInfo( Variant::INT, "directional_shadow_mode",PROPERTY_HINT_ENUM,"Orthogonal,PSSM 2 Splits,PSSM 4 Splits"), "set_shadow_mode", "get_shadow_mode"); @@ -406,11 +406,11 @@ OmniLight::ShadowDetail OmniLight::get_shadow_detail() const{ void OmniLight::_bind_methods() { - ClassDB::bind_method( _MD("set_shadow_mode","mode"),&OmniLight::set_shadow_mode); - ClassDB::bind_method( _MD("get_shadow_mode"),&OmniLight::get_shadow_mode); + ClassDB::bind_method( D_METHOD("set_shadow_mode","mode"),&OmniLight::set_shadow_mode); + ClassDB::bind_method( D_METHOD("get_shadow_mode"),&OmniLight::get_shadow_mode); - ClassDB::bind_method( _MD("set_shadow_detail","detail"),&OmniLight::set_shadow_detail); - ClassDB::bind_method( _MD("get_shadow_detail"),&OmniLight::get_shadow_detail); + ClassDB::bind_method( D_METHOD("set_shadow_detail","detail"),&OmniLight::set_shadow_detail); + ClassDB::bind_method( D_METHOD("get_shadow_detail"),&OmniLight::get_shadow_detail); ADD_GROUP("Omni","omni_"); ADD_PROPERTYI( PropertyInfo( Variant::REAL, "omni_range",PROPERTY_HINT_RANGE,"0,65536,0.1"), "set_param", "get_param", PARAM_RANGE); diff --git a/scene/3d/listener.cpp b/scene/3d/listener.cpp index 0aa1128bdb..c774d59d77 100644 --- a/scene/3d/listener.cpp +++ b/scene/3d/listener.cpp @@ -146,10 +146,10 @@ RES Listener::_get_gizmo_geometry() const { void Listener::_bind_methods() { - ClassDB::bind_method( _MD("make_current"),&Listener::make_current ); - ClassDB::bind_method( _MD("clear_current"),&Listener::clear_current ); - ClassDB::bind_method( _MD("is_current"),&Listener::is_current ); - ClassDB::bind_method( _MD("get_listener_transform"),&Listener::get_listener_transform ); + ClassDB::bind_method( D_METHOD("make_current"),&Listener::make_current ); + ClassDB::bind_method( D_METHOD("clear_current"),&Listener::clear_current ); + ClassDB::bind_method( D_METHOD("is_current"),&Listener::is_current ); + ClassDB::bind_method( D_METHOD("get_listener_transform"),&Listener::get_listener_transform ); } Listener::Listener() { diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 3533f1b994..e6bd69aed2 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -294,16 +294,16 @@ void MeshInstance::_mesh_changed() { void MeshInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_mesh","mesh:Mesh"),&MeshInstance::set_mesh); - ClassDB::bind_method(_MD("get_mesh:Mesh"),&MeshInstance::get_mesh); - ClassDB::bind_method(_MD("set_skeleton_path","skeleton_path:NodePath"),&MeshInstance::set_skeleton_path); - ClassDB::bind_method(_MD("get_skeleton_path:NodePath"),&MeshInstance::get_skeleton_path); + ClassDB::bind_method(D_METHOD("set_mesh","mesh:Mesh"),&MeshInstance::set_mesh); + ClassDB::bind_method(D_METHOD("get_mesh:Mesh"),&MeshInstance::get_mesh); + ClassDB::bind_method(D_METHOD("set_skeleton_path","skeleton_path:NodePath"),&MeshInstance::set_skeleton_path); + ClassDB::bind_method(D_METHOD("get_skeleton_path:NodePath"),&MeshInstance::get_skeleton_path); - ClassDB::bind_method(_MD("create_trimesh_collision"),&MeshInstance::create_trimesh_collision); + ClassDB::bind_method(D_METHOD("create_trimesh_collision"),&MeshInstance::create_trimesh_collision); ClassDB::set_method_flags("MeshInstance","create_trimesh_collision",METHOD_FLAGS_DEFAULT); - ClassDB::bind_method(_MD("create_convex_collision"),&MeshInstance::create_convex_collision); + ClassDB::bind_method(D_METHOD("create_convex_collision"),&MeshInstance::create_convex_collision); ClassDB::set_method_flags("MeshInstance","create_convex_collision",METHOD_FLAGS_DEFAULT); - ClassDB::bind_method(_MD("_mesh_changed"),&MeshInstance::_mesh_changed); + ClassDB::bind_method(D_METHOD("_mesh_changed"),&MeshInstance::_mesh_changed); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh" ), "set_mesh", "get_mesh"); ADD_PROPERTY( PropertyInfo (Variant::NODE_PATH, "skeleton"), "set_skeleton_path", "get_skeleton_path"); diff --git a/scene/3d/multimesh_instance.cpp b/scene/3d/multimesh_instance.cpp index 4c79fb6c0a..e1acdfca53 100644 --- a/scene/3d/multimesh_instance.cpp +++ b/scene/3d/multimesh_instance.cpp @@ -34,8 +34,8 @@ void MultiMeshInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_multimesh","multimesh"),&MultiMeshInstance::set_multimesh); - ClassDB::bind_method(_MD("get_multimesh"),&MultiMeshInstance::get_multimesh); + ClassDB::bind_method(D_METHOD("set_multimesh","multimesh"),&MultiMeshInstance::set_multimesh); + ClassDB::bind_method(D_METHOD("get_multimesh"),&MultiMeshInstance::get_multimesh); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"multimesh",PROPERTY_HINT_RESOURCE_TYPE,"MultiMesh"), "set_multimesh", "get_multimesh"); diff --git a/scene/3d/navigation.cpp b/scene/3d/navigation.cpp index a45a5a2a20..5c8fe6bb67 100644 --- a/scene/3d/navigation.cpp +++ b/scene/3d/navigation.cpp @@ -730,18 +730,18 @@ Vector3 Navigation::get_up_vector() const{ void Navigation::_bind_methods() { - ClassDB::bind_method(_MD("navmesh_create","mesh:NavigationMesh","xform","owner"),&Navigation::navmesh_create,DEFVAL(Variant())); - ClassDB::bind_method(_MD("navmesh_set_transform","id","xform"),&Navigation::navmesh_set_transform); - ClassDB::bind_method(_MD("navmesh_remove","id"),&Navigation::navmesh_remove); - - ClassDB::bind_method(_MD("get_simple_path","start","end","optimize"),&Navigation::get_simple_path,DEFVAL(true)); - ClassDB::bind_method(_MD("get_closest_point_to_segment","start","end","use_collision"),&Navigation::get_closest_point_to_segment,DEFVAL(false)); - ClassDB::bind_method(_MD("get_closest_point","to_point"),&Navigation::get_closest_point); - ClassDB::bind_method(_MD("get_closest_point_normal","to_point"),&Navigation::get_closest_point_normal); - ClassDB::bind_method(_MD("get_closest_point_owner","to_point"),&Navigation::get_closest_point_owner); - - ClassDB::bind_method(_MD("set_up_vector","up"),&Navigation::set_up_vector); - ClassDB::bind_method(_MD("get_up_vector"),&Navigation::get_up_vector); + ClassDB::bind_method(D_METHOD("navmesh_create","mesh:NavigationMesh","xform","owner"),&Navigation::navmesh_create,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("navmesh_set_transform","id","xform"),&Navigation::navmesh_set_transform); + ClassDB::bind_method(D_METHOD("navmesh_remove","id"),&Navigation::navmesh_remove); + + ClassDB::bind_method(D_METHOD("get_simple_path","start","end","optimize"),&Navigation::get_simple_path,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("get_closest_point_to_segment","start","end","use_collision"),&Navigation::get_closest_point_to_segment,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_closest_point","to_point"),&Navigation::get_closest_point); + ClassDB::bind_method(D_METHOD("get_closest_point_normal","to_point"),&Navigation::get_closest_point_normal); + ClassDB::bind_method(D_METHOD("get_closest_point_owner","to_point"),&Navigation::get_closest_point_owner); + + ClassDB::bind_method(D_METHOD("set_up_vector","up"),&Navigation::set_up_vector); + ClassDB::bind_method(D_METHOD("get_up_vector"),&Navigation::get_up_vector); ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"up_vector"),"set_up_vector","get_up_vector"); } diff --git a/scene/3d/navigation_mesh.cpp b/scene/3d/navigation_mesh.cpp index 23f347ff3d..8efb9bb333 100644 --- a/scene/3d/navigation_mesh.cpp +++ b/scene/3d/navigation_mesh.cpp @@ -208,16 +208,16 @@ Ref<Mesh> NavigationMesh::get_debug_mesh() { void NavigationMesh::_bind_methods() { - ClassDB::bind_method(_MD("set_vertices","vertices"),&NavigationMesh::set_vertices); - ClassDB::bind_method(_MD("get_vertices"),&NavigationMesh::get_vertices); + ClassDB::bind_method(D_METHOD("set_vertices","vertices"),&NavigationMesh::set_vertices); + ClassDB::bind_method(D_METHOD("get_vertices"),&NavigationMesh::get_vertices); - ClassDB::bind_method(_MD("add_polygon","polygon"),&NavigationMesh::add_polygon); - ClassDB::bind_method(_MD("get_polygon_count"),&NavigationMesh::get_polygon_count); - ClassDB::bind_method(_MD("get_polygon","idx"),&NavigationMesh::get_polygon); - ClassDB::bind_method(_MD("clear_polygons"),&NavigationMesh::clear_polygons); + ClassDB::bind_method(D_METHOD("add_polygon","polygon"),&NavigationMesh::add_polygon); + ClassDB::bind_method(D_METHOD("get_polygon_count"),&NavigationMesh::get_polygon_count); + ClassDB::bind_method(D_METHOD("get_polygon","idx"),&NavigationMesh::get_polygon); + ClassDB::bind_method(D_METHOD("clear_polygons"),&NavigationMesh::clear_polygons); - ClassDB::bind_method(_MD("_set_polygons","polygons"),&NavigationMesh::_set_polygons); - ClassDB::bind_method(_MD("_get_polygons"),&NavigationMesh::_get_polygons); + ClassDB::bind_method(D_METHOD("_set_polygons","polygons"),&NavigationMesh::_set_polygons); + ClassDB::bind_method(D_METHOD("_get_polygons"),&NavigationMesh::_get_polygons); ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY,"vertices",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_vertices","get_vertices"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY,"polygons",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_polygons","_get_polygons"); @@ -394,11 +394,11 @@ String NavigationMeshInstance::get_configuration_warning() const { void NavigationMeshInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_navigation_mesh","navmesh"),&NavigationMeshInstance::set_navigation_mesh); - ClassDB::bind_method(_MD("get_navigation_mesh"),&NavigationMeshInstance::get_navigation_mesh); + ClassDB::bind_method(D_METHOD("set_navigation_mesh","navmesh"),&NavigationMeshInstance::set_navigation_mesh); + ClassDB::bind_method(D_METHOD("get_navigation_mesh"),&NavigationMeshInstance::get_navigation_mesh); - ClassDB::bind_method(_MD("set_enabled","enabled"),&NavigationMeshInstance::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&NavigationMeshInstance::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&NavigationMeshInstance::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&NavigationMeshInstance::is_enabled); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"navmesh",PROPERTY_HINT_RESOURCE_TYPE,"NavigationMesh"),"set_navigation_mesh","get_navigation_mesh"); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index b8403b566b..0e0c1e9dc6 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -406,39 +406,39 @@ RES Particles::_get_gizmo_geometry() const { void Particles::_bind_methods() { - ClassDB::bind_method(_MD("set_amount","amount"),&Particles::set_amount); - ClassDB::bind_method(_MD("get_amount"),&Particles::get_amount); - ClassDB::bind_method(_MD("set_emitting","enabled"),&Particles::set_emitting); - ClassDB::bind_method(_MD("is_emitting"),&Particles::is_emitting); - ClassDB::bind_method(_MD("set_visibility_aabb","aabb"),&Particles::set_visibility_aabb); - ClassDB::bind_method(_MD("get_visibility_aabb"),&Particles::get_visibility_aabb); - ClassDB::bind_method(_MD("set_emission_half_extents","half_extents"),&Particles::set_emission_half_extents); - ClassDB::bind_method(_MD("get_emission_half_extents"),&Particles::get_emission_half_extents); - ClassDB::bind_method(_MD("set_emission_base_velocity","base_velocity"),&Particles::set_emission_base_velocity); - ClassDB::bind_method(_MD("get_emission_base_velocity"),&Particles::get_emission_base_velocity); - ClassDB::bind_method(_MD("set_emission_points","points"),&Particles::set_emission_points); - ClassDB::bind_method(_MD("get_emission_points"),&Particles::get_emission_points); - ClassDB::bind_method(_MD("set_gravity_normal","normal"),&Particles::set_gravity_normal); - ClassDB::bind_method(_MD("get_gravity_normal"),&Particles::get_gravity_normal); - ClassDB::bind_method(_MD("set_variable","variable","value"),&Particles::set_variable); - ClassDB::bind_method(_MD("get_variable","variable"),&Particles::get_variable); - ClassDB::bind_method(_MD("set_randomness","variable","randomness"),&Particles::set_randomness); - ClassDB::bind_method(_MD("get_randomness","variable"),&Particles::get_randomness); - ClassDB::bind_method(_MD("set_color_phase_pos","phase","pos"),&Particles::set_color_phase_pos); - ClassDB::bind_method(_MD("get_color_phase_pos","phase"),&Particles::get_color_phase_pos); - ClassDB::bind_method(_MD("set_color_phase_color","phase","color"),&Particles::set_color_phase_color); - ClassDB::bind_method(_MD("get_color_phase_color","phase"),&Particles::get_color_phase_color); - ClassDB::bind_method(_MD("set_material","material:Material"),&Particles::set_material); - ClassDB::bind_method(_MD("get_material:Material"),&Particles::get_material); - ClassDB::bind_method(_MD("set_emit_timeout","timeout"),&Particles::set_emit_timeout); - ClassDB::bind_method(_MD("get_emit_timeout"),&Particles::get_emit_timeout); - ClassDB::bind_method(_MD("set_height_from_velocity","enable"),&Particles::set_height_from_velocity); - ClassDB::bind_method(_MD("has_height_from_velocity"),&Particles::has_height_from_velocity); - ClassDB::bind_method(_MD("set_use_local_coordinates","enable"),&Particles::set_use_local_coordinates); - ClassDB::bind_method(_MD("is_using_local_coordinates"),&Particles::is_using_local_coordinates); - - ClassDB::bind_method(_MD("set_color_phases","count"),&Particles::set_color_phases); - ClassDB::bind_method(_MD("get_color_phases"),&Particles::get_color_phases); + ClassDB::bind_method(D_METHOD("set_amount","amount"),&Particles::set_amount); + ClassDB::bind_method(D_METHOD("get_amount"),&Particles::get_amount); + ClassDB::bind_method(D_METHOD("set_emitting","enabled"),&Particles::set_emitting); + ClassDB::bind_method(D_METHOD("is_emitting"),&Particles::is_emitting); + ClassDB::bind_method(D_METHOD("set_visibility_aabb","aabb"),&Particles::set_visibility_aabb); + ClassDB::bind_method(D_METHOD("get_visibility_aabb"),&Particles::get_visibility_aabb); + ClassDB::bind_method(D_METHOD("set_emission_half_extents","half_extents"),&Particles::set_emission_half_extents); + ClassDB::bind_method(D_METHOD("get_emission_half_extents"),&Particles::get_emission_half_extents); + ClassDB::bind_method(D_METHOD("set_emission_base_velocity","base_velocity"),&Particles::set_emission_base_velocity); + ClassDB::bind_method(D_METHOD("get_emission_base_velocity"),&Particles::get_emission_base_velocity); + ClassDB::bind_method(D_METHOD("set_emission_points","points"),&Particles::set_emission_points); + ClassDB::bind_method(D_METHOD("get_emission_points"),&Particles::get_emission_points); + ClassDB::bind_method(D_METHOD("set_gravity_normal","normal"),&Particles::set_gravity_normal); + ClassDB::bind_method(D_METHOD("get_gravity_normal"),&Particles::get_gravity_normal); + ClassDB::bind_method(D_METHOD("set_variable","variable","value"),&Particles::set_variable); + ClassDB::bind_method(D_METHOD("get_variable","variable"),&Particles::get_variable); + ClassDB::bind_method(D_METHOD("set_randomness","variable","randomness"),&Particles::set_randomness); + ClassDB::bind_method(D_METHOD("get_randomness","variable"),&Particles::get_randomness); + ClassDB::bind_method(D_METHOD("set_color_phase_pos","phase","pos"),&Particles::set_color_phase_pos); + ClassDB::bind_method(D_METHOD("get_color_phase_pos","phase"),&Particles::get_color_phase_pos); + ClassDB::bind_method(D_METHOD("set_color_phase_color","phase","color"),&Particles::set_color_phase_color); + ClassDB::bind_method(D_METHOD("get_color_phase_color","phase"),&Particles::get_color_phase_color); + ClassDB::bind_method(D_METHOD("set_material","material:Material"),&Particles::set_material); + ClassDB::bind_method(D_METHOD("get_material:Material"),&Particles::get_material); + ClassDB::bind_method(D_METHOD("set_emit_timeout","timeout"),&Particles::set_emit_timeout); + ClassDB::bind_method(D_METHOD("get_emit_timeout"),&Particles::get_emit_timeout); + ClassDB::bind_method(D_METHOD("set_height_from_velocity","enable"),&Particles::set_height_from_velocity); + ClassDB::bind_method(D_METHOD("has_height_from_velocity"),&Particles::has_height_from_velocity); + ClassDB::bind_method(D_METHOD("set_use_local_coordinates","enable"),&Particles::set_use_local_coordinates); + ClassDB::bind_method(D_METHOD("is_using_local_coordinates"),&Particles::is_using_local_coordinates); + + ClassDB::bind_method(D_METHOD("set_color_phases","count"),&Particles::set_color_phases); + ClassDB::bind_method(D_METHOD("get_color_phases"),&Particles::get_color_phases); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "Material" ), "set_material", "get_material") ; diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index 840f779e5a..ead150e40b 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -80,9 +80,9 @@ Ref<Curve3D> Path::get_curve() const{ void Path::_bind_methods() { - ClassDB::bind_method(_MD("set_curve","curve:Curve3D"),&Path::set_curve); - ClassDB::bind_method(_MD("get_curve:Curve3D","curve"),&Path::get_curve); - ClassDB::bind_method(_MD("_curve_changed"),&Path::_curve_changed); + ClassDB::bind_method(D_METHOD("set_curve","curve:Curve3D"),&Path::set_curve); + ClassDB::bind_method(D_METHOD("get_curve:Curve3D","curve"),&Path::get_curve); + ClassDB::bind_method(D_METHOD("_curve_changed"),&Path::_curve_changed); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve3D"), "set_curve","get_curve"); } @@ -257,26 +257,26 @@ void PathFollow::_get_property_list( List<PropertyInfo> *p_list) const{ void PathFollow::_bind_methods() { - ClassDB::bind_method(_MD("set_offset","offset"),&PathFollow::set_offset); - ClassDB::bind_method(_MD("get_offset"),&PathFollow::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&PathFollow::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&PathFollow::get_offset); - ClassDB::bind_method(_MD("set_h_offset","h_offset"),&PathFollow::set_h_offset); - ClassDB::bind_method(_MD("get_h_offset"),&PathFollow::get_h_offset); + ClassDB::bind_method(D_METHOD("set_h_offset","h_offset"),&PathFollow::set_h_offset); + ClassDB::bind_method(D_METHOD("get_h_offset"),&PathFollow::get_h_offset); - ClassDB::bind_method(_MD("set_v_offset","v_offset"),&PathFollow::set_v_offset); - ClassDB::bind_method(_MD("get_v_offset"),&PathFollow::get_v_offset); + ClassDB::bind_method(D_METHOD("set_v_offset","v_offset"),&PathFollow::set_v_offset); + ClassDB::bind_method(D_METHOD("get_v_offset"),&PathFollow::get_v_offset); - ClassDB::bind_method(_MD("set_unit_offset","unit_offset"),&PathFollow::set_unit_offset); - ClassDB::bind_method(_MD("get_unit_offset"),&PathFollow::get_unit_offset); + ClassDB::bind_method(D_METHOD("set_unit_offset","unit_offset"),&PathFollow::set_unit_offset); + ClassDB::bind_method(D_METHOD("get_unit_offset"),&PathFollow::get_unit_offset); - ClassDB::bind_method(_MD("set_rotation_mode","rotation_mode"),&PathFollow::set_rotation_mode); - ClassDB::bind_method(_MD("get_rotation_mode"),&PathFollow::get_rotation_mode); + ClassDB::bind_method(D_METHOD("set_rotation_mode","rotation_mode"),&PathFollow::set_rotation_mode); + ClassDB::bind_method(D_METHOD("get_rotation_mode"),&PathFollow::get_rotation_mode); - ClassDB::bind_method(_MD("set_cubic_interpolation","enable"),&PathFollow::set_cubic_interpolation); - ClassDB::bind_method(_MD("get_cubic_interpolation"),&PathFollow::get_cubic_interpolation); + ClassDB::bind_method(D_METHOD("set_cubic_interpolation","enable"),&PathFollow::set_cubic_interpolation); + ClassDB::bind_method(D_METHOD("get_cubic_interpolation"),&PathFollow::get_cubic_interpolation); - ClassDB::bind_method(_MD("set_loop","loop"),&PathFollow::set_loop); - ClassDB::bind_method(_MD("has_loop"),&PathFollow::has_loop); + ClassDB::bind_method(D_METHOD("set_loop","loop"),&PathFollow::set_loop); + ClassDB::bind_method(D_METHOD("has_loop"),&PathFollow::has_loop); BIND_CONSTANT( ROTATION_NONE ); BIND_CONSTANT( ROTATION_Y ); diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 546518b4fa..af514a171f 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -147,20 +147,20 @@ uint32_t PhysicsBody::_get_layers() const{ } void PhysicsBody::_bind_methods() { - ClassDB::bind_method(_MD("set_collision_layer","layer"),&PhysicsBody::set_collision_layer); - ClassDB::bind_method(_MD("get_collision_layer"),&PhysicsBody::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_layer","layer"),&PhysicsBody::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"),&PhysicsBody::get_collision_layer); - ClassDB::bind_method(_MD("set_collision_mask","mask"),&PhysicsBody::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&PhysicsBody::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&PhysicsBody::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&PhysicsBody::get_collision_mask); - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&PhysicsBody::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&PhysicsBody::get_collision_mask_bit); + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&PhysicsBody::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&PhysicsBody::get_collision_mask_bit); - ClassDB::bind_method(_MD("set_collision_layer_bit","bit","value"),&PhysicsBody::set_collision_layer_bit); - ClassDB::bind_method(_MD("get_collision_layer_bit","bit"),&PhysicsBody::get_collision_layer_bit); + ClassDB::bind_method(D_METHOD("set_collision_layer_bit","bit","value"),&PhysicsBody::set_collision_layer_bit); + ClassDB::bind_method(D_METHOD("get_collision_layer_bit","bit"),&PhysicsBody::get_collision_layer_bit); - ClassDB::bind_method(_MD("_set_layers","mask"),&PhysicsBody::_set_layers); - ClassDB::bind_method(_MD("_get_layers"),&PhysicsBody::_get_layers); + ClassDB::bind_method(D_METHOD("_set_layers","mask"),&PhysicsBody::_set_layers); + ClassDB::bind_method(D_METHOD("_get_layers"),&PhysicsBody::_get_layers); ADD_GROUP("Collision","collision_"); ADD_PROPERTY(PropertyInfo(Variant::INT,"collision_layer",PROPERTY_HINT_LAYERS_3D_PHYSICS),"set_collision_layer","get_collision_layer"); @@ -230,19 +230,19 @@ Vector3 StaticBody::get_constant_angular_velocity() const { void StaticBody::_bind_methods() { - ClassDB::bind_method(_MD("set_constant_linear_velocity","vel"),&StaticBody::set_constant_linear_velocity); - ClassDB::bind_method(_MD("set_constant_angular_velocity","vel"),&StaticBody::set_constant_angular_velocity); - ClassDB::bind_method(_MD("get_constant_linear_velocity"),&StaticBody::get_constant_linear_velocity); - ClassDB::bind_method(_MD("get_constant_angular_velocity"),&StaticBody::get_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("set_constant_linear_velocity","vel"),&StaticBody::set_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("set_constant_angular_velocity","vel"),&StaticBody::set_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("get_constant_linear_velocity"),&StaticBody::get_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("get_constant_angular_velocity"),&StaticBody::get_constant_angular_velocity); - ClassDB::bind_method(_MD("set_friction","friction"),&StaticBody::set_friction); - ClassDB::bind_method(_MD("get_friction"),&StaticBody::get_friction); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&StaticBody::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&StaticBody::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&StaticBody::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&StaticBody::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&StaticBody::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&StaticBody::get_bounce); - ClassDB::bind_method(_MD("add_collision_exception_with","body:PhysicsBody"),&PhysicsBody::add_collision_exception_with); - ClassDB::bind_method(_MD("remove_collision_exception_with","body:PhysicsBody"),&PhysicsBody::remove_collision_exception_with); + ClassDB::bind_method(D_METHOD("add_collision_exception_with","body:PhysicsBody"),&PhysicsBody::add_collision_exception_with); + ClassDB::bind_method(D_METHOD("remove_collision_exception_with","body:PhysicsBody"),&PhysicsBody::remove_collision_exception_with); ADD_PROPERTY( PropertyInfo(Variant::REAL,"friction",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_friction","get_friction"); ADD_PROPERTY( PropertyInfo(Variant::REAL,"bounce",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_bounce","get_bounce"); @@ -800,66 +800,66 @@ Array RigidBody::get_colliding_bodies() const { void RigidBody::_bind_methods() { - ClassDB::bind_method(_MD("set_mode","mode"),&RigidBody::set_mode); - ClassDB::bind_method(_MD("get_mode"),&RigidBody::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&RigidBody::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&RigidBody::get_mode); - ClassDB::bind_method(_MD("set_mass","mass"),&RigidBody::set_mass); - ClassDB::bind_method(_MD("get_mass"),&RigidBody::get_mass); + ClassDB::bind_method(D_METHOD("set_mass","mass"),&RigidBody::set_mass); + ClassDB::bind_method(D_METHOD("get_mass"),&RigidBody::get_mass); - ClassDB::bind_method(_MD("set_weight","weight"),&RigidBody::set_weight); - ClassDB::bind_method(_MD("get_weight"),&RigidBody::get_weight); + ClassDB::bind_method(D_METHOD("set_weight","weight"),&RigidBody::set_weight); + ClassDB::bind_method(D_METHOD("get_weight"),&RigidBody::get_weight); - ClassDB::bind_method(_MD("set_friction","friction"),&RigidBody::set_friction); - ClassDB::bind_method(_MD("get_friction"),&RigidBody::get_friction); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&RigidBody::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&RigidBody::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&RigidBody::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&RigidBody::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&RigidBody::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&RigidBody::get_bounce); - ClassDB::bind_method(_MD("set_linear_velocity","linear_velocity"),&RigidBody::set_linear_velocity); - ClassDB::bind_method(_MD("get_linear_velocity"),&RigidBody::get_linear_velocity); + ClassDB::bind_method(D_METHOD("set_linear_velocity","linear_velocity"),&RigidBody::set_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&RigidBody::get_linear_velocity); - ClassDB::bind_method(_MD("set_angular_velocity","angular_velocity"),&RigidBody::set_angular_velocity); - ClassDB::bind_method(_MD("get_angular_velocity"),&RigidBody::get_angular_velocity); + ClassDB::bind_method(D_METHOD("set_angular_velocity","angular_velocity"),&RigidBody::set_angular_velocity); + ClassDB::bind_method(D_METHOD("get_angular_velocity"),&RigidBody::get_angular_velocity); - ClassDB::bind_method(_MD("set_gravity_scale","gravity_scale"),&RigidBody::set_gravity_scale); - ClassDB::bind_method(_MD("get_gravity_scale"),&RigidBody::get_gravity_scale); + ClassDB::bind_method(D_METHOD("set_gravity_scale","gravity_scale"),&RigidBody::set_gravity_scale); + ClassDB::bind_method(D_METHOD("get_gravity_scale"),&RigidBody::get_gravity_scale); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&RigidBody::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&RigidBody::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&RigidBody::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&RigidBody::get_linear_damp); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&RigidBody::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&RigidBody::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&RigidBody::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&RigidBody::get_angular_damp); - ClassDB::bind_method(_MD("set_max_contacts_reported","amount"),&RigidBody::set_max_contacts_reported); - ClassDB::bind_method(_MD("get_max_contacts_reported"),&RigidBody::get_max_contacts_reported); + ClassDB::bind_method(D_METHOD("set_max_contacts_reported","amount"),&RigidBody::set_max_contacts_reported); + ClassDB::bind_method(D_METHOD("get_max_contacts_reported"),&RigidBody::get_max_contacts_reported); - ClassDB::bind_method(_MD("set_use_custom_integrator","enable"),&RigidBody::set_use_custom_integrator); - ClassDB::bind_method(_MD("is_using_custom_integrator"),&RigidBody::is_using_custom_integrator); + ClassDB::bind_method(D_METHOD("set_use_custom_integrator","enable"),&RigidBody::set_use_custom_integrator); + ClassDB::bind_method(D_METHOD("is_using_custom_integrator"),&RigidBody::is_using_custom_integrator); - ClassDB::bind_method(_MD("set_contact_monitor","enabled"),&RigidBody::set_contact_monitor); - ClassDB::bind_method(_MD("is_contact_monitor_enabled"),&RigidBody::is_contact_monitor_enabled); + ClassDB::bind_method(D_METHOD("set_contact_monitor","enabled"),&RigidBody::set_contact_monitor); + ClassDB::bind_method(D_METHOD("is_contact_monitor_enabled"),&RigidBody::is_contact_monitor_enabled); - ClassDB::bind_method(_MD("set_use_continuous_collision_detection","enable"),&RigidBody::set_use_continuous_collision_detection); - ClassDB::bind_method(_MD("is_using_continuous_collision_detection"),&RigidBody::is_using_continuous_collision_detection); + ClassDB::bind_method(D_METHOD("set_use_continuous_collision_detection","enable"),&RigidBody::set_use_continuous_collision_detection); + ClassDB::bind_method(D_METHOD("is_using_continuous_collision_detection"),&RigidBody::is_using_continuous_collision_detection); - ClassDB::bind_method(_MD("set_axis_velocity","axis_velocity"),&RigidBody::set_axis_velocity); - ClassDB::bind_method(_MD("apply_impulse","pos","impulse"),&RigidBody::apply_impulse); + ClassDB::bind_method(D_METHOD("set_axis_velocity","axis_velocity"),&RigidBody::set_axis_velocity); + ClassDB::bind_method(D_METHOD("apply_impulse","pos","impulse"),&RigidBody::apply_impulse); - ClassDB::bind_method(_MD("set_sleeping","sleeping"),&RigidBody::set_sleeping); - ClassDB::bind_method(_MD("is_sleeping"),&RigidBody::is_sleeping); + ClassDB::bind_method(D_METHOD("set_sleeping","sleeping"),&RigidBody::set_sleeping); + ClassDB::bind_method(D_METHOD("is_sleeping"),&RigidBody::is_sleeping); - ClassDB::bind_method(_MD("set_can_sleep","able_to_sleep"),&RigidBody::set_can_sleep); - ClassDB::bind_method(_MD("is_able_to_sleep"),&RigidBody::is_able_to_sleep); + ClassDB::bind_method(D_METHOD("set_can_sleep","able_to_sleep"),&RigidBody::set_can_sleep); + ClassDB::bind_method(D_METHOD("is_able_to_sleep"),&RigidBody::is_able_to_sleep); - ClassDB::bind_method(_MD("_direct_state_changed"),&RigidBody::_direct_state_changed); - ClassDB::bind_method(_MD("_body_enter_tree"),&RigidBody::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree"),&RigidBody::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_direct_state_changed"),&RigidBody::_direct_state_changed); + ClassDB::bind_method(D_METHOD("_body_enter_tree"),&RigidBody::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree"),&RigidBody::_body_exit_tree); - ClassDB::bind_method(_MD("set_axis_lock","axis_lock"),&RigidBody::set_axis_lock); - ClassDB::bind_method(_MD("get_axis_lock"),&RigidBody::get_axis_lock); + ClassDB::bind_method(D_METHOD("set_axis_lock","axis_lock"),&RigidBody::set_axis_lock); + ClassDB::bind_method(D_METHOD("get_axis_lock"),&RigidBody::get_axis_lock); - ClassDB::bind_method(_MD("get_colliding_bodies"),&RigidBody::get_colliding_bodies); + ClassDB::bind_method(D_METHOD("get_colliding_bodies"),&RigidBody::get_colliding_bodies); BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:PhysicsDirectBodyState"))); @@ -1298,34 +1298,34 @@ float KinematicBody::get_collision_margin() const{ void KinematicBody::_bind_methods() { - ClassDB::bind_method(_MD("move","rel_vec"),&KinematicBody::move); - ClassDB::bind_method(_MD("move_to","position"),&KinematicBody::move_to); + ClassDB::bind_method(D_METHOD("move","rel_vec"),&KinematicBody::move); + ClassDB::bind_method(D_METHOD("move_to","position"),&KinematicBody::move_to); - ClassDB::bind_method(_MD("can_teleport_to","position"),&KinematicBody::can_teleport_to); + ClassDB::bind_method(D_METHOD("can_teleport_to","position"),&KinematicBody::can_teleport_to); - ClassDB::bind_method(_MD("is_colliding"),&KinematicBody::is_colliding); + ClassDB::bind_method(D_METHOD("is_colliding"),&KinematicBody::is_colliding); - ClassDB::bind_method(_MD("get_collision_pos"),&KinematicBody::get_collision_pos); - ClassDB::bind_method(_MD("get_collision_normal"),&KinematicBody::get_collision_normal); - ClassDB::bind_method(_MD("get_collider_velocity"),&KinematicBody::get_collider_velocity); - ClassDB::bind_method(_MD("get_collider:Variant"),&KinematicBody::_get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&KinematicBody::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collision_pos"),&KinematicBody::get_collision_pos); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&KinematicBody::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider_velocity"),&KinematicBody::get_collider_velocity); + ClassDB::bind_method(D_METHOD("get_collider:Variant"),&KinematicBody::_get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&KinematicBody::get_collider_shape); - ClassDB::bind_method(_MD("set_collide_with_static_bodies","enable"),&KinematicBody::set_collide_with_static_bodies); - ClassDB::bind_method(_MD("can_collide_with_static_bodies"),&KinematicBody::can_collide_with_static_bodies); + ClassDB::bind_method(D_METHOD("set_collide_with_static_bodies","enable"),&KinematicBody::set_collide_with_static_bodies); + ClassDB::bind_method(D_METHOD("can_collide_with_static_bodies"),&KinematicBody::can_collide_with_static_bodies); - ClassDB::bind_method(_MD("set_collide_with_kinematic_bodies","enable"),&KinematicBody::set_collide_with_kinematic_bodies); - ClassDB::bind_method(_MD("can_collide_with_kinematic_bodies"),&KinematicBody::can_collide_with_kinematic_bodies); + ClassDB::bind_method(D_METHOD("set_collide_with_kinematic_bodies","enable"),&KinematicBody::set_collide_with_kinematic_bodies); + ClassDB::bind_method(D_METHOD("can_collide_with_kinematic_bodies"),&KinematicBody::can_collide_with_kinematic_bodies); - ClassDB::bind_method(_MD("set_collide_with_rigid_bodies","enable"),&KinematicBody::set_collide_with_rigid_bodies); - ClassDB::bind_method(_MD("can_collide_with_rigid_bodies"),&KinematicBody::can_collide_with_rigid_bodies); + ClassDB::bind_method(D_METHOD("set_collide_with_rigid_bodies","enable"),&KinematicBody::set_collide_with_rigid_bodies); + ClassDB::bind_method(D_METHOD("can_collide_with_rigid_bodies"),&KinematicBody::can_collide_with_rigid_bodies); - ClassDB::bind_method(_MD("set_collide_with_character_bodies","enable"),&KinematicBody::set_collide_with_character_bodies); - ClassDB::bind_method(_MD("can_collide_with_character_bodies"),&KinematicBody::can_collide_with_character_bodies); + ClassDB::bind_method(D_METHOD("set_collide_with_character_bodies","enable"),&KinematicBody::set_collide_with_character_bodies); + ClassDB::bind_method(D_METHOD("can_collide_with_character_bodies"),&KinematicBody::can_collide_with_character_bodies); - ClassDB::bind_method(_MD("set_collision_margin","pixels"),&KinematicBody::set_collision_margin); - ClassDB::bind_method(_MD("get_collision_margin","pixels"),&KinematicBody::get_collision_margin); + ClassDB::bind_method(D_METHOD("set_collision_margin","pixels"),&KinematicBody::set_collision_margin); + ClassDB::bind_method(D_METHOD("get_collision_margin","pixels"),&KinematicBody::get_collision_margin); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"collide_with/static"),"set_collide_with_static_bodies","can_collide_with_static_bodies"); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"collide_with/kinematic"),"set_collide_with_kinematic_bodies","can_collide_with_kinematic_bodies"); diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index 9a06c37523..d48d75f464 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -167,17 +167,17 @@ bool Joint::get_exclude_nodes_from_collision() const{ void Joint::_bind_methods() { - ClassDB::bind_method( _MD("set_node_a","node"), &Joint::set_node_a ); - ClassDB::bind_method( _MD("get_node_a"), &Joint::get_node_a ); + ClassDB::bind_method( D_METHOD("set_node_a","node"), &Joint::set_node_a ); + ClassDB::bind_method( D_METHOD("get_node_a"), &Joint::get_node_a ); - ClassDB::bind_method( _MD("set_node_b","node"), &Joint::set_node_b ); - ClassDB::bind_method( _MD("get_node_b"), &Joint::get_node_b ); + ClassDB::bind_method( D_METHOD("set_node_b","node"), &Joint::set_node_b ); + ClassDB::bind_method( D_METHOD("get_node_b"), &Joint::get_node_b ); - ClassDB::bind_method( _MD("set_solver_priority","priority"), &Joint::set_solver_priority ); - ClassDB::bind_method( _MD("get_solver_priority"), &Joint::get_solver_priority ); + ClassDB::bind_method( D_METHOD("set_solver_priority","priority"), &Joint::set_solver_priority ); + ClassDB::bind_method( D_METHOD("get_solver_priority"), &Joint::get_solver_priority ); - ClassDB::bind_method( _MD("set_exclude_nodes_from_collision","enable"), &Joint::set_exclude_nodes_from_collision ); - ClassDB::bind_method( _MD("get_exclude_nodes_from_collision"), &Joint::get_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("set_exclude_nodes_from_collision","enable"), &Joint::set_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("get_exclude_nodes_from_collision"), &Joint::get_exclude_nodes_from_collision ); ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "nodes/node_a"), "set_node_a","get_node_a") ; ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "nodes/node_b"), "set_node_b","get_node_b") ; @@ -203,8 +203,8 @@ Joint::Joint() { void PinJoint::_bind_methods() { - ClassDB::bind_method(_MD("set_param","param","value"),&PinJoint::set_param); - ClassDB::bind_method(_MD("get_param","param"),&PinJoint::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&PinJoint::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&PinJoint::get_param); ADD_PROPERTYI( PropertyInfo(Variant::REAL,"params/bias",PROPERTY_HINT_RANGE,"0.01,0.99,0.01"),"set_param","get_param", PARAM_BIAS ); ADD_PROPERTYI( PropertyInfo(Variant::REAL,"params/damping",PROPERTY_HINT_RANGE,"0.01,8.0,0.01"),"set_param","get_param", PARAM_DAMPING ); @@ -292,17 +292,17 @@ float HingeJoint::_get_lower_limit() const { void HingeJoint::_bind_methods() { - ClassDB::bind_method(_MD("set_param","param","value"),&HingeJoint::set_param); - ClassDB::bind_method(_MD("get_param","param"),&HingeJoint::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&HingeJoint::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&HingeJoint::get_param); - ClassDB::bind_method(_MD("set_flag","flag","enabled"),&HingeJoint::set_flag); - ClassDB::bind_method(_MD("get_flag","flag"),&HingeJoint::get_flag); + ClassDB::bind_method(D_METHOD("set_flag","flag","enabled"),&HingeJoint::set_flag); + ClassDB::bind_method(D_METHOD("get_flag","flag"),&HingeJoint::get_flag); - ClassDB::bind_method(_MD("_set_upper_limit","upper_limit"),&HingeJoint::_set_upper_limit); - ClassDB::bind_method(_MD("_get_upper_limit"),&HingeJoint::_get_upper_limit); + ClassDB::bind_method(D_METHOD("_set_upper_limit","upper_limit"),&HingeJoint::_set_upper_limit); + ClassDB::bind_method(D_METHOD("_get_upper_limit"),&HingeJoint::_get_upper_limit); - ClassDB::bind_method(_MD("_set_lower_limit","lower_limit"),&HingeJoint::_set_lower_limit); - ClassDB::bind_method(_MD("_get_lower_limit"),&HingeJoint::_get_lower_limit); + ClassDB::bind_method(D_METHOD("_set_lower_limit","lower_limit"),&HingeJoint::_set_lower_limit); + ClassDB::bind_method(D_METHOD("_get_lower_limit"),&HingeJoint::_get_lower_limit); ADD_PROPERTYI( PropertyInfo(Variant::REAL,"params/bias",PROPERTY_HINT_RANGE,"0.01,0.99,0.01"),"set_param","get_param", PARAM_BIAS ); @@ -447,15 +447,15 @@ float SliderJoint::_get_lower_limit_angular() const { void SliderJoint::_bind_methods() { - ClassDB::bind_method(_MD("set_param","param","value"),&SliderJoint::set_param); - ClassDB::bind_method(_MD("get_param","param"),&SliderJoint::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&SliderJoint::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&SliderJoint::get_param); - ClassDB::bind_method(_MD("_set_upper_limit_angular","upper_limit_angular"),&SliderJoint::_set_upper_limit_angular); - ClassDB::bind_method(_MD("_get_upper_limit_angular"),&SliderJoint::_get_upper_limit_angular); + ClassDB::bind_method(D_METHOD("_set_upper_limit_angular","upper_limit_angular"),&SliderJoint::_set_upper_limit_angular); + ClassDB::bind_method(D_METHOD("_get_upper_limit_angular"),&SliderJoint::_get_upper_limit_angular); - ClassDB::bind_method(_MD("_set_lower_limit_angular","lower_limit_angular"),&SliderJoint::_set_lower_limit_angular); - ClassDB::bind_method(_MD("_get_lower_limit_angular"),&SliderJoint::_get_lower_limit_angular); + ClassDB::bind_method(D_METHOD("_set_lower_limit_angular","lower_limit_angular"),&SliderJoint::_set_lower_limit_angular); + ClassDB::bind_method(D_METHOD("_get_lower_limit_angular"),&SliderJoint::_get_lower_limit_angular); ADD_PROPERTYI( PropertyInfo(Variant::REAL,"linear_limit/upper_distance",PROPERTY_HINT_RANGE,"-1024,1024,0.01"),"set_param","get_param", PARAM_LINEAR_LIMIT_UPPER); @@ -612,15 +612,15 @@ float ConeTwistJoint::_get_twist_span() const { void ConeTwistJoint::_bind_methods() { - ClassDB::bind_method(_MD("set_param","param","value"),&ConeTwistJoint::set_param); - ClassDB::bind_method(_MD("get_param","param"),&ConeTwistJoint::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&ConeTwistJoint::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&ConeTwistJoint::get_param); - ClassDB::bind_method(_MD("_set_swing_span","swing_span"),&ConeTwistJoint::_set_swing_span); - ClassDB::bind_method(_MD("_get_swing_span"),&ConeTwistJoint::_get_swing_span); + ClassDB::bind_method(D_METHOD("_set_swing_span","swing_span"),&ConeTwistJoint::_set_swing_span); + ClassDB::bind_method(D_METHOD("_get_swing_span"),&ConeTwistJoint::_get_swing_span); - ClassDB::bind_method(_MD("_set_twist_span","twist_span"),&ConeTwistJoint::_set_twist_span); - ClassDB::bind_method(_MD("_get_twist_span"),&ConeTwistJoint::_get_twist_span); + ClassDB::bind_method(D_METHOD("_set_twist_span","twist_span"),&ConeTwistJoint::_set_twist_span); + ClassDB::bind_method(D_METHOD("_get_twist_span"),&ConeTwistJoint::_get_twist_span); ADD_PROPERTY( PropertyInfo(Variant::REAL,"swing_span",PROPERTY_HINT_RANGE,"-180,180,0.1"),"_set_swing_span","_get_swing_span") ; @@ -771,41 +771,41 @@ float Generic6DOFJoint::_get_angular_lo_limit_z() const{ void Generic6DOFJoint::_bind_methods(){ - ClassDB::bind_method(_MD("_set_angular_hi_limit_x","angle"),&Generic6DOFJoint::_set_angular_hi_limit_x); - ClassDB::bind_method(_MD("_get_angular_hi_limit_x"),&Generic6DOFJoint::_get_angular_hi_limit_x); + ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_x","angle"),&Generic6DOFJoint::_set_angular_hi_limit_x); + ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_x"),&Generic6DOFJoint::_get_angular_hi_limit_x); - ClassDB::bind_method(_MD("_set_angular_lo_limit_x","angle"),&Generic6DOFJoint::_set_angular_lo_limit_x); - ClassDB::bind_method(_MD("_get_angular_lo_limit_x"),&Generic6DOFJoint::_get_angular_lo_limit_x); + ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_x","angle"),&Generic6DOFJoint::_set_angular_lo_limit_x); + ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_x"),&Generic6DOFJoint::_get_angular_lo_limit_x); - ClassDB::bind_method(_MD("_set_angular_hi_limit_y","angle"),&Generic6DOFJoint::_set_angular_hi_limit_y); - ClassDB::bind_method(_MD("_get_angular_hi_limit_y"),&Generic6DOFJoint::_get_angular_hi_limit_y); + ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_y","angle"),&Generic6DOFJoint::_set_angular_hi_limit_y); + ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_y"),&Generic6DOFJoint::_get_angular_hi_limit_y); - ClassDB::bind_method(_MD("_set_angular_lo_limit_y","angle"),&Generic6DOFJoint::_set_angular_lo_limit_y); - ClassDB::bind_method(_MD("_get_angular_lo_limit_y"),&Generic6DOFJoint::_get_angular_lo_limit_y); + ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_y","angle"),&Generic6DOFJoint::_set_angular_lo_limit_y); + ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_y"),&Generic6DOFJoint::_get_angular_lo_limit_y); - ClassDB::bind_method(_MD("_set_angular_hi_limit_z","angle"),&Generic6DOFJoint::_set_angular_hi_limit_z); - ClassDB::bind_method(_MD("_get_angular_hi_limit_z"),&Generic6DOFJoint::_get_angular_hi_limit_z); + ClassDB::bind_method(D_METHOD("_set_angular_hi_limit_z","angle"),&Generic6DOFJoint::_set_angular_hi_limit_z); + ClassDB::bind_method(D_METHOD("_get_angular_hi_limit_z"),&Generic6DOFJoint::_get_angular_hi_limit_z); - ClassDB::bind_method(_MD("_set_angular_lo_limit_z","angle"),&Generic6DOFJoint::_set_angular_lo_limit_z); - ClassDB::bind_method(_MD("_get_angular_lo_limit_z"),&Generic6DOFJoint::_get_angular_lo_limit_z); + ClassDB::bind_method(D_METHOD("_set_angular_lo_limit_z","angle"),&Generic6DOFJoint::_set_angular_lo_limit_z); + ClassDB::bind_method(D_METHOD("_get_angular_lo_limit_z"),&Generic6DOFJoint::_get_angular_lo_limit_z); - ClassDB::bind_method(_MD("set_param_x","param","value"),&Generic6DOFJoint::set_param_x); - ClassDB::bind_method(_MD("get_param_x","param"),&Generic6DOFJoint::get_param_x); + ClassDB::bind_method(D_METHOD("set_param_x","param","value"),&Generic6DOFJoint::set_param_x); + ClassDB::bind_method(D_METHOD("get_param_x","param"),&Generic6DOFJoint::get_param_x); - ClassDB::bind_method(_MD("set_param_y","param","value"),&Generic6DOFJoint::set_param_y); - ClassDB::bind_method(_MD("get_param_y","param"),&Generic6DOFJoint::get_param_y); + ClassDB::bind_method(D_METHOD("set_param_y","param","value"),&Generic6DOFJoint::set_param_y); + ClassDB::bind_method(D_METHOD("get_param_y","param"),&Generic6DOFJoint::get_param_y); - ClassDB::bind_method(_MD("set_param_z","param","value"),&Generic6DOFJoint::set_param_z); - ClassDB::bind_method(_MD("get_param_z","param"),&Generic6DOFJoint::get_param_z); + ClassDB::bind_method(D_METHOD("set_param_z","param","value"),&Generic6DOFJoint::set_param_z); + ClassDB::bind_method(D_METHOD("get_param_z","param"),&Generic6DOFJoint::get_param_z); - ClassDB::bind_method(_MD("set_flag_x","flag","value"),&Generic6DOFJoint::set_flag_x); - ClassDB::bind_method(_MD("get_flag_x","flag"),&Generic6DOFJoint::get_flag_x); + ClassDB::bind_method(D_METHOD("set_flag_x","flag","value"),&Generic6DOFJoint::set_flag_x); + ClassDB::bind_method(D_METHOD("get_flag_x","flag"),&Generic6DOFJoint::get_flag_x); - ClassDB::bind_method(_MD("set_flag_y","flag","value"),&Generic6DOFJoint::set_flag_y); - ClassDB::bind_method(_MD("get_flag_y","flag"),&Generic6DOFJoint::get_flag_y); + ClassDB::bind_method(D_METHOD("set_flag_y","flag","value"),&Generic6DOFJoint::set_flag_y); + ClassDB::bind_method(D_METHOD("get_flag_y","flag"),&Generic6DOFJoint::get_flag_y); - ClassDB::bind_method(_MD("set_flag_z","flag","value"),&Generic6DOFJoint::set_flag_z); - ClassDB::bind_method(_MD("get_flag_z","flag"),&Generic6DOFJoint::get_flag_z); + ClassDB::bind_method(D_METHOD("set_flag_z","flag","value"),&Generic6DOFJoint::set_flag_z); + ClassDB::bind_method(D_METHOD("get_flag_z","flag"),&Generic6DOFJoint::get_flag_z); ADD_PROPERTYI(PropertyInfo(Variant::BOOL,"linear_limit_x/enabled"),"set_flag_x","get_flag_x",FLAG_ENABLE_LINEAR_LIMIT); @@ -1171,22 +1171,22 @@ RID PhysicsJoint::_get_visual_instance_rid() const { void PhysicsJoint::_bind_methods() { - ClassDB::bind_method(_MD("_get_visual_instance_rid"),&PhysicsJoint::_get_visual_instance_rid); - ClassDB::bind_method(_MD("set_body_A","path"),&PhysicsJoint::set_body_A); - ClassDB::bind_method(_MD("set_body_B"),&PhysicsJoint::set_body_B); - ClassDB::bind_method(_MD("get_body_A","path"),&PhysicsJoint::get_body_A); - ClassDB::bind_method(_MD("get_body_B"),&PhysicsJoint::get_body_B); + ClassDB::bind_method(D_METHOD("_get_visual_instance_rid"),&PhysicsJoint::_get_visual_instance_rid); + ClassDB::bind_method(D_METHOD("set_body_A","path"),&PhysicsJoint::set_body_A); + ClassDB::bind_method(D_METHOD("set_body_B"),&PhysicsJoint::set_body_B); + ClassDB::bind_method(D_METHOD("get_body_A","path"),&PhysicsJoint::get_body_A); + ClassDB::bind_method(D_METHOD("get_body_B"),&PhysicsJoint::get_body_B); - ClassDB::bind_method(_MD("set_active","active"),&PhysicsJoint::set_active); - ClassDB::bind_method(_MD("is_active"),&PhysicsJoint::is_active); + ClassDB::bind_method(D_METHOD("set_active","active"),&PhysicsJoint::set_active); + ClassDB::bind_method(D_METHOD("is_active"),&PhysicsJoint::is_active); - ClassDB::bind_method(_MD("set_disable_collision","disable"),&PhysicsJoint::set_disable_collision); - ClassDB::bind_method(_MD("has_disable_collision"),&PhysicsJoint::has_disable_collision); + ClassDB::bind_method(D_METHOD("set_disable_collision","disable"),&PhysicsJoint::set_disable_collision); + ClassDB::bind_method(D_METHOD("has_disable_collision"),&PhysicsJoint::has_disable_collision); ClassDB::bind_method("reconnect",&PhysicsJoint::reconnect); - ClassDB::bind_method(_MD("get_rid"),&PhysicsJoint::get_rid); + ClassDB::bind_method(D_METHOD("get_rid"),&PhysicsJoint::get_rid); } diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 054b61a4ed..44e4fb54da 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -197,20 +197,20 @@ Color Portal::get_disabled_color() const { void Portal::_bind_methods() { - ClassDB::bind_method(_MD("set_shape","points"),&Portal::set_shape); - ClassDB::bind_method(_MD("get_shape"),&Portal::get_shape); + ClassDB::bind_method(D_METHOD("set_shape","points"),&Portal::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&Portal::get_shape); - ClassDB::bind_method(_MD("set_enabled","enable"),&Portal::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&Portal::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enable"),&Portal::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&Portal::is_enabled); - ClassDB::bind_method(_MD("set_disable_distance","distance"),&Portal::set_disable_distance); - ClassDB::bind_method(_MD("get_disable_distance"),&Portal::get_disable_distance); + ClassDB::bind_method(D_METHOD("set_disable_distance","distance"),&Portal::set_disable_distance); + ClassDB::bind_method(D_METHOD("get_disable_distance"),&Portal::get_disable_distance); - ClassDB::bind_method(_MD("set_disabled_color","color"),&Portal::set_disabled_color); - ClassDB::bind_method(_MD("get_disabled_color"),&Portal::get_disabled_color); + ClassDB::bind_method(D_METHOD("set_disabled_color","color"),&Portal::set_disabled_color); + ClassDB::bind_method(D_METHOD("get_disabled_color"),&Portal::get_disabled_color); - ClassDB::bind_method(_MD("set_connect_range","range"),&Portal::set_connect_range); - ClassDB::bind_method(_MD("get_connect_range"),&Portal::get_connect_range); + ClassDB::bind_method(D_METHOD("set_connect_range","range"),&Portal::set_connect_range); + ClassDB::bind_method(D_METHOD("get_connect_range"),&Portal::get_connect_range); } diff --git a/scene/3d/proximity_group.cpp b/scene/3d/proximity_group.cpp index 4ad2fde6f8..f0dc8cb2ed 100644 --- a/scene/3d/proximity_group.cpp +++ b/scene/3d/proximity_group.cpp @@ -171,12 +171,12 @@ Vector3 ProximityGroup::get_grid_radius() const { void ProximityGroup::_bind_methods() { - ClassDB::bind_method(_MD("set_group_name","name"), &ProximityGroup::set_group_name); - ClassDB::bind_method(_MD("broadcast","name", "parameters"), &ProximityGroup::broadcast); - ClassDB::bind_method(_MD("set_dispatch_mode","mode"), &ProximityGroup::set_dispatch_mode); - ClassDB::bind_method(_MD("_proximity_group_broadcast","name","params"), &ProximityGroup::_proximity_group_broadcast); - ClassDB::bind_method(_MD("set_grid_radius","radius"), &ProximityGroup::set_grid_radius); - ClassDB::bind_method(_MD("get_grid_radius"), &ProximityGroup::get_grid_radius); + ClassDB::bind_method(D_METHOD("set_group_name","name"), &ProximityGroup::set_group_name); + ClassDB::bind_method(D_METHOD("broadcast","name", "parameters"), &ProximityGroup::broadcast); + ClassDB::bind_method(D_METHOD("set_dispatch_mode","mode"), &ProximityGroup::set_dispatch_mode); + ClassDB::bind_method(D_METHOD("_proximity_group_broadcast","name","params"), &ProximityGroup::_proximity_group_broadcast); + ClassDB::bind_method(D_METHOD("set_grid_radius","radius"), &ProximityGroup::set_grid_radius); + ClassDB::bind_method(D_METHOD("get_grid_radius"), &ProximityGroup::get_grid_radius); ADD_PROPERTY( PropertyInfo( Variant::VECTOR3, "grid_radius"), "set_grid_radius", "get_grid_radius"); diff --git a/scene/3d/quad.cpp b/scene/3d/quad.cpp index 8be39d289f..e740769bd4 100644 --- a/scene/3d/quad.cpp +++ b/scene/3d/quad.cpp @@ -199,17 +199,17 @@ Rect3 Quad::get_aabb() const { void Quad::_bind_methods(){ - ClassDB::bind_method(_MD("set_axis","axis"),&Quad::set_axis); - ClassDB::bind_method(_MD("get_axis"),&Quad::get_axis); + ClassDB::bind_method(D_METHOD("set_axis","axis"),&Quad::set_axis); + ClassDB::bind_method(D_METHOD("get_axis"),&Quad::get_axis); - ClassDB::bind_method(_MD("set_size","size"),&Quad::set_size); - ClassDB::bind_method(_MD("get_size"),&Quad::get_size); + ClassDB::bind_method(D_METHOD("set_size","size"),&Quad::set_size); + ClassDB::bind_method(D_METHOD("get_size"),&Quad::get_size); - ClassDB::bind_method(_MD("set_centered","centered"),&Quad::set_centered); - ClassDB::bind_method(_MD("is_centered"),&Quad::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&Quad::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&Quad::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&Quad::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Quad::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Quad::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Quad::get_offset); ADD_PROPERTY( PropertyInfo( Variant::INT, "axis", PROPERTY_HINT_ENUM,"X,Y,Z" ), "set_axis", "get_axis"); ADD_PROPERTY( PropertyInfo( Variant::VECTOR2, "size" ), "set_size", "get_size"); diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index 47c4417321..6be8b89441 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -210,33 +210,33 @@ void RayCast::clear_exceptions(){ void RayCast::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&RayCast::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&RayCast::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&RayCast::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&RayCast::is_enabled); - ClassDB::bind_method(_MD("set_cast_to","local_point"),&RayCast::set_cast_to); - ClassDB::bind_method(_MD("get_cast_to"),&RayCast::get_cast_to); + ClassDB::bind_method(D_METHOD("set_cast_to","local_point"),&RayCast::set_cast_to); + ClassDB::bind_method(D_METHOD("get_cast_to"),&RayCast::get_cast_to); - ClassDB::bind_method(_MD("is_colliding"),&RayCast::is_colliding); - ClassDB::bind_method(_MD("force_raycast_update"),&RayCast::force_raycast_update); + ClassDB::bind_method(D_METHOD("is_colliding"),&RayCast::is_colliding); + ClassDB::bind_method(D_METHOD("force_raycast_update"),&RayCast::force_raycast_update); - ClassDB::bind_method(_MD("get_collider"),&RayCast::get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&RayCast::get_collider_shape); - ClassDB::bind_method(_MD("get_collision_point"),&RayCast::get_collision_point); - ClassDB::bind_method(_MD("get_collision_normal"),&RayCast::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider"),&RayCast::get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&RayCast::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collision_point"),&RayCast::get_collision_point); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&RayCast::get_collision_normal); - ClassDB::bind_method(_MD("add_exception_rid","rid"),&RayCast::add_exception_rid); - ClassDB::bind_method(_MD("add_exception","node"),&RayCast::add_exception); + ClassDB::bind_method(D_METHOD("add_exception_rid","rid"),&RayCast::add_exception_rid); + ClassDB::bind_method(D_METHOD("add_exception","node"),&RayCast::add_exception); - ClassDB::bind_method(_MD("remove_exception_rid","rid"),&RayCast::remove_exception_rid); - ClassDB::bind_method(_MD("remove_exception","node"),&RayCast::remove_exception); + ClassDB::bind_method(D_METHOD("remove_exception_rid","rid"),&RayCast::remove_exception_rid); + ClassDB::bind_method(D_METHOD("remove_exception","node"),&RayCast::remove_exception); - ClassDB::bind_method(_MD("clear_exceptions"),&RayCast::clear_exceptions); + ClassDB::bind_method(D_METHOD("clear_exceptions"),&RayCast::clear_exceptions); - ClassDB::bind_method(_MD("set_layer_mask","mask"),&RayCast::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&RayCast::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","mask"),&RayCast::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&RayCast::get_layer_mask); - ClassDB::bind_method(_MD("set_type_mask","mask"),&RayCast::set_type_mask); - ClassDB::bind_method(_MD("get_type_mask"),&RayCast::get_type_mask); + ClassDB::bind_method(D_METHOD("set_type_mask","mask"),&RayCast::set_type_mask); + ClassDB::bind_method(D_METHOD("get_type_mask"),&RayCast::get_type_mask); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3,"cast_to"),"set_cast_to","get_cast_to"); diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index 5e87d623c5..bcda7ca0ae 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -185,42 +185,42 @@ void ReflectionProbe::_validate_property(PropertyInfo& property) const { void ReflectionProbe::_bind_methods() { - ClassDB::bind_method(_MD("set_intensity","intensity"),&ReflectionProbe::set_intensity); - ClassDB::bind_method(_MD("get_intensity"),&ReflectionProbe::get_intensity); + ClassDB::bind_method(D_METHOD("set_intensity","intensity"),&ReflectionProbe::set_intensity); + ClassDB::bind_method(D_METHOD("get_intensity"),&ReflectionProbe::get_intensity); - ClassDB::bind_method(_MD("set_interior_ambient","ambient"),&ReflectionProbe::set_interior_ambient); - ClassDB::bind_method(_MD("get_interior_ambient"),&ReflectionProbe::get_interior_ambient); + ClassDB::bind_method(D_METHOD("set_interior_ambient","ambient"),&ReflectionProbe::set_interior_ambient); + ClassDB::bind_method(D_METHOD("get_interior_ambient"),&ReflectionProbe::get_interior_ambient); - ClassDB::bind_method(_MD("set_interior_ambient_energy","ambient_energy"),&ReflectionProbe::set_interior_ambient_energy); - ClassDB::bind_method(_MD("get_interior_ambient_energy"),&ReflectionProbe::get_interior_ambient_energy); + ClassDB::bind_method(D_METHOD("set_interior_ambient_energy","ambient_energy"),&ReflectionProbe::set_interior_ambient_energy); + ClassDB::bind_method(D_METHOD("get_interior_ambient_energy"),&ReflectionProbe::get_interior_ambient_energy); - ClassDB::bind_method(_MD("set_interior_ambient_probe_contribution","ambient_probe_contribution"),&ReflectionProbe::set_interior_ambient_probe_contribution); - ClassDB::bind_method(_MD("get_interior_ambient_probe_contribution"),&ReflectionProbe::get_interior_ambient_probe_contribution); + ClassDB::bind_method(D_METHOD("set_interior_ambient_probe_contribution","ambient_probe_contribution"),&ReflectionProbe::set_interior_ambient_probe_contribution); + ClassDB::bind_method(D_METHOD("get_interior_ambient_probe_contribution"),&ReflectionProbe::get_interior_ambient_probe_contribution); - ClassDB::bind_method(_MD("set_max_distance","max_distance"),&ReflectionProbe::set_max_distance); - ClassDB::bind_method(_MD("get_max_distance"),&ReflectionProbe::get_max_distance); + ClassDB::bind_method(D_METHOD("set_max_distance","max_distance"),&ReflectionProbe::set_max_distance); + ClassDB::bind_method(D_METHOD("get_max_distance"),&ReflectionProbe::get_max_distance); - ClassDB::bind_method(_MD("set_extents","extents"),&ReflectionProbe::set_extents); - ClassDB::bind_method(_MD("get_extents"),&ReflectionProbe::get_extents); + ClassDB::bind_method(D_METHOD("set_extents","extents"),&ReflectionProbe::set_extents); + ClassDB::bind_method(D_METHOD("get_extents"),&ReflectionProbe::get_extents); - ClassDB::bind_method(_MD("set_origin_offset","origin_offset"),&ReflectionProbe::set_origin_offset); - ClassDB::bind_method(_MD("get_origin_offset"),&ReflectionProbe::get_origin_offset); + ClassDB::bind_method(D_METHOD("set_origin_offset","origin_offset"),&ReflectionProbe::set_origin_offset); + ClassDB::bind_method(D_METHOD("get_origin_offset"),&ReflectionProbe::get_origin_offset); - ClassDB::bind_method(_MD("set_as_interior","enable"),&ReflectionProbe::set_as_interior); - ClassDB::bind_method(_MD("is_set_as_interior"),&ReflectionProbe::is_set_as_interior); + ClassDB::bind_method(D_METHOD("set_as_interior","enable"),&ReflectionProbe::set_as_interior); + ClassDB::bind_method(D_METHOD("is_set_as_interior"),&ReflectionProbe::is_set_as_interior); - ClassDB::bind_method(_MD("set_enable_box_projection","enable"),&ReflectionProbe::set_enable_box_projection); - ClassDB::bind_method(_MD("is_box_projection_enabled"),&ReflectionProbe::is_box_projection_enabled); + ClassDB::bind_method(D_METHOD("set_enable_box_projection","enable"),&ReflectionProbe::set_enable_box_projection); + ClassDB::bind_method(D_METHOD("is_box_projection_enabled"),&ReflectionProbe::is_box_projection_enabled); - ClassDB::bind_method(_MD("set_enable_shadows","enable"),&ReflectionProbe::set_enable_shadows); - ClassDB::bind_method(_MD("are_shadows_enabled"),&ReflectionProbe::are_shadows_enabled); + ClassDB::bind_method(D_METHOD("set_enable_shadows","enable"),&ReflectionProbe::set_enable_shadows); + ClassDB::bind_method(D_METHOD("are_shadows_enabled"),&ReflectionProbe::are_shadows_enabled); - ClassDB::bind_method(_MD("set_cull_mask","layers"),&ReflectionProbe::set_cull_mask); - ClassDB::bind_method(_MD("get_cull_mask"),&ReflectionProbe::get_cull_mask); + ClassDB::bind_method(D_METHOD("set_cull_mask","layers"),&ReflectionProbe::set_cull_mask); + ClassDB::bind_method(D_METHOD("get_cull_mask"),&ReflectionProbe::get_cull_mask); - ClassDB::bind_method(_MD("set_update_mode","mode"),&ReflectionProbe::set_update_mode); - ClassDB::bind_method(_MD("get_update_mode"),&ReflectionProbe::get_update_mode); + ClassDB::bind_method(D_METHOD("set_update_mode","mode"),&ReflectionProbe::set_update_mode); + ClassDB::bind_method(D_METHOD("get_update_mode"),&ReflectionProbe::get_update_mode); ADD_PROPERTY( PropertyInfo(Variant::INT,"update_mode",PROPERTY_HINT_ENUM,"Once,Always"),"set_update_mode","get_update_mode"); ADD_PROPERTY( PropertyInfo(Variant::REAL,"intensity",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_intensity","get_intensity"); diff --git a/scene/3d/remote_transform.cpp b/scene/3d/remote_transform.cpp index 5da9ab2a55..21ec65f5e0 100644 --- a/scene/3d/remote_transform.cpp +++ b/scene/3d/remote_transform.cpp @@ -118,8 +118,8 @@ String RemoteTransform::get_configuration_warning() const { void RemoteTransform::_bind_methods() { - ClassDB::bind_method(_MD("set_remote_node","path"),&RemoteTransform::set_remote_node); - ClassDB::bind_method(_MD("get_remote_node"),&RemoteTransform::get_remote_node); + ClassDB::bind_method(D_METHOD("set_remote_node","path"),&RemoteTransform::set_remote_node); + ClassDB::bind_method(D_METHOD("get_remote_node"),&RemoteTransform::get_remote_node); ADD_PROPERTY( PropertyInfo(Variant::NODE_PATH,"remote_path"),"set_remote_node","get_remote_node"); } diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp index 15db769e11..fbfc44ce90 100644 --- a/scene/3d/room_instance.cpp +++ b/scene/3d/room_instance.cpp @@ -161,8 +161,8 @@ void Room::_bounds_changed() { void Room::_bind_methods() { - ClassDB::bind_method(_MD("set_room","room:Room"),&Room::set_room ); - ClassDB::bind_method(_MD("get_room:Room"),&Room::get_room ); + ClassDB::bind_method(D_METHOD("set_room","room:Room"),&Room::set_room ); + ClassDB::bind_method(D_METHOD("get_room:Room"),&Room::get_room ); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "room/room", PROPERTY_HINT_RESOURCE_TYPE, "Area" ), "set_room", "get_room") ; diff --git a/scene/3d/scenario_fx.cpp b/scene/3d/scenario_fx.cpp index 9366a347f8..145242ba7c 100644 --- a/scene/3d/scenario_fx.cpp +++ b/scene/3d/scenario_fx.cpp @@ -99,8 +99,8 @@ String WorldEnvironment::get_configuration_warning() const { void WorldEnvironment::_bind_methods() { - ClassDB::bind_method(_MD("set_environment","env:Environment"),&WorldEnvironment::set_environment); - ClassDB::bind_method(_MD("get_environment:Environment"),&WorldEnvironment::get_environment); + ClassDB::bind_method(D_METHOD("set_environment","env:Environment"),&WorldEnvironment::set_environment); + ClassDB::bind_method(D_METHOD("get_environment:Environment"),&WorldEnvironment::get_environment); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"environment",PROPERTY_HINT_RESOURCE_TYPE,"Environment"),"set_environment","get_environment"); } diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index f2e339604e..1bb6d83393 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -530,39 +530,39 @@ void Skeleton::_bind_methods() { - ClassDB::bind_method(_MD("add_bone","name"),&Skeleton::add_bone); - ClassDB::bind_method(_MD("find_bone","name"),&Skeleton::find_bone); - ClassDB::bind_method(_MD("get_bone_name","bone_idx"),&Skeleton::get_bone_name); + ClassDB::bind_method(D_METHOD("add_bone","name"),&Skeleton::add_bone); + ClassDB::bind_method(D_METHOD("find_bone","name"),&Skeleton::find_bone); + ClassDB::bind_method(D_METHOD("get_bone_name","bone_idx"),&Skeleton::get_bone_name); - ClassDB::bind_method(_MD("get_bone_parent","bone_idx"),&Skeleton::get_bone_parent); - ClassDB::bind_method(_MD("set_bone_parent","bone_idx","parent_idx"),&Skeleton::set_bone_parent); + ClassDB::bind_method(D_METHOD("get_bone_parent","bone_idx"),&Skeleton::get_bone_parent); + ClassDB::bind_method(D_METHOD("set_bone_parent","bone_idx","parent_idx"),&Skeleton::set_bone_parent); - ClassDB::bind_method(_MD("get_bone_count"),&Skeleton::get_bone_count); + ClassDB::bind_method(D_METHOD("get_bone_count"),&Skeleton::get_bone_count); - ClassDB::bind_method(_MD("unparent_bone_and_rest","bone_idx"),&Skeleton::unparent_bone_and_rest); + ClassDB::bind_method(D_METHOD("unparent_bone_and_rest","bone_idx"),&Skeleton::unparent_bone_and_rest); - ClassDB::bind_method(_MD("get_bone_rest","bone_idx"),&Skeleton::get_bone_rest); - ClassDB::bind_method(_MD("set_bone_rest","bone_idx","rest"),&Skeleton::set_bone_rest); + ClassDB::bind_method(D_METHOD("get_bone_rest","bone_idx"),&Skeleton::get_bone_rest); + ClassDB::bind_method(D_METHOD("set_bone_rest","bone_idx","rest"),&Skeleton::set_bone_rest); - ClassDB::bind_method(_MD("set_bone_disable_rest","bone_idx","disable"),&Skeleton::set_bone_disable_rest); - ClassDB::bind_method(_MD("is_bone_rest_disabled","bone_idx"),&Skeleton::is_bone_rest_disabled); + ClassDB::bind_method(D_METHOD("set_bone_disable_rest","bone_idx","disable"),&Skeleton::set_bone_disable_rest); + ClassDB::bind_method(D_METHOD("is_bone_rest_disabled","bone_idx"),&Skeleton::is_bone_rest_disabled); - ClassDB::bind_method(_MD("bind_child_node_to_bone","bone_idx","node:Node"),&Skeleton::bind_child_node_to_bone); - ClassDB::bind_method(_MD("unbind_child_node_from_bone","bone_idx","node:Node"),&Skeleton::unbind_child_node_from_bone); - ClassDB::bind_method(_MD("get_bound_child_nodes_to_bone","bone_idx"),&Skeleton::_get_bound_child_nodes_to_bone); + ClassDB::bind_method(D_METHOD("bind_child_node_to_bone","bone_idx","node:Node"),&Skeleton::bind_child_node_to_bone); + ClassDB::bind_method(D_METHOD("unbind_child_node_from_bone","bone_idx","node:Node"),&Skeleton::unbind_child_node_from_bone); + ClassDB::bind_method(D_METHOD("get_bound_child_nodes_to_bone","bone_idx"),&Skeleton::_get_bound_child_nodes_to_bone); - ClassDB::bind_method(_MD("clear_bones"),&Skeleton::clear_bones); + ClassDB::bind_method(D_METHOD("clear_bones"),&Skeleton::clear_bones); - ClassDB::bind_method(_MD("get_bone_pose","bone_idx"),&Skeleton::get_bone_pose); - ClassDB::bind_method(_MD("set_bone_pose","bone_idx","pose"),&Skeleton::set_bone_pose); + ClassDB::bind_method(D_METHOD("get_bone_pose","bone_idx"),&Skeleton::get_bone_pose); + ClassDB::bind_method(D_METHOD("set_bone_pose","bone_idx","pose"),&Skeleton::set_bone_pose); - ClassDB::bind_method(_MD("set_bone_global_pose","bone_idx","pose"),&Skeleton::set_bone_global_pose); - ClassDB::bind_method(_MD("get_bone_global_pose","bone_idx"),&Skeleton::get_bone_global_pose); + ClassDB::bind_method(D_METHOD("set_bone_global_pose","bone_idx","pose"),&Skeleton::set_bone_global_pose); + ClassDB::bind_method(D_METHOD("get_bone_global_pose","bone_idx"),&Skeleton::get_bone_global_pose); - ClassDB::bind_method(_MD("get_bone_custom_pose","bone_idx"),&Skeleton::get_bone_custom_pose); - ClassDB::bind_method(_MD("set_bone_custom_pose","bone_idx","custom_pose"),&Skeleton::set_bone_custom_pose); + ClassDB::bind_method(D_METHOD("get_bone_custom_pose","bone_idx"),&Skeleton::get_bone_custom_pose); + ClassDB::bind_method(D_METHOD("set_bone_custom_pose","bone_idx","custom_pose"),&Skeleton::set_bone_custom_pose); - ClassDB::bind_method(_MD("get_bone_transform","bone_idx"),&Skeleton::get_bone_transform); + ClassDB::bind_method(D_METHOD("get_bone_transform","bone_idx"),&Skeleton::get_bone_transform); BIND_CONSTANT( NOTIFICATION_UPDATE_SKELETON ); } diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index cbbc21cd6a..58a6a24567 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -742,50 +742,50 @@ bool Spatial::is_local_transform_notification_enabled() const { void Spatial::_bind_methods() { - ClassDB::bind_method(_MD("set_transform","local"), &Spatial::set_transform); - ClassDB::bind_method(_MD("get_transform"), &Spatial::get_transform); - ClassDB::bind_method(_MD("set_translation","translation"), &Spatial::set_translation); - ClassDB::bind_method(_MD("get_translation"), &Spatial::get_translation); - ClassDB::bind_method(_MD("set_rotation","rotation_rad"), &Spatial::set_rotation); - ClassDB::bind_method(_MD("get_rotation"), &Spatial::get_rotation); - ClassDB::bind_method(_MD("set_rotation_deg","rotation_deg"), &Spatial::set_rotation_in_degrees); - ClassDB::bind_method(_MD("get_rotation_deg"), &Spatial::get_rotation_in_degrees); - ClassDB::bind_method(_MD("set_scale","scale"), &Spatial::set_scale); - ClassDB::bind_method(_MD("get_scale"), &Spatial::get_scale); - ClassDB::bind_method(_MD("set_global_transform","global"), &Spatial::set_global_transform); - ClassDB::bind_method(_MD("get_global_transform"), &Spatial::get_global_transform); - ClassDB::bind_method(_MD("get_parent_spatial"), &Spatial::get_parent_spatial); - ClassDB::bind_method(_MD("set_ignore_transform_notification","enabled"), &Spatial::set_ignore_transform_notification); - ClassDB::bind_method(_MD("set_as_toplevel","enable"), &Spatial::set_as_toplevel); - ClassDB::bind_method(_MD("is_set_as_toplevel"), &Spatial::is_set_as_toplevel); - ClassDB::bind_method(_MD("get_world:World"), &Spatial::get_world); + ClassDB::bind_method(D_METHOD("set_transform","local"), &Spatial::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"), &Spatial::get_transform); + ClassDB::bind_method(D_METHOD("set_translation","translation"), &Spatial::set_translation); + ClassDB::bind_method(D_METHOD("get_translation"), &Spatial::get_translation); + ClassDB::bind_method(D_METHOD("set_rotation","rotation_rad"), &Spatial::set_rotation); + ClassDB::bind_method(D_METHOD("get_rotation"), &Spatial::get_rotation); + ClassDB::bind_method(D_METHOD("set_rotation_deg","rotation_deg"), &Spatial::set_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("get_rotation_deg"), &Spatial::get_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_scale","scale"), &Spatial::set_scale); + ClassDB::bind_method(D_METHOD("get_scale"), &Spatial::get_scale); + ClassDB::bind_method(D_METHOD("set_global_transform","global"), &Spatial::set_global_transform); + ClassDB::bind_method(D_METHOD("get_global_transform"), &Spatial::get_global_transform); + ClassDB::bind_method(D_METHOD("get_parent_spatial"), &Spatial::get_parent_spatial); + ClassDB::bind_method(D_METHOD("set_ignore_transform_notification","enabled"), &Spatial::set_ignore_transform_notification); + ClassDB::bind_method(D_METHOD("set_as_toplevel","enable"), &Spatial::set_as_toplevel); + ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &Spatial::is_set_as_toplevel); + ClassDB::bind_method(D_METHOD("get_world:World"), &Spatial::get_world); // TODO: Obsolete those two methods (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_set_rotation_deg","rotation_deg"), &Spatial::_set_rotation_deg); - ClassDB::bind_method(_MD("_get_rotation_deg"), &Spatial::_get_rotation_deg); + ClassDB::bind_method(D_METHOD("_set_rotation_deg","rotation_deg"), &Spatial::_set_rotation_deg); + ClassDB::bind_method(D_METHOD("_get_rotation_deg"), &Spatial::_get_rotation_deg); #ifdef TOOLS_ENABLED - ClassDB::bind_method(_MD("_update_gizmo"), &Spatial::_update_gizmo); - ClassDB::bind_method(_MD("_set_import_transform"), &Spatial::set_import_transform); - ClassDB::bind_method(_MD("_get_import_transform"), &Spatial::get_import_transform); + ClassDB::bind_method(D_METHOD("_update_gizmo"), &Spatial::_update_gizmo); + ClassDB::bind_method(D_METHOD("_set_import_transform"), &Spatial::set_import_transform); + ClassDB::bind_method(D_METHOD("_get_import_transform"), &Spatial::get_import_transform); ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM,"_import_transform",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_import_transform","_get_import_transform"); #endif - ClassDB::bind_method(_MD("update_gizmo"), &Spatial::update_gizmo); - ClassDB::bind_method(_MD("set_gizmo","gizmo:SpatialGizmo"), &Spatial::set_gizmo); - ClassDB::bind_method(_MD("get_gizmo:SpatialGizmo"), &Spatial::get_gizmo); + ClassDB::bind_method(D_METHOD("update_gizmo"), &Spatial::update_gizmo); + ClassDB::bind_method(D_METHOD("set_gizmo","gizmo:SpatialGizmo"), &Spatial::set_gizmo); + ClassDB::bind_method(D_METHOD("get_gizmo:SpatialGizmo"), &Spatial::get_gizmo); - ClassDB::bind_method(_MD("set_visible"), &Spatial::set_visible); - ClassDB::bind_method(_MD("is_visible"), &Spatial::is_visible); - ClassDB::bind_method(_MD("is_visible_in_tree"), &Spatial::is_visible_in_tree); - ClassDB::bind_method(_MD("show"), &Spatial::show); - ClassDB::bind_method(_MD("hide"), &Spatial::hide); + ClassDB::bind_method(D_METHOD("set_visible"), &Spatial::set_visible); + ClassDB::bind_method(D_METHOD("is_visible"), &Spatial::is_visible); + ClassDB::bind_method(D_METHOD("is_visible_in_tree"), &Spatial::is_visible_in_tree); + ClassDB::bind_method(D_METHOD("show"), &Spatial::show); + ClassDB::bind_method(D_METHOD("hide"), &Spatial::hide); - ClassDB::bind_method(_MD("set_notify_local_transform","enable"), &Spatial::set_notify_local_transform); - ClassDB::bind_method(_MD("is_local_transform_notification_enabled"), &Spatial::is_local_transform_notification_enabled); + ClassDB::bind_method(D_METHOD("set_notify_local_transform","enable"), &Spatial::set_notify_local_transform); + ClassDB::bind_method(D_METHOD("is_local_transform_notification_enabled"), &Spatial::is_local_transform_notification_enabled); - ClassDB::bind_method(_MD("set_notify_transform","enable"), &Spatial::set_notify_transform); - ClassDB::bind_method(_MD("is_transform_notification_enabled"), &Spatial::is_transform_notification_enabled); + ClassDB::bind_method(D_METHOD("set_notify_transform","enable"), &Spatial::set_notify_transform); + ClassDB::bind_method(D_METHOD("is_transform_notification_enabled"), &Spatial::is_transform_notification_enabled); void rotate(const Vector3& p_normal,float p_radians); void rotate_x(float p_radians); @@ -796,18 +796,18 @@ void Spatial::_bind_methods() { void global_rotate(const Vector3& p_normal,float p_radians); void global_translate(const Vector3& p_offset); - ClassDB::bind_method( _MD("rotate","normal","radians"),&Spatial::rotate ); - ClassDB::bind_method( _MD("global_rotate","normal","radians"),&Spatial::global_rotate ); - ClassDB::bind_method( _MD("rotate_x","radians"),&Spatial::rotate_x ); - ClassDB::bind_method( _MD("rotate_y","radians"),&Spatial::rotate_y ); - ClassDB::bind_method( _MD("rotate_z","radians"),&Spatial::rotate_z ); - ClassDB::bind_method( _MD("translate","offset"),&Spatial::translate ); - ClassDB::bind_method( _MD("global_translate","offset"),&Spatial::global_translate ); - ClassDB::bind_method( _MD("orthonormalize"),&Spatial::orthonormalize ); - ClassDB::bind_method( _MD("set_identity"),&Spatial::set_identity ); - - ClassDB::bind_method( _MD("look_at","target","up"),&Spatial::look_at ); - ClassDB::bind_method( _MD("look_at_from_pos","pos","target","up"),&Spatial::look_at_from_pos ); + ClassDB::bind_method( D_METHOD("rotate","normal","radians"),&Spatial::rotate ); + ClassDB::bind_method( D_METHOD("global_rotate","normal","radians"),&Spatial::global_rotate ); + ClassDB::bind_method( D_METHOD("rotate_x","radians"),&Spatial::rotate_x ); + ClassDB::bind_method( D_METHOD("rotate_y","radians"),&Spatial::rotate_y ); + ClassDB::bind_method( D_METHOD("rotate_z","radians"),&Spatial::rotate_z ); + ClassDB::bind_method( D_METHOD("translate","offset"),&Spatial::translate ); + ClassDB::bind_method( D_METHOD("global_translate","offset"),&Spatial::global_translate ); + ClassDB::bind_method( D_METHOD("orthonormalize"),&Spatial::orthonormalize ); + ClassDB::bind_method( D_METHOD("set_identity"),&Spatial::set_identity ); + + ClassDB::bind_method( D_METHOD("look_at","target","up"),&Spatial::look_at ); + ClassDB::bind_method( D_METHOD("look_at_from_pos","pos","target","up"),&Spatial::look_at_from_pos ); BIND_CONSTANT( NOTIFICATION_TRANSFORM_CHANGED ); BIND_CONSTANT( NOTIFICATION_ENTER_WORLD ); diff --git a/scene/3d/spatial_indexer.cpp b/scene/3d/spatial_indexer.cpp index 0cc6d1abd0..6d6c272c25 100644 --- a/scene/3d/spatial_indexer.cpp +++ b/scene/3d/spatial_indexer.cpp @@ -112,7 +112,7 @@ void SpatialIndexer::_update_pairs() { void SpatialIndexer::_bind_methods() { - ClassDB::bind_method(_MD("_update_pairs"),&SpatialIndexer::_update_pairs); + ClassDB::bind_method(D_METHOD("_update_pairs"),&SpatialIndexer::_update_pairs); } diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 008eaf7a44..5adb7050f8 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -246,41 +246,41 @@ SpriteBase3D::AlphaCutMode SpriteBase3D::get_alpha_cut_mode() const{ void SpriteBase3D::_bind_methods() { - ClassDB::bind_method(_MD("set_centered","centered"),&SpriteBase3D::set_centered); - ClassDB::bind_method(_MD("is_centered"),&SpriteBase3D::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&SpriteBase3D::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&SpriteBase3D::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&SpriteBase3D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&SpriteBase3D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&SpriteBase3D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&SpriteBase3D::get_offset); - ClassDB::bind_method(_MD("set_flip_h","flip_h"),&SpriteBase3D::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&SpriteBase3D::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","flip_h"),&SpriteBase3D::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&SpriteBase3D::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","flip_v"),&SpriteBase3D::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&SpriteBase3D::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","flip_v"),&SpriteBase3D::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&SpriteBase3D::is_flipped_v); - ClassDB::bind_method(_MD("set_modulate","modulate"),&SpriteBase3D::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&SpriteBase3D::get_modulate); + ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&SpriteBase3D::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&SpriteBase3D::get_modulate); - ClassDB::bind_method(_MD("set_opacity","opacity"),&SpriteBase3D::set_opacity); - ClassDB::bind_method(_MD("get_opacity"),&SpriteBase3D::get_opacity); + ClassDB::bind_method(D_METHOD("set_opacity","opacity"),&SpriteBase3D::set_opacity); + ClassDB::bind_method(D_METHOD("get_opacity"),&SpriteBase3D::get_opacity); - ClassDB::bind_method(_MD("set_pixel_size","pixel_size"),&SpriteBase3D::set_pixel_size); - ClassDB::bind_method(_MD("get_pixel_size"),&SpriteBase3D::get_pixel_size); + ClassDB::bind_method(D_METHOD("set_pixel_size","pixel_size"),&SpriteBase3D::set_pixel_size); + ClassDB::bind_method(D_METHOD("get_pixel_size"),&SpriteBase3D::get_pixel_size); - ClassDB::bind_method(_MD("set_axis","axis"),&SpriteBase3D::set_axis); - ClassDB::bind_method(_MD("get_axis"),&SpriteBase3D::get_axis); + ClassDB::bind_method(D_METHOD("set_axis","axis"),&SpriteBase3D::set_axis); + ClassDB::bind_method(D_METHOD("get_axis"),&SpriteBase3D::get_axis); - ClassDB::bind_method(_MD("set_draw_flag","flag","enabled"),&SpriteBase3D::set_draw_flag); - ClassDB::bind_method(_MD("get_draw_flag","flag"),&SpriteBase3D::get_draw_flag); + ClassDB::bind_method(D_METHOD("set_draw_flag","flag","enabled"),&SpriteBase3D::set_draw_flag); + ClassDB::bind_method(D_METHOD("get_draw_flag","flag"),&SpriteBase3D::get_draw_flag); - ClassDB::bind_method(_MD("set_alpha_cut_mode","mode"),&SpriteBase3D::set_alpha_cut_mode); - ClassDB::bind_method(_MD("get_alpha_cut_mode"),&SpriteBase3D::get_alpha_cut_mode); + ClassDB::bind_method(D_METHOD("set_alpha_cut_mode","mode"),&SpriteBase3D::set_alpha_cut_mode); + ClassDB::bind_method(D_METHOD("get_alpha_cut_mode"),&SpriteBase3D::get_alpha_cut_mode); - ClassDB::bind_method(_MD("get_item_rect"),&SpriteBase3D::get_item_rect); + ClassDB::bind_method(D_METHOD("get_item_rect"),&SpriteBase3D::get_item_rect); - ClassDB::bind_method(_MD("_queue_update"),&SpriteBase3D::_queue_update); - ClassDB::bind_method(_MD("_im_update"),&SpriteBase3D::_im_update); + ClassDB::bind_method(D_METHOD("_queue_update"),&SpriteBase3D::_queue_update); + ClassDB::bind_method(D_METHOD("_im_update"),&SpriteBase3D::_im_update); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "centered"), "set_centered","is_centered"); @@ -601,23 +601,23 @@ void Sprite3D::_validate_property(PropertyInfo& property) const { void Sprite3D::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite3D::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&Sprite3D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture:Texture"),&Sprite3D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&Sprite3D::get_texture); - ClassDB::bind_method(_MD("set_region","enabled"),&Sprite3D::set_region); - ClassDB::bind_method(_MD("is_region"),&Sprite3D::is_region); + ClassDB::bind_method(D_METHOD("set_region","enabled"),&Sprite3D::set_region); + ClassDB::bind_method(D_METHOD("is_region"),&Sprite3D::is_region); - ClassDB::bind_method(_MD("set_region_rect","rect"),&Sprite3D::set_region_rect); - ClassDB::bind_method(_MD("get_region_rect"),&Sprite3D::get_region_rect); + ClassDB::bind_method(D_METHOD("set_region_rect","rect"),&Sprite3D::set_region_rect); + ClassDB::bind_method(D_METHOD("get_region_rect"),&Sprite3D::get_region_rect); - ClassDB::bind_method(_MD("set_frame","frame"),&Sprite3D::set_frame); - ClassDB::bind_method(_MD("get_frame"),&Sprite3D::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&Sprite3D::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&Sprite3D::get_frame); - ClassDB::bind_method(_MD("set_vframes","vframes"),&Sprite3D::set_vframes); - ClassDB::bind_method(_MD("get_vframes"),&Sprite3D::get_vframes); + ClassDB::bind_method(D_METHOD("set_vframes","vframes"),&Sprite3D::set_vframes); + ClassDB::bind_method(D_METHOD("get_vframes"),&Sprite3D::get_vframes); - ClassDB::bind_method(_MD("set_hframes","hframes"),&Sprite3D::set_hframes); - ClassDB::bind_method(_MD("get_hframes"),&Sprite3D::get_hframes); + ClassDB::bind_method(D_METHOD("set_hframes","hframes"),&Sprite3D::set_hframes); + ClassDB::bind_method(D_METHOD("get_hframes"),&Sprite3D::get_hframes); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), "set_texture","get_texture"); ADD_PROPERTY( PropertyInfo( Variant::INT, "vframes",PROPERTY_HINT_RANGE,"1,16384,1"), "set_vframes","get_vframes"); @@ -764,10 +764,10 @@ void AnimatedSprite3D::_draw() { void AnimatedSprite3D::_bind_methods(){ - ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames); - ClassDB::bind_method(_MD("get_sprite_frames:Texture"),&AnimatedSprite3D::get_sprite_frames); - ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame); - ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame); + ClassDB::bind_method(D_METHOD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames); + ClassDB::bind_method(D_METHOD("get_sprite_frames:Texture"),&AnimatedSprite3D::get_sprite_frames); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&AnimatedSprite3D::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&AnimatedSprite3D::get_frame); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "frames", PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), "set_sprite_frames","get_sprite_frames"); ADD_PROPERTY( PropertyInfo( Variant::INT, "frame",PROPERTY_HINT_SPRITE_FRAME), "set_frame","get_frame"); @@ -1312,24 +1312,24 @@ String AnimatedSprite3D::get_configuration_warning() const { void AnimatedSprite3D::_bind_methods() { - ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames); - ClassDB::bind_method(_MD("get_sprite_frames:SpriteFrames"),&AnimatedSprite3D::get_sprite_frames); + ClassDB::bind_method(D_METHOD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames); + ClassDB::bind_method(D_METHOD("get_sprite_frames:SpriteFrames"),&AnimatedSprite3D::get_sprite_frames); - ClassDB::bind_method(_MD("set_animation","animation"),&AnimatedSprite3D::set_animation); - ClassDB::bind_method(_MD("get_animation"),&AnimatedSprite3D::get_animation); + ClassDB::bind_method(D_METHOD("set_animation","animation"),&AnimatedSprite3D::set_animation); + ClassDB::bind_method(D_METHOD("get_animation"),&AnimatedSprite3D::get_animation); - ClassDB::bind_method(_MD("_set_playing","playing"),&AnimatedSprite3D::_set_playing); - ClassDB::bind_method(_MD("_is_playing"),&AnimatedSprite3D::_is_playing); + ClassDB::bind_method(D_METHOD("_set_playing","playing"),&AnimatedSprite3D::_set_playing); + ClassDB::bind_method(D_METHOD("_is_playing"),&AnimatedSprite3D::_is_playing); - ClassDB::bind_method(_MD("play","anim"),&AnimatedSprite3D::play,DEFVAL(StringName())); - ClassDB::bind_method(_MD("stop"),&AnimatedSprite3D::stop); - ClassDB::bind_method(_MD("is_playing"),&AnimatedSprite3D::is_playing); + ClassDB::bind_method(D_METHOD("play","anim"),&AnimatedSprite3D::play,DEFVAL(StringName())); + ClassDB::bind_method(D_METHOD("stop"),&AnimatedSprite3D::stop); + ClassDB::bind_method(D_METHOD("is_playing"),&AnimatedSprite3D::is_playing); - ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame); - ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&AnimatedSprite3D::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&AnimatedSprite3D::get_frame); - ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite3D::_res_changed); + ClassDB::bind_method(D_METHOD("_res_changed"),&AnimatedSprite3D::_res_changed); ADD_SIGNAL(MethodInfo("frame_changed")); diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp index f1a2af1b2d..4b32c62d14 100644 --- a/scene/3d/vehicle_body.cpp +++ b/scene/3d/vehicle_body.cpp @@ -232,36 +232,36 @@ float VehicleWheel::get_friction_slip() const{ void VehicleWheel::_bind_methods() { - ClassDB::bind_method(_MD("set_radius","length"),&VehicleWheel::set_radius); - ClassDB::bind_method(_MD("get_radius"),&VehicleWheel::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","length"),&VehicleWheel::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&VehicleWheel::get_radius); - ClassDB::bind_method(_MD("set_suspension_rest_length","length"),&VehicleWheel::set_suspension_rest_length); - ClassDB::bind_method(_MD("get_suspension_rest_length"),&VehicleWheel::get_suspension_rest_length); + ClassDB::bind_method(D_METHOD("set_suspension_rest_length","length"),&VehicleWheel::set_suspension_rest_length); + ClassDB::bind_method(D_METHOD("get_suspension_rest_length"),&VehicleWheel::get_suspension_rest_length); - ClassDB::bind_method(_MD("set_suspension_travel","length"),&VehicleWheel::set_suspension_travel); - ClassDB::bind_method(_MD("get_suspension_travel"),&VehicleWheel::get_suspension_travel); + ClassDB::bind_method(D_METHOD("set_suspension_travel","length"),&VehicleWheel::set_suspension_travel); + ClassDB::bind_method(D_METHOD("get_suspension_travel"),&VehicleWheel::get_suspension_travel); - ClassDB::bind_method(_MD("set_suspension_stiffness","length"),&VehicleWheel::set_suspension_stiffness); - ClassDB::bind_method(_MD("get_suspension_stiffness"),&VehicleWheel::get_suspension_stiffness); + ClassDB::bind_method(D_METHOD("set_suspension_stiffness","length"),&VehicleWheel::set_suspension_stiffness); + ClassDB::bind_method(D_METHOD("get_suspension_stiffness"),&VehicleWheel::get_suspension_stiffness); - ClassDB::bind_method(_MD("set_suspension_max_force","length"),&VehicleWheel::set_suspension_max_force); - ClassDB::bind_method(_MD("get_suspension_max_force"),&VehicleWheel::get_suspension_max_force); + ClassDB::bind_method(D_METHOD("set_suspension_max_force","length"),&VehicleWheel::set_suspension_max_force); + ClassDB::bind_method(D_METHOD("get_suspension_max_force"),&VehicleWheel::get_suspension_max_force); - ClassDB::bind_method(_MD("set_damping_compression","length"),&VehicleWheel::set_damping_compression); - ClassDB::bind_method(_MD("get_damping_compression"),&VehicleWheel::get_damping_compression); + ClassDB::bind_method(D_METHOD("set_damping_compression","length"),&VehicleWheel::set_damping_compression); + ClassDB::bind_method(D_METHOD("get_damping_compression"),&VehicleWheel::get_damping_compression); - ClassDB::bind_method(_MD("set_damping_relaxation","length"),&VehicleWheel::set_damping_relaxation); - ClassDB::bind_method(_MD("get_damping_relaxation"),&VehicleWheel::get_damping_relaxation); + ClassDB::bind_method(D_METHOD("set_damping_relaxation","length"),&VehicleWheel::set_damping_relaxation); + ClassDB::bind_method(D_METHOD("get_damping_relaxation"),&VehicleWheel::get_damping_relaxation); - ClassDB::bind_method(_MD("set_use_as_traction","enable"),&VehicleWheel::set_use_as_traction); - ClassDB::bind_method(_MD("is_used_as_traction"),&VehicleWheel::is_used_as_traction); + ClassDB::bind_method(D_METHOD("set_use_as_traction","enable"),&VehicleWheel::set_use_as_traction); + ClassDB::bind_method(D_METHOD("is_used_as_traction"),&VehicleWheel::is_used_as_traction); - ClassDB::bind_method(_MD("set_use_as_steering","enable"),&VehicleWheel::set_use_as_steering); - ClassDB::bind_method(_MD("is_used_as_steering"),&VehicleWheel::is_used_as_steering); + ClassDB::bind_method(D_METHOD("set_use_as_steering","enable"),&VehicleWheel::set_use_as_steering); + ClassDB::bind_method(D_METHOD("is_used_as_steering"),&VehicleWheel::is_used_as_steering); - ClassDB::bind_method(_MD("set_friction_slip","length"),&VehicleWheel::set_friction_slip); - ClassDB::bind_method(_MD("get_friction_slip"),&VehicleWheel::get_friction_slip); + ClassDB::bind_method(D_METHOD("set_friction_slip","length"),&VehicleWheel::set_friction_slip); + ClassDB::bind_method(D_METHOD("get_friction_slip"),&VehicleWheel::get_friction_slip); @@ -1026,24 +1026,24 @@ Vector3 VehicleBody::get_linear_velocity() const void VehicleBody::_bind_methods(){ - ClassDB::bind_method(_MD("set_mass","mass"),&VehicleBody::set_mass); - ClassDB::bind_method(_MD("get_mass"),&VehicleBody::get_mass); + ClassDB::bind_method(D_METHOD("set_mass","mass"),&VehicleBody::set_mass); + ClassDB::bind_method(D_METHOD("get_mass"),&VehicleBody::get_mass); - ClassDB::bind_method(_MD("set_friction","friction"),&VehicleBody::set_friction); - ClassDB::bind_method(_MD("get_friction"),&VehicleBody::get_friction); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&VehicleBody::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&VehicleBody::get_friction); - ClassDB::bind_method(_MD("set_engine_force","engine_force"),&VehicleBody::set_engine_force); - ClassDB::bind_method(_MD("get_engine_force"),&VehicleBody::get_engine_force); + ClassDB::bind_method(D_METHOD("set_engine_force","engine_force"),&VehicleBody::set_engine_force); + ClassDB::bind_method(D_METHOD("get_engine_force"),&VehicleBody::get_engine_force); - ClassDB::bind_method(_MD("set_brake","brake"),&VehicleBody::set_brake); - ClassDB::bind_method(_MD("get_brake"),&VehicleBody::get_brake); + ClassDB::bind_method(D_METHOD("set_brake","brake"),&VehicleBody::set_brake); + ClassDB::bind_method(D_METHOD("get_brake"),&VehicleBody::get_brake); - ClassDB::bind_method(_MD("set_steering","steering"),&VehicleBody::set_steering); - ClassDB::bind_method(_MD("get_steering"),&VehicleBody::get_steering); + ClassDB::bind_method(D_METHOD("set_steering","steering"),&VehicleBody::set_steering); + ClassDB::bind_method(D_METHOD("get_steering"),&VehicleBody::get_steering); - ClassDB::bind_method(_MD("get_linear_velocity"),&VehicleBody::get_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&VehicleBody::get_linear_velocity); - ClassDB::bind_method(_MD("_direct_state_changed"),&VehicleBody::_direct_state_changed); + ClassDB::bind_method(D_METHOD("_direct_state_changed"),&VehicleBody::_direct_state_changed); ADD_GROUP("Motion",""); ADD_PROPERTY( PropertyInfo(Variant::REAL,"engine_force",PROPERTY_HINT_RANGE,"0.00,1024.0,0.01"),"set_engine_force","get_engine_force"); diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index 725747c629..0633846b5a 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -109,9 +109,9 @@ bool VisibilityNotifier::is_on_screen() const { void VisibilityNotifier::_bind_methods(){ - ClassDB::bind_method(_MD("set_aabb","rect"),&VisibilityNotifier::set_aabb); - ClassDB::bind_method(_MD("get_aabb"),&VisibilityNotifier::get_aabb); - ClassDB::bind_method(_MD("is_on_screen"),&VisibilityNotifier::is_on_screen); + ClassDB::bind_method(D_METHOD("set_aabb","rect"),&VisibilityNotifier::set_aabb); + ClassDB::bind_method(D_METHOD("get_aabb"),&VisibilityNotifier::get_aabb); + ClassDB::bind_method(D_METHOD("is_on_screen"),&VisibilityNotifier::is_on_screen); ADD_PROPERTY( PropertyInfo(Variant::RECT3,"aabb"),"set_aabb","get_aabb"); @@ -268,9 +268,9 @@ void VisibilityEnabler::_node_removed(Node* p_node) { void VisibilityEnabler::_bind_methods(){ - ClassDB::bind_method(_MD("set_enabler","enabler","enabled"),&VisibilityEnabler::set_enabler); - ClassDB::bind_method(_MD("is_enabler_enabled","enabler"),&VisibilityEnabler::is_enabler_enabled); - ClassDB::bind_method(_MD("_node_removed"),&VisibilityEnabler::_node_removed); + ClassDB::bind_method(D_METHOD("set_enabler","enabler","enabled"),&VisibilityEnabler::set_enabler); + ClassDB::bind_method(D_METHOD("is_enabler_enabled","enabler"),&VisibilityEnabler::is_enabler_enabled); + ClassDB::bind_method(D_METHOD("_node_removed"),&VisibilityEnabler::_node_removed); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"pause_animations"),"set_enabler","is_enabler_enabled", ENABLER_PAUSE_ANIMATIONS ); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"freeze_bodies"),"set_enabler","is_enabler_enabled", ENABLER_FREEZE_BODIES); diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 6d0d8d8547..bbcd54b36b 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -137,12 +137,12 @@ uint32_t VisualInstance::get_layer_mask() const { void VisualInstance::_bind_methods() { - ClassDB::bind_method(_MD("_get_visual_instance_rid"),&VisualInstance::_get_visual_instance_rid); - ClassDB::bind_method(_MD("set_base","base"), &VisualInstance::set_base); - ClassDB::bind_method(_MD("set_layer_mask","mask"), &VisualInstance::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"), &VisualInstance::get_layer_mask); + ClassDB::bind_method(D_METHOD("_get_visual_instance_rid"),&VisualInstance::_get_visual_instance_rid); + ClassDB::bind_method(D_METHOD("set_base","base"), &VisualInstance::set_base); + ClassDB::bind_method(D_METHOD("set_layer_mask","mask"), &VisualInstance::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"), &VisualInstance::get_layer_mask); - ClassDB::bind_method(_MD("get_transformed_aabb"), &VisualInstance::get_transformed_aabb); + ClassDB::bind_method(D_METHOD("get_transformed_aabb"), &VisualInstance::get_transformed_aabb); ADD_PROPERTY( PropertyInfo( Variant::INT, "layers",PROPERTY_HINT_LAYERS_3D_RENDER), "set_layer_mask", "get_layer_mask"); @@ -324,32 +324,32 @@ float GeometryInstance::get_extra_cull_margin() const{ void GeometryInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_material_override","material"), &GeometryInstance::set_material_override); - ClassDB::bind_method(_MD("get_material_override"), &GeometryInstance::get_material_override); + ClassDB::bind_method(D_METHOD("set_material_override","material"), &GeometryInstance::set_material_override); + ClassDB::bind_method(D_METHOD("get_material_override"), &GeometryInstance::get_material_override); - ClassDB::bind_method(_MD("set_flag","flag","value"), &GeometryInstance::set_flag); - ClassDB::bind_method(_MD("get_flag","flag"), &GeometryInstance::get_flag); + ClassDB::bind_method(D_METHOD("set_flag","flag","value"), &GeometryInstance::set_flag); + ClassDB::bind_method(D_METHOD("get_flag","flag"), &GeometryInstance::get_flag); - ClassDB::bind_method(_MD("set_cast_shadows_setting", "shadow_casting_setting"), &GeometryInstance::set_cast_shadows_setting); - ClassDB::bind_method(_MD("get_cast_shadows_setting"), &GeometryInstance::get_cast_shadows_setting); + ClassDB::bind_method(D_METHOD("set_cast_shadows_setting", "shadow_casting_setting"), &GeometryInstance::set_cast_shadows_setting); + ClassDB::bind_method(D_METHOD("get_cast_shadows_setting"), &GeometryInstance::get_cast_shadows_setting); - ClassDB::bind_method(_MD("set_lod_max_hysteresis","mode"), &GeometryInstance::set_lod_max_hysteresis); - ClassDB::bind_method(_MD("get_lod_max_hysteresis"), &GeometryInstance::get_lod_max_hysteresis); + ClassDB::bind_method(D_METHOD("set_lod_max_hysteresis","mode"), &GeometryInstance::set_lod_max_hysteresis); + ClassDB::bind_method(D_METHOD("get_lod_max_hysteresis"), &GeometryInstance::get_lod_max_hysteresis); - ClassDB::bind_method(_MD("set_lod_max_distance","mode"), &GeometryInstance::set_lod_max_distance); - ClassDB::bind_method(_MD("get_lod_max_distance"), &GeometryInstance::get_lod_max_distance); + ClassDB::bind_method(D_METHOD("set_lod_max_distance","mode"), &GeometryInstance::set_lod_max_distance); + ClassDB::bind_method(D_METHOD("get_lod_max_distance"), &GeometryInstance::get_lod_max_distance); - ClassDB::bind_method(_MD("set_lod_min_hysteresis","mode"), &GeometryInstance::set_lod_min_hysteresis); - ClassDB::bind_method(_MD("get_lod_min_hysteresis"), &GeometryInstance::get_lod_min_hysteresis); + ClassDB::bind_method(D_METHOD("set_lod_min_hysteresis","mode"), &GeometryInstance::set_lod_min_hysteresis); + ClassDB::bind_method(D_METHOD("get_lod_min_hysteresis"), &GeometryInstance::get_lod_min_hysteresis); - ClassDB::bind_method(_MD("set_lod_min_distance","mode"), &GeometryInstance::set_lod_min_distance); - ClassDB::bind_method(_MD("get_lod_min_distance"), &GeometryInstance::get_lod_min_distance); + ClassDB::bind_method(D_METHOD("set_lod_min_distance","mode"), &GeometryInstance::set_lod_min_distance); + ClassDB::bind_method(D_METHOD("get_lod_min_distance"), &GeometryInstance::get_lod_min_distance); - ClassDB::bind_method(_MD("set_extra_cull_margin","margin"), &GeometryInstance::set_extra_cull_margin); - ClassDB::bind_method(_MD("get_extra_cull_margin"), &GeometryInstance::get_extra_cull_margin); + ClassDB::bind_method(D_METHOD("set_extra_cull_margin","margin"), &GeometryInstance::set_extra_cull_margin); + ClassDB::bind_method(D_METHOD("get_extra_cull_margin"), &GeometryInstance::get_extra_cull_margin); - ClassDB::bind_method(_MD("get_aabb"),&GeometryInstance::get_aabb); + ClassDB::bind_method(D_METHOD("get_aabb"),&GeometryInstance::get_aabb); ADD_GROUP("Geometry",""); diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp index bcbda5a781..960356d9cf 100644 --- a/scene/animation/animation_cache.cpp +++ b/scene/animation/animation_cache.cpp @@ -368,8 +368,8 @@ void AnimationCache::set_animation(const Ref<Animation>& p_animation) { void AnimationCache::_bind_methods() { - ClassDB::bind_method(_MD("_node_exit_tree"),&AnimationCache::_node_exit_tree); - ClassDB::bind_method(_MD("_animation_changed"),&AnimationCache::_animation_changed); + ClassDB::bind_method(D_METHOD("_node_exit_tree"),&AnimationCache::_node_exit_tree); + ClassDB::bind_method(D_METHOD("_animation_changed"),&AnimationCache::_animation_changed); } void AnimationCache::set_root(Node* p_root) { diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index ecbd75ed8e..dabdde8ece 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -1296,61 +1296,61 @@ void AnimationPlayer::get_argument_options(const StringName& p_function,int p_id void AnimationPlayer::_bind_methods() { - ClassDB::bind_method(_MD("_node_removed"),&AnimationPlayer::_node_removed); - ClassDB::bind_method(_MD("_animation_changed"),&AnimationPlayer::_animation_changed); + ClassDB::bind_method(D_METHOD("_node_removed"),&AnimationPlayer::_node_removed); + ClassDB::bind_method(D_METHOD("_animation_changed"),&AnimationPlayer::_animation_changed); - ClassDB::bind_method(_MD("add_animation","name","animation:Animation"),&AnimationPlayer::add_animation); - ClassDB::bind_method(_MD("remove_animation","name"),&AnimationPlayer::remove_animation); - ClassDB::bind_method(_MD("rename_animation","name","newname"),&AnimationPlayer::rename_animation); - ClassDB::bind_method(_MD("has_animation","name"),&AnimationPlayer::has_animation); - ClassDB::bind_method(_MD("get_animation:Animation","name"),&AnimationPlayer::get_animation); - ClassDB::bind_method(_MD("get_animation_list"),&AnimationPlayer::_get_animation_list); + ClassDB::bind_method(D_METHOD("add_animation","name","animation:Animation"),&AnimationPlayer::add_animation); + ClassDB::bind_method(D_METHOD("remove_animation","name"),&AnimationPlayer::remove_animation); + ClassDB::bind_method(D_METHOD("rename_animation","name","newname"),&AnimationPlayer::rename_animation); + ClassDB::bind_method(D_METHOD("has_animation","name"),&AnimationPlayer::has_animation); + ClassDB::bind_method(D_METHOD("get_animation:Animation","name"),&AnimationPlayer::get_animation); + ClassDB::bind_method(D_METHOD("get_animation_list"),&AnimationPlayer::_get_animation_list); - ClassDB::bind_method(_MD("animation_set_next", "anim_from", "anim_to"), &AnimationPlayer::animation_set_next); - ClassDB::bind_method(_MD("animation_get_next", "anim_from"), &AnimationPlayer::animation_get_next); + ClassDB::bind_method(D_METHOD("animation_set_next", "anim_from", "anim_to"), &AnimationPlayer::animation_set_next); + ClassDB::bind_method(D_METHOD("animation_get_next", "anim_from"), &AnimationPlayer::animation_get_next); - ClassDB::bind_method(_MD("set_blend_time","anim_from","anim_to","sec"),&AnimationPlayer::set_blend_time); - ClassDB::bind_method(_MD("get_blend_time","anim_from","anim_to"),&AnimationPlayer::get_blend_time); + ClassDB::bind_method(D_METHOD("set_blend_time","anim_from","anim_to","sec"),&AnimationPlayer::set_blend_time); + ClassDB::bind_method(D_METHOD("get_blend_time","anim_from","anim_to"),&AnimationPlayer::get_blend_time); - ClassDB::bind_method(_MD("set_default_blend_time","sec"),&AnimationPlayer::set_default_blend_time); - ClassDB::bind_method(_MD("get_default_blend_time"),&AnimationPlayer::get_default_blend_time); + ClassDB::bind_method(D_METHOD("set_default_blend_time","sec"),&AnimationPlayer::set_default_blend_time); + ClassDB::bind_method(D_METHOD("get_default_blend_time"),&AnimationPlayer::get_default_blend_time); - ClassDB::bind_method(_MD("play","name","custom_blend","custom_speed","from_end"),&AnimationPlayer::play,DEFVAL(""),DEFVAL(-1),DEFVAL(1.0),DEFVAL(false)); - ClassDB::bind_method(_MD("play_backwards","name","custom_blend"),&AnimationPlayer::play_backwards,DEFVAL(""),DEFVAL(-1)); - ClassDB::bind_method(_MD("stop","reset"),&AnimationPlayer::stop,DEFVAL(true)); - ClassDB::bind_method(_MD("stop_all"),&AnimationPlayer::stop_all); - ClassDB::bind_method(_MD("is_playing"),&AnimationPlayer::is_playing); - ClassDB::bind_method(_MD("set_current_animation","anim"),&AnimationPlayer::set_current_animation); - ClassDB::bind_method(_MD("get_current_animation"),&AnimationPlayer::get_current_animation); - ClassDB::bind_method(_MD("queue","name"),&AnimationPlayer::queue); - ClassDB::bind_method(_MD("clear_queue"),&AnimationPlayer::clear_queue); + ClassDB::bind_method(D_METHOD("play","name","custom_blend","custom_speed","from_end"),&AnimationPlayer::play,DEFVAL(""),DEFVAL(-1),DEFVAL(1.0),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("play_backwards","name","custom_blend"),&AnimationPlayer::play_backwards,DEFVAL(""),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("stop","reset"),&AnimationPlayer::stop,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("stop_all"),&AnimationPlayer::stop_all); + ClassDB::bind_method(D_METHOD("is_playing"),&AnimationPlayer::is_playing); + ClassDB::bind_method(D_METHOD("set_current_animation","anim"),&AnimationPlayer::set_current_animation); + ClassDB::bind_method(D_METHOD("get_current_animation"),&AnimationPlayer::get_current_animation); + ClassDB::bind_method(D_METHOD("queue","name"),&AnimationPlayer::queue); + ClassDB::bind_method(D_METHOD("clear_queue"),&AnimationPlayer::clear_queue); - ClassDB::bind_method(_MD("set_active","active"),&AnimationPlayer::set_active); - ClassDB::bind_method(_MD("is_active"),&AnimationPlayer::is_active); + ClassDB::bind_method(D_METHOD("set_active","active"),&AnimationPlayer::set_active); + ClassDB::bind_method(D_METHOD("is_active"),&AnimationPlayer::is_active); - ClassDB::bind_method(_MD("set_speed_scale","speed"),&AnimationPlayer::set_speed_scale); - ClassDB::bind_method(_MD("get_speed_scale"),&AnimationPlayer::get_speed_scale); + ClassDB::bind_method(D_METHOD("set_speed_scale","speed"),&AnimationPlayer::set_speed_scale); + ClassDB::bind_method(D_METHOD("get_speed_scale"),&AnimationPlayer::get_speed_scale); - ClassDB::bind_method(_MD("set_autoplay","name"),&AnimationPlayer::set_autoplay); - ClassDB::bind_method(_MD("get_autoplay"),&AnimationPlayer::get_autoplay); + ClassDB::bind_method(D_METHOD("set_autoplay","name"),&AnimationPlayer::set_autoplay); + ClassDB::bind_method(D_METHOD("get_autoplay"),&AnimationPlayer::get_autoplay); - ClassDB::bind_method(_MD("set_root","path"),&AnimationPlayer::set_root); - ClassDB::bind_method(_MD("get_root"),&AnimationPlayer::get_root); + ClassDB::bind_method(D_METHOD("set_root","path"),&AnimationPlayer::set_root); + ClassDB::bind_method(D_METHOD("get_root"),&AnimationPlayer::get_root); - ClassDB::bind_method(_MD("seek","pos_sec","update"),&AnimationPlayer::seek,DEFVAL(false)); - ClassDB::bind_method(_MD("get_pos"),&AnimationPlayer::get_current_animation_pos); + ClassDB::bind_method(D_METHOD("seek","pos_sec","update"),&AnimationPlayer::seek,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_pos"),&AnimationPlayer::get_current_animation_pos); - ClassDB::bind_method(_MD("find_animation","animation:Animation"),&AnimationPlayer::find_animation); + ClassDB::bind_method(D_METHOD("find_animation","animation:Animation"),&AnimationPlayer::find_animation); - ClassDB::bind_method(_MD("clear_caches"),&AnimationPlayer::clear_caches); + ClassDB::bind_method(D_METHOD("clear_caches"),&AnimationPlayer::clear_caches); - ClassDB::bind_method(_MD("set_animation_process_mode","mode"),&AnimationPlayer::set_animation_process_mode); - ClassDB::bind_method(_MD("get_animation_process_mode"),&AnimationPlayer::get_animation_process_mode); + ClassDB::bind_method(D_METHOD("set_animation_process_mode","mode"),&AnimationPlayer::set_animation_process_mode); + ClassDB::bind_method(D_METHOD("get_animation_process_mode"),&AnimationPlayer::get_animation_process_mode); - ClassDB::bind_method(_MD("get_current_animation_pos"),&AnimationPlayer::get_current_animation_pos); - ClassDB::bind_method(_MD("get_current_animation_length"),&AnimationPlayer::get_current_animation_length); + ClassDB::bind_method(D_METHOD("get_current_animation_pos"),&AnimationPlayer::get_current_animation_pos); + ClassDB::bind_method(D_METHOD("get_current_animation_length"),&AnimationPlayer::get_current_animation_length); - ClassDB::bind_method(_MD("advance","delta"),&AnimationPlayer::advance); + ClassDB::bind_method(D_METHOD("advance","delta"),&AnimationPlayer::advance); ADD_GROUP("Playback","playback_"); diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index 3e2c093054..ed4ec23d54 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -1828,103 +1828,103 @@ Error AnimationTreePlayer::node_rename(const StringName& p_node,const StringName void AnimationTreePlayer::_bind_methods() { - ClassDB::bind_method(_MD("add_node","type","id"),&AnimationTreePlayer::add_node); + ClassDB::bind_method(D_METHOD("add_node","type","id"),&AnimationTreePlayer::add_node); - ClassDB::bind_method(_MD("node_exists","node"),&AnimationTreePlayer::node_exists); - ClassDB::bind_method(_MD("node_rename","node","new_name"),&AnimationTreePlayer::node_rename); + ClassDB::bind_method(D_METHOD("node_exists","node"),&AnimationTreePlayer::node_exists); + ClassDB::bind_method(D_METHOD("node_rename","node","new_name"),&AnimationTreePlayer::node_rename); - ClassDB::bind_method(_MD("node_get_type","id"),&AnimationTreePlayer::node_get_type); - ClassDB::bind_method(_MD("node_get_input_count","id"),&AnimationTreePlayer::node_get_input_count); - ClassDB::bind_method(_MD("node_get_input_source","id","idx"),&AnimationTreePlayer::node_get_input_source); + ClassDB::bind_method(D_METHOD("node_get_type","id"),&AnimationTreePlayer::node_get_type); + ClassDB::bind_method(D_METHOD("node_get_input_count","id"),&AnimationTreePlayer::node_get_input_count); + ClassDB::bind_method(D_METHOD("node_get_input_source","id","idx"),&AnimationTreePlayer::node_get_input_source); - ClassDB::bind_method(_MD("animation_node_set_animation","id","animation:Animation"),&AnimationTreePlayer::animation_node_set_animation); - ClassDB::bind_method(_MD("animation_node_get_animation:Animation","id"),&AnimationTreePlayer::animation_node_get_animation); + ClassDB::bind_method(D_METHOD("animation_node_set_animation","id","animation:Animation"),&AnimationTreePlayer::animation_node_set_animation); + ClassDB::bind_method(D_METHOD("animation_node_get_animation:Animation","id"),&AnimationTreePlayer::animation_node_get_animation); - ClassDB::bind_method(_MD("animation_node_set_master_animation","id","source"),&AnimationTreePlayer::animation_node_set_master_animation); - ClassDB::bind_method(_MD("animation_node_get_master_animation","id"),&AnimationTreePlayer::animation_node_get_master_animation); - ClassDB::bind_method(_MD("animation_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::animation_node_set_filter_path); + ClassDB::bind_method(D_METHOD("animation_node_set_master_animation","id","source"),&AnimationTreePlayer::animation_node_set_master_animation); + ClassDB::bind_method(D_METHOD("animation_node_get_master_animation","id"),&AnimationTreePlayer::animation_node_get_master_animation); + ClassDB::bind_method(D_METHOD("animation_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::animation_node_set_filter_path); - ClassDB::bind_method(_MD("oneshot_node_set_fadein_time","id","time_sec"),&AnimationTreePlayer::oneshot_node_set_fadein_time); - ClassDB::bind_method(_MD("oneshot_node_get_fadein_time","id"),&AnimationTreePlayer::oneshot_node_get_fadein_time); + ClassDB::bind_method(D_METHOD("oneshot_node_set_fadein_time","id","time_sec"),&AnimationTreePlayer::oneshot_node_set_fadein_time); + ClassDB::bind_method(D_METHOD("oneshot_node_get_fadein_time","id"),&AnimationTreePlayer::oneshot_node_get_fadein_time); - ClassDB::bind_method(_MD("oneshot_node_set_fadeout_time","id","time_sec"),&AnimationTreePlayer::oneshot_node_set_fadeout_time); - ClassDB::bind_method(_MD("oneshot_node_get_fadeout_time","id"),&AnimationTreePlayer::oneshot_node_get_fadeout_time); + ClassDB::bind_method(D_METHOD("oneshot_node_set_fadeout_time","id","time_sec"),&AnimationTreePlayer::oneshot_node_set_fadeout_time); + ClassDB::bind_method(D_METHOD("oneshot_node_get_fadeout_time","id"),&AnimationTreePlayer::oneshot_node_get_fadeout_time); - ClassDB::bind_method(_MD("oneshot_node_set_autorestart","id","enable"),&AnimationTreePlayer::oneshot_node_set_autorestart); - ClassDB::bind_method(_MD("oneshot_node_set_autorestart_delay","id","delay_sec"),&AnimationTreePlayer::oneshot_node_set_autorestart_delay); - ClassDB::bind_method(_MD("oneshot_node_set_autorestart_random_delay","id","rand_sec"),&AnimationTreePlayer::oneshot_node_set_autorestart_random_delay); + ClassDB::bind_method(D_METHOD("oneshot_node_set_autorestart","id","enable"),&AnimationTreePlayer::oneshot_node_set_autorestart); + ClassDB::bind_method(D_METHOD("oneshot_node_set_autorestart_delay","id","delay_sec"),&AnimationTreePlayer::oneshot_node_set_autorestart_delay); + ClassDB::bind_method(D_METHOD("oneshot_node_set_autorestart_random_delay","id","rand_sec"),&AnimationTreePlayer::oneshot_node_set_autorestart_random_delay); - ClassDB::bind_method(_MD("oneshot_node_has_autorestart","id"),&AnimationTreePlayer::oneshot_node_has_autorestart); - ClassDB::bind_method(_MD("oneshot_node_get_autorestart_delay","id"),&AnimationTreePlayer::oneshot_node_get_autorestart_delay); - ClassDB::bind_method(_MD("oneshot_node_get_autorestart_random_delay","id"),&AnimationTreePlayer::oneshot_node_get_autorestart_random_delay); + ClassDB::bind_method(D_METHOD("oneshot_node_has_autorestart","id"),&AnimationTreePlayer::oneshot_node_has_autorestart); + ClassDB::bind_method(D_METHOD("oneshot_node_get_autorestart_delay","id"),&AnimationTreePlayer::oneshot_node_get_autorestart_delay); + ClassDB::bind_method(D_METHOD("oneshot_node_get_autorestart_random_delay","id"),&AnimationTreePlayer::oneshot_node_get_autorestart_random_delay); - ClassDB::bind_method(_MD("oneshot_node_start","id"),&AnimationTreePlayer::oneshot_node_start); - ClassDB::bind_method(_MD("oneshot_node_stop","id"),&AnimationTreePlayer::oneshot_node_stop); - ClassDB::bind_method(_MD("oneshot_node_is_active","id"),&AnimationTreePlayer::oneshot_node_is_active); - ClassDB::bind_method(_MD("oneshot_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::oneshot_node_set_filter_path); + ClassDB::bind_method(D_METHOD("oneshot_node_start","id"),&AnimationTreePlayer::oneshot_node_start); + ClassDB::bind_method(D_METHOD("oneshot_node_stop","id"),&AnimationTreePlayer::oneshot_node_stop); + ClassDB::bind_method(D_METHOD("oneshot_node_is_active","id"),&AnimationTreePlayer::oneshot_node_is_active); + ClassDB::bind_method(D_METHOD("oneshot_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::oneshot_node_set_filter_path); - ClassDB::bind_method(_MD("mix_node_set_amount","id","ratio"),&AnimationTreePlayer::mix_node_set_amount); - ClassDB::bind_method(_MD("mix_node_get_amount","id"),&AnimationTreePlayer::mix_node_get_amount); + ClassDB::bind_method(D_METHOD("mix_node_set_amount","id","ratio"),&AnimationTreePlayer::mix_node_set_amount); + ClassDB::bind_method(D_METHOD("mix_node_get_amount","id"),&AnimationTreePlayer::mix_node_get_amount); - ClassDB::bind_method(_MD("blend2_node_set_amount","id","blend"),&AnimationTreePlayer::blend2_node_set_amount); - ClassDB::bind_method(_MD("blend2_node_get_amount","id"),&AnimationTreePlayer::blend2_node_get_amount); - ClassDB::bind_method(_MD("blend2_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::blend2_node_set_filter_path); + ClassDB::bind_method(D_METHOD("blend2_node_set_amount","id","blend"),&AnimationTreePlayer::blend2_node_set_amount); + ClassDB::bind_method(D_METHOD("blend2_node_get_amount","id"),&AnimationTreePlayer::blend2_node_get_amount); + ClassDB::bind_method(D_METHOD("blend2_node_set_filter_path","id","path","enable"),&AnimationTreePlayer::blend2_node_set_filter_path); - ClassDB::bind_method(_MD("blend3_node_set_amount","id","blend"),&AnimationTreePlayer::blend3_node_set_amount); - ClassDB::bind_method(_MD("blend3_node_get_amount","id"),&AnimationTreePlayer::blend3_node_get_amount); + ClassDB::bind_method(D_METHOD("blend3_node_set_amount","id","blend"),&AnimationTreePlayer::blend3_node_set_amount); + ClassDB::bind_method(D_METHOD("blend3_node_get_amount","id"),&AnimationTreePlayer::blend3_node_get_amount); - ClassDB::bind_method(_MD("blend4_node_set_amount","id","blend"),&AnimationTreePlayer::blend4_node_set_amount); - ClassDB::bind_method(_MD("blend4_node_get_amount","id"),&AnimationTreePlayer::blend4_node_get_amount); + ClassDB::bind_method(D_METHOD("blend4_node_set_amount","id","blend"),&AnimationTreePlayer::blend4_node_set_amount); + ClassDB::bind_method(D_METHOD("blend4_node_get_amount","id"),&AnimationTreePlayer::blend4_node_get_amount); - ClassDB::bind_method(_MD("timescale_node_set_scale","id","scale"),&AnimationTreePlayer::timescale_node_set_scale); - ClassDB::bind_method(_MD("timescale_node_get_scale","id"),&AnimationTreePlayer::timescale_node_get_scale); + ClassDB::bind_method(D_METHOD("timescale_node_set_scale","id","scale"),&AnimationTreePlayer::timescale_node_set_scale); + ClassDB::bind_method(D_METHOD("timescale_node_get_scale","id"),&AnimationTreePlayer::timescale_node_get_scale); - ClassDB::bind_method(_MD("timeseek_node_seek","id","pos_sec"),&AnimationTreePlayer::timeseek_node_seek); + ClassDB::bind_method(D_METHOD("timeseek_node_seek","id","pos_sec"),&AnimationTreePlayer::timeseek_node_seek); - ClassDB::bind_method(_MD("transition_node_set_input_count","id","count"),&AnimationTreePlayer::transition_node_set_input_count); - ClassDB::bind_method(_MD("transition_node_get_input_count","id"),&AnimationTreePlayer::transition_node_get_input_count); - ClassDB::bind_method(_MD("transition_node_delete_input","id","input_idx"),&AnimationTreePlayer::transition_node_delete_input); + ClassDB::bind_method(D_METHOD("transition_node_set_input_count","id","count"),&AnimationTreePlayer::transition_node_set_input_count); + ClassDB::bind_method(D_METHOD("transition_node_get_input_count","id"),&AnimationTreePlayer::transition_node_get_input_count); + ClassDB::bind_method(D_METHOD("transition_node_delete_input","id","input_idx"),&AnimationTreePlayer::transition_node_delete_input); - ClassDB::bind_method(_MD("transition_node_set_input_auto_advance","id","input_idx","enable"),&AnimationTreePlayer::transition_node_set_input_auto_advance); - ClassDB::bind_method(_MD("transition_node_has_input_auto_advance","id","input_idx"),&AnimationTreePlayer::transition_node_has_input_auto_advance); + ClassDB::bind_method(D_METHOD("transition_node_set_input_auto_advance","id","input_idx","enable"),&AnimationTreePlayer::transition_node_set_input_auto_advance); + ClassDB::bind_method(D_METHOD("transition_node_has_input_auto_advance","id","input_idx"),&AnimationTreePlayer::transition_node_has_input_auto_advance); - ClassDB::bind_method(_MD("transition_node_set_xfade_time","id","time_sec"),&AnimationTreePlayer::transition_node_set_xfade_time); - ClassDB::bind_method(_MD("transition_node_get_xfade_time","id"),&AnimationTreePlayer::transition_node_get_xfade_time); + ClassDB::bind_method(D_METHOD("transition_node_set_xfade_time","id","time_sec"),&AnimationTreePlayer::transition_node_set_xfade_time); + ClassDB::bind_method(D_METHOD("transition_node_get_xfade_time","id"),&AnimationTreePlayer::transition_node_get_xfade_time); - ClassDB::bind_method(_MD("transition_node_set_current","id","input_idx"),&AnimationTreePlayer::transition_node_set_current); - ClassDB::bind_method(_MD("transition_node_get_current","id"),&AnimationTreePlayer::transition_node_get_current); + ClassDB::bind_method(D_METHOD("transition_node_set_current","id","input_idx"),&AnimationTreePlayer::transition_node_set_current); + ClassDB::bind_method(D_METHOD("transition_node_get_current","id"),&AnimationTreePlayer::transition_node_get_current); - ClassDB::bind_method(_MD("node_set_pos","id","screen_pos"),&AnimationTreePlayer::node_set_pos); - ClassDB::bind_method(_MD("node_get_pos","id"),&AnimationTreePlayer::node_get_pos); + ClassDB::bind_method(D_METHOD("node_set_pos","id","screen_pos"),&AnimationTreePlayer::node_set_pos); + ClassDB::bind_method(D_METHOD("node_get_pos","id"),&AnimationTreePlayer::node_get_pos); - ClassDB::bind_method(_MD("remove_node","id"),&AnimationTreePlayer::remove_node); - ClassDB::bind_method(_MD("connect_nodes","id","dst_id","dst_input_idx"),&AnimationTreePlayer::connect_nodes); - ClassDB::bind_method(_MD("are_nodes_connected","id","dst_id","dst_input_idx"),&AnimationTreePlayer::are_nodes_connected); - ClassDB::bind_method(_MD("disconnect_nodes","id","dst_input_idx"),&AnimationTreePlayer::disconnect_nodes); + ClassDB::bind_method(D_METHOD("remove_node","id"),&AnimationTreePlayer::remove_node); + ClassDB::bind_method(D_METHOD("connect_nodes","id","dst_id","dst_input_idx"),&AnimationTreePlayer::connect_nodes); + ClassDB::bind_method(D_METHOD("are_nodes_connected","id","dst_id","dst_input_idx"),&AnimationTreePlayer::are_nodes_connected); + ClassDB::bind_method(D_METHOD("disconnect_nodes","id","dst_input_idx"),&AnimationTreePlayer::disconnect_nodes); - ClassDB::bind_method(_MD("set_active","enabled"),&AnimationTreePlayer::set_active); - ClassDB::bind_method(_MD("is_active"),&AnimationTreePlayer::is_active); + ClassDB::bind_method(D_METHOD("set_active","enabled"),&AnimationTreePlayer::set_active); + ClassDB::bind_method(D_METHOD("is_active"),&AnimationTreePlayer::is_active); - ClassDB::bind_method(_MD("set_base_path","path"),&AnimationTreePlayer::set_base_path); - ClassDB::bind_method(_MD("get_base_path"),&AnimationTreePlayer::get_base_path); + ClassDB::bind_method(D_METHOD("set_base_path","path"),&AnimationTreePlayer::set_base_path); + ClassDB::bind_method(D_METHOD("get_base_path"),&AnimationTreePlayer::get_base_path); - ClassDB::bind_method(_MD("set_master_player","nodepath"),&AnimationTreePlayer::set_master_player); - ClassDB::bind_method(_MD("get_master_player"),&AnimationTreePlayer::get_master_player); + ClassDB::bind_method(D_METHOD("set_master_player","nodepath"),&AnimationTreePlayer::set_master_player); + ClassDB::bind_method(D_METHOD("get_master_player"),&AnimationTreePlayer::get_master_player); - ClassDB::bind_method(_MD("get_node_list"),&AnimationTreePlayer::_get_node_list); + ClassDB::bind_method(D_METHOD("get_node_list"),&AnimationTreePlayer::_get_node_list); - ClassDB::bind_method(_MD("set_animation_process_mode","mode"),&AnimationTreePlayer::set_animation_process_mode); - ClassDB::bind_method(_MD("get_animation_process_mode"),&AnimationTreePlayer::get_animation_process_mode); + ClassDB::bind_method(D_METHOD("set_animation_process_mode","mode"),&AnimationTreePlayer::set_animation_process_mode); + ClassDB::bind_method(D_METHOD("get_animation_process_mode"),&AnimationTreePlayer::get_animation_process_mode); - ClassDB::bind_method(_MD("advance", "delta"), &AnimationTreePlayer::advance); + ClassDB::bind_method(D_METHOD("advance", "delta"), &AnimationTreePlayer::advance); - ClassDB::bind_method(_MD("reset"),&AnimationTreePlayer::reset); + ClassDB::bind_method(D_METHOD("reset"),&AnimationTreePlayer::reset); - ClassDB::bind_method(_MD("recompute_caches"),&AnimationTreePlayer::recompute_caches); + ClassDB::bind_method(D_METHOD("recompute_caches"),&AnimationTreePlayer::recompute_caches); ADD_GROUP("Playback","playback_"); ADD_PROPERTY(PropertyInfo(Variant::INT, "playback_process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_animation_process_mode", "get_animation_process_mode"); diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 6d59edc213..c422e765b5 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -186,40 +186,40 @@ void Tween::_notification(int p_what) { void Tween::_bind_methods() { - ClassDB::bind_method(_MD("is_active"),&Tween::is_active ); - ClassDB::bind_method(_MD("set_active","active"),&Tween::set_active ); - - ClassDB::bind_method(_MD("is_repeat"),&Tween::is_repeat ); - ClassDB::bind_method(_MD("set_repeat","repeat"),&Tween::set_repeat ); - - ClassDB::bind_method(_MD("set_speed_scale","speed"),&Tween::set_speed_scale); - ClassDB::bind_method(_MD("get_speed_scale"),&Tween::get_speed_scale); - - ClassDB::bind_method(_MD("set_tween_process_mode","mode"),&Tween::set_tween_process_mode); - ClassDB::bind_method(_MD("get_tween_process_mode"),&Tween::get_tween_process_mode); - - ClassDB::bind_method(_MD("start"),&Tween::start ); - ClassDB::bind_method(_MD("reset","object","key"),&Tween::reset, DEFVAL("") ); - ClassDB::bind_method(_MD("reset_all"),&Tween::reset_all ); - ClassDB::bind_method(_MD("stop","object","key"),&Tween::stop, DEFVAL("") ); - ClassDB::bind_method(_MD("stop_all"),&Tween::stop_all ); - ClassDB::bind_method(_MD("resume","object","key"),&Tween::resume, DEFVAL("") ); - ClassDB::bind_method(_MD("resume_all"),&Tween::resume_all ); - ClassDB::bind_method(_MD("remove","object","key"),&Tween::remove, DEFVAL("") ); - ClassDB::bind_method(_MD("_remove","object","key","first_only"),&Tween::_remove ); - ClassDB::bind_method(_MD("remove_all"),&Tween::remove_all ); - ClassDB::bind_method(_MD("seek","time"),&Tween::seek ); - ClassDB::bind_method(_MD("tell"),&Tween::tell ); - ClassDB::bind_method(_MD("get_runtime"),&Tween::get_runtime ); - - ClassDB::bind_method(_MD("interpolate_property","object","property","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::interpolate_property, DEFVAL(0) ); - ClassDB::bind_method(_MD("interpolate_method","object","method","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::interpolate_method, DEFVAL(0) ); - ClassDB::bind_method(_MD("interpolate_callback","object","duration","callback","arg1", "arg2","arg3","arg4","arg5"),&Tween::interpolate_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()) ); - ClassDB::bind_method(_MD("interpolate_deferred_callback","object","duration","callback","arg1","arg2","arg3","arg4","arg5"),&Tween::interpolate_deferred_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()) ); - ClassDB::bind_method(_MD("follow_property","object","property","initial_val","target","target_property","duration","trans_type","ease_type","delay"),&Tween::follow_property, DEFVAL(0) ); - ClassDB::bind_method(_MD("follow_method","object","method","initial_val","target","target_method","duration","trans_type","ease_type","delay"),&Tween::follow_method, DEFVAL(0) ); - ClassDB::bind_method(_MD("targeting_property","object","property","initial","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::targeting_property, DEFVAL(0) ); - ClassDB::bind_method(_MD("targeting_method","object","method","initial","initial_method","final_val","duration","trans_type","ease_type","delay"),&Tween::targeting_method, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("is_active"),&Tween::is_active ); + ClassDB::bind_method(D_METHOD("set_active","active"),&Tween::set_active ); + + ClassDB::bind_method(D_METHOD("is_repeat"),&Tween::is_repeat ); + ClassDB::bind_method(D_METHOD("set_repeat","repeat"),&Tween::set_repeat ); + + ClassDB::bind_method(D_METHOD("set_speed_scale","speed"),&Tween::set_speed_scale); + ClassDB::bind_method(D_METHOD("get_speed_scale"),&Tween::get_speed_scale); + + ClassDB::bind_method(D_METHOD("set_tween_process_mode","mode"),&Tween::set_tween_process_mode); + ClassDB::bind_method(D_METHOD("get_tween_process_mode"),&Tween::get_tween_process_mode); + + ClassDB::bind_method(D_METHOD("start"),&Tween::start ); + ClassDB::bind_method(D_METHOD("reset","object","key"),&Tween::reset, DEFVAL("") ); + ClassDB::bind_method(D_METHOD("reset_all"),&Tween::reset_all ); + ClassDB::bind_method(D_METHOD("stop","object","key"),&Tween::stop, DEFVAL("") ); + ClassDB::bind_method(D_METHOD("stop_all"),&Tween::stop_all ); + ClassDB::bind_method(D_METHOD("resume","object","key"),&Tween::resume, DEFVAL("") ); + ClassDB::bind_method(D_METHOD("resume_all"),&Tween::resume_all ); + ClassDB::bind_method(D_METHOD("remove","object","key"),&Tween::remove, DEFVAL("") ); + ClassDB::bind_method(D_METHOD("_remove","object","key","first_only"),&Tween::_remove ); + ClassDB::bind_method(D_METHOD("remove_all"),&Tween::remove_all ); + ClassDB::bind_method(D_METHOD("seek","time"),&Tween::seek ); + ClassDB::bind_method(D_METHOD("tell"),&Tween::tell ); + ClassDB::bind_method(D_METHOD("get_runtime"),&Tween::get_runtime ); + + ClassDB::bind_method(D_METHOD("interpolate_property","object","property","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::interpolate_property, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("interpolate_method","object","method","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::interpolate_method, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("interpolate_callback","object","duration","callback","arg1", "arg2","arg3","arg4","arg5"),&Tween::interpolate_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()) ); + ClassDB::bind_method(D_METHOD("interpolate_deferred_callback","object","duration","callback","arg1","arg2","arg3","arg4","arg5"),&Tween::interpolate_deferred_callback, DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()), DEFVAL(Variant()) ); + ClassDB::bind_method(D_METHOD("follow_property","object","property","initial_val","target","target_property","duration","trans_type","ease_type","delay"),&Tween::follow_property, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("follow_method","object","method","initial_val","target","target_method","duration","trans_type","ease_type","delay"),&Tween::follow_method, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("targeting_property","object","property","initial","initial_val","final_val","duration","trans_type","ease_type","delay"),&Tween::targeting_property, DEFVAL(0) ); + ClassDB::bind_method(D_METHOD("targeting_method","object","method","initial","initial_method","final_val","duration","trans_type","ease_type","delay"),&Tween::targeting_method, DEFVAL(0) ); ADD_SIGNAL( MethodInfo("tween_started", PropertyInfo( Variant::OBJECT,"object"), PropertyInfo( Variant::STRING,"key")) ); ADD_SIGNAL( MethodInfo("tween_step", PropertyInfo( Variant::OBJECT,"object"), PropertyInfo( Variant::STRING,"key"), PropertyInfo( Variant::REAL,"elapsed"), PropertyInfo( Variant::OBJECT,"value")) ); diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index 0aee7e8736..e646810387 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -243,32 +243,32 @@ void AudioPlayer::_bus_layout_changed() { void AudioPlayer::_bind_methods() { - ClassDB::bind_method(_MD("set_stream","stream:AudioStream"),&AudioPlayer::set_stream); - ClassDB::bind_method(_MD("get_stream"),&AudioPlayer::get_stream); + ClassDB::bind_method(D_METHOD("set_stream","stream:AudioStream"),&AudioPlayer::set_stream); + ClassDB::bind_method(D_METHOD("get_stream"),&AudioPlayer::get_stream); - ClassDB::bind_method(_MD("set_volume_db","volume_db"),&AudioPlayer::set_volume_db); - ClassDB::bind_method(_MD("get_volume_db"),&AudioPlayer::get_volume_db); + ClassDB::bind_method(D_METHOD("set_volume_db","volume_db"),&AudioPlayer::set_volume_db); + ClassDB::bind_method(D_METHOD("get_volume_db"),&AudioPlayer::get_volume_db); - ClassDB::bind_method(_MD("play","from_pos"),&AudioPlayer::play,DEFVAL(0.0)); - ClassDB::bind_method(_MD("seek","to_pos"),&AudioPlayer::seek); - ClassDB::bind_method(_MD("stop"),&AudioPlayer::stop); + ClassDB::bind_method(D_METHOD("play","from_pos"),&AudioPlayer::play,DEFVAL(0.0)); + ClassDB::bind_method(D_METHOD("seek","to_pos"),&AudioPlayer::seek); + ClassDB::bind_method(D_METHOD("stop"),&AudioPlayer::stop); - ClassDB::bind_method(_MD("is_playing"),&AudioPlayer::is_playing); - ClassDB::bind_method(_MD("get_pos"),&AudioPlayer::get_pos); + ClassDB::bind_method(D_METHOD("is_playing"),&AudioPlayer::is_playing); + ClassDB::bind_method(D_METHOD("get_pos"),&AudioPlayer::get_pos); - ClassDB::bind_method(_MD("set_bus","bus"),&AudioPlayer::set_bus); - ClassDB::bind_method(_MD("get_bus"),&AudioPlayer::get_bus); + ClassDB::bind_method(D_METHOD("set_bus","bus"),&AudioPlayer::set_bus); + ClassDB::bind_method(D_METHOD("get_bus"),&AudioPlayer::get_bus); - ClassDB::bind_method(_MD("set_autoplay","enable"),&AudioPlayer::set_autoplay); - ClassDB::bind_method(_MD("is_autoplay_enabled"),&AudioPlayer::is_autoplay_enabled); + ClassDB::bind_method(D_METHOD("set_autoplay","enable"),&AudioPlayer::set_autoplay); + ClassDB::bind_method(D_METHOD("is_autoplay_enabled"),&AudioPlayer::is_autoplay_enabled); - ClassDB::bind_method(_MD("set_mix_target","mix_target"),&AudioPlayer::set_mix_target); - ClassDB::bind_method(_MD("get_mix_target"),&AudioPlayer::get_mix_target); + ClassDB::bind_method(D_METHOD("set_mix_target","mix_target"),&AudioPlayer::set_mix_target); + ClassDB::bind_method(D_METHOD("get_mix_target"),&AudioPlayer::get_mix_target); - ClassDB::bind_method(_MD("_set_playing","enable"),&AudioPlayer::_set_playing); - ClassDB::bind_method(_MD("_is_active"),&AudioPlayer::_is_active); + ClassDB::bind_method(D_METHOD("_set_playing","enable"),&AudioPlayer::_set_playing); + ClassDB::bind_method(D_METHOD("_is_active"),&AudioPlayer::_is_active); - ClassDB::bind_method(_MD("_bus_layout_changed"),&AudioPlayer::_bus_layout_changed); + ClassDB::bind_method(D_METHOD("_bus_layout_changed"),&AudioPlayer::_bus_layout_changed); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"stream",PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"),"set_stream","get_stream") ; diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index f31ad6aaf1..79b607e2e6 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -505,26 +505,26 @@ Ref<ButtonGroup> BaseButton::get_button_group() const { void BaseButton::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&BaseButton::_gui_input); - ClassDB::bind_method(_MD("_unhandled_input"),&BaseButton::_unhandled_input); - ClassDB::bind_method(_MD("set_pressed","pressed"),&BaseButton::set_pressed); - ClassDB::bind_method(_MD("is_pressed"),&BaseButton::is_pressed); - ClassDB::bind_method(_MD("is_hovered"),&BaseButton::is_hovered); - ClassDB::bind_method(_MD("set_toggle_mode","enabled"),&BaseButton::set_toggle_mode); - ClassDB::bind_method(_MD("is_toggle_mode"),&BaseButton::is_toggle_mode); - ClassDB::bind_method(_MD("set_disabled","disabled"),&BaseButton::set_disabled); - ClassDB::bind_method(_MD("is_disabled"),&BaseButton::is_disabled); - ClassDB::bind_method(_MD("set_action_mode","mode"),&BaseButton::set_action_mode); - ClassDB::bind_method(_MD("get_action_mode"),&BaseButton::get_action_mode); - ClassDB::bind_method(_MD("get_draw_mode"),&BaseButton::get_draw_mode); - ClassDB::bind_method(_MD("set_enabled_focus_mode","mode"),&BaseButton::set_enabled_focus_mode); - ClassDB::bind_method(_MD("get_enabled_focus_mode"),&BaseButton::get_enabled_focus_mode); - - ClassDB::bind_method(_MD("set_shortcut","shortcut"),&BaseButton::set_shortcut); - ClassDB::bind_method(_MD("get_shortcut"),&BaseButton::get_shortcut); - - ClassDB::bind_method(_MD("set_button_group","button_group"),&BaseButton::set_button_group); - ClassDB::bind_method(_MD("get_button_group"),&BaseButton::get_button_group); + ClassDB::bind_method(D_METHOD("_gui_input"),&BaseButton::_gui_input); + ClassDB::bind_method(D_METHOD("_unhandled_input"),&BaseButton::_unhandled_input); + ClassDB::bind_method(D_METHOD("set_pressed","pressed"),&BaseButton::set_pressed); + ClassDB::bind_method(D_METHOD("is_pressed"),&BaseButton::is_pressed); + ClassDB::bind_method(D_METHOD("is_hovered"),&BaseButton::is_hovered); + ClassDB::bind_method(D_METHOD("set_toggle_mode","enabled"),&BaseButton::set_toggle_mode); + ClassDB::bind_method(D_METHOD("is_toggle_mode"),&BaseButton::is_toggle_mode); + ClassDB::bind_method(D_METHOD("set_disabled","disabled"),&BaseButton::set_disabled); + ClassDB::bind_method(D_METHOD("is_disabled"),&BaseButton::is_disabled); + ClassDB::bind_method(D_METHOD("set_action_mode","mode"),&BaseButton::set_action_mode); + ClassDB::bind_method(D_METHOD("get_action_mode"),&BaseButton::get_action_mode); + ClassDB::bind_method(D_METHOD("get_draw_mode"),&BaseButton::get_draw_mode); + ClassDB::bind_method(D_METHOD("set_enabled_focus_mode","mode"),&BaseButton::set_enabled_focus_mode); + ClassDB::bind_method(D_METHOD("get_enabled_focus_mode"),&BaseButton::get_enabled_focus_mode); + + ClassDB::bind_method(D_METHOD("set_shortcut","shortcut"),&BaseButton::set_shortcut); + ClassDB::bind_method(D_METHOD("get_shortcut"),&BaseButton::get_shortcut); + + ClassDB::bind_method(D_METHOD("set_button_group","button_group"),&BaseButton::set_button_group); + ClassDB::bind_method(D_METHOD("get_button_group"),&BaseButton::get_button_group); BIND_VMETHOD(MethodInfo("_pressed")); BIND_VMETHOD(MethodInfo("_toggled",PropertyInfo(Variant::BOOL,"pressed"))); @@ -598,7 +598,7 @@ BaseButton* ButtonGroup::get_pressed_button() { void ButtonGroup::_bind_methods() { - ClassDB::bind_method(_MD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button); + ClassDB::bind_method(D_METHOD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button); } ButtonGroup::ButtonGroup() { diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index b9121490e6..1f6e0392d8 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -302,9 +302,9 @@ BoxContainer::BoxContainer(bool p_vertical) { void BoxContainer::_bind_methods() { - ClassDB::bind_method(_MD("add_spacer","begin"),&BoxContainer::add_spacer); - ClassDB::bind_method(_MD("get_alignment"),&BoxContainer::get_alignment); - ClassDB::bind_method(_MD("set_alignment","alignment"),&BoxContainer::set_alignment); + ClassDB::bind_method(D_METHOD("add_spacer","begin"),&BoxContainer::add_spacer); + ClassDB::bind_method(D_METHOD("get_alignment"),&BoxContainer::get_alignment); + ClassDB::bind_method(D_METHOD("set_alignment","alignment"),&BoxContainer::set_alignment); BIND_CONSTANT( ALIGN_BEGIN ); BIND_CONSTANT( ALIGN_CENTER ); diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 3eb583decb..de2ccfb0b5 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -228,16 +228,16 @@ Button::TextAlign Button::get_text_align() const { void Button::_bind_methods() { - ClassDB::bind_method(_MD("set_text","text"),&Button::set_text); - ClassDB::bind_method(_MD("get_text"),&Button::get_text); - ClassDB::bind_method(_MD("set_button_icon","texture:Texture"),&Button::set_icon); - ClassDB::bind_method(_MD("get_button_icon:Texture"),&Button::get_icon); - ClassDB::bind_method(_MD("set_flat","enabled"),&Button::set_flat); - ClassDB::bind_method(_MD("set_clip_text","enabled"),&Button::set_clip_text); - ClassDB::bind_method(_MD("get_clip_text"),&Button::get_clip_text); - ClassDB::bind_method(_MD("set_text_align","align"),&Button::set_text_align); - ClassDB::bind_method(_MD("get_text_align"),&Button::get_text_align); - ClassDB::bind_method(_MD("is_flat"),&Button::is_flat); + ClassDB::bind_method(D_METHOD("set_text","text"),&Button::set_text); + ClassDB::bind_method(D_METHOD("get_text"),&Button::get_text); + ClassDB::bind_method(D_METHOD("set_button_icon","texture:Texture"),&Button::set_icon); + ClassDB::bind_method(D_METHOD("get_button_icon:Texture"),&Button::get_icon); + ClassDB::bind_method(D_METHOD("set_flat","enabled"),&Button::set_flat); + ClassDB::bind_method(D_METHOD("set_clip_text","enabled"),&Button::set_clip_text); + ClassDB::bind_method(D_METHOD("get_clip_text"),&Button::get_clip_text); + ClassDB::bind_method(D_METHOD("set_text_align","align"),&Button::set_text_align); + ClassDB::bind_method(D_METHOD("get_text_align"),&Button::get_text_align); + ClassDB::bind_method(D_METHOD("is_flat"),&Button::is_flat); BIND_CONSTANT( ALIGN_LEFT ); BIND_CONSTANT( ALIGN_CENTER ); diff --git a/scene/gui/button_array.cpp b/scene/gui/button_array.cpp index 557b128ac4..c05b787bf5 100644 --- a/scene/gui/button_array.cpp +++ b/scene/gui/button_array.cpp @@ -527,24 +527,24 @@ void ButtonArray::get_translatable_strings(List<String> *p_strings) const { void ButtonArray::_bind_methods() { - ClassDB::bind_method(_MD("add_button","text","tooltip"),&ButtonArray::add_button,DEFVAL("")); - ClassDB::bind_method(_MD("add_icon_button","icon:Texture","text","tooltip"),&ButtonArray::add_icon_button,DEFVAL(""),DEFVAL("")); - ClassDB::bind_method(_MD("set_button_text","button_idx","text"),&ButtonArray::set_button_text); - ClassDB::bind_method(_MD("set_button_tooltip","button_idx","text"),&ButtonArray::set_button_tooltip); - ClassDB::bind_method(_MD("set_button_icon","button_idx","icon:Texture"),&ButtonArray::set_button_icon); - ClassDB::bind_method(_MD("get_button_text","button_idx"),&ButtonArray::get_button_text); - ClassDB::bind_method(_MD("get_button_tooltip","button_idx"),&ButtonArray::get_button_tooltip); - ClassDB::bind_method(_MD("get_button_icon:Texture","button_idx"),&ButtonArray::get_button_icon); - ClassDB::bind_method(_MD("get_button_count"),&ButtonArray::get_button_count); - ClassDB::bind_method(_MD("set_flat","enabled"),&ButtonArray::set_flat); - ClassDB::bind_method(_MD("is_flat"),&ButtonArray::is_flat); - ClassDB::bind_method(_MD("get_selected"),&ButtonArray::get_selected); - ClassDB::bind_method(_MD("get_hovered"),&ButtonArray::get_hovered); - ClassDB::bind_method(_MD("set_selected","button_idx"),&ButtonArray::set_selected); - ClassDB::bind_method(_MD("erase_button","button_idx"),&ButtonArray::erase_button); - ClassDB::bind_method(_MD("clear"),&ButtonArray::clear); - - ClassDB::bind_method(_MD("_gui_input"),&ButtonArray::_gui_input); + ClassDB::bind_method(D_METHOD("add_button","text","tooltip"),&ButtonArray::add_button,DEFVAL("")); + ClassDB::bind_method(D_METHOD("add_icon_button","icon:Texture","text","tooltip"),&ButtonArray::add_icon_button,DEFVAL(""),DEFVAL("")); + ClassDB::bind_method(D_METHOD("set_button_text","button_idx","text"),&ButtonArray::set_button_text); + ClassDB::bind_method(D_METHOD("set_button_tooltip","button_idx","text"),&ButtonArray::set_button_tooltip); + ClassDB::bind_method(D_METHOD("set_button_icon","button_idx","icon:Texture"),&ButtonArray::set_button_icon); + ClassDB::bind_method(D_METHOD("get_button_text","button_idx"),&ButtonArray::get_button_text); + ClassDB::bind_method(D_METHOD("get_button_tooltip","button_idx"),&ButtonArray::get_button_tooltip); + ClassDB::bind_method(D_METHOD("get_button_icon:Texture","button_idx"),&ButtonArray::get_button_icon); + ClassDB::bind_method(D_METHOD("get_button_count"),&ButtonArray::get_button_count); + ClassDB::bind_method(D_METHOD("set_flat","enabled"),&ButtonArray::set_flat); + ClassDB::bind_method(D_METHOD("is_flat"),&ButtonArray::is_flat); + ClassDB::bind_method(D_METHOD("get_selected"),&ButtonArray::get_selected); + ClassDB::bind_method(D_METHOD("get_hovered"),&ButtonArray::get_hovered); + ClassDB::bind_method(D_METHOD("set_selected","button_idx"),&ButtonArray::set_selected); + ClassDB::bind_method(D_METHOD("erase_button","button_idx"),&ButtonArray::erase_button); + ClassDB::bind_method(D_METHOD("clear"),&ButtonArray::clear); + + ClassDB::bind_method(D_METHOD("_gui_input"),&ButtonArray::_gui_input); BIND_CONSTANT( ALIGN_BEGIN ); BIND_CONSTANT( ALIGN_CENTER ); diff --git a/scene/gui/button_group.cpp b/scene/gui/button_group.cpp index 01a3f633c3..21c1559b8f 100644 --- a/scene/gui/button_group.cpp +++ b/scene/gui/button_group.cpp @@ -151,12 +151,12 @@ int ButtonGroup::get_pressed_button_index() const { void ButtonGroup::_bind_methods() { - ClassDB::bind_method(_MD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button); - ClassDB::bind_method(_MD("get_pressed_button_index"),&ButtonGroup::get_pressed_button_index); - ClassDB::bind_method(_MD("get_focused_button:BaseButton"),&ButtonGroup::get_focused_button); - ClassDB::bind_method(_MD("get_button_list"),&ButtonGroup::_get_button_list); - ClassDB::bind_method(_MD("_pressed"),&ButtonGroup::_pressed); - ClassDB::bind_method(_MD("set_pressed_button","button:BaseButton"),&ButtonGroup::_pressed); + ClassDB::bind_method(D_METHOD("get_pressed_button:BaseButton"),&ButtonGroup::get_pressed_button); + ClassDB::bind_method(D_METHOD("get_pressed_button_index"),&ButtonGroup::get_pressed_button_index); + ClassDB::bind_method(D_METHOD("get_focused_button:BaseButton"),&ButtonGroup::get_focused_button); + ClassDB::bind_method(D_METHOD("get_button_list"),&ButtonGroup::_get_button_list); + ClassDB::bind_method(D_METHOD("_pressed"),&ButtonGroup::_pressed); + ClassDB::bind_method(D_METHOD("set_pressed_button","button:BaseButton"),&ButtonGroup::_pressed); ADD_SIGNAL( MethodInfo("button_selected",PropertyInfo(Variant::OBJECT,"button",PROPERTY_HINT_RESOURCE_TYPE,"BaseButton"))); } diff --git a/scene/gui/center_container.cpp b/scene/gui/center_container.cpp index e7814d07b2..c1c04ced84 100644 --- a/scene/gui/center_container.cpp +++ b/scene/gui/center_container.cpp @@ -92,8 +92,8 @@ void CenterContainer::_notification(int p_what) { void CenterContainer::_bind_methods() { - ClassDB::bind_method(_MD("set_use_top_left","enable"),&CenterContainer::set_use_top_left); - ClassDB::bind_method(_MD("is_using_top_left"),&CenterContainer::is_using_top_left); + ClassDB::bind_method(D_METHOD("set_use_top_left","enable"),&CenterContainer::set_use_top_left); + ClassDB::bind_method(D_METHOD("is_using_top_left"),&CenterContainer::is_using_top_left); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"use_top_left"),"set_use_top_left","is_using_top_left"); } diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index d6ec33797e..d9da583bf5 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -451,24 +451,24 @@ void ColorPicker::_screen_pick_pressed() void ColorPicker::_bind_methods() { - ClassDB::bind_method(_MD("set_pick_color","color"),&ColorPicker::set_pick_color); - ClassDB::bind_method(_MD("get_pick_color"),&ColorPicker::get_pick_color); - ClassDB::bind_method(_MD("set_raw_mode","mode"),&ColorPicker::set_raw_mode); - ClassDB::bind_method(_MD("is_raw_mode"),&ColorPicker::is_raw_mode); - ClassDB::bind_method(_MD("set_edit_alpha","show"),&ColorPicker::set_edit_alpha); - ClassDB::bind_method(_MD("is_editing_alpha"),&ColorPicker::is_editing_alpha); - ClassDB::bind_method(_MD("add_preset"), &ColorPicker::add_preset); - ClassDB::bind_method(_MD("_value_changed"),&ColorPicker::_value_changed); - ClassDB::bind_method(_MD("_html_entered"),&ColorPicker::_html_entered); - ClassDB::bind_method(_MD("_text_type_toggled"),&ColorPicker::_text_type_toggled); - ClassDB::bind_method(_MD("_add_preset_pressed"), &ColorPicker::_add_preset_pressed); - ClassDB::bind_method(_MD("_screen_pick_pressed"), &ColorPicker::_screen_pick_pressed); - ClassDB::bind_method(_MD("_sample_draw"),&ColorPicker::_sample_draw); - ClassDB::bind_method(_MD("_hsv_draw"),&ColorPicker::_hsv_draw); - ClassDB::bind_method(_MD("_uv_input"),&ColorPicker::_uv_input); - ClassDB::bind_method(_MD("_w_input"),&ColorPicker::_w_input); - ClassDB::bind_method(_MD("_preset_input"),&ColorPicker::_preset_input); - ClassDB::bind_method(_MD("_screen_input"),&ColorPicker::_screen_input); + ClassDB::bind_method(D_METHOD("set_pick_color","color"),&ColorPicker::set_pick_color); + ClassDB::bind_method(D_METHOD("get_pick_color"),&ColorPicker::get_pick_color); + ClassDB::bind_method(D_METHOD("set_raw_mode","mode"),&ColorPicker::set_raw_mode); + ClassDB::bind_method(D_METHOD("is_raw_mode"),&ColorPicker::is_raw_mode); + ClassDB::bind_method(D_METHOD("set_edit_alpha","show"),&ColorPicker::set_edit_alpha); + ClassDB::bind_method(D_METHOD("is_editing_alpha"),&ColorPicker::is_editing_alpha); + ClassDB::bind_method(D_METHOD("add_preset"), &ColorPicker::add_preset); + ClassDB::bind_method(D_METHOD("_value_changed"),&ColorPicker::_value_changed); + ClassDB::bind_method(D_METHOD("_html_entered"),&ColorPicker::_html_entered); + ClassDB::bind_method(D_METHOD("_text_type_toggled"),&ColorPicker::_text_type_toggled); + ClassDB::bind_method(D_METHOD("_add_preset_pressed"), &ColorPicker::_add_preset_pressed); + ClassDB::bind_method(D_METHOD("_screen_pick_pressed"), &ColorPicker::_screen_pick_pressed); + ClassDB::bind_method(D_METHOD("_sample_draw"),&ColorPicker::_sample_draw); + ClassDB::bind_method(D_METHOD("_hsv_draw"),&ColorPicker::_hsv_draw); + ClassDB::bind_method(D_METHOD("_uv_input"),&ColorPicker::_uv_input); + ClassDB::bind_method(D_METHOD("_w_input"),&ColorPicker::_w_input); + ClassDB::bind_method(D_METHOD("_preset_input"),&ColorPicker::_preset_input); + ClassDB::bind_method(D_METHOD("_screen_input"),&ColorPicker::_screen_input); ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color"))); } @@ -665,12 +665,12 @@ ColorPicker *ColorPickerButton::get_picker() { void ColorPickerButton::_bind_methods(){ - ClassDB::bind_method(_MD("set_pick_color","color"),&ColorPickerButton::set_pick_color); - ClassDB::bind_method(_MD("get_pick_color"),&ColorPickerButton::get_pick_color); - ClassDB::bind_method(_MD("get_picker:ColorPicker"),&ColorPickerButton::get_picker); - ClassDB::bind_method(_MD("set_edit_alpha","show"),&ColorPickerButton::set_edit_alpha); - ClassDB::bind_method(_MD("is_editing_alpha"),&ColorPickerButton::is_editing_alpha); - ClassDB::bind_method(_MD("_color_changed"),&ColorPickerButton::_color_changed); + ClassDB::bind_method(D_METHOD("set_pick_color","color"),&ColorPickerButton::set_pick_color); + ClassDB::bind_method(D_METHOD("get_pick_color"),&ColorPickerButton::get_pick_color); + ClassDB::bind_method(D_METHOD("get_picker:ColorPicker"),&ColorPickerButton::get_picker); + ClassDB::bind_method(D_METHOD("set_edit_alpha","show"),&ColorPickerButton::set_edit_alpha); + ClassDB::bind_method(D_METHOD("is_editing_alpha"),&ColorPickerButton::is_editing_alpha); + ClassDB::bind_method(D_METHOD("_color_changed"),&ColorPickerButton::_color_changed); ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color"))); ADD_PROPERTY( PropertyInfo(Variant::COLOR,"color"),"set_pick_color","get_pick_color") ; diff --git a/scene/gui/color_ramp_edit.cpp b/scene/gui/color_ramp_edit.cpp index 5d5d6c31a2..81bc5ca9bb 100644 --- a/scene/gui/color_ramp_edit.cpp +++ b/scene/gui/color_ramp_edit.cpp @@ -446,7 +446,7 @@ Vector<ColorRamp::Point>& ColorRampEdit::get_points() { } void ColorRampEdit::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&ColorRampEdit::_gui_input); - ClassDB::bind_method(_MD("_color_changed"),&ColorRampEdit::_color_changed); + ClassDB::bind_method(D_METHOD("_gui_input"),&ColorRampEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_color_changed"),&ColorRampEdit::_color_changed); ADD_SIGNAL(MethodInfo("ramp_changed")); } diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp index f626d79f60..d72dffcae3 100644 --- a/scene/gui/color_rect.cpp +++ b/scene/gui/color_rect.cpp @@ -49,8 +49,8 @@ void ColorRect::_notification(int p_what) { void ColorRect::_bind_methods() { - ClassDB::bind_method(_MD("set_frame_color","color"),&ColorRect::set_frame_color); - ClassDB::bind_method(_MD("get_frame_color"),&ColorRect::get_frame_color); + ClassDB::bind_method(D_METHOD("set_frame_color","color"),&ColorRect::set_frame_color); + ClassDB::bind_method(D_METHOD("get_frame_color"),&ColorRect::get_frame_color); ADD_PROPERTY(PropertyInfo(Variant::COLOR,"color"),"set_frame_color","get_frame_color") ; } diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index de5f35933c..655c6e1bbf 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -156,11 +156,11 @@ void Container::_notification(int p_what) { void Container::_bind_methods() { - ClassDB::bind_method(_MD("_sort_children"),&Container::_sort_children); - ClassDB::bind_method(_MD("_child_minsize_changed"),&Container::_child_minsize_changed); + ClassDB::bind_method(D_METHOD("_sort_children"),&Container::_sort_children); + ClassDB::bind_method(D_METHOD("_child_minsize_changed"),&Container::_child_minsize_changed); - ClassDB::bind_method(_MD("queue_sort"),&Container::queue_sort); - ClassDB::bind_method(_MD("fit_child_in_rect","child:Control","rect"),&Container::fit_child_in_rect); + ClassDB::bind_method(D_METHOD("queue_sort"),&Container::queue_sort); + ClassDB::bind_method(D_METHOD("fit_child_in_rect","child:Control","rect"),&Container::fit_child_in_rect); BIND_CONSTANT( NOTIFICATION_SORT_CHILDREN ); ADD_SIGNAL(MethodInfo("sort_children")); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 42020ee75b..e52afdffdf 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2448,125 +2448,125 @@ bool Control::is_clipping_contents() { void Control::_bind_methods() { - //ClassDB::bind_method(_MD("_window_resize_event"),&Control::_window_resize_event); - ClassDB::bind_method(_MD("_size_changed"),&Control::_size_changed); - ClassDB::bind_method(_MD("_update_minimum_size"),&Control::_update_minimum_size); - - ClassDB::bind_method(_MD("accept_event"),&Control::accept_event); - ClassDB::bind_method(_MD("get_minimum_size"),&Control::get_minimum_size); - ClassDB::bind_method(_MD("get_combined_minimum_size"),&Control::get_combined_minimum_size); - ClassDB::bind_method(_MD("set_anchor","margin","anchor_mode","keep_margin"),&Control::set_anchor,DEFVAL(false)); - ClassDB::bind_method(_MD("_set_anchor","margin","anchor_mode"),&Control::_set_anchor); - ClassDB::bind_method(_MD("get_anchor","margin"),&Control::get_anchor); - ClassDB::bind_method(_MD("set_margin","margin","offset"),&Control::set_margin); - ClassDB::bind_method(_MD("set_anchor_and_margin","margin","anchor_mode","offset"),&Control::set_anchor_and_margin); - ClassDB::bind_method(_MD("set_begin","pos"),&Control::set_begin); - ClassDB::bind_method(_MD("set_end","pos"),&Control::set_end); - ClassDB::bind_method(_MD("set_pos","pos"),&Control::set_pos); - ClassDB::bind_method(_MD("set_size","size"),&Control::set_size); - ClassDB::bind_method(_MD("set_custom_minimum_size","size"),&Control::set_custom_minimum_size); - ClassDB::bind_method(_MD("set_global_pos","pos"),&Control::set_global_pos); - ClassDB::bind_method(_MD("set_rotation","radians"),&Control::set_rotation); - ClassDB::bind_method(_MD("set_rotation_deg","degrees"),&Control::set_rotation_deg); + //ClassDB::bind_method(D_METHOD("_window_resize_event"),&Control::_window_resize_event); + ClassDB::bind_method(D_METHOD("_size_changed"),&Control::_size_changed); + ClassDB::bind_method(D_METHOD("_update_minimum_size"),&Control::_update_minimum_size); + + ClassDB::bind_method(D_METHOD("accept_event"),&Control::accept_event); + ClassDB::bind_method(D_METHOD("get_minimum_size"),&Control::get_minimum_size); + ClassDB::bind_method(D_METHOD("get_combined_minimum_size"),&Control::get_combined_minimum_size); + ClassDB::bind_method(D_METHOD("set_anchor","margin","anchor_mode","keep_margin"),&Control::set_anchor,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("_set_anchor","margin","anchor_mode"),&Control::_set_anchor); + ClassDB::bind_method(D_METHOD("get_anchor","margin"),&Control::get_anchor); + ClassDB::bind_method(D_METHOD("set_margin","margin","offset"),&Control::set_margin); + ClassDB::bind_method(D_METHOD("set_anchor_and_margin","margin","anchor_mode","offset"),&Control::set_anchor_and_margin); + ClassDB::bind_method(D_METHOD("set_begin","pos"),&Control::set_begin); + ClassDB::bind_method(D_METHOD("set_end","pos"),&Control::set_end); + ClassDB::bind_method(D_METHOD("set_pos","pos"),&Control::set_pos); + ClassDB::bind_method(D_METHOD("set_size","size"),&Control::set_size); + ClassDB::bind_method(D_METHOD("set_custom_minimum_size","size"),&Control::set_custom_minimum_size); + ClassDB::bind_method(D_METHOD("set_global_pos","pos"),&Control::set_global_pos); + ClassDB::bind_method(D_METHOD("set_rotation","radians"),&Control::set_rotation); + ClassDB::bind_method(D_METHOD("set_rotation_deg","degrees"),&Control::set_rotation_deg); // TODO: Obsolete this method (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_set_rotation_deg","degrees"),&Control::_set_rotation_deg); - ClassDB::bind_method(_MD("set_scale","scale"),&Control::set_scale); - ClassDB::bind_method(_MD("get_margin","margin"),&Control::get_margin); - ClassDB::bind_method(_MD("get_begin"),&Control::get_begin); - ClassDB::bind_method(_MD("get_end"),&Control::get_end); - ClassDB::bind_method(_MD("get_pos"),&Control::get_pos); - ClassDB::bind_method(_MD("get_size"),&Control::get_size); - ClassDB::bind_method(_MD("get_rotation"),&Control::get_rotation); - ClassDB::bind_method(_MD("get_rotation_deg"),&Control::get_rotation_deg); + ClassDB::bind_method(D_METHOD("_set_rotation_deg","degrees"),&Control::_set_rotation_deg); + ClassDB::bind_method(D_METHOD("set_scale","scale"),&Control::set_scale); + ClassDB::bind_method(D_METHOD("get_margin","margin"),&Control::get_margin); + ClassDB::bind_method(D_METHOD("get_begin"),&Control::get_begin); + ClassDB::bind_method(D_METHOD("get_end"),&Control::get_end); + ClassDB::bind_method(D_METHOD("get_pos"),&Control::get_pos); + ClassDB::bind_method(D_METHOD("get_size"),&Control::get_size); + ClassDB::bind_method(D_METHOD("get_rotation"),&Control::get_rotation); + ClassDB::bind_method(D_METHOD("get_rotation_deg"),&Control::get_rotation_deg); // TODO: Obsolete this method (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_get_rotation_deg"),&Control::_get_rotation_deg); - ClassDB::bind_method(_MD("get_scale"),&Control::get_scale); - ClassDB::bind_method(_MD("get_custom_minimum_size"),&Control::get_custom_minimum_size); - ClassDB::bind_method(_MD("get_parent_area_size"),&Control::get_size); - ClassDB::bind_method(_MD("get_global_pos"),&Control::get_global_pos); - ClassDB::bind_method(_MD("get_rect"),&Control::get_rect); - ClassDB::bind_method(_MD("get_global_rect"),&Control::get_global_rect); - ClassDB::bind_method(_MD("set_area_as_parent_rect","margin"),&Control::set_area_as_parent_rect,DEFVAL(0)); - ClassDB::bind_method(_MD("show_modal","exclusive"),&Control::show_modal,DEFVAL(false)); - ClassDB::bind_method(_MD("set_focus_mode","mode"),&Control::set_focus_mode); - ClassDB::bind_method(_MD("get_focus_mode"),&Control::get_focus_mode); - ClassDB::bind_method(_MD("has_focus"),&Control::has_focus); - ClassDB::bind_method(_MD("grab_focus"),&Control::grab_focus); - ClassDB::bind_method(_MD("release_focus"),&Control::release_focus); - ClassDB::bind_method(_MD("get_focus_owner:Control"),&Control::get_focus_owner); + ClassDB::bind_method(D_METHOD("_get_rotation_deg"),&Control::_get_rotation_deg); + ClassDB::bind_method(D_METHOD("get_scale"),&Control::get_scale); + ClassDB::bind_method(D_METHOD("get_custom_minimum_size"),&Control::get_custom_minimum_size); + ClassDB::bind_method(D_METHOD("get_parent_area_size"),&Control::get_size); + ClassDB::bind_method(D_METHOD("get_global_pos"),&Control::get_global_pos); + ClassDB::bind_method(D_METHOD("get_rect"),&Control::get_rect); + ClassDB::bind_method(D_METHOD("get_global_rect"),&Control::get_global_rect); + ClassDB::bind_method(D_METHOD("set_area_as_parent_rect","margin"),&Control::set_area_as_parent_rect,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("show_modal","exclusive"),&Control::show_modal,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_focus_mode","mode"),&Control::set_focus_mode); + ClassDB::bind_method(D_METHOD("get_focus_mode"),&Control::get_focus_mode); + ClassDB::bind_method(D_METHOD("has_focus"),&Control::has_focus); + ClassDB::bind_method(D_METHOD("grab_focus"),&Control::grab_focus); + ClassDB::bind_method(D_METHOD("release_focus"),&Control::release_focus); + ClassDB::bind_method(D_METHOD("get_focus_owner:Control"),&Control::get_focus_owner); - ClassDB::bind_method(_MD("set_h_size_flags","flags"),&Control::set_h_size_flags); - ClassDB::bind_method(_MD("get_h_size_flags"),&Control::get_h_size_flags); + ClassDB::bind_method(D_METHOD("set_h_size_flags","flags"),&Control::set_h_size_flags); + ClassDB::bind_method(D_METHOD("get_h_size_flags"),&Control::get_h_size_flags); - ClassDB::bind_method(_MD("set_stretch_ratio","ratio"),&Control::set_stretch_ratio); - ClassDB::bind_method(_MD("get_stretch_ratio"),&Control::get_stretch_ratio); + ClassDB::bind_method(D_METHOD("set_stretch_ratio","ratio"),&Control::set_stretch_ratio); + ClassDB::bind_method(D_METHOD("get_stretch_ratio"),&Control::get_stretch_ratio); - ClassDB::bind_method(_MD("set_v_size_flags","flags"),&Control::set_v_size_flags); - ClassDB::bind_method(_MD("get_v_size_flags"),&Control::get_v_size_flags); + ClassDB::bind_method(D_METHOD("set_v_size_flags","flags"),&Control::set_v_size_flags); + ClassDB::bind_method(D_METHOD("get_v_size_flags"),&Control::get_v_size_flags); - ClassDB::bind_method(_MD("set_theme","theme:Theme"),&Control::set_theme); - ClassDB::bind_method(_MD("get_theme:Theme"),&Control::get_theme); + ClassDB::bind_method(D_METHOD("set_theme","theme:Theme"),&Control::set_theme); + ClassDB::bind_method(D_METHOD("get_theme:Theme"),&Control::get_theme); - ClassDB::bind_method(_MD("add_icon_override","name","texture:Texture"),&Control::add_icon_override); - ClassDB::bind_method(_MD("add_shader_override","name","shader:Shader"),&Control::add_shader_override); - ClassDB::bind_method(_MD("add_style_override","name","stylebox:StyleBox"),&Control::add_style_override); - ClassDB::bind_method(_MD("add_font_override","name","font:Font"),&Control::add_font_override); - ClassDB::bind_method(_MD("add_color_override","name","color"),&Control::add_color_override); - ClassDB::bind_method(_MD("add_constant_override","name","constant"),&Control::add_constant_override); + ClassDB::bind_method(D_METHOD("add_icon_override","name","texture:Texture"),&Control::add_icon_override); + ClassDB::bind_method(D_METHOD("add_shader_override","name","shader:Shader"),&Control::add_shader_override); + ClassDB::bind_method(D_METHOD("add_style_override","name","stylebox:StyleBox"),&Control::add_style_override); + ClassDB::bind_method(D_METHOD("add_font_override","name","font:Font"),&Control::add_font_override); + ClassDB::bind_method(D_METHOD("add_color_override","name","color"),&Control::add_color_override); + ClassDB::bind_method(D_METHOD("add_constant_override","name","constant"),&Control::add_constant_override); - ClassDB::bind_method(_MD("get_icon:Texture","name","type"),&Control::get_icon,DEFVAL("")); - ClassDB::bind_method(_MD("get_stylebox:StyleBox","name","type"),&Control::get_stylebox,DEFVAL("")); - ClassDB::bind_method(_MD("get_font:Font","name","type"),&Control::get_font,DEFVAL("")); - ClassDB::bind_method(_MD("get_color","name","type"),&Control::get_color,DEFVAL("")); - ClassDB::bind_method(_MD("get_constant","name","type"),&Control::get_constant,DEFVAL("")); + ClassDB::bind_method(D_METHOD("get_icon:Texture","name","type"),&Control::get_icon,DEFVAL("")); + ClassDB::bind_method(D_METHOD("get_stylebox:StyleBox","name","type"),&Control::get_stylebox,DEFVAL("")); + ClassDB::bind_method(D_METHOD("get_font:Font","name","type"),&Control::get_font,DEFVAL("")); + ClassDB::bind_method(D_METHOD("get_color","name","type"),&Control::get_color,DEFVAL("")); + ClassDB::bind_method(D_METHOD("get_constant","name","type"),&Control::get_constant,DEFVAL("")); - ClassDB::bind_method(_MD("has_icon_override", "name"), &Control::has_icon_override); - ClassDB::bind_method(_MD("has_stylebox_override", "name"), &Control::has_stylebox_override); - ClassDB::bind_method(_MD("has_font_override", "name"), &Control::has_font_override); - ClassDB::bind_method(_MD("has_color_override", "name"), &Control::has_color_override); - ClassDB::bind_method(_MD("has_constant_override", "name"), &Control::has_constant_override); + ClassDB::bind_method(D_METHOD("has_icon_override", "name"), &Control::has_icon_override); + ClassDB::bind_method(D_METHOD("has_stylebox_override", "name"), &Control::has_stylebox_override); + ClassDB::bind_method(D_METHOD("has_font_override", "name"), &Control::has_font_override); + ClassDB::bind_method(D_METHOD("has_color_override", "name"), &Control::has_color_override); + ClassDB::bind_method(D_METHOD("has_constant_override", "name"), &Control::has_constant_override); - ClassDB::bind_method(_MD("has_icon", "name", "type"), &Control::has_icon, DEFVAL("")); - ClassDB::bind_method(_MD("has_stylebox", "name", "type"), &Control::has_stylebox, DEFVAL("")); - ClassDB::bind_method(_MD("has_font", "name", "type"), &Control::has_font, DEFVAL("")); - ClassDB::bind_method(_MD("has_color", "name", "type"), &Control::has_color, DEFVAL("")); - ClassDB::bind_method(_MD("has_constant", "name", "type"), &Control::has_constant, DEFVAL("")); + ClassDB::bind_method(D_METHOD("has_icon", "name", "type"), &Control::has_icon, DEFVAL("")); + ClassDB::bind_method(D_METHOD("has_stylebox", "name", "type"), &Control::has_stylebox, DEFVAL("")); + ClassDB::bind_method(D_METHOD("has_font", "name", "type"), &Control::has_font, DEFVAL("")); + ClassDB::bind_method(D_METHOD("has_color", "name", "type"), &Control::has_color, DEFVAL("")); + ClassDB::bind_method(D_METHOD("has_constant", "name", "type"), &Control::has_constant, DEFVAL("")); - ClassDB::bind_method(_MD("get_parent_control:Control"),&Control::get_parent_control); + ClassDB::bind_method(D_METHOD("get_parent_control:Control"),&Control::get_parent_control); - ClassDB::bind_method(_MD("set_tooltip","tooltip"),&Control::set_tooltip); - ClassDB::bind_method(_MD("get_tooltip","atpos"),&Control::get_tooltip,DEFVAL(Point2())); - ClassDB::bind_method(_MD("_get_tooltip"),&Control::_get_tooltip); + ClassDB::bind_method(D_METHOD("set_tooltip","tooltip"),&Control::set_tooltip); + ClassDB::bind_method(D_METHOD("get_tooltip","atpos"),&Control::get_tooltip,DEFVAL(Point2())); + ClassDB::bind_method(D_METHOD("_get_tooltip"),&Control::_get_tooltip); - ClassDB::bind_method(_MD("set_default_cursor_shape","shape"),&Control::set_default_cursor_shape); - ClassDB::bind_method(_MD("get_default_cursor_shape"),&Control::get_default_cursor_shape); - ClassDB::bind_method(_MD("get_cursor_shape","pos"),&Control::get_cursor_shape,DEFVAL(Point2())); + ClassDB::bind_method(D_METHOD("set_default_cursor_shape","shape"),&Control::set_default_cursor_shape); + ClassDB::bind_method(D_METHOD("get_default_cursor_shape"),&Control::get_default_cursor_shape); + ClassDB::bind_method(D_METHOD("get_cursor_shape","pos"),&Control::get_cursor_shape,DEFVAL(Point2())); - ClassDB::bind_method(_MD("set_focus_neighbour","margin","neighbour"),&Control::set_focus_neighbour); - ClassDB::bind_method(_MD("get_focus_neighbour","margin"),&Control::get_focus_neighbour); + ClassDB::bind_method(D_METHOD("set_focus_neighbour","margin","neighbour"),&Control::set_focus_neighbour); + ClassDB::bind_method(D_METHOD("get_focus_neighbour","margin"),&Control::get_focus_neighbour); - ClassDB::bind_method(_MD("force_drag","data","preview"),&Control::force_drag); + ClassDB::bind_method(D_METHOD("force_drag","data","preview"),&Control::force_drag); - ClassDB::bind_method(_MD("set_mouse_filter","filter"),&Control::set_mouse_filter); - ClassDB::bind_method(_MD("get_mouse_filter"),&Control::get_mouse_filter); + ClassDB::bind_method(D_METHOD("set_mouse_filter","filter"),&Control::set_mouse_filter); + ClassDB::bind_method(D_METHOD("get_mouse_filter"),&Control::get_mouse_filter); - ClassDB::bind_method(_MD("set_clip_contents","enable"),&Control::set_clip_contents); - ClassDB::bind_method(_MD("is_clipping_contents"),&Control::is_clipping_contents); + ClassDB::bind_method(D_METHOD("set_clip_contents","enable"),&Control::set_clip_contents); + ClassDB::bind_method(D_METHOD("is_clipping_contents"),&Control::is_clipping_contents); - ClassDB::bind_method(_MD("grab_click_focus"),&Control::grab_click_focus); + ClassDB::bind_method(D_METHOD("grab_click_focus"),&Control::grab_click_focus); - ClassDB::bind_method(_MD("set_drag_forwarding","target:Control"),&Control::set_drag_forwarding); - ClassDB::bind_method(_MD("set_drag_preview","control:Control"),&Control::set_drag_preview); + ClassDB::bind_method(D_METHOD("set_drag_forwarding","target:Control"),&Control::set_drag_forwarding); + ClassDB::bind_method(D_METHOD("set_drag_preview","control:Control"),&Control::set_drag_preview); - ClassDB::bind_method(_MD("warp_mouse","to_pos"),&Control::warp_mouse); + ClassDB::bind_method(D_METHOD("warp_mouse","to_pos"),&Control::warp_mouse); - ClassDB::bind_method(_MD("minimum_size_changed"), &Control::minimum_size_changed); + ClassDB::bind_method(D_METHOD("minimum_size_changed"), &Control::minimum_size_changed); - ClassDB::bind_method(_MD("_theme_changed"), &Control::_theme_changed); + ClassDB::bind_method(D_METHOD("_theme_changed"), &Control::_theme_changed); - ClassDB::bind_method(_MD("_font_changed"), &Control::_font_changed); + ClassDB::bind_method(D_METHOD("_font_changed"), &Control::_font_changed); BIND_VMETHOD(MethodInfo("_gui_input",PropertyInfo(Variant::INPUT_EVENT,"event"))); BIND_VMETHOD(MethodInfo(Variant::VECTOR2,"get_minimum_size")); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index b83241bf0e..2f97ce2d51 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -141,11 +141,11 @@ TextureButton *WindowDialog::get_close_button() { void WindowDialog::_bind_methods() { - ClassDB::bind_method( _MD("_gui_input"),&WindowDialog::_gui_input); - ClassDB::bind_method( _MD("set_title","title"),&WindowDialog::set_title); - ClassDB::bind_method( _MD("get_title"),&WindowDialog::get_title); - ClassDB::bind_method( _MD("_closed"),&WindowDialog::_closed); - ClassDB::bind_method( _MD("get_close_button:TextureButton"),&WindowDialog::get_close_button); + ClassDB::bind_method( D_METHOD("_gui_input"),&WindowDialog::_gui_input); + ClassDB::bind_method( D_METHOD("set_title","title"),&WindowDialog::set_title); + ClassDB::bind_method( D_METHOD("get_title"),&WindowDialog::get_title); + ClassDB::bind_method( D_METHOD("_closed"),&WindowDialog::_closed); + ClassDB::bind_method( D_METHOD("get_close_button:TextureButton"),&WindowDialog::get_close_button); ADD_PROPERTY( PropertyInfo(Variant::STRING,"window_title",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_DEFAULT_INTL),"set_title","get_title"); } @@ -361,18 +361,18 @@ Button* AcceptDialog::add_cancel(const String &p_cancel) { void AcceptDialog::_bind_methods() { - ClassDB::bind_method(_MD("_ok"),&AcceptDialog::_ok_pressed); - ClassDB::bind_method(_MD("get_ok"),&AcceptDialog::get_ok); - ClassDB::bind_method(_MD("get_label"),&AcceptDialog::get_label); - ClassDB::bind_method(_MD("set_hide_on_ok","enabled"),&AcceptDialog::set_hide_on_ok); - ClassDB::bind_method(_MD("get_hide_on_ok"),&AcceptDialog::get_hide_on_ok); - ClassDB::bind_method(_MD("add_button:Button","text","right","action"),&AcceptDialog::add_button,DEFVAL(false),DEFVAL("")); - ClassDB::bind_method(_MD("add_cancel:Button","name"),&AcceptDialog::add_cancel); - ClassDB::bind_method(_MD("_builtin_text_entered"),&AcceptDialog::_builtin_text_entered); - ClassDB::bind_method(_MD("register_text_enter:LineEdit","line_edit"),&AcceptDialog::register_text_enter); - ClassDB::bind_method(_MD("_custom_action"),&AcceptDialog::_custom_action); - ClassDB::bind_method(_MD("set_text","text"),&AcceptDialog::set_text); - ClassDB::bind_method(_MD("get_text"),&AcceptDialog::get_text); + ClassDB::bind_method(D_METHOD("_ok"),&AcceptDialog::_ok_pressed); + ClassDB::bind_method(D_METHOD("get_ok"),&AcceptDialog::get_ok); + ClassDB::bind_method(D_METHOD("get_label"),&AcceptDialog::get_label); + ClassDB::bind_method(D_METHOD("set_hide_on_ok","enabled"),&AcceptDialog::set_hide_on_ok); + ClassDB::bind_method(D_METHOD("get_hide_on_ok"),&AcceptDialog::get_hide_on_ok); + ClassDB::bind_method(D_METHOD("add_button:Button","text","right","action"),&AcceptDialog::add_button,DEFVAL(false),DEFVAL("")); + ClassDB::bind_method(D_METHOD("add_cancel:Button","name"),&AcceptDialog::add_cancel); + ClassDB::bind_method(D_METHOD("_builtin_text_entered"),&AcceptDialog::_builtin_text_entered); + ClassDB::bind_method(D_METHOD("register_text_enter:LineEdit","line_edit"),&AcceptDialog::register_text_enter); + ClassDB::bind_method(D_METHOD("_custom_action"),&AcceptDialog::_custom_action); + ClassDB::bind_method(D_METHOD("set_text","text"),&AcceptDialog::set_text); + ClassDB::bind_method(D_METHOD("get_text"),&AcceptDialog::get_text); ADD_SIGNAL( MethodInfo("confirmed") ); ADD_SIGNAL( MethodInfo("custom_action",PropertyInfo(Variant::STRING,"action")) ); @@ -429,7 +429,7 @@ AcceptDialog::~AcceptDialog() void ConfirmationDialog::_bind_methods() { - ClassDB::bind_method(_MD("get_cancel:Button"),&ConfirmationDialog::get_cancel); + ClassDB::bind_method(D_METHOD("get_cancel:Button"),&ConfirmationDialog::get_cancel); } Button *ConfirmationDialog::get_cancel() { diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 5fce0ddc50..357a70a25b 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -686,41 +686,41 @@ bool FileDialog::default_show_hidden_files=false; void FileDialog::_bind_methods() { - ClassDB::bind_method(_MD("_unhandled_input"),&FileDialog::_unhandled_input); - - ClassDB::bind_method(_MD("_tree_selected"),&FileDialog::_tree_selected); - ClassDB::bind_method(_MD("_tree_db_selected"),&FileDialog::_tree_dc_selected); - ClassDB::bind_method(_MD("_dir_entered"),&FileDialog::_dir_entered); - ClassDB::bind_method(_MD("_file_entered"),&FileDialog::_file_entered); - ClassDB::bind_method(_MD("_action_pressed"),&FileDialog::_action_pressed); - ClassDB::bind_method(_MD("_cancel_pressed"),&FileDialog::_cancel_pressed); - ClassDB::bind_method(_MD("_filter_selected"),&FileDialog::_filter_selected); - ClassDB::bind_method(_MD("_save_confirm_pressed"),&FileDialog::_save_confirm_pressed); - - ClassDB::bind_method(_MD("clear_filters"),&FileDialog::clear_filters); - ClassDB::bind_method(_MD("add_filter","filter"),&FileDialog::add_filter); - ClassDB::bind_method(_MD("set_filters","filters"),&FileDialog::set_filters); - ClassDB::bind_method(_MD("get_filters"),&FileDialog::get_filters); - ClassDB::bind_method(_MD("get_current_dir"),&FileDialog::get_current_dir); - ClassDB::bind_method(_MD("get_current_file"),&FileDialog::get_current_file); - ClassDB::bind_method(_MD("get_current_path"),&FileDialog::get_current_path); - ClassDB::bind_method(_MD("set_current_dir","dir"),&FileDialog::set_current_dir); - ClassDB::bind_method(_MD("set_current_file","file"),&FileDialog::set_current_file); - ClassDB::bind_method(_MD("set_current_path","path"),&FileDialog::set_current_path); - ClassDB::bind_method(_MD("set_mode","mode"),&FileDialog::set_mode); - ClassDB::bind_method(_MD("get_mode"),&FileDialog::get_mode); - ClassDB::bind_method(_MD("get_vbox:VBoxContainer"),&FileDialog::get_vbox); - ClassDB::bind_method(_MD("set_access","access"),&FileDialog::set_access); - ClassDB::bind_method(_MD("get_access"),&FileDialog::get_access); - ClassDB::bind_method(_MD("set_show_hidden_files","show"),&FileDialog::set_show_hidden_files); - ClassDB::bind_method(_MD("is_showing_hidden_files"),&FileDialog::is_showing_hidden_files); - ClassDB::bind_method(_MD("_select_drive"),&FileDialog::_select_drive); - ClassDB::bind_method(_MD("_make_dir"),&FileDialog::_make_dir); - ClassDB::bind_method(_MD("_make_dir_confirm"),&FileDialog::_make_dir_confirm); - ClassDB::bind_method(_MD("_update_file_list"),&FileDialog::update_file_list); - ClassDB::bind_method(_MD("_update_dir"),&FileDialog::update_dir); - - ClassDB::bind_method(_MD("invalidate"),&FileDialog::invalidate); + ClassDB::bind_method(D_METHOD("_unhandled_input"),&FileDialog::_unhandled_input); + + ClassDB::bind_method(D_METHOD("_tree_selected"),&FileDialog::_tree_selected); + ClassDB::bind_method(D_METHOD("_tree_db_selected"),&FileDialog::_tree_dc_selected); + ClassDB::bind_method(D_METHOD("_dir_entered"),&FileDialog::_dir_entered); + ClassDB::bind_method(D_METHOD("_file_entered"),&FileDialog::_file_entered); + ClassDB::bind_method(D_METHOD("_action_pressed"),&FileDialog::_action_pressed); + ClassDB::bind_method(D_METHOD("_cancel_pressed"),&FileDialog::_cancel_pressed); + ClassDB::bind_method(D_METHOD("_filter_selected"),&FileDialog::_filter_selected); + ClassDB::bind_method(D_METHOD("_save_confirm_pressed"),&FileDialog::_save_confirm_pressed); + + ClassDB::bind_method(D_METHOD("clear_filters"),&FileDialog::clear_filters); + ClassDB::bind_method(D_METHOD("add_filter","filter"),&FileDialog::add_filter); + ClassDB::bind_method(D_METHOD("set_filters","filters"),&FileDialog::set_filters); + ClassDB::bind_method(D_METHOD("get_filters"),&FileDialog::get_filters); + ClassDB::bind_method(D_METHOD("get_current_dir"),&FileDialog::get_current_dir); + ClassDB::bind_method(D_METHOD("get_current_file"),&FileDialog::get_current_file); + ClassDB::bind_method(D_METHOD("get_current_path"),&FileDialog::get_current_path); + ClassDB::bind_method(D_METHOD("set_current_dir","dir"),&FileDialog::set_current_dir); + ClassDB::bind_method(D_METHOD("set_current_file","file"),&FileDialog::set_current_file); + ClassDB::bind_method(D_METHOD("set_current_path","path"),&FileDialog::set_current_path); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&FileDialog::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&FileDialog::get_mode); + ClassDB::bind_method(D_METHOD("get_vbox:VBoxContainer"),&FileDialog::get_vbox); + ClassDB::bind_method(D_METHOD("set_access","access"),&FileDialog::set_access); + ClassDB::bind_method(D_METHOD("get_access"),&FileDialog::get_access); + ClassDB::bind_method(D_METHOD("set_show_hidden_files","show"),&FileDialog::set_show_hidden_files); + ClassDB::bind_method(D_METHOD("is_showing_hidden_files"),&FileDialog::is_showing_hidden_files); + ClassDB::bind_method(D_METHOD("_select_drive"),&FileDialog::_select_drive); + ClassDB::bind_method(D_METHOD("_make_dir"),&FileDialog::_make_dir); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"),&FileDialog::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("_update_file_list"),&FileDialog::update_file_list); + ClassDB::bind_method(D_METHOD("_update_dir"),&FileDialog::update_dir); + + ClassDB::bind_method(D_METHOD("invalidate"),&FileDialog::invalidate); ADD_SIGNAL(MethodInfo("file_selected",PropertyInfo( Variant::STRING,"path"))); ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::POOL_STRING_ARRAY,"paths"))); @@ -868,11 +868,11 @@ FileDialog::~FileDialog() { void LineEditFileChooser::_bind_methods() { - ClassDB::bind_method(_MD("_browse"),&LineEditFileChooser::_browse); - ClassDB::bind_method(_MD("_chosen"),&LineEditFileChooser::_chosen); - ClassDB::bind_method(_MD("get_button:Button"),&LineEditFileChooser::get_button); - ClassDB::bind_method(_MD("get_line_edit:LineEdit"),&LineEditFileChooser::get_line_edit); - ClassDB::bind_method(_MD("get_file_dialog:FileDialog"),&LineEditFileChooser::get_file_dialog); + ClassDB::bind_method(D_METHOD("_browse"),&LineEditFileChooser::_browse); + ClassDB::bind_method(D_METHOD("_chosen"),&LineEditFileChooser::_chosen); + ClassDB::bind_method(D_METHOD("get_button:Button"),&LineEditFileChooser::get_button); + ClassDB::bind_method(D_METHOD("get_line_edit:LineEdit"),&LineEditFileChooser::get_line_edit); + ClassDB::bind_method(D_METHOD("get_file_dialog:FileDialog"),&LineEditFileChooser::get_file_dialog); } diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index ba1ab1afa8..a6954a2c77 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -1201,44 +1201,44 @@ void GraphEdit::_snap_value_changed(double) { void GraphEdit::_bind_methods() { - ClassDB::bind_method(_MD("connect_node:Error","from","from_port","to","to_port"),&GraphEdit::connect_node); - ClassDB::bind_method(_MD("is_node_connected","from","from_port","to","to_port"),&GraphEdit::is_node_connected); - ClassDB::bind_method(_MD("disconnect_node","from","from_port","to","to_port"),&GraphEdit::disconnect_node); - ClassDB::bind_method(_MD("get_connection_list"),&GraphEdit::_get_connection_list); - ClassDB::bind_method(_MD("get_scroll_ofs"),&GraphEdit::get_scroll_ofs); - ClassDB::bind_method(_MD("set_scroll_ofs","ofs"),&GraphEdit::set_scroll_ofs); + ClassDB::bind_method(D_METHOD("connect_node:Error","from","from_port","to","to_port"),&GraphEdit::connect_node); + ClassDB::bind_method(D_METHOD("is_node_connected","from","from_port","to","to_port"),&GraphEdit::is_node_connected); + ClassDB::bind_method(D_METHOD("disconnect_node","from","from_port","to","to_port"),&GraphEdit::disconnect_node); + ClassDB::bind_method(D_METHOD("get_connection_list"),&GraphEdit::_get_connection_list); + ClassDB::bind_method(D_METHOD("get_scroll_ofs"),&GraphEdit::get_scroll_ofs); + ClassDB::bind_method(D_METHOD("set_scroll_ofs","ofs"),&GraphEdit::set_scroll_ofs); - ClassDB::bind_method(_MD("set_zoom","p_zoom"),&GraphEdit::set_zoom); - ClassDB::bind_method(_MD("get_zoom"),&GraphEdit::get_zoom); + ClassDB::bind_method(D_METHOD("set_zoom","p_zoom"),&GraphEdit::set_zoom); + ClassDB::bind_method(D_METHOD("get_zoom"),&GraphEdit::get_zoom); - ClassDB::bind_method(_MD("set_snap","pixels"),&GraphEdit::set_snap); - ClassDB::bind_method(_MD("get_snap"),&GraphEdit::get_snap); + ClassDB::bind_method(D_METHOD("set_snap","pixels"),&GraphEdit::set_snap); + ClassDB::bind_method(D_METHOD("get_snap"),&GraphEdit::get_snap); - ClassDB::bind_method(_MD("set_use_snap","enable"),&GraphEdit::set_use_snap); - ClassDB::bind_method(_MD("is_using_snap"),&GraphEdit::is_using_snap); + ClassDB::bind_method(D_METHOD("set_use_snap","enable"),&GraphEdit::set_use_snap); + ClassDB::bind_method(D_METHOD("is_using_snap"),&GraphEdit::is_using_snap); - ClassDB::bind_method(_MD("set_right_disconnects","enable"),&GraphEdit::set_right_disconnects); - ClassDB::bind_method(_MD("is_right_disconnects_enabled"),&GraphEdit::is_right_disconnects_enabled); + ClassDB::bind_method(D_METHOD("set_right_disconnects","enable"),&GraphEdit::set_right_disconnects); + ClassDB::bind_method(D_METHOD("is_right_disconnects_enabled"),&GraphEdit::is_right_disconnects_enabled); - ClassDB::bind_method(_MD("_graph_node_moved"),&GraphEdit::_graph_node_moved); - ClassDB::bind_method(_MD("_graph_node_raised"),&GraphEdit::_graph_node_raised); + ClassDB::bind_method(D_METHOD("_graph_node_moved"),&GraphEdit::_graph_node_moved); + ClassDB::bind_method(D_METHOD("_graph_node_raised"),&GraphEdit::_graph_node_raised); - ClassDB::bind_method(_MD("_top_layer_input"),&GraphEdit::_top_layer_input); - ClassDB::bind_method(_MD("_top_layer_draw"),&GraphEdit::_top_layer_draw); - ClassDB::bind_method(_MD("_scroll_moved"),&GraphEdit::_scroll_moved); - ClassDB::bind_method(_MD("_zoom_minus"),&GraphEdit::_zoom_minus); - ClassDB::bind_method(_MD("_zoom_reset"),&GraphEdit::_zoom_reset); - ClassDB::bind_method(_MD("_zoom_plus"),&GraphEdit::_zoom_plus); - ClassDB::bind_method(_MD("_snap_toggled"),&GraphEdit::_snap_toggled); - ClassDB::bind_method(_MD("_snap_value_changed"),&GraphEdit::_snap_value_changed); + ClassDB::bind_method(D_METHOD("_top_layer_input"),&GraphEdit::_top_layer_input); + ClassDB::bind_method(D_METHOD("_top_layer_draw"),&GraphEdit::_top_layer_draw); + ClassDB::bind_method(D_METHOD("_scroll_moved"),&GraphEdit::_scroll_moved); + ClassDB::bind_method(D_METHOD("_zoom_minus"),&GraphEdit::_zoom_minus); + ClassDB::bind_method(D_METHOD("_zoom_reset"),&GraphEdit::_zoom_reset); + ClassDB::bind_method(D_METHOD("_zoom_plus"),&GraphEdit::_zoom_plus); + ClassDB::bind_method(D_METHOD("_snap_toggled"),&GraphEdit::_snap_toggled); + ClassDB::bind_method(D_METHOD("_snap_value_changed"),&GraphEdit::_snap_value_changed); - ClassDB::bind_method(_MD("_gui_input"),&GraphEdit::_gui_input); - ClassDB::bind_method(_MD("_update_scroll_offset"),&GraphEdit::_update_scroll_offset); - ClassDB::bind_method(_MD("_connections_layer_draw"),&GraphEdit::_connections_layer_draw); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_update_scroll_offset"),&GraphEdit::_update_scroll_offset); + ClassDB::bind_method(D_METHOD("_connections_layer_draw"),&GraphEdit::_connections_layer_draw); - ClassDB::bind_method(_MD("set_selected","node"),&GraphEdit::set_selected); + ClassDB::bind_method(D_METHOD("set_selected","node"),&GraphEdit::set_selected); ADD_SIGNAL(MethodInfo("connection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot"))); ADD_SIGNAL(MethodInfo("disconnection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot"))); diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 0900be503a..58d3f42483 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -712,47 +712,47 @@ bool GraphNode::is_resizeable() const{ void GraphNode::_bind_methods() { - ClassDB::bind_method(_MD("set_title","title"),&GraphNode::set_title); - ClassDB::bind_method(_MD("get_title"),&GraphNode::get_title); - ClassDB::bind_method(_MD("_gui_input"),&GraphNode::_gui_input); - - ClassDB::bind_method(_MD("set_slot","idx","enable_left","type_left","color_left","enable_right","type_right","color_right","custom_left","custom_right"),&GraphNode::set_slot,DEFVAL(Ref<Texture>()),DEFVAL(Ref<Texture>())); - ClassDB::bind_method(_MD("clear_slot","idx"),&GraphNode::clear_slot); - ClassDB::bind_method(_MD("clear_all_slots","idx"),&GraphNode::clear_all_slots); - ClassDB::bind_method(_MD("is_slot_enabled_left","idx"),&GraphNode::is_slot_enabled_left); - ClassDB::bind_method(_MD("get_slot_type_left","idx"),&GraphNode::get_slot_type_left); - ClassDB::bind_method(_MD("get_slot_color_left","idx"),&GraphNode::get_slot_color_left); - ClassDB::bind_method(_MD("is_slot_enabled_right","idx"),&GraphNode::is_slot_enabled_right); - ClassDB::bind_method(_MD("get_slot_type_right","idx"),&GraphNode::get_slot_type_right); - ClassDB::bind_method(_MD("get_slot_color_right","idx"),&GraphNode::get_slot_color_right); - - ClassDB::bind_method(_MD("set_offset","offset"),&GraphNode::set_offset); - ClassDB::bind_method(_MD("get_offset"),&GraphNode::get_offset); - - ClassDB::bind_method(_MD("set_comment","comment"),&GraphNode::set_comment); - ClassDB::bind_method(_MD("is_comment"),&GraphNode::is_comment); - - ClassDB::bind_method(_MD("set_resizeable","resizeable"),&GraphNode::set_resizeable); - ClassDB::bind_method(_MD("is_resizeable"),&GraphNode::is_resizeable); - - ClassDB::bind_method(_MD("set_selected","selected"),&GraphNode::set_selected); - ClassDB::bind_method(_MD("is_selected"),&GraphNode::is_selected); - - ClassDB::bind_method(_MD("get_connection_output_count"),&GraphNode::get_connection_output_count); - ClassDB::bind_method(_MD("get_connection_input_count"),&GraphNode::get_connection_input_count); - - ClassDB::bind_method(_MD("get_connection_output_pos","idx"),&GraphNode::get_connection_output_pos); - ClassDB::bind_method(_MD("get_connection_output_type","idx"),&GraphNode::get_connection_output_type); - ClassDB::bind_method(_MD("get_connection_output_color","idx"),&GraphNode::get_connection_output_color); - ClassDB::bind_method(_MD("get_connection_input_pos","idx"),&GraphNode::get_connection_input_pos); - ClassDB::bind_method(_MD("get_connection_input_type","idx"),&GraphNode::get_connection_input_type); - ClassDB::bind_method(_MD("get_connection_input_color","idx"),&GraphNode::get_connection_input_color); - - ClassDB::bind_method(_MD("set_show_close_button","show"),&GraphNode::set_show_close_button); - ClassDB::bind_method(_MD("is_close_button_visible"),&GraphNode::is_close_button_visible); - - ClassDB::bind_method(_MD("set_overlay","overlay"),&GraphNode::set_overlay); - ClassDB::bind_method(_MD("get_overlay"),&GraphNode::get_overlay); + ClassDB::bind_method(D_METHOD("set_title","title"),&GraphNode::set_title); + ClassDB::bind_method(D_METHOD("get_title"),&GraphNode::get_title); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphNode::_gui_input); + + ClassDB::bind_method(D_METHOD("set_slot","idx","enable_left","type_left","color_left","enable_right","type_right","color_right","custom_left","custom_right"),&GraphNode::set_slot,DEFVAL(Ref<Texture>()),DEFVAL(Ref<Texture>())); + ClassDB::bind_method(D_METHOD("clear_slot","idx"),&GraphNode::clear_slot); + ClassDB::bind_method(D_METHOD("clear_all_slots","idx"),&GraphNode::clear_all_slots); + ClassDB::bind_method(D_METHOD("is_slot_enabled_left","idx"),&GraphNode::is_slot_enabled_left); + ClassDB::bind_method(D_METHOD("get_slot_type_left","idx"),&GraphNode::get_slot_type_left); + ClassDB::bind_method(D_METHOD("get_slot_color_left","idx"),&GraphNode::get_slot_color_left); + ClassDB::bind_method(D_METHOD("is_slot_enabled_right","idx"),&GraphNode::is_slot_enabled_right); + ClassDB::bind_method(D_METHOD("get_slot_type_right","idx"),&GraphNode::get_slot_type_right); + ClassDB::bind_method(D_METHOD("get_slot_color_right","idx"),&GraphNode::get_slot_color_right); + + ClassDB::bind_method(D_METHOD("set_offset","offset"),&GraphNode::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&GraphNode::get_offset); + + ClassDB::bind_method(D_METHOD("set_comment","comment"),&GraphNode::set_comment); + ClassDB::bind_method(D_METHOD("is_comment"),&GraphNode::is_comment); + + ClassDB::bind_method(D_METHOD("set_resizeable","resizeable"),&GraphNode::set_resizeable); + ClassDB::bind_method(D_METHOD("is_resizeable"),&GraphNode::is_resizeable); + + ClassDB::bind_method(D_METHOD("set_selected","selected"),&GraphNode::set_selected); + ClassDB::bind_method(D_METHOD("is_selected"),&GraphNode::is_selected); + + ClassDB::bind_method(D_METHOD("get_connection_output_count"),&GraphNode::get_connection_output_count); + ClassDB::bind_method(D_METHOD("get_connection_input_count"),&GraphNode::get_connection_input_count); + + ClassDB::bind_method(D_METHOD("get_connection_output_pos","idx"),&GraphNode::get_connection_output_pos); + ClassDB::bind_method(D_METHOD("get_connection_output_type","idx"),&GraphNode::get_connection_output_type); + ClassDB::bind_method(D_METHOD("get_connection_output_color","idx"),&GraphNode::get_connection_output_color); + ClassDB::bind_method(D_METHOD("get_connection_input_pos","idx"),&GraphNode::get_connection_input_pos); + ClassDB::bind_method(D_METHOD("get_connection_input_type","idx"),&GraphNode::get_connection_input_type); + ClassDB::bind_method(D_METHOD("get_connection_input_color","idx"),&GraphNode::get_connection_input_color); + + ClassDB::bind_method(D_METHOD("set_show_close_button","show"),&GraphNode::set_show_close_button); + ClassDB::bind_method(D_METHOD("is_close_button_visible"),&GraphNode::is_close_button_visible); + + ClassDB::bind_method(D_METHOD("set_overlay","overlay"),&GraphNode::set_overlay); + ClassDB::bind_method(D_METHOD("get_overlay"),&GraphNode::get_overlay); ADD_PROPERTY( PropertyInfo(Variant::STRING,"title"),"set_title","get_title"); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_close"),"set_show_close_button","is_close_button_visible"); diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index 1e94424c8f..ee1d642110 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -170,8 +170,8 @@ int GridContainer::get_columns() const{ void GridContainer::_bind_methods(){ - ClassDB::bind_method(_MD("set_columns","columns"),&GridContainer::set_columns); - ClassDB::bind_method(_MD("get_columns"),&GridContainer::get_columns); + ClassDB::bind_method(D_METHOD("set_columns","columns"),&GridContainer::set_columns); + ClassDB::bind_method(D_METHOD("get_columns"),&GridContainer::get_columns); ADD_PROPERTY( PropertyInfo(Variant::INT,"columns",PROPERTY_HINT_RANGE,"1,1024,1"),"set_columns","get_columns"); } diff --git a/scene/gui/input_action.cpp b/scene/gui/input_action.cpp index f923e1a4e5..06787fca9e 100644 --- a/scene/gui/input_action.cpp +++ b/scene/gui/input_action.cpp @@ -109,13 +109,13 @@ bool ShortCut::is_valid() const { void ShortCut::_bind_methods() { - ClassDB::bind_method(_MD("set_shortcut","event"),&ShortCut::set_shortcut); - ClassDB::bind_method(_MD("get_shortcut"),&ShortCut::get_shortcut); + ClassDB::bind_method(D_METHOD("set_shortcut","event"),&ShortCut::set_shortcut); + ClassDB::bind_method(D_METHOD("get_shortcut"),&ShortCut::get_shortcut); - ClassDB::bind_method(_MD("is_valid"),&ShortCut::is_valid); + ClassDB::bind_method(D_METHOD("is_valid"),&ShortCut::is_valid); - ClassDB::bind_method(_MD("is_shortcut","event"),&ShortCut::is_shortcut); - ClassDB::bind_method(_MD("get_as_text"),&ShortCut::get_as_text); + ClassDB::bind_method(D_METHOD("is_shortcut","event"),&ShortCut::is_shortcut); + ClassDB::bind_method(D_METHOD("get_as_text"),&ShortCut::get_as_text); ADD_PROPERTY(PropertyInfo(Variant::INPUT_EVENT,"shortcut"),"set_shortcut","get_shortcut"); } diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index a42ef08bf3..4e10f1d622 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -1284,83 +1284,83 @@ Vector<int> ItemList::get_selected_items() { void ItemList::_bind_methods(){ - ClassDB::bind_method(_MD("add_item","text","icon:Texture","selectable"),&ItemList::add_item,DEFVAL(Variant()),DEFVAL(true)); - ClassDB::bind_method(_MD("add_icon_item","icon:Texture","selectable"),&ItemList::add_icon_item,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("add_item","text","icon:Texture","selectable"),&ItemList::add_item,DEFVAL(Variant()),DEFVAL(true)); + ClassDB::bind_method(D_METHOD("add_icon_item","icon:Texture","selectable"),&ItemList::add_icon_item,DEFVAL(true)); - ClassDB::bind_method(_MD("set_item_text","idx","text"),&ItemList::set_item_text); - ClassDB::bind_method(_MD("get_item_text","idx"),&ItemList::get_item_text); + ClassDB::bind_method(D_METHOD("set_item_text","idx","text"),&ItemList::set_item_text); + ClassDB::bind_method(D_METHOD("get_item_text","idx"),&ItemList::get_item_text); - ClassDB::bind_method(_MD("set_item_icon","idx","icon:Texture"),&ItemList::set_item_icon); - ClassDB::bind_method(_MD("get_item_icon:Texture","idx"),&ItemList::get_item_icon); + ClassDB::bind_method(D_METHOD("set_item_icon","idx","icon:Texture"),&ItemList::set_item_icon); + ClassDB::bind_method(D_METHOD("get_item_icon:Texture","idx"),&ItemList::get_item_icon); - ClassDB::bind_method(_MD("set_item_icon_region","idx","rect"),&ItemList::set_item_icon_region); - ClassDB::bind_method(_MD("get_item_icon_region","idx"),&ItemList::get_item_icon_region); + ClassDB::bind_method(D_METHOD("set_item_icon_region","idx","rect"),&ItemList::set_item_icon_region); + ClassDB::bind_method(D_METHOD("get_item_icon_region","idx"),&ItemList::get_item_icon_region); - ClassDB::bind_method(_MD("set_item_selectable","idx","selectable"),&ItemList::set_item_selectable); - ClassDB::bind_method(_MD("is_item_selectable","idx"),&ItemList::is_item_selectable); + ClassDB::bind_method(D_METHOD("set_item_selectable","idx","selectable"),&ItemList::set_item_selectable); + ClassDB::bind_method(D_METHOD("is_item_selectable","idx"),&ItemList::is_item_selectable); - ClassDB::bind_method(_MD("set_item_disabled","idx","disabled"),&ItemList::set_item_disabled); - ClassDB::bind_method(_MD("is_item_disabled","idx"),&ItemList::is_item_disabled); + ClassDB::bind_method(D_METHOD("set_item_disabled","idx","disabled"),&ItemList::set_item_disabled); + ClassDB::bind_method(D_METHOD("is_item_disabled","idx"),&ItemList::is_item_disabled); - ClassDB::bind_method(_MD("set_item_metadata","idx","metadata"),&ItemList::set_item_metadata); - ClassDB::bind_method(_MD("get_item_metadata","idx"),&ItemList::get_item_metadata); + ClassDB::bind_method(D_METHOD("set_item_metadata","idx","metadata"),&ItemList::set_item_metadata); + ClassDB::bind_method(D_METHOD("get_item_metadata","idx"),&ItemList::get_item_metadata); - ClassDB::bind_method(_MD("set_item_custom_bg_color","idx","custom_bg_color"),&ItemList::set_item_custom_bg_color); - ClassDB::bind_method(_MD("get_item_custom_bg_color","idx"),&ItemList::get_item_custom_bg_color); + ClassDB::bind_method(D_METHOD("set_item_custom_bg_color","idx","custom_bg_color"),&ItemList::set_item_custom_bg_color); + ClassDB::bind_method(D_METHOD("get_item_custom_bg_color","idx"),&ItemList::get_item_custom_bg_color); - ClassDB::bind_method(_MD("set_item_tooltip_enabled","idx","enable"),&ItemList::set_item_tooltip_enabled); - ClassDB::bind_method(_MD("is_item_tooltip_enabled","idx"),&ItemList::is_item_tooltip_enabled); + ClassDB::bind_method(D_METHOD("set_item_tooltip_enabled","idx","enable"),&ItemList::set_item_tooltip_enabled); + ClassDB::bind_method(D_METHOD("is_item_tooltip_enabled","idx"),&ItemList::is_item_tooltip_enabled); - ClassDB::bind_method(_MD("set_item_tooltip","idx","tooltip"),&ItemList::set_item_tooltip); - ClassDB::bind_method(_MD("get_item_tooltip","idx"),&ItemList::get_item_tooltip); + ClassDB::bind_method(D_METHOD("set_item_tooltip","idx","tooltip"),&ItemList::set_item_tooltip); + ClassDB::bind_method(D_METHOD("get_item_tooltip","idx"),&ItemList::get_item_tooltip); - ClassDB::bind_method(_MD("select","idx","single"),&ItemList::select,DEFVAL(true)); - ClassDB::bind_method(_MD("unselect","idx"),&ItemList::unselect); - ClassDB::bind_method(_MD("is_selected","idx"),&ItemList::is_selected); - ClassDB::bind_method(_MD("get_selected_items"),&ItemList::get_selected_items); + ClassDB::bind_method(D_METHOD("select","idx","single"),&ItemList::select,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("unselect","idx"),&ItemList::unselect); + ClassDB::bind_method(D_METHOD("is_selected","idx"),&ItemList::is_selected); + ClassDB::bind_method(D_METHOD("get_selected_items"),&ItemList::get_selected_items); - ClassDB::bind_method(_MD("get_item_count"),&ItemList::get_item_count); - ClassDB::bind_method(_MD("remove_item","idx"),&ItemList::remove_item); + ClassDB::bind_method(D_METHOD("get_item_count"),&ItemList::get_item_count); + ClassDB::bind_method(D_METHOD("remove_item","idx"),&ItemList::remove_item); - ClassDB::bind_method(_MD("clear"),&ItemList::clear); - ClassDB::bind_method(_MD("sort_items_by_text"),&ItemList::sort_items_by_text); + ClassDB::bind_method(D_METHOD("clear"),&ItemList::clear); + ClassDB::bind_method(D_METHOD("sort_items_by_text"),&ItemList::sort_items_by_text); - ClassDB::bind_method(_MD("set_fixed_column_width","width"),&ItemList::set_fixed_column_width); - ClassDB::bind_method(_MD("get_fixed_column_width"),&ItemList::get_fixed_column_width); + ClassDB::bind_method(D_METHOD("set_fixed_column_width","width"),&ItemList::set_fixed_column_width); + ClassDB::bind_method(D_METHOD("get_fixed_column_width"),&ItemList::get_fixed_column_width); - ClassDB::bind_method(_MD("set_same_column_width","enable"),&ItemList::set_same_column_width); - ClassDB::bind_method(_MD("is_same_column_width"),&ItemList::is_same_column_width); + ClassDB::bind_method(D_METHOD("set_same_column_width","enable"),&ItemList::set_same_column_width); + ClassDB::bind_method(D_METHOD("is_same_column_width"),&ItemList::is_same_column_width); - ClassDB::bind_method(_MD("set_max_text_lines","lines"),&ItemList::set_max_text_lines); - ClassDB::bind_method(_MD("get_max_text_lines"),&ItemList::get_max_text_lines); + ClassDB::bind_method(D_METHOD("set_max_text_lines","lines"),&ItemList::set_max_text_lines); + ClassDB::bind_method(D_METHOD("get_max_text_lines"),&ItemList::get_max_text_lines); - ClassDB::bind_method(_MD("set_max_columns","amount"),&ItemList::set_max_columns); - ClassDB::bind_method(_MD("get_max_columns"),&ItemList::get_max_columns); + ClassDB::bind_method(D_METHOD("set_max_columns","amount"),&ItemList::set_max_columns); + ClassDB::bind_method(D_METHOD("get_max_columns"),&ItemList::get_max_columns); - ClassDB::bind_method(_MD("set_select_mode","mode"),&ItemList::set_select_mode); - ClassDB::bind_method(_MD("get_select_mode"),&ItemList::get_select_mode); + ClassDB::bind_method(D_METHOD("set_select_mode","mode"),&ItemList::set_select_mode); + ClassDB::bind_method(D_METHOD("get_select_mode"),&ItemList::get_select_mode); - ClassDB::bind_method(_MD("set_icon_mode","mode"),&ItemList::set_icon_mode); - ClassDB::bind_method(_MD("get_icon_mode"),&ItemList::get_icon_mode); + ClassDB::bind_method(D_METHOD("set_icon_mode","mode"),&ItemList::set_icon_mode); + ClassDB::bind_method(D_METHOD("get_icon_mode"),&ItemList::get_icon_mode); - ClassDB::bind_method(_MD("set_fixed_icon_size","size"),&ItemList::set_fixed_icon_size); - ClassDB::bind_method(_MD("get_fixed_icon_size"),&ItemList::get_fixed_icon_size); + ClassDB::bind_method(D_METHOD("set_fixed_icon_size","size"),&ItemList::set_fixed_icon_size); + ClassDB::bind_method(D_METHOD("get_fixed_icon_size"),&ItemList::get_fixed_icon_size); - ClassDB::bind_method(_MD("set_icon_scale","scale"),&ItemList::set_icon_scale); - ClassDB::bind_method(_MD("get_icon_scale"),&ItemList::get_icon_scale); + ClassDB::bind_method(D_METHOD("set_icon_scale","scale"),&ItemList::set_icon_scale); + ClassDB::bind_method(D_METHOD("get_icon_scale"),&ItemList::get_icon_scale); - ClassDB::bind_method(_MD("set_allow_rmb_select","allow"),&ItemList::set_allow_rmb_select); - ClassDB::bind_method(_MD("get_allow_rmb_select"),&ItemList::get_allow_rmb_select); + ClassDB::bind_method(D_METHOD("set_allow_rmb_select","allow"),&ItemList::set_allow_rmb_select); + ClassDB::bind_method(D_METHOD("get_allow_rmb_select"),&ItemList::get_allow_rmb_select); - ClassDB::bind_method(_MD("get_item_at_pos","pos","exact"),&ItemList::get_item_at_pos,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_item_at_pos","pos","exact"),&ItemList::get_item_at_pos,DEFVAL(false)); - ClassDB::bind_method(_MD("ensure_current_is_visible"),&ItemList::ensure_current_is_visible); + ClassDB::bind_method(D_METHOD("ensure_current_is_visible"),&ItemList::ensure_current_is_visible); - ClassDB::bind_method(_MD("get_v_scroll"),&ItemList::get_v_scroll); + ClassDB::bind_method(D_METHOD("get_v_scroll"),&ItemList::get_v_scroll); - ClassDB::bind_method(_MD("_scroll_changed"),&ItemList::_scroll_changed); - ClassDB::bind_method(_MD("_gui_input"),&ItemList::_gui_input); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&ItemList::_scroll_changed); + ClassDB::bind_method(D_METHOD("_gui_input"),&ItemList::_gui_input); BIND_CONSTANT( ICON_MODE_TOP ); BIND_CONSTANT( ICON_MODE_LEFT ); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index fb485a7b25..dfcea30056 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -648,30 +648,30 @@ int Label::get_total_character_count() const { void Label::_bind_methods() { - ClassDB::bind_method(_MD("set_align","align"),&Label::set_align); - ClassDB::bind_method(_MD("get_align"),&Label::get_align); - ClassDB::bind_method(_MD("set_valign","valign"),&Label::set_valign); - ClassDB::bind_method(_MD("get_valign"),&Label::get_valign); - ClassDB::bind_method(_MD("set_text","text"),&Label::set_text); - ClassDB::bind_method(_MD("get_text"),&Label::get_text); - ClassDB::bind_method(_MD("set_autowrap","enable"),&Label::set_autowrap); - ClassDB::bind_method(_MD("has_autowrap"),&Label::has_autowrap); - ClassDB::bind_method(_MD("set_clip_text","enable"),&Label::set_clip_text); - ClassDB::bind_method(_MD("is_clipping_text"),&Label::is_clipping_text); - ClassDB::bind_method(_MD("set_uppercase","enable"),&Label::set_uppercase); - ClassDB::bind_method(_MD("is_uppercase"),&Label::is_uppercase); - ClassDB::bind_method(_MD("get_line_height"),&Label::get_line_height); - ClassDB::bind_method(_MD("get_line_count"),&Label::get_line_count); - ClassDB::bind_method(_MD("get_visible_line_count"),&Label::get_visible_line_count); - ClassDB::bind_method(_MD("get_total_character_count"),&Label::get_total_character_count); - ClassDB::bind_method(_MD("set_visible_characters","amount"),&Label::set_visible_characters); - ClassDB::bind_method(_MD("get_visible_characters"),&Label::get_visible_characters); - ClassDB::bind_method(_MD("set_percent_visible","percent_visible"),&Label::set_percent_visible); - ClassDB::bind_method(_MD("get_percent_visible"),&Label::get_percent_visible); - ClassDB::bind_method(_MD("set_lines_skipped","lines_skipped"),&Label::set_lines_skipped); - ClassDB::bind_method(_MD("get_lines_skipped"),&Label::get_lines_skipped); - ClassDB::bind_method(_MD("set_max_lines_visible","lines_visible"),&Label::set_max_lines_visible); - ClassDB::bind_method(_MD("get_max_lines_visible"),&Label::get_max_lines_visible); + ClassDB::bind_method(D_METHOD("set_align","align"),&Label::set_align); + ClassDB::bind_method(D_METHOD("get_align"),&Label::get_align); + ClassDB::bind_method(D_METHOD("set_valign","valign"),&Label::set_valign); + ClassDB::bind_method(D_METHOD("get_valign"),&Label::get_valign); + ClassDB::bind_method(D_METHOD("set_text","text"),&Label::set_text); + ClassDB::bind_method(D_METHOD("get_text"),&Label::get_text); + ClassDB::bind_method(D_METHOD("set_autowrap","enable"),&Label::set_autowrap); + ClassDB::bind_method(D_METHOD("has_autowrap"),&Label::has_autowrap); + ClassDB::bind_method(D_METHOD("set_clip_text","enable"),&Label::set_clip_text); + ClassDB::bind_method(D_METHOD("is_clipping_text"),&Label::is_clipping_text); + ClassDB::bind_method(D_METHOD("set_uppercase","enable"),&Label::set_uppercase); + ClassDB::bind_method(D_METHOD("is_uppercase"),&Label::is_uppercase); + ClassDB::bind_method(D_METHOD("get_line_height"),&Label::get_line_height); + ClassDB::bind_method(D_METHOD("get_line_count"),&Label::get_line_count); + ClassDB::bind_method(D_METHOD("get_visible_line_count"),&Label::get_visible_line_count); + ClassDB::bind_method(D_METHOD("get_total_character_count"),&Label::get_total_character_count); + ClassDB::bind_method(D_METHOD("set_visible_characters","amount"),&Label::set_visible_characters); + ClassDB::bind_method(D_METHOD("get_visible_characters"),&Label::get_visible_characters); + ClassDB::bind_method(D_METHOD("set_percent_visible","percent_visible"),&Label::set_percent_visible); + ClassDB::bind_method(D_METHOD("get_percent_visible"),&Label::get_percent_visible); + ClassDB::bind_method(D_METHOD("set_lines_skipped","lines_skipped"),&Label::set_lines_skipped); + ClassDB::bind_method(D_METHOD("get_lines_skipped"),&Label::get_lines_skipped); + ClassDB::bind_method(D_METHOD("set_max_lines_visible","lines_visible"),&Label::set_max_lines_visible); + ClassDB::bind_method(D_METHOD("get_max_lines_visible"),&Label::get_max_lines_visible); BIND_CONSTANT( ALIGN_LEFT ); BIND_CONSTANT( ALIGN_CENTER ); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index b8615a98ee..893670efea 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -1256,42 +1256,42 @@ void LineEdit::_text_changed() { void LineEdit::_bind_methods() { - ClassDB::bind_method(_MD("_toggle_draw_caret"),&LineEdit::_toggle_draw_caret); + ClassDB::bind_method(D_METHOD("_toggle_draw_caret"),&LineEdit::_toggle_draw_caret); #ifdef TOOLS_ENABLED ClassDB::bind_method("_editor_settings_changed",&LineEdit::_editor_settings_changed); #endif - ClassDB::bind_method(_MD("set_align", "align"), &LineEdit::set_align); - ClassDB::bind_method(_MD("get_align"), &LineEdit::get_align); - - ClassDB::bind_method(_MD("_gui_input"),&LineEdit::_gui_input); - ClassDB::bind_method(_MD("clear"),&LineEdit::clear); - ClassDB::bind_method(_MD("select_all"),&LineEdit::select_all); - ClassDB::bind_method(_MD("set_text","text"),&LineEdit::set_text); - ClassDB::bind_method(_MD("get_text"),&LineEdit::get_text); - ClassDB::bind_method(_MD("set_placeholder","text"),&LineEdit::set_placeholder); - ClassDB::bind_method(_MD("get_placeholder"),&LineEdit::get_placeholder); - ClassDB::bind_method(_MD("set_placeholder_alpha","alpha"),&LineEdit::set_placeholder_alpha); - ClassDB::bind_method(_MD("get_placeholder_alpha"),&LineEdit::get_placeholder_alpha); - ClassDB::bind_method(_MD("set_cursor_pos","pos"),&LineEdit::set_cursor_pos); - ClassDB::bind_method(_MD("get_cursor_pos"),&LineEdit::get_cursor_pos); - ClassDB::bind_method(_MD("set_expand_to_text_length","enabled"),&LineEdit::set_expand_to_text_length); - ClassDB::bind_method(_MD("get_expand_to_text_length"),&LineEdit::get_expand_to_text_length); - ClassDB::bind_method(_MD("cursor_set_blink_enabled", "enabled"),&LineEdit::cursor_set_blink_enabled); - ClassDB::bind_method(_MD("cursor_get_blink_enabled"),&LineEdit::cursor_get_blink_enabled); - ClassDB::bind_method(_MD("cursor_set_blink_speed", "blink_speed"),&LineEdit::cursor_set_blink_speed); - ClassDB::bind_method(_MD("cursor_get_blink_speed"),&LineEdit::cursor_get_blink_speed); - ClassDB::bind_method(_MD("set_max_length","chars"),&LineEdit::set_max_length); - ClassDB::bind_method(_MD("get_max_length"),&LineEdit::get_max_length); - ClassDB::bind_method(_MD("append_at_cursor","text"),&LineEdit::append_at_cursor); - ClassDB::bind_method(_MD("set_editable","enabled"),&LineEdit::set_editable); - ClassDB::bind_method(_MD("is_editable"),&LineEdit::is_editable); - ClassDB::bind_method(_MD("set_secret","enabled"),&LineEdit::set_secret); - ClassDB::bind_method(_MD("is_secret"),&LineEdit::is_secret); - ClassDB::bind_method(_MD("select","from","to"),&LineEdit::select,DEFVAL(0),DEFVAL(-1)); - ClassDB::bind_method(_MD("menu_option","option"),&LineEdit::menu_option); - ClassDB::bind_method(_MD("get_menu:PopupMenu"),&LineEdit::get_menu); + ClassDB::bind_method(D_METHOD("set_align", "align"), &LineEdit::set_align); + ClassDB::bind_method(D_METHOD("get_align"), &LineEdit::get_align); + + ClassDB::bind_method(D_METHOD("_gui_input"),&LineEdit::_gui_input); + ClassDB::bind_method(D_METHOD("clear"),&LineEdit::clear); + ClassDB::bind_method(D_METHOD("select_all"),&LineEdit::select_all); + ClassDB::bind_method(D_METHOD("set_text","text"),&LineEdit::set_text); + ClassDB::bind_method(D_METHOD("get_text"),&LineEdit::get_text); + ClassDB::bind_method(D_METHOD("set_placeholder","text"),&LineEdit::set_placeholder); + ClassDB::bind_method(D_METHOD("get_placeholder"),&LineEdit::get_placeholder); + ClassDB::bind_method(D_METHOD("set_placeholder_alpha","alpha"),&LineEdit::set_placeholder_alpha); + ClassDB::bind_method(D_METHOD("get_placeholder_alpha"),&LineEdit::get_placeholder_alpha); + ClassDB::bind_method(D_METHOD("set_cursor_pos","pos"),&LineEdit::set_cursor_pos); + ClassDB::bind_method(D_METHOD("get_cursor_pos"),&LineEdit::get_cursor_pos); + ClassDB::bind_method(D_METHOD("set_expand_to_text_length","enabled"),&LineEdit::set_expand_to_text_length); + ClassDB::bind_method(D_METHOD("get_expand_to_text_length"),&LineEdit::get_expand_to_text_length); + ClassDB::bind_method(D_METHOD("cursor_set_blink_enabled", "enabled"),&LineEdit::cursor_set_blink_enabled); + ClassDB::bind_method(D_METHOD("cursor_get_blink_enabled"),&LineEdit::cursor_get_blink_enabled); + ClassDB::bind_method(D_METHOD("cursor_set_blink_speed", "blink_speed"),&LineEdit::cursor_set_blink_speed); + ClassDB::bind_method(D_METHOD("cursor_get_blink_speed"),&LineEdit::cursor_get_blink_speed); + ClassDB::bind_method(D_METHOD("set_max_length","chars"),&LineEdit::set_max_length); + ClassDB::bind_method(D_METHOD("get_max_length"),&LineEdit::get_max_length); + ClassDB::bind_method(D_METHOD("append_at_cursor","text"),&LineEdit::append_at_cursor); + ClassDB::bind_method(D_METHOD("set_editable","enabled"),&LineEdit::set_editable); + ClassDB::bind_method(D_METHOD("is_editable"),&LineEdit::is_editable); + ClassDB::bind_method(D_METHOD("set_secret","enabled"),&LineEdit::set_secret); + ClassDB::bind_method(D_METHOD("is_secret"),&LineEdit::is_secret); + ClassDB::bind_method(D_METHOD("select","from","to"),&LineEdit::select,DEFVAL(0),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("menu_option","option"),&LineEdit::menu_option); + ClassDB::bind_method(D_METHOD("get_menu:PopupMenu"),&LineEdit::get_menu); ADD_SIGNAL( MethodInfo("text_changed", PropertyInfo( Variant::STRING, "text" )) ); ADD_SIGNAL( MethodInfo("text_entered", PropertyInfo( Variant::STRING, "text" )) ); diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index 29c07eb158..7ea88f35f3 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -130,11 +130,11 @@ void LinkButton::_notification(int p_what) { void LinkButton::_bind_methods() { - ClassDB::bind_method(_MD("set_text","text"),&LinkButton::set_text); - ClassDB::bind_method(_MD("get_text"),&LinkButton::get_text); + ClassDB::bind_method(D_METHOD("set_text","text"),&LinkButton::set_text); + ClassDB::bind_method(D_METHOD("get_text"),&LinkButton::get_text); - ClassDB::bind_method(_MD("set_underline_mode","underline_mode"),&LinkButton::set_underline_mode); - ClassDB::bind_method(_MD("get_underline_mode"),&LinkButton::get_underline_mode); + ClassDB::bind_method(D_METHOD("set_underline_mode","underline_mode"),&LinkButton::set_underline_mode); + ClassDB::bind_method(D_METHOD("get_underline_mode"),&LinkButton::get_underline_mode); BIND_CONSTANT( UNDERLINE_MODE_ALWAYS ); diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 4fd3daa507..f15b864b95 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -98,10 +98,10 @@ void MenuButton::_set_items(const Array& p_items) { void MenuButton::_bind_methods() { - ClassDB::bind_method(_MD("get_popup:PopupMenu"),&MenuButton::get_popup); - ClassDB::bind_method(_MD("_unhandled_key_input"),&MenuButton::_unhandled_key_input); - ClassDB::bind_method(_MD("_set_items"),&MenuButton::_set_items); - ClassDB::bind_method(_MD("_get_items"),&MenuButton::_get_items); + ClassDB::bind_method(D_METHOD("get_popup:PopupMenu"),&MenuButton::get_popup); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&MenuButton::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_set_items"),&MenuButton::_set_items); + ClassDB::bind_method(D_METHOD("_get_items"),&MenuButton::_get_items); ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"items",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_items","_get_items") ; diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index ed0e1bd208..9ead79b491 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -287,32 +287,32 @@ void OptionButton::get_translatable_strings(List<String> *p_strings) const { void OptionButton::_bind_methods() { - ClassDB::bind_method(_MD("_selected"),&OptionButton::_selected); - - ClassDB::bind_method(_MD("add_item","label","id"),&OptionButton::add_item,DEFVAL(-1)); - ClassDB::bind_method(_MD("add_icon_item","texture:Texture","label","id"),&OptionButton::add_icon_item); - ClassDB::bind_method(_MD("set_item_text","idx","text"),&OptionButton::set_item_text); - ClassDB::bind_method(_MD("set_item_icon","idx","texture:Texture"),&OptionButton::set_item_icon); - ClassDB::bind_method(_MD("set_item_disabled","idx","disabled"),&OptionButton::set_item_disabled); - ClassDB::bind_method(_MD("set_item_ID","idx","id"),&OptionButton::set_item_ID); - ClassDB::bind_method(_MD("set_item_metadata","idx","metadata"),&OptionButton::set_item_metadata); - ClassDB::bind_method(_MD("get_item_text","idx"),&OptionButton::get_item_text); - ClassDB::bind_method(_MD("get_item_icon:Texture","idx"),&OptionButton::get_item_icon); - ClassDB::bind_method(_MD("get_item_ID","idx"),&OptionButton::get_item_ID); - ClassDB::bind_method(_MD("get_item_metadata","idx"),&OptionButton::get_item_metadata); - ClassDB::bind_method(_MD("is_item_disabled","idx"),&OptionButton::is_item_disabled); - ClassDB::bind_method(_MD("get_item_count"),&OptionButton::get_item_count); - ClassDB::bind_method(_MD("add_separator"),&OptionButton::add_separator); - ClassDB::bind_method(_MD("clear"),&OptionButton::clear); - ClassDB::bind_method(_MD("select","idx"),&OptionButton::select); - ClassDB::bind_method(_MD("get_selected"),&OptionButton::get_selected); - ClassDB::bind_method(_MD("get_selected_ID"),&OptionButton::get_selected_ID); - ClassDB::bind_method(_MD("get_selected_metadata"),&OptionButton::get_selected_metadata); - ClassDB::bind_method(_MD("remove_item","idx"),&OptionButton::remove_item); - ClassDB::bind_method(_MD("_select_int"),&OptionButton::_select_int); - - ClassDB::bind_method(_MD("_set_items"),&OptionButton::_set_items); - ClassDB::bind_method(_MD("_get_items"),&OptionButton::_get_items); + ClassDB::bind_method(D_METHOD("_selected"),&OptionButton::_selected); + + ClassDB::bind_method(D_METHOD("add_item","label","id"),&OptionButton::add_item,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("add_icon_item","texture:Texture","label","id"),&OptionButton::add_icon_item); + ClassDB::bind_method(D_METHOD("set_item_text","idx","text"),&OptionButton::set_item_text); + ClassDB::bind_method(D_METHOD("set_item_icon","idx","texture:Texture"),&OptionButton::set_item_icon); + ClassDB::bind_method(D_METHOD("set_item_disabled","idx","disabled"),&OptionButton::set_item_disabled); + ClassDB::bind_method(D_METHOD("set_item_ID","idx","id"),&OptionButton::set_item_ID); + ClassDB::bind_method(D_METHOD("set_item_metadata","idx","metadata"),&OptionButton::set_item_metadata); + ClassDB::bind_method(D_METHOD("get_item_text","idx"),&OptionButton::get_item_text); + ClassDB::bind_method(D_METHOD("get_item_icon:Texture","idx"),&OptionButton::get_item_icon); + ClassDB::bind_method(D_METHOD("get_item_ID","idx"),&OptionButton::get_item_ID); + ClassDB::bind_method(D_METHOD("get_item_metadata","idx"),&OptionButton::get_item_metadata); + ClassDB::bind_method(D_METHOD("is_item_disabled","idx"),&OptionButton::is_item_disabled); + ClassDB::bind_method(D_METHOD("get_item_count"),&OptionButton::get_item_count); + ClassDB::bind_method(D_METHOD("add_separator"),&OptionButton::add_separator); + ClassDB::bind_method(D_METHOD("clear"),&OptionButton::clear); + ClassDB::bind_method(D_METHOD("select","idx"),&OptionButton::select); + ClassDB::bind_method(D_METHOD("get_selected"),&OptionButton::get_selected); + ClassDB::bind_method(D_METHOD("get_selected_ID"),&OptionButton::get_selected_ID); + ClassDB::bind_method(D_METHOD("get_selected_metadata"),&OptionButton::get_selected_metadata); + ClassDB::bind_method(D_METHOD("remove_item","idx"),&OptionButton::remove_item); + ClassDB::bind_method(D_METHOD("_select_int"),&OptionButton::_select_int); + + ClassDB::bind_method(D_METHOD("_set_items"),&OptionButton::_set_items); + ClassDB::bind_method(D_METHOD("_get_items"),&OptionButton::_get_items); ADD_PROPERTY( PropertyInfo(Variant::INT,"selected"), "_select_int","get_selected") ; ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"items",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_items","_get_items") ; diff --git a/scene/gui/patch_9_rect.cpp b/scene/gui/patch_9_rect.cpp index 34ee964cd5..6fb35f72e5 100644 --- a/scene/gui/patch_9_rect.cpp +++ b/scene/gui/patch_9_rect.cpp @@ -68,14 +68,14 @@ Size2 NinePatchRect::get_minimum_size() const { void NinePatchRect::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture"), & NinePatchRect::set_texture ); - ClassDB::bind_method(_MD("get_texture"), & NinePatchRect::get_texture ); - ClassDB::bind_method(_MD("set_patch_margin","margin","value"), & NinePatchRect::set_patch_margin ); - ClassDB::bind_method(_MD("get_patch_margin","margin"), & NinePatchRect::get_patch_margin ); - ClassDB::bind_method(_MD("set_region_rect","rect"),&NinePatchRect::set_region_rect); - ClassDB::bind_method(_MD("get_region_rect"),&NinePatchRect::get_region_rect); - ClassDB::bind_method(_MD("set_draw_center","draw_center"), & NinePatchRect::set_draw_center ); - ClassDB::bind_method(_MD("get_draw_center"), & NinePatchRect::get_draw_center ); + ClassDB::bind_method(D_METHOD("set_texture","texture"), & NinePatchRect::set_texture ); + ClassDB::bind_method(D_METHOD("get_texture"), & NinePatchRect::get_texture ); + ClassDB::bind_method(D_METHOD("set_patch_margin","margin","value"), & NinePatchRect::set_patch_margin ); + ClassDB::bind_method(D_METHOD("get_patch_margin","margin"), & NinePatchRect::get_patch_margin ); + ClassDB::bind_method(D_METHOD("set_region_rect","rect"),&NinePatchRect::set_region_rect); + ClassDB::bind_method(D_METHOD("get_region_rect"),&NinePatchRect::get_region_rect); + ClassDB::bind_method(D_METHOD("set_draw_center","draw_center"), & NinePatchRect::set_draw_center ); + ClassDB::bind_method(D_METHOD("get_draw_center"), & NinePatchRect::get_draw_center ); ADD_SIGNAL(MethodInfo("texture_changed")); diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 6ef7de4516..60ecd775f7 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -257,12 +257,12 @@ bool Popup::is_exclusive() const { void Popup::_bind_methods() { - ClassDB::bind_method(_MD("popup_centered","size"),&Popup::popup_centered,DEFVAL(Size2())); - ClassDB::bind_method(_MD("popup_centered_ratio","ratio"),&Popup::popup_centered_ratio,DEFVAL(0.75)); - ClassDB::bind_method(_MD("popup_centered_minsize","minsize"),&Popup::popup_centered_minsize,DEFVAL(Size2())); - ClassDB::bind_method(_MD("popup"),&Popup::popup); - ClassDB::bind_method(_MD("set_exclusive","enable"),&Popup::set_exclusive); - ClassDB::bind_method(_MD("is_exclusive"),&Popup::is_exclusive); + ClassDB::bind_method(D_METHOD("popup_centered","size"),&Popup::popup_centered,DEFVAL(Size2())); + ClassDB::bind_method(D_METHOD("popup_centered_ratio","ratio"),&Popup::popup_centered_ratio,DEFVAL(0.75)); + ClassDB::bind_method(D_METHOD("popup_centered_minsize","minsize"),&Popup::popup_centered_minsize,DEFVAL(Size2())); + ClassDB::bind_method(D_METHOD("popup"),&Popup::popup); + ClassDB::bind_method(D_METHOD("set_exclusive","enable"),&Popup::set_exclusive); + ClassDB::bind_method(D_METHOD("is_exclusive"),&Popup::is_exclusive); ADD_SIGNAL( MethodInfo("about_to_show") ); ADD_SIGNAL( MethodInfo("popup_hide") ); ADD_GROUP("Popup","popup_"); diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index d5762f8d53..884cf0312a 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -1114,61 +1114,61 @@ void PopupMenu::clear_autohide_areas(){ void PopupMenu::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&PopupMenu::_gui_input); - ClassDB::bind_method(_MD("add_icon_item","texture","label","id","accel"),&PopupMenu::add_icon_item,DEFVAL(-1),DEFVAL(0)); - ClassDB::bind_method(_MD("add_item","label","id","accel"),&PopupMenu::add_item,DEFVAL(-1),DEFVAL(0)); - ClassDB::bind_method(_MD("add_icon_check_item","texture","label","id","accel"),&PopupMenu::add_icon_check_item,DEFVAL(-1),DEFVAL(0)); - ClassDB::bind_method(_MD("add_check_item","label","id","accel"),&PopupMenu::add_check_item,DEFVAL(-1),DEFVAL(0)); - ClassDB::bind_method(_MD("add_submenu_item","label","submenu","id"),&PopupMenu::add_submenu_item,DEFVAL(-1)); - - ClassDB::bind_method(_MD("add_icon_shortcut","texture","shortcut:ShortCut","id","global"),&PopupMenu::add_icon_shortcut,DEFVAL(-1),DEFVAL(false)); - ClassDB::bind_method(_MD("add_shortcut","shortcut:ShortCut","id","global"),&PopupMenu::add_shortcut,DEFVAL(-1),DEFVAL(false)); - ClassDB::bind_method(_MD("add_icon_check_shortcut","texture","shortcut:ShortCut","id","global"),&PopupMenu::add_icon_check_shortcut,DEFVAL(-1),DEFVAL(false)); - ClassDB::bind_method(_MD("add_check_shortcut","shortcut:ShortCut","id","global"),&PopupMenu::add_check_shortcut,DEFVAL(-1),DEFVAL(false)); - - ClassDB::bind_method(_MD("set_item_text","idx","text"),&PopupMenu::set_item_text); - ClassDB::bind_method(_MD("set_item_icon","idx","icon"),&PopupMenu::set_item_icon); - ClassDB::bind_method(_MD("set_item_checked","idx","checked"),&PopupMenu::set_item_checked); - ClassDB::bind_method(_MD("set_item_ID","idx","id"),&PopupMenu::set_item_ID); - ClassDB::bind_method(_MD("set_item_accelerator","idx","accel"),&PopupMenu::set_item_accelerator); - ClassDB::bind_method(_MD("set_item_metadata","idx","metadata"),&PopupMenu::set_item_metadata); - ClassDB::bind_method(_MD("set_item_disabled","idx","disabled"),&PopupMenu::set_item_disabled); - ClassDB::bind_method(_MD("set_item_submenu","idx","submenu"),&PopupMenu::set_item_submenu); - ClassDB::bind_method(_MD("set_item_as_separator","idx","enable"),&PopupMenu::set_item_as_separator); - ClassDB::bind_method(_MD("set_item_as_checkable","idx","enable"),&PopupMenu::set_item_as_checkable); - ClassDB::bind_method(_MD("set_item_tooltip","idx","tooltip"),&PopupMenu::set_item_tooltip); - ClassDB::bind_method(_MD("set_item_shortcut","idx","shortcut:ShortCut","global"),&PopupMenu::set_item_shortcut,DEFVAL(false)); - - ClassDB::bind_method(_MD("toggle_item_checked","idx"), &PopupMenu::toggle_item_checked); - - ClassDB::bind_method(_MD("get_item_text","idx"),&PopupMenu::get_item_text); - ClassDB::bind_method(_MD("get_item_icon","idx"),&PopupMenu::get_item_icon); - ClassDB::bind_method(_MD("is_item_checked","idx"),&PopupMenu::is_item_checked); - ClassDB::bind_method(_MD("get_item_ID","idx"),&PopupMenu::get_item_ID); - ClassDB::bind_method(_MD("get_item_index","id"),&PopupMenu::get_item_index); - ClassDB::bind_method(_MD("get_item_accelerator","idx"),&PopupMenu::get_item_accelerator); - ClassDB::bind_method(_MD("get_item_metadata","idx"),&PopupMenu::get_item_metadata); - ClassDB::bind_method(_MD("is_item_disabled","idx"),&PopupMenu::is_item_disabled); - ClassDB::bind_method(_MD("get_item_submenu","idx"),&PopupMenu::get_item_submenu); - ClassDB::bind_method(_MD("is_item_separator","idx"),&PopupMenu::is_item_separator); - ClassDB::bind_method(_MD("is_item_checkable","idx"),&PopupMenu::is_item_checkable); - ClassDB::bind_method(_MD("get_item_tooltip","idx"),&PopupMenu::get_item_tooltip); - ClassDB::bind_method(_MD("get_item_shortcut:ShortCut","idx"),&PopupMenu::get_item_shortcut); - - ClassDB::bind_method(_MD("get_item_count"),&PopupMenu::get_item_count); - - ClassDB::bind_method(_MD("remove_item","idx"),&PopupMenu::remove_item); - - ClassDB::bind_method(_MD("add_separator"),&PopupMenu::add_separator); - ClassDB::bind_method(_MD("clear"),&PopupMenu::clear); - - ClassDB::bind_method(_MD("_set_items"),&PopupMenu::_set_items); - ClassDB::bind_method(_MD("_get_items"),&PopupMenu::_get_items); - - ClassDB::bind_method(_MD("set_hide_on_item_selection","enable"),&PopupMenu::set_hide_on_item_selection); - ClassDB::bind_method(_MD("is_hide_on_item_selection"),&PopupMenu::is_hide_on_item_selection); - - ClassDB::bind_method(_MD("_submenu_timeout"),&PopupMenu::_submenu_timeout); + ClassDB::bind_method(D_METHOD("_gui_input"),&PopupMenu::_gui_input); + ClassDB::bind_method(D_METHOD("add_icon_item","texture","label","id","accel"),&PopupMenu::add_icon_item,DEFVAL(-1),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("add_item","label","id","accel"),&PopupMenu::add_item,DEFVAL(-1),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("add_icon_check_item","texture","label","id","accel"),&PopupMenu::add_icon_check_item,DEFVAL(-1),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("add_check_item","label","id","accel"),&PopupMenu::add_check_item,DEFVAL(-1),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("add_submenu_item","label","submenu","id"),&PopupMenu::add_submenu_item,DEFVAL(-1)); + + ClassDB::bind_method(D_METHOD("add_icon_shortcut","texture","shortcut:ShortCut","id","global"),&PopupMenu::add_icon_shortcut,DEFVAL(-1),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_shortcut","shortcut:ShortCut","id","global"),&PopupMenu::add_shortcut,DEFVAL(-1),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_icon_check_shortcut","texture","shortcut:ShortCut","id","global"),&PopupMenu::add_icon_check_shortcut,DEFVAL(-1),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_check_shortcut","shortcut:ShortCut","id","global"),&PopupMenu::add_check_shortcut,DEFVAL(-1),DEFVAL(false)); + + ClassDB::bind_method(D_METHOD("set_item_text","idx","text"),&PopupMenu::set_item_text); + ClassDB::bind_method(D_METHOD("set_item_icon","idx","icon"),&PopupMenu::set_item_icon); + ClassDB::bind_method(D_METHOD("set_item_checked","idx","checked"),&PopupMenu::set_item_checked); + ClassDB::bind_method(D_METHOD("set_item_ID","idx","id"),&PopupMenu::set_item_ID); + ClassDB::bind_method(D_METHOD("set_item_accelerator","idx","accel"),&PopupMenu::set_item_accelerator); + ClassDB::bind_method(D_METHOD("set_item_metadata","idx","metadata"),&PopupMenu::set_item_metadata); + ClassDB::bind_method(D_METHOD("set_item_disabled","idx","disabled"),&PopupMenu::set_item_disabled); + ClassDB::bind_method(D_METHOD("set_item_submenu","idx","submenu"),&PopupMenu::set_item_submenu); + ClassDB::bind_method(D_METHOD("set_item_as_separator","idx","enable"),&PopupMenu::set_item_as_separator); + ClassDB::bind_method(D_METHOD("set_item_as_checkable","idx","enable"),&PopupMenu::set_item_as_checkable); + ClassDB::bind_method(D_METHOD("set_item_tooltip","idx","tooltip"),&PopupMenu::set_item_tooltip); + ClassDB::bind_method(D_METHOD("set_item_shortcut","idx","shortcut:ShortCut","global"),&PopupMenu::set_item_shortcut,DEFVAL(false)); + + ClassDB::bind_method(D_METHOD("toggle_item_checked","idx"), &PopupMenu::toggle_item_checked); + + ClassDB::bind_method(D_METHOD("get_item_text","idx"),&PopupMenu::get_item_text); + ClassDB::bind_method(D_METHOD("get_item_icon","idx"),&PopupMenu::get_item_icon); + ClassDB::bind_method(D_METHOD("is_item_checked","idx"),&PopupMenu::is_item_checked); + ClassDB::bind_method(D_METHOD("get_item_ID","idx"),&PopupMenu::get_item_ID); + ClassDB::bind_method(D_METHOD("get_item_index","id"),&PopupMenu::get_item_index); + ClassDB::bind_method(D_METHOD("get_item_accelerator","idx"),&PopupMenu::get_item_accelerator); + ClassDB::bind_method(D_METHOD("get_item_metadata","idx"),&PopupMenu::get_item_metadata); + ClassDB::bind_method(D_METHOD("is_item_disabled","idx"),&PopupMenu::is_item_disabled); + ClassDB::bind_method(D_METHOD("get_item_submenu","idx"),&PopupMenu::get_item_submenu); + ClassDB::bind_method(D_METHOD("is_item_separator","idx"),&PopupMenu::is_item_separator); + ClassDB::bind_method(D_METHOD("is_item_checkable","idx"),&PopupMenu::is_item_checkable); + ClassDB::bind_method(D_METHOD("get_item_tooltip","idx"),&PopupMenu::get_item_tooltip); + ClassDB::bind_method(D_METHOD("get_item_shortcut:ShortCut","idx"),&PopupMenu::get_item_shortcut); + + ClassDB::bind_method(D_METHOD("get_item_count"),&PopupMenu::get_item_count); + + ClassDB::bind_method(D_METHOD("remove_item","idx"),&PopupMenu::remove_item); + + ClassDB::bind_method(D_METHOD("add_separator"),&PopupMenu::add_separator); + ClassDB::bind_method(D_METHOD("clear"),&PopupMenu::clear); + + ClassDB::bind_method(D_METHOD("_set_items"),&PopupMenu::_set_items); + ClassDB::bind_method(D_METHOD("_get_items"),&PopupMenu::_get_items); + + ClassDB::bind_method(D_METHOD("set_hide_on_item_selection","enable"),&PopupMenu::set_hide_on_item_selection); + ClassDB::bind_method(D_METHOD("is_hide_on_item_selection"),&PopupMenu::is_hide_on_item_selection); + + ClassDB::bind_method(D_METHOD("_submenu_timeout"),&PopupMenu::_submenu_timeout); ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"items",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_items","_get_items") ; ADD_PROPERTYNO( PropertyInfo(Variant::BOOL, "hide_on_item_selection" ), "set_hide_on_item_selection", "is_hide_on_item_selection") ; diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp index ed3cf2cf56..61776d3ae6 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -82,8 +82,8 @@ bool ProgressBar::is_percent_visible() const{ void ProgressBar::_bind_methods() { - ClassDB::bind_method(_MD("set_percent_visible","visible"),&ProgressBar::set_percent_visible); - ClassDB::bind_method(_MD("is_percent_visible"),&ProgressBar::is_percent_visible); + ClassDB::bind_method(D_METHOD("set_percent_visible","visible"),&ProgressBar::set_percent_visible); + ClassDB::bind_method(D_METHOD("is_percent_visible"),&ProgressBar::is_percent_visible); ADD_GROUP("Percent","percent_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"percent_visible"),"set_percent_visible","is_percent_visible"); } diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index f45d0e6a04..f434aff08d 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -222,25 +222,25 @@ void Range::_unref_shared() { void Range::_bind_methods() { - ClassDB::bind_method(_MD("get_value"),&Range::get_value); - ClassDB::bind_method(_MD("get_min"),&Range::get_min); - ClassDB::bind_method(_MD("get_max"),&Range::get_max); - ClassDB::bind_method(_MD("get_step"),&Range::get_step); - ClassDB::bind_method(_MD("get_page"),&Range::get_page); - ClassDB::bind_method(_MD("get_as_ratio"),&Range::get_as_ratio); - ClassDB::bind_method(_MD("set_value","value"),&Range::set_value); - ClassDB::bind_method(_MD("set_min","minimum"),&Range::set_min); - ClassDB::bind_method(_MD("set_max","maximum"),&Range::set_max); - ClassDB::bind_method(_MD("set_step","step"),&Range::set_step); - ClassDB::bind_method(_MD("set_page","pagesize"),&Range::set_page); - ClassDB::bind_method(_MD("set_as_ratio","value"),&Range::set_as_ratio); - ClassDB::bind_method(_MD("set_use_rounded_values","enabled"),&Range::set_use_rounded_values); - ClassDB::bind_method(_MD("is_using_rounded_values"),&Range::is_using_rounded_values); - ClassDB::bind_method(_MD("set_exp_ratio","enabled"),&Range::set_exp_ratio); - ClassDB::bind_method(_MD("is_ratio_exp"),&Range::is_ratio_exp); - - ClassDB::bind_method(_MD("share","with"),&Range::_share); - ClassDB::bind_method(_MD("unshare"),&Range::unshare); + ClassDB::bind_method(D_METHOD("get_value"),&Range::get_value); + ClassDB::bind_method(D_METHOD("get_min"),&Range::get_min); + ClassDB::bind_method(D_METHOD("get_max"),&Range::get_max); + ClassDB::bind_method(D_METHOD("get_step"),&Range::get_step); + ClassDB::bind_method(D_METHOD("get_page"),&Range::get_page); + ClassDB::bind_method(D_METHOD("get_as_ratio"),&Range::get_as_ratio); + ClassDB::bind_method(D_METHOD("set_value","value"),&Range::set_value); + ClassDB::bind_method(D_METHOD("set_min","minimum"),&Range::set_min); + ClassDB::bind_method(D_METHOD("set_max","maximum"),&Range::set_max); + ClassDB::bind_method(D_METHOD("set_step","step"),&Range::set_step); + ClassDB::bind_method(D_METHOD("set_page","pagesize"),&Range::set_page); + ClassDB::bind_method(D_METHOD("set_as_ratio","value"),&Range::set_as_ratio); + ClassDB::bind_method(D_METHOD("set_use_rounded_values","enabled"),&Range::set_use_rounded_values); + ClassDB::bind_method(D_METHOD("is_using_rounded_values"),&Range::is_using_rounded_values); + ClassDB::bind_method(D_METHOD("set_exp_ratio","enabled"),&Range::set_exp_ratio); + ClassDB::bind_method(D_METHOD("is_ratio_exp"),&Range::is_ratio_exp); + + ClassDB::bind_method(D_METHOD("share","with"),&Range::_share); + ClassDB::bind_method(D_METHOD("unshare"),&Range::unshare); ADD_SIGNAL( MethodInfo("value_changed", PropertyInfo(Variant::REAL,"value"))); ADD_SIGNAL( MethodInfo("changed")); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 9276e66eb8..b06cde1e91 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1900,58 +1900,58 @@ String RichTextLabel::get_text() { void RichTextLabel::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&RichTextLabel::_gui_input); - ClassDB::bind_method(_MD("_scroll_changed"),&RichTextLabel::_scroll_changed); - ClassDB::bind_method(_MD("get_text"),&RichTextLabel::get_text); - ClassDB::bind_method(_MD("add_text","text"),&RichTextLabel::add_text); - ClassDB::bind_method(_MD("add_image","image:Texture"),&RichTextLabel::add_image); - ClassDB::bind_method(_MD("newline"),&RichTextLabel::add_newline); - ClassDB::bind_method(_MD("push_font","font"),&RichTextLabel::push_font); - ClassDB::bind_method(_MD("push_color","color"),&RichTextLabel::push_color); - ClassDB::bind_method(_MD("push_align","align"),&RichTextLabel::push_align); - ClassDB::bind_method(_MD("push_indent","level"),&RichTextLabel::push_indent); - ClassDB::bind_method(_MD("push_list","type"),&RichTextLabel::push_list); - ClassDB::bind_method(_MD("push_meta","data"),&RichTextLabel::push_meta); - ClassDB::bind_method(_MD("push_underline"),&RichTextLabel::push_underline); - ClassDB::bind_method(_MD("push_table","columns"),&RichTextLabel::push_table); - ClassDB::bind_method(_MD("set_table_column_expand","column","expand","ratio"),&RichTextLabel::set_table_column_expand); - ClassDB::bind_method(_MD("push_cell"),&RichTextLabel::push_cell); - ClassDB::bind_method(_MD("pop"),&RichTextLabel::pop); + ClassDB::bind_method(D_METHOD("_gui_input"),&RichTextLabel::_gui_input); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&RichTextLabel::_scroll_changed); + ClassDB::bind_method(D_METHOD("get_text"),&RichTextLabel::get_text); + ClassDB::bind_method(D_METHOD("add_text","text"),&RichTextLabel::add_text); + ClassDB::bind_method(D_METHOD("add_image","image:Texture"),&RichTextLabel::add_image); + ClassDB::bind_method(D_METHOD("newline"),&RichTextLabel::add_newline); + ClassDB::bind_method(D_METHOD("push_font","font"),&RichTextLabel::push_font); + ClassDB::bind_method(D_METHOD("push_color","color"),&RichTextLabel::push_color); + ClassDB::bind_method(D_METHOD("push_align","align"),&RichTextLabel::push_align); + ClassDB::bind_method(D_METHOD("push_indent","level"),&RichTextLabel::push_indent); + ClassDB::bind_method(D_METHOD("push_list","type"),&RichTextLabel::push_list); + ClassDB::bind_method(D_METHOD("push_meta","data"),&RichTextLabel::push_meta); + ClassDB::bind_method(D_METHOD("push_underline"),&RichTextLabel::push_underline); + ClassDB::bind_method(D_METHOD("push_table","columns"),&RichTextLabel::push_table); + ClassDB::bind_method(D_METHOD("set_table_column_expand","column","expand","ratio"),&RichTextLabel::set_table_column_expand); + ClassDB::bind_method(D_METHOD("push_cell"),&RichTextLabel::push_cell); + ClassDB::bind_method(D_METHOD("pop"),&RichTextLabel::pop); - ClassDB::bind_method(_MD("clear"),&RichTextLabel::clear); + ClassDB::bind_method(D_METHOD("clear"),&RichTextLabel::clear); - ClassDB::bind_method(_MD("set_meta_underline","enable"),&RichTextLabel::set_meta_underline); - ClassDB::bind_method(_MD("is_meta_underlined"),&RichTextLabel::is_meta_underlined); + ClassDB::bind_method(D_METHOD("set_meta_underline","enable"),&RichTextLabel::set_meta_underline); + ClassDB::bind_method(D_METHOD("is_meta_underlined"),&RichTextLabel::is_meta_underlined); - ClassDB::bind_method(_MD("set_scroll_active","active"),&RichTextLabel::set_scroll_active); - ClassDB::bind_method(_MD("is_scroll_active"),&RichTextLabel::is_scroll_active); + ClassDB::bind_method(D_METHOD("set_scroll_active","active"),&RichTextLabel::set_scroll_active); + ClassDB::bind_method(D_METHOD("is_scroll_active"),&RichTextLabel::is_scroll_active); - ClassDB::bind_method(_MD("set_scroll_follow","follow"),&RichTextLabel::set_scroll_follow); - ClassDB::bind_method(_MD("is_scroll_following"),&RichTextLabel::is_scroll_following); + ClassDB::bind_method(D_METHOD("set_scroll_follow","follow"),&RichTextLabel::set_scroll_follow); + ClassDB::bind_method(D_METHOD("is_scroll_following"),&RichTextLabel::is_scroll_following); - ClassDB::bind_method(_MD("get_v_scroll"),&RichTextLabel::get_v_scroll); + ClassDB::bind_method(D_METHOD("get_v_scroll"),&RichTextLabel::get_v_scroll); - ClassDB::bind_method(_MD("scroll_to_line","line"),&RichTextLabel::scroll_to_line); + ClassDB::bind_method(D_METHOD("scroll_to_line","line"),&RichTextLabel::scroll_to_line); - ClassDB::bind_method(_MD("set_tab_size","spaces"),&RichTextLabel::set_tab_size); - ClassDB::bind_method(_MD("get_tab_size"),&RichTextLabel::get_tab_size); + ClassDB::bind_method(D_METHOD("set_tab_size","spaces"),&RichTextLabel::set_tab_size); + ClassDB::bind_method(D_METHOD("get_tab_size"),&RichTextLabel::get_tab_size); - ClassDB::bind_method(_MD("set_selection_enabled","enabled"),&RichTextLabel::set_selection_enabled); - ClassDB::bind_method(_MD("is_selection_enabled"),&RichTextLabel::is_selection_enabled); + ClassDB::bind_method(D_METHOD("set_selection_enabled","enabled"),&RichTextLabel::set_selection_enabled); + ClassDB::bind_method(D_METHOD("is_selection_enabled"),&RichTextLabel::is_selection_enabled); - ClassDB::bind_method(_MD("parse_bbcode", "bbcode"),&RichTextLabel::parse_bbcode); - ClassDB::bind_method(_MD("append_bbcode", "bbcode"),&RichTextLabel::append_bbcode); + ClassDB::bind_method(D_METHOD("parse_bbcode", "bbcode"),&RichTextLabel::parse_bbcode); + ClassDB::bind_method(D_METHOD("append_bbcode", "bbcode"),&RichTextLabel::append_bbcode); - ClassDB::bind_method(_MD("set_bbcode","text"),&RichTextLabel::set_bbcode); - ClassDB::bind_method(_MD("get_bbcode"),&RichTextLabel::get_bbcode); + ClassDB::bind_method(D_METHOD("set_bbcode","text"),&RichTextLabel::set_bbcode); + ClassDB::bind_method(D_METHOD("get_bbcode"),&RichTextLabel::get_bbcode); - ClassDB::bind_method(_MD("set_visible_characters","amount"),&RichTextLabel::set_visible_characters); - ClassDB::bind_method(_MD("get_visible_characters"),&RichTextLabel::get_visible_characters); + ClassDB::bind_method(D_METHOD("set_visible_characters","amount"),&RichTextLabel::set_visible_characters); + ClassDB::bind_method(D_METHOD("get_visible_characters"),&RichTextLabel::get_visible_characters); - ClassDB::bind_method(_MD("get_total_character_count"),&RichTextLabel::get_total_character_count); + ClassDB::bind_method(D_METHOD("get_total_character_count"),&RichTextLabel::get_total_character_count); - ClassDB::bind_method(_MD("set_use_bbcode","enable"),&RichTextLabel::set_use_bbcode); - ClassDB::bind_method(_MD("is_using_bbcode"),&RichTextLabel::is_using_bbcode); + ClassDB::bind_method(D_METHOD("set_use_bbcode","enable"),&RichTextLabel::set_use_bbcode); + ClassDB::bind_method(D_METHOD("is_using_bbcode"),&RichTextLabel::is_using_bbcode); ADD_GROUP("BBCode","bbcode_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"bbcode_enabled"),"set_use_bbcode","is_using_bbcode"); diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 8f68dd6921..b2ad74eaa8 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -814,11 +814,11 @@ bool ScrollBar::key(unsigned long p_unicode, unsigned long p_scan_code,bool b.pr void ScrollBar::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&ScrollBar::_gui_input); - ClassDB::bind_method(_MD("set_custom_step","step"),&ScrollBar::set_custom_step); - ClassDB::bind_method(_MD("get_custom_step"),&ScrollBar::get_custom_step); - ClassDB::bind_method(_MD("_drag_slave_input"),&ScrollBar::_drag_slave_input); - ClassDB::bind_method(_MD("_drag_slave_exit"),&ScrollBar::_drag_slave_exit); + ClassDB::bind_method(D_METHOD("_gui_input"),&ScrollBar::_gui_input); + ClassDB::bind_method(D_METHOD("set_custom_step","step"),&ScrollBar::set_custom_step); + ClassDB::bind_method(D_METHOD("get_custom_step"),&ScrollBar::get_custom_step); + ClassDB::bind_method(D_METHOD("_drag_slave_input"),&ScrollBar::_drag_slave_input); + ClassDB::bind_method(D_METHOD("_drag_slave_exit"),&ScrollBar::_drag_slave_exit); ADD_PROPERTY( PropertyInfo(Variant::REAL,"custom_step",PROPERTY_HINT_RANGE,"-1,4096"), "set_custom_step","get_custom_step"); diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 71dcf7a12f..2296c9742d 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -459,17 +459,17 @@ String ScrollContainer::get_configuration_warning() const { void ScrollContainer::_bind_methods() { - ClassDB::bind_method(_MD("_scroll_moved"),&ScrollContainer::_scroll_moved); - ClassDB::bind_method(_MD("_gui_input"),&ScrollContainer::_gui_input); - ClassDB::bind_method(_MD("set_enable_h_scroll","enable"),&ScrollContainer::set_enable_h_scroll); - ClassDB::bind_method(_MD("is_h_scroll_enabled"),&ScrollContainer::is_h_scroll_enabled); - ClassDB::bind_method(_MD("set_enable_v_scroll","enable"),&ScrollContainer::set_enable_v_scroll); - ClassDB::bind_method(_MD("is_v_scroll_enabled"),&ScrollContainer::is_v_scroll_enabled); - ClassDB::bind_method(_MD("_update_scrollbar_pos"),&ScrollContainer::_update_scrollbar_pos); - ClassDB::bind_method(_MD("set_h_scroll","val"),&ScrollContainer::set_h_scroll); - ClassDB::bind_method(_MD("get_h_scroll"),&ScrollContainer::get_h_scroll); - ClassDB::bind_method(_MD("set_v_scroll","val"),&ScrollContainer::set_v_scroll); - ClassDB::bind_method(_MD("get_v_scroll"),&ScrollContainer::get_v_scroll); + ClassDB::bind_method(D_METHOD("_scroll_moved"),&ScrollContainer::_scroll_moved); + ClassDB::bind_method(D_METHOD("_gui_input"),&ScrollContainer::_gui_input); + ClassDB::bind_method(D_METHOD("set_enable_h_scroll","enable"),&ScrollContainer::set_enable_h_scroll); + ClassDB::bind_method(D_METHOD("is_h_scroll_enabled"),&ScrollContainer::is_h_scroll_enabled); + ClassDB::bind_method(D_METHOD("set_enable_v_scroll","enable"),&ScrollContainer::set_enable_v_scroll); + ClassDB::bind_method(D_METHOD("is_v_scroll_enabled"),&ScrollContainer::is_v_scroll_enabled); + ClassDB::bind_method(D_METHOD("_update_scrollbar_pos"),&ScrollContainer::_update_scrollbar_pos); + ClassDB::bind_method(D_METHOD("set_h_scroll","val"),&ScrollContainer::set_h_scroll); + ClassDB::bind_method(D_METHOD("get_h_scroll"),&ScrollContainer::get_h_scroll); + ClassDB::bind_method(D_METHOD("set_v_scroll","val"),&ScrollContainer::set_v_scroll); + ClassDB::bind_method(D_METHOD("get_v_scroll"),&ScrollContainer::get_v_scroll); ADD_GROUP("Scroll","scroll_"); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "scroll_horizontal"), "set_enable_h_scroll","is_h_scroll_enabled"); diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp index e36287246e..a6d6864b16 100644 --- a/scene/gui/slider.cpp +++ b/scene/gui/slider.cpp @@ -235,12 +235,12 @@ void Slider::set_ticks_on_borders(bool _tob){ void Slider::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&Slider::_gui_input); - ClassDB::bind_method(_MD("set_ticks","count"),&Slider::set_ticks); - ClassDB::bind_method(_MD("get_ticks"),&Slider::get_ticks); + ClassDB::bind_method(D_METHOD("_gui_input"),&Slider::_gui_input); + ClassDB::bind_method(D_METHOD("set_ticks","count"),&Slider::set_ticks); + ClassDB::bind_method(D_METHOD("get_ticks"),&Slider::get_ticks); - ClassDB::bind_method(_MD("get_ticks_on_borders"),&Slider::get_ticks_on_borders); - ClassDB::bind_method(_MD("set_ticks_on_borders","ticks_on_border"),&Slider::set_ticks_on_borders); + ClassDB::bind_method(D_METHOD("get_ticks_on_borders"),&Slider::get_ticks_on_borders); + ClassDB::bind_method(D_METHOD("set_ticks_on_borders","ticks_on_border"),&Slider::set_ticks_on_borders); ADD_PROPERTY( PropertyInfo( Variant::INT, "tick_count", PROPERTY_HINT_RANGE,"0,4096,1"), "set_ticks", "get_ticks") ; ADD_PROPERTY( PropertyInfo( Variant::BOOL, "ticks_on_borders" ), "set_ticks_on_borders", "get_ticks_on_borders") ; diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 1554f16c4d..2ad1f385db 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -253,19 +253,19 @@ bool SpinBox::is_editable() const { void SpinBox::_bind_methods() { - //ClassDB::bind_method(_MD("_value_changed"),&SpinBox::_value_changed); - ClassDB::bind_method(_MD("_gui_input"),&SpinBox::_gui_input); - ClassDB::bind_method(_MD("_text_entered"),&SpinBox::_text_entered); - ClassDB::bind_method(_MD("set_suffix","suffix"),&SpinBox::set_suffix); - ClassDB::bind_method(_MD("get_suffix"),&SpinBox::get_suffix); - ClassDB::bind_method(_MD("set_prefix","prefix"),&SpinBox::set_prefix); - ClassDB::bind_method(_MD("get_prefix"),&SpinBox::get_prefix); - ClassDB::bind_method(_MD("set_editable","editable"),&SpinBox::set_editable); - ClassDB::bind_method(_MD("is_editable"),&SpinBox::is_editable); - ClassDB::bind_method(_MD("_line_edit_focus_exit"),&SpinBox::_line_edit_focus_exit); - ClassDB::bind_method(_MD("get_line_edit"),&SpinBox::get_line_edit); - ClassDB::bind_method(_MD("_line_edit_input"),&SpinBox::_line_edit_input); - ClassDB::bind_method(_MD("_range_click_timeout"),&SpinBox::_range_click_timeout); + //ClassDB::bind_method(D_METHOD("_value_changed"),&SpinBox::_value_changed); + ClassDB::bind_method(D_METHOD("_gui_input"),&SpinBox::_gui_input); + ClassDB::bind_method(D_METHOD("_text_entered"),&SpinBox::_text_entered); + ClassDB::bind_method(D_METHOD("set_suffix","suffix"),&SpinBox::set_suffix); + ClassDB::bind_method(D_METHOD("get_suffix"),&SpinBox::get_suffix); + ClassDB::bind_method(D_METHOD("set_prefix","prefix"),&SpinBox::set_prefix); + ClassDB::bind_method(D_METHOD("get_prefix"),&SpinBox::get_prefix); + ClassDB::bind_method(D_METHOD("set_editable","editable"),&SpinBox::set_editable); + ClassDB::bind_method(D_METHOD("is_editable"),&SpinBox::is_editable); + ClassDB::bind_method(D_METHOD("_line_edit_focus_exit"),&SpinBox::_line_edit_focus_exit); + ClassDB::bind_method(D_METHOD("get_line_edit"),&SpinBox::get_line_edit); + ClassDB::bind_method(D_METHOD("_line_edit_input"),&SpinBox::_line_edit_input); + ClassDB::bind_method(D_METHOD("_range_click_timeout"),&SpinBox::_range_click_timeout); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"editable"),"set_editable","is_editable"); diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index b47e12e261..14ea96a4e6 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -422,15 +422,15 @@ bool SplitContainer::is_collapsed() const { void SplitContainer::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SplitContainer::_gui_input); - ClassDB::bind_method(_MD("set_split_offset","offset"),&SplitContainer::set_split_offset); - ClassDB::bind_method(_MD("get_split_offset"),&SplitContainer::get_split_offset); + ClassDB::bind_method(D_METHOD("_gui_input"),&SplitContainer::_gui_input); + ClassDB::bind_method(D_METHOD("set_split_offset","offset"),&SplitContainer::set_split_offset); + ClassDB::bind_method(D_METHOD("get_split_offset"),&SplitContainer::get_split_offset); - ClassDB::bind_method(_MD("set_collapsed","collapsed"),&SplitContainer::set_collapsed); - ClassDB::bind_method(_MD("is_collapsed"),&SplitContainer::is_collapsed); + ClassDB::bind_method(D_METHOD("set_collapsed","collapsed"),&SplitContainer::set_collapsed); + ClassDB::bind_method(D_METHOD("is_collapsed"),&SplitContainer::is_collapsed); - ClassDB::bind_method(_MD("set_dragger_visibility","mode"),&SplitContainer::set_dragger_visibility); - ClassDB::bind_method(_MD("get_dragger_visibility"),&SplitContainer::get_dragger_visibility); + ClassDB::bind_method(D_METHOD("set_dragger_visibility","mode"),&SplitContainer::set_dragger_visibility); + ClassDB::bind_method(D_METHOD("get_dragger_visibility"),&SplitContainer::get_dragger_visibility); ADD_SIGNAL( MethodInfo("dragged",PropertyInfo(Variant::INT,"offset"))); diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 7bc0d82a16..a15c9f5e42 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -714,24 +714,24 @@ Popup* TabContainer::get_popup() const { void TabContainer::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&TabContainer::_gui_input); - ClassDB::bind_method(_MD("get_tab_count"),&TabContainer::get_tab_count); - ClassDB::bind_method(_MD("set_current_tab","tab_idx"),&TabContainer::set_current_tab); - ClassDB::bind_method(_MD("get_current_tab"),&TabContainer::get_current_tab); - ClassDB::bind_method(_MD("get_current_tab_control:Control"),&TabContainer::get_current_tab_control); - ClassDB::bind_method(_MD("get_tab_control:Control","idx"),&TabContainer::get_tab_control); - ClassDB::bind_method(_MD("set_tab_align","align"),&TabContainer::set_tab_align); - ClassDB::bind_method(_MD("get_tab_align"),&TabContainer::get_tab_align); - ClassDB::bind_method(_MD("set_tabs_visible","visible"),&TabContainer::set_tabs_visible); - ClassDB::bind_method(_MD("are_tabs_visible"),&TabContainer::are_tabs_visible); - ClassDB::bind_method(_MD("set_tab_title","tab_idx","title"),&TabContainer::set_tab_title); - ClassDB::bind_method(_MD("get_tab_title","tab_idx"),&TabContainer::get_tab_title); - ClassDB::bind_method(_MD("set_tab_icon","tab_idx","icon:Texture"),&TabContainer::set_tab_icon); - ClassDB::bind_method(_MD("get_tab_icon:Texture","tab_idx"),&TabContainer::get_tab_icon); - ClassDB::bind_method(_MD("set_popup","popup:Popup"),&TabContainer::set_popup); - ClassDB::bind_method(_MD("get_popup:Popup"),&TabContainer::get_popup); - - ClassDB::bind_method(_MD("_child_renamed_callback"),&TabContainer::_child_renamed_callback); + ClassDB::bind_method(D_METHOD("_gui_input"),&TabContainer::_gui_input); + ClassDB::bind_method(D_METHOD("get_tab_count"),&TabContainer::get_tab_count); + ClassDB::bind_method(D_METHOD("set_current_tab","tab_idx"),&TabContainer::set_current_tab); + ClassDB::bind_method(D_METHOD("get_current_tab"),&TabContainer::get_current_tab); + ClassDB::bind_method(D_METHOD("get_current_tab_control:Control"),&TabContainer::get_current_tab_control); + ClassDB::bind_method(D_METHOD("get_tab_control:Control","idx"),&TabContainer::get_tab_control); + ClassDB::bind_method(D_METHOD("set_tab_align","align"),&TabContainer::set_tab_align); + ClassDB::bind_method(D_METHOD("get_tab_align"),&TabContainer::get_tab_align); + ClassDB::bind_method(D_METHOD("set_tabs_visible","visible"),&TabContainer::set_tabs_visible); + ClassDB::bind_method(D_METHOD("are_tabs_visible"),&TabContainer::are_tabs_visible); + ClassDB::bind_method(D_METHOD("set_tab_title","tab_idx","title"),&TabContainer::set_tab_title); + ClassDB::bind_method(D_METHOD("get_tab_title","tab_idx"),&TabContainer::get_tab_title); + ClassDB::bind_method(D_METHOD("set_tab_icon","tab_idx","icon:Texture"),&TabContainer::set_tab_icon); + ClassDB::bind_method(D_METHOD("get_tab_icon:Texture","tab_idx"),&TabContainer::get_tab_icon); + ClassDB::bind_method(D_METHOD("set_popup","popup:Popup"),&TabContainer::set_popup); + ClassDB::bind_method(D_METHOD("get_popup:Popup"),&TabContainer::get_popup); + + ClassDB::bind_method(D_METHOD("_child_renamed_callback"),&TabContainer::_child_renamed_callback); ADD_SIGNAL(MethodInfo("tab_changed",PropertyInfo(Variant::INT,"tab"))); ADD_SIGNAL(MethodInfo("pre_popup_pressed")); diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index cd6d9989a0..ae282165c2 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -649,19 +649,19 @@ void Tabs::set_tab_close_display_policy(CloseButtonDisplayPolicy p_policy) { void Tabs::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&Tabs::_gui_input); - ClassDB::bind_method(_MD("get_tab_count"),&Tabs::get_tab_count); - ClassDB::bind_method(_MD("set_current_tab","tab_idx"),&Tabs::set_current_tab); - ClassDB::bind_method(_MD("get_current_tab"),&Tabs::get_current_tab); - ClassDB::bind_method(_MD("set_tab_title","tab_idx","title"),&Tabs::set_tab_title); - ClassDB::bind_method(_MD("get_tab_title","tab_idx"),&Tabs::get_tab_title); - ClassDB::bind_method(_MD("set_tab_icon","tab_idx","icon:Texture"),&Tabs::set_tab_icon); - ClassDB::bind_method(_MD("get_tab_icon:Texture","tab_idx"),&Tabs::get_tab_icon); - ClassDB::bind_method(_MD("remove_tab","tab_idx"),&Tabs::remove_tab); - ClassDB::bind_method(_MD("add_tab","title","icon:Texture"),&Tabs::add_tab); - ClassDB::bind_method(_MD("set_tab_align","align"),&Tabs::set_tab_align); - ClassDB::bind_method(_MD("get_tab_align"),&Tabs::get_tab_align); - ClassDB::bind_method(_MD("ensure_tab_visible","idx"),&Tabs::ensure_tab_visible); + ClassDB::bind_method(D_METHOD("_gui_input"),&Tabs::_gui_input); + ClassDB::bind_method(D_METHOD("get_tab_count"),&Tabs::get_tab_count); + ClassDB::bind_method(D_METHOD("set_current_tab","tab_idx"),&Tabs::set_current_tab); + ClassDB::bind_method(D_METHOD("get_current_tab"),&Tabs::get_current_tab); + ClassDB::bind_method(D_METHOD("set_tab_title","tab_idx","title"),&Tabs::set_tab_title); + ClassDB::bind_method(D_METHOD("get_tab_title","tab_idx"),&Tabs::get_tab_title); + ClassDB::bind_method(D_METHOD("set_tab_icon","tab_idx","icon:Texture"),&Tabs::set_tab_icon); + ClassDB::bind_method(D_METHOD("get_tab_icon:Texture","tab_idx"),&Tabs::get_tab_icon); + ClassDB::bind_method(D_METHOD("remove_tab","tab_idx"),&Tabs::remove_tab); + ClassDB::bind_method(D_METHOD("add_tab","title","icon:Texture"),&Tabs::add_tab); + ClassDB::bind_method(D_METHOD("set_tab_align","align"),&Tabs::set_tab_align); + ClassDB::bind_method(D_METHOD("get_tab_align"),&Tabs::get_tab_align); + ClassDB::bind_method(D_METHOD("ensure_tab_visible","idx"),&Tabs::ensure_tab_visible); ADD_SIGNAL(MethodInfo("tab_changed",PropertyInfo(Variant::INT,"tab"))); ADD_SIGNAL(MethodInfo("right_button_pressed",PropertyInfo(Variant::INT,"tab"))); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 75764a37ea..cacb79268c 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4620,80 +4620,80 @@ PopupMenu *TextEdit::get_menu() const { void TextEdit::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&TextEdit::_gui_input); - ClassDB::bind_method(_MD("_scroll_moved"),&TextEdit::_scroll_moved); - ClassDB::bind_method(_MD("_cursor_changed_emit"),&TextEdit::_cursor_changed_emit); - ClassDB::bind_method(_MD("_text_changed_emit"),&TextEdit::_text_changed_emit); - ClassDB::bind_method(_MD("_push_current_op"),&TextEdit::_push_current_op); - ClassDB::bind_method(_MD("_click_selection_held"),&TextEdit::_click_selection_held); - ClassDB::bind_method(_MD("_toggle_draw_caret"),&TextEdit::_toggle_draw_caret); + ClassDB::bind_method(D_METHOD("_gui_input"),&TextEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_scroll_moved"),&TextEdit::_scroll_moved); + ClassDB::bind_method(D_METHOD("_cursor_changed_emit"),&TextEdit::_cursor_changed_emit); + ClassDB::bind_method(D_METHOD("_text_changed_emit"),&TextEdit::_text_changed_emit); + ClassDB::bind_method(D_METHOD("_push_current_op"),&TextEdit::_push_current_op); + ClassDB::bind_method(D_METHOD("_click_selection_held"),&TextEdit::_click_selection_held); + ClassDB::bind_method(D_METHOD("_toggle_draw_caret"),&TextEdit::_toggle_draw_caret); BIND_CONSTANT( SEARCH_MATCH_CASE ); BIND_CONSTANT( SEARCH_WHOLE_WORDS ); BIND_CONSTANT( SEARCH_BACKWARDS ); /* - ClassDB::bind_method(_MD("delete_char"),&TextEdit::delete_char); - ClassDB::bind_method(_MD("delete_line"),&TextEdit::delete_line); + ClassDB::bind_method(D_METHOD("delete_char"),&TextEdit::delete_char); + ClassDB::bind_method(D_METHOD("delete_line"),&TextEdit::delete_line); */ - ClassDB::bind_method(_MD("set_text","text"),&TextEdit::set_text); - ClassDB::bind_method(_MD("insert_text_at_cursor","text"),&TextEdit::insert_text_at_cursor); - - ClassDB::bind_method(_MD("get_line_count"),&TextEdit::get_line_count); - ClassDB::bind_method(_MD("get_text"),&TextEdit::get_text); - ClassDB::bind_method(_MD("get_line","line"),&TextEdit::get_line); - - ClassDB::bind_method(_MD("cursor_set_column","column","adjust_viewport"),&TextEdit::cursor_set_column,DEFVAL(false)); - ClassDB::bind_method(_MD("cursor_set_line","line","adjust_viewport"),&TextEdit::cursor_set_line,DEFVAL(false)); - - ClassDB::bind_method(_MD("cursor_get_column"),&TextEdit::cursor_get_column); - ClassDB::bind_method(_MD("cursor_get_line"),&TextEdit::cursor_get_line); - ClassDB::bind_method(_MD("cursor_set_blink_enabled", "enable"),&TextEdit::cursor_set_blink_enabled); - ClassDB::bind_method(_MD("cursor_get_blink_enabled"),&TextEdit::cursor_get_blink_enabled); - ClassDB::bind_method(_MD("cursor_set_blink_speed", "blink_speed"),&TextEdit::cursor_set_blink_speed); - ClassDB::bind_method(_MD("cursor_get_blink_speed"),&TextEdit::cursor_get_blink_speed); - ClassDB::bind_method(_MD("cursor_set_block_mode", "enable"), &TextEdit::cursor_set_block_mode); - ClassDB::bind_method(_MD("cursor_is_block_mode"), &TextEdit::cursor_is_block_mode); - - ClassDB::bind_method(_MD("set_readonly","enable"),&TextEdit::set_readonly); - ClassDB::bind_method(_MD("set_wrap","enable"),&TextEdit::set_wrap); - ClassDB::bind_method(_MD("set_max_chars","amount"),&TextEdit::set_max_chars); - - ClassDB::bind_method(_MD("cut"),&TextEdit::cut); - ClassDB::bind_method(_MD("copy"),&TextEdit::copy); - ClassDB::bind_method(_MD("paste"),&TextEdit::paste); - ClassDB::bind_method(_MD("select_all"),&TextEdit::select_all); - ClassDB::bind_method(_MD("select","from_line","from_column","to_line","to_column"),&TextEdit::select); - - ClassDB::bind_method(_MD("is_selection_active"),&TextEdit::is_selection_active); - ClassDB::bind_method(_MD("get_selection_from_line"),&TextEdit::get_selection_from_line); - ClassDB::bind_method(_MD("get_selection_from_column"),&TextEdit::get_selection_from_column); - ClassDB::bind_method(_MD("get_selection_to_line"),&TextEdit::get_selection_to_line); - ClassDB::bind_method(_MD("get_selection_to_column"),&TextEdit::get_selection_to_column); - ClassDB::bind_method(_MD("get_selection_text"),&TextEdit::get_selection_text); - ClassDB::bind_method(_MD("get_word_under_cursor"),&TextEdit::get_word_under_cursor); - ClassDB::bind_method(_MD("search","flags","from_line","from_column","to_line","to_column"),&TextEdit::_search_bind); - - ClassDB::bind_method(_MD("undo"),&TextEdit::undo); - ClassDB::bind_method(_MD("redo"),&TextEdit::redo); - ClassDB::bind_method(_MD("clear_undo_history"),&TextEdit::clear_undo_history); - - ClassDB::bind_method(_MD("set_show_line_numbers", "enable"), &TextEdit::set_show_line_numbers); - ClassDB::bind_method(_MD("is_show_line_numbers_enabled"), &TextEdit::is_show_line_numbers_enabled); - - ClassDB::bind_method(_MD("set_highlight_all_occurrences", "enable"), &TextEdit::set_highlight_all_occurrences); - ClassDB::bind_method(_MD("is_highlight_all_occurrences_enabled"), &TextEdit::is_highlight_all_occurrences_enabled); - - ClassDB::bind_method(_MD("set_syntax_coloring","enable"),&TextEdit::set_syntax_coloring); - ClassDB::bind_method(_MD("is_syntax_coloring_enabled"),&TextEdit::is_syntax_coloring_enabled); - - - ClassDB::bind_method(_MD("add_keyword_color","keyword","color"),&TextEdit::add_keyword_color); - ClassDB::bind_method(_MD("add_color_region","begin_key","end_key","color","line_only"),&TextEdit::add_color_region,DEFVAL(false)); - ClassDB::bind_method(_MD("clear_colors"),&TextEdit::clear_colors); - ClassDB::bind_method(_MD("menu_option"),&TextEdit::menu_option); - ClassDB::bind_method(_MD("get_menu:PopupMenu"),&TextEdit::get_menu); + ClassDB::bind_method(D_METHOD("set_text","text"),&TextEdit::set_text); + ClassDB::bind_method(D_METHOD("insert_text_at_cursor","text"),&TextEdit::insert_text_at_cursor); + + ClassDB::bind_method(D_METHOD("get_line_count"),&TextEdit::get_line_count); + ClassDB::bind_method(D_METHOD("get_text"),&TextEdit::get_text); + ClassDB::bind_method(D_METHOD("get_line","line"),&TextEdit::get_line); + + ClassDB::bind_method(D_METHOD("cursor_set_column","column","adjust_viewport"),&TextEdit::cursor_set_column,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("cursor_set_line","line","adjust_viewport"),&TextEdit::cursor_set_line,DEFVAL(false)); + + ClassDB::bind_method(D_METHOD("cursor_get_column"),&TextEdit::cursor_get_column); + ClassDB::bind_method(D_METHOD("cursor_get_line"),&TextEdit::cursor_get_line); + ClassDB::bind_method(D_METHOD("cursor_set_blink_enabled", "enable"),&TextEdit::cursor_set_blink_enabled); + ClassDB::bind_method(D_METHOD("cursor_get_blink_enabled"),&TextEdit::cursor_get_blink_enabled); + ClassDB::bind_method(D_METHOD("cursor_set_blink_speed", "blink_speed"),&TextEdit::cursor_set_blink_speed); + ClassDB::bind_method(D_METHOD("cursor_get_blink_speed"),&TextEdit::cursor_get_blink_speed); + ClassDB::bind_method(D_METHOD("cursor_set_block_mode", "enable"), &TextEdit::cursor_set_block_mode); + ClassDB::bind_method(D_METHOD("cursor_is_block_mode"), &TextEdit::cursor_is_block_mode); + + ClassDB::bind_method(D_METHOD("set_readonly","enable"),&TextEdit::set_readonly); + ClassDB::bind_method(D_METHOD("set_wrap","enable"),&TextEdit::set_wrap); + ClassDB::bind_method(D_METHOD("set_max_chars","amount"),&TextEdit::set_max_chars); + + ClassDB::bind_method(D_METHOD("cut"),&TextEdit::cut); + ClassDB::bind_method(D_METHOD("copy"),&TextEdit::copy); + ClassDB::bind_method(D_METHOD("paste"),&TextEdit::paste); + ClassDB::bind_method(D_METHOD("select_all"),&TextEdit::select_all); + ClassDB::bind_method(D_METHOD("select","from_line","from_column","to_line","to_column"),&TextEdit::select); + + ClassDB::bind_method(D_METHOD("is_selection_active"),&TextEdit::is_selection_active); + ClassDB::bind_method(D_METHOD("get_selection_from_line"),&TextEdit::get_selection_from_line); + ClassDB::bind_method(D_METHOD("get_selection_from_column"),&TextEdit::get_selection_from_column); + ClassDB::bind_method(D_METHOD("get_selection_to_line"),&TextEdit::get_selection_to_line); + ClassDB::bind_method(D_METHOD("get_selection_to_column"),&TextEdit::get_selection_to_column); + ClassDB::bind_method(D_METHOD("get_selection_text"),&TextEdit::get_selection_text); + ClassDB::bind_method(D_METHOD("get_word_under_cursor"),&TextEdit::get_word_under_cursor); + ClassDB::bind_method(D_METHOD("search","flags","from_line","from_column","to_line","to_column"),&TextEdit::_search_bind); + + ClassDB::bind_method(D_METHOD("undo"),&TextEdit::undo); + ClassDB::bind_method(D_METHOD("redo"),&TextEdit::redo); + ClassDB::bind_method(D_METHOD("clear_undo_history"),&TextEdit::clear_undo_history); + + ClassDB::bind_method(D_METHOD("set_show_line_numbers", "enable"), &TextEdit::set_show_line_numbers); + ClassDB::bind_method(D_METHOD("is_show_line_numbers_enabled"), &TextEdit::is_show_line_numbers_enabled); + + ClassDB::bind_method(D_METHOD("set_highlight_all_occurrences", "enable"), &TextEdit::set_highlight_all_occurrences); + ClassDB::bind_method(D_METHOD("is_highlight_all_occurrences_enabled"), &TextEdit::is_highlight_all_occurrences_enabled); + + ClassDB::bind_method(D_METHOD("set_syntax_coloring","enable"),&TextEdit::set_syntax_coloring); + ClassDB::bind_method(D_METHOD("is_syntax_coloring_enabled"),&TextEdit::is_syntax_coloring_enabled); + + + ClassDB::bind_method(D_METHOD("add_keyword_color","keyword","color"),&TextEdit::add_keyword_color); + ClassDB::bind_method(D_METHOD("add_color_region","begin_key","end_key","color","line_only"),&TextEdit::add_color_region,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("clear_colors"),&TextEdit::clear_colors); + ClassDB::bind_method(D_METHOD("menu_option"),&TextEdit::menu_option); + ClassDB::bind_method(D_METHOD("get_menu:PopupMenu"),&TextEdit::get_menu); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "syntax_highlighting"), "set_syntax_coloring", "is_syntax_coloring_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_line_numbers"), "set_show_line_numbers", "is_show_line_numbers_enabled"); diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index af7d70e565..ada1021a9d 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -181,23 +181,23 @@ void TextureButton::_notification(int p_what) { void TextureButton::_bind_methods() { - ClassDB::bind_method(_MD("set_normal_texture","texture:Texture"),&TextureButton::set_normal_texture); - ClassDB::bind_method(_MD("set_pressed_texture","texture:Texture"),&TextureButton::set_pressed_texture); - ClassDB::bind_method(_MD("set_hover_texture","texture:Texture"),&TextureButton::set_hover_texture); - ClassDB::bind_method(_MD("set_disabled_texture","texture:Texture"),&TextureButton::set_disabled_texture); - ClassDB::bind_method(_MD("set_focused_texture","texture:Texture"),&TextureButton::set_focused_texture); - ClassDB::bind_method(_MD("set_click_mask","mask:BitMap"),&TextureButton::set_click_mask); - ClassDB::bind_method(_MD("set_expand","p_expand"),&TextureButton::set_expand); - ClassDB::bind_method(_MD("set_stretch_mode","p_mode"),&TextureButton::set_stretch_mode); - - ClassDB::bind_method(_MD("get_normal_texture:Texture"),&TextureButton::get_normal_texture); - ClassDB::bind_method(_MD("get_pressed_texture:Texture"),&TextureButton::get_pressed_texture); - ClassDB::bind_method(_MD("get_hover_texture:Texture"),&TextureButton::get_hover_texture); - ClassDB::bind_method(_MD("get_disabled_texture:Texture"),&TextureButton::get_disabled_texture); - ClassDB::bind_method(_MD("get_focused_texture:Texture"),&TextureButton::get_focused_texture); - ClassDB::bind_method(_MD("get_click_mask:BitMap"),&TextureButton::get_click_mask); - ClassDB::bind_method(_MD("get_expand"),&TextureButton::get_expand); - ClassDB::bind_method(_MD("get_stretch_mode"),&TextureButton::get_stretch_mode); + ClassDB::bind_method(D_METHOD("set_normal_texture","texture:Texture"),&TextureButton::set_normal_texture); + ClassDB::bind_method(D_METHOD("set_pressed_texture","texture:Texture"),&TextureButton::set_pressed_texture); + ClassDB::bind_method(D_METHOD("set_hover_texture","texture:Texture"),&TextureButton::set_hover_texture); + ClassDB::bind_method(D_METHOD("set_disabled_texture","texture:Texture"),&TextureButton::set_disabled_texture); + ClassDB::bind_method(D_METHOD("set_focused_texture","texture:Texture"),&TextureButton::set_focused_texture); + ClassDB::bind_method(D_METHOD("set_click_mask","mask:BitMap"),&TextureButton::set_click_mask); + ClassDB::bind_method(D_METHOD("set_expand","p_expand"),&TextureButton::set_expand); + ClassDB::bind_method(D_METHOD("set_stretch_mode","p_mode"),&TextureButton::set_stretch_mode); + + ClassDB::bind_method(D_METHOD("get_normal_texture:Texture"),&TextureButton::get_normal_texture); + ClassDB::bind_method(D_METHOD("get_pressed_texture:Texture"),&TextureButton::get_pressed_texture); + ClassDB::bind_method(D_METHOD("get_hover_texture:Texture"),&TextureButton::get_hover_texture); + ClassDB::bind_method(D_METHOD("get_disabled_texture:Texture"),&TextureButton::get_disabled_texture); + ClassDB::bind_method(D_METHOD("get_focused_texture:Texture"),&TextureButton::get_focused_texture); + ClassDB::bind_method(D_METHOD("get_click_mask:BitMap"),&TextureButton::get_click_mask); + ClassDB::bind_method(D_METHOD("get_expand"),&TextureButton::get_expand); + ClassDB::bind_method(D_METHOD("get_stretch_mode"),&TextureButton::get_stretch_mode); ADD_GROUP("Textures","texture_"); ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"texture_normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), "set_normal_texture", "get_normal_texture"); diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp index 20970d3fb9..3897647502 100644 --- a/scene/gui/texture_progress.cpp +++ b/scene/gui/texture_progress.cpp @@ -257,26 +257,26 @@ Point2 TextureProgress::get_radial_center_offset() void TextureProgress::_bind_methods() { - ClassDB::bind_method(_MD("set_under_texture","tex"),&TextureProgress::set_under_texture); - ClassDB::bind_method(_MD("get_under_texture"),&TextureProgress::get_under_texture); + ClassDB::bind_method(D_METHOD("set_under_texture","tex"),&TextureProgress::set_under_texture); + ClassDB::bind_method(D_METHOD("get_under_texture"),&TextureProgress::get_under_texture); - ClassDB::bind_method(_MD("set_progress_texture","tex"),&TextureProgress::set_progress_texture); - ClassDB::bind_method(_MD("get_progress_texture"),&TextureProgress::get_progress_texture); + ClassDB::bind_method(D_METHOD("set_progress_texture","tex"),&TextureProgress::set_progress_texture); + ClassDB::bind_method(D_METHOD("get_progress_texture"),&TextureProgress::get_progress_texture); - ClassDB::bind_method(_MD("set_over_texture","tex"),&TextureProgress::set_over_texture); - ClassDB::bind_method(_MD("get_over_texture"),&TextureProgress::get_over_texture); + ClassDB::bind_method(D_METHOD("set_over_texture","tex"),&TextureProgress::set_over_texture); + ClassDB::bind_method(D_METHOD("get_over_texture"),&TextureProgress::get_over_texture); - ClassDB::bind_method(_MD("set_fill_mode","mode"),&TextureProgress::set_fill_mode); - ClassDB::bind_method(_MD("get_fill_mode"), &TextureProgress::get_fill_mode); + ClassDB::bind_method(D_METHOD("set_fill_mode","mode"),&TextureProgress::set_fill_mode); + ClassDB::bind_method(D_METHOD("get_fill_mode"), &TextureProgress::get_fill_mode); - ClassDB::bind_method(_MD("set_radial_initial_angle","mode"),&TextureProgress::set_radial_initial_angle); - ClassDB::bind_method(_MD("get_radial_initial_angle"), &TextureProgress::get_radial_initial_angle); + ClassDB::bind_method(D_METHOD("set_radial_initial_angle","mode"),&TextureProgress::set_radial_initial_angle); + ClassDB::bind_method(D_METHOD("get_radial_initial_angle"), &TextureProgress::get_radial_initial_angle); - ClassDB::bind_method(_MD("set_radial_center_offset","mode"),&TextureProgress::set_radial_center_offset); - ClassDB::bind_method(_MD("get_radial_center_offset"), &TextureProgress::get_radial_center_offset); + ClassDB::bind_method(D_METHOD("set_radial_center_offset","mode"),&TextureProgress::set_radial_center_offset); + ClassDB::bind_method(D_METHOD("get_radial_center_offset"), &TextureProgress::get_radial_center_offset); - ClassDB::bind_method(_MD("set_fill_degrees","mode"),&TextureProgress::set_fill_degrees); - ClassDB::bind_method(_MD("get_fill_degrees"), &TextureProgress::get_fill_degrees); + ClassDB::bind_method(D_METHOD("set_fill_degrees","mode"),&TextureProgress::set_fill_degrees); + ClassDB::bind_method(D_METHOD("get_fill_degrees"), &TextureProgress::get_fill_degrees); ADD_GROUP("Textures","texture_"); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"texture_under",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),"set_under_texture","get_under_texture"); diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index b943ee9781..f2fe3eae12 100644 --- a/scene/gui/texture_rect.cpp +++ b/scene/gui/texture_rect.cpp @@ -103,12 +103,12 @@ Size2 TextureRect::get_minimum_size() const { void TextureRect::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture"), & TextureRect::set_texture ); - ClassDB::bind_method(_MD("get_texture"), & TextureRect::get_texture ); - ClassDB::bind_method(_MD("set_expand","enable"), & TextureRect::set_expand ); - ClassDB::bind_method(_MD("has_expand"), & TextureRect::has_expand ); - ClassDB::bind_method(_MD("set_stretch_mode","stretch_mode"), & TextureRect::set_stretch_mode ); - ClassDB::bind_method(_MD("get_stretch_mode"), & TextureRect::get_stretch_mode ); + ClassDB::bind_method(D_METHOD("set_texture","texture"), & TextureRect::set_texture ); + ClassDB::bind_method(D_METHOD("get_texture"), & TextureRect::get_texture ); + ClassDB::bind_method(D_METHOD("set_expand","enable"), & TextureRect::set_expand ); + ClassDB::bind_method(D_METHOD("has_expand"), & TextureRect::has_expand ); + ClassDB::bind_method(D_METHOD("set_stretch_mode","stretch_mode"), & TextureRect::set_stretch_mode ); + ClassDB::bind_method(D_METHOD("get_stretch_mode"), & TextureRect::get_stretch_mode ); ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture"); ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "expand" ), "set_expand","has_expand"); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 1a7392f27e..524ef2aae4 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -657,76 +657,76 @@ Color TreeItem::get_custom_bg_color(int p_column) const { void TreeItem::_bind_methods() { - ClassDB::bind_method(_MD("set_cell_mode","column","mode"),&TreeItem::set_cell_mode); - ClassDB::bind_method(_MD("get_cell_mode","column"),&TreeItem::get_cell_mode); + ClassDB::bind_method(D_METHOD("set_cell_mode","column","mode"),&TreeItem::set_cell_mode); + ClassDB::bind_method(D_METHOD("get_cell_mode","column"),&TreeItem::get_cell_mode); - ClassDB::bind_method(_MD("set_checked","column","checked"),&TreeItem::set_checked); - ClassDB::bind_method(_MD("is_checked","column"),&TreeItem::is_checked); + ClassDB::bind_method(D_METHOD("set_checked","column","checked"),&TreeItem::set_checked); + ClassDB::bind_method(D_METHOD("is_checked","column"),&TreeItem::is_checked); - ClassDB::bind_method(_MD("set_text","column","text"),&TreeItem::set_text); - ClassDB::bind_method(_MD("get_text","column"),&TreeItem::get_text); + ClassDB::bind_method(D_METHOD("set_text","column","text"),&TreeItem::set_text); + ClassDB::bind_method(D_METHOD("get_text","column"),&TreeItem::get_text); - ClassDB::bind_method(_MD("set_icon","column","texture:Texture"),&TreeItem::set_icon); - ClassDB::bind_method(_MD("get_icon:Texture","column"),&TreeItem::get_icon); + ClassDB::bind_method(D_METHOD("set_icon","column","texture:Texture"),&TreeItem::set_icon); + ClassDB::bind_method(D_METHOD("get_icon:Texture","column"),&TreeItem::get_icon); - ClassDB::bind_method(_MD("set_icon_region","column","region"),&TreeItem::set_icon_region); - ClassDB::bind_method(_MD("get_icon_region","column"),&TreeItem::get_icon_region); + ClassDB::bind_method(D_METHOD("set_icon_region","column","region"),&TreeItem::set_icon_region); + ClassDB::bind_method(D_METHOD("get_icon_region","column"),&TreeItem::get_icon_region); - ClassDB::bind_method(_MD("set_icon_max_width","column","width"),&TreeItem::set_icon_max_width); - ClassDB::bind_method(_MD("get_icon_max_width","column"),&TreeItem::get_icon_max_width); + ClassDB::bind_method(D_METHOD("set_icon_max_width","column","width"),&TreeItem::set_icon_max_width); + ClassDB::bind_method(D_METHOD("get_icon_max_width","column"),&TreeItem::get_icon_max_width); - ClassDB::bind_method(_MD("set_range","column","value"),&TreeItem::set_range); - ClassDB::bind_method(_MD("get_range","column"),&TreeItem::get_range); - ClassDB::bind_method(_MD("set_range_config","column","min","max","step","expr"),&TreeItem::set_range_config,DEFVAL(false)); - ClassDB::bind_method(_MD("get_range_config","column"),&TreeItem::_get_range_config); + ClassDB::bind_method(D_METHOD("set_range","column","value"),&TreeItem::set_range); + ClassDB::bind_method(D_METHOD("get_range","column"),&TreeItem::get_range); + ClassDB::bind_method(D_METHOD("set_range_config","column","min","max","step","expr"),&TreeItem::set_range_config,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_range_config","column"),&TreeItem::_get_range_config); - ClassDB::bind_method(_MD("set_metadata","column","meta"),&TreeItem::set_metadata); - ClassDB::bind_method(_MD("get_metadata","column"),&TreeItem::get_metadata); + ClassDB::bind_method(D_METHOD("set_metadata","column","meta"),&TreeItem::set_metadata); + ClassDB::bind_method(D_METHOD("get_metadata","column"),&TreeItem::get_metadata); - ClassDB::bind_method(_MD("set_custom_draw","column","object","callback"),&TreeItem::set_custom_draw); + ClassDB::bind_method(D_METHOD("set_custom_draw","column","object","callback"),&TreeItem::set_custom_draw); - ClassDB::bind_method(_MD("set_collapsed","enable"),&TreeItem::set_collapsed); - ClassDB::bind_method(_MD("is_collapsed"),&TreeItem::is_collapsed); + ClassDB::bind_method(D_METHOD("set_collapsed","enable"),&TreeItem::set_collapsed); + ClassDB::bind_method(D_METHOD("is_collapsed"),&TreeItem::is_collapsed); - ClassDB::bind_method(_MD("get_next:TreeItem"),&TreeItem::get_next); - ClassDB::bind_method(_MD("get_prev:TreeItem"),&TreeItem::get_prev); - ClassDB::bind_method(_MD("get_parent:TreeItem"),&TreeItem::get_parent); - ClassDB::bind_method(_MD("get_children:TreeItem"),&TreeItem::get_children); + ClassDB::bind_method(D_METHOD("get_next:TreeItem"),&TreeItem::get_next); + ClassDB::bind_method(D_METHOD("get_prev:TreeItem"),&TreeItem::get_prev); + ClassDB::bind_method(D_METHOD("get_parent:TreeItem"),&TreeItem::get_parent); + ClassDB::bind_method(D_METHOD("get_children:TreeItem"),&TreeItem::get_children); - ClassDB::bind_method(_MD("get_next_visible:TreeItem"),&TreeItem::get_next_visible); - ClassDB::bind_method(_MD("get_prev_visible:TreeItem"),&TreeItem::get_prev_visible); + ClassDB::bind_method(D_METHOD("get_next_visible:TreeItem"),&TreeItem::get_next_visible); + ClassDB::bind_method(D_METHOD("get_prev_visible:TreeItem"),&TreeItem::get_prev_visible); - ClassDB::bind_method(_MD("remove_child:TreeItem","child"),&TreeItem::_remove_child); + ClassDB::bind_method(D_METHOD("remove_child:TreeItem","child"),&TreeItem::_remove_child); - ClassDB::bind_method(_MD("set_selectable","column","selectable"),&TreeItem::set_selectable); - ClassDB::bind_method(_MD("is_selectable","column"),&TreeItem::is_selectable); + ClassDB::bind_method(D_METHOD("set_selectable","column","selectable"),&TreeItem::set_selectable); + ClassDB::bind_method(D_METHOD("is_selectable","column"),&TreeItem::is_selectable); - ClassDB::bind_method(_MD("is_selected","column"),&TreeItem::is_selected); - ClassDB::bind_method(_MD("select","column"),&TreeItem::select); - ClassDB::bind_method(_MD("deselect","column"),&TreeItem::deselect); + ClassDB::bind_method(D_METHOD("is_selected","column"),&TreeItem::is_selected); + ClassDB::bind_method(D_METHOD("select","column"),&TreeItem::select); + ClassDB::bind_method(D_METHOD("deselect","column"),&TreeItem::deselect); - ClassDB::bind_method(_MD("set_editable","column","enabled"),&TreeItem::set_editable); - ClassDB::bind_method(_MD("is_editable","column"),&TreeItem::is_editable); + ClassDB::bind_method(D_METHOD("set_editable","column","enabled"),&TreeItem::set_editable); + ClassDB::bind_method(D_METHOD("is_editable","column"),&TreeItem::is_editable); - ClassDB::bind_method(_MD("set_custom_color","column","color"),&TreeItem::set_custom_color); - ClassDB::bind_method(_MD("clear_custom_color","column"),&TreeItem::clear_custom_color); + ClassDB::bind_method(D_METHOD("set_custom_color","column","color"),&TreeItem::set_custom_color); + ClassDB::bind_method(D_METHOD("clear_custom_color","column"),&TreeItem::clear_custom_color); - ClassDB::bind_method(_MD("set_custom_bg_color","column","color","just_outline"),&TreeItem::set_custom_bg_color,DEFVAL(false)); - ClassDB::bind_method(_MD("clear_custom_bg_color","column"),&TreeItem::clear_custom_bg_color); - ClassDB::bind_method(_MD("get_custom_bg_color","column"),&TreeItem::get_custom_bg_color); + ClassDB::bind_method(D_METHOD("set_custom_bg_color","column","color","just_outline"),&TreeItem::set_custom_bg_color,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("clear_custom_bg_color","column"),&TreeItem::clear_custom_bg_color); + ClassDB::bind_method(D_METHOD("get_custom_bg_color","column"),&TreeItem::get_custom_bg_color); - ClassDB::bind_method(_MD("add_button","column","button:Texture","button_idx","disabled"),&TreeItem::add_button,DEFVAL(-1),DEFVAL(false)); - ClassDB::bind_method(_MD("get_button_count","column"),&TreeItem::get_button_count); - ClassDB::bind_method(_MD("get_button:Texture","column","button_idx"),&TreeItem::get_button); - ClassDB::bind_method(_MD("set_button","column","button_idx","button:Texture"),&TreeItem::set_button); - ClassDB::bind_method(_MD("erase_button","column","button_idx"),&TreeItem::erase_button); - ClassDB::bind_method(_MD("is_button_disabled","column","button_idx"),&TreeItem::is_button_disabled); + ClassDB::bind_method(D_METHOD("add_button","column","button:Texture","button_idx","disabled"),&TreeItem::add_button,DEFVAL(-1),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_button_count","column"),&TreeItem::get_button_count); + ClassDB::bind_method(D_METHOD("get_button:Texture","column","button_idx"),&TreeItem::get_button); + ClassDB::bind_method(D_METHOD("set_button","column","button_idx","button:Texture"),&TreeItem::set_button); + ClassDB::bind_method(D_METHOD("erase_button","column","button_idx"),&TreeItem::erase_button); + ClassDB::bind_method(D_METHOD("is_button_disabled","column","button_idx"),&TreeItem::is_button_disabled); - ClassDB::bind_method(_MD("set_tooltip","column","tooltip"),&TreeItem::set_tooltip); - ClassDB::bind_method(_MD("get_tooltip","column"),&TreeItem::get_tooltip); + ClassDB::bind_method(D_METHOD("set_tooltip","column","tooltip"),&TreeItem::set_tooltip); + ClassDB::bind_method(D_METHOD("get_tooltip","column"),&TreeItem::get_tooltip); - ClassDB::bind_method(_MD("move_to_top"),&TreeItem::move_to_top); - ClassDB::bind_method(_MD("move_to_bottom"),&TreeItem::move_to_bottom); + ClassDB::bind_method(D_METHOD("move_to_top"),&TreeItem::move_to_top); + ClassDB::bind_method(D_METHOD("move_to_bottom"),&TreeItem::move_to_bottom); BIND_CONSTANT( CELL_MODE_STRING ); BIND_CONSTANT( CELL_MODE_CHECK ); @@ -3586,59 +3586,59 @@ bool Tree::get_allow_rmb_select() const{ void Tree::_bind_methods() { - ClassDB::bind_method(_MD("_range_click_timeout"),&Tree::_range_click_timeout); - ClassDB::bind_method(_MD("_gui_input"),&Tree::_gui_input); - ClassDB::bind_method(_MD("_popup_select"),&Tree::popup_select); - ClassDB::bind_method(_MD("_text_editor_enter"),&Tree::text_editor_enter); - ClassDB::bind_method(_MD("_text_editor_modal_close"),&Tree::_text_editor_modal_close); - ClassDB::bind_method(_MD("_value_editor_changed"),&Tree::value_editor_changed); - ClassDB::bind_method(_MD("_scroll_moved"),&Tree::_scroll_moved); + ClassDB::bind_method(D_METHOD("_range_click_timeout"),&Tree::_range_click_timeout); + ClassDB::bind_method(D_METHOD("_gui_input"),&Tree::_gui_input); + ClassDB::bind_method(D_METHOD("_popup_select"),&Tree::popup_select); + ClassDB::bind_method(D_METHOD("_text_editor_enter"),&Tree::text_editor_enter); + ClassDB::bind_method(D_METHOD("_text_editor_modal_close"),&Tree::_text_editor_modal_close); + ClassDB::bind_method(D_METHOD("_value_editor_changed"),&Tree::value_editor_changed); + ClassDB::bind_method(D_METHOD("_scroll_moved"),&Tree::_scroll_moved); - ClassDB::bind_method(_MD("clear"),&Tree::clear); - ClassDB::bind_method(_MD("create_item:TreeItem","parent:TreeItem"),&Tree::_create_item,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("clear"),&Tree::clear); + ClassDB::bind_method(D_METHOD("create_item:TreeItem","parent:TreeItem"),&Tree::_create_item,DEFVAL(Variant())); - ClassDB::bind_method(_MD("get_root:TreeItem"),&Tree::get_root); - ClassDB::bind_method(_MD("set_column_min_width","column","min_width"),&Tree::set_column_min_width); - ClassDB::bind_method(_MD("set_column_expand","column","expand"),&Tree::set_column_expand); - ClassDB::bind_method(_MD("get_column_width","column"),&Tree::get_column_width); + ClassDB::bind_method(D_METHOD("get_root:TreeItem"),&Tree::get_root); + ClassDB::bind_method(D_METHOD("set_column_min_width","column","min_width"),&Tree::set_column_min_width); + ClassDB::bind_method(D_METHOD("set_column_expand","column","expand"),&Tree::set_column_expand); + ClassDB::bind_method(D_METHOD("get_column_width","column"),&Tree::get_column_width); - ClassDB::bind_method(_MD("set_hide_root","enable"),&Tree::set_hide_root); - ClassDB::bind_method(_MD("get_next_selected:TreeItem","from:TreeItem"),&Tree::_get_next_selected); - ClassDB::bind_method(_MD("get_selected:TreeItem"),&Tree::get_selected); - ClassDB::bind_method(_MD("get_selected_column"),&Tree::get_selected_column); - ClassDB::bind_method(_MD("get_pressed_button"),&Tree::get_pressed_button); - ClassDB::bind_method(_MD("set_select_mode","mode"),&Tree::set_select_mode); + ClassDB::bind_method(D_METHOD("set_hide_root","enable"),&Tree::set_hide_root); + ClassDB::bind_method(D_METHOD("get_next_selected:TreeItem","from:TreeItem"),&Tree::_get_next_selected); + ClassDB::bind_method(D_METHOD("get_selected:TreeItem"),&Tree::get_selected); + ClassDB::bind_method(D_METHOD("get_selected_column"),&Tree::get_selected_column); + ClassDB::bind_method(D_METHOD("get_pressed_button"),&Tree::get_pressed_button); + ClassDB::bind_method(D_METHOD("set_select_mode","mode"),&Tree::set_select_mode); - ClassDB::bind_method(_MD("set_columns","amount"),&Tree::set_columns); - ClassDB::bind_method(_MD("get_columns"),&Tree::get_columns); + ClassDB::bind_method(D_METHOD("set_columns","amount"),&Tree::set_columns); + ClassDB::bind_method(D_METHOD("get_columns"),&Tree::get_columns); - ClassDB::bind_method(_MD("get_edited:TreeItem"),&Tree::get_edited); - ClassDB::bind_method(_MD("get_edited_column"),&Tree::get_edited_column); - ClassDB::bind_method(_MD("get_custom_popup_rect"),&Tree::get_custom_popup_rect); - ClassDB::bind_method(_MD("get_item_area_rect","item:TreeItem","column"),&Tree::_get_item_rect,DEFVAL(-1)); - ClassDB::bind_method(_MD("get_item_at_pos:TreeItem","pos"),&Tree::get_item_at_pos); - ClassDB::bind_method(_MD("get_column_at_pos","pos"),&Tree::get_column_at_pos); + ClassDB::bind_method(D_METHOD("get_edited:TreeItem"),&Tree::get_edited); + ClassDB::bind_method(D_METHOD("get_edited_column"),&Tree::get_edited_column); + ClassDB::bind_method(D_METHOD("get_custom_popup_rect"),&Tree::get_custom_popup_rect); + ClassDB::bind_method(D_METHOD("get_item_area_rect","item:TreeItem","column"),&Tree::_get_item_rect,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("get_item_at_pos:TreeItem","pos"),&Tree::get_item_at_pos); + ClassDB::bind_method(D_METHOD("get_column_at_pos","pos"),&Tree::get_column_at_pos); - ClassDB::bind_method(_MD("ensure_cursor_is_visible"),&Tree::ensure_cursor_is_visible); + ClassDB::bind_method(D_METHOD("ensure_cursor_is_visible"),&Tree::ensure_cursor_is_visible); - ClassDB::bind_method(_MD("set_column_titles_visible","visible"),&Tree::set_column_titles_visible); - ClassDB::bind_method(_MD("are_column_titles_visible"),&Tree::are_column_titles_visible); + ClassDB::bind_method(D_METHOD("set_column_titles_visible","visible"),&Tree::set_column_titles_visible); + ClassDB::bind_method(D_METHOD("are_column_titles_visible"),&Tree::are_column_titles_visible); - ClassDB::bind_method(_MD("set_column_title","column","title"),&Tree::set_column_title); - ClassDB::bind_method(_MD("get_column_title","column"),&Tree::get_column_title); - ClassDB::bind_method(_MD("get_scroll"),&Tree::get_scroll); + ClassDB::bind_method(D_METHOD("set_column_title","column","title"),&Tree::set_column_title); + ClassDB::bind_method(D_METHOD("get_column_title","column"),&Tree::get_column_title); + ClassDB::bind_method(D_METHOD("get_scroll"),&Tree::get_scroll); - ClassDB::bind_method(_MD("set_hide_folding","hide"),&Tree::set_hide_folding); - ClassDB::bind_method(_MD("is_folding_hidden"),&Tree::is_folding_hidden); + ClassDB::bind_method(D_METHOD("set_hide_folding","hide"),&Tree::set_hide_folding); + ClassDB::bind_method(D_METHOD("is_folding_hidden"),&Tree::is_folding_hidden); - ClassDB::bind_method(_MD("set_drop_mode_flags","flags"),&Tree::set_drop_mode_flags); - ClassDB::bind_method(_MD("get_drop_mode_flags"),&Tree::get_drop_mode_flags); + ClassDB::bind_method(D_METHOD("set_drop_mode_flags","flags"),&Tree::set_drop_mode_flags); + ClassDB::bind_method(D_METHOD("get_drop_mode_flags"),&Tree::get_drop_mode_flags); - ClassDB::bind_method(_MD("set_allow_rmb_select","allow"),&Tree::set_allow_rmb_select); - ClassDB::bind_method(_MD("get_allow_rmb_select"),&Tree::get_allow_rmb_select); + ClassDB::bind_method(D_METHOD("set_allow_rmb_select","allow"),&Tree::set_allow_rmb_select); + ClassDB::bind_method(D_METHOD("get_allow_rmb_select"),&Tree::get_allow_rmb_select); - ClassDB::bind_method(_MD("set_single_select_cell_editing_only_when_already_selected","enable"),&Tree::set_single_select_cell_editing_only_when_already_selected); - ClassDB::bind_method(_MD("get_single_select_cell_editing_only_when_already_selected"),&Tree::get_single_select_cell_editing_only_when_already_selected); + ClassDB::bind_method(D_METHOD("set_single_select_cell_editing_only_when_already_selected","enable"),&Tree::set_single_select_cell_editing_only_when_already_selected); + ClassDB::bind_method(D_METHOD("get_single_select_cell_editing_only_when_already_selected"),&Tree::get_single_select_cell_editing_only_when_already_selected); ADD_SIGNAL( MethodInfo("item_selected")); ADD_SIGNAL( MethodInfo("cell_selected")); diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index ca0032ae61..063ad8c44a 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -358,40 +358,40 @@ bool VideoPlayer::has_autoplay() const { void VideoPlayer::_bind_methods() { - ClassDB::bind_method(_MD("set_stream","stream:VideoStream"),&VideoPlayer::set_stream); - ClassDB::bind_method(_MD("get_stream:VideoStream"),&VideoPlayer::get_stream); + ClassDB::bind_method(D_METHOD("set_stream","stream:VideoStream"),&VideoPlayer::set_stream); + ClassDB::bind_method(D_METHOD("get_stream:VideoStream"),&VideoPlayer::get_stream); - ClassDB::bind_method(_MD("play"),&VideoPlayer::play); - ClassDB::bind_method(_MD("stop"),&VideoPlayer::stop); + ClassDB::bind_method(D_METHOD("play"),&VideoPlayer::play); + ClassDB::bind_method(D_METHOD("stop"),&VideoPlayer::stop); - ClassDB::bind_method(_MD("is_playing"),&VideoPlayer::is_playing); + ClassDB::bind_method(D_METHOD("is_playing"),&VideoPlayer::is_playing); - ClassDB::bind_method(_MD("set_paused","paused"),&VideoPlayer::set_paused); - ClassDB::bind_method(_MD("is_paused"),&VideoPlayer::is_paused); + ClassDB::bind_method(D_METHOD("set_paused","paused"),&VideoPlayer::set_paused); + ClassDB::bind_method(D_METHOD("is_paused"),&VideoPlayer::is_paused); - ClassDB::bind_method(_MD("set_volume","volume"),&VideoPlayer::set_volume); - ClassDB::bind_method(_MD("get_volume"),&VideoPlayer::get_volume); + ClassDB::bind_method(D_METHOD("set_volume","volume"),&VideoPlayer::set_volume); + ClassDB::bind_method(D_METHOD("get_volume"),&VideoPlayer::get_volume); - ClassDB::bind_method(_MD("set_volume_db","db"),&VideoPlayer::set_volume_db); - ClassDB::bind_method(_MD("get_volume_db"),&VideoPlayer::get_volume_db); + ClassDB::bind_method(D_METHOD("set_volume_db","db"),&VideoPlayer::set_volume_db); + ClassDB::bind_method(D_METHOD("get_volume_db"),&VideoPlayer::get_volume_db); - ClassDB::bind_method(_MD("set_audio_track","track"),&VideoPlayer::set_audio_track); - ClassDB::bind_method(_MD("get_audio_track"),&VideoPlayer::get_audio_track); + ClassDB::bind_method(D_METHOD("set_audio_track","track"),&VideoPlayer::set_audio_track); + ClassDB::bind_method(D_METHOD("get_audio_track"),&VideoPlayer::get_audio_track); - ClassDB::bind_method(_MD("get_stream_name"),&VideoPlayer::get_stream_name); + ClassDB::bind_method(D_METHOD("get_stream_name"),&VideoPlayer::get_stream_name); - ClassDB::bind_method(_MD("get_stream_pos"),&VideoPlayer::get_stream_pos); + ClassDB::bind_method(D_METHOD("get_stream_pos"),&VideoPlayer::get_stream_pos); - ClassDB::bind_method(_MD("set_autoplay","enabled"),&VideoPlayer::set_autoplay); - ClassDB::bind_method(_MD("has_autoplay"),&VideoPlayer::has_autoplay); + ClassDB::bind_method(D_METHOD("set_autoplay","enabled"),&VideoPlayer::set_autoplay); + ClassDB::bind_method(D_METHOD("has_autoplay"),&VideoPlayer::has_autoplay); - ClassDB::bind_method(_MD("set_expand","enable"), &VideoPlayer::set_expand ); - ClassDB::bind_method(_MD("has_expand"), &VideoPlayer::has_expand ); + ClassDB::bind_method(D_METHOD("set_expand","enable"), &VideoPlayer::set_expand ); + ClassDB::bind_method(D_METHOD("has_expand"), &VideoPlayer::has_expand ); - ClassDB::bind_method(_MD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec); - ClassDB::bind_method(_MD("get_buffering_msec"),&VideoPlayer::get_buffering_msec); + ClassDB::bind_method(D_METHOD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec); + ClassDB::bind_method(D_METHOD("get_buffering_msec"),&VideoPlayer::get_buffering_msec); - ClassDB::bind_method(_MD("get_video_texture:Texture"), &VideoPlayer::get_video_texture ); + ClassDB::bind_method(D_METHOD("get_video_texture:Texture"), &VideoPlayer::get_video_texture ); ADD_PROPERTY( PropertyInfo(Variant::INT, "audio_track",PROPERTY_HINT_RANGE,"0,128,1"), "set_audio_track", "get_audio_track") ; ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), "set_stream", "get_stream") ; diff --git a/scene/gui/viewport_container.cpp b/scene/gui/viewport_container.cpp index e3ad91ed70..1121ea6029 100644 --- a/scene/gui/viewport_container.cpp +++ b/scene/gui/viewport_container.cpp @@ -91,8 +91,8 @@ void ViewportContainer::_notification(int p_what) { void ViewportContainer::_bind_methods() { - ClassDB::bind_method(_MD("set_stretch","enable"),&ViewportContainer::set_stretch); - ClassDB::bind_method(_MD("is_stretch_enabled"),&ViewportContainer::is_stretch_enabled); + ClassDB::bind_method(D_METHOD("set_stretch","enable"),&ViewportContainer::set_stretch); + ClassDB::bind_method(D_METHOD("is_stretch_enabled"),&ViewportContainer::is_stretch_enabled); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"stretch"),"set_stretch","is_stretch_enabled"); } diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index a20c3d761e..04d72b5a3d 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -259,33 +259,33 @@ int CanvasLayer::get_sort_index() { void CanvasLayer::_bind_methods() { - ClassDB::bind_method(_MD("set_layer","layer"),&CanvasLayer::set_layer); - ClassDB::bind_method(_MD("get_layer"),&CanvasLayer::get_layer); + ClassDB::bind_method(D_METHOD("set_layer","layer"),&CanvasLayer::set_layer); + ClassDB::bind_method(D_METHOD("get_layer"),&CanvasLayer::get_layer); - ClassDB::bind_method(_MD("set_transform","transform"),&CanvasLayer::set_transform); - ClassDB::bind_method(_MD("get_transform"),&CanvasLayer::get_transform); + ClassDB::bind_method(D_METHOD("set_transform","transform"),&CanvasLayer::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"),&CanvasLayer::get_transform); - ClassDB::bind_method(_MD("set_offset","offset"),&CanvasLayer::set_offset); - ClassDB::bind_method(_MD("get_offset"),&CanvasLayer::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&CanvasLayer::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&CanvasLayer::get_offset); - ClassDB::bind_method(_MD("set_rotation","radians"),&CanvasLayer::set_rotation); - ClassDB::bind_method(_MD("get_rotation"),&CanvasLayer::get_rotation); + ClassDB::bind_method(D_METHOD("set_rotation","radians"),&CanvasLayer::set_rotation); + ClassDB::bind_method(D_METHOD("get_rotation"),&CanvasLayer::get_rotation); - ClassDB::bind_method(_MD("set_rotationd","degrees"),&CanvasLayer::set_rotationd); - ClassDB::bind_method(_MD("get_rotationd"),&CanvasLayer::get_rotationd); + ClassDB::bind_method(D_METHOD("set_rotationd","degrees"),&CanvasLayer::set_rotationd); + ClassDB::bind_method(D_METHOD("get_rotationd"),&CanvasLayer::get_rotationd); // TODO: Obsolete those two methods (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_set_rotationd","degrees"),&CanvasLayer::_set_rotationd); - ClassDB::bind_method(_MD("_get_rotationd"),&CanvasLayer::_get_rotationd); + ClassDB::bind_method(D_METHOD("_set_rotationd","degrees"),&CanvasLayer::_set_rotationd); + ClassDB::bind_method(D_METHOD("_get_rotationd"),&CanvasLayer::_get_rotationd); - ClassDB::bind_method(_MD("set_scale","scale"),&CanvasLayer::set_scale); - ClassDB::bind_method(_MD("get_scale"),&CanvasLayer::get_scale); + ClassDB::bind_method(D_METHOD("set_scale","scale"),&CanvasLayer::set_scale); + ClassDB::bind_method(D_METHOD("get_scale"),&CanvasLayer::get_scale); - ClassDB::bind_method(_MD("set_custom_viewport","viewport:Viewport"),&CanvasLayer::set_custom_viewport); - ClassDB::bind_method(_MD("get_custom_viewport:Viewport"),&CanvasLayer::get_custom_viewport); + ClassDB::bind_method(D_METHOD("set_custom_viewport","viewport:Viewport"),&CanvasLayer::set_custom_viewport); + ClassDB::bind_method(D_METHOD("get_custom_viewport:Viewport"),&CanvasLayer::get_custom_viewport); - ClassDB::bind_method(_MD("get_world_2d:World2D"),&CanvasLayer::get_world_2d); - //ClassDB::bind_method(_MD("get_viewport"),&CanvasLayer::get_viewport); + ClassDB::bind_method(D_METHOD("get_world_2d:World2D"),&CanvasLayer::get_world_2d); + //ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasLayer::get_viewport); ADD_PROPERTY( PropertyInfo(Variant::INT,"layer",PROPERTY_HINT_RANGE,"-128,128,1"),"set_layer","get_layer") ; //ADD_PROPERTY( PropertyInfo(Variant::MATRIX32,"transform",PROPERTY_HINT_RANGE),"set_transform","get_transform") ; diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index cbe49c85af..77b08fd58b 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -535,28 +535,28 @@ int HTTPRequest::get_body_size() const{ void HTTPRequest::_bind_methods() { - ClassDB::bind_method(_MD("request","url","custom_headers","ssl_validate_domain","method","request_data"),&HTTPRequest::request,DEFVAL(PoolStringArray()),DEFVAL(true),DEFVAL(HTTPClient::METHOD_GET),DEFVAL(String())); - ClassDB::bind_method(_MD("cancel_request"),&HTTPRequest::cancel_request); + ClassDB::bind_method(D_METHOD("request","url","custom_headers","ssl_validate_domain","method","request_data"),&HTTPRequest::request,DEFVAL(PoolStringArray()),DEFVAL(true),DEFVAL(HTTPClient::METHOD_GET),DEFVAL(String())); + ClassDB::bind_method(D_METHOD("cancel_request"),&HTTPRequest::cancel_request); - ClassDB::bind_method(_MD("get_http_client_status"),&HTTPRequest::get_http_client_status); + ClassDB::bind_method(D_METHOD("get_http_client_status"),&HTTPRequest::get_http_client_status); - ClassDB::bind_method(_MD("set_use_threads","enable"),&HTTPRequest::set_use_threads); - ClassDB::bind_method(_MD("is_using_threads"),&HTTPRequest::is_using_threads); + ClassDB::bind_method(D_METHOD("set_use_threads","enable"),&HTTPRequest::set_use_threads); + ClassDB::bind_method(D_METHOD("is_using_threads"),&HTTPRequest::is_using_threads); - ClassDB::bind_method(_MD("set_body_size_limit","bytes"),&HTTPRequest::set_body_size_limit); - ClassDB::bind_method(_MD("get_body_size_limit"),&HTTPRequest::get_body_size_limit); + ClassDB::bind_method(D_METHOD("set_body_size_limit","bytes"),&HTTPRequest::set_body_size_limit); + ClassDB::bind_method(D_METHOD("get_body_size_limit"),&HTTPRequest::get_body_size_limit); - ClassDB::bind_method(_MD("set_max_redirects","amount"),&HTTPRequest::set_max_redirects); - ClassDB::bind_method(_MD("get_max_redirects"),&HTTPRequest::get_max_redirects); + ClassDB::bind_method(D_METHOD("set_max_redirects","amount"),&HTTPRequest::set_max_redirects); + ClassDB::bind_method(D_METHOD("get_max_redirects"),&HTTPRequest::get_max_redirects); - ClassDB::bind_method(_MD("set_download_file","path"),&HTTPRequest::set_download_file); - ClassDB::bind_method(_MD("get_download_file"),&HTTPRequest::get_download_file); + ClassDB::bind_method(D_METHOD("set_download_file","path"),&HTTPRequest::set_download_file); + ClassDB::bind_method(D_METHOD("get_download_file"),&HTTPRequest::get_download_file); - ClassDB::bind_method(_MD("get_downloaded_bytes"),&HTTPRequest::get_downloaded_bytes); - ClassDB::bind_method(_MD("get_body_size"),&HTTPRequest::get_body_size); + ClassDB::bind_method(D_METHOD("get_downloaded_bytes"),&HTTPRequest::get_downloaded_bytes); + ClassDB::bind_method(D_METHOD("get_body_size"),&HTTPRequest::get_body_size); - ClassDB::bind_method(_MD("_redirect_request"),&HTTPRequest::_redirect_request); - ClassDB::bind_method(_MD("_request_done"),&HTTPRequest::_request_done); + ClassDB::bind_method(D_METHOD("_redirect_request"),&HTTPRequest::_redirect_request); + ClassDB::bind_method(D_METHOD("_request_done"),&HTTPRequest::_request_done); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"use_threads"),"set_use_threads","is_using_threads"); ADD_PROPERTY(PropertyInfo(Variant::INT,"body_size_limit",PROPERTY_HINT_RANGE,"-1,2000000000"),"set_body_size_limit","get_body_size_limit"); diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp index 5d1b0495c0..935811009b 100644 --- a/scene/main/instance_placeholder.cpp +++ b/scene/main/instance_placeholder.cpp @@ -122,9 +122,9 @@ Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) { void InstancePlaceholder::_bind_methods() { - ClassDB::bind_method(_MD("get_stored_values","with_order"),&InstancePlaceholder::get_stored_values,DEFVAL(false)); - ClassDB::bind_method(_MD("replace_by_instance","custom_scene:PackedScene"),&InstancePlaceholder::replace_by_instance,DEFVAL(Variant())); - ClassDB::bind_method(_MD("get_instance_path"),&InstancePlaceholder::get_instance_path); + ClassDB::bind_method(D_METHOD("get_stored_values","with_order"),&InstancePlaceholder::get_stored_values,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("replace_by_instance","custom_scene:PackedScene"),&InstancePlaceholder::replace_by_instance,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("get_instance_path"),&InstancePlaceholder::get_instance_path); } InstancePlaceholder::InstancePlaceholder() { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 6592452c56..488256970f 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2904,95 +2904,95 @@ void Node::_bind_methods() { GLOBAL_DEF("node/name_casing",NAME_CASING_PASCAL_CASE); GlobalConfig::get_singleton()->set_custom_property_info("node/name_casing",PropertyInfo(Variant::INT,"node/name_casing",PROPERTY_HINT_ENUM,"PascalCase,camelCase,snake_case")); - ClassDB::bind_method(_MD("_add_child_below_node","node:Node","child_node:Node","legible_unique_name"),&Node::add_child_below_node,DEFVAL(false)); - - ClassDB::bind_method(_MD("set_name","name"),&Node::set_name); - ClassDB::bind_method(_MD("get_name"),&Node::get_name); - ClassDB::bind_method(_MD("add_child","node:Node","legible_unique_name"),&Node::add_child,DEFVAL(false)); - ClassDB::bind_method(_MD("remove_child","node:Node"),&Node::remove_child); - //ClassDB::bind_method(_MD("remove_and_delete_child","node:Node"),&Node::remove_and_delete_child); - ClassDB::bind_method(_MD("get_child_count"),&Node::get_child_count); - ClassDB::bind_method(_MD("get_children"),&Node::_get_children); - ClassDB::bind_method(_MD("get_child:Node","idx"),&Node::get_child); - ClassDB::bind_method(_MD("has_node","path"),&Node::has_node); - ClassDB::bind_method(_MD("get_node:Node","path"),&Node::get_node); - ClassDB::bind_method(_MD("get_parent:Node"),&Node::get_parent); - ClassDB::bind_method(_MD("find_node:Node","mask","recursive","owned"),&Node::find_node,DEFVAL(true),DEFVAL(true)); - ClassDB::bind_method(_MD("has_node_and_resource","path"),&Node::has_node_and_resource); - ClassDB::bind_method(_MD("get_node_and_resource","path"),&Node::_get_node_and_resource); - - ClassDB::bind_method(_MD("is_inside_tree"),&Node::is_inside_tree); - ClassDB::bind_method(_MD("is_a_parent_of","node:Node"),&Node::is_a_parent_of); - ClassDB::bind_method(_MD("is_greater_than","node:Node"),&Node::is_greater_than); - ClassDB::bind_method(_MD("get_path"),&Node::get_path); - ClassDB::bind_method(_MD("get_path_to","node:Node"),&Node::get_path_to); - ClassDB::bind_method(_MD("add_to_group","group","persistent"),&Node::add_to_group,DEFVAL(false)); - ClassDB::bind_method(_MD("remove_from_group","group"),&Node::remove_from_group); - ClassDB::bind_method(_MD("is_in_group","group"),&Node::is_in_group); - ClassDB::bind_method(_MD("move_child","child_node:Node","to_pos"),&Node::move_child); - ClassDB::bind_method(_MD("get_groups"),&Node::_get_groups); - ClassDB::bind_method(_MD("raise"),&Node::raise); - ClassDB::bind_method(_MD("set_owner","owner:Node"),&Node::set_owner); - ClassDB::bind_method(_MD("get_owner:Node"),&Node::get_owner); - ClassDB::bind_method(_MD("remove_and_skip"),&Node::remove_and_skip); - ClassDB::bind_method(_MD("get_index"),&Node::get_index); - ClassDB::bind_method(_MD("print_tree"),&Node::print_tree); - ClassDB::bind_method(_MD("set_filename","filename"),&Node::set_filename); - ClassDB::bind_method(_MD("get_filename"),&Node::get_filename); - ClassDB::bind_method(_MD("propagate_notification","what"),&Node::propagate_notification); - ClassDB::bind_method(_MD("set_fixed_process","enable"),&Node::set_fixed_process); - ClassDB::bind_method(_MD("get_fixed_process_delta_time"),&Node::get_fixed_process_delta_time); - ClassDB::bind_method(_MD("is_fixed_processing"),&Node::is_fixed_processing); - ClassDB::bind_method(_MD("get_process_delta_time"),&Node::get_process_delta_time); - ClassDB::bind_method(_MD("set_process","enable"),&Node::set_process); - ClassDB::bind_method(_MD("is_processing"),&Node::is_processing); - ClassDB::bind_method(_MD("set_process_input","enable"),&Node::set_process_input); - ClassDB::bind_method(_MD("is_processing_input"),&Node::is_processing_input); - ClassDB::bind_method(_MD("set_process_unhandled_input","enable"),&Node::set_process_unhandled_input); - ClassDB::bind_method(_MD("is_processing_unhandled_input"),&Node::is_processing_unhandled_input); - ClassDB::bind_method(_MD("set_process_unhandled_key_input","enable"),&Node::set_process_unhandled_key_input); - ClassDB::bind_method(_MD("is_processing_unhandled_key_input"),&Node::is_processing_unhandled_key_input); - ClassDB::bind_method(_MD("set_pause_mode","mode"),&Node::set_pause_mode); - ClassDB::bind_method(_MD("get_pause_mode"),&Node::get_pause_mode); - ClassDB::bind_method(_MD("can_process"),&Node::can_process); - ClassDB::bind_method(_MD("print_stray_nodes"),&Node::_print_stray_nodes); - ClassDB::bind_method(_MD("get_position_in_parent"),&Node::get_position_in_parent); - ClassDB::bind_method(_MD("set_display_folded","fold"),&Node::set_display_folded); - ClassDB::bind_method(_MD("is_displayed_folded"),&Node::is_displayed_folded); - - ClassDB::bind_method(_MD("set_process_internal","enable"),&Node::set_process_internal); - ClassDB::bind_method(_MD("is_processing_internal"),&Node::is_processing_internal); - - ClassDB::bind_method(_MD("set_fixed_process_internal","enable"),&Node::set_fixed_process_internal); - ClassDB::bind_method(_MD("is_fixed_processing_internal"),&Node::is_fixed_processing_internal); - - ClassDB::bind_method(_MD("get_tree:SceneTree"),&Node::get_tree); - - ClassDB::bind_method(_MD("duplicate:Node","use_instancing"),&Node::duplicate,DEFVAL(false)); - ClassDB::bind_method(_MD("replace_by","node:Node","keep_data"),&Node::replace_by,DEFVAL(false)); - - ClassDB::bind_method(_MD("set_scene_instance_load_placeholder","load_placeholder"),&Node::set_scene_instance_load_placeholder); - ClassDB::bind_method(_MD("get_scene_instance_load_placeholder"),&Node::get_scene_instance_load_placeholder); - - - ClassDB::bind_method(_MD("get_viewport"),&Node::get_viewport); - - ClassDB::bind_method(_MD("queue_free"),&Node::queue_delete); - - ClassDB::bind_method(_MD("request_ready"),&Node::request_ready); - - ClassDB::bind_method(_MD("set_network_mode","mode"),&Node::set_network_mode); - ClassDB::bind_method(_MD("get_network_mode"),&Node::get_network_mode); - - ClassDB::bind_method(_MD("is_network_master"),&Node::is_network_master); - - ClassDB::bind_method(_MD("rpc_config","method","mode"),&Node::rpc_config); - ClassDB::bind_method(_MD("rset_config","property","mode"),&Node::rset_config); + ClassDB::bind_method(D_METHOD("_add_child_below_node","node:Node","child_node:Node","legible_unique_name"),&Node::add_child_below_node,DEFVAL(false)); + + ClassDB::bind_method(D_METHOD("set_name","name"),&Node::set_name); + ClassDB::bind_method(D_METHOD("get_name"),&Node::get_name); + ClassDB::bind_method(D_METHOD("add_child","node:Node","legible_unique_name"),&Node::add_child,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("remove_child","node:Node"),&Node::remove_child); + //ClassDB::bind_method(D_METHOD("remove_and_delete_child","node:Node"),&Node::remove_and_delete_child); + ClassDB::bind_method(D_METHOD("get_child_count"),&Node::get_child_count); + ClassDB::bind_method(D_METHOD("get_children"),&Node::_get_children); + ClassDB::bind_method(D_METHOD("get_child:Node","idx"),&Node::get_child); + ClassDB::bind_method(D_METHOD("has_node","path"),&Node::has_node); + ClassDB::bind_method(D_METHOD("get_node:Node","path"),&Node::get_node); + ClassDB::bind_method(D_METHOD("get_parent:Node"),&Node::get_parent); + ClassDB::bind_method(D_METHOD("find_node:Node","mask","recursive","owned"),&Node::find_node,DEFVAL(true),DEFVAL(true)); + ClassDB::bind_method(D_METHOD("has_node_and_resource","path"),&Node::has_node_and_resource); + ClassDB::bind_method(D_METHOD("get_node_and_resource","path"),&Node::_get_node_and_resource); + + ClassDB::bind_method(D_METHOD("is_inside_tree"),&Node::is_inside_tree); + ClassDB::bind_method(D_METHOD("is_a_parent_of","node:Node"),&Node::is_a_parent_of); + ClassDB::bind_method(D_METHOD("is_greater_than","node:Node"),&Node::is_greater_than); + ClassDB::bind_method(D_METHOD("get_path"),&Node::get_path); + ClassDB::bind_method(D_METHOD("get_path_to","node:Node"),&Node::get_path_to); + ClassDB::bind_method(D_METHOD("add_to_group","group","persistent"),&Node::add_to_group,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("remove_from_group","group"),&Node::remove_from_group); + ClassDB::bind_method(D_METHOD("is_in_group","group"),&Node::is_in_group); + ClassDB::bind_method(D_METHOD("move_child","child_node:Node","to_pos"),&Node::move_child); + ClassDB::bind_method(D_METHOD("get_groups"),&Node::_get_groups); + ClassDB::bind_method(D_METHOD("raise"),&Node::raise); + ClassDB::bind_method(D_METHOD("set_owner","owner:Node"),&Node::set_owner); + ClassDB::bind_method(D_METHOD("get_owner:Node"),&Node::get_owner); + ClassDB::bind_method(D_METHOD("remove_and_skip"),&Node::remove_and_skip); + ClassDB::bind_method(D_METHOD("get_index"),&Node::get_index); + ClassDB::bind_method(D_METHOD("print_tree"),&Node::print_tree); + ClassDB::bind_method(D_METHOD("set_filename","filename"),&Node::set_filename); + ClassDB::bind_method(D_METHOD("get_filename"),&Node::get_filename); + ClassDB::bind_method(D_METHOD("propagate_notification","what"),&Node::propagate_notification); + ClassDB::bind_method(D_METHOD("set_fixed_process","enable"),&Node::set_fixed_process); + ClassDB::bind_method(D_METHOD("get_fixed_process_delta_time"),&Node::get_fixed_process_delta_time); + ClassDB::bind_method(D_METHOD("is_fixed_processing"),&Node::is_fixed_processing); + ClassDB::bind_method(D_METHOD("get_process_delta_time"),&Node::get_process_delta_time); + ClassDB::bind_method(D_METHOD("set_process","enable"),&Node::set_process); + ClassDB::bind_method(D_METHOD("is_processing"),&Node::is_processing); + ClassDB::bind_method(D_METHOD("set_process_input","enable"),&Node::set_process_input); + ClassDB::bind_method(D_METHOD("is_processing_input"),&Node::is_processing_input); + ClassDB::bind_method(D_METHOD("set_process_unhandled_input","enable"),&Node::set_process_unhandled_input); + ClassDB::bind_method(D_METHOD("is_processing_unhandled_input"),&Node::is_processing_unhandled_input); + ClassDB::bind_method(D_METHOD("set_process_unhandled_key_input","enable"),&Node::set_process_unhandled_key_input); + ClassDB::bind_method(D_METHOD("is_processing_unhandled_key_input"),&Node::is_processing_unhandled_key_input); + ClassDB::bind_method(D_METHOD("set_pause_mode","mode"),&Node::set_pause_mode); + ClassDB::bind_method(D_METHOD("get_pause_mode"),&Node::get_pause_mode); + ClassDB::bind_method(D_METHOD("can_process"),&Node::can_process); + ClassDB::bind_method(D_METHOD("print_stray_nodes"),&Node::_print_stray_nodes); + ClassDB::bind_method(D_METHOD("get_position_in_parent"),&Node::get_position_in_parent); + ClassDB::bind_method(D_METHOD("set_display_folded","fold"),&Node::set_display_folded); + ClassDB::bind_method(D_METHOD("is_displayed_folded"),&Node::is_displayed_folded); + + ClassDB::bind_method(D_METHOD("set_process_internal","enable"),&Node::set_process_internal); + ClassDB::bind_method(D_METHOD("is_processing_internal"),&Node::is_processing_internal); + + ClassDB::bind_method(D_METHOD("set_fixed_process_internal","enable"),&Node::set_fixed_process_internal); + ClassDB::bind_method(D_METHOD("is_fixed_processing_internal"),&Node::is_fixed_processing_internal); + + ClassDB::bind_method(D_METHOD("get_tree:SceneTree"),&Node::get_tree); + + ClassDB::bind_method(D_METHOD("duplicate:Node","use_instancing"),&Node::duplicate,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("replace_by","node:Node","keep_data"),&Node::replace_by,DEFVAL(false)); + + ClassDB::bind_method(D_METHOD("set_scene_instance_load_placeholder","load_placeholder"),&Node::set_scene_instance_load_placeholder); + ClassDB::bind_method(D_METHOD("get_scene_instance_load_placeholder"),&Node::get_scene_instance_load_placeholder); + + + ClassDB::bind_method(D_METHOD("get_viewport"),&Node::get_viewport); + + ClassDB::bind_method(D_METHOD("queue_free"),&Node::queue_delete); + + ClassDB::bind_method(D_METHOD("request_ready"),&Node::request_ready); + + ClassDB::bind_method(D_METHOD("set_network_mode","mode"),&Node::set_network_mode); + ClassDB::bind_method(D_METHOD("get_network_mode"),&Node::get_network_mode); + + ClassDB::bind_method(D_METHOD("is_network_master"),&Node::is_network_master); + + ClassDB::bind_method(D_METHOD("rpc_config","method","mode"),&Node::rpc_config); + ClassDB::bind_method(D_METHOD("rset_config","property","mode"),&Node::rset_config); #ifdef TOOLS_ENABLED - ClassDB::bind_method(_MD("_set_import_path","import_path"),&Node::set_import_path); - ClassDB::bind_method(_MD("_get_import_path"),&Node::get_import_path); + ClassDB::bind_method(D_METHOD("_set_import_path","import_path"),&Node::set_import_path); + ClassDB::bind_method(D_METHOD("_get_import_path"),&Node::get_import_path); ADD_PROPERTYNZ( PropertyInfo(Variant::NODE_PATH,"_import_path",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_import_path","_get_import_path"); #endif @@ -3018,10 +3018,10 @@ void Node::_bind_methods() { } - ClassDB::bind_method(_MD("rset","property","value:Variant"),&Node::rset); - ClassDB::bind_method(_MD("rset_id","peer_id","property","value:Variant"),&Node::rset_id); - ClassDB::bind_method(_MD("rset_unreliable","property","value:Variant"),&Node::rset_unreliable); - ClassDB::bind_method(_MD("rset_unreliable_id","peer_id","property","value:Variant"),&Node::rset_unreliable_id); + ClassDB::bind_method(D_METHOD("rset","property","value:Variant"),&Node::rset); + ClassDB::bind_method(D_METHOD("rset_id","peer_id","property","value:Variant"),&Node::rset_id); + ClassDB::bind_method(D_METHOD("rset_unreliable","property","value:Variant"),&Node::rset_unreliable); + ClassDB::bind_method(D_METHOD("rset_unreliable_id","peer_id","property","value:Variant"),&Node::rset_unreliable_id); BIND_CONSTANT( NOTIFICATION_ENTER_TREE ); @@ -3079,8 +3079,8 @@ void Node::_bind_methods() { BIND_VMETHOD( MethodInfo("_unhandled_input",PropertyInfo(Variant::INPUT_EVENT,"event")) ); BIND_VMETHOD( MethodInfo("_unhandled_key_input",PropertyInfo(Variant::INPUT_EVENT,"key_event")) ); - //ClassDB::bind_method(_MD("get_child",&Node::get_child,PH("index"))); - //ClassDB::bind_method(_MD("get_node",&Node::get_node,PH("path"))); + //ClassDB::bind_method(D_METHOD("get_child",&Node::get_child,PH("index"))); + //ClassDB::bind_method(D_METHOD("get_node",&Node::get_node,PH("path"))); } diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp index cc550ed665..29333ff4bc 100644 --- a/scene/main/resource_preloader.cpp +++ b/scene/main/resource_preloader.cpp @@ -163,15 +163,15 @@ void ResourcePreloader::get_resource_list(List<StringName> *p_list) { void ResourcePreloader::_bind_methods() { - ClassDB::bind_method(_MD("_set_resources"),&ResourcePreloader::_set_resources); - ClassDB::bind_method(_MD("_get_resources"),&ResourcePreloader::_get_resources); - - ClassDB::bind_method(_MD("add_resource","name","resource"),&ResourcePreloader::add_resource); - ClassDB::bind_method(_MD("remove_resource","name"),&ResourcePreloader::remove_resource); - ClassDB::bind_method(_MD("rename_resource","name","newname"),&ResourcePreloader::rename_resource); - ClassDB::bind_method(_MD("has_resource","name"),&ResourcePreloader::has_resource); - ClassDB::bind_method(_MD("get_resource","name"),&ResourcePreloader::get_resource); - ClassDB::bind_method(_MD("get_resource_list"),&ResourcePreloader::_get_resource_list); + ClassDB::bind_method(D_METHOD("_set_resources"),&ResourcePreloader::_set_resources); + ClassDB::bind_method(D_METHOD("_get_resources"),&ResourcePreloader::_get_resources); + + ClassDB::bind_method(D_METHOD("add_resource","name","resource"),&ResourcePreloader::add_resource); + ClassDB::bind_method(D_METHOD("remove_resource","name"),&ResourcePreloader::remove_resource); + ClassDB::bind_method(D_METHOD("rename_resource","name","newname"),&ResourcePreloader::rename_resource); + ClassDB::bind_method(D_METHOD("has_resource","name"),&ResourcePreloader::has_resource); + ClassDB::bind_method(D_METHOD("get_resource","name"),&ResourcePreloader::get_resource); + ClassDB::bind_method(D_METHOD("get_resource_list"),&ResourcePreloader::_get_resource_list); ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"resources",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_resources", "_get_resources"); diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index 9db1d3fd77..76f5ef7c96 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -48,8 +48,8 @@ void SceneTreeTimer::_bind_methods() { - ClassDB::bind_method(_MD("set_time_left","time"),&SceneTreeTimer::set_time_left); - ClassDB::bind_method(_MD("get_time_left"),&SceneTreeTimer::get_time_left); + ClassDB::bind_method(D_METHOD("set_time_left","time"),&SceneTreeTimer::set_time_left); + ClassDB::bind_method(D_METHOD("get_time_left"),&SceneTreeTimer::get_time_left); ADD_SIGNAL(MethodInfo("timeout")); } @@ -2220,39 +2220,39 @@ void SceneTree::_network_poll() { void SceneTree::_bind_methods() { - //ClassDB::bind_method(_MD("call_group","call_flags","group","method","arg1","arg2"),&SceneMainLoop::_call_group,DEFVAL(Variant()),DEFVAL(Variant())); + //ClassDB::bind_method(D_METHOD("call_group","call_flags","group","method","arg1","arg2"),&SceneMainLoop::_call_group,DEFVAL(Variant()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("get_root:Viewport"),&SceneTree::get_root); - ClassDB::bind_method(_MD("has_group","name"),&SceneTree::has_group); + ClassDB::bind_method(D_METHOD("get_root:Viewport"),&SceneTree::get_root); + ClassDB::bind_method(D_METHOD("has_group","name"),&SceneTree::has_group); - ClassDB::bind_method(_MD("set_auto_accept_quit","enabled"),&SceneTree::set_auto_accept_quit); + ClassDB::bind_method(D_METHOD("set_auto_accept_quit","enabled"),&SceneTree::set_auto_accept_quit); - ClassDB::bind_method(_MD("set_editor_hint","enable"),&SceneTree::set_editor_hint); - ClassDB::bind_method(_MD("is_editor_hint"),&SceneTree::is_editor_hint); - ClassDB::bind_method(_MD("set_debug_collisions_hint","enable"),&SceneTree::set_debug_collisions_hint); - ClassDB::bind_method(_MD("is_debugging_collisions_hint"),&SceneTree::is_debugging_collisions_hint); - ClassDB::bind_method(_MD("set_debug_navigation_hint","enable"),&SceneTree::set_debug_navigation_hint); - ClassDB::bind_method(_MD("is_debugging_navigation_hint"),&SceneTree::is_debugging_navigation_hint); + ClassDB::bind_method(D_METHOD("set_editor_hint","enable"),&SceneTree::set_editor_hint); + ClassDB::bind_method(D_METHOD("is_editor_hint"),&SceneTree::is_editor_hint); + ClassDB::bind_method(D_METHOD("set_debug_collisions_hint","enable"),&SceneTree::set_debug_collisions_hint); + ClassDB::bind_method(D_METHOD("is_debugging_collisions_hint"),&SceneTree::is_debugging_collisions_hint); + ClassDB::bind_method(D_METHOD("set_debug_navigation_hint","enable"),&SceneTree::set_debug_navigation_hint); + ClassDB::bind_method(D_METHOD("is_debugging_navigation_hint"),&SceneTree::is_debugging_navigation_hint); #ifdef TOOLS_ENABLED - ClassDB::bind_method(_MD("set_edited_scene_root","scene"),&SceneTree::set_edited_scene_root); - ClassDB::bind_method(_MD("get_edited_scene_root"),&SceneTree::get_edited_scene_root); + ClassDB::bind_method(D_METHOD("set_edited_scene_root","scene"),&SceneTree::set_edited_scene_root); + ClassDB::bind_method(D_METHOD("get_edited_scene_root"),&SceneTree::get_edited_scene_root); #endif - ClassDB::bind_method(_MD("set_pause","enable"),&SceneTree::set_pause); - ClassDB::bind_method(_MD("is_paused"),&SceneTree::is_paused); - ClassDB::bind_method(_MD("set_input_as_handled"),&SceneTree::set_input_as_handled); + ClassDB::bind_method(D_METHOD("set_pause","enable"),&SceneTree::set_pause); + ClassDB::bind_method(D_METHOD("is_paused"),&SceneTree::is_paused); + ClassDB::bind_method(D_METHOD("set_input_as_handled"),&SceneTree::set_input_as_handled); - ClassDB::bind_method(_MD("create_timer:SceneTreeTimer","time_sec"),&SceneTree::create_timer); + ClassDB::bind_method(D_METHOD("create_timer:SceneTreeTimer","time_sec"),&SceneTree::create_timer); - ClassDB::bind_method(_MD("get_node_count"),&SceneTree::get_node_count); - ClassDB::bind_method(_MD("get_frame"),&SceneTree::get_frame); - ClassDB::bind_method(_MD("quit"),&SceneTree::quit); + ClassDB::bind_method(D_METHOD("get_node_count"),&SceneTree::get_node_count); + ClassDB::bind_method(D_METHOD("get_frame"),&SceneTree::get_frame); + ClassDB::bind_method(D_METHOD("quit"),&SceneTree::quit); - ClassDB::bind_method(_MD("set_screen_stretch","mode","aspect","minsize"),&SceneTree::set_screen_stretch); + ClassDB::bind_method(D_METHOD("set_screen_stretch","mode","aspect","minsize"),&SceneTree::set_screen_stretch); - ClassDB::bind_method(_MD("queue_delete","obj"),&SceneTree::queue_delete); + ClassDB::bind_method(D_METHOD("queue_delete","obj"),&SceneTree::queue_delete); @@ -2266,8 +2266,8 @@ void SceneTree::_bind_methods() { ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_group_flags",&SceneTree::_call_group_flags,mi); - ClassDB::bind_method(_MD("notify_group_flags","call_flags","group","notification"),&SceneTree::notify_group_flags); - ClassDB::bind_method(_MD("set_group_flags","call_flags","group","property","value"),&SceneTree::set_group_flags); + ClassDB::bind_method(D_METHOD("notify_group_flags","call_flags","group","notification"),&SceneTree::notify_group_flags); + ClassDB::bind_method(D_METHOD("set_group_flags","call_flags","group","property","value"),&SceneTree::set_group_flags); MethodInfo mi2; mi2.name="call_group"; @@ -2277,33 +2277,33 @@ void SceneTree::_bind_methods() { ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT,"call_group",&SceneTree::_call_group,mi2); - ClassDB::bind_method(_MD("notify_group","call_flags","group","notification"),&SceneTree::notify_group); - ClassDB::bind_method(_MD("set_group","call_flags","group","property","value"),&SceneTree::set_group); + ClassDB::bind_method(D_METHOD("notify_group","call_flags","group","notification"),&SceneTree::notify_group); + ClassDB::bind_method(D_METHOD("set_group","call_flags","group","property","value"),&SceneTree::set_group); - ClassDB::bind_method(_MD("get_nodes_in_group","group"),&SceneTree::_get_nodes_in_group); + ClassDB::bind_method(D_METHOD("get_nodes_in_group","group"),&SceneTree::_get_nodes_in_group); - ClassDB::bind_method(_MD("set_current_scene","child_node:Node"),&SceneTree::set_current_scene); - ClassDB::bind_method(_MD("get_current_scene:Node"),&SceneTree::get_current_scene); + ClassDB::bind_method(D_METHOD("set_current_scene","child_node:Node"),&SceneTree::set_current_scene); + ClassDB::bind_method(D_METHOD("get_current_scene:Node"),&SceneTree::get_current_scene); - ClassDB::bind_method(_MD("change_scene","path"),&SceneTree::change_scene); - ClassDB::bind_method(_MD("change_scene_to","packed_scene:PackedScene"),&SceneTree::change_scene_to); + ClassDB::bind_method(D_METHOD("change_scene","path"),&SceneTree::change_scene); + ClassDB::bind_method(D_METHOD("change_scene_to","packed_scene:PackedScene"),&SceneTree::change_scene_to); - ClassDB::bind_method(_MD("reload_current_scene"),&SceneTree::reload_current_scene); + ClassDB::bind_method(D_METHOD("reload_current_scene"),&SceneTree::reload_current_scene); - ClassDB::bind_method(_MD("_change_scene"),&SceneTree::_change_scene); + ClassDB::bind_method(D_METHOD("_change_scene"),&SceneTree::_change_scene); - ClassDB::bind_method(_MD("set_network_peer","peer:NetworkedMultiplayerPeer"),&SceneTree::set_network_peer); - ClassDB::bind_method(_MD("is_network_server"),&SceneTree::is_network_server); - ClassDB::bind_method(_MD("get_network_unique_id"),&SceneTree::get_network_unique_id); - ClassDB::bind_method(_MD("set_refuse_new_network_connections","refuse"),&SceneTree::set_refuse_new_network_connections); - ClassDB::bind_method(_MD("is_refusing_new_network_connections"),&SceneTree::is_refusing_new_network_connections); - ClassDB::bind_method(_MD("_network_peer_connected"),&SceneTree::_network_peer_connected); - ClassDB::bind_method(_MD("_network_peer_disconnected"),&SceneTree::_network_peer_disconnected); - ClassDB::bind_method(_MD("_connected_to_server"),&SceneTree::_connected_to_server); - ClassDB::bind_method(_MD("_connection_failed"),&SceneTree::_connection_failed); - ClassDB::bind_method(_MD("_server_disconnected"),&SceneTree::_server_disconnected); + ClassDB::bind_method(D_METHOD("set_network_peer","peer:NetworkedMultiplayerPeer"),&SceneTree::set_network_peer); + ClassDB::bind_method(D_METHOD("is_network_server"),&SceneTree::is_network_server); + ClassDB::bind_method(D_METHOD("get_network_unique_id"),&SceneTree::get_network_unique_id); + ClassDB::bind_method(D_METHOD("set_refuse_new_network_connections","refuse"),&SceneTree::set_refuse_new_network_connections); + ClassDB::bind_method(D_METHOD("is_refusing_new_network_connections"),&SceneTree::is_refusing_new_network_connections); + ClassDB::bind_method(D_METHOD("_network_peer_connected"),&SceneTree::_network_peer_connected); + ClassDB::bind_method(D_METHOD("_network_peer_disconnected"),&SceneTree::_network_peer_disconnected); + ClassDB::bind_method(D_METHOD("_connected_to_server"),&SceneTree::_connected_to_server); + ClassDB::bind_method(D_METHOD("_connection_failed"),&SceneTree::_connection_failed); + ClassDB::bind_method(D_METHOD("_server_disconnected"),&SceneTree::_server_disconnected); ADD_SIGNAL( MethodInfo("tree_changed") ); ADD_SIGNAL( MethodInfo("node_removed",PropertyInfo( Variant::OBJECT, "node") ) ); diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 6f2ad7ae5d..d27b53d48b 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -179,25 +179,25 @@ void Timer::_set_process(bool p_process, bool p_force) void Timer::_bind_methods() { - ClassDB::bind_method(_MD("set_wait_time","time_sec"),&Timer::set_wait_time); - ClassDB::bind_method(_MD("get_wait_time"),&Timer::get_wait_time); + ClassDB::bind_method(D_METHOD("set_wait_time","time_sec"),&Timer::set_wait_time); + ClassDB::bind_method(D_METHOD("get_wait_time"),&Timer::get_wait_time); - ClassDB::bind_method(_MD("set_one_shot","enable"),&Timer::set_one_shot); - ClassDB::bind_method(_MD("is_one_shot"),&Timer::is_one_shot); + ClassDB::bind_method(D_METHOD("set_one_shot","enable"),&Timer::set_one_shot); + ClassDB::bind_method(D_METHOD("is_one_shot"),&Timer::is_one_shot); - ClassDB::bind_method(_MD("set_autostart","enable"),&Timer::set_autostart); - ClassDB::bind_method(_MD("has_autostart"),&Timer::has_autostart); + ClassDB::bind_method(D_METHOD("set_autostart","enable"),&Timer::set_autostart); + ClassDB::bind_method(D_METHOD("has_autostart"),&Timer::has_autostart); - ClassDB::bind_method(_MD("start"),&Timer::start); - ClassDB::bind_method(_MD("stop"),&Timer::stop); + ClassDB::bind_method(D_METHOD("start"),&Timer::start); + ClassDB::bind_method(D_METHOD("stop"),&Timer::stop); - ClassDB::bind_method(_MD("set_active", "active"), &Timer::set_active); - ClassDB::bind_method(_MD("is_active"), &Timer::is_active); + ClassDB::bind_method(D_METHOD("set_active", "active"), &Timer::set_active); + ClassDB::bind_method(D_METHOD("is_active"), &Timer::is_active); - ClassDB::bind_method(_MD("get_time_left"),&Timer::get_time_left); + ClassDB::bind_method(D_METHOD("get_time_left"),&Timer::get_time_left); - ClassDB::bind_method(_MD("set_timer_process_mode", "mode"), &Timer::set_timer_process_mode); - ClassDB::bind_method(_MD("get_timer_process_mode"), &Timer::get_timer_process_mode); + ClassDB::bind_method(D_METHOD("set_timer_process_mode", "mode"), &Timer::set_timer_process_mode); + ClassDB::bind_method(D_METHOD("get_timer_process_mode"), &Timer::get_timer_process_mode); ADD_SIGNAL( MethodInfo("timeout") ); diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index b5f0697dec..f7bd98a002 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -139,8 +139,8 @@ uint32_t ViewportTexture::get_flags() const{ void ViewportTexture::_bind_methods() { - ClassDB::bind_method(_MD("set_viewport_path_in_scene","path"),&ViewportTexture::set_viewport_path_in_scene); - ClassDB::bind_method(_MD("get_viewport_path_in_scene"),&ViewportTexture::get_viewport_path_in_scene); + ClassDB::bind_method(D_METHOD("set_viewport_path_in_scene","path"),&ViewportTexture::set_viewport_path_in_scene); + ClassDB::bind_method(D_METHOD("get_viewport_path_in_scene"),&ViewportTexture::get_viewport_path_in_scene); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH,"viewport_path"),"set_viewport_path_in_scene","get_viewport_path_in_scene"); @@ -2774,101 +2774,101 @@ bool Viewport::get_hdr() const{ void Viewport::_bind_methods() { - ClassDB::bind_method(_MD("set_size","size"), &Viewport::set_size); - ClassDB::bind_method(_MD("get_size"), &Viewport::get_size); - ClassDB::bind_method(_MD("set_world_2d","world_2d:World2D"), &Viewport::set_world_2d); - ClassDB::bind_method(_MD("get_world_2d:World2D"), &Viewport::get_world_2d); - ClassDB::bind_method(_MD("find_world_2d:World2D"), &Viewport::find_world_2d); - ClassDB::bind_method(_MD("set_world","world:World"), &Viewport::set_world); - ClassDB::bind_method(_MD("get_world:World"), &Viewport::get_world); - ClassDB::bind_method(_MD("find_world:World"), &Viewport::find_world); + ClassDB::bind_method(D_METHOD("set_size","size"), &Viewport::set_size); + ClassDB::bind_method(D_METHOD("get_size"), &Viewport::get_size); + ClassDB::bind_method(D_METHOD("set_world_2d","world_2d:World2D"), &Viewport::set_world_2d); + ClassDB::bind_method(D_METHOD("get_world_2d:World2D"), &Viewport::get_world_2d); + ClassDB::bind_method(D_METHOD("find_world_2d:World2D"), &Viewport::find_world_2d); + ClassDB::bind_method(D_METHOD("set_world","world:World"), &Viewport::set_world); + ClassDB::bind_method(D_METHOD("get_world:World"), &Viewport::get_world); + ClassDB::bind_method(D_METHOD("find_world:World"), &Viewport::find_world); - ClassDB::bind_method(_MD("set_canvas_transform","xform"), &Viewport::set_canvas_transform); - ClassDB::bind_method(_MD("get_canvas_transform"), &Viewport::get_canvas_transform); + ClassDB::bind_method(D_METHOD("set_canvas_transform","xform"), &Viewport::set_canvas_transform); + ClassDB::bind_method(D_METHOD("get_canvas_transform"), &Viewport::get_canvas_transform); - ClassDB::bind_method(_MD("set_global_canvas_transform","xform"), &Viewport::set_global_canvas_transform); - ClassDB::bind_method(_MD("get_global_canvas_transform"), &Viewport::get_global_canvas_transform); - ClassDB::bind_method(_MD("get_final_transform"), &Viewport::get_final_transform); + ClassDB::bind_method(D_METHOD("set_global_canvas_transform","xform"), &Viewport::set_global_canvas_transform); + ClassDB::bind_method(D_METHOD("get_global_canvas_transform"), &Viewport::get_global_canvas_transform); + ClassDB::bind_method(D_METHOD("get_final_transform"), &Viewport::get_final_transform); - ClassDB::bind_method(_MD("get_visible_rect"), &Viewport::get_visible_rect); - ClassDB::bind_method(_MD("set_transparent_background","enable"), &Viewport::set_transparent_background); - ClassDB::bind_method(_MD("has_transparent_background"), &Viewport::has_transparent_background); + ClassDB::bind_method(D_METHOD("get_visible_rect"), &Viewport::get_visible_rect); + ClassDB::bind_method(D_METHOD("set_transparent_background","enable"), &Viewport::set_transparent_background); + ClassDB::bind_method(D_METHOD("has_transparent_background"), &Viewport::has_transparent_background); - ClassDB::bind_method(_MD("_parent_visibility_changed"), &Viewport::_parent_visibility_changed); + ClassDB::bind_method(D_METHOD("_parent_visibility_changed"), &Viewport::_parent_visibility_changed); - ClassDB::bind_method(_MD("_parent_resized"), &Viewport::_parent_resized); - ClassDB::bind_method(_MD("_vp_input"), &Viewport::_vp_input); - ClassDB::bind_method(_MD("_vp_input_text","text"), &Viewport::_vp_input_text); - ClassDB::bind_method(_MD("_vp_unhandled_input"), &Viewport::_vp_unhandled_input); + ClassDB::bind_method(D_METHOD("_parent_resized"), &Viewport::_parent_resized); + ClassDB::bind_method(D_METHOD("_vp_input"), &Viewport::_vp_input); + ClassDB::bind_method(D_METHOD("_vp_input_text","text"), &Viewport::_vp_input_text); + ClassDB::bind_method(D_METHOD("_vp_unhandled_input"), &Viewport::_vp_unhandled_input); - ClassDB::bind_method(_MD("set_size_override","enable","size","margin"), &Viewport::set_size_override,DEFVAL(Size2(-1,-1)),DEFVAL(Size2(0,0))); - ClassDB::bind_method(_MD("get_size_override"), &Viewport::get_size_override); - ClassDB::bind_method(_MD("is_size_override_enabled"), &Viewport::is_size_override_enabled); - ClassDB::bind_method(_MD("set_size_override_stretch","enabled"), &Viewport::set_size_override_stretch); - ClassDB::bind_method(_MD("is_size_override_stretch_enabled"), &Viewport::is_size_override_stretch_enabled); - ClassDB::bind_method(_MD("queue_screen_capture"), &Viewport::queue_screen_capture); - ClassDB::bind_method(_MD("get_screen_capture"), &Viewport::get_screen_capture); + ClassDB::bind_method(D_METHOD("set_size_override","enable","size","margin"), &Viewport::set_size_override,DEFVAL(Size2(-1,-1)),DEFVAL(Size2(0,0))); + ClassDB::bind_method(D_METHOD("get_size_override"), &Viewport::get_size_override); + ClassDB::bind_method(D_METHOD("is_size_override_enabled"), &Viewport::is_size_override_enabled); + ClassDB::bind_method(D_METHOD("set_size_override_stretch","enabled"), &Viewport::set_size_override_stretch); + ClassDB::bind_method(D_METHOD("is_size_override_stretch_enabled"), &Viewport::is_size_override_stretch_enabled); + ClassDB::bind_method(D_METHOD("queue_screen_capture"), &Viewport::queue_screen_capture); + ClassDB::bind_method(D_METHOD("get_screen_capture"), &Viewport::get_screen_capture); - ClassDB::bind_method(_MD("set_vflip","enable"), &Viewport::set_vflip); - ClassDB::bind_method(_MD("get_vflip"), &Viewport::get_vflip); + ClassDB::bind_method(D_METHOD("set_vflip","enable"), &Viewport::set_vflip); + ClassDB::bind_method(D_METHOD("get_vflip"), &Viewport::get_vflip); - ClassDB::bind_method(_MD("set_clear_on_new_frame","enable"), &Viewport::set_clear_on_new_frame); - ClassDB::bind_method(_MD("get_clear_on_new_frame"), &Viewport::get_clear_on_new_frame); + ClassDB::bind_method(D_METHOD("set_clear_on_new_frame","enable"), &Viewport::set_clear_on_new_frame); + ClassDB::bind_method(D_METHOD("get_clear_on_new_frame"), &Viewport::get_clear_on_new_frame); - ClassDB::bind_method(_MD("clear"), &Viewport::clear); - ClassDB::bind_method(_MD("set_update_mode","mode"), &Viewport::set_update_mode); - ClassDB::bind_method(_MD("get_update_mode"), &Viewport::get_update_mode); + ClassDB::bind_method(D_METHOD("clear"), &Viewport::clear); + ClassDB::bind_method(D_METHOD("set_update_mode","mode"), &Viewport::set_update_mode); + ClassDB::bind_method(D_METHOD("get_update_mode"), &Viewport::get_update_mode); - ClassDB::bind_method(_MD("set_msaa","msaa"), &Viewport::set_msaa); - ClassDB::bind_method(_MD("get_msaa"), &Viewport::get_msaa); + ClassDB::bind_method(D_METHOD("set_msaa","msaa"), &Viewport::set_msaa); + ClassDB::bind_method(D_METHOD("get_msaa"), &Viewport::get_msaa); - ClassDB::bind_method(_MD("set_hdr","enable"), &Viewport::set_hdr); - ClassDB::bind_method(_MD("get_hdr"), &Viewport::get_hdr); + ClassDB::bind_method(D_METHOD("set_hdr","enable"), &Viewport::set_hdr); + ClassDB::bind_method(D_METHOD("get_hdr"), &Viewport::get_hdr); - ClassDB::bind_method(_MD("get_texture:ViewportTexture"), &Viewport::get_texture); + ClassDB::bind_method(D_METHOD("get_texture:ViewportTexture"), &Viewport::get_texture); - ClassDB::bind_method(_MD("set_physics_object_picking","enable"), &Viewport::set_physics_object_picking); - ClassDB::bind_method(_MD("get_physics_object_picking"), &Viewport::get_physics_object_picking); + ClassDB::bind_method(D_METHOD("set_physics_object_picking","enable"), &Viewport::set_physics_object_picking); + ClassDB::bind_method(D_METHOD("get_physics_object_picking"), &Viewport::get_physics_object_picking); - ClassDB::bind_method(_MD("get_viewport_rid"), &Viewport::get_viewport_rid); - ClassDB::bind_method(_MD("input","local_event"), &Viewport::input); - ClassDB::bind_method(_MD("unhandled_input","local_event"), &Viewport::unhandled_input); + ClassDB::bind_method(D_METHOD("get_viewport_rid"), &Viewport::get_viewport_rid); + ClassDB::bind_method(D_METHOD("input","local_event"), &Viewport::input); + ClassDB::bind_method(D_METHOD("unhandled_input","local_event"), &Viewport::unhandled_input); - ClassDB::bind_method(_MD("update_worlds"), &Viewport::update_worlds); + ClassDB::bind_method(D_METHOD("update_worlds"), &Viewport::update_worlds); - ClassDB::bind_method(_MD("set_use_own_world","enable"), &Viewport::set_use_own_world); - ClassDB::bind_method(_MD("is_using_own_world"), &Viewport::is_using_own_world); + ClassDB::bind_method(D_METHOD("set_use_own_world","enable"), &Viewport::set_use_own_world); + ClassDB::bind_method(D_METHOD("is_using_own_world"), &Viewport::is_using_own_world); - ClassDB::bind_method(_MD("get_camera:Camera"), &Viewport::get_camera); + ClassDB::bind_method(D_METHOD("get_camera:Camera"), &Viewport::get_camera); - ClassDB::bind_method(_MD("set_as_audio_listener","enable"), &Viewport::set_as_audio_listener); - ClassDB::bind_method(_MD("is_audio_listener","enable"), &Viewport::is_audio_listener); + ClassDB::bind_method(D_METHOD("set_as_audio_listener","enable"), &Viewport::set_as_audio_listener); + ClassDB::bind_method(D_METHOD("is_audio_listener","enable"), &Viewport::is_audio_listener); - ClassDB::bind_method(_MD("set_as_audio_listener_2d","enable"), &Viewport::set_as_audio_listener_2d); - ClassDB::bind_method(_MD("is_audio_listener_2d","enable"), &Viewport::is_audio_listener_2d); - ClassDB::bind_method(_MD("set_attach_to_screen_rect","rect"), &Viewport::set_attach_to_screen_rect); + ClassDB::bind_method(D_METHOD("set_as_audio_listener_2d","enable"), &Viewport::set_as_audio_listener_2d); + ClassDB::bind_method(D_METHOD("is_audio_listener_2d","enable"), &Viewport::is_audio_listener_2d); + ClassDB::bind_method(D_METHOD("set_attach_to_screen_rect","rect"), &Viewport::set_attach_to_screen_rect); - ClassDB::bind_method(_MD("get_mouse_pos"), &Viewport::get_mouse_pos); - ClassDB::bind_method(_MD("warp_mouse","to_pos"), &Viewport::warp_mouse); + ClassDB::bind_method(D_METHOD("get_mouse_pos"), &Viewport::get_mouse_pos); + ClassDB::bind_method(D_METHOD("warp_mouse","to_pos"), &Viewport::warp_mouse); - ClassDB::bind_method(_MD("gui_has_modal_stack"), &Viewport::gui_has_modal_stack); - ClassDB::bind_method(_MD("gui_get_drag_data:Variant"), &Viewport::gui_get_drag_data); + ClassDB::bind_method(D_METHOD("gui_has_modal_stack"), &Viewport::gui_has_modal_stack); + ClassDB::bind_method(D_METHOD("gui_get_drag_data:Variant"), &Viewport::gui_get_drag_data); - ClassDB::bind_method(_MD("set_disable_input","disable"), &Viewport::set_disable_input); - ClassDB::bind_method(_MD("is_input_disabled"), &Viewport::is_input_disabled); + ClassDB::bind_method(D_METHOD("set_disable_input","disable"), &Viewport::set_disable_input); + ClassDB::bind_method(D_METHOD("is_input_disabled"), &Viewport::is_input_disabled); - ClassDB::bind_method(_MD("set_disable_3d","disable"), &Viewport::set_disable_3d); - ClassDB::bind_method(_MD("is_3d_disabled"), &Viewport::is_3d_disabled); + ClassDB::bind_method(D_METHOD("set_disable_3d","disable"), &Viewport::set_disable_3d); + ClassDB::bind_method(D_METHOD("is_3d_disabled"), &Viewport::is_3d_disabled); - ClassDB::bind_method(_MD("_gui_show_tooltip"), &Viewport::_gui_show_tooltip); - ClassDB::bind_method(_MD("_gui_remove_focus"), &Viewport::_gui_remove_focus); + ClassDB::bind_method(D_METHOD("_gui_show_tooltip"), &Viewport::_gui_show_tooltip); + ClassDB::bind_method(D_METHOD("_gui_remove_focus"), &Viewport::_gui_remove_focus); - ClassDB::bind_method(_MD("set_shadow_atlas_size","size"), &Viewport::set_shadow_atlas_size); - ClassDB::bind_method(_MD("get_shadow_atlas_size"), &Viewport::get_shadow_atlas_size); + ClassDB::bind_method(D_METHOD("set_shadow_atlas_size","size"), &Viewport::set_shadow_atlas_size); + ClassDB::bind_method(D_METHOD("get_shadow_atlas_size"), &Viewport::get_shadow_atlas_size); - ClassDB::bind_method(_MD("set_shadow_atlas_quadrant_subdiv","quadrant","subdiv"), &Viewport::set_shadow_atlas_quadrant_subdiv); - ClassDB::bind_method(_MD("get_shadow_atlas_quadrant_subdiv","quadrant"), &Viewport::get_shadow_atlas_quadrant_subdiv); + ClassDB::bind_method(D_METHOD("set_shadow_atlas_quadrant_subdiv","quadrant","subdiv"), &Viewport::set_shadow_atlas_quadrant_subdiv); + ClassDB::bind_method(D_METHOD("get_shadow_atlas_quadrant_subdiv","quadrant"), &Viewport::get_shadow_atlas_quadrant_subdiv); ADD_PROPERTY( PropertyInfo(Variant::RECT2,"size"), "set_size", "get_size") ; ADD_PROPERTY( PropertyInfo(Variant::BOOL,"own_world"), "set_use_own_world", "is_using_own_world") ; diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 5b9baa6a67..b743834e63 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1698,61 +1698,61 @@ float Animation::get_step() const{ void Animation::_bind_methods() { - ClassDB::bind_method(_MD("add_track","type","at_pos"),&Animation::add_track,DEFVAL(-1)); - ClassDB::bind_method(_MD("remove_track","idx"),&Animation::remove_track); - ClassDB::bind_method(_MD("get_track_count"),&Animation::get_track_count); - ClassDB::bind_method(_MD("track_get_type","idx"),&Animation::track_get_type); - ClassDB::bind_method(_MD("track_get_path","idx"),&Animation::track_get_path); - ClassDB::bind_method(_MD("track_set_path","idx","path"),&Animation::track_set_path); - ClassDB::bind_method(_MD("find_track","path"),&Animation::find_track); + ClassDB::bind_method(D_METHOD("add_track","type","at_pos"),&Animation::add_track,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("remove_track","idx"),&Animation::remove_track); + ClassDB::bind_method(D_METHOD("get_track_count"),&Animation::get_track_count); + ClassDB::bind_method(D_METHOD("track_get_type","idx"),&Animation::track_get_type); + ClassDB::bind_method(D_METHOD("track_get_path","idx"),&Animation::track_get_path); + ClassDB::bind_method(D_METHOD("track_set_path","idx","path"),&Animation::track_set_path); + ClassDB::bind_method(D_METHOD("find_track","path"),&Animation::find_track); - ClassDB::bind_method(_MD("track_move_up","idx"),&Animation::track_move_up); - ClassDB::bind_method(_MD("track_move_down","idx"),&Animation::track_move_down); + ClassDB::bind_method(D_METHOD("track_move_up","idx"),&Animation::track_move_up); + ClassDB::bind_method(D_METHOD("track_move_down","idx"),&Animation::track_move_down); - ClassDB::bind_method(_MD("track_set_imported","idx","imported"),&Animation::track_set_imported); - ClassDB::bind_method(_MD("track_is_imported","idx"),&Animation::track_is_imported); + ClassDB::bind_method(D_METHOD("track_set_imported","idx","imported"),&Animation::track_set_imported); + ClassDB::bind_method(D_METHOD("track_is_imported","idx"),&Animation::track_is_imported); - ClassDB::bind_method(_MD("transform_track_insert_key","idx","time","loc","rot","scale"),&Animation::transform_track_insert_key); - ClassDB::bind_method(_MD("track_insert_key","idx","time","key","transition"),&Animation::track_insert_key,DEFVAL(1)); - ClassDB::bind_method(_MD("track_remove_key","idx","key_idx"),&Animation::track_remove_key); - ClassDB::bind_method(_MD("track_remove_key_at_pos","idx","pos"),&Animation::track_remove_key_at_pos); - ClassDB::bind_method(_MD("track_set_key_value","idx","key","value"),&Animation::track_set_key_value); - ClassDB::bind_method(_MD("track_set_key_transition","idx","key_idx","transition"),&Animation::track_set_key_transition); - ClassDB::bind_method(_MD("track_get_key_transition","idx","key_idx"),&Animation::track_get_key_transition); + ClassDB::bind_method(D_METHOD("transform_track_insert_key","idx","time","loc","rot","scale"),&Animation::transform_track_insert_key); + ClassDB::bind_method(D_METHOD("track_insert_key","idx","time","key","transition"),&Animation::track_insert_key,DEFVAL(1)); + ClassDB::bind_method(D_METHOD("track_remove_key","idx","key_idx"),&Animation::track_remove_key); + ClassDB::bind_method(D_METHOD("track_remove_key_at_pos","idx","pos"),&Animation::track_remove_key_at_pos); + ClassDB::bind_method(D_METHOD("track_set_key_value","idx","key","value"),&Animation::track_set_key_value); + ClassDB::bind_method(D_METHOD("track_set_key_transition","idx","key_idx","transition"),&Animation::track_set_key_transition); + ClassDB::bind_method(D_METHOD("track_get_key_transition","idx","key_idx"),&Animation::track_get_key_transition); - ClassDB::bind_method(_MD("track_get_key_count","idx"),&Animation::track_get_key_count); - ClassDB::bind_method(_MD("track_get_key_value","idx","key_idx"),&Animation::track_get_key_value); - ClassDB::bind_method(_MD("track_get_key_time","idx","key_idx"),&Animation::track_get_key_time); - ClassDB::bind_method(_MD("track_find_key","idx","time","exact"),&Animation::track_find_key,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("track_get_key_count","idx"),&Animation::track_get_key_count); + ClassDB::bind_method(D_METHOD("track_get_key_value","idx","key_idx"),&Animation::track_get_key_value); + ClassDB::bind_method(D_METHOD("track_get_key_time","idx","key_idx"),&Animation::track_get_key_time); + ClassDB::bind_method(D_METHOD("track_find_key","idx","time","exact"),&Animation::track_find_key,DEFVAL(false)); - ClassDB::bind_method(_MD("track_set_interpolation_type","idx","interpolation"),&Animation::track_set_interpolation_type); - ClassDB::bind_method(_MD("track_get_interpolation_type","idx"),&Animation::track_get_interpolation_type); + ClassDB::bind_method(D_METHOD("track_set_interpolation_type","idx","interpolation"),&Animation::track_set_interpolation_type); + ClassDB::bind_method(D_METHOD("track_get_interpolation_type","idx"),&Animation::track_get_interpolation_type); - ClassDB::bind_method(_MD("track_set_interpolation_loop_wrap","idx","interpolation"),&Animation::track_set_interpolation_loop_wrap); - ClassDB::bind_method(_MD("track_get_interpolation_loop_wrap","idx"),&Animation::track_get_interpolation_loop_wrap); + ClassDB::bind_method(D_METHOD("track_set_interpolation_loop_wrap","idx","interpolation"),&Animation::track_set_interpolation_loop_wrap); + ClassDB::bind_method(D_METHOD("track_get_interpolation_loop_wrap","idx"),&Animation::track_get_interpolation_loop_wrap); - ClassDB::bind_method(_MD("transform_track_interpolate","idx","time_sec"),&Animation::_transform_track_interpolate); - ClassDB::bind_method(_MD("value_track_set_update_mode","idx","mode"),&Animation::value_track_set_update_mode); - ClassDB::bind_method(_MD("value_track_get_update_mode","idx"),&Animation::value_track_get_update_mode); + ClassDB::bind_method(D_METHOD("transform_track_interpolate","idx","time_sec"),&Animation::_transform_track_interpolate); + ClassDB::bind_method(D_METHOD("value_track_set_update_mode","idx","mode"),&Animation::value_track_set_update_mode); + ClassDB::bind_method(D_METHOD("value_track_get_update_mode","idx"),&Animation::value_track_get_update_mode); - ClassDB::bind_method(_MD("value_track_get_key_indices","idx","time_sec","delta"),&Animation::_value_track_get_key_indices); + ClassDB::bind_method(D_METHOD("value_track_get_key_indices","idx","time_sec","delta"),&Animation::_value_track_get_key_indices); - ClassDB::bind_method(_MD("method_track_get_key_indices","idx","time_sec","delta"),&Animation::_method_track_get_key_indices); - ClassDB::bind_method(_MD("method_track_get_name","idx","key_idx"),&Animation::method_track_get_name); - ClassDB::bind_method(_MD("method_track_get_params","idx","key_idx"),&Animation::method_track_get_params); + ClassDB::bind_method(D_METHOD("method_track_get_key_indices","idx","time_sec","delta"),&Animation::_method_track_get_key_indices); + ClassDB::bind_method(D_METHOD("method_track_get_name","idx","key_idx"),&Animation::method_track_get_name); + ClassDB::bind_method(D_METHOD("method_track_get_params","idx","key_idx"),&Animation::method_track_get_params); - ClassDB::bind_method(_MD("set_length","time_sec"),&Animation::set_length); - ClassDB::bind_method(_MD("get_length"),&Animation::get_length); + ClassDB::bind_method(D_METHOD("set_length","time_sec"),&Animation::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&Animation::get_length); - ClassDB::bind_method(_MD("set_loop","enabled"),&Animation::set_loop); - ClassDB::bind_method(_MD("has_loop"),&Animation::has_loop); + ClassDB::bind_method(D_METHOD("set_loop","enabled"),&Animation::set_loop); + ClassDB::bind_method(D_METHOD("has_loop"),&Animation::has_loop); - ClassDB::bind_method(_MD("set_step","size_sec"),&Animation::set_step); - ClassDB::bind_method(_MD("get_step"),&Animation::get_step); + ClassDB::bind_method(D_METHOD("set_step","size_sec"),&Animation::set_step); + ClassDB::bind_method(D_METHOD("get_step"),&Animation::get_step); - ClassDB::bind_method(_MD("clear"),&Animation::clear); + ClassDB::bind_method(D_METHOD("clear"),&Animation::clear); BIND_CONSTANT( TYPE_VALUE ); BIND_CONSTANT( TYPE_TRANSFORM ); diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp index d9dd2396e0..297cec0c83 100644 --- a/scene/resources/audio_stream_sample.cpp +++ b/scene/resources/audio_stream_sample.cpp @@ -504,26 +504,26 @@ String AudioStreamSample::get_stream_name() const { void AudioStreamSample::_bind_methods() { - ClassDB::bind_method(_MD("set_format","format"),&AudioStreamSample::set_format); - ClassDB::bind_method(_MD("get_format"),&AudioStreamSample::get_format); + ClassDB::bind_method(D_METHOD("set_format","format"),&AudioStreamSample::set_format); + ClassDB::bind_method(D_METHOD("get_format"),&AudioStreamSample::get_format); - ClassDB::bind_method(_MD("set_loop_mode","loop_mode"),&AudioStreamSample::set_loop_mode); - ClassDB::bind_method(_MD("get_loop_mode"),&AudioStreamSample::get_loop_mode); + ClassDB::bind_method(D_METHOD("set_loop_mode","loop_mode"),&AudioStreamSample::set_loop_mode); + ClassDB::bind_method(D_METHOD("get_loop_mode"),&AudioStreamSample::get_loop_mode); - ClassDB::bind_method(_MD("set_loop_begin","loop_begin"),&AudioStreamSample::set_loop_begin); - ClassDB::bind_method(_MD("get_loop_begin"),&AudioStreamSample::get_loop_begin); + ClassDB::bind_method(D_METHOD("set_loop_begin","loop_begin"),&AudioStreamSample::set_loop_begin); + ClassDB::bind_method(D_METHOD("get_loop_begin"),&AudioStreamSample::get_loop_begin); - ClassDB::bind_method(_MD("set_loop_end","loop_end"),&AudioStreamSample::set_loop_end); - ClassDB::bind_method(_MD("get_loop_end"),&AudioStreamSample::get_loop_end); + ClassDB::bind_method(D_METHOD("set_loop_end","loop_end"),&AudioStreamSample::set_loop_end); + ClassDB::bind_method(D_METHOD("get_loop_end"),&AudioStreamSample::get_loop_end); - ClassDB::bind_method(_MD("set_mix_rate","mix_rate"),&AudioStreamSample::set_mix_rate); - ClassDB::bind_method(_MD("get_mix_rate"),&AudioStreamSample::get_mix_rate); + ClassDB::bind_method(D_METHOD("set_mix_rate","mix_rate"),&AudioStreamSample::set_mix_rate); + ClassDB::bind_method(D_METHOD("get_mix_rate"),&AudioStreamSample::get_mix_rate); - ClassDB::bind_method(_MD("set_stereo","stereo"),&AudioStreamSample::set_stereo); - ClassDB::bind_method(_MD("is_stereo"),&AudioStreamSample::is_stereo); + ClassDB::bind_method(D_METHOD("set_stereo","stereo"),&AudioStreamSample::set_stereo); + ClassDB::bind_method(D_METHOD("is_stereo"),&AudioStreamSample::is_stereo); - ClassDB::bind_method(_MD("set_data","data"),&AudioStreamSample::set_data); - ClassDB::bind_method(_MD("get_data"),&AudioStreamSample::get_data); + ClassDB::bind_method(D_METHOD("set_data","data"),&AudioStreamSample::set_data); + ClassDB::bind_method(D_METHOD("get_data"),&AudioStreamSample::get_data); ADD_PROPERTY(PropertyInfo(Variant::INT,"format",PROPERTY_HINT_ENUM,"8-Bit,16-Bit,IMA-ADPCM"),"set_format","get_format"); ADD_PROPERTY(PropertyInfo(Variant::INT,"loop_mode",PROPERTY_HINT_ENUM,"Disabled,Forward,Ping-Pong"),"set_loop_mode","get_loop_mode"); diff --git a/scene/resources/bit_mask.cpp b/scene/resources/bit_mask.cpp index 703dc1a4e5..4ceac5af0c 100644 --- a/scene/resources/bit_mask.cpp +++ b/scene/resources/bit_mask.cpp @@ -177,19 +177,19 @@ Dictionary BitMap::_get_data() const{ void BitMap::_bind_methods() { - ClassDB::bind_method(_MD("create","size"),&BitMap::create); - ClassDB::bind_method(_MD("create_from_image_alpha","image"),&BitMap::create_from_image_alpha); + ClassDB::bind_method(D_METHOD("create","size"),&BitMap::create); + ClassDB::bind_method(D_METHOD("create_from_image_alpha","image"),&BitMap::create_from_image_alpha); - ClassDB::bind_method(_MD("set_bit","pos","bit"),&BitMap::set_bit); - ClassDB::bind_method(_MD("get_bit","pos"),&BitMap::get_bit); + ClassDB::bind_method(D_METHOD("set_bit","pos","bit"),&BitMap::set_bit); + ClassDB::bind_method(D_METHOD("get_bit","pos"),&BitMap::get_bit); - ClassDB::bind_method(_MD("set_bit_rect","p_rect","bit"),&BitMap::set_bit_rect); - ClassDB::bind_method(_MD("get_true_bit_count"),&BitMap::get_true_bit_count); + ClassDB::bind_method(D_METHOD("set_bit_rect","p_rect","bit"),&BitMap::set_bit_rect); + ClassDB::bind_method(D_METHOD("get_true_bit_count"),&BitMap::get_true_bit_count); - ClassDB::bind_method(_MD("get_size"),&BitMap::get_size); + ClassDB::bind_method(D_METHOD("get_size"),&BitMap::get_size); - ClassDB::bind_method(_MD("_set_data"),&BitMap::_set_data); - ClassDB::bind_method(_MD("_get_data"),&BitMap::_get_data); + ClassDB::bind_method(D_METHOD("_set_data"),&BitMap::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&BitMap::_get_data); ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_data","_get_data"); diff --git a/scene/resources/bounds.cpp b/scene/resources/bounds.cpp index 4c85dac476..26bf6270e9 100644 --- a/scene/resources/bounds.cpp +++ b/scene/resources/bounds.cpp @@ -31,8 +31,8 @@ void Bounds::_bind_methods() { - ClassDB::bind_method( _MD("set_bsp_tree","bsp_tree"),&Bounds::set_bsp_tree); - ClassDB::bind_method( _MD("get_bsp_tree"),&Bounds::get_bsp_tree ); + ClassDB::bind_method( D_METHOD("set_bsp_tree","bsp_tree"),&Bounds::set_bsp_tree); + ClassDB::bind_method( D_METHOD("get_bsp_tree"),&Bounds::get_bsp_tree ); ADD_PROPERTY( PropertyInfo( Variant::ARRAY, "bsp_tree" ), "set_bsp_tree", "get_bsp_tree"); diff --git a/scene/resources/box_shape.cpp b/scene/resources/box_shape.cpp index 9b3a93be1f..e8eccaceae 100644 --- a/scene/resources/box_shape.cpp +++ b/scene/resources/box_shape.cpp @@ -70,8 +70,8 @@ Vector3 BoxShape::get_extents() const { void BoxShape::_bind_methods() { - ClassDB::bind_method(_MD("set_extents","extents"),&BoxShape::set_extents); - ClassDB::bind_method(_MD("get_extents"),&BoxShape::get_extents); + ClassDB::bind_method(D_METHOD("set_extents","extents"),&BoxShape::set_extents); + ClassDB::bind_method(D_METHOD("get_extents"),&BoxShape::get_extents); ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"extents"), "set_extents", "get_extents") ; diff --git a/scene/resources/capsule_shape.cpp b/scene/resources/capsule_shape.cpp index 75b885c4bf..bd30f009c4 100644 --- a/scene/resources/capsule_shape.cpp +++ b/scene/resources/capsule_shape.cpp @@ -107,10 +107,10 @@ float CapsuleShape::get_height() const { void CapsuleShape::_bind_methods() { - ClassDB::bind_method(_MD("set_radius","radius"),&CapsuleShape::set_radius); - ClassDB::bind_method(_MD("get_radius"),&CapsuleShape::get_radius); - ClassDB::bind_method(_MD("set_height","height"),&CapsuleShape::set_height); - ClassDB::bind_method(_MD("get_height"),&CapsuleShape::get_height); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&CapsuleShape::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&CapsuleShape::get_radius); + ClassDB::bind_method(D_METHOD("set_height","height"),&CapsuleShape::set_height); + ClassDB::bind_method(D_METHOD("get_height"),&CapsuleShape::get_height); ADD_PROPERTY( PropertyInfo(Variant::REAL,"radius",PROPERTY_HINT_RANGE,"0.01,4096,0.01"), "set_radius","get_radius") ; ADD_PROPERTY( PropertyInfo(Variant::REAL,"height",PROPERTY_HINT_RANGE,"0.01,4096,0.01"), "set_height","get_height") ; diff --git a/scene/resources/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp index 9ad6cc8dcb..523d6d7455 100644 --- a/scene/resources/capsule_shape_2d.cpp +++ b/scene/resources/capsule_shape_2d.cpp @@ -89,11 +89,11 @@ Rect2 CapsuleShape2D::get_rect() const { void CapsuleShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_radius","radius"),&CapsuleShape2D::set_radius); - ClassDB::bind_method(_MD("get_radius"),&CapsuleShape2D::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&CapsuleShape2D::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&CapsuleShape2D::get_radius); - ClassDB::bind_method(_MD("set_height","height"),&CapsuleShape2D::set_height); - ClassDB::bind_method(_MD("get_height"),&CapsuleShape2D::get_height); + ClassDB::bind_method(D_METHOD("set_height","height"),&CapsuleShape2D::set_height); + ClassDB::bind_method(D_METHOD("get_height"),&CapsuleShape2D::get_height); ADD_PROPERTY( PropertyInfo(Variant::REAL,"radius"),"set_radius","get_radius") ; diff --git a/scene/resources/circle_shape_2d.cpp b/scene/resources/circle_shape_2d.cpp index 830a3a01c0..cd707b1032 100644 --- a/scene/resources/circle_shape_2d.cpp +++ b/scene/resources/circle_shape_2d.cpp @@ -51,8 +51,8 @@ real_t CircleShape2D::get_radius() const { void CircleShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_radius","radius"),&CircleShape2D::set_radius); - ClassDB::bind_method(_MD("get_radius"),&CircleShape2D::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&CircleShape2D::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&CircleShape2D::get_radius); ADD_PROPERTY( PropertyInfo(Variant::REAL,"radius",PROPERTY_HINT_RANGE,"0.01,16384,0.5"),"set_radius","get_radius") ; diff --git a/scene/resources/color_ramp.cpp b/scene/resources/color_ramp.cpp index 1f6bd509be..b14ba4c8ed 100644 --- a/scene/resources/color_ramp.cpp +++ b/scene/resources/color_ramp.cpp @@ -55,24 +55,24 @@ void ColorRamp::_bind_methods() { - ClassDB::bind_method(_MD("add_point","offset","color"),&ColorRamp::add_point); - ClassDB::bind_method(_MD("remove_point","offset","color"),&ColorRamp::remove_point); + ClassDB::bind_method(D_METHOD("add_point","offset","color"),&ColorRamp::add_point); + ClassDB::bind_method(D_METHOD("remove_point","offset","color"),&ColorRamp::remove_point); - ClassDB::bind_method(_MD("set_offset","point","offset"),&ColorRamp::set_offset); - ClassDB::bind_method(_MD("get_offset","point"),&ColorRamp::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","point","offset"),&ColorRamp::set_offset); + ClassDB::bind_method(D_METHOD("get_offset","point"),&ColorRamp::get_offset); - ClassDB::bind_method(_MD("set_color","point","color"),&ColorRamp::set_color); - ClassDB::bind_method(_MD("get_color","point"),&ColorRamp::get_color); + ClassDB::bind_method(D_METHOD("set_color","point","color"),&ColorRamp::set_color); + ClassDB::bind_method(D_METHOD("get_color","point"),&ColorRamp::get_color); - ClassDB::bind_method(_MD("interpolate","offset"),&ColorRamp::get_color_at_offset); + ClassDB::bind_method(D_METHOD("interpolate","offset"),&ColorRamp::get_color_at_offset); - ClassDB::bind_method(_MD("get_point_count"),&ColorRamp::get_points_count); + ClassDB::bind_method(D_METHOD("get_point_count"),&ColorRamp::get_points_count); - ClassDB::bind_method(_MD(COLOR_RAMP_SET_OFFSETS,"offsets"),&ColorRamp::set_offsets); - ClassDB::bind_method(_MD(COLOR_RAMP_GET_OFFSETS),&ColorRamp::get_offsets); + ClassDB::bind_method(D_METHOD(COLOR_RAMP_SET_OFFSETS,"offsets"),&ColorRamp::set_offsets); + ClassDB::bind_method(D_METHOD(COLOR_RAMP_GET_OFFSETS),&ColorRamp::get_offsets); - ClassDB::bind_method(_MD(COLOR_RAMP_SET_COLORS,"colors"),&ColorRamp::set_colors); - ClassDB::bind_method(_MD(COLOR_RAMP_GET_COLORS),&ColorRamp::get_colors); + ClassDB::bind_method(D_METHOD(COLOR_RAMP_SET_COLORS,"colors"),&ColorRamp::set_colors); + ClassDB::bind_method(D_METHOD(COLOR_RAMP_GET_COLORS),&ColorRamp::get_colors); ADD_PROPERTY( PropertyInfo(Variant::REAL,"offsets"),COLOR_RAMP_SET_OFFSETS,COLOR_RAMP_GET_OFFSETS) ; ADD_PROPERTY( PropertyInfo(Variant::REAL,"colors"),COLOR_RAMP_SET_COLORS,COLOR_RAMP_GET_COLORS) ; diff --git a/scene/resources/concave_polygon_shape.cpp b/scene/resources/concave_polygon_shape.cpp index 5190bba6a5..3945ade215 100644 --- a/scene/resources/concave_polygon_shape.cpp +++ b/scene/resources/concave_polygon_shape.cpp @@ -110,8 +110,8 @@ PoolVector<Vector3> ConcavePolygonShape::get_faces() const { void ConcavePolygonShape::_bind_methods() { - ClassDB::bind_method(_MD("set_faces","faces"),&ConcavePolygonShape::set_faces); - ClassDB::bind_method(_MD("get_faces"),&ConcavePolygonShape::get_faces); + ClassDB::bind_method(D_METHOD("set_faces","faces"),&ConcavePolygonShape::set_faces); + ClassDB::bind_method(D_METHOD("get_faces"),&ConcavePolygonShape::get_faces); } ConcavePolygonShape::ConcavePolygonShape() : Shape( PhysicsServer::get_singleton()->shape_create(PhysicsServer::SHAPE_CONCAVE_POLYGON)) { diff --git a/scene/resources/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp index 2f6070d889..f3dfa8a2b3 100644 --- a/scene/resources/concave_polygon_shape_2d.cpp +++ b/scene/resources/concave_polygon_shape_2d.cpp @@ -82,8 +82,8 @@ Rect2 ConcavePolygonShape2D::get_rect() const { void ConcavePolygonShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_segments","segments"),&ConcavePolygonShape2D::set_segments); - ClassDB::bind_method(_MD("get_segments"),&ConcavePolygonShape2D::get_segments); + ClassDB::bind_method(D_METHOD("set_segments","segments"),&ConcavePolygonShape2D::set_segments); + ClassDB::bind_method(D_METHOD("get_segments"),&ConcavePolygonShape2D::get_segments); ADD_PROPERTY( PropertyInfo(Variant::POOL_VECTOR2_ARRAY,"segments"),"set_segments","get_segments") ; diff --git a/scene/resources/convex_polygon_shape.cpp b/scene/resources/convex_polygon_shape.cpp index e7e8e65e8d..207419f8cd 100644 --- a/scene/resources/convex_polygon_shape.cpp +++ b/scene/resources/convex_polygon_shape.cpp @@ -79,8 +79,8 @@ PoolVector<Vector3> ConvexPolygonShape::get_points() const { void ConvexPolygonShape::_bind_methods() { - ClassDB::bind_method(_MD("set_points","points"),&ConvexPolygonShape::set_points); - ClassDB::bind_method(_MD("get_points"),&ConvexPolygonShape::get_points); + ClassDB::bind_method(D_METHOD("set_points","points"),&ConvexPolygonShape::set_points); + ClassDB::bind_method(D_METHOD("get_points"),&ConvexPolygonShape::get_points); ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"points"), "set_points", "get_points") ; diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp index 2cd4fc5685..2a4b181611 100644 --- a/scene/resources/convex_polygon_shape_2d.cpp +++ b/scene/resources/convex_polygon_shape_2d.cpp @@ -61,9 +61,9 @@ Vector<Vector2> ConvexPolygonShape2D::get_points() const { void ConvexPolygonShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_point_cloud","point_cloud"),&ConvexPolygonShape2D::set_point_cloud); - ClassDB::bind_method(_MD("set_points","points"),&ConvexPolygonShape2D::set_points); - ClassDB::bind_method(_MD("get_points"),&ConvexPolygonShape2D::get_points); + ClassDB::bind_method(D_METHOD("set_point_cloud","point_cloud"),&ConvexPolygonShape2D::set_point_cloud); + ClassDB::bind_method(D_METHOD("set_points","points"),&ConvexPolygonShape2D::set_points); + ClassDB::bind_method(D_METHOD("get_points"),&ConvexPolygonShape2D::get_points); diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp index 4455afeeb8..9311ab4dd7 100644 --- a/scene/resources/curve.cpp +++ b/scene/resources/curve.cpp @@ -349,26 +349,26 @@ Vector2Array Curve2D::get_points_pos() const { void Curve2D::_bind_methods() { - ClassDB::bind_method(_MD("get_point_count"),&Curve2D::get_point_count); - ClassDB::bind_method(_MD("add_point","pos","in","out"),&Curve2D::add_point,DEFVAL(Vector2()),DEFVAL(Vector2())); - ClassDB::bind_method(_MD("set_point_pos","idx","pos"),&Curve2D::set_point_pos); - ClassDB::bind_method(_MD("get_point_pos","idx"),&Curve2D::get_point_pos); - ClassDB::bind_method(_MD("set_point_in","idx","pos"),&Curve2D::set_point_in); - ClassDB::bind_method(_MD("get_point_in","idx"),&Curve2D::get_point_in); - ClassDB::bind_method(_MD("set_point_out","idx","pos"),&Curve2D::set_point_out); - ClassDB::bind_method(_MD("get_point_out","idx"),&Curve2D::get_point_out); - ClassDB::bind_method(_MD("remove_point","idx"),&Curve2D::remove_point); - ClassDB::bind_method(_MD("interpolate","idx","t"),&Curve2D::interpolate); - ClassDB::bind_method(_MD("bake","subdivs"),&Curve2D::bake,DEFVAL(10)); - - - ClassDB::bind_method(_MD("set_points_in"),&Curve2D::set_points_in); - ClassDB::bind_method(_MD("set_points_out"),&Curve2D::set_points_out); - ClassDB::bind_method(_MD("set_points_pos"),&Curve2D::set_points_pos); - - ClassDB::bind_method(_MD("get_points_in"),&Curve2D::get_points_in); - ClassDB::bind_method(_MD("get_points_out"),&Curve2D::get_points_out); - ClassDB::bind_method(_MD("get_points_pos"),&Curve2D::get_points_pos); + ClassDB::bind_method(D_METHOD("get_point_count"),&Curve2D::get_point_count); + ClassDB::bind_method(D_METHOD("add_point","pos","in","out"),&Curve2D::add_point,DEFVAL(Vector2()),DEFVAL(Vector2())); + ClassDB::bind_method(D_METHOD("set_point_pos","idx","pos"),&Curve2D::set_point_pos); + ClassDB::bind_method(D_METHOD("get_point_pos","idx"),&Curve2D::get_point_pos); + ClassDB::bind_method(D_METHOD("set_point_in","idx","pos"),&Curve2D::set_point_in); + ClassDB::bind_method(D_METHOD("get_point_in","idx"),&Curve2D::get_point_in); + ClassDB::bind_method(D_METHOD("set_point_out","idx","pos"),&Curve2D::set_point_out); + ClassDB::bind_method(D_METHOD("get_point_out","idx"),&Curve2D::get_point_out); + ClassDB::bind_method(D_METHOD("remove_point","idx"),&Curve2D::remove_point); + ClassDB::bind_method(D_METHOD("interpolate","idx","t"),&Curve2D::interpolate); + ClassDB::bind_method(D_METHOD("bake","subdivs"),&Curve2D::bake,DEFVAL(10)); + + + ClassDB::bind_method(D_METHOD("set_points_in"),&Curve2D::set_points_in); + ClassDB::bind_method(D_METHOD("set_points_out"),&Curve2D::set_points_out); + ClassDB::bind_method(D_METHOD("set_points_pos"),&Curve2D::set_points_pos); + + ClassDB::bind_method(D_METHOD("get_points_in"),&Curve2D::get_points_in); + ClassDB::bind_method(D_METHOD("get_points_out"),&Curve2D::get_points_out); + ClassDB::bind_method(D_METHOD("get_points_pos"),&Curve2D::get_points_pos); ADD_PROPERTY( PropertyInfo( Variant::VECTOR2_ARRAY, "points_in"), "set_points_in","get_points_in"); ADD_PROPERTY( PropertyInfo( Variant::VECTOR2_ARRAY, "points_out"), "set_points_out","get_points_out"); @@ -789,29 +789,29 @@ PoolVector2Array Curve2D::tesselate(int p_max_stages,float p_tolerance) const { void Curve2D::_bind_methods() { - ClassDB::bind_method(_MD("get_point_count"),&Curve2D::get_point_count); - ClassDB::bind_method(_MD("add_point","pos","in","out","atpos"),&Curve2D::add_point,DEFVAL(Vector2()),DEFVAL(Vector2()),DEFVAL(-1)); - ClassDB::bind_method(_MD("set_point_pos","idx","pos"),&Curve2D::set_point_pos); - ClassDB::bind_method(_MD("get_point_pos","idx"),&Curve2D::get_point_pos); - ClassDB::bind_method(_MD("set_point_in","idx","pos"),&Curve2D::set_point_in); - ClassDB::bind_method(_MD("get_point_in","idx"),&Curve2D::get_point_in); - ClassDB::bind_method(_MD("set_point_out","idx","pos"),&Curve2D::set_point_out); - ClassDB::bind_method(_MD("get_point_out","idx"),&Curve2D::get_point_out); - ClassDB::bind_method(_MD("remove_point","idx"),&Curve2D::remove_point); - ClassDB::bind_method(_MD("clear_points"),&Curve2D::clear_points); - ClassDB::bind_method(_MD("interpolate","idx","t"),&Curve2D::interpolate); - ClassDB::bind_method(_MD("interpolatef","fofs"),&Curve2D::interpolatef); - //ClassDB::bind_method(_MD("bake","subdivs"),&Curve2D::bake,DEFVAL(10)); - ClassDB::bind_method(_MD("set_bake_interval","distance"),&Curve2D::set_bake_interval); - ClassDB::bind_method(_MD("get_bake_interval"),&Curve2D::get_bake_interval); - - ClassDB::bind_method(_MD("get_baked_length"),&Curve2D::get_baked_length); - ClassDB::bind_method(_MD("interpolate_baked","offset","cubic"),&Curve2D::interpolate_baked,DEFVAL(false)); - ClassDB::bind_method(_MD("get_baked_points"),&Curve2D::get_baked_points); - ClassDB::bind_method(_MD("tesselate","max_stages","tolerance_degrees"),&Curve2D::tesselate,DEFVAL(5),DEFVAL(4)); - - ClassDB::bind_method(_MD("_get_data"),&Curve2D::_get_data); - ClassDB::bind_method(_MD("_set_data"),&Curve2D::_set_data); + ClassDB::bind_method(D_METHOD("get_point_count"),&Curve2D::get_point_count); + ClassDB::bind_method(D_METHOD("add_point","pos","in","out","atpos"),&Curve2D::add_point,DEFVAL(Vector2()),DEFVAL(Vector2()),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("set_point_pos","idx","pos"),&Curve2D::set_point_pos); + ClassDB::bind_method(D_METHOD("get_point_pos","idx"),&Curve2D::get_point_pos); + ClassDB::bind_method(D_METHOD("set_point_in","idx","pos"),&Curve2D::set_point_in); + ClassDB::bind_method(D_METHOD("get_point_in","idx"),&Curve2D::get_point_in); + ClassDB::bind_method(D_METHOD("set_point_out","idx","pos"),&Curve2D::set_point_out); + ClassDB::bind_method(D_METHOD("get_point_out","idx"),&Curve2D::get_point_out); + ClassDB::bind_method(D_METHOD("remove_point","idx"),&Curve2D::remove_point); + ClassDB::bind_method(D_METHOD("clear_points"),&Curve2D::clear_points); + ClassDB::bind_method(D_METHOD("interpolate","idx","t"),&Curve2D::interpolate); + ClassDB::bind_method(D_METHOD("interpolatef","fofs"),&Curve2D::interpolatef); + //ClassDB::bind_method(D_METHOD("bake","subdivs"),&Curve2D::bake,DEFVAL(10)); + ClassDB::bind_method(D_METHOD("set_bake_interval","distance"),&Curve2D::set_bake_interval); + ClassDB::bind_method(D_METHOD("get_bake_interval"),&Curve2D::get_bake_interval); + + ClassDB::bind_method(D_METHOD("get_baked_length"),&Curve2D::get_baked_length); + ClassDB::bind_method(D_METHOD("interpolate_baked","offset","cubic"),&Curve2D::interpolate_baked,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_baked_points"),&Curve2D::get_baked_points); + ClassDB::bind_method(D_METHOD("tesselate","max_stages","tolerance_degrees"),&Curve2D::tesselate,DEFVAL(5),DEFVAL(4)); + + ClassDB::bind_method(D_METHOD("_get_data"),&Curve2D::_get_data); + ClassDB::bind_method(D_METHOD("_set_data"),&Curve2D::_set_data); ADD_PROPERTY( PropertyInfo( Variant::REAL, "bake_interval",PROPERTY_HINT_RANGE,"0.01,512,0.01"), "set_bake_interval","get_bake_interval"); @@ -1329,32 +1329,32 @@ PoolVector3Array Curve3D::tesselate(int p_max_stages,float p_tolerance) const { void Curve3D::_bind_methods() { - ClassDB::bind_method(_MD("get_point_count"),&Curve3D::get_point_count); - ClassDB::bind_method(_MD("add_point","pos","in","out","atpos"),&Curve3D::add_point,DEFVAL(Vector3()),DEFVAL(Vector3()),DEFVAL(-1)); - ClassDB::bind_method(_MD("set_point_pos","idx","pos"),&Curve3D::set_point_pos); - ClassDB::bind_method(_MD("get_point_pos","idx"),&Curve3D::get_point_pos); - ClassDB::bind_method(_MD("set_point_tilt","idx","tilt"),&Curve3D::set_point_tilt); - ClassDB::bind_method(_MD("get_point_tilt","idx"),&Curve3D::get_point_tilt); - ClassDB::bind_method(_MD("set_point_in","idx","pos"),&Curve3D::set_point_in); - ClassDB::bind_method(_MD("get_point_in","idx"),&Curve3D::get_point_in); - ClassDB::bind_method(_MD("set_point_out","idx","pos"),&Curve3D::set_point_out); - ClassDB::bind_method(_MD("get_point_out","idx"),&Curve3D::get_point_out); - ClassDB::bind_method(_MD("remove_point","idx"),&Curve3D::remove_point); - ClassDB::bind_method(_MD("clear_points"),&Curve3D::clear_points); - ClassDB::bind_method(_MD("interpolate","idx","t"),&Curve3D::interpolate); - ClassDB::bind_method(_MD("interpolatef","fofs"),&Curve3D::interpolatef); - //ClassDB::bind_method(_MD("bake","subdivs"),&Curve3D::bake,DEFVAL(10)); - ClassDB::bind_method(_MD("set_bake_interval","distance"),&Curve3D::set_bake_interval); - ClassDB::bind_method(_MD("get_bake_interval"),&Curve3D::get_bake_interval); - - ClassDB::bind_method(_MD("get_baked_length"),&Curve3D::get_baked_length); - ClassDB::bind_method(_MD("interpolate_baked","offset","cubic"),&Curve3D::interpolate_baked,DEFVAL(false)); - ClassDB::bind_method(_MD("get_baked_points"),&Curve3D::get_baked_points); - ClassDB::bind_method(_MD("get_baked_tilts"),&Curve3D::get_baked_tilts); - ClassDB::bind_method(_MD("tesselate","max_stages","tolerance_degrees"),&Curve3D::tesselate,DEFVAL(5),DEFVAL(4)); - - ClassDB::bind_method(_MD("_get_data"),&Curve3D::_get_data); - ClassDB::bind_method(_MD("_set_data"),&Curve3D::_set_data); + ClassDB::bind_method(D_METHOD("get_point_count"),&Curve3D::get_point_count); + ClassDB::bind_method(D_METHOD("add_point","pos","in","out","atpos"),&Curve3D::add_point,DEFVAL(Vector3()),DEFVAL(Vector3()),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("set_point_pos","idx","pos"),&Curve3D::set_point_pos); + ClassDB::bind_method(D_METHOD("get_point_pos","idx"),&Curve3D::get_point_pos); + ClassDB::bind_method(D_METHOD("set_point_tilt","idx","tilt"),&Curve3D::set_point_tilt); + ClassDB::bind_method(D_METHOD("get_point_tilt","idx"),&Curve3D::get_point_tilt); + ClassDB::bind_method(D_METHOD("set_point_in","idx","pos"),&Curve3D::set_point_in); + ClassDB::bind_method(D_METHOD("get_point_in","idx"),&Curve3D::get_point_in); + ClassDB::bind_method(D_METHOD("set_point_out","idx","pos"),&Curve3D::set_point_out); + ClassDB::bind_method(D_METHOD("get_point_out","idx"),&Curve3D::get_point_out); + ClassDB::bind_method(D_METHOD("remove_point","idx"),&Curve3D::remove_point); + ClassDB::bind_method(D_METHOD("clear_points"),&Curve3D::clear_points); + ClassDB::bind_method(D_METHOD("interpolate","idx","t"),&Curve3D::interpolate); + ClassDB::bind_method(D_METHOD("interpolatef","fofs"),&Curve3D::interpolatef); + //ClassDB::bind_method(D_METHOD("bake","subdivs"),&Curve3D::bake,DEFVAL(10)); + ClassDB::bind_method(D_METHOD("set_bake_interval","distance"),&Curve3D::set_bake_interval); + ClassDB::bind_method(D_METHOD("get_bake_interval"),&Curve3D::get_bake_interval); + + ClassDB::bind_method(D_METHOD("get_baked_length"),&Curve3D::get_baked_length); + ClassDB::bind_method(D_METHOD("interpolate_baked","offset","cubic"),&Curve3D::interpolate_baked,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_baked_points"),&Curve3D::get_baked_points); + ClassDB::bind_method(D_METHOD("get_baked_tilts"),&Curve3D::get_baked_tilts); + ClassDB::bind_method(D_METHOD("tesselate","max_stages","tolerance_degrees"),&Curve3D::tesselate,DEFVAL(5),DEFVAL(4)); + + ClassDB::bind_method(D_METHOD("_get_data"),&Curve3D::_get_data); + ClassDB::bind_method(D_METHOD("_set_data"),&Curve3D::_set_data); ADD_PROPERTY( PropertyInfo( Variant::REAL, "bake_interval",PROPERTY_HINT_RANGE,"0.01,512,0.01"), "set_bake_interval","get_bake_interval"); diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index e29cd344e9..02149f5748 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -84,8 +84,8 @@ void DynamicFontData::set_force_autohinter(bool p_force) { } void DynamicFontData::_bind_methods() { - ClassDB::bind_method(_MD("set_font_path","path"),&DynamicFontData::set_font_path); - ClassDB::bind_method(_MD("get_font_path"),&DynamicFontData::get_font_path); + ClassDB::bind_method(D_METHOD("set_font_path","path"),&DynamicFontData::set_font_path); + ClassDB::bind_method(D_METHOD("get_font_path"),&DynamicFontData::get_font_path); ADD_PROPERTY(PropertyInfo(Variant::STRING,"font_path",PROPERTY_HINT_FILE,"*.ttf,*.otf"),"set_font_path","get_font_path"); } @@ -879,24 +879,24 @@ void DynamicFont::_get_property_list( List<PropertyInfo> *p_list) const{ void DynamicFont::_bind_methods() { - ClassDB::bind_method(_MD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data); - ClassDB::bind_method(_MD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data); + ClassDB::bind_method(D_METHOD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data); + ClassDB::bind_method(D_METHOD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data); - ClassDB::bind_method(_MD("set_size","data"),&DynamicFont::set_size); - ClassDB::bind_method(_MD("get_size"),&DynamicFont::get_size); + ClassDB::bind_method(D_METHOD("set_size","data"),&DynamicFont::set_size); + ClassDB::bind_method(D_METHOD("get_size"),&DynamicFont::get_size); - ClassDB::bind_method(_MD("set_use_mipmaps","enable"),&DynamicFont::set_use_mipmaps); - ClassDB::bind_method(_MD("get_use_mipmaps"),&DynamicFont::get_use_mipmaps); - ClassDB::bind_method(_MD("set_use_filter","enable"),&DynamicFont::set_use_filter); - ClassDB::bind_method(_MD("get_use_filter"),&DynamicFont::get_use_filter); - ClassDB::bind_method(_MD("set_spacing","type","value"),&DynamicFont::set_spacing); - ClassDB::bind_method(_MD("get_spacing","type"),&DynamicFont::get_spacing); + ClassDB::bind_method(D_METHOD("set_use_mipmaps","enable"),&DynamicFont::set_use_mipmaps); + ClassDB::bind_method(D_METHOD("get_use_mipmaps"),&DynamicFont::get_use_mipmaps); + ClassDB::bind_method(D_METHOD("set_use_filter","enable"),&DynamicFont::set_use_filter); + ClassDB::bind_method(D_METHOD("get_use_filter"),&DynamicFont::get_use_filter); + ClassDB::bind_method(D_METHOD("set_spacing","type","value"),&DynamicFont::set_spacing); + ClassDB::bind_method(D_METHOD("get_spacing","type"),&DynamicFont::get_spacing); - ClassDB::bind_method(_MD("add_fallback","data:DynamicFontData"),&DynamicFont::add_fallback); - ClassDB::bind_method(_MD("set_fallback","idx","data:DynamicFontData"),&DynamicFont::set_fallback); - ClassDB::bind_method(_MD("get_fallback:DynamicFontData","idx"),&DynamicFont::get_fallback); - ClassDB::bind_method(_MD("remove_fallback","idx"),&DynamicFont::remove_fallback); - ClassDB::bind_method(_MD("get_fallback_count"),&DynamicFont::get_fallback_count); + ClassDB::bind_method(D_METHOD("add_fallback","data:DynamicFontData"),&DynamicFont::add_fallback); + ClassDB::bind_method(D_METHOD("set_fallback","idx","data:DynamicFontData"),&DynamicFont::set_fallback); + ClassDB::bind_method(D_METHOD("get_fallback:DynamicFontData","idx"),&DynamicFont::get_fallback); + ClassDB::bind_method(D_METHOD("remove_fallback","idx"),&DynamicFont::remove_fallback); + ClassDB::bind_method(D_METHOD("get_fallback_count"),&DynamicFont::get_fallback_count); ADD_GROUP("Settings",""); diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp index 076e08a594..c4a182103f 100644 --- a/scene/resources/dynamic_font_stb.cpp +++ b/scene/resources/dynamic_font_stb.cpp @@ -378,11 +378,11 @@ DynamicFontAtSize::~DynamicFontAtSize(){ void DynamicFont::_bind_methods() { - ClassDB::bind_method(_MD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data); - ClassDB::bind_method(_MD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data); + ClassDB::bind_method(D_METHOD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data); + ClassDB::bind_method(D_METHOD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data); - ClassDB::bind_method(_MD("set_size","data"),&DynamicFont::set_size); - ClassDB::bind_method(_MD("get_size"),&DynamicFont::get_size); + ClassDB::bind_method(D_METHOD("set_size","data"),&DynamicFont::set_size); + ClassDB::bind_method(D_METHOD("get_size"),&DynamicFont::get_size); ADD_PROPERTY(PropertyInfo(Variant::INT,"font/size"),"set_size","get_size"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"font/font",PROPERTY_HINT_RESOURCE_TYPE,"DynamicFontData"),"set_font_data","get_font_data"); diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index 5f4fbff173..eb1a3b550a 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -701,26 +701,26 @@ Environment::DOFBlurQuality Environment::get_dof_blur_near_quality() const { void Environment::_bind_methods() { - ClassDB::bind_method(_MD("set_background","mode"),&Environment::set_background); - ClassDB::bind_method(_MD("set_skybox","skybox:CubeMap"),&Environment::set_skybox); - ClassDB::bind_method(_MD("set_skybox_scale","scale"),&Environment::set_skybox_scale); - ClassDB::bind_method(_MD("set_bg_color","color"),&Environment::set_bg_color); - ClassDB::bind_method(_MD("set_bg_energy","energy"),&Environment::set_bg_energy); - ClassDB::bind_method(_MD("set_canvas_max_layer","layer"),&Environment::set_canvas_max_layer); - ClassDB::bind_method(_MD("set_ambient_light_color","color"),&Environment::set_ambient_light_color); - ClassDB::bind_method(_MD("set_ambient_light_energy","energy"),&Environment::set_ambient_light_energy); - ClassDB::bind_method(_MD("set_ambient_light_skybox_contribution","energy"),&Environment::set_ambient_light_skybox_contribution); - - - ClassDB::bind_method(_MD("get_background"),&Environment::get_background); - ClassDB::bind_method(_MD("get_skybox:CubeMap"),&Environment::get_skybox); - ClassDB::bind_method(_MD("get_skybox_scale"),&Environment::get_skybox_scale); - ClassDB::bind_method(_MD("get_bg_color"),&Environment::get_bg_color); - ClassDB::bind_method(_MD("get_bg_energy"),&Environment::get_bg_energy); - ClassDB::bind_method(_MD("get_canvas_max_layer"),&Environment::get_canvas_max_layer); - ClassDB::bind_method(_MD("get_ambient_light_color"),&Environment::get_ambient_light_color); - ClassDB::bind_method(_MD("get_ambient_light_energy"),&Environment::get_ambient_light_energy); - ClassDB::bind_method(_MD("get_ambient_light_skybox_contribution"),&Environment::get_ambient_light_skybox_contribution); + ClassDB::bind_method(D_METHOD("set_background","mode"),&Environment::set_background); + ClassDB::bind_method(D_METHOD("set_skybox","skybox:CubeMap"),&Environment::set_skybox); + ClassDB::bind_method(D_METHOD("set_skybox_scale","scale"),&Environment::set_skybox_scale); + ClassDB::bind_method(D_METHOD("set_bg_color","color"),&Environment::set_bg_color); + ClassDB::bind_method(D_METHOD("set_bg_energy","energy"),&Environment::set_bg_energy); + ClassDB::bind_method(D_METHOD("set_canvas_max_layer","layer"),&Environment::set_canvas_max_layer); + ClassDB::bind_method(D_METHOD("set_ambient_light_color","color"),&Environment::set_ambient_light_color); + ClassDB::bind_method(D_METHOD("set_ambient_light_energy","energy"),&Environment::set_ambient_light_energy); + ClassDB::bind_method(D_METHOD("set_ambient_light_skybox_contribution","energy"),&Environment::set_ambient_light_skybox_contribution); + + + ClassDB::bind_method(D_METHOD("get_background"),&Environment::get_background); + ClassDB::bind_method(D_METHOD("get_skybox:CubeMap"),&Environment::get_skybox); + ClassDB::bind_method(D_METHOD("get_skybox_scale"),&Environment::get_skybox_scale); + ClassDB::bind_method(D_METHOD("get_bg_color"),&Environment::get_bg_color); + ClassDB::bind_method(D_METHOD("get_bg_energy"),&Environment::get_bg_energy); + ClassDB::bind_method(D_METHOD("get_canvas_max_layer"),&Environment::get_canvas_max_layer); + ClassDB::bind_method(D_METHOD("get_ambient_light_color"),&Environment::get_ambient_light_color); + ClassDB::bind_method(D_METHOD("get_ambient_light_energy"),&Environment::get_ambient_light_energy); + ClassDB::bind_method(D_METHOD("get_ambient_light_skybox_contribution"),&Environment::get_ambient_light_skybox_contribution); ADD_GROUP("Background","background_"); @@ -736,26 +736,26 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL,"ambient_light_skybox_contribution",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_ambient_light_skybox_contribution","get_ambient_light_skybox_contribution") ; - ClassDB::bind_method(_MD("set_ssr_enabled","enabled"),&Environment::set_ssr_enabled); - ClassDB::bind_method(_MD("is_ssr_enabled"),&Environment::is_ssr_enabled); + ClassDB::bind_method(D_METHOD("set_ssr_enabled","enabled"),&Environment::set_ssr_enabled); + ClassDB::bind_method(D_METHOD("is_ssr_enabled"),&Environment::is_ssr_enabled); - ClassDB::bind_method(_MD("set_ssr_max_steps","max_steps"),&Environment::set_ssr_max_steps); - ClassDB::bind_method(_MD("get_ssr_max_steps"),&Environment::get_ssr_max_steps); + ClassDB::bind_method(D_METHOD("set_ssr_max_steps","max_steps"),&Environment::set_ssr_max_steps); + ClassDB::bind_method(D_METHOD("get_ssr_max_steps"),&Environment::get_ssr_max_steps); - ClassDB::bind_method(_MD("set_ssr_accel","accel"),&Environment::set_ssr_accel); - ClassDB::bind_method(_MD("get_ssr_accel"),&Environment::get_ssr_accel); + ClassDB::bind_method(D_METHOD("set_ssr_accel","accel"),&Environment::set_ssr_accel); + ClassDB::bind_method(D_METHOD("get_ssr_accel"),&Environment::get_ssr_accel); - ClassDB::bind_method(_MD("set_ssr_fade","fade"),&Environment::set_ssr_fade); - ClassDB::bind_method(_MD("get_ssr_fade"),&Environment::get_ssr_fade); + ClassDB::bind_method(D_METHOD("set_ssr_fade","fade"),&Environment::set_ssr_fade); + ClassDB::bind_method(D_METHOD("get_ssr_fade"),&Environment::get_ssr_fade); - ClassDB::bind_method(_MD("set_ssr_depth_tolerance","depth_tolerance"),&Environment::set_ssr_depth_tolerance); - ClassDB::bind_method(_MD("get_ssr_depth_tolerance"),&Environment::get_ssr_depth_tolerance); + ClassDB::bind_method(D_METHOD("set_ssr_depth_tolerance","depth_tolerance"),&Environment::set_ssr_depth_tolerance); + ClassDB::bind_method(D_METHOD("get_ssr_depth_tolerance"),&Environment::get_ssr_depth_tolerance); - ClassDB::bind_method(_MD("set_ssr_smooth","smooth"),&Environment::set_ssr_smooth); - ClassDB::bind_method(_MD("is_ssr_smooth"),&Environment::is_ssr_smooth); + ClassDB::bind_method(D_METHOD("set_ssr_smooth","smooth"),&Environment::set_ssr_smooth); + ClassDB::bind_method(D_METHOD("is_ssr_smooth"),&Environment::is_ssr_smooth); - ClassDB::bind_method(_MD("set_ssr_rough","rough"),&Environment::set_ssr_rough); - ClassDB::bind_method(_MD("is_ssr_rough"),&Environment::is_ssr_rough); + ClassDB::bind_method(D_METHOD("set_ssr_rough","rough"),&Environment::set_ssr_rough); + ClassDB::bind_method(D_METHOD("is_ssr_rough"),&Environment::is_ssr_rough); ADD_GROUP("SS Reflections","ss_reflections_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"ss_reflections_enabled"),"set_ssr_enabled","is_ssr_enabled") ; @@ -766,32 +766,32 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL,"ss_reflections_accel_smooth"),"set_ssr_smooth","is_ssr_smooth") ; ADD_PROPERTY(PropertyInfo(Variant::BOOL,"ss_reflections_roughness"),"set_ssr_rough","is_ssr_rough") ; - ClassDB::bind_method(_MD("set_ssao_enabled","enabled"),&Environment::set_ssao_enabled); - ClassDB::bind_method(_MD("is_ssao_enabled"),&Environment::is_ssao_enabled); + ClassDB::bind_method(D_METHOD("set_ssao_enabled","enabled"),&Environment::set_ssao_enabled); + ClassDB::bind_method(D_METHOD("is_ssao_enabled"),&Environment::is_ssao_enabled); - ClassDB::bind_method(_MD("set_ssao_radius","radius"),&Environment::set_ssao_radius); - ClassDB::bind_method(_MD("get_ssao_radius"),&Environment::get_ssao_radius); + ClassDB::bind_method(D_METHOD("set_ssao_radius","radius"),&Environment::set_ssao_radius); + ClassDB::bind_method(D_METHOD("get_ssao_radius"),&Environment::get_ssao_radius); - ClassDB::bind_method(_MD("set_ssao_intensity","intensity"),&Environment::set_ssao_intensity); - ClassDB::bind_method(_MD("get_ssao_intensity"),&Environment::get_ssao_intensity); + ClassDB::bind_method(D_METHOD("set_ssao_intensity","intensity"),&Environment::set_ssao_intensity); + ClassDB::bind_method(D_METHOD("get_ssao_intensity"),&Environment::get_ssao_intensity); - ClassDB::bind_method(_MD("set_ssao_radius2","radius"),&Environment::set_ssao_radius2); - ClassDB::bind_method(_MD("get_ssao_radius2"),&Environment::get_ssao_radius2); + ClassDB::bind_method(D_METHOD("set_ssao_radius2","radius"),&Environment::set_ssao_radius2); + ClassDB::bind_method(D_METHOD("get_ssao_radius2"),&Environment::get_ssao_radius2); - ClassDB::bind_method(_MD("set_ssao_intensity2","intensity"),&Environment::set_ssao_intensity2); - ClassDB::bind_method(_MD("get_ssao_intensity2"),&Environment::get_ssao_intensity2); + ClassDB::bind_method(D_METHOD("set_ssao_intensity2","intensity"),&Environment::set_ssao_intensity2); + ClassDB::bind_method(D_METHOD("get_ssao_intensity2"),&Environment::get_ssao_intensity2); - ClassDB::bind_method(_MD("set_ssao_bias","bias"),&Environment::set_ssao_bias); - ClassDB::bind_method(_MD("get_ssao_bias"),&Environment::get_ssao_bias); + ClassDB::bind_method(D_METHOD("set_ssao_bias","bias"),&Environment::set_ssao_bias); + ClassDB::bind_method(D_METHOD("get_ssao_bias"),&Environment::get_ssao_bias); - ClassDB::bind_method(_MD("set_ssao_direct_light_affect","amount"),&Environment::set_ssao_direct_light_affect); - ClassDB::bind_method(_MD("get_ssao_direct_light_affect"),&Environment::get_ssao_direct_light_affect); + ClassDB::bind_method(D_METHOD("set_ssao_direct_light_affect","amount"),&Environment::set_ssao_direct_light_affect); + ClassDB::bind_method(D_METHOD("get_ssao_direct_light_affect"),&Environment::get_ssao_direct_light_affect); - ClassDB::bind_method(_MD("set_ssao_color","color"),&Environment::set_ssao_color); - ClassDB::bind_method(_MD("get_ssao_color"),&Environment::get_ssao_color); + ClassDB::bind_method(D_METHOD("set_ssao_color","color"),&Environment::set_ssao_color); + ClassDB::bind_method(D_METHOD("get_ssao_color"),&Environment::get_ssao_color); - ClassDB::bind_method(_MD("set_ssao_blur","enabled"),&Environment::set_ssao_blur); - ClassDB::bind_method(_MD("is_ssao_blur_enabled"),&Environment::is_ssao_blur_enabled); + ClassDB::bind_method(D_METHOD("set_ssao_blur","enabled"),&Environment::set_ssao_blur); + ClassDB::bind_method(D_METHOD("is_ssao_blur_enabled"),&Environment::is_ssao_blur_enabled); ADD_GROUP("SSAO","ssao_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"ssao_enabled"),"set_ssao_enabled","is_ssao_enabled") ; @@ -804,35 +804,35 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::COLOR,"ssao_color",PROPERTY_HINT_COLOR_NO_ALPHA),"set_ssao_color","get_ssao_color") ; ADD_PROPERTY(PropertyInfo(Variant::BOOL,"ssao_blur"),"set_ssao_blur","is_ssao_blur_enabled") ; - ClassDB::bind_method(_MD("set_dof_blur_far_enabled","enabled"),&Environment::set_dof_blur_far_enabled); - ClassDB::bind_method(_MD("is_dof_blur_far_enabled"),&Environment::is_dof_blur_far_enabled); + ClassDB::bind_method(D_METHOD("set_dof_blur_far_enabled","enabled"),&Environment::set_dof_blur_far_enabled); + ClassDB::bind_method(D_METHOD("is_dof_blur_far_enabled"),&Environment::is_dof_blur_far_enabled); - ClassDB::bind_method(_MD("set_dof_blur_far_distance","intensity"),&Environment::set_dof_blur_far_distance); - ClassDB::bind_method(_MD("get_dof_blur_far_distance"),&Environment::get_dof_blur_far_distance); + ClassDB::bind_method(D_METHOD("set_dof_blur_far_distance","intensity"),&Environment::set_dof_blur_far_distance); + ClassDB::bind_method(D_METHOD("get_dof_blur_far_distance"),&Environment::get_dof_blur_far_distance); - ClassDB::bind_method(_MD("set_dof_blur_far_transition","intensity"),&Environment::set_dof_blur_far_transition); - ClassDB::bind_method(_MD("get_dof_blur_far_transition"),&Environment::get_dof_blur_far_transition); + ClassDB::bind_method(D_METHOD("set_dof_blur_far_transition","intensity"),&Environment::set_dof_blur_far_transition); + ClassDB::bind_method(D_METHOD("get_dof_blur_far_transition"),&Environment::get_dof_blur_far_transition); - ClassDB::bind_method(_MD("set_dof_blur_far_amount","intensity"),&Environment::set_dof_blur_far_amount); - ClassDB::bind_method(_MD("get_dof_blur_far_amount"),&Environment::get_dof_blur_far_amount); + ClassDB::bind_method(D_METHOD("set_dof_blur_far_amount","intensity"),&Environment::set_dof_blur_far_amount); + ClassDB::bind_method(D_METHOD("get_dof_blur_far_amount"),&Environment::get_dof_blur_far_amount); - ClassDB::bind_method(_MD("set_dof_blur_far_quality","intensity"),&Environment::set_dof_blur_far_quality); - ClassDB::bind_method(_MD("get_dof_blur_far_quality"),&Environment::get_dof_blur_far_quality); + ClassDB::bind_method(D_METHOD("set_dof_blur_far_quality","intensity"),&Environment::set_dof_blur_far_quality); + ClassDB::bind_method(D_METHOD("get_dof_blur_far_quality"),&Environment::get_dof_blur_far_quality); - ClassDB::bind_method(_MD("set_dof_blur_near_enabled","enabled"),&Environment::set_dof_blur_near_enabled); - ClassDB::bind_method(_MD("is_dof_blur_near_enabled"),&Environment::is_dof_blur_near_enabled); + ClassDB::bind_method(D_METHOD("set_dof_blur_near_enabled","enabled"),&Environment::set_dof_blur_near_enabled); + ClassDB::bind_method(D_METHOD("is_dof_blur_near_enabled"),&Environment::is_dof_blur_near_enabled); - ClassDB::bind_method(_MD("set_dof_blur_near_distance","intensity"),&Environment::set_dof_blur_near_distance); - ClassDB::bind_method(_MD("get_dof_blur_near_distance"),&Environment::get_dof_blur_near_distance); + ClassDB::bind_method(D_METHOD("set_dof_blur_near_distance","intensity"),&Environment::set_dof_blur_near_distance); + ClassDB::bind_method(D_METHOD("get_dof_blur_near_distance"),&Environment::get_dof_blur_near_distance); - ClassDB::bind_method(_MD("set_dof_blur_near_transition","intensity"),&Environment::set_dof_blur_near_transition); - ClassDB::bind_method(_MD("get_dof_blur_near_transition"),&Environment::get_dof_blur_near_transition); + ClassDB::bind_method(D_METHOD("set_dof_blur_near_transition","intensity"),&Environment::set_dof_blur_near_transition); + ClassDB::bind_method(D_METHOD("get_dof_blur_near_transition"),&Environment::get_dof_blur_near_transition); - ClassDB::bind_method(_MD("set_dof_blur_near_amount","intensity"),&Environment::set_dof_blur_near_amount); - ClassDB::bind_method(_MD("get_dof_blur_near_amount"),&Environment::get_dof_blur_near_amount); + ClassDB::bind_method(D_METHOD("set_dof_blur_near_amount","intensity"),&Environment::set_dof_blur_near_amount); + ClassDB::bind_method(D_METHOD("get_dof_blur_near_amount"),&Environment::get_dof_blur_near_amount); - ClassDB::bind_method(_MD("set_dof_blur_near_quality","level"),&Environment::set_dof_blur_near_quality); - ClassDB::bind_method(_MD("get_dof_blur_near_quality"),&Environment::get_dof_blur_near_quality); + ClassDB::bind_method(D_METHOD("set_dof_blur_near_quality","level"),&Environment::set_dof_blur_near_quality); + ClassDB::bind_method(D_METHOD("get_dof_blur_near_quality"),&Environment::get_dof_blur_near_quality); ADD_GROUP("DOF Far Blur","dof_blur_far_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"dof_blur_far_enabled"),"set_dof_blur_far_enabled","is_dof_blur_far_enabled") ; @@ -849,32 +849,32 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT,"dof_blur_near_quality",PROPERTY_HINT_ENUM,"Low,Medium,High"),"set_dof_blur_near_quality","get_dof_blur_near_quality") ; - ClassDB::bind_method(_MD("set_glow_enabled","enabled"),&Environment::set_glow_enabled); - ClassDB::bind_method(_MD("is_glow_enabled"),&Environment::is_glow_enabled); + ClassDB::bind_method(D_METHOD("set_glow_enabled","enabled"),&Environment::set_glow_enabled); + ClassDB::bind_method(D_METHOD("is_glow_enabled"),&Environment::is_glow_enabled); - ClassDB::bind_method(_MD("set_glow_level","idx","enabled"),&Environment::set_glow_level); - ClassDB::bind_method(_MD("is_glow_level_enabled","idx"),&Environment::is_glow_level_enabled); + ClassDB::bind_method(D_METHOD("set_glow_level","idx","enabled"),&Environment::set_glow_level); + ClassDB::bind_method(D_METHOD("is_glow_level_enabled","idx"),&Environment::is_glow_level_enabled); - ClassDB::bind_method(_MD("set_glow_intensity","intensity"),&Environment::set_glow_intensity); - ClassDB::bind_method(_MD("get_glow_intensity"),&Environment::get_glow_intensity); + ClassDB::bind_method(D_METHOD("set_glow_intensity","intensity"),&Environment::set_glow_intensity); + ClassDB::bind_method(D_METHOD("get_glow_intensity"),&Environment::get_glow_intensity); - ClassDB::bind_method(_MD("set_glow_strength","strength"),&Environment::set_glow_strength); - ClassDB::bind_method(_MD("get_glow_strength"),&Environment::get_glow_strength); + ClassDB::bind_method(D_METHOD("set_glow_strength","strength"),&Environment::set_glow_strength); + ClassDB::bind_method(D_METHOD("get_glow_strength"),&Environment::get_glow_strength); - ClassDB::bind_method(_MD("set_glow_bloom","amount"),&Environment::set_glow_bloom); - ClassDB::bind_method(_MD("get_glow_bloom"),&Environment::get_glow_bloom); + ClassDB::bind_method(D_METHOD("set_glow_bloom","amount"),&Environment::set_glow_bloom); + ClassDB::bind_method(D_METHOD("get_glow_bloom"),&Environment::get_glow_bloom); - ClassDB::bind_method(_MD("set_glow_blend_mode","mode"),&Environment::set_glow_blend_mode); - ClassDB::bind_method(_MD("get_glow_blend_mode"),&Environment::get_glow_blend_mode); + ClassDB::bind_method(D_METHOD("set_glow_blend_mode","mode"),&Environment::set_glow_blend_mode); + ClassDB::bind_method(D_METHOD("get_glow_blend_mode"),&Environment::get_glow_blend_mode); - ClassDB::bind_method(_MD("set_glow_hdr_bleed_treshold","treshold"),&Environment::set_glow_hdr_bleed_treshold); - ClassDB::bind_method(_MD("get_glow_hdr_bleed_treshold"),&Environment::get_glow_hdr_bleed_treshold); + ClassDB::bind_method(D_METHOD("set_glow_hdr_bleed_treshold","treshold"),&Environment::set_glow_hdr_bleed_treshold); + ClassDB::bind_method(D_METHOD("get_glow_hdr_bleed_treshold"),&Environment::get_glow_hdr_bleed_treshold); - ClassDB::bind_method(_MD("set_glow_hdr_bleed_scale","scale"),&Environment::set_glow_hdr_bleed_scale); - ClassDB::bind_method(_MD("get_glow_hdr_bleed_scale"),&Environment::get_glow_hdr_bleed_scale); + ClassDB::bind_method(D_METHOD("set_glow_hdr_bleed_scale","scale"),&Environment::set_glow_hdr_bleed_scale); + ClassDB::bind_method(D_METHOD("get_glow_hdr_bleed_scale"),&Environment::get_glow_hdr_bleed_scale); - ClassDB::bind_method(_MD("set_glow_bicubic_upscale","enabled"),&Environment::set_glow_bicubic_upscale); - ClassDB::bind_method(_MD("is_glow_bicubic_upscale_enabled"),&Environment::is_glow_bicubic_upscale_enabled); + ClassDB::bind_method(D_METHOD("set_glow_bicubic_upscale","enabled"),&Environment::set_glow_bicubic_upscale); + ClassDB::bind_method(D_METHOD("is_glow_bicubic_upscale_enabled"),&Environment::is_glow_bicubic_upscale_enabled); ADD_GROUP("Glow","glow_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"glow_enabled"),"set_glow_enabled","is_glow_enabled") ; @@ -895,29 +895,29 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL,"glow_bicubic_upscale"),"set_glow_bicubic_upscale","is_glow_bicubic_upscale_enabled") ; - ClassDB::bind_method(_MD("set_tonemapper","mode"),&Environment::set_tonemapper); - ClassDB::bind_method(_MD("get_tonemapper"),&Environment::get_tonemapper); + ClassDB::bind_method(D_METHOD("set_tonemapper","mode"),&Environment::set_tonemapper); + ClassDB::bind_method(D_METHOD("get_tonemapper"),&Environment::get_tonemapper); - ClassDB::bind_method(_MD("set_tonemap_exposure","exposure"),&Environment::set_tonemap_exposure); - ClassDB::bind_method(_MD("get_tonemap_exposure"),&Environment::get_tonemap_exposure); + ClassDB::bind_method(D_METHOD("set_tonemap_exposure","exposure"),&Environment::set_tonemap_exposure); + ClassDB::bind_method(D_METHOD("get_tonemap_exposure"),&Environment::get_tonemap_exposure); - ClassDB::bind_method(_MD("set_tonemap_white","white"),&Environment::set_tonemap_white); - ClassDB::bind_method(_MD("get_tonemap_white"),&Environment::get_tonemap_white); + ClassDB::bind_method(D_METHOD("set_tonemap_white","white"),&Environment::set_tonemap_white); + ClassDB::bind_method(D_METHOD("get_tonemap_white"),&Environment::get_tonemap_white); - ClassDB::bind_method(_MD("set_tonemap_auto_exposure","auto_exposure"),&Environment::set_tonemap_auto_exposure); - ClassDB::bind_method(_MD("get_tonemap_auto_exposure"),&Environment::get_tonemap_auto_exposure); + ClassDB::bind_method(D_METHOD("set_tonemap_auto_exposure","auto_exposure"),&Environment::set_tonemap_auto_exposure); + ClassDB::bind_method(D_METHOD("get_tonemap_auto_exposure"),&Environment::get_tonemap_auto_exposure); - ClassDB::bind_method(_MD("set_tonemap_auto_exposure_max","exposure_max"),&Environment::set_tonemap_auto_exposure_max); - ClassDB::bind_method(_MD("get_tonemap_auto_exposure_max"),&Environment::get_tonemap_auto_exposure_max); + ClassDB::bind_method(D_METHOD("set_tonemap_auto_exposure_max","exposure_max"),&Environment::set_tonemap_auto_exposure_max); + ClassDB::bind_method(D_METHOD("get_tonemap_auto_exposure_max"),&Environment::get_tonemap_auto_exposure_max); - ClassDB::bind_method(_MD("set_tonemap_auto_exposure_min","exposure_min"),&Environment::set_tonemap_auto_exposure_min); - ClassDB::bind_method(_MD("get_tonemap_auto_exposure_min"),&Environment::get_tonemap_auto_exposure_min); + ClassDB::bind_method(D_METHOD("set_tonemap_auto_exposure_min","exposure_min"),&Environment::set_tonemap_auto_exposure_min); + ClassDB::bind_method(D_METHOD("get_tonemap_auto_exposure_min"),&Environment::get_tonemap_auto_exposure_min); - ClassDB::bind_method(_MD("set_tonemap_auto_exposure_speed","exposure_speed"),&Environment::set_tonemap_auto_exposure_speed); - ClassDB::bind_method(_MD("get_tonemap_auto_exposure_speed"),&Environment::get_tonemap_auto_exposure_speed); + ClassDB::bind_method(D_METHOD("set_tonemap_auto_exposure_speed","exposure_speed"),&Environment::set_tonemap_auto_exposure_speed); + ClassDB::bind_method(D_METHOD("get_tonemap_auto_exposure_speed"),&Environment::get_tonemap_auto_exposure_speed); - ClassDB::bind_method(_MD("set_tonemap_auto_exposure_grey","exposure_grey"),&Environment::set_tonemap_auto_exposure_grey); - ClassDB::bind_method(_MD("get_tonemap_auto_exposure_grey"),&Environment::get_tonemap_auto_exposure_grey); + ClassDB::bind_method(D_METHOD("set_tonemap_auto_exposure_grey","exposure_grey"),&Environment::set_tonemap_auto_exposure_grey); + ClassDB::bind_method(D_METHOD("get_tonemap_auto_exposure_grey"),&Environment::get_tonemap_auto_exposure_grey); ADD_GROUP("Tonemap","tonemap_"); @@ -931,20 +931,20 @@ void Environment::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL,"auto_expoure_max_luma",PROPERTY_HINT_RANGE,"0,16,0.01"),"set_tonemap_auto_exposure_max","get_tonemap_auto_exposure_max") ; ADD_PROPERTY(PropertyInfo(Variant::REAL,"auto_expoure_speed",PROPERTY_HINT_RANGE,"0.01,64,0.01"),"set_tonemap_auto_exposure_speed","get_tonemap_auto_exposure_speed") ; - ClassDB::bind_method(_MD("set_adjustment_enable","enabled"),&Environment::set_adjustment_enable); - ClassDB::bind_method(_MD("is_adjustment_enabled"),&Environment::is_adjustment_enabled); + ClassDB::bind_method(D_METHOD("set_adjustment_enable","enabled"),&Environment::set_adjustment_enable); + ClassDB::bind_method(D_METHOD("is_adjustment_enabled"),&Environment::is_adjustment_enabled); - ClassDB::bind_method(_MD("set_adjustment_brightness","brightness"),&Environment::set_adjustment_brightness); - ClassDB::bind_method(_MD("get_adjustment_brightness"),&Environment::get_adjustment_brightness); + ClassDB::bind_method(D_METHOD("set_adjustment_brightness","brightness"),&Environment::set_adjustment_brightness); + ClassDB::bind_method(D_METHOD("get_adjustment_brightness"),&Environment::get_adjustment_brightness); - ClassDB::bind_method(_MD("set_adjustment_contrast","contrast"),&Environment::set_adjustment_contrast); - ClassDB::bind_method(_MD("get_adjustment_contrast"),&Environment::get_adjustment_contrast); + ClassDB::bind_method(D_METHOD("set_adjustment_contrast","contrast"),&Environment::set_adjustment_contrast); + ClassDB::bind_method(D_METHOD("get_adjustment_contrast"),&Environment::get_adjustment_contrast); - ClassDB::bind_method(_MD("set_adjustment_saturation","saturation"),&Environment::set_adjustment_saturation); - ClassDB::bind_method(_MD("get_adjustment_saturation"),&Environment::get_adjustment_saturation); + ClassDB::bind_method(D_METHOD("set_adjustment_saturation","saturation"),&Environment::set_adjustment_saturation); + ClassDB::bind_method(D_METHOD("get_adjustment_saturation"),&Environment::get_adjustment_saturation); - ClassDB::bind_method(_MD("set_adjustment_color_correction","color_correction"),&Environment::set_adjustment_color_correction); - ClassDB::bind_method(_MD("get_adjustment_color_correction"),&Environment::get_adjustment_color_correction); + ClassDB::bind_method(D_METHOD("set_adjustment_color_correction","color_correction"),&Environment::set_adjustment_color_correction); + ClassDB::bind_method(D_METHOD("get_adjustment_color_correction"),&Environment::get_adjustment_color_correction); ADD_GROUP("Adjustments","adjustment_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"adjustment_enabled"),"set_adjustment_enable","is_adjustment_enabled") ; diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index d7cf629960..d94e046b98 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -78,14 +78,14 @@ void Font::update_changes() { void Font::_bind_methods() { - ClassDB::bind_method(_MD("draw","canvas_item","pos","string","modulate","clip_w"),&Font::draw,DEFVAL(Color(1,1,1)),DEFVAL(-1)); - ClassDB::bind_method(_MD("get_ascent"),&Font::get_ascent); - ClassDB::bind_method(_MD("get_descent"),&Font::get_descent); - ClassDB::bind_method(_MD("get_height"),&Font::get_height); - ClassDB::bind_method(_MD("is_distance_field_hint"),&Font::is_distance_field_hint); - ClassDB::bind_method(_MD("get_string_size","string"),&Font::get_string_size); - ClassDB::bind_method(_MD("draw_char","canvas_item","pos","char","next","modulate"),&Font::draw_char,DEFVAL(-1),DEFVAL(Color(1,1,1))); - ClassDB::bind_method(_MD("update_changes"),&Font::update_changes); + ClassDB::bind_method(D_METHOD("draw","canvas_item","pos","string","modulate","clip_w"),&Font::draw,DEFVAL(Color(1,1,1)),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("get_ascent"),&Font::get_ascent); + ClassDB::bind_method(D_METHOD("get_descent"),&Font::get_descent); + ClassDB::bind_method(D_METHOD("get_height"),&Font::get_height); + ClassDB::bind_method(D_METHOD("is_distance_field_hint"),&Font::is_distance_field_hint); + ClassDB::bind_method(D_METHOD("get_string_size","string"),&Font::get_string_size); + ClassDB::bind_method(D_METHOD("draw_char","canvas_item","pos","char","next","modulate"),&Font::draw_char,DEFVAL(-1),DEFVAL(Color(1,1,1))); + ClassDB::bind_method(D_METHOD("update_changes"),&Font::update_changes); } @@ -566,39 +566,39 @@ Size2 BitmapFont::get_char_size(CharType p_char,CharType p_next) const { void BitmapFont::_bind_methods() { - ClassDB::bind_method(_MD("create_from_fnt","path"),&BitmapFont::create_from_fnt); - ClassDB::bind_method(_MD("set_height","px"),&BitmapFont::set_height); + ClassDB::bind_method(D_METHOD("create_from_fnt","path"),&BitmapFont::create_from_fnt); + ClassDB::bind_method(D_METHOD("set_height","px"),&BitmapFont::set_height); - ClassDB::bind_method(_MD("set_ascent","px"),&BitmapFont::set_ascent); + ClassDB::bind_method(D_METHOD("set_ascent","px"),&BitmapFont::set_ascent); - ClassDB::bind_method(_MD("add_kerning_pair","char_a","char_b","kerning"),&BitmapFont::add_kerning_pair); - ClassDB::bind_method(_MD("get_kerning_pair","char_a","char_b"),&BitmapFont::get_kerning_pair); + ClassDB::bind_method(D_METHOD("add_kerning_pair","char_a","char_b","kerning"),&BitmapFont::add_kerning_pair); + ClassDB::bind_method(D_METHOD("get_kerning_pair","char_a","char_b"),&BitmapFont::get_kerning_pair); - ClassDB::bind_method(_MD("add_texture","texture:Texture"),&BitmapFont::add_texture); - ClassDB::bind_method(_MD("add_char","character","texture","rect","align","advance"),&BitmapFont::add_char,DEFVAL(Point2()),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("add_texture","texture:Texture"),&BitmapFont::add_texture); + ClassDB::bind_method(D_METHOD("add_char","character","texture","rect","align","advance"),&BitmapFont::add_char,DEFVAL(Point2()),DEFVAL(-1)); - ClassDB::bind_method(_MD("get_texture_count"),&BitmapFont::get_texture_count); - ClassDB::bind_method(_MD("get_texture:Texture","idx"),&BitmapFont::get_texture); + ClassDB::bind_method(D_METHOD("get_texture_count"),&BitmapFont::get_texture_count); + ClassDB::bind_method(D_METHOD("get_texture:Texture","idx"),&BitmapFont::get_texture); - ClassDB::bind_method(_MD("get_char_size","char","next"),&BitmapFont::get_char_size,DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_char_size","char","next"),&BitmapFont::get_char_size,DEFVAL(0)); - ClassDB::bind_method(_MD("set_distance_field_hint","enable"),&BitmapFont::set_distance_field_hint); + ClassDB::bind_method(D_METHOD("set_distance_field_hint","enable"),&BitmapFont::set_distance_field_hint); - ClassDB::bind_method(_MD("clear"),&BitmapFont::clear); + ClassDB::bind_method(D_METHOD("clear"),&BitmapFont::clear); - ClassDB::bind_method(_MD("_set_chars"),&BitmapFont::_set_chars); - ClassDB::bind_method(_MD("_get_chars"),&BitmapFont::_get_chars); + ClassDB::bind_method(D_METHOD("_set_chars"),&BitmapFont::_set_chars); + ClassDB::bind_method(D_METHOD("_get_chars"),&BitmapFont::_get_chars); - ClassDB::bind_method(_MD("_set_kernings"),&BitmapFont::_set_kernings); - ClassDB::bind_method(_MD("_get_kernings"),&BitmapFont::_get_kernings); + ClassDB::bind_method(D_METHOD("_set_kernings"),&BitmapFont::_set_kernings); + ClassDB::bind_method(D_METHOD("_get_kernings"),&BitmapFont::_get_kernings); - ClassDB::bind_method(_MD("_set_textures"),&BitmapFont::_set_textures); - ClassDB::bind_method(_MD("_get_textures"),&BitmapFont::_get_textures); + ClassDB::bind_method(D_METHOD("_set_textures"),&BitmapFont::_set_textures); + ClassDB::bind_method(D_METHOD("_get_textures"),&BitmapFont::_get_textures); - ClassDB::bind_method(_MD("set_fallback","fallback"),&BitmapFont::set_fallback); - ClassDB::bind_method(_MD("get_fallback"),&BitmapFont::get_fallback); + ClassDB::bind_method(D_METHOD("set_fallback","fallback"),&BitmapFont::set_fallback); + ClassDB::bind_method(D_METHOD("get_fallback"),&BitmapFont::get_fallback); ADD_PROPERTY( PropertyInfo( Variant::ARRAY, "textures", PROPERTY_HINT_NONE,"", PROPERTY_USAGE_NOEDITOR ), "_set_textures", "_get_textures") ; ADD_PROPERTY( PropertyInfo( Variant::POOL_INT_ARRAY, "chars", PROPERTY_HINT_NONE,"", PROPERTY_USAGE_NOEDITOR ), "_set_chars", "_get_chars") ; diff --git a/scene/resources/gibberish_stream.cpp b/scene/resources/gibberish_stream.cpp index 8b8ae63ab0..fdc5bf01e8 100644 --- a/scene/resources/gibberish_stream.cpp +++ b/scene/resources/gibberish_stream.cpp @@ -305,17 +305,17 @@ float AudioStreamGibberish::get_pitch_random_scale() const { void AudioStreamGibberish::_bind_methods() { - ClassDB::bind_method(_MD("set_phonemes","phonemes"),&AudioStreamGibberish::set_phonemes); - ClassDB::bind_method(_MD("get_phonemes"),&AudioStreamGibberish::get_phonemes); + ClassDB::bind_method(D_METHOD("set_phonemes","phonemes"),&AudioStreamGibberish::set_phonemes); + ClassDB::bind_method(D_METHOD("get_phonemes"),&AudioStreamGibberish::get_phonemes); - ClassDB::bind_method(_MD("set_pitch_scale","pitch_scale"),&AudioStreamGibberish::set_pitch_scale); - ClassDB::bind_method(_MD("get_pitch_scale"),&AudioStreamGibberish::get_pitch_scale); + ClassDB::bind_method(D_METHOD("set_pitch_scale","pitch_scale"),&AudioStreamGibberish::set_pitch_scale); + ClassDB::bind_method(D_METHOD("get_pitch_scale"),&AudioStreamGibberish::get_pitch_scale); - ClassDB::bind_method(_MD("set_pitch_random_scale","pitch_random_scale"),&AudioStreamGibberish::set_pitch_random_scale); - ClassDB::bind_method(_MD("get_pitch_random_scale"),&AudioStreamGibberish::get_pitch_random_scale); + ClassDB::bind_method(D_METHOD("set_pitch_random_scale","pitch_random_scale"),&AudioStreamGibberish::set_pitch_random_scale); + ClassDB::bind_method(D_METHOD("get_pitch_random_scale"),&AudioStreamGibberish::get_pitch_random_scale); - ClassDB::bind_method(_MD("set_xfade_time","sec"),&AudioStreamGibberish::set_xfade_time); - ClassDB::bind_method(_MD("get_xfade_time"),&AudioStreamGibberish::get_xfade_time); + ClassDB::bind_method(D_METHOD("set_xfade_time","sec"),&AudioStreamGibberish::set_xfade_time); + ClassDB::bind_method(D_METHOD("get_xfade_time"),&AudioStreamGibberish::get_xfade_time); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"phonemes",PROPERTY_HINT_RESOURCE_TYPE,"SampleLibrary"),"set_phonemes","get_phonemes"); ADD_PROPERTY( PropertyInfo(Variant::REAL,"pitch_scale",PROPERTY_HINT_RANGE,"0.01,64,0.01"),"set_pitch_scale","get_pitch_scale"); diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index ea088cb909..b7c8b1664d 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -831,101 +831,101 @@ Vector2 FixedSpatialMaterial::get_uv2_offset() const{ void FixedSpatialMaterial::_bind_methods() { - ClassDB::bind_method(_MD("set_albedo","albedo"),&FixedSpatialMaterial::set_albedo); - ClassDB::bind_method(_MD("get_albedo"),&FixedSpatialMaterial::get_albedo); + ClassDB::bind_method(D_METHOD("set_albedo","albedo"),&FixedSpatialMaterial::set_albedo); + ClassDB::bind_method(D_METHOD("get_albedo"),&FixedSpatialMaterial::get_albedo); - ClassDB::bind_method(_MD("set_specular_mode","specular_mode"),&FixedSpatialMaterial::set_specular_mode); - ClassDB::bind_method(_MD("get_specular_mode"),&FixedSpatialMaterial::get_specular_mode); + ClassDB::bind_method(D_METHOD("set_specular_mode","specular_mode"),&FixedSpatialMaterial::set_specular_mode); + ClassDB::bind_method(D_METHOD("get_specular_mode"),&FixedSpatialMaterial::get_specular_mode); - ClassDB::bind_method(_MD("set_specular","specular"),&FixedSpatialMaterial::set_specular); - ClassDB::bind_method(_MD("get_specular"),&FixedSpatialMaterial::get_specular); + ClassDB::bind_method(D_METHOD("set_specular","specular"),&FixedSpatialMaterial::set_specular); + ClassDB::bind_method(D_METHOD("get_specular"),&FixedSpatialMaterial::get_specular); - ClassDB::bind_method(_MD("set_metalness","metalness"),&FixedSpatialMaterial::set_metalness); - ClassDB::bind_method(_MD("get_metalness"),&FixedSpatialMaterial::get_metalness); + ClassDB::bind_method(D_METHOD("set_metalness","metalness"),&FixedSpatialMaterial::set_metalness); + ClassDB::bind_method(D_METHOD("get_metalness"),&FixedSpatialMaterial::get_metalness); - ClassDB::bind_method(_MD("set_roughness","roughness"),&FixedSpatialMaterial::set_roughness); - ClassDB::bind_method(_MD("get_roughness"),&FixedSpatialMaterial::get_roughness); + ClassDB::bind_method(D_METHOD("set_roughness","roughness"),&FixedSpatialMaterial::set_roughness); + ClassDB::bind_method(D_METHOD("get_roughness"),&FixedSpatialMaterial::get_roughness); - ClassDB::bind_method(_MD("set_emission","emission"),&FixedSpatialMaterial::set_emission); - ClassDB::bind_method(_MD("get_emission"),&FixedSpatialMaterial::get_emission); + ClassDB::bind_method(D_METHOD("set_emission","emission"),&FixedSpatialMaterial::set_emission); + ClassDB::bind_method(D_METHOD("get_emission"),&FixedSpatialMaterial::get_emission); - ClassDB::bind_method(_MD("set_emission_energy","emission_energy"),&FixedSpatialMaterial::set_emission_energy); - ClassDB::bind_method(_MD("get_emission_energy"),&FixedSpatialMaterial::get_emission_energy); + ClassDB::bind_method(D_METHOD("set_emission_energy","emission_energy"),&FixedSpatialMaterial::set_emission_energy); + ClassDB::bind_method(D_METHOD("get_emission_energy"),&FixedSpatialMaterial::get_emission_energy); - ClassDB::bind_method(_MD("set_normal_scale","normal_scale"),&FixedSpatialMaterial::set_normal_scale); - ClassDB::bind_method(_MD("get_normal_scale"),&FixedSpatialMaterial::get_normal_scale); + ClassDB::bind_method(D_METHOD("set_normal_scale","normal_scale"),&FixedSpatialMaterial::set_normal_scale); + ClassDB::bind_method(D_METHOD("get_normal_scale"),&FixedSpatialMaterial::get_normal_scale); - ClassDB::bind_method(_MD("set_rim","rim"),&FixedSpatialMaterial::set_rim); - ClassDB::bind_method(_MD("get_rim"),&FixedSpatialMaterial::get_rim); + ClassDB::bind_method(D_METHOD("set_rim","rim"),&FixedSpatialMaterial::set_rim); + ClassDB::bind_method(D_METHOD("get_rim"),&FixedSpatialMaterial::get_rim); - ClassDB::bind_method(_MD("set_rim_tint","rim_tint"),&FixedSpatialMaterial::set_rim_tint); - ClassDB::bind_method(_MD("get_rim_tint"),&FixedSpatialMaterial::get_rim_tint); + ClassDB::bind_method(D_METHOD("set_rim_tint","rim_tint"),&FixedSpatialMaterial::set_rim_tint); + ClassDB::bind_method(D_METHOD("get_rim_tint"),&FixedSpatialMaterial::get_rim_tint); - ClassDB::bind_method(_MD("set_clearcoat","clearcoat"),&FixedSpatialMaterial::set_clearcoat); - ClassDB::bind_method(_MD("get_clearcoat"),&FixedSpatialMaterial::get_clearcoat); + ClassDB::bind_method(D_METHOD("set_clearcoat","clearcoat"),&FixedSpatialMaterial::set_clearcoat); + ClassDB::bind_method(D_METHOD("get_clearcoat"),&FixedSpatialMaterial::get_clearcoat); - ClassDB::bind_method(_MD("set_clearcoat_gloss","clearcoat_gloss"),&FixedSpatialMaterial::set_clearcoat_gloss); - ClassDB::bind_method(_MD("get_clearcoat_gloss"),&FixedSpatialMaterial::get_clearcoat_gloss); + ClassDB::bind_method(D_METHOD("set_clearcoat_gloss","clearcoat_gloss"),&FixedSpatialMaterial::set_clearcoat_gloss); + ClassDB::bind_method(D_METHOD("get_clearcoat_gloss"),&FixedSpatialMaterial::get_clearcoat_gloss); - ClassDB::bind_method(_MD("set_anisotropy","anisotropy"),&FixedSpatialMaterial::set_anisotropy); - ClassDB::bind_method(_MD("get_anisotropy"),&FixedSpatialMaterial::get_anisotropy); + ClassDB::bind_method(D_METHOD("set_anisotropy","anisotropy"),&FixedSpatialMaterial::set_anisotropy); + ClassDB::bind_method(D_METHOD("get_anisotropy"),&FixedSpatialMaterial::get_anisotropy); - ClassDB::bind_method(_MD("set_height_scale","height_scale"),&FixedSpatialMaterial::set_height_scale); - ClassDB::bind_method(_MD("get_height_scale"),&FixedSpatialMaterial::get_height_scale); + ClassDB::bind_method(D_METHOD("set_height_scale","height_scale"),&FixedSpatialMaterial::set_height_scale); + ClassDB::bind_method(D_METHOD("get_height_scale"),&FixedSpatialMaterial::get_height_scale); - ClassDB::bind_method(_MD("set_subsurface_scattering_strength","strength"),&FixedSpatialMaterial::set_subsurface_scattering_strength); - ClassDB::bind_method(_MD("get_subsurface_scattering_strength"),&FixedSpatialMaterial::get_subsurface_scattering_strength); + ClassDB::bind_method(D_METHOD("set_subsurface_scattering_strength","strength"),&FixedSpatialMaterial::set_subsurface_scattering_strength); + ClassDB::bind_method(D_METHOD("get_subsurface_scattering_strength"),&FixedSpatialMaterial::get_subsurface_scattering_strength); - ClassDB::bind_method(_MD("set_refraction","refraction"),&FixedSpatialMaterial::set_refraction); - ClassDB::bind_method(_MD("get_refraction"),&FixedSpatialMaterial::get_refraction); + ClassDB::bind_method(D_METHOD("set_refraction","refraction"),&FixedSpatialMaterial::set_refraction); + ClassDB::bind_method(D_METHOD("get_refraction"),&FixedSpatialMaterial::get_refraction); - ClassDB::bind_method(_MD("set_refraction_roughness","refraction_roughness"),&FixedSpatialMaterial::set_refraction_roughness); - ClassDB::bind_method(_MD("get_refraction_roughness"),&FixedSpatialMaterial::get_refraction_roughness); + ClassDB::bind_method(D_METHOD("set_refraction_roughness","refraction_roughness"),&FixedSpatialMaterial::set_refraction_roughness); + ClassDB::bind_method(D_METHOD("get_refraction_roughness"),&FixedSpatialMaterial::get_refraction_roughness); - ClassDB::bind_method(_MD("set_line_width","line_width"),&FixedSpatialMaterial::set_line_width); - ClassDB::bind_method(_MD("get_line_width"),&FixedSpatialMaterial::get_line_width); + ClassDB::bind_method(D_METHOD("set_line_width","line_width"),&FixedSpatialMaterial::set_line_width); + ClassDB::bind_method(D_METHOD("get_line_width"),&FixedSpatialMaterial::get_line_width); - ClassDB::bind_method(_MD("set_point_size","point_size"),&FixedSpatialMaterial::set_point_size); - ClassDB::bind_method(_MD("get_point_size"),&FixedSpatialMaterial::get_point_size); + ClassDB::bind_method(D_METHOD("set_point_size","point_size"),&FixedSpatialMaterial::set_point_size); + ClassDB::bind_method(D_METHOD("get_point_size"),&FixedSpatialMaterial::get_point_size); - ClassDB::bind_method(_MD("set_detail_uv","detail_uv"),&FixedSpatialMaterial::set_detail_uv); - ClassDB::bind_method(_MD("get_detail_uv"),&FixedSpatialMaterial::get_detail_uv); + ClassDB::bind_method(D_METHOD("set_detail_uv","detail_uv"),&FixedSpatialMaterial::set_detail_uv); + ClassDB::bind_method(D_METHOD("get_detail_uv"),&FixedSpatialMaterial::get_detail_uv); - ClassDB::bind_method(_MD("set_blend_mode","blend_mode"),&FixedSpatialMaterial::set_blend_mode); - ClassDB::bind_method(_MD("get_blend_mode"),&FixedSpatialMaterial::get_blend_mode); + ClassDB::bind_method(D_METHOD("set_blend_mode","blend_mode"),&FixedSpatialMaterial::set_blend_mode); + ClassDB::bind_method(D_METHOD("get_blend_mode"),&FixedSpatialMaterial::get_blend_mode); - ClassDB::bind_method(_MD("set_depth_draw_mode","depth_draw_mode"),&FixedSpatialMaterial::set_depth_draw_mode); - ClassDB::bind_method(_MD("get_depth_draw_mode"),&FixedSpatialMaterial::get_depth_draw_mode); + ClassDB::bind_method(D_METHOD("set_depth_draw_mode","depth_draw_mode"),&FixedSpatialMaterial::set_depth_draw_mode); + ClassDB::bind_method(D_METHOD("get_depth_draw_mode"),&FixedSpatialMaterial::get_depth_draw_mode); - ClassDB::bind_method(_MD("set_cull_mode","cull_mode"),&FixedSpatialMaterial::set_cull_mode); - ClassDB::bind_method(_MD("get_cull_mode"),&FixedSpatialMaterial::get_cull_mode); + ClassDB::bind_method(D_METHOD("set_cull_mode","cull_mode"),&FixedSpatialMaterial::set_cull_mode); + ClassDB::bind_method(D_METHOD("get_cull_mode"),&FixedSpatialMaterial::get_cull_mode); - ClassDB::bind_method(_MD("set_diffuse_mode","diffuse_mode"),&FixedSpatialMaterial::set_diffuse_mode); - ClassDB::bind_method(_MD("get_diffuse_mode"),&FixedSpatialMaterial::get_diffuse_mode); + ClassDB::bind_method(D_METHOD("set_diffuse_mode","diffuse_mode"),&FixedSpatialMaterial::set_diffuse_mode); + ClassDB::bind_method(D_METHOD("get_diffuse_mode"),&FixedSpatialMaterial::get_diffuse_mode); - ClassDB::bind_method(_MD("set_flag","flag","enable"),&FixedSpatialMaterial::set_flag); - ClassDB::bind_method(_MD("get_flag"),&FixedSpatialMaterial::get_flag); + ClassDB::bind_method(D_METHOD("set_flag","flag","enable"),&FixedSpatialMaterial::set_flag); + ClassDB::bind_method(D_METHOD("get_flag"),&FixedSpatialMaterial::get_flag); - ClassDB::bind_method(_MD("set_feature","feature","enable"),&FixedSpatialMaterial::set_feature); - ClassDB::bind_method(_MD("get_feature","feature"),&FixedSpatialMaterial::get_feature); + ClassDB::bind_method(D_METHOD("set_feature","feature","enable"),&FixedSpatialMaterial::set_feature); + ClassDB::bind_method(D_METHOD("get_feature","feature"),&FixedSpatialMaterial::get_feature); - ClassDB::bind_method(_MD("set_texture","param:Texture","texture"),&FixedSpatialMaterial::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture","param:Texture"),&FixedSpatialMaterial::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","param:Texture","texture"),&FixedSpatialMaterial::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture","param:Texture"),&FixedSpatialMaterial::get_texture); - ClassDB::bind_method(_MD("set_detail_blend_mode","detail_blend_mode"),&FixedSpatialMaterial::set_detail_blend_mode); - ClassDB::bind_method(_MD("get_detail_blend_mode"),&FixedSpatialMaterial::get_detail_blend_mode); + ClassDB::bind_method(D_METHOD("set_detail_blend_mode","detail_blend_mode"),&FixedSpatialMaterial::set_detail_blend_mode); + ClassDB::bind_method(D_METHOD("get_detail_blend_mode"),&FixedSpatialMaterial::get_detail_blend_mode); - ClassDB::bind_method(_MD("set_uv1_scale","scale"),&FixedSpatialMaterial::set_uv1_scale); - ClassDB::bind_method(_MD("get_uv1_scale"),&FixedSpatialMaterial::get_uv1_scale); + ClassDB::bind_method(D_METHOD("set_uv1_scale","scale"),&FixedSpatialMaterial::set_uv1_scale); + ClassDB::bind_method(D_METHOD("get_uv1_scale"),&FixedSpatialMaterial::get_uv1_scale); - ClassDB::bind_method(_MD("set_uv1_offset","offset"),&FixedSpatialMaterial::set_uv1_offset); - ClassDB::bind_method(_MD("get_uv1_offset"),&FixedSpatialMaterial::get_uv1_offset); + ClassDB::bind_method(D_METHOD("set_uv1_offset","offset"),&FixedSpatialMaterial::set_uv1_offset); + ClassDB::bind_method(D_METHOD("get_uv1_offset"),&FixedSpatialMaterial::get_uv1_offset); - ClassDB::bind_method(_MD("set_uv2_scale","scale"),&FixedSpatialMaterial::set_uv2_scale); - ClassDB::bind_method(_MD("get_uv2_scale"),&FixedSpatialMaterial::get_uv2_scale); + ClassDB::bind_method(D_METHOD("set_uv2_scale","scale"),&FixedSpatialMaterial::set_uv2_scale); + ClassDB::bind_method(D_METHOD("get_uv2_scale"),&FixedSpatialMaterial::get_uv2_scale); - ClassDB::bind_method(_MD("set_uv2_offset","offset"),&FixedSpatialMaterial::set_uv2_offset); - ClassDB::bind_method(_MD("get_uv2_offset"),&FixedSpatialMaterial::get_uv2_offset); + ClassDB::bind_method(D_METHOD("set_uv2_offset","offset"),&FixedSpatialMaterial::set_uv2_offset); + ClassDB::bind_method(D_METHOD("get_uv2_offset"),&FixedSpatialMaterial::get_uv2_offset); ADD_GROUP("Flags","flags_"); ADD_PROPERTYI(PropertyInfo(Variant::BOOL,"flags_transparent"),"set_feature","get_feature",FEATURE_TRANSPARENT); diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index a174fffcc4..03d516329a 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -1019,31 +1019,31 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const { void Mesh::_bind_methods() { - ClassDB::bind_method(_MD("add_blend_shape","name"),&Mesh::add_blend_shape); - ClassDB::bind_method(_MD("get_blend_shape_count"),&Mesh::get_blend_shape_count); - ClassDB::bind_method(_MD("get_blend_shape_name","index"),&Mesh::get_blend_shape_name); - ClassDB::bind_method(_MD("clear_blend_shapes"),&Mesh::clear_blend_shapes); - ClassDB::bind_method(_MD("set_blend_shape_mode","mode"),&Mesh::set_blend_shape_mode); - ClassDB::bind_method(_MD("get_blend_shape_mode"),&Mesh::get_blend_shape_mode); - - ClassDB::bind_method(_MD("add_surface_from_arrays","primitive","arrays","blend_shapes","compress_flags"),&Mesh::add_surface_from_arrays,DEFVAL(Array()),DEFVAL(ARRAY_COMPRESS_DEFAULT)); - ClassDB::bind_method(_MD("get_surface_count"),&Mesh::get_surface_count); - ClassDB::bind_method(_MD("surface_remove","surf_idx"),&Mesh::surface_remove); - ClassDB::bind_method(_MD("surface_get_array_len","surf_idx"),&Mesh::surface_get_array_len); - ClassDB::bind_method(_MD("surface_get_array_index_len","surf_idx"),&Mesh::surface_get_array_index_len); - ClassDB::bind_method(_MD("surface_get_format","surf_idx"),&Mesh::surface_get_format); - ClassDB::bind_method(_MD("surface_get_primitive_type","surf_idx"),&Mesh::surface_get_primitive_type); - ClassDB::bind_method(_MD("surface_set_material","surf_idx","material:Material"),&Mesh::surface_set_material); - ClassDB::bind_method(_MD("surface_get_material:Material","surf_idx"),&Mesh::surface_get_material); - ClassDB::bind_method(_MD("surface_set_name","surf_idx","name"),&Mesh::surface_set_name); - ClassDB::bind_method(_MD("surface_get_name","surf_idx"),&Mesh::surface_get_name); - ClassDB::bind_method(_MD("center_geometry"),&Mesh::center_geometry); + ClassDB::bind_method(D_METHOD("add_blend_shape","name"),&Mesh::add_blend_shape); + ClassDB::bind_method(D_METHOD("get_blend_shape_count"),&Mesh::get_blend_shape_count); + ClassDB::bind_method(D_METHOD("get_blend_shape_name","index"),&Mesh::get_blend_shape_name); + ClassDB::bind_method(D_METHOD("clear_blend_shapes"),&Mesh::clear_blend_shapes); + ClassDB::bind_method(D_METHOD("set_blend_shape_mode","mode"),&Mesh::set_blend_shape_mode); + ClassDB::bind_method(D_METHOD("get_blend_shape_mode"),&Mesh::get_blend_shape_mode); + + ClassDB::bind_method(D_METHOD("add_surface_from_arrays","primitive","arrays","blend_shapes","compress_flags"),&Mesh::add_surface_from_arrays,DEFVAL(Array()),DEFVAL(ARRAY_COMPRESS_DEFAULT)); + ClassDB::bind_method(D_METHOD("get_surface_count"),&Mesh::get_surface_count); + ClassDB::bind_method(D_METHOD("surface_remove","surf_idx"),&Mesh::surface_remove); + ClassDB::bind_method(D_METHOD("surface_get_array_len","surf_idx"),&Mesh::surface_get_array_len); + ClassDB::bind_method(D_METHOD("surface_get_array_index_len","surf_idx"),&Mesh::surface_get_array_index_len); + ClassDB::bind_method(D_METHOD("surface_get_format","surf_idx"),&Mesh::surface_get_format); + ClassDB::bind_method(D_METHOD("surface_get_primitive_type","surf_idx"),&Mesh::surface_get_primitive_type); + ClassDB::bind_method(D_METHOD("surface_set_material","surf_idx","material:Material"),&Mesh::surface_set_material); + ClassDB::bind_method(D_METHOD("surface_get_material:Material","surf_idx"),&Mesh::surface_get_material); + ClassDB::bind_method(D_METHOD("surface_set_name","surf_idx","name"),&Mesh::surface_set_name); + ClassDB::bind_method(D_METHOD("surface_get_name","surf_idx"),&Mesh::surface_get_name); + ClassDB::bind_method(D_METHOD("center_geometry"),&Mesh::center_geometry); ClassDB::set_method_flags(get_class_static(),_scs_create("center_geometry"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("regen_normalmaps"),&Mesh::regen_normalmaps); + ClassDB::bind_method(D_METHOD("regen_normalmaps"),&Mesh::regen_normalmaps); ClassDB::set_method_flags(get_class_static(),_scs_create("regen_normalmaps"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("set_custom_aabb","aabb"),&Mesh::set_custom_aabb); - ClassDB::bind_method(_MD("get_custom_aabb"),&Mesh::get_custom_aabb); + ClassDB::bind_method(D_METHOD("set_custom_aabb","aabb"),&Mesh::set_custom_aabb); + ClassDB::bind_method(D_METHOD("get_custom_aabb"),&Mesh::get_custom_aabb); BIND_CONSTANT( NO_INDEX_ARRAY ); diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index ec699ee8e3..abe335aa5b 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -565,62 +565,62 @@ void MeshDataTool::set_material(const Ref<Material> &p_material) { void MeshDataTool::_bind_methods() { - ClassDB::bind_method(_MD("clear"),&MeshDataTool::clear); - ClassDB::bind_method(_MD("create_from_surface","mesh","surface"),&MeshDataTool::create_from_surface); - ClassDB::bind_method(_MD("commit_to_surface","mesh"),&MeshDataTool::commit_to_surface); + ClassDB::bind_method(D_METHOD("clear"),&MeshDataTool::clear); + ClassDB::bind_method(D_METHOD("create_from_surface","mesh","surface"),&MeshDataTool::create_from_surface); + ClassDB::bind_method(D_METHOD("commit_to_surface","mesh"),&MeshDataTool::commit_to_surface); - ClassDB::bind_method(_MD("get_format"),&MeshDataTool::get_format); + ClassDB::bind_method(D_METHOD("get_format"),&MeshDataTool::get_format); - ClassDB::bind_method(_MD("get_vertex_count"),&MeshDataTool::get_vertex_count); - ClassDB::bind_method(_MD("get_edge_count"),&MeshDataTool::get_edge_count); - ClassDB::bind_method(_MD("get_face_count"),&MeshDataTool::get_face_count); + ClassDB::bind_method(D_METHOD("get_vertex_count"),&MeshDataTool::get_vertex_count); + ClassDB::bind_method(D_METHOD("get_edge_count"),&MeshDataTool::get_edge_count); + ClassDB::bind_method(D_METHOD("get_face_count"),&MeshDataTool::get_face_count); - ClassDB::bind_method(_MD("set_vertex","idx","vertex"),&MeshDataTool::set_vertex); - ClassDB::bind_method(_MD("get_vertex","idx"),&MeshDataTool::get_vertex); + ClassDB::bind_method(D_METHOD("set_vertex","idx","vertex"),&MeshDataTool::set_vertex); + ClassDB::bind_method(D_METHOD("get_vertex","idx"),&MeshDataTool::get_vertex); - ClassDB::bind_method(_MD("set_vertex_normal","idx","normal"),&MeshDataTool::set_vertex_normal); - ClassDB::bind_method(_MD("get_vertex_normal","idx"),&MeshDataTool::get_vertex_normal); + ClassDB::bind_method(D_METHOD("set_vertex_normal","idx","normal"),&MeshDataTool::set_vertex_normal); + ClassDB::bind_method(D_METHOD("get_vertex_normal","idx"),&MeshDataTool::get_vertex_normal); - ClassDB::bind_method(_MD("set_vertex_tangent","idx","tangent"),&MeshDataTool::set_vertex_tangent); - ClassDB::bind_method(_MD("get_vertex_tangent","idx"),&MeshDataTool::get_vertex_tangent); + ClassDB::bind_method(D_METHOD("set_vertex_tangent","idx","tangent"),&MeshDataTool::set_vertex_tangent); + ClassDB::bind_method(D_METHOD("get_vertex_tangent","idx"),&MeshDataTool::get_vertex_tangent); - ClassDB::bind_method(_MD("set_vertex_uv","idx","uv"),&MeshDataTool::set_vertex_uv); - ClassDB::bind_method(_MD("get_vertex_uv","idx"),&MeshDataTool::get_vertex_uv); + ClassDB::bind_method(D_METHOD("set_vertex_uv","idx","uv"),&MeshDataTool::set_vertex_uv); + ClassDB::bind_method(D_METHOD("get_vertex_uv","idx"),&MeshDataTool::get_vertex_uv); - ClassDB::bind_method(_MD("set_vertex_uv2","idx","uv2"),&MeshDataTool::set_vertex_uv2); - ClassDB::bind_method(_MD("get_vertex_uv2","idx"),&MeshDataTool::get_vertex_uv2); + ClassDB::bind_method(D_METHOD("set_vertex_uv2","idx","uv2"),&MeshDataTool::set_vertex_uv2); + ClassDB::bind_method(D_METHOD("get_vertex_uv2","idx"),&MeshDataTool::get_vertex_uv2); - ClassDB::bind_method(_MD("set_vertex_color","idx","color"),&MeshDataTool::set_vertex_color); - ClassDB::bind_method(_MD("get_vertex_color","idx"),&MeshDataTool::get_vertex_color); + ClassDB::bind_method(D_METHOD("set_vertex_color","idx","color"),&MeshDataTool::set_vertex_color); + ClassDB::bind_method(D_METHOD("get_vertex_color","idx"),&MeshDataTool::get_vertex_color); - ClassDB::bind_method(_MD("set_vertex_bones","idx","bones"),&MeshDataTool::set_vertex_bones); - ClassDB::bind_method(_MD("get_vertex_bones","idx"),&MeshDataTool::get_vertex_bones); + ClassDB::bind_method(D_METHOD("set_vertex_bones","idx","bones"),&MeshDataTool::set_vertex_bones); + ClassDB::bind_method(D_METHOD("get_vertex_bones","idx"),&MeshDataTool::get_vertex_bones); - ClassDB::bind_method(_MD("set_vertex_weights","idx","weights"),&MeshDataTool::set_vertex_weights); - ClassDB::bind_method(_MD("get_vertex_weights","idx"),&MeshDataTool::get_vertex_weights); + ClassDB::bind_method(D_METHOD("set_vertex_weights","idx","weights"),&MeshDataTool::set_vertex_weights); + ClassDB::bind_method(D_METHOD("get_vertex_weights","idx"),&MeshDataTool::get_vertex_weights); - ClassDB::bind_method(_MD("set_vertex_meta","idx","meta"),&MeshDataTool::set_vertex_meta); - ClassDB::bind_method(_MD("get_vertex_meta","idx"),&MeshDataTool::get_vertex_meta); + ClassDB::bind_method(D_METHOD("set_vertex_meta","idx","meta"),&MeshDataTool::set_vertex_meta); + ClassDB::bind_method(D_METHOD("get_vertex_meta","idx"),&MeshDataTool::get_vertex_meta); - ClassDB::bind_method(_MD("get_vertex_edges","idx"),&MeshDataTool::get_vertex_edges); - ClassDB::bind_method(_MD("get_vertex_faces","idx"),&MeshDataTool::get_vertex_faces); + ClassDB::bind_method(D_METHOD("get_vertex_edges","idx"),&MeshDataTool::get_vertex_edges); + ClassDB::bind_method(D_METHOD("get_vertex_faces","idx"),&MeshDataTool::get_vertex_faces); - ClassDB::bind_method(_MD("get_edge_vertex","idx","vertex"),&MeshDataTool::get_edge_vertex); - ClassDB::bind_method(_MD("get_edge_faces","idx","faces"),&MeshDataTool::get_edge_faces); + ClassDB::bind_method(D_METHOD("get_edge_vertex","idx","vertex"),&MeshDataTool::get_edge_vertex); + ClassDB::bind_method(D_METHOD("get_edge_faces","idx","faces"),&MeshDataTool::get_edge_faces); - ClassDB::bind_method(_MD("set_edge_meta","idx","meta"),&MeshDataTool::set_edge_meta); - ClassDB::bind_method(_MD("get_edge_meta","idx"),&MeshDataTool::get_edge_meta); + ClassDB::bind_method(D_METHOD("set_edge_meta","idx","meta"),&MeshDataTool::set_edge_meta); + ClassDB::bind_method(D_METHOD("get_edge_meta","idx"),&MeshDataTool::get_edge_meta); - ClassDB::bind_method(_MD("get_face_vertex","idx","vertex"),&MeshDataTool::get_face_vertex); - ClassDB::bind_method(_MD("get_face_edge","idx","edge"),&MeshDataTool::get_face_edge); + ClassDB::bind_method(D_METHOD("get_face_vertex","idx","vertex"),&MeshDataTool::get_face_vertex); + ClassDB::bind_method(D_METHOD("get_face_edge","idx","edge"),&MeshDataTool::get_face_edge); - ClassDB::bind_method(_MD("set_face_meta","idx","meta"),&MeshDataTool::set_face_meta); - ClassDB::bind_method(_MD("get_face_meta","idx"),&MeshDataTool::get_face_meta); + ClassDB::bind_method(D_METHOD("set_face_meta","idx","meta"),&MeshDataTool::set_face_meta); + ClassDB::bind_method(D_METHOD("get_face_meta","idx"),&MeshDataTool::get_face_meta); - ClassDB::bind_method(_MD("get_face_normal","idx"),&MeshDataTool::get_face_normal); + ClassDB::bind_method(D_METHOD("get_face_normal","idx"),&MeshDataTool::get_face_normal); - ClassDB::bind_method(_MD("set_material","material:Material"),&MeshDataTool::set_material); - ClassDB::bind_method(_MD("get_material","material"),&MeshDataTool::get_material); + ClassDB::bind_method(D_METHOD("set_material","material:Material"),&MeshDataTool::set_material); + ClassDB::bind_method(D_METHOD("get_material","material"),&MeshDataTool::get_material); } MeshDataTool::MeshDataTool(){ diff --git a/scene/resources/mesh_library.cpp b/scene/resources/mesh_library.cpp index cc357c4d9b..becbf39dad 100644 --- a/scene/resources/mesh_library.cpp +++ b/scene/resources/mesh_library.cpp @@ -244,19 +244,19 @@ int MeshLibrary::get_last_unused_item_id() const { void MeshLibrary::_bind_methods() { - ClassDB::bind_method(_MD("create_item","id"),&MeshLibrary::create_item); - ClassDB::bind_method(_MD("set_item_name","id","name"),&MeshLibrary::set_item_name); - ClassDB::bind_method(_MD("set_item_mesh","id","mesh:Mesh"),&MeshLibrary::set_item_mesh); - ClassDB::bind_method(_MD("set_item_navmesh","id","navmesh:NavigationMesh"),&MeshLibrary::set_item_navmesh); - ClassDB::bind_method(_MD("set_item_shape","id","shape:Shape"),&MeshLibrary::set_item_shape); - ClassDB::bind_method(_MD("get_item_name","id"),&MeshLibrary::get_item_name); - ClassDB::bind_method(_MD("get_item_mesh:Mesh","id"),&MeshLibrary::get_item_mesh); - ClassDB::bind_method(_MD("get_item_navmesh:NavigationMesh","id"),&MeshLibrary::get_item_navmesh); - ClassDB::bind_method(_MD("get_item_shape:Shape","id"),&MeshLibrary::get_item_shape); - ClassDB::bind_method(_MD("remove_item","id"),&MeshLibrary::remove_item); - ClassDB::bind_method(_MD("clear"),&MeshLibrary::clear); - ClassDB::bind_method(_MD("get_item_list"),&MeshLibrary::get_item_list); - ClassDB::bind_method(_MD("get_last_unused_item_id"),&MeshLibrary::get_last_unused_item_id); + ClassDB::bind_method(D_METHOD("create_item","id"),&MeshLibrary::create_item); + ClassDB::bind_method(D_METHOD("set_item_name","id","name"),&MeshLibrary::set_item_name); + ClassDB::bind_method(D_METHOD("set_item_mesh","id","mesh:Mesh"),&MeshLibrary::set_item_mesh); + ClassDB::bind_method(D_METHOD("set_item_navmesh","id","navmesh:NavigationMesh"),&MeshLibrary::set_item_navmesh); + ClassDB::bind_method(D_METHOD("set_item_shape","id","shape:Shape"),&MeshLibrary::set_item_shape); + ClassDB::bind_method(D_METHOD("get_item_name","id"),&MeshLibrary::get_item_name); + ClassDB::bind_method(D_METHOD("get_item_mesh:Mesh","id"),&MeshLibrary::get_item_mesh); + ClassDB::bind_method(D_METHOD("get_item_navmesh:NavigationMesh","id"),&MeshLibrary::get_item_navmesh); + ClassDB::bind_method(D_METHOD("get_item_shape:Shape","id"),&MeshLibrary::get_item_shape); + ClassDB::bind_method(D_METHOD("remove_item","id"),&MeshLibrary::remove_item); + ClassDB::bind_method(D_METHOD("clear"),&MeshLibrary::clear); + ClassDB::bind_method(D_METHOD("get_item_list"),&MeshLibrary::get_item_list); + ClassDB::bind_method(D_METHOD("get_last_unused_item_id"),&MeshLibrary::get_last_unused_item_id); } MeshLibrary::MeshLibrary() { diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index d72264c951..69ef3f18a6 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -211,26 +211,26 @@ MultiMesh::TransformFormat MultiMesh::get_transform_format() const{ void MultiMesh::_bind_methods() { - ClassDB::bind_method(_MD("set_mesh","mesh:Mesh"),&MultiMesh::set_mesh); - ClassDB::bind_method(_MD("get_mesh:Mesh"),&MultiMesh::get_mesh); - ClassDB::bind_method(_MD("set_color_format","format"),&MultiMesh::set_color_format); - ClassDB::bind_method(_MD("get_color_format"),&MultiMesh::get_color_format); - ClassDB::bind_method(_MD("set_transform_format","format"),&MultiMesh::set_transform_format); - ClassDB::bind_method(_MD("get_transform_format"),&MultiMesh::get_transform_format); - - ClassDB::bind_method(_MD("set_instance_count","count"),&MultiMesh::set_instance_count); - ClassDB::bind_method(_MD("get_instance_count"),&MultiMesh::get_instance_count); - ClassDB::bind_method(_MD("set_instance_transform","instance","transform"),&MultiMesh::set_instance_transform); - ClassDB::bind_method(_MD("get_instance_transform","instance"),&MultiMesh::get_instance_transform); - ClassDB::bind_method(_MD("set_instance_color","instance","color"),&MultiMesh::set_instance_color); - ClassDB::bind_method(_MD("get_instance_color","instance"),&MultiMesh::get_instance_color); - ClassDB::bind_method(_MD("get_aabb"),&MultiMesh::get_aabb); - - - ClassDB::bind_method(_MD("_set_transform_array"),&MultiMesh::_set_transform_array); - ClassDB::bind_method(_MD("_get_transform_array"),&MultiMesh::_get_transform_array); - ClassDB::bind_method(_MD("_set_color_array"),&MultiMesh::_set_color_array); - ClassDB::bind_method(_MD("_get_color_array"),&MultiMesh::_get_color_array); + ClassDB::bind_method(D_METHOD("set_mesh","mesh:Mesh"),&MultiMesh::set_mesh); + ClassDB::bind_method(D_METHOD("get_mesh:Mesh"),&MultiMesh::get_mesh); + ClassDB::bind_method(D_METHOD("set_color_format","format"),&MultiMesh::set_color_format); + ClassDB::bind_method(D_METHOD("get_color_format"),&MultiMesh::get_color_format); + ClassDB::bind_method(D_METHOD("set_transform_format","format"),&MultiMesh::set_transform_format); + ClassDB::bind_method(D_METHOD("get_transform_format"),&MultiMesh::get_transform_format); + + ClassDB::bind_method(D_METHOD("set_instance_count","count"),&MultiMesh::set_instance_count); + ClassDB::bind_method(D_METHOD("get_instance_count"),&MultiMesh::get_instance_count); + ClassDB::bind_method(D_METHOD("set_instance_transform","instance","transform"),&MultiMesh::set_instance_transform); + ClassDB::bind_method(D_METHOD("get_instance_transform","instance"),&MultiMesh::get_instance_transform); + ClassDB::bind_method(D_METHOD("set_instance_color","instance","color"),&MultiMesh::set_instance_color); + ClassDB::bind_method(D_METHOD("get_instance_color","instance"),&MultiMesh::get_instance_color); + ClassDB::bind_method(D_METHOD("get_aabb"),&MultiMesh::get_aabb); + + + ClassDB::bind_method(D_METHOD("_set_transform_array"),&MultiMesh::_set_transform_array); + ClassDB::bind_method(D_METHOD("_get_transform_array"),&MultiMesh::_get_transform_array); + ClassDB::bind_method(D_METHOD("_set_color_array"),&MultiMesh::_set_color_array); + ClassDB::bind_method(D_METHOD("_get_color_array"),&MultiMesh::_get_color_array); ADD_PROPERTY(PropertyInfo(Variant::INT,"color_format",PROPERTY_HINT_ENUM,"None,Byte,Float"), "set_color_format", "get_color_format"); diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 948bddf898..ce755d90db 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1716,25 +1716,25 @@ void SceneState::_bind_methods() { //unbuild API - ClassDB::bind_method(_MD("get_node_count"),&SceneState::get_node_count); - ClassDB::bind_method(_MD("get_node_type","idx"),&SceneState::get_node_type); - ClassDB::bind_method(_MD("get_node_name","idx"),&SceneState::get_node_name); - ClassDB::bind_method(_MD("get_node_path","idx","for_parent"),&SceneState::get_node_path,DEFVAL(false)); - ClassDB::bind_method(_MD("get_node_owner_path","idx"),&SceneState::get_node_owner_path); - ClassDB::bind_method(_MD("is_node_instance_placeholder","idx"),&SceneState::is_node_instance_placeholder); - ClassDB::bind_method(_MD("get_node_instance_placeholder","idx"),&SceneState::get_node_instance_placeholder); - ClassDB::bind_method(_MD("get_node_instance:PackedScene","idx"),&SceneState::get_node_instance); - ClassDB::bind_method(_MD("get_node_groups","idx"),&SceneState::_get_node_groups); - ClassDB::bind_method(_MD("get_node_property_count","idx"),&SceneState::get_node_property_count); - ClassDB::bind_method(_MD("get_node_property_name","idx","prop_idx"),&SceneState::get_node_property_name); - ClassDB::bind_method(_MD("get_node_property_value","idx","prop_idx"),&SceneState::get_node_property_value); - ClassDB::bind_method(_MD("get_connection_count"),&SceneState::get_connection_count); - ClassDB::bind_method(_MD("get_connection_source","idx"),&SceneState::get_connection_source); - ClassDB::bind_method(_MD("get_connection_signal","idx"),&SceneState::get_connection_signal); - ClassDB::bind_method(_MD("get_connection_target","idx"),&SceneState::get_connection_target); - ClassDB::bind_method(_MD("get_connection_method","idx"),&SceneState::get_connection_method); - ClassDB::bind_method(_MD("get_connection_flags","idx"),&SceneState::get_connection_flags); - ClassDB::bind_method(_MD("get_connection_binds","idx"),&SceneState::get_connection_binds); + ClassDB::bind_method(D_METHOD("get_node_count"),&SceneState::get_node_count); + ClassDB::bind_method(D_METHOD("get_node_type","idx"),&SceneState::get_node_type); + ClassDB::bind_method(D_METHOD("get_node_name","idx"),&SceneState::get_node_name); + ClassDB::bind_method(D_METHOD("get_node_path","idx","for_parent"),&SceneState::get_node_path,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_node_owner_path","idx"),&SceneState::get_node_owner_path); + ClassDB::bind_method(D_METHOD("is_node_instance_placeholder","idx"),&SceneState::is_node_instance_placeholder); + ClassDB::bind_method(D_METHOD("get_node_instance_placeholder","idx"),&SceneState::get_node_instance_placeholder); + ClassDB::bind_method(D_METHOD("get_node_instance:PackedScene","idx"),&SceneState::get_node_instance); + ClassDB::bind_method(D_METHOD("get_node_groups","idx"),&SceneState::_get_node_groups); + ClassDB::bind_method(D_METHOD("get_node_property_count","idx"),&SceneState::get_node_property_count); + ClassDB::bind_method(D_METHOD("get_node_property_name","idx","prop_idx"),&SceneState::get_node_property_name); + ClassDB::bind_method(D_METHOD("get_node_property_value","idx","prop_idx"),&SceneState::get_node_property_value); + ClassDB::bind_method(D_METHOD("get_connection_count"),&SceneState::get_connection_count); + ClassDB::bind_method(D_METHOD("get_connection_source","idx"),&SceneState::get_connection_source); + ClassDB::bind_method(D_METHOD("get_connection_signal","idx"),&SceneState::get_connection_signal); + ClassDB::bind_method(D_METHOD("get_connection_target","idx"),&SceneState::get_connection_target); + ClassDB::bind_method(D_METHOD("get_connection_method","idx"),&SceneState::get_connection_method); + ClassDB::bind_method(D_METHOD("get_connection_flags","idx"),&SceneState::get_connection_flags); + ClassDB::bind_method(D_METHOD("get_connection_binds","idx"),&SceneState::get_connection_binds); BIND_CONSTANT( GEN_EDIT_STATE_DISABLED ); BIND_CONSTANT( GEN_EDIT_STATE_INSTANCE ); @@ -1837,12 +1837,12 @@ void PackedScene::set_path(const String& p_path,bool p_take_over) { void PackedScene::_bind_methods() { - ClassDB::bind_method(_MD("pack","path:Node"),&PackedScene::pack); - ClassDB::bind_method(_MD("instance:Node","edit_state"),&PackedScene::instance,DEFVAL(false)); - ClassDB::bind_method(_MD("can_instance"),&PackedScene::can_instance); - ClassDB::bind_method(_MD("_set_bundled_scene"),&PackedScene::_set_bundled_scene); - ClassDB::bind_method(_MD("_get_bundled_scene"),&PackedScene::_get_bundled_scene); - ClassDB::bind_method(_MD("get_state:SceneState"),&PackedScene::get_state); + ClassDB::bind_method(D_METHOD("pack","path:Node"),&PackedScene::pack); + ClassDB::bind_method(D_METHOD("instance:Node","edit_state"),&PackedScene::instance,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("can_instance"),&PackedScene::can_instance); + ClassDB::bind_method(D_METHOD("_set_bundled_scene"),&PackedScene::_set_bundled_scene); + ClassDB::bind_method(D_METHOD("_get_bundled_scene"),&PackedScene::_get_bundled_scene); + ClassDB::bind_method(D_METHOD("get_state:SceneState"),&PackedScene::get_state); ADD_PROPERTY( PropertyInfo(Variant::DICTIONARY,"_bundled"),"_set_bundled_scene","_get_bundled_scene"); diff --git a/scene/resources/plane_shape.cpp b/scene/resources/plane_shape.cpp index e541c964b7..f1bb6d60c0 100644 --- a/scene/resources/plane_shape.cpp +++ b/scene/resources/plane_shape.cpp @@ -80,8 +80,8 @@ Plane PlaneShape::get_plane() const { void PlaneShape::_bind_methods() { - ClassDB::bind_method(_MD("set_plane","plane"),&PlaneShape::set_plane); - ClassDB::bind_method(_MD("get_plane"),&PlaneShape::get_plane); + ClassDB::bind_method(D_METHOD("set_plane","plane"),&PlaneShape::set_plane); + ClassDB::bind_method(D_METHOD("get_plane"),&PlaneShape::get_plane); ADD_PROPERTY( PropertyInfo(Variant::PLANE,"plane"), "set_plane", "get_plane") ; diff --git a/scene/resources/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp index 333c036965..6dac8a9779 100644 --- a/scene/resources/polygon_path_finder.cpp +++ b/scene/resources/polygon_path_finder.cpp @@ -618,17 +618,17 @@ float PolygonPathFinder::get_point_penalty(int p_point) const { void PolygonPathFinder::_bind_methods() { - ClassDB::bind_method(_MD("setup","points","connections"),&PolygonPathFinder::setup); - ClassDB::bind_method(_MD("find_path","from","to"),&PolygonPathFinder::find_path); - ClassDB::bind_method(_MD("get_intersections","from","to"),&PolygonPathFinder::get_intersections); - ClassDB::bind_method(_MD("get_closest_point","point"),&PolygonPathFinder::get_closest_point); - ClassDB::bind_method(_MD("is_point_inside","point"),&PolygonPathFinder::is_point_inside); - ClassDB::bind_method(_MD("set_point_penalty","idx","penalty"),&PolygonPathFinder::set_point_penalty); - ClassDB::bind_method(_MD("get_point_penalty","idx"),&PolygonPathFinder::get_point_penalty); - - ClassDB::bind_method(_MD("get_bounds"),&PolygonPathFinder::get_bounds); - ClassDB::bind_method(_MD("_set_data"),&PolygonPathFinder::_set_data); - ClassDB::bind_method(_MD("_get_data"),&PolygonPathFinder::_get_data); + ClassDB::bind_method(D_METHOD("setup","points","connections"),&PolygonPathFinder::setup); + ClassDB::bind_method(D_METHOD("find_path","from","to"),&PolygonPathFinder::find_path); + ClassDB::bind_method(D_METHOD("get_intersections","from","to"),&PolygonPathFinder::get_intersections); + ClassDB::bind_method(D_METHOD("get_closest_point","point"),&PolygonPathFinder::get_closest_point); + ClassDB::bind_method(D_METHOD("is_point_inside","point"),&PolygonPathFinder::is_point_inside); + ClassDB::bind_method(D_METHOD("set_point_penalty","idx","penalty"),&PolygonPathFinder::set_point_penalty); + ClassDB::bind_method(D_METHOD("get_point_penalty","idx"),&PolygonPathFinder::get_point_penalty); + + ClassDB::bind_method(D_METHOD("get_bounds"),&PolygonPathFinder::get_bounds); + ClassDB::bind_method(D_METHOD("_set_data"),&PolygonPathFinder::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&PolygonPathFinder::_get_data); ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_data","_get_data"); diff --git a/scene/resources/ray_shape.cpp b/scene/resources/ray_shape.cpp index d90df0baf3..52ce736925 100644 --- a/scene/resources/ray_shape.cpp +++ b/scene/resources/ray_shape.cpp @@ -60,8 +60,8 @@ float RayShape::get_length() const { void RayShape::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&RayShape::set_length); - ClassDB::bind_method(_MD("get_length"),&RayShape::get_length); + ClassDB::bind_method(D_METHOD("set_length","length"),&RayShape::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&RayShape::get_length); ADD_PROPERTY( PropertyInfo(Variant::REAL,"length",PROPERTY_HINT_RANGE,"0,4096,0.01"), "set_length", "get_length") ; diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp index 8c7580e903..1161843a2b 100644 --- a/scene/resources/rectangle_shape_2d.cpp +++ b/scene/resources/rectangle_shape_2d.cpp @@ -64,8 +64,8 @@ Rect2 RectangleShape2D::get_rect() const { void RectangleShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_extents","extents"),&RectangleShape2D::set_extents); - ClassDB::bind_method(_MD("get_extents"),&RectangleShape2D::get_extents); + ClassDB::bind_method(D_METHOD("set_extents","extents"),&RectangleShape2D::set_extents); + ClassDB::bind_method(D_METHOD("get_extents"),&RectangleShape2D::get_extents); diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp index 3374ae90ff..e677f92c31 100644 --- a/scene/resources/room.cpp +++ b/scene/resources/room.cpp @@ -52,8 +52,8 @@ PoolVector<Face3> RoomBounds::get_geometry_hint() const { void RoomBounds::_bind_methods() { - ClassDB::bind_method(_MD("set_geometry_hint","triangles"),&RoomBounds::set_geometry_hint); - ClassDB::bind_method(_MD("get_geometry_hint"),&RoomBounds::get_geometry_hint); + ClassDB::bind_method(D_METHOD("set_geometry_hint","triangles"),&RoomBounds::set_geometry_hint); + ClassDB::bind_method(D_METHOD("get_geometry_hint"),&RoomBounds::get_geometry_hint); //ADD_PROPERTY( PropertyInfo( Variant::DICTIONARY, "bounds"), "set_bounds","get_bounds") ; ADD_PROPERTY( PropertyInfo( Variant::POOL_VECTOR3_ARRAY, "geometry_hint"),"set_geometry_hint","get_geometry_hint") ; diff --git a/scene/resources/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp index ad663faaf9..fbe1efe5d1 100644 --- a/scene/resources/segment_shape_2d.cpp +++ b/scene/resources/segment_shape_2d.cpp @@ -82,11 +82,11 @@ Rect2 SegmentShape2D::get_rect() const{ void SegmentShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_a","a"),&SegmentShape2D::set_a); - ClassDB::bind_method(_MD("get_a"),&SegmentShape2D::get_a); + ClassDB::bind_method(D_METHOD("set_a","a"),&SegmentShape2D::set_a); + ClassDB::bind_method(D_METHOD("get_a"),&SegmentShape2D::get_a); - ClassDB::bind_method(_MD("set_b","b"),&SegmentShape2D::set_b); - ClassDB::bind_method(_MD("get_b"),&SegmentShape2D::get_b); + ClassDB::bind_method(D_METHOD("set_b","b"),&SegmentShape2D::set_b); + ClassDB::bind_method(D_METHOD("get_b"),&SegmentShape2D::get_b); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"a"),"set_a","get_a") ; @@ -145,8 +145,8 @@ Rect2 RayShape2D::get_rect() const { void RayShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&RayShape2D::set_length); - ClassDB::bind_method(_MD("get_length"),&RayShape2D::get_length); + ClassDB::bind_method(D_METHOD("set_length","length"),&RayShape2D::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&RayShape2D::get_length); ADD_PROPERTY( PropertyInfo(Variant::REAL,"length"),"set_length","get_length") ; diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 7aa335e44f..375a9a1cb0 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -116,17 +116,17 @@ bool Shader::has_param(const StringName& p_param) const { void Shader::_bind_methods() { - ClassDB::bind_method(_MD("get_mode"),&Shader::get_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&Shader::get_mode); - ClassDB::bind_method(_MD("set_code","code"),&Shader::set_code); - ClassDB::bind_method(_MD("get_code"),&Shader::get_code); + ClassDB::bind_method(D_METHOD("set_code","code"),&Shader::set_code); + ClassDB::bind_method(D_METHOD("get_code"),&Shader::get_code); - ClassDB::bind_method(_MD("set_default_texture_param","param","texture:Texture"),&Shader::set_default_texture_param); - ClassDB::bind_method(_MD("get_default_texture_param:Texture","param"),&Shader::get_default_texture_param); + ClassDB::bind_method(D_METHOD("set_default_texture_param","param","texture:Texture"),&Shader::set_default_texture_param); + ClassDB::bind_method(D_METHOD("get_default_texture_param:Texture","param"),&Shader::get_default_texture_param); - ClassDB::bind_method(_MD("has_param","name"),&Shader::has_param); + ClassDB::bind_method(D_METHOD("has_param","name"),&Shader::has_param); - //ClassDB::bind_method(_MD("get_param_list"),&Shader::get_fragment_code); + //ClassDB::bind_method(D_METHOD("get_param_list"),&Shader::get_fragment_code); ADD_PROPERTY( PropertyInfo(Variant::STRING, "code",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "set_code", "get_code") ; diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index 5dff8e9907..c21feb0bf5 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -165,106 +165,106 @@ int ShaderGraph::node_count(ShaderType p_which, int p_type) void ShaderGraph::_bind_methods() { - ClassDB::bind_method(_MD("_update_shader"),&ShaderGraph::_update_shader); + ClassDB::bind_method(D_METHOD("_update_shader"),&ShaderGraph::_update_shader); - ClassDB::bind_method(_MD("node_add","shader_type","node_type","id"),&ShaderGraph::node_add); - ClassDB::bind_method(_MD("node_remove","shader_type","id"),&ShaderGraph::node_remove); - ClassDB::bind_method(_MD("node_set_pos","shader_type","id","pos"),&ShaderGraph::node_set_pos); - ClassDB::bind_method(_MD("node_get_pos","shader_type","id"),&ShaderGraph::node_get_pos); + ClassDB::bind_method(D_METHOD("node_add","shader_type","node_type","id"),&ShaderGraph::node_add); + ClassDB::bind_method(D_METHOD("node_remove","shader_type","id"),&ShaderGraph::node_remove); + ClassDB::bind_method(D_METHOD("node_set_pos","shader_type","id","pos"),&ShaderGraph::node_set_pos); + ClassDB::bind_method(D_METHOD("node_get_pos","shader_type","id"),&ShaderGraph::node_get_pos); - ClassDB::bind_method(_MD("node_get_type","shader_type","id"),&ShaderGraph::node_get_type); + ClassDB::bind_method(D_METHOD("node_get_type","shader_type","id"),&ShaderGraph::node_get_type); - ClassDB::bind_method(_MD("get_node_list","shader_type"),&ShaderGraph::_get_node_list); + ClassDB::bind_method(D_METHOD("get_node_list","shader_type"),&ShaderGraph::_get_node_list); - ClassDB::bind_method(_MD("default_set_value","shader_type","id","param_id","value"), &ShaderGraph::default_set_value); - ClassDB::bind_method(_MD("default_get_value","shader_type","id","param_id"), &ShaderGraph::default_get_value); + ClassDB::bind_method(D_METHOD("default_set_value","shader_type","id","param_id","value"), &ShaderGraph::default_set_value); + ClassDB::bind_method(D_METHOD("default_get_value","shader_type","id","param_id"), &ShaderGraph::default_get_value); - ClassDB::bind_method(_MD("scalar_const_node_set_value","shader_type","id","value"),&ShaderGraph::scalar_const_node_set_value); - ClassDB::bind_method(_MD("scalar_const_node_get_value","shader_type","id"),&ShaderGraph::scalar_const_node_get_value); + ClassDB::bind_method(D_METHOD("scalar_const_node_set_value","shader_type","id","value"),&ShaderGraph::scalar_const_node_set_value); + ClassDB::bind_method(D_METHOD("scalar_const_node_get_value","shader_type","id"),&ShaderGraph::scalar_const_node_get_value); - ClassDB::bind_method(_MD("vec_const_node_set_value","shader_type","id","value"),&ShaderGraph::vec_const_node_set_value); - ClassDB::bind_method(_MD("vec_const_node_get_value","shader_type","id"),&ShaderGraph::vec_const_node_get_value); + ClassDB::bind_method(D_METHOD("vec_const_node_set_value","shader_type","id","value"),&ShaderGraph::vec_const_node_set_value); + ClassDB::bind_method(D_METHOD("vec_const_node_get_value","shader_type","id"),&ShaderGraph::vec_const_node_get_value); - ClassDB::bind_method(_MD("rgb_const_node_set_value","shader_type","id","value"),&ShaderGraph::rgb_const_node_set_value); - ClassDB::bind_method(_MD("rgb_const_node_get_value","shader_type","id"),&ShaderGraph::rgb_const_node_get_value); + ClassDB::bind_method(D_METHOD("rgb_const_node_set_value","shader_type","id","value"),&ShaderGraph::rgb_const_node_set_value); + ClassDB::bind_method(D_METHOD("rgb_const_node_get_value","shader_type","id"),&ShaderGraph::rgb_const_node_get_value); - ClassDB::bind_method(_MD("xform_const_node_set_value","shader_type","id","value"),&ShaderGraph::xform_const_node_set_value); - ClassDB::bind_method(_MD("xform_const_node_get_value","shader_type","id"),&ShaderGraph::xform_const_node_get_value); + ClassDB::bind_method(D_METHOD("xform_const_node_set_value","shader_type","id","value"),&ShaderGraph::xform_const_node_set_value); + ClassDB::bind_method(D_METHOD("xform_const_node_get_value","shader_type","id"),&ShaderGraph::xform_const_node_get_value); //void get_node_list(ShaderType p_which,List<int> *p_node_list) const; - ClassDB::bind_method(_MD("texture_node_set_filter_size","shader_type","id","filter_size"),&ShaderGraph::texture_node_set_filter_size); - ClassDB::bind_method(_MD("texture_node_get_filter_size","shader_type","id"),&ShaderGraph::texture_node_get_filter_size); + ClassDB::bind_method(D_METHOD("texture_node_set_filter_size","shader_type","id","filter_size"),&ShaderGraph::texture_node_set_filter_size); + ClassDB::bind_method(D_METHOD("texture_node_get_filter_size","shader_type","id"),&ShaderGraph::texture_node_get_filter_size); - ClassDB::bind_method(_MD("texture_node_set_filter_strength","shader_type","id","filter_strength"),&ShaderGraph::texture_node_set_filter_strength); - ClassDB::bind_method(_MD("texture_node_get_filter_strength","shader_type","id"),&ShaderGraph::texture_node_get_filter_strength); + ClassDB::bind_method(D_METHOD("texture_node_set_filter_strength","shader_type","id","filter_strength"),&ShaderGraph::texture_node_set_filter_strength); + ClassDB::bind_method(D_METHOD("texture_node_get_filter_strength","shader_type","id"),&ShaderGraph::texture_node_get_filter_strength); - ClassDB::bind_method(_MD("scalar_op_node_set_op","shader_type","id","op"),&ShaderGraph::scalar_op_node_set_op); - ClassDB::bind_method(_MD("scalar_op_node_get_op","shader_type","id"),&ShaderGraph::scalar_op_node_get_op); + ClassDB::bind_method(D_METHOD("scalar_op_node_set_op","shader_type","id","op"),&ShaderGraph::scalar_op_node_set_op); + ClassDB::bind_method(D_METHOD("scalar_op_node_get_op","shader_type","id"),&ShaderGraph::scalar_op_node_get_op); - ClassDB::bind_method(_MD("vec_op_node_set_op","shader_type","id","op"),&ShaderGraph::vec_op_node_set_op); - ClassDB::bind_method(_MD("vec_op_node_get_op","shader_type","id"),&ShaderGraph::vec_op_node_get_op); + ClassDB::bind_method(D_METHOD("vec_op_node_set_op","shader_type","id","op"),&ShaderGraph::vec_op_node_set_op); + ClassDB::bind_method(D_METHOD("vec_op_node_get_op","shader_type","id"),&ShaderGraph::vec_op_node_get_op); - ClassDB::bind_method(_MD("vec_scalar_op_node_set_op","shader_type","id","op"),&ShaderGraph::vec_scalar_op_node_set_op); - ClassDB::bind_method(_MD("vec_scalar_op_node_get_op","shader_type","id"),&ShaderGraph::vec_scalar_op_node_get_op); + ClassDB::bind_method(D_METHOD("vec_scalar_op_node_set_op","shader_type","id","op"),&ShaderGraph::vec_scalar_op_node_set_op); + ClassDB::bind_method(D_METHOD("vec_scalar_op_node_get_op","shader_type","id"),&ShaderGraph::vec_scalar_op_node_get_op); - ClassDB::bind_method(_MD("rgb_op_node_set_op","shader_type","id","op"),&ShaderGraph::rgb_op_node_set_op); - ClassDB::bind_method(_MD("rgb_op_node_get_op","shader_type","id"),&ShaderGraph::rgb_op_node_get_op); + ClassDB::bind_method(D_METHOD("rgb_op_node_set_op","shader_type","id","op"),&ShaderGraph::rgb_op_node_set_op); + ClassDB::bind_method(D_METHOD("rgb_op_node_get_op","shader_type","id"),&ShaderGraph::rgb_op_node_get_op); - ClassDB::bind_method(_MD("xform_vec_mult_node_set_no_translation","shader_type","id","disable"),&ShaderGraph::xform_vec_mult_node_set_no_translation); - ClassDB::bind_method(_MD("xform_vec_mult_node_get_no_translation","shader_type","id"),&ShaderGraph::xform_vec_mult_node_get_no_translation); + ClassDB::bind_method(D_METHOD("xform_vec_mult_node_set_no_translation","shader_type","id","disable"),&ShaderGraph::xform_vec_mult_node_set_no_translation); + ClassDB::bind_method(D_METHOD("xform_vec_mult_node_get_no_translation","shader_type","id"),&ShaderGraph::xform_vec_mult_node_get_no_translation); - ClassDB::bind_method(_MD("scalar_func_node_set_function","shader_type","id","func"),&ShaderGraph::scalar_func_node_set_function); - ClassDB::bind_method(_MD("scalar_func_node_get_function","shader_type","id"),&ShaderGraph::scalar_func_node_get_function); + ClassDB::bind_method(D_METHOD("scalar_func_node_set_function","shader_type","id","func"),&ShaderGraph::scalar_func_node_set_function); + ClassDB::bind_method(D_METHOD("scalar_func_node_get_function","shader_type","id"),&ShaderGraph::scalar_func_node_get_function); - ClassDB::bind_method(_MD("vec_func_node_set_function","shader_type","id","func"),&ShaderGraph::vec_func_node_set_function); - ClassDB::bind_method(_MD("vec_func_node_get_function","shader_type","id"),&ShaderGraph::vec_func_node_get_function); + ClassDB::bind_method(D_METHOD("vec_func_node_set_function","shader_type","id","func"),&ShaderGraph::vec_func_node_set_function); + ClassDB::bind_method(D_METHOD("vec_func_node_get_function","shader_type","id"),&ShaderGraph::vec_func_node_get_function); - ClassDB::bind_method(_MD("input_node_set_name","shader_type","id","name"),&ShaderGraph::input_node_set_name); - ClassDB::bind_method(_MD("input_node_get_name","shader_type","id"),&ShaderGraph::input_node_get_name); + ClassDB::bind_method(D_METHOD("input_node_set_name","shader_type","id","name"),&ShaderGraph::input_node_set_name); + ClassDB::bind_method(D_METHOD("input_node_get_name","shader_type","id"),&ShaderGraph::input_node_get_name); - ClassDB::bind_method(_MD("scalar_input_node_set_value","shader_type","id","value"),&ShaderGraph::scalar_input_node_set_value); - ClassDB::bind_method(_MD("scalar_input_node_get_value","shader_type","id"),&ShaderGraph::scalar_input_node_get_value); + ClassDB::bind_method(D_METHOD("scalar_input_node_set_value","shader_type","id","value"),&ShaderGraph::scalar_input_node_set_value); + ClassDB::bind_method(D_METHOD("scalar_input_node_get_value","shader_type","id"),&ShaderGraph::scalar_input_node_get_value); - ClassDB::bind_method(_MD("vec_input_node_set_value","shader_type","id","value"),&ShaderGraph::vec_input_node_set_value); - ClassDB::bind_method(_MD("vec_input_node_get_value","shader_type","id"),&ShaderGraph::vec_input_node_get_value); + ClassDB::bind_method(D_METHOD("vec_input_node_set_value","shader_type","id","value"),&ShaderGraph::vec_input_node_set_value); + ClassDB::bind_method(D_METHOD("vec_input_node_get_value","shader_type","id"),&ShaderGraph::vec_input_node_get_value); - ClassDB::bind_method(_MD("rgb_input_node_set_value","shader_type","id","value"),&ShaderGraph::rgb_input_node_set_value); - ClassDB::bind_method(_MD("rgb_input_node_get_value","shader_type","id"),&ShaderGraph::rgb_input_node_get_value); + ClassDB::bind_method(D_METHOD("rgb_input_node_set_value","shader_type","id","value"),&ShaderGraph::rgb_input_node_set_value); + ClassDB::bind_method(D_METHOD("rgb_input_node_get_value","shader_type","id"),&ShaderGraph::rgb_input_node_get_value); - ClassDB::bind_method(_MD("xform_input_node_set_value","shader_type","id","value"),&ShaderGraph::xform_input_node_set_value); - ClassDB::bind_method(_MD("xform_input_node_get_value","shader_type","id"),&ShaderGraph::xform_input_node_get_value); + ClassDB::bind_method(D_METHOD("xform_input_node_set_value","shader_type","id","value"),&ShaderGraph::xform_input_node_set_value); + ClassDB::bind_method(D_METHOD("xform_input_node_get_value","shader_type","id"),&ShaderGraph::xform_input_node_get_value); - ClassDB::bind_method(_MD("texture_input_node_set_value","shader_type","id","value:Texture"),&ShaderGraph::texture_input_node_set_value); - ClassDB::bind_method(_MD("texture_input_node_get_value:Texture","shader_type","id"),&ShaderGraph::texture_input_node_get_value); + ClassDB::bind_method(D_METHOD("texture_input_node_set_value","shader_type","id","value:Texture"),&ShaderGraph::texture_input_node_set_value); + ClassDB::bind_method(D_METHOD("texture_input_node_get_value:Texture","shader_type","id"),&ShaderGraph::texture_input_node_get_value); - ClassDB::bind_method(_MD("cubemap_input_node_set_value","shader_type","id","value:CubeMap"),&ShaderGraph::cubemap_input_node_set_value); - ClassDB::bind_method(_MD("cubemap_input_node_get_value:CubeMap","shader_type","id"),&ShaderGraph::cubemap_input_node_get_value); + ClassDB::bind_method(D_METHOD("cubemap_input_node_set_value","shader_type","id","value:CubeMap"),&ShaderGraph::cubemap_input_node_set_value); + ClassDB::bind_method(D_METHOD("cubemap_input_node_get_value:CubeMap","shader_type","id"),&ShaderGraph::cubemap_input_node_get_value); - ClassDB::bind_method(_MD("comment_node_set_text","shader_type","id","text"),&ShaderGraph::comment_node_set_text); - ClassDB::bind_method(_MD("comment_node_get_text","shader_type","id"),&ShaderGraph::comment_node_get_text); + ClassDB::bind_method(D_METHOD("comment_node_set_text","shader_type","id","text"),&ShaderGraph::comment_node_set_text); + ClassDB::bind_method(D_METHOD("comment_node_get_text","shader_type","id"),&ShaderGraph::comment_node_get_text); - ClassDB::bind_method(_MD("color_ramp_node_set_ramp","shader_type","id","colors","offsets"),&ShaderGraph::color_ramp_node_set_ramp); - ClassDB::bind_method(_MD("color_ramp_node_get_colors","shader_type","id"),&ShaderGraph::color_ramp_node_get_colors); - ClassDB::bind_method(_MD("color_ramp_node_get_offsets","shader_type","id"),&ShaderGraph::color_ramp_node_get_offsets); + ClassDB::bind_method(D_METHOD("color_ramp_node_set_ramp","shader_type","id","colors","offsets"),&ShaderGraph::color_ramp_node_set_ramp); + ClassDB::bind_method(D_METHOD("color_ramp_node_get_colors","shader_type","id"),&ShaderGraph::color_ramp_node_get_colors); + ClassDB::bind_method(D_METHOD("color_ramp_node_get_offsets","shader_type","id"),&ShaderGraph::color_ramp_node_get_offsets); - ClassDB::bind_method(_MD("curve_map_node_set_points","shader_type","id","points"),&ShaderGraph::curve_map_node_set_points); - ClassDB::bind_method(_MD("curve_map_node_get_points","shader_type","id"),&ShaderGraph::curve_map_node_get_points); + ClassDB::bind_method(D_METHOD("curve_map_node_set_points","shader_type","id","points"),&ShaderGraph::curve_map_node_set_points); + ClassDB::bind_method(D_METHOD("curve_map_node_get_points","shader_type","id"),&ShaderGraph::curve_map_node_get_points); - ClassDB::bind_method(_MD("connect_node:Error","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::connect_node); - ClassDB::bind_method(_MD("is_node_connected","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::is_node_connected); - ClassDB::bind_method(_MD("disconnect_node","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::disconnect_node); - ClassDB::bind_method(_MD("get_node_connections","shader_type"),&ShaderGraph::_get_connections); + ClassDB::bind_method(D_METHOD("connect_node:Error","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::connect_node); + ClassDB::bind_method(D_METHOD("is_node_connected","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::is_node_connected); + ClassDB::bind_method(D_METHOD("disconnect_node","shader_type","src_id","src_slot","dst_id","dst_slot"),&ShaderGraph::disconnect_node); + ClassDB::bind_method(D_METHOD("get_node_connections","shader_type"),&ShaderGraph::_get_connections); - ClassDB::bind_method(_MD("clear","shader_type"),&ShaderGraph::clear); + ClassDB::bind_method(D_METHOD("clear","shader_type"),&ShaderGraph::clear); - ClassDB::bind_method(_MD("node_set_state","shader_type","id","state"),&ShaderGraph::node_set_state); - ClassDB::bind_method(_MD("node_get_state:Variant","shader_type","id"),&ShaderGraph::node_get_state); + ClassDB::bind_method(D_METHOD("node_set_state","shader_type","id","state"),&ShaderGraph::node_set_state); + ClassDB::bind_method(D_METHOD("node_get_state:Variant","shader_type","id"),&ShaderGraph::node_get_state); - ClassDB::bind_method(_MD("_set_data"),&ShaderGraph::_set_data); - ClassDB::bind_method(_MD("_get_data"),&ShaderGraph::_get_data); + ClassDB::bind_method(D_METHOD("_set_data"),&ShaderGraph::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&ShaderGraph::_get_data); ADD_PROPERTY( PropertyInfo(Variant::DICTIONARY,"_data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_data","_get_data"); @@ -399,21 +399,21 @@ void ShaderGraph::_bind_methods() { #if 0 - ClassDB::bind_method(_MD("node_add"),&ShaderGraph::node_add ); - ClassDB::bind_method(_MD("node_remove"),&ShaderGraph::node_remove ); - ClassDB::bind_method(_MD("node_set_param"),&ShaderGraph::node_set_param ); - ClassDB::bind_method(_MD("node_set_pos"),&ShaderGraph::node_set_pos ); + ClassDB::bind_method(D_METHOD("node_add"),&ShaderGraph::node_add ); + ClassDB::bind_method(D_METHOD("node_remove"),&ShaderGraph::node_remove ); + ClassDB::bind_method(D_METHOD("node_set_param"),&ShaderGraph::node_set_param ); + ClassDB::bind_method(D_METHOD("node_set_pos"),&ShaderGraph::node_set_pos ); - ClassDB::bind_method(_MD("node_get_pos"),&ShaderGraph::node_get_pos ); - ClassDB::bind_method(_MD("node_get_param"),&ShaderGraph::node_get_param); - ClassDB::bind_method(_MD("node_get_type"),&ShaderGraph::node_get_type); + ClassDB::bind_method(D_METHOD("node_get_pos"),&ShaderGraph::node_get_pos ); + ClassDB::bind_method(D_METHOD("node_get_param"),&ShaderGraph::node_get_param); + ClassDB::bind_method(D_METHOD("node_get_type"),&ShaderGraph::node_get_type); - ClassDB::bind_method(_MD("connect"),&ShaderGraph::connect ); - ClassDB::bind_method(_MD("disconnect"),&ShaderGraph::disconnect ); + ClassDB::bind_method(D_METHOD("connect"),&ShaderGraph::connect ); + ClassDB::bind_method(D_METHOD("disconnect"),&ShaderGraph::disconnect ); - ClassDB::bind_method(_MD("get_connections"),&ShaderGraph::_get_connections_helper ); + ClassDB::bind_method(D_METHOD("get_connections"),&ShaderGraph::_get_connections_helper ); - ClassDB::bind_method(_MD("clear"),&ShaderGraph::clear ); + ClassDB::bind_method(D_METHOD("clear"),&ShaderGraph::clear ); BIND_CONSTANT( NODE_IN ); ///< param 0: name BIND_CONSTANT( NODE_OUT ); ///< param 0: name diff --git a/scene/resources/shape_2d.cpp b/scene/resources/shape_2d.cpp index c39c09ecbc..ec1568e218 100644 --- a/scene/resources/shape_2d.cpp +++ b/scene/resources/shape_2d.cpp @@ -104,12 +104,12 @@ Variant Shape2D::collide_and_get_contacts(const Transform2D& p_local_xform, con void Shape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_custom_solver_bias","bias"),&Shape2D::set_custom_solver_bias); - ClassDB::bind_method(_MD("get_custom_solver_bias"),&Shape2D::get_custom_solver_bias); - ClassDB::bind_method(_MD("collide","local_xform","with_shape:Shape2D","shape_xform"),&Shape2D::collide); - ClassDB::bind_method(_MD("collide_with_motion","local_xform","local_motion","with_shape:Shape2D","shape_xform","shape_motion"),&Shape2D::collide_with_motion); - ClassDB::bind_method(_MD("collide_and_get_contacts:Variant","local_xform","with_shape:Shape2D","shape_xform"),&Shape2D::collide_and_get_contacts); - ClassDB::bind_method(_MD("collide_with_motion_and_get_contacts:Variant","local_xform","local_motion","with_shape:Shape2D","shape_xform","shape_motion"),&Shape2D::collide_with_motion_and_get_contacts); + ClassDB::bind_method(D_METHOD("set_custom_solver_bias","bias"),&Shape2D::set_custom_solver_bias); + ClassDB::bind_method(D_METHOD("get_custom_solver_bias"),&Shape2D::get_custom_solver_bias); + ClassDB::bind_method(D_METHOD("collide","local_xform","with_shape:Shape2D","shape_xform"),&Shape2D::collide); + ClassDB::bind_method(D_METHOD("collide_with_motion","local_xform","local_motion","with_shape:Shape2D","shape_xform","shape_motion"),&Shape2D::collide_with_motion); + ClassDB::bind_method(D_METHOD("collide_and_get_contacts:Variant","local_xform","with_shape:Shape2D","shape_xform"),&Shape2D::collide_and_get_contacts); + ClassDB::bind_method(D_METHOD("collide_with_motion_and_get_contacts:Variant","local_xform","local_motion","with_shape:Shape2D","shape_xform","shape_motion"),&Shape2D::collide_with_motion_and_get_contacts); ADD_PROPERTY( PropertyInfo(Variant::REAL,"custom_solver_bias",PROPERTY_HINT_RANGE,"0,1,0.001"),"set_custom_solver_bias","get_custom_solver_bias"); } diff --git a/scene/resources/shape_line_2d.cpp b/scene/resources/shape_line_2d.cpp index 5f6716423d..64e50e62c8 100644 --- a/scene/resources/shape_line_2d.cpp +++ b/scene/resources/shape_line_2d.cpp @@ -90,11 +90,11 @@ Rect2 LineShape2D::get_rect() const{ void LineShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_normal","normal"),&LineShape2D::set_normal); - ClassDB::bind_method(_MD("get_normal"),&LineShape2D::get_normal); + ClassDB::bind_method(D_METHOD("set_normal","normal"),&LineShape2D::set_normal); + ClassDB::bind_method(D_METHOD("get_normal"),&LineShape2D::get_normal); - ClassDB::bind_method(_MD("set_d","d"),&LineShape2D::set_d); - ClassDB::bind_method(_MD("get_d"),&LineShape2D::get_d); + ClassDB::bind_method(D_METHOD("set_d","d"),&LineShape2D::set_d); + ClassDB::bind_method(D_METHOD("get_d"),&LineShape2D::get_d); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"normal"),"set_normal","get_normal") ; ADD_PROPERTY( PropertyInfo(Variant::REAL,"d"),"set_d","get_d") ; diff --git a/scene/resources/sky_box.cpp b/scene/resources/sky_box.cpp index 8975ed83dd..fddf3070b1 100644 --- a/scene/resources/sky_box.cpp +++ b/scene/resources/sky_box.cpp @@ -16,8 +16,8 @@ SkyBox::RadianceSize SkyBox::get_radiance_size() const { void SkyBox::_bind_methods() { - ClassDB::bind_method(_MD("set_radiance_size","size"),&SkyBox::set_radiance_size); - ClassDB::bind_method(_MD("get_radiance_size"),&SkyBox::get_radiance_size); + ClassDB::bind_method(D_METHOD("set_radiance_size","size"),&SkyBox::set_radiance_size); + ClassDB::bind_method(D_METHOD("get_radiance_size"),&SkyBox::get_radiance_size); ADD_PROPERTY(PropertyInfo(Variant::INT,"radiance_size",PROPERTY_HINT_ENUM,"256,512,1024,2048"),"set_radiance_size","get_radiance_size"); @@ -113,8 +113,8 @@ RID ImageSkyBox::get_rid() const { void ImageSkyBox::_bind_methods() { - ClassDB::bind_method(_MD("set_image_path","image","path"),&ImageSkyBox::set_image_path); - ClassDB::bind_method(_MD("get_image_path","image"),&ImageSkyBox::get_image_path); + ClassDB::bind_method(D_METHOD("set_image_path","image","path"),&ImageSkyBox::set_image_path); + ClassDB::bind_method(D_METHOD("get_image_path","image"),&ImageSkyBox::get_image_path); List<String> extensions; ImageLoader::get_recognized_extensions(&extensions); diff --git a/scene/resources/space_2d.cpp b/scene/resources/space_2d.cpp index d0fc6edcf0..f1fe9629dd 100644 --- a/scene/resources/space_2d.cpp +++ b/scene/resources/space_2d.cpp @@ -48,8 +48,8 @@ bool Space2D::is_active() const { void Space2D::_bind_methods() { - ClassDB::bind_method(_MD("set_active","active"),&Space2D::set_active); - ClassDB::bind_method(_MD("is_active"),&Space2D::is_active); + ClassDB::bind_method(D_METHOD("set_active","active"),&Space2D::set_active); + ClassDB::bind_method(D_METHOD("is_active"),&Space2D::is_active); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"active"),"set_active","is_active") ; diff --git a/scene/resources/sphere_shape.cpp b/scene/resources/sphere_shape.cpp index ac73c4d380..3029625928 100644 --- a/scene/resources/sphere_shape.cpp +++ b/scene/resources/sphere_shape.cpp @@ -75,8 +75,8 @@ float SphereShape::get_radius() const { void SphereShape::_bind_methods() { - ClassDB::bind_method(_MD("set_radius","radius"),&SphereShape::set_radius); - ClassDB::bind_method(_MD("get_radius"),&SphereShape::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&SphereShape::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&SphereShape::get_radius); ADD_PROPERTY( PropertyInfo(Variant::REAL,"radius",PROPERTY_HINT_RANGE,"0,4096,0.01"), "set_radius", "get_radius"); diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index d94d42ff62..34a4202942 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -70,20 +70,20 @@ Size2 StyleBox::get_center_size() const { void StyleBox::_bind_methods() { - ClassDB::bind_method(_MD("test_mask","point","rect"),&StyleBox::test_mask); + ClassDB::bind_method(D_METHOD("test_mask","point","rect"),&StyleBox::test_mask); - ClassDB::bind_method(_MD("set_default_margin","margin","offset"),&StyleBox::set_default_margin); - ClassDB::bind_method(_MD("get_default_margin","margin"),&StyleBox::get_default_margin); + ClassDB::bind_method(D_METHOD("set_default_margin","margin","offset"),&StyleBox::set_default_margin); + ClassDB::bind_method(D_METHOD("get_default_margin","margin"),&StyleBox::get_default_margin); - //ClassDB::bind_method(_MD("set_default_margin"),&StyleBox::set_default_margin); - //ClassDB::bind_method(_MD("get_default_margin"),&StyleBox::get_default_margin); + //ClassDB::bind_method(D_METHOD("set_default_margin"),&StyleBox::set_default_margin); + //ClassDB::bind_method(D_METHOD("get_default_margin"),&StyleBox::get_default_margin); - ClassDB::bind_method(_MD("get_margin","margin"),&StyleBox::get_margin); - ClassDB::bind_method(_MD("get_minimum_size"),&StyleBox::get_minimum_size); - ClassDB::bind_method(_MD("get_center_size"),&StyleBox::get_center_size); - ClassDB::bind_method(_MD("get_offset"),&StyleBox::get_offset); + ClassDB::bind_method(D_METHOD("get_margin","margin"),&StyleBox::get_margin); + ClassDB::bind_method(D_METHOD("get_minimum_size"),&StyleBox::get_minimum_size); + ClassDB::bind_method(D_METHOD("get_center_size"),&StyleBox::get_center_size); + ClassDB::bind_method(D_METHOD("get_offset"),&StyleBox::get_offset); - ClassDB::bind_method(_MD("draw","canvas_item","rect"),&StyleBox::draw); + ClassDB::bind_method(D_METHOD("draw","canvas_item","rect"),&StyleBox::draw); ADD_GROUP("Content Margin","content_margin_"); ADD_PROPERTYI( PropertyInfo( Variant::REAL, "content_margin_left", PROPERTY_HINT_RANGE,"-1,2048,1" ), "set_default_margin","get_default_margin", MARGIN_LEFT ); @@ -209,23 +209,23 @@ Color StyleBoxTexture::get_modulate() const { void StyleBoxTexture::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture:Texture"),&StyleBoxTexture::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&StyleBoxTexture::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture:Texture"),&StyleBoxTexture::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&StyleBoxTexture::get_texture); - ClassDB::bind_method(_MD("set_margin_size","margin","size"),&StyleBoxTexture::set_margin_size); - ClassDB::bind_method(_MD("get_margin_size","margin"),&StyleBoxTexture::get_margin_size); + ClassDB::bind_method(D_METHOD("set_margin_size","margin","size"),&StyleBoxTexture::set_margin_size); + ClassDB::bind_method(D_METHOD("get_margin_size","margin"),&StyleBoxTexture::get_margin_size); - ClassDB::bind_method(_MD("set_expand_margin_size","margin","size"),&StyleBoxTexture::set_expand_margin_size); - ClassDB::bind_method(_MD("get_expand_margin_size","margin"),&StyleBoxTexture::get_expand_margin_size); + ClassDB::bind_method(D_METHOD("set_expand_margin_size","margin","size"),&StyleBoxTexture::set_expand_margin_size); + ClassDB::bind_method(D_METHOD("get_expand_margin_size","margin"),&StyleBoxTexture::get_expand_margin_size); - ClassDB::bind_method(_MD("set_region_rect","region"),&StyleBoxTexture::set_region_rect); - ClassDB::bind_method(_MD("get_region_rect"),&StyleBoxTexture::get_region_rect); + ClassDB::bind_method(D_METHOD("set_region_rect","region"),&StyleBoxTexture::set_region_rect); + ClassDB::bind_method(D_METHOD("get_region_rect"),&StyleBoxTexture::get_region_rect); - ClassDB::bind_method(_MD("set_draw_center","enable"),&StyleBoxTexture::set_draw_center); - ClassDB::bind_method(_MD("get_draw_center"),&StyleBoxTexture::get_draw_center); + ClassDB::bind_method(D_METHOD("set_draw_center","enable"),&StyleBoxTexture::set_draw_center); + ClassDB::bind_method(D_METHOD("get_draw_center"),&StyleBoxTexture::get_draw_center); - ClassDB::bind_method(_MD("set_modulate","color"),&StyleBoxTexture::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&StyleBoxTexture::get_modulate); + ClassDB::bind_method(D_METHOD("set_modulate","color"),&StyleBoxTexture::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&StyleBoxTexture::get_modulate); ADD_SIGNAL(MethodInfo("texture_changed")); @@ -390,18 +390,18 @@ float StyleBoxFlat::get_style_margin(Margin p_margin) const { } void StyleBoxFlat::_bind_methods() { - ClassDB::bind_method(_MD("set_bg_color","color"),&StyleBoxFlat::set_bg_color); - ClassDB::bind_method(_MD("get_bg_color"),&StyleBoxFlat::get_bg_color); - ClassDB::bind_method(_MD("set_light_color","color"),&StyleBoxFlat::set_light_color); - ClassDB::bind_method(_MD("get_light_color"),&StyleBoxFlat::get_light_color); - ClassDB::bind_method(_MD("set_dark_color","color"),&StyleBoxFlat::set_dark_color); - ClassDB::bind_method(_MD("get_dark_color"),&StyleBoxFlat::get_dark_color); - ClassDB::bind_method(_MD("set_border_size","size"),&StyleBoxFlat::set_border_size); - ClassDB::bind_method(_MD("get_border_size"),&StyleBoxFlat::get_border_size); - ClassDB::bind_method(_MD("set_border_blend","blend"),&StyleBoxFlat::set_border_blend); - ClassDB::bind_method(_MD("get_border_blend"),&StyleBoxFlat::get_border_blend); - ClassDB::bind_method(_MD("set_draw_center","size"),&StyleBoxFlat::set_draw_center); - ClassDB::bind_method(_MD("get_draw_center"),&StyleBoxFlat::get_draw_center); + ClassDB::bind_method(D_METHOD("set_bg_color","color"),&StyleBoxFlat::set_bg_color); + ClassDB::bind_method(D_METHOD("get_bg_color"),&StyleBoxFlat::get_bg_color); + ClassDB::bind_method(D_METHOD("set_light_color","color"),&StyleBoxFlat::set_light_color); + ClassDB::bind_method(D_METHOD("get_light_color"),&StyleBoxFlat::get_light_color); + ClassDB::bind_method(D_METHOD("set_dark_color","color"),&StyleBoxFlat::set_dark_color); + ClassDB::bind_method(D_METHOD("get_dark_color"),&StyleBoxFlat::get_dark_color); + ClassDB::bind_method(D_METHOD("set_border_size","size"),&StyleBoxFlat::set_border_size); + ClassDB::bind_method(D_METHOD("get_border_size"),&StyleBoxFlat::get_border_size); + ClassDB::bind_method(D_METHOD("set_border_blend","blend"),&StyleBoxFlat::set_border_blend); + ClassDB::bind_method(D_METHOD("get_border_blend"),&StyleBoxFlat::get_border_blend); + ClassDB::bind_method(D_METHOD("set_draw_center","size"),&StyleBoxFlat::set_draw_center); + ClassDB::bind_method(D_METHOD("get_draw_center"),&StyleBoxFlat::get_draw_center); ADD_PROPERTY( PropertyInfo( Variant::COLOR, "bg_color"), "set_bg_color","get_bg_color") ; ADD_PROPERTY( PropertyInfo( Variant::COLOR, "light_color"),"set_light_color","get_light_color"); diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 1d0d323546..cf07f1658b 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -862,25 +862,25 @@ void SurfaceTool::clear() { void SurfaceTool::_bind_methods() { - ClassDB::bind_method(_MD("begin","primitive"),&SurfaceTool::begin); - ClassDB::bind_method(_MD("add_vertex","vertex"),&SurfaceTool::add_vertex); - ClassDB::bind_method(_MD("add_color","color"),&SurfaceTool::add_color); - ClassDB::bind_method(_MD("add_normal","normal"),&SurfaceTool::add_normal); - ClassDB::bind_method(_MD("add_tangent","tangent"),&SurfaceTool::add_tangent); - ClassDB::bind_method(_MD("add_uv","uv"),&SurfaceTool::add_uv); - ClassDB::bind_method(_MD("add_uv2","uv2"),&SurfaceTool::add_uv2); - ClassDB::bind_method(_MD("add_bones","bones"),&SurfaceTool::add_bones); - ClassDB::bind_method(_MD("add_weights","weights"),&SurfaceTool::add_weights); - ClassDB::bind_method(_MD("add_smooth_group","smooth"),&SurfaceTool::add_smooth_group); - ClassDB::bind_method(_MD("add_triangle_fan", "vertexes", "uvs", "colors", "uv2s", "normals", "tangents"),&SurfaceTool::add_triangle_fan, DEFVAL(Vector<Vector2>()), DEFVAL(Vector<Color>()), DEFVAL(Vector<Vector2>()),DEFVAL(Vector<Vector3>()), DEFVAL(Vector<Plane>())); - ClassDB::bind_method(_MD("set_material","material:Material"),&SurfaceTool::set_material); - ClassDB::bind_method(_MD("index"),&SurfaceTool::index); - ClassDB::bind_method(_MD("deindex"),&SurfaceTool::deindex); - ///ClassDB::bind_method(_MD("generate_flat_normals"),&SurfaceTool::generate_flat_normals); - ClassDB::bind_method(_MD("generate_normals"),&SurfaceTool::generate_normals); - ClassDB::bind_method(_MD("add_index", "index"), &SurfaceTool::add_index); - ClassDB::bind_method(_MD("commit:Mesh","existing:Mesh"),&SurfaceTool::commit,DEFVAL(Variant())); - ClassDB::bind_method(_MD("clear"),&SurfaceTool::clear); + ClassDB::bind_method(D_METHOD("begin","primitive"),&SurfaceTool::begin); + ClassDB::bind_method(D_METHOD("add_vertex","vertex"),&SurfaceTool::add_vertex); + ClassDB::bind_method(D_METHOD("add_color","color"),&SurfaceTool::add_color); + ClassDB::bind_method(D_METHOD("add_normal","normal"),&SurfaceTool::add_normal); + ClassDB::bind_method(D_METHOD("add_tangent","tangent"),&SurfaceTool::add_tangent); + ClassDB::bind_method(D_METHOD("add_uv","uv"),&SurfaceTool::add_uv); + ClassDB::bind_method(D_METHOD("add_uv2","uv2"),&SurfaceTool::add_uv2); + ClassDB::bind_method(D_METHOD("add_bones","bones"),&SurfaceTool::add_bones); + ClassDB::bind_method(D_METHOD("add_weights","weights"),&SurfaceTool::add_weights); + ClassDB::bind_method(D_METHOD("add_smooth_group","smooth"),&SurfaceTool::add_smooth_group); + ClassDB::bind_method(D_METHOD("add_triangle_fan", "vertexes", "uvs", "colors", "uv2s", "normals", "tangents"),&SurfaceTool::add_triangle_fan, DEFVAL(Vector<Vector2>()), DEFVAL(Vector<Color>()), DEFVAL(Vector<Vector2>()),DEFVAL(Vector<Vector3>()), DEFVAL(Vector<Plane>())); + ClassDB::bind_method(D_METHOD("set_material","material:Material"),&SurfaceTool::set_material); + ClassDB::bind_method(D_METHOD("index"),&SurfaceTool::index); + ClassDB::bind_method(D_METHOD("deindex"),&SurfaceTool::deindex); + ///ClassDB::bind_method(D_METHOD("generate_flat_normals"),&SurfaceTool::generate_flat_normals); + ClassDB::bind_method(D_METHOD("generate_normals"),&SurfaceTool::generate_normals); + ClassDB::bind_method(D_METHOD("add_index", "index"), &SurfaceTool::add_index); + ClassDB::bind_method(D_METHOD("commit:Mesh","existing:Mesh"),&SurfaceTool::commit,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("clear"),&SurfaceTool::clear); } diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 744150fdb6..5e67a9e5b2 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -63,15 +63,15 @@ bool Texture::get_rect_region(const Rect2& p_rect, const Rect2& p_src_rect,Rect2 void Texture::_bind_methods() { - ClassDB::bind_method(_MD("get_width"),&Texture::get_width); - ClassDB::bind_method(_MD("get_height"),&Texture::get_height); - ClassDB::bind_method(_MD("get_size"),&Texture::get_size); - ClassDB::bind_method(_MD("has_alpha"),&Texture::has_alpha); - ClassDB::bind_method(_MD("set_flags","flags"),&Texture::set_flags); - ClassDB::bind_method(_MD("get_flags"),&Texture::get_flags); - ClassDB::bind_method(_MD("draw","canvas_item","pos","modulate","transpose"),&Texture::draw,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_rect","canvas_item","rect","tile","modulate","transpose"),&Texture::draw_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_rect_region","canvas_item","rect","src_rect","modulate","transpose"),&Texture::draw_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_width"),&Texture::get_width); + ClassDB::bind_method(D_METHOD("get_height"),&Texture::get_height); + ClassDB::bind_method(D_METHOD("get_size"),&Texture::get_size); + ClassDB::bind_method(D_METHOD("has_alpha"),&Texture::has_alpha); + ClassDB::bind_method(D_METHOD("set_flags","flags"),&Texture::set_flags); + ClassDB::bind_method(D_METHOD("get_flags"),&Texture::get_flags); + ClassDB::bind_method(D_METHOD("draw","canvas_item","pos","modulate","transpose"),&Texture::draw,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_rect","canvas_item","rect","tile","modulate","transpose"),&Texture::draw_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_rect_region","canvas_item","rect","src_rect","modulate","transpose"),&Texture::draw_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); BIND_CONSTANT( FLAG_MIPMAPS ); BIND_CONSTANT( FLAG_REPEAT ); @@ -406,27 +406,27 @@ void ImageTexture::_set_data(Dictionary p_data) { void ImageTexture::_bind_methods() { - ClassDB::bind_method(_MD("create","width","height","format","flags"),&ImageTexture::create,DEFVAL(FLAGS_DEFAULT)); - ClassDB::bind_method(_MD("create_from_image","image","flags"),&ImageTexture::create_from_image,DEFVAL(FLAGS_DEFAULT)); - ClassDB::bind_method(_MD("get_format"),&ImageTexture::get_format); - ClassDB::bind_method(_MD("load","path"),&ImageTexture::load); - ClassDB::bind_method(_MD("set_data","image"),&ImageTexture::set_data); - ClassDB::bind_method(_MD("get_data","cube_side"),&ImageTexture::get_data); - ClassDB::bind_method(_MD("set_storage","mode"),&ImageTexture::set_storage); - ClassDB::bind_method(_MD("get_storage"),&ImageTexture::get_storage); - ClassDB::bind_method(_MD("set_lossy_storage_quality","quality"),&ImageTexture::set_lossy_storage_quality); - ClassDB::bind_method(_MD("get_lossy_storage_quality"),&ImageTexture::get_lossy_storage_quality); - ClassDB::bind_method(_MD("fix_alpha_edges"),&ImageTexture::fix_alpha_edges); - ClassDB::bind_method(_MD("premultiply_alpha"),&ImageTexture::premultiply_alpha); - ClassDB::bind_method(_MD("normal_to_xy"),&ImageTexture::normal_to_xy); - ClassDB::bind_method(_MD("shrink_x2_and_keep_size"),&ImageTexture::shrink_x2_and_keep_size); - - ClassDB::bind_method(_MD("set_size_override","size"),&ImageTexture::set_size_override); + ClassDB::bind_method(D_METHOD("create","width","height","format","flags"),&ImageTexture::create,DEFVAL(FLAGS_DEFAULT)); + ClassDB::bind_method(D_METHOD("create_from_image","image","flags"),&ImageTexture::create_from_image,DEFVAL(FLAGS_DEFAULT)); + ClassDB::bind_method(D_METHOD("get_format"),&ImageTexture::get_format); + ClassDB::bind_method(D_METHOD("load","path"),&ImageTexture::load); + ClassDB::bind_method(D_METHOD("set_data","image"),&ImageTexture::set_data); + ClassDB::bind_method(D_METHOD("get_data","cube_side"),&ImageTexture::get_data); + ClassDB::bind_method(D_METHOD("set_storage","mode"),&ImageTexture::set_storage); + ClassDB::bind_method(D_METHOD("get_storage"),&ImageTexture::get_storage); + ClassDB::bind_method(D_METHOD("set_lossy_storage_quality","quality"),&ImageTexture::set_lossy_storage_quality); + ClassDB::bind_method(D_METHOD("get_lossy_storage_quality"),&ImageTexture::get_lossy_storage_quality); + ClassDB::bind_method(D_METHOD("fix_alpha_edges"),&ImageTexture::fix_alpha_edges); + ClassDB::bind_method(D_METHOD("premultiply_alpha"),&ImageTexture::premultiply_alpha); + ClassDB::bind_method(D_METHOD("normal_to_xy"),&ImageTexture::normal_to_xy); + ClassDB::bind_method(D_METHOD("shrink_x2_and_keep_size"),&ImageTexture::shrink_x2_and_keep_size); + + ClassDB::bind_method(D_METHOD("set_size_override","size"),&ImageTexture::set_size_override); ClassDB::set_method_flags(get_class_static(),_scs_create("fix_alpha_edges"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); ClassDB::set_method_flags(get_class_static(),_scs_create("premultiply_alpha"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); ClassDB::set_method_flags(get_class_static(),_scs_create("normal_to_xy"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); ClassDB::set_method_flags(get_class_static(),_scs_create("shrink_x2_and_keep_size"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ClassDB::bind_method(_MD("_reload_hook","rid"),&ImageTexture::_reload_hook); + ClassDB::bind_method(D_METHOD("_reload_hook","rid"),&ImageTexture::_reload_hook); BIND_CONSTANT( STORAGE_RAW ); @@ -771,8 +771,8 @@ void StreamTexture::reload_from_file() { void StreamTexture::_bind_methods() { - ClassDB::bind_method(_MD("load","path"),&StreamTexture::load); - ClassDB::bind_method(_MD("get_load_path"),&StreamTexture::get_load_path); + ClassDB::bind_method(D_METHOD("load","path"),&StreamTexture::load); + ClassDB::bind_method(D_METHOD("get_load_path"),&StreamTexture::get_load_path); ADD_PROPERTY( PropertyInfo(Variant::STRING,"load_path",PROPERTY_HINT_FILE,"*.stex"),"load","get_load_path"); } @@ -921,14 +921,14 @@ Rect2 AtlasTexture::get_margin() const { void AtlasTexture::_bind_methods() { - ClassDB::bind_method(_MD("set_atlas","atlas:Texture"),&AtlasTexture::set_atlas); - ClassDB::bind_method(_MD("get_atlas:Texture"),&AtlasTexture::get_atlas); + ClassDB::bind_method(D_METHOD("set_atlas","atlas:Texture"),&AtlasTexture::set_atlas); + ClassDB::bind_method(D_METHOD("get_atlas:Texture"),&AtlasTexture::get_atlas); - ClassDB::bind_method(_MD("set_region","region"),&AtlasTexture::set_region); - ClassDB::bind_method(_MD("get_region"),&AtlasTexture::get_region); + ClassDB::bind_method(D_METHOD("set_region","region"),&AtlasTexture::set_region); + ClassDB::bind_method(D_METHOD("get_region"),&AtlasTexture::get_region); - ClassDB::bind_method(_MD("set_margin","margin"),&AtlasTexture::set_margin); - ClassDB::bind_method(_MD("get_margin"),&AtlasTexture::get_margin); + ClassDB::bind_method(D_METHOD("set_margin","margin"),&AtlasTexture::set_margin); + ClassDB::bind_method(D_METHOD("get_margin"),&AtlasTexture::get_margin); ADD_SIGNAL(MethodInfo("atlas_changed")); @@ -1176,18 +1176,18 @@ Ref<Texture> LargeTexture::get_piece_texture(int p_idx) const{ void LargeTexture::_bind_methods() { - ClassDB::bind_method(_MD("add_piece","ofs","texture:Texture"),&LargeTexture::add_piece); - ClassDB::bind_method(_MD("set_piece_offset", "idx", "ofs"),&LargeTexture::set_piece_offset); - ClassDB::bind_method(_MD("set_piece_texture","idx", "texture:Texture"),&LargeTexture::set_piece_texture); - ClassDB::bind_method(_MD("set_size","size"),&LargeTexture::set_size); - ClassDB::bind_method(_MD("clear"),&LargeTexture::clear); + ClassDB::bind_method(D_METHOD("add_piece","ofs","texture:Texture"),&LargeTexture::add_piece); + ClassDB::bind_method(D_METHOD("set_piece_offset", "idx", "ofs"),&LargeTexture::set_piece_offset); + ClassDB::bind_method(D_METHOD("set_piece_texture","idx", "texture:Texture"),&LargeTexture::set_piece_texture); + ClassDB::bind_method(D_METHOD("set_size","size"),&LargeTexture::set_size); + ClassDB::bind_method(D_METHOD("clear"),&LargeTexture::clear); - ClassDB::bind_method(_MD("get_piece_count"),&LargeTexture::get_piece_count); - ClassDB::bind_method(_MD("get_piece_offset","idx"),&LargeTexture::get_piece_offset); - ClassDB::bind_method(_MD("get_piece_texture:Texture","idx"),&LargeTexture::get_piece_texture); + ClassDB::bind_method(D_METHOD("get_piece_count"),&LargeTexture::get_piece_count); + ClassDB::bind_method(D_METHOD("get_piece_offset","idx"),&LargeTexture::get_piece_offset); + ClassDB::bind_method(D_METHOD("get_piece_texture:Texture","idx"),&LargeTexture::get_piece_texture); - ClassDB::bind_method(_MD("_set_data","data"),&LargeTexture::_set_data); - ClassDB::bind_method(_MD("_get_data"),&LargeTexture::_get_data); + ClassDB::bind_method(D_METHOD("_set_data","data"),&LargeTexture::_set_data); + ClassDB::bind_method(D_METHOD("_get_data"),&LargeTexture::_get_data); ADD_PROPERTY( PropertyInfo( Variant::ARRAY, "_data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR), "_set_data","_get_data") ; @@ -1420,18 +1420,18 @@ void CubeMap::_get_property_list( List<PropertyInfo> *p_list) const { void CubeMap::_bind_methods() { - ClassDB::bind_method(_MD("get_width"),&CubeMap::get_width); - ClassDB::bind_method(_MD("get_height"),&CubeMap::get_height); - //ClassDB::bind_method(_MD("get_rid"),&CubeMap::get_rid); - ClassDB::bind_method(_MD("set_flags","flags"),&CubeMap::set_flags); - ClassDB::bind_method(_MD("get_flags"),&CubeMap::get_flags); - - ClassDB::bind_method(_MD("set_side","side","image"),&CubeMap::set_side); - ClassDB::bind_method(_MD("get_side","side"),&CubeMap::get_side); - ClassDB::bind_method(_MD("set_storage","mode"),&CubeMap::set_storage); - ClassDB::bind_method(_MD("get_storage"),&CubeMap::get_storage); - ClassDB::bind_method(_MD("set_lossy_storage_quality","quality"),&CubeMap::set_lossy_storage_quality); - ClassDB::bind_method(_MD("get_lossy_storage_quality"),&CubeMap::get_lossy_storage_quality); + ClassDB::bind_method(D_METHOD("get_width"),&CubeMap::get_width); + ClassDB::bind_method(D_METHOD("get_height"),&CubeMap::get_height); + //ClassDB::bind_method(D_METHOD("get_rid"),&CubeMap::get_rid); + ClassDB::bind_method(D_METHOD("set_flags","flags"),&CubeMap::set_flags); + ClassDB::bind_method(D_METHOD("get_flags"),&CubeMap::get_flags); + + ClassDB::bind_method(D_METHOD("set_side","side","image"),&CubeMap::set_side); + ClassDB::bind_method(D_METHOD("get_side","side"),&CubeMap::get_side); + ClassDB::bind_method(D_METHOD("set_storage","mode"),&CubeMap::set_storage); + ClassDB::bind_method(D_METHOD("get_storage"),&CubeMap::get_storage); + ClassDB::bind_method(D_METHOD("set_lossy_storage_quality","quality"),&CubeMap::set_lossy_storage_quality); + ClassDB::bind_method(D_METHOD("get_lossy_storage_quality"),&CubeMap::get_lossy_storage_quality); BIND_CONSTANT( STORAGE_RAW ); diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index c123cee54a..10ad38d498 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -664,43 +664,43 @@ void Theme::get_type_list(List<StringName> *p_list) const { void Theme::_bind_methods() { - ClassDB::bind_method(_MD("set_icon","name","type","texture:Texture"),&Theme::set_icon); - ClassDB::bind_method(_MD("get_icon:Texture","name","type"),&Theme::get_icon); - ClassDB::bind_method(_MD("has_icon","name","type"),&Theme::has_icon); - ClassDB::bind_method(_MD("clear_icon","name","type"),&Theme::clear_icon); - ClassDB::bind_method(_MD("get_icon_list","type"),&Theme::_get_icon_list); - - ClassDB::bind_method(_MD("set_stylebox","name","type","texture:StyleBox"),&Theme::set_stylebox); - ClassDB::bind_method(_MD("get_stylebox:StyleBox","name","type"),&Theme::get_stylebox); - ClassDB::bind_method(_MD("has_stylebox","name","type"),&Theme::has_stylebox); - ClassDB::bind_method(_MD("clear_stylebox","name","type"),&Theme::clear_stylebox); - ClassDB::bind_method(_MD("get_stylebox_list","type"),&Theme::_get_stylebox_list); - ClassDB::bind_method(_MD("get_stylebox_types"),&Theme::_get_stylebox_types); - - ClassDB::bind_method(_MD("set_font","name","type","font:Font"),&Theme::set_font); - ClassDB::bind_method(_MD("get_font:Font","name","type"),&Theme::get_font); - ClassDB::bind_method(_MD("has_font","name","type"),&Theme::has_font); - ClassDB::bind_method(_MD("clear_font","name","type"),&Theme::clear_font); - ClassDB::bind_method(_MD("get_font_list","type"),&Theme::_get_font_list); - - ClassDB::bind_method(_MD("set_color","name","type","color"),&Theme::set_color); - ClassDB::bind_method(_MD("get_color","name","type"),&Theme::get_color); - ClassDB::bind_method(_MD("has_color","name","type"),&Theme::has_color); - ClassDB::bind_method(_MD("clear_color","name","type"),&Theme::clear_color); - ClassDB::bind_method(_MD("get_color_list","type"),&Theme::_get_color_list); - - ClassDB::bind_method(_MD("set_constant","name","type","constant"),&Theme::set_constant); - ClassDB::bind_method(_MD("get_constant","name","type"),&Theme::get_constant); - ClassDB::bind_method(_MD("has_constant","name","type"),&Theme::has_constant); - ClassDB::bind_method(_MD("clear_constant","name","type"),&Theme::clear_constant); - ClassDB::bind_method(_MD("get_constant_list","type"),&Theme::_get_constant_list); - - ClassDB::bind_method(_MD("set_default_font","font"),&Theme::set_default_theme_font); - ClassDB::bind_method(_MD("get_default_font"),&Theme::get_default_theme_font); - - ClassDB::bind_method(_MD("get_type_list","type"),&Theme::_get_type_list); - - ClassDB::bind_method(_MD("_emit_theme_changed"),&Theme::_emit_theme_changed); + ClassDB::bind_method(D_METHOD("set_icon","name","type","texture:Texture"),&Theme::set_icon); + ClassDB::bind_method(D_METHOD("get_icon:Texture","name","type"),&Theme::get_icon); + ClassDB::bind_method(D_METHOD("has_icon","name","type"),&Theme::has_icon); + ClassDB::bind_method(D_METHOD("clear_icon","name","type"),&Theme::clear_icon); + ClassDB::bind_method(D_METHOD("get_icon_list","type"),&Theme::_get_icon_list); + + ClassDB::bind_method(D_METHOD("set_stylebox","name","type","texture:StyleBox"),&Theme::set_stylebox); + ClassDB::bind_method(D_METHOD("get_stylebox:StyleBox","name","type"),&Theme::get_stylebox); + ClassDB::bind_method(D_METHOD("has_stylebox","name","type"),&Theme::has_stylebox); + ClassDB::bind_method(D_METHOD("clear_stylebox","name","type"),&Theme::clear_stylebox); + ClassDB::bind_method(D_METHOD("get_stylebox_list","type"),&Theme::_get_stylebox_list); + ClassDB::bind_method(D_METHOD("get_stylebox_types"),&Theme::_get_stylebox_types); + + ClassDB::bind_method(D_METHOD("set_font","name","type","font:Font"),&Theme::set_font); + ClassDB::bind_method(D_METHOD("get_font:Font","name","type"),&Theme::get_font); + ClassDB::bind_method(D_METHOD("has_font","name","type"),&Theme::has_font); + ClassDB::bind_method(D_METHOD("clear_font","name","type"),&Theme::clear_font); + ClassDB::bind_method(D_METHOD("get_font_list","type"),&Theme::_get_font_list); + + ClassDB::bind_method(D_METHOD("set_color","name","type","color"),&Theme::set_color); + ClassDB::bind_method(D_METHOD("get_color","name","type"),&Theme::get_color); + ClassDB::bind_method(D_METHOD("has_color","name","type"),&Theme::has_color); + ClassDB::bind_method(D_METHOD("clear_color","name","type"),&Theme::clear_color); + ClassDB::bind_method(D_METHOD("get_color_list","type"),&Theme::_get_color_list); + + ClassDB::bind_method(D_METHOD("set_constant","name","type","constant"),&Theme::set_constant); + ClassDB::bind_method(D_METHOD("get_constant","name","type"),&Theme::get_constant); + ClassDB::bind_method(D_METHOD("has_constant","name","type"),&Theme::has_constant); + ClassDB::bind_method(D_METHOD("clear_constant","name","type"),&Theme::clear_constant); + ClassDB::bind_method(D_METHOD("get_constant_list","type"),&Theme::_get_constant_list); + + ClassDB::bind_method(D_METHOD("set_default_font","font"),&Theme::set_default_theme_font); + ClassDB::bind_method(D_METHOD("get_default_font"),&Theme::get_default_theme_font); + + ClassDB::bind_method(D_METHOD("get_type_list","type"),&Theme::_get_type_list); + + ClassDB::bind_method(D_METHOD("_emit_theme_changed"),&Theme::_emit_theme_changed); diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index c97682f504..e12d8057d8 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -426,37 +426,37 @@ void TileSet::clear() { void TileSet::_bind_methods() { - ClassDB::bind_method(_MD("create_tile","id"),&TileSet::create_tile); - ClassDB::bind_method(_MD("tile_set_name","id","name"),&TileSet::tile_set_name); - ClassDB::bind_method(_MD("tile_get_name","id"),&TileSet::tile_get_name); - ClassDB::bind_method(_MD("tile_set_texture","id","texture:Texture"),&TileSet::tile_set_texture); - ClassDB::bind_method(_MD("tile_get_texture:Texture","id"),&TileSet::tile_get_texture); - ClassDB::bind_method(_MD("tile_set_material","id","material:CanvasItemMaterial"),&TileSet::tile_set_material); - ClassDB::bind_method(_MD("tile_get_material:CanvasItemMaterial","id"),&TileSet::tile_get_material); - ClassDB::bind_method(_MD("tile_set_texture_offset","id","texture_offset"),&TileSet::tile_set_texture_offset); - ClassDB::bind_method(_MD("tile_get_texture_offset","id"),&TileSet::tile_get_texture_offset); - ClassDB::bind_method(_MD("tile_set_shape_offset","id","shape_offset"),&TileSet::tile_set_shape_offset); - ClassDB::bind_method(_MD("tile_get_shape_offset","id"),&TileSet::tile_get_shape_offset); - ClassDB::bind_method(_MD("tile_set_region","id","region"),&TileSet::tile_set_region); - ClassDB::bind_method(_MD("tile_get_region","id"),&TileSet::tile_get_region); - ClassDB::bind_method(_MD("tile_set_shape","id","shape:Shape2D"),&TileSet::tile_set_shape); - ClassDB::bind_method(_MD("tile_get_shape:Shape2D","id"),&TileSet::tile_get_shape); - ClassDB::bind_method(_MD("tile_set_shapes","id","shapes"),&TileSet::_tile_set_shapes); - ClassDB::bind_method(_MD("tile_get_shapes","id"),&TileSet::_tile_get_shapes); - ClassDB::bind_method(_MD("tile_set_navigation_polygon","id","navigation_polygon:NavigationPolygon"),&TileSet::tile_set_navigation_polygon); - ClassDB::bind_method(_MD("tile_get_navigation_polygon:NavigationPolygon","id"),&TileSet::tile_get_navigation_polygon); - ClassDB::bind_method(_MD("tile_set_navigation_polygon_offset","id","navigation_polygon_offset"),&TileSet::tile_set_navigation_polygon_offset); - ClassDB::bind_method(_MD("tile_get_navigation_polygon_offset","id"),&TileSet::tile_get_navigation_polygon_offset); - ClassDB::bind_method(_MD("tile_set_light_occluder","id","light_occluder:OccluderPolygon2D"),&TileSet::tile_set_light_occluder); - ClassDB::bind_method(_MD("tile_get_light_occluder:OccluderPolygon2D","id"),&TileSet::tile_get_light_occluder); - ClassDB::bind_method(_MD("tile_set_occluder_offset","id","occluder_offset"),&TileSet::tile_set_occluder_offset); - ClassDB::bind_method(_MD("tile_get_occluder_offset","id"),&TileSet::tile_get_occluder_offset); - - ClassDB::bind_method(_MD("remove_tile","id"),&TileSet::remove_tile); - ClassDB::bind_method(_MD("clear"),&TileSet::clear); - ClassDB::bind_method(_MD("get_last_unused_tile_id"),&TileSet::get_last_unused_tile_id); - ClassDB::bind_method(_MD("find_tile_by_name","name"),&TileSet::find_tile_by_name); - ClassDB::bind_method(_MD("get_tiles_ids", "name"), &TileSet::_get_tiles_ids); + ClassDB::bind_method(D_METHOD("create_tile","id"),&TileSet::create_tile); + ClassDB::bind_method(D_METHOD("tile_set_name","id","name"),&TileSet::tile_set_name); + ClassDB::bind_method(D_METHOD("tile_get_name","id"),&TileSet::tile_get_name); + ClassDB::bind_method(D_METHOD("tile_set_texture","id","texture:Texture"),&TileSet::tile_set_texture); + ClassDB::bind_method(D_METHOD("tile_get_texture:Texture","id"),&TileSet::tile_get_texture); + ClassDB::bind_method(D_METHOD("tile_set_material","id","material:CanvasItemMaterial"),&TileSet::tile_set_material); + ClassDB::bind_method(D_METHOD("tile_get_material:CanvasItemMaterial","id"),&TileSet::tile_get_material); + ClassDB::bind_method(D_METHOD("tile_set_texture_offset","id","texture_offset"),&TileSet::tile_set_texture_offset); + ClassDB::bind_method(D_METHOD("tile_get_texture_offset","id"),&TileSet::tile_get_texture_offset); + ClassDB::bind_method(D_METHOD("tile_set_shape_offset","id","shape_offset"),&TileSet::tile_set_shape_offset); + ClassDB::bind_method(D_METHOD("tile_get_shape_offset","id"),&TileSet::tile_get_shape_offset); + ClassDB::bind_method(D_METHOD("tile_set_region","id","region"),&TileSet::tile_set_region); + ClassDB::bind_method(D_METHOD("tile_get_region","id"),&TileSet::tile_get_region); + ClassDB::bind_method(D_METHOD("tile_set_shape","id","shape:Shape2D"),&TileSet::tile_set_shape); + ClassDB::bind_method(D_METHOD("tile_get_shape:Shape2D","id"),&TileSet::tile_get_shape); + ClassDB::bind_method(D_METHOD("tile_set_shapes","id","shapes"),&TileSet::_tile_set_shapes); + ClassDB::bind_method(D_METHOD("tile_get_shapes","id"),&TileSet::_tile_get_shapes); + ClassDB::bind_method(D_METHOD("tile_set_navigation_polygon","id","navigation_polygon:NavigationPolygon"),&TileSet::tile_set_navigation_polygon); + ClassDB::bind_method(D_METHOD("tile_get_navigation_polygon:NavigationPolygon","id"),&TileSet::tile_get_navigation_polygon); + ClassDB::bind_method(D_METHOD("tile_set_navigation_polygon_offset","id","navigation_polygon_offset"),&TileSet::tile_set_navigation_polygon_offset); + ClassDB::bind_method(D_METHOD("tile_get_navigation_polygon_offset","id"),&TileSet::tile_get_navigation_polygon_offset); + ClassDB::bind_method(D_METHOD("tile_set_light_occluder","id","light_occluder:OccluderPolygon2D"),&TileSet::tile_set_light_occluder); + ClassDB::bind_method(D_METHOD("tile_get_light_occluder:OccluderPolygon2D","id"),&TileSet::tile_get_light_occluder); + ClassDB::bind_method(D_METHOD("tile_set_occluder_offset","id","occluder_offset"),&TileSet::tile_set_occluder_offset); + ClassDB::bind_method(D_METHOD("tile_get_occluder_offset","id"),&TileSet::tile_get_occluder_offset); + + ClassDB::bind_method(D_METHOD("remove_tile","id"),&TileSet::remove_tile); + ClassDB::bind_method(D_METHOD("clear"),&TileSet::clear); + ClassDB::bind_method(D_METHOD("get_last_unused_tile_id"),&TileSet::get_last_unused_tile_id); + ClassDB::bind_method(D_METHOD("find_tile_by_name","name"),&TileSet::find_tile_by_name); + ClassDB::bind_method(D_METHOD("get_tiles_ids", "name"), &TileSet::_get_tiles_ids); } diff --git a/scene/resources/world.cpp b/scene/resources/world.cpp index 74ab950a2d..f9233d950c 100644 --- a/scene/resources/world.cpp +++ b/scene/resources/world.cpp @@ -310,11 +310,11 @@ PhysicsDirectSpaceState *World::get_direct_space_state() { void World::_bind_methods() { - ClassDB::bind_method(_MD("get_space"),&World::get_space); - ClassDB::bind_method(_MD("get_scenario"),&World::get_scenario); - ClassDB::bind_method(_MD("set_environment","env:Environment"),&World::set_environment); - ClassDB::bind_method(_MD("get_environment:Environment"),&World::get_environment); - ClassDB::bind_method(_MD("get_direct_space_state:PhysicsDirectSpaceState"),&World::get_direct_space_state); + ClassDB::bind_method(D_METHOD("get_space"),&World::get_space); + ClassDB::bind_method(D_METHOD("get_scenario"),&World::get_scenario); + ClassDB::bind_method(D_METHOD("set_environment","env:Environment"),&World::set_environment); + ClassDB::bind_method(D_METHOD("get_environment:Environment"),&World::get_environment); + ClassDB::bind_method(D_METHOD("get_direct_space_state:PhysicsDirectSpaceState"),&World::get_direct_space_state); ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"environment",PROPERTY_HINT_RESOURCE_TYPE,"Environment"),"set_environment","get_environment"); } diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index d4eff8d2b3..b2713da569 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -382,11 +382,11 @@ RID World2D::get_sound_space() { void World2D::_bind_methods() { - ClassDB::bind_method(_MD("get_canvas"),&World2D::get_canvas); - ClassDB::bind_method(_MD("get_space"),&World2D::get_space); - ClassDB::bind_method(_MD("get_sound_space"),&World2D::get_sound_space); + ClassDB::bind_method(D_METHOD("get_canvas"),&World2D::get_canvas); + ClassDB::bind_method(D_METHOD("get_space"),&World2D::get_space); + ClassDB::bind_method(D_METHOD("get_sound_space"),&World2D::get_sound_space); - ClassDB::bind_method(_MD("get_direct_space_state:Physics2DDirectSpaceState"),&World2D::get_direct_space_state); + ClassDB::bind_method(D_METHOD("get_direct_space_state:Physics2DDirectSpaceState"),&World2D::get_direct_space_state); } diff --git a/servers/audio/effects/audio_effect_amplify.cpp b/servers/audio/effects/audio_effect_amplify.cpp index 85c32e1fc7..fde33dfe63 100644 --- a/servers/audio/effects/audio_effect_amplify.cpp +++ b/servers/audio/effects/audio_effect_amplify.cpp @@ -38,8 +38,8 @@ float AudioEffectAmplify::get_volume_db() const { void AudioEffectAmplify::_bind_methods() { - ClassDB::bind_method(_MD("set_volume_db","volume"),&AudioEffectAmplify::set_volume_db); - ClassDB::bind_method(_MD("get_volume_db"),&AudioEffectAmplify::get_volume_db); + ClassDB::bind_method(D_METHOD("set_volume_db","volume"),&AudioEffectAmplify::set_volume_db); + ClassDB::bind_method(D_METHOD("get_volume_db"),&AudioEffectAmplify::get_volume_db); ADD_PROPERTY(PropertyInfo(Variant::REAL,"volume_db",PROPERTY_HINT_RANGE,"-80,24,0.01"),"set_volume_db","get_volume_db"); } diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp index 553e1a16a0..b33aabf24b 100644 --- a/servers/audio/effects/audio_effect_chorus.cpp +++ b/servers/audio/effects/audio_effect_chorus.cpp @@ -284,33 +284,33 @@ void AudioEffectChorus::_validate_property(PropertyInfo& property) const { void AudioEffectChorus::_bind_methods() { - ClassDB::bind_method(_MD("set_voice_count","voices"),&AudioEffectChorus::set_voice_count); - ClassDB::bind_method(_MD("get_voice_count"),&AudioEffectChorus::get_voice_count); + ClassDB::bind_method(D_METHOD("set_voice_count","voices"),&AudioEffectChorus::set_voice_count); + ClassDB::bind_method(D_METHOD("get_voice_count"),&AudioEffectChorus::get_voice_count); - ClassDB::bind_method(_MD("set_voice_delay_ms","voice_idx","delay_ms"),&AudioEffectChorus::set_voice_delay_ms); - ClassDB::bind_method(_MD("get_voice_delay_ms","voice_idx"),&AudioEffectChorus::get_voice_delay_ms); + ClassDB::bind_method(D_METHOD("set_voice_delay_ms","voice_idx","delay_ms"),&AudioEffectChorus::set_voice_delay_ms); + ClassDB::bind_method(D_METHOD("get_voice_delay_ms","voice_idx"),&AudioEffectChorus::get_voice_delay_ms); - ClassDB::bind_method(_MD("set_voice_rate_hz","voice_idx","rate_hz"),&AudioEffectChorus::set_voice_rate_hz); - ClassDB::bind_method(_MD("get_voice_rate_hz","voice_idx"),&AudioEffectChorus::get_voice_rate_hz); + ClassDB::bind_method(D_METHOD("set_voice_rate_hz","voice_idx","rate_hz"),&AudioEffectChorus::set_voice_rate_hz); + ClassDB::bind_method(D_METHOD("get_voice_rate_hz","voice_idx"),&AudioEffectChorus::get_voice_rate_hz); - ClassDB::bind_method(_MD("set_voice_depth_ms","voice_idx","depth_ms"),&AudioEffectChorus::set_voice_depth_ms); - ClassDB::bind_method(_MD("get_voice_depth_ms","voice_idx"),&AudioEffectChorus::get_voice_depth_ms); + ClassDB::bind_method(D_METHOD("set_voice_depth_ms","voice_idx","depth_ms"),&AudioEffectChorus::set_voice_depth_ms); + ClassDB::bind_method(D_METHOD("get_voice_depth_ms","voice_idx"),&AudioEffectChorus::get_voice_depth_ms); - ClassDB::bind_method(_MD("set_voice_level_db","voice_idx","level_db"),&AudioEffectChorus::set_voice_level_db); - ClassDB::bind_method(_MD("get_voice_level_db","voice_idx"),&AudioEffectChorus::get_voice_level_db); + ClassDB::bind_method(D_METHOD("set_voice_level_db","voice_idx","level_db"),&AudioEffectChorus::set_voice_level_db); + ClassDB::bind_method(D_METHOD("get_voice_level_db","voice_idx"),&AudioEffectChorus::get_voice_level_db); - ClassDB::bind_method(_MD("set_voice_cutoff_hz","voice_idx","cutoff_hz"),&AudioEffectChorus::set_voice_cutoff_hz); - ClassDB::bind_method(_MD("get_voice_cutoff_hz","voice_idx"),&AudioEffectChorus::get_voice_cutoff_hz); + ClassDB::bind_method(D_METHOD("set_voice_cutoff_hz","voice_idx","cutoff_hz"),&AudioEffectChorus::set_voice_cutoff_hz); + ClassDB::bind_method(D_METHOD("get_voice_cutoff_hz","voice_idx"),&AudioEffectChorus::get_voice_cutoff_hz); - ClassDB::bind_method(_MD("set_voice_pan","voice_idx","pan"),&AudioEffectChorus::set_voice_pan); - ClassDB::bind_method(_MD("get_voice_pan","voice_idx"),&AudioEffectChorus::get_voice_pan); + ClassDB::bind_method(D_METHOD("set_voice_pan","voice_idx","pan"),&AudioEffectChorus::set_voice_pan); + ClassDB::bind_method(D_METHOD("get_voice_pan","voice_idx"),&AudioEffectChorus::get_voice_pan); - ClassDB::bind_method(_MD("set_wet","amount"),&AudioEffectChorus::set_wet); - ClassDB::bind_method(_MD("get_wet"),&AudioEffectChorus::get_wet); + ClassDB::bind_method(D_METHOD("set_wet","amount"),&AudioEffectChorus::set_wet); + ClassDB::bind_method(D_METHOD("get_wet"),&AudioEffectChorus::get_wet); - ClassDB::bind_method(_MD("set_dry","amount"),&AudioEffectChorus::set_dry); - ClassDB::bind_method(_MD("get_dry"),&AudioEffectChorus::get_dry); + ClassDB::bind_method(D_METHOD("set_dry","amount"),&AudioEffectChorus::set_dry); + ClassDB::bind_method(D_METHOD("get_dry"),&AudioEffectChorus::get_dry); ADD_PROPERTY(PropertyInfo(Variant::INT,"voice_count",PROPERTY_HINT_RANGE,"1,4,1"),"set_voice_count","get_voice_count"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"dry",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_dry","get_dry"); diff --git a/servers/audio/effects/audio_effect_compressor.cpp b/servers/audio/effects/audio_effect_compressor.cpp index 219f406512..d20c5bb4bd 100644 --- a/servers/audio/effects/audio_effect_compressor.cpp +++ b/servers/audio/effects/audio_effect_compressor.cpp @@ -185,26 +185,26 @@ void AudioEffectCompressor::_validate_property(PropertyInfo& property) const { void AudioEffectCompressor::_bind_methods() { - ClassDB::bind_method(_MD("set_treshold","treshold"),&AudioEffectCompressor::set_treshold); - ClassDB::bind_method(_MD("get_treshold"),&AudioEffectCompressor::get_treshold); + ClassDB::bind_method(D_METHOD("set_treshold","treshold"),&AudioEffectCompressor::set_treshold); + ClassDB::bind_method(D_METHOD("get_treshold"),&AudioEffectCompressor::get_treshold); - ClassDB::bind_method(_MD("set_ratio","ratio"),&AudioEffectCompressor::set_ratio); - ClassDB::bind_method(_MD("get_ratio"),&AudioEffectCompressor::get_ratio); + ClassDB::bind_method(D_METHOD("set_ratio","ratio"),&AudioEffectCompressor::set_ratio); + ClassDB::bind_method(D_METHOD("get_ratio"),&AudioEffectCompressor::get_ratio); - ClassDB::bind_method(_MD("set_gain","gain"),&AudioEffectCompressor::set_gain); - ClassDB::bind_method(_MD("get_gain"),&AudioEffectCompressor::get_gain); + ClassDB::bind_method(D_METHOD("set_gain","gain"),&AudioEffectCompressor::set_gain); + ClassDB::bind_method(D_METHOD("get_gain"),&AudioEffectCompressor::get_gain); - ClassDB::bind_method(_MD("set_attack_us","attack_us"),&AudioEffectCompressor::set_attack_us); - ClassDB::bind_method(_MD("get_attack_us"),&AudioEffectCompressor::get_attack_us); + ClassDB::bind_method(D_METHOD("set_attack_us","attack_us"),&AudioEffectCompressor::set_attack_us); + ClassDB::bind_method(D_METHOD("get_attack_us"),&AudioEffectCompressor::get_attack_us); - ClassDB::bind_method(_MD("set_release_ms","release_ms"),&AudioEffectCompressor::set_release_ms); - ClassDB::bind_method(_MD("get_release_ms"),&AudioEffectCompressor::get_release_ms); + ClassDB::bind_method(D_METHOD("set_release_ms","release_ms"),&AudioEffectCompressor::set_release_ms); + ClassDB::bind_method(D_METHOD("get_release_ms"),&AudioEffectCompressor::get_release_ms); - ClassDB::bind_method(_MD("set_mix","mix"),&AudioEffectCompressor::set_mix); - ClassDB::bind_method(_MD("get_mix"),&AudioEffectCompressor::get_mix); + ClassDB::bind_method(D_METHOD("set_mix","mix"),&AudioEffectCompressor::set_mix); + ClassDB::bind_method(D_METHOD("get_mix"),&AudioEffectCompressor::get_mix); - ClassDB::bind_method(_MD("set_sidechain","sidechain"),&AudioEffectCompressor::set_sidechain); - ClassDB::bind_method(_MD("get_sidechain"),&AudioEffectCompressor::get_sidechain); + ClassDB::bind_method(D_METHOD("set_sidechain","sidechain"),&AudioEffectCompressor::set_sidechain); + ClassDB::bind_method(D_METHOD("get_sidechain"),&AudioEffectCompressor::get_sidechain); ADD_PROPERTY(PropertyInfo(Variant::REAL,"treshold",PROPERTY_HINT_RANGE,"-60,0,0.1"),"set_treshold","get_treshold"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"ratio",PROPERTY_HINT_RANGE,"1,48,0.1"),"set_ratio","get_ratio"); diff --git a/servers/audio/effects/audio_effect_delay.cpp b/servers/audio/effects/audio_effect_delay.cpp index 78e17e563b..3d3a956b92 100644 --- a/servers/audio/effects/audio_effect_delay.cpp +++ b/servers/audio/effects/audio_effect_delay.cpp @@ -244,45 +244,45 @@ float AudioEffectDelay::get_feedback_lowpass() const{ void AudioEffectDelay::_bind_methods() { - ClassDB::bind_method(_MD("set_dry","amount"),&AudioEffectDelay::set_dry); - ClassDB::bind_method(_MD("get_dry"),&AudioEffectDelay::get_dry); + ClassDB::bind_method(D_METHOD("set_dry","amount"),&AudioEffectDelay::set_dry); + ClassDB::bind_method(D_METHOD("get_dry"),&AudioEffectDelay::get_dry); - ClassDB::bind_method(_MD("set_tap1_active","amount"),&AudioEffectDelay::set_tap1_active); - ClassDB::bind_method(_MD("is_tap1_active"),&AudioEffectDelay::is_tap1_active); + ClassDB::bind_method(D_METHOD("set_tap1_active","amount"),&AudioEffectDelay::set_tap1_active); + ClassDB::bind_method(D_METHOD("is_tap1_active"),&AudioEffectDelay::is_tap1_active); - ClassDB::bind_method(_MD("set_tap1_delay_ms","amount"),&AudioEffectDelay::set_tap1_delay_ms); - ClassDB::bind_method(_MD("get_tap1_delay_ms"),&AudioEffectDelay::get_tap1_delay_ms); + ClassDB::bind_method(D_METHOD("set_tap1_delay_ms","amount"),&AudioEffectDelay::set_tap1_delay_ms); + ClassDB::bind_method(D_METHOD("get_tap1_delay_ms"),&AudioEffectDelay::get_tap1_delay_ms); - ClassDB::bind_method(_MD("set_tap1_level_db","amount"),&AudioEffectDelay::set_tap1_level_db); - ClassDB::bind_method(_MD("get_tap1_level_db"),&AudioEffectDelay::get_tap1_level_db); + ClassDB::bind_method(D_METHOD("set_tap1_level_db","amount"),&AudioEffectDelay::set_tap1_level_db); + ClassDB::bind_method(D_METHOD("get_tap1_level_db"),&AudioEffectDelay::get_tap1_level_db); - ClassDB::bind_method(_MD("set_tap1_pan","amount"),&AudioEffectDelay::set_tap1_pan); - ClassDB::bind_method(_MD("get_tap1_pan"),&AudioEffectDelay::get_tap1_pan); + ClassDB::bind_method(D_METHOD("set_tap1_pan","amount"),&AudioEffectDelay::set_tap1_pan); + ClassDB::bind_method(D_METHOD("get_tap1_pan"),&AudioEffectDelay::get_tap1_pan); - ClassDB::bind_method(_MD("set_tap2_active","amount"),&AudioEffectDelay::set_tap2_active); - ClassDB::bind_method(_MD("is_tap2_active"),&AudioEffectDelay::is_tap2_active); + ClassDB::bind_method(D_METHOD("set_tap2_active","amount"),&AudioEffectDelay::set_tap2_active); + ClassDB::bind_method(D_METHOD("is_tap2_active"),&AudioEffectDelay::is_tap2_active); - ClassDB::bind_method(_MD("set_tap2_delay_ms","amount"),&AudioEffectDelay::set_tap2_delay_ms); - ClassDB::bind_method(_MD("get_tap2_delay_ms"),&AudioEffectDelay::get_tap2_delay_ms); + ClassDB::bind_method(D_METHOD("set_tap2_delay_ms","amount"),&AudioEffectDelay::set_tap2_delay_ms); + ClassDB::bind_method(D_METHOD("get_tap2_delay_ms"),&AudioEffectDelay::get_tap2_delay_ms); - ClassDB::bind_method(_MD("set_tap2_level_db","amount"),&AudioEffectDelay::set_tap2_level_db); - ClassDB::bind_method(_MD("get_tap2_level_db"),&AudioEffectDelay::get_tap2_level_db); + ClassDB::bind_method(D_METHOD("set_tap2_level_db","amount"),&AudioEffectDelay::set_tap2_level_db); + ClassDB::bind_method(D_METHOD("get_tap2_level_db"),&AudioEffectDelay::get_tap2_level_db); - ClassDB::bind_method(_MD("set_tap2_pan","amount"),&AudioEffectDelay::set_tap2_pan); - ClassDB::bind_method(_MD("get_tap2_pan"),&AudioEffectDelay::get_tap2_pan); + ClassDB::bind_method(D_METHOD("set_tap2_pan","amount"),&AudioEffectDelay::set_tap2_pan); + ClassDB::bind_method(D_METHOD("get_tap2_pan"),&AudioEffectDelay::get_tap2_pan); - ClassDB::bind_method(_MD("set_feedback_active","amount"),&AudioEffectDelay::set_feedback_active); - ClassDB::bind_method(_MD("is_feedback_active"),&AudioEffectDelay::is_feedback_active); + ClassDB::bind_method(D_METHOD("set_feedback_active","amount"),&AudioEffectDelay::set_feedback_active); + ClassDB::bind_method(D_METHOD("is_feedback_active"),&AudioEffectDelay::is_feedback_active); - ClassDB::bind_method(_MD("set_feedback_delay_ms","amount"),&AudioEffectDelay::set_feedback_delay_ms); - ClassDB::bind_method(_MD("get_feedback_delay_ms"),&AudioEffectDelay::get_feedback_delay_ms); + ClassDB::bind_method(D_METHOD("set_feedback_delay_ms","amount"),&AudioEffectDelay::set_feedback_delay_ms); + ClassDB::bind_method(D_METHOD("get_feedback_delay_ms"),&AudioEffectDelay::get_feedback_delay_ms); - ClassDB::bind_method(_MD("set_feedback_level_db","amount"),&AudioEffectDelay::set_feedback_level_db); - ClassDB::bind_method(_MD("get_feedback_level_db"),&AudioEffectDelay::get_feedback_level_db); + ClassDB::bind_method(D_METHOD("set_feedback_level_db","amount"),&AudioEffectDelay::set_feedback_level_db); + ClassDB::bind_method(D_METHOD("get_feedback_level_db"),&AudioEffectDelay::get_feedback_level_db); - ClassDB::bind_method(_MD("set_feedback_lowpass","amount"),&AudioEffectDelay::set_feedback_lowpass); - ClassDB::bind_method(_MD("get_feedback_lowpass"),&AudioEffectDelay::get_feedback_lowpass); + ClassDB::bind_method(D_METHOD("set_feedback_lowpass","amount"),&AudioEffectDelay::set_feedback_lowpass); + ClassDB::bind_method(D_METHOD("get_feedback_lowpass"),&AudioEffectDelay::get_feedback_lowpass); ADD_PROPERTY(PropertyInfo(Variant::REAL,"dry",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_dry","get_dry"); diff --git a/servers/audio/effects/audio_effect_distortion.cpp b/servers/audio/effects/audio_effect_distortion.cpp index 0f036a3221..d0f526fe24 100644 --- a/servers/audio/effects/audio_effect_distortion.cpp +++ b/servers/audio/effects/audio_effect_distortion.cpp @@ -137,21 +137,21 @@ float AudioEffectDistortion::get_post_gain() const{ void AudioEffectDistortion::_bind_methods() { - ClassDB::bind_method(_MD("set_mode","mode"),&AudioEffectDistortion::set_mode); - ClassDB::bind_method(_MD("get_mode"),&AudioEffectDistortion::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&AudioEffectDistortion::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&AudioEffectDistortion::get_mode); - ClassDB::bind_method(_MD("set_pre_gain","pre_gain"),&AudioEffectDistortion::set_pre_gain); - ClassDB::bind_method(_MD("get_pre_gain"),&AudioEffectDistortion::get_pre_gain); + ClassDB::bind_method(D_METHOD("set_pre_gain","pre_gain"),&AudioEffectDistortion::set_pre_gain); + ClassDB::bind_method(D_METHOD("get_pre_gain"),&AudioEffectDistortion::get_pre_gain); - ClassDB::bind_method(_MD("set_keep_hf_hz","keep_hf_hz"),&AudioEffectDistortion::set_keep_hf_hz); - ClassDB::bind_method(_MD("get_keep_hf_hz"),&AudioEffectDistortion::get_keep_hf_hz); + ClassDB::bind_method(D_METHOD("set_keep_hf_hz","keep_hf_hz"),&AudioEffectDistortion::set_keep_hf_hz); + ClassDB::bind_method(D_METHOD("get_keep_hf_hz"),&AudioEffectDistortion::get_keep_hf_hz); - ClassDB::bind_method(_MD("set_drive","drive"),&AudioEffectDistortion::set_drive); - ClassDB::bind_method(_MD("get_drive"),&AudioEffectDistortion::get_drive); + ClassDB::bind_method(D_METHOD("set_drive","drive"),&AudioEffectDistortion::set_drive); + ClassDB::bind_method(D_METHOD("get_drive"),&AudioEffectDistortion::get_drive); - ClassDB::bind_method(_MD("set_post_gain","post_gain"),&AudioEffectDistortion::set_post_gain); - ClassDB::bind_method(_MD("get_post_gain"),&AudioEffectDistortion::get_post_gain); + ClassDB::bind_method(D_METHOD("set_post_gain","post_gain"),&AudioEffectDistortion::set_post_gain); + ClassDB::bind_method(D_METHOD("get_post_gain"),&AudioEffectDistortion::get_post_gain); ADD_PROPERTY(PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Clip,ATan,LoFi,Overdrive,WaveShape"),"set_mode","get_mode"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"pre_gain",PROPERTY_HINT_RANGE,"-60,60,0.01"),"set_pre_gain","get_pre_gain"); diff --git a/servers/audio/effects/audio_effect_eq.cpp b/servers/audio/effects/audio_effect_eq.cpp index 3c6a684224..5f42f2826f 100644 --- a/servers/audio/effects/audio_effect_eq.cpp +++ b/servers/audio/effects/audio_effect_eq.cpp @@ -100,9 +100,9 @@ void AudioEffectEQ::_get_property_list( List<PropertyInfo> *p_list) const{ void AudioEffectEQ::_bind_methods() { - ClassDB::bind_method(_MD("set_band_gain_db","band_idx","volume_db"),&AudioEffectEQ::set_band_gain_db); - ClassDB::bind_method(_MD("get_band_gain_db","band_idx"),&AudioEffectEQ::get_band_gain_db); - ClassDB::bind_method(_MD("get_band_count"),&AudioEffectEQ::get_band_count); + ClassDB::bind_method(D_METHOD("set_band_gain_db","band_idx","volume_db"),&AudioEffectEQ::set_band_gain_db); + ClassDB::bind_method(D_METHOD("get_band_gain_db","band_idx"),&AudioEffectEQ::get_band_gain_db); + ClassDB::bind_method(D_METHOD("get_band_count"),&AudioEffectEQ::get_band_count); } diff --git a/servers/audio/effects/audio_effect_filter.cpp b/servers/audio/effects/audio_effect_filter.cpp index dc04f74095..e7af7ca9c0 100644 --- a/servers/audio/effects/audio_effect_filter.cpp +++ b/servers/audio/effects/audio_effect_filter.cpp @@ -122,17 +122,17 @@ AudioEffectFilter::FilterDB AudioEffectFilter::get_db() const { void AudioEffectFilter::_bind_methods() { - ClassDB::bind_method(_MD("set_cutoff","freq"),&AudioEffectFilter::set_cutoff); - ClassDB::bind_method(_MD("get_cutoff"),&AudioEffectFilter::get_cutoff); + ClassDB::bind_method(D_METHOD("set_cutoff","freq"),&AudioEffectFilter::set_cutoff); + ClassDB::bind_method(D_METHOD("get_cutoff"),&AudioEffectFilter::get_cutoff); - ClassDB::bind_method(_MD("set_resonance","amount"),&AudioEffectFilter::set_resonance); - ClassDB::bind_method(_MD("get_resonance"),&AudioEffectFilter::get_resonance); + ClassDB::bind_method(D_METHOD("set_resonance","amount"),&AudioEffectFilter::set_resonance); + ClassDB::bind_method(D_METHOD("get_resonance"),&AudioEffectFilter::get_resonance); - ClassDB::bind_method(_MD("set_gain","amount"),&AudioEffectFilter::set_gain); - ClassDB::bind_method(_MD("get_gain"),&AudioEffectFilter::get_gain); + ClassDB::bind_method(D_METHOD("set_gain","amount"),&AudioEffectFilter::set_gain); + ClassDB::bind_method(D_METHOD("get_gain"),&AudioEffectFilter::get_gain); - ClassDB::bind_method(_MD("set_db","amount"),&AudioEffectFilter::set_db); - ClassDB::bind_method(_MD("get_db"),&AudioEffectFilter::get_db); + ClassDB::bind_method(D_METHOD("set_db","amount"),&AudioEffectFilter::set_db); + ClassDB::bind_method(D_METHOD("get_db"),&AudioEffectFilter::get_db); ADD_PROPERTY(PropertyInfo(Variant::REAL,"cutoff_hz",PROPERTY_HINT_RANGE,"1,40000,0.1"),"set_cutoff","get_cutoff"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"resonance",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_resonance","get_resonance"); diff --git a/servers/audio/effects/audio_effect_limiter.cpp b/servers/audio/effects/audio_effect_limiter.cpp index 76bcc38c37..bce1e0a0df 100644 --- a/servers/audio/effects/audio_effect_limiter.cpp +++ b/servers/audio/effects/audio_effect_limiter.cpp @@ -97,17 +97,17 @@ float AudioEffectLimiter::get_soft_clip_ratio() const{ void AudioEffectLimiter::_bind_methods() { - ClassDB::bind_method(_MD("set_ceiling_db","ceiling"),&AudioEffectLimiter::set_ceiling_db); - ClassDB::bind_method(_MD("get_ceiling_db"),&AudioEffectLimiter::get_ceiling_db); + ClassDB::bind_method(D_METHOD("set_ceiling_db","ceiling"),&AudioEffectLimiter::set_ceiling_db); + ClassDB::bind_method(D_METHOD("get_ceiling_db"),&AudioEffectLimiter::get_ceiling_db); - ClassDB::bind_method(_MD("set_treshold_db","treshold"),&AudioEffectLimiter::set_treshold_db); - ClassDB::bind_method(_MD("get_treshold_db"),&AudioEffectLimiter::get_treshold_db); + ClassDB::bind_method(D_METHOD("set_treshold_db","treshold"),&AudioEffectLimiter::set_treshold_db); + ClassDB::bind_method(D_METHOD("get_treshold_db"),&AudioEffectLimiter::get_treshold_db); - ClassDB::bind_method(_MD("set_soft_clip_db","soft_clip"),&AudioEffectLimiter::set_soft_clip_db); - ClassDB::bind_method(_MD("get_soft_clip_db"),&AudioEffectLimiter::get_soft_clip_db); + ClassDB::bind_method(D_METHOD("set_soft_clip_db","soft_clip"),&AudioEffectLimiter::set_soft_clip_db); + ClassDB::bind_method(D_METHOD("get_soft_clip_db"),&AudioEffectLimiter::get_soft_clip_db); - ClassDB::bind_method(_MD("set_soft_clip_ratio","soft_clip"),&AudioEffectLimiter::set_soft_clip_ratio); - ClassDB::bind_method(_MD("get_soft_clip_ratio"),&AudioEffectLimiter::get_soft_clip_ratio); + ClassDB::bind_method(D_METHOD("set_soft_clip_ratio","soft_clip"),&AudioEffectLimiter::set_soft_clip_ratio); + ClassDB::bind_method(D_METHOD("get_soft_clip_ratio"),&AudioEffectLimiter::get_soft_clip_ratio); ADD_PROPERTY(PropertyInfo(Variant::REAL,"ceiling_db",PROPERTY_HINT_RANGE,"-20,-0.1,0.1"),"set_ceiling_db","get_ceiling_db"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"treshold_db",PROPERTY_HINT_RANGE,"-30,0,0.1"),"set_treshold_db","get_treshold_db"); diff --git a/servers/audio/effects/audio_effect_panner.cpp b/servers/audio/effects/audio_effect_panner.cpp index db80155b7e..75ef9c3e3a 100644 --- a/servers/audio/effects/audio_effect_panner.cpp +++ b/servers/audio/effects/audio_effect_panner.cpp @@ -35,8 +35,8 @@ float AudioEffectPanner::get_pan() const { void AudioEffectPanner::_bind_methods() { - ClassDB::bind_method(_MD("set_pan","cpanume"),&AudioEffectPanner::set_pan); - ClassDB::bind_method(_MD("get_pan"),&AudioEffectPanner::get_pan); + ClassDB::bind_method(D_METHOD("set_pan","cpanume"),&AudioEffectPanner::set_pan); + ClassDB::bind_method(D_METHOD("get_pan"),&AudioEffectPanner::get_pan); ADD_PROPERTY(PropertyInfo(Variant::REAL,"pan",PROPERTY_HINT_RANGE,"-1,1,0.01"),"set_pan","get_pan"); } diff --git a/servers/audio/effects/audio_effect_phaser.cpp b/servers/audio/effects/audio_effect_phaser.cpp index 273baba130..c5e49e6cc6 100644 --- a/servers/audio/effects/audio_effect_phaser.cpp +++ b/servers/audio/effects/audio_effect_phaser.cpp @@ -115,20 +115,20 @@ float AudioEffectPhaser::get_depth() const { void AudioEffectPhaser::_bind_methods() { - ClassDB::bind_method(_MD("set_range_min_hz","hz"),&AudioEffectPhaser::set_range_min_hz); - ClassDB::bind_method(_MD("get_range_min_hz"),&AudioEffectPhaser::get_range_min_hz); + ClassDB::bind_method(D_METHOD("set_range_min_hz","hz"),&AudioEffectPhaser::set_range_min_hz); + ClassDB::bind_method(D_METHOD("get_range_min_hz"),&AudioEffectPhaser::get_range_min_hz); - ClassDB::bind_method(_MD("set_range_max_hz","hz"),&AudioEffectPhaser::set_range_max_hz); - ClassDB::bind_method(_MD("get_range_max_hz"),&AudioEffectPhaser::get_range_max_hz); + ClassDB::bind_method(D_METHOD("set_range_max_hz","hz"),&AudioEffectPhaser::set_range_max_hz); + ClassDB::bind_method(D_METHOD("get_range_max_hz"),&AudioEffectPhaser::get_range_max_hz); - ClassDB::bind_method(_MD("set_rate_hz","hz"),&AudioEffectPhaser::set_rate_hz); - ClassDB::bind_method(_MD("get_rate_hz"),&AudioEffectPhaser::get_rate_hz); + ClassDB::bind_method(D_METHOD("set_rate_hz","hz"),&AudioEffectPhaser::set_rate_hz); + ClassDB::bind_method(D_METHOD("get_rate_hz"),&AudioEffectPhaser::get_rate_hz); - ClassDB::bind_method(_MD("set_feedback","fbk"),&AudioEffectPhaser::set_feedback); - ClassDB::bind_method(_MD("get_feedback"),&AudioEffectPhaser::get_feedback); + ClassDB::bind_method(D_METHOD("set_feedback","fbk"),&AudioEffectPhaser::set_feedback); + ClassDB::bind_method(D_METHOD("get_feedback"),&AudioEffectPhaser::get_feedback); - ClassDB::bind_method(_MD("set_depth","depth"),&AudioEffectPhaser::set_depth); - ClassDB::bind_method(_MD("get_depth"),&AudioEffectPhaser::get_depth); + ClassDB::bind_method(D_METHOD("set_depth","depth"),&AudioEffectPhaser::set_depth); + ClassDB::bind_method(D_METHOD("get_depth"),&AudioEffectPhaser::get_depth); ADD_PROPERTY(PropertyInfo(Variant::REAL,"range_min_hz",PROPERTY_HINT_RANGE,"10,10000"),"set_range_min_hz","get_range_min_hz"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"range_max_hz",PROPERTY_HINT_RANGE,"10,10000"),"set_range_max_hz","get_range_max_hz"); diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp index a0d35ecd5e..1222c7b1b2 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.cpp +++ b/servers/audio/effects/audio_effect_pitch_shift.cpp @@ -285,8 +285,8 @@ float AudioEffectPitchShift::get_pitch_scale() const { void AudioEffectPitchShift::_bind_methods() { - ClassDB::bind_method(_MD("set_pitch_scale","rate"),&AudioEffectPitchShift::set_pitch_scale); - ClassDB::bind_method(_MD("get_pitch_scale"),&AudioEffectPitchShift::get_pitch_scale); + ClassDB::bind_method(D_METHOD("set_pitch_scale","rate"),&AudioEffectPitchShift::set_pitch_scale); + ClassDB::bind_method(D_METHOD("get_pitch_scale"),&AudioEffectPitchShift::get_pitch_scale); ADD_PROPERTY(PropertyInfo(Variant::REAL,"pitch_scale",PROPERTY_HINT_RANGE,"0.01,16,0.01"),"set_pitch_scale","get_pitch_scale"); diff --git a/servers/audio/effects/audio_effect_reverb.cpp b/servers/audio/effects/audio_effect_reverb.cpp index a518a36334..f84dffdd36 100644 --- a/servers/audio/effects/audio_effect_reverb.cpp +++ b/servers/audio/effects/audio_effect_reverb.cpp @@ -132,29 +132,29 @@ float AudioEffectReverb::get_hpf() const { void AudioEffectReverb::_bind_methods() { - ClassDB::bind_method(_MD("set_predelay_msec","msec"),&AudioEffectReverb::set_predelay_msec); - ClassDB::bind_method(_MD("get_predelay_msec"),&AudioEffectReverb::get_predelay_msec); + ClassDB::bind_method(D_METHOD("set_predelay_msec","msec"),&AudioEffectReverb::set_predelay_msec); + ClassDB::bind_method(D_METHOD("get_predelay_msec"),&AudioEffectReverb::get_predelay_msec); - ClassDB::bind_method(_MD("set_predelay_feedback","feedback"),&AudioEffectReverb::set_predelay_feedback); - ClassDB::bind_method(_MD("get_predelay_feedback"),&AudioEffectReverb::get_predelay_feedback); + ClassDB::bind_method(D_METHOD("set_predelay_feedback","feedback"),&AudioEffectReverb::set_predelay_feedback); + ClassDB::bind_method(D_METHOD("get_predelay_feedback"),&AudioEffectReverb::get_predelay_feedback); - ClassDB::bind_method(_MD("set_room_size","size"),&AudioEffectReverb::set_room_size); - ClassDB::bind_method(_MD("get_room_size"),&AudioEffectReverb::get_room_size); + ClassDB::bind_method(D_METHOD("set_room_size","size"),&AudioEffectReverb::set_room_size); + ClassDB::bind_method(D_METHOD("get_room_size"),&AudioEffectReverb::get_room_size); - ClassDB::bind_method(_MD("set_damping","amount"),&AudioEffectReverb::set_damping); - ClassDB::bind_method(_MD("get_damping"),&AudioEffectReverb::get_damping); + ClassDB::bind_method(D_METHOD("set_damping","amount"),&AudioEffectReverb::set_damping); + ClassDB::bind_method(D_METHOD("get_damping"),&AudioEffectReverb::get_damping); - ClassDB::bind_method(_MD("set_spread","amount"),&AudioEffectReverb::set_spread); - ClassDB::bind_method(_MD("get_spread"),&AudioEffectReverb::get_spread); + ClassDB::bind_method(D_METHOD("set_spread","amount"),&AudioEffectReverb::set_spread); + ClassDB::bind_method(D_METHOD("get_spread"),&AudioEffectReverb::get_spread); - ClassDB::bind_method(_MD("set_dry","amount"),&AudioEffectReverb::set_dry); - ClassDB::bind_method(_MD("get_dry"),&AudioEffectReverb::get_dry); + ClassDB::bind_method(D_METHOD("set_dry","amount"),&AudioEffectReverb::set_dry); + ClassDB::bind_method(D_METHOD("get_dry"),&AudioEffectReverb::get_dry); - ClassDB::bind_method(_MD("set_wet","amount"),&AudioEffectReverb::set_wet); - ClassDB::bind_method(_MD("get_wet"),&AudioEffectReverb::get_wet); + ClassDB::bind_method(D_METHOD("set_wet","amount"),&AudioEffectReverb::set_wet); + ClassDB::bind_method(D_METHOD("get_wet"),&AudioEffectReverb::get_wet); - ClassDB::bind_method(_MD("set_hpf","amount"),&AudioEffectReverb::set_hpf); - ClassDB::bind_method(_MD("get_hpf"),&AudioEffectReverb::get_hpf); + ClassDB::bind_method(D_METHOD("set_hpf","amount"),&AudioEffectReverb::set_hpf); + ClassDB::bind_method(D_METHOD("get_hpf"),&AudioEffectReverb::get_hpf); ADD_GROUP("Predelay","predelay_"); diff --git a/servers/audio/effects/audio_effect_stereo_enhance.cpp b/servers/audio/effects/audio_effect_stereo_enhance.cpp index 10abe0259d..0afabc8f3d 100644 --- a/servers/audio/effects/audio_effect_stereo_enhance.cpp +++ b/servers/audio/effects/audio_effect_stereo_enhance.cpp @@ -113,14 +113,14 @@ float AudioEffectStereoEnhance::get_surround() const { void AudioEffectStereoEnhance::_bind_methods() { - ClassDB::bind_method(_MD("set_pan_pullout","amount"),&AudioEffectStereoEnhance::set_pan_pullout); - ClassDB::bind_method(_MD("get_pan_pullout"),&AudioEffectStereoEnhance::get_pan_pullout); + ClassDB::bind_method(D_METHOD("set_pan_pullout","amount"),&AudioEffectStereoEnhance::set_pan_pullout); + ClassDB::bind_method(D_METHOD("get_pan_pullout"),&AudioEffectStereoEnhance::get_pan_pullout); - ClassDB::bind_method(_MD("set_time_pullout","amount"),&AudioEffectStereoEnhance::set_time_pullout); - ClassDB::bind_method(_MD("get_time_pullout"),&AudioEffectStereoEnhance::get_time_pullout); + ClassDB::bind_method(D_METHOD("set_time_pullout","amount"),&AudioEffectStereoEnhance::set_time_pullout); + ClassDB::bind_method(D_METHOD("get_time_pullout"),&AudioEffectStereoEnhance::get_time_pullout); - ClassDB::bind_method(_MD("set_surround","amount"),&AudioEffectStereoEnhance::set_surround); - ClassDB::bind_method(_MD("get_surround"),&AudioEffectStereoEnhance::get_surround); + ClassDB::bind_method(D_METHOD("set_surround","amount"),&AudioEffectStereoEnhance::set_surround); + ClassDB::bind_method(D_METHOD("get_surround"),&AudioEffectStereoEnhance::get_surround); ADD_PROPERTY(PropertyInfo(Variant::REAL,"pan_pullout",PROPERTY_HINT_RANGE,"0,4,0.01"),"set_pan_pullout","get_pan_pullout"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"time_pullout_ms",PROPERTY_HINT_RANGE,"0,50,0.01"),"set_time_pullout","get_time_pullout"); diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 8a8b9ebf76..edc7f36ff2 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -1019,52 +1019,52 @@ Ref<AudioBusLayout> AudioServer::generate_bus_layout() const { void AudioServer::_bind_methods() { - ClassDB::bind_method(_MD("set_bus_count","amount"),&AudioServer::set_bus_count); - ClassDB::bind_method(_MD("get_bus_count"),&AudioServer::get_bus_count); + ClassDB::bind_method(D_METHOD("set_bus_count","amount"),&AudioServer::set_bus_count); + ClassDB::bind_method(D_METHOD("get_bus_count"),&AudioServer::get_bus_count); - ClassDB::bind_method(_MD("remove_bus","index"),&AudioServer::remove_bus); - ClassDB::bind_method(_MD("add_bus","at_pos"),&AudioServer::add_bus,DEFVAL(-1)); - ClassDB::bind_method(_MD("move_bus","index","to_index"),&AudioServer::move_bus); + ClassDB::bind_method(D_METHOD("remove_bus","index"),&AudioServer::remove_bus); + ClassDB::bind_method(D_METHOD("add_bus","at_pos"),&AudioServer::add_bus,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("move_bus","index","to_index"),&AudioServer::move_bus); - ClassDB::bind_method(_MD("set_bus_name","bus_idx","name"),&AudioServer::set_bus_name); - ClassDB::bind_method(_MD("get_bus_name","bus_idx"),&AudioServer::get_bus_name); + ClassDB::bind_method(D_METHOD("set_bus_name","bus_idx","name"),&AudioServer::set_bus_name); + ClassDB::bind_method(D_METHOD("get_bus_name","bus_idx"),&AudioServer::get_bus_name); - ClassDB::bind_method(_MD("set_bus_volume_db","bus_idx","volume_db"),&AudioServer::set_bus_volume_db); - ClassDB::bind_method(_MD("get_bus_volume_db","bus_idx"),&AudioServer::get_bus_volume_db); + ClassDB::bind_method(D_METHOD("set_bus_volume_db","bus_idx","volume_db"),&AudioServer::set_bus_volume_db); + ClassDB::bind_method(D_METHOD("get_bus_volume_db","bus_idx"),&AudioServer::get_bus_volume_db); - ClassDB::bind_method(_MD("set_bus_send","bus_idx","send"),&AudioServer::set_bus_send); - ClassDB::bind_method(_MD("get_bus_send","bus_idx"),&AudioServer::get_bus_send); + ClassDB::bind_method(D_METHOD("set_bus_send","bus_idx","send"),&AudioServer::set_bus_send); + ClassDB::bind_method(D_METHOD("get_bus_send","bus_idx"),&AudioServer::get_bus_send); - ClassDB::bind_method(_MD("set_bus_solo","bus_idx","enable"),&AudioServer::set_bus_solo); - ClassDB::bind_method(_MD("is_bus_solo","bus_idx"),&AudioServer::is_bus_solo); + ClassDB::bind_method(D_METHOD("set_bus_solo","bus_idx","enable"),&AudioServer::set_bus_solo); + ClassDB::bind_method(D_METHOD("is_bus_solo","bus_idx"),&AudioServer::is_bus_solo); - ClassDB::bind_method(_MD("set_bus_mute","bus_idx","enable"),&AudioServer::set_bus_mute); - ClassDB::bind_method(_MD("is_bus_mute","bus_idx"),&AudioServer::is_bus_mute); + ClassDB::bind_method(D_METHOD("set_bus_mute","bus_idx","enable"),&AudioServer::set_bus_mute); + ClassDB::bind_method(D_METHOD("is_bus_mute","bus_idx"),&AudioServer::is_bus_mute); - ClassDB::bind_method(_MD("set_bus_bypass_effects","bus_idx","enable"),&AudioServer::set_bus_bypass_effects); - ClassDB::bind_method(_MD("is_bus_bypassing_effects","bus_idx"),&AudioServer::is_bus_bypassing_effects); + ClassDB::bind_method(D_METHOD("set_bus_bypass_effects","bus_idx","enable"),&AudioServer::set_bus_bypass_effects); + ClassDB::bind_method(D_METHOD("is_bus_bypassing_effects","bus_idx"),&AudioServer::is_bus_bypassing_effects); - ClassDB::bind_method(_MD("add_bus_effect","bus_idx","effect:AudioEffect"),&AudioServer::add_bus_effect,DEFVAL(-1)); - ClassDB::bind_method(_MD("remove_bus_effect","bus_idx","effect_idx"),&AudioServer::remove_bus_effect); + ClassDB::bind_method(D_METHOD("add_bus_effect","bus_idx","effect:AudioEffect"),&AudioServer::add_bus_effect,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("remove_bus_effect","bus_idx","effect_idx"),&AudioServer::remove_bus_effect); - ClassDB::bind_method(_MD("get_bus_effect_count","bus_idx"),&AudioServer::add_bus_effect); - ClassDB::bind_method(_MD("get_bus_effect:AudioEffect","bus_idx","effect_idx"),&AudioServer::get_bus_effect); - ClassDB::bind_method(_MD("swap_bus_effects","bus_idx","effect_idx","by_effect_idx"),&AudioServer::swap_bus_effects); + ClassDB::bind_method(D_METHOD("get_bus_effect_count","bus_idx"),&AudioServer::add_bus_effect); + ClassDB::bind_method(D_METHOD("get_bus_effect:AudioEffect","bus_idx","effect_idx"),&AudioServer::get_bus_effect); + ClassDB::bind_method(D_METHOD("swap_bus_effects","bus_idx","effect_idx","by_effect_idx"),&AudioServer::swap_bus_effects); - ClassDB::bind_method(_MD("set_bus_effect_enabled","bus_idx","effect_idx","enabled"),&AudioServer::set_bus_effect_enabled); - ClassDB::bind_method(_MD("is_bus_effect_enabled","bus_idx","effect_idx"),&AudioServer::is_bus_effect_enabled); + ClassDB::bind_method(D_METHOD("set_bus_effect_enabled","bus_idx","effect_idx","enabled"),&AudioServer::set_bus_effect_enabled); + ClassDB::bind_method(D_METHOD("is_bus_effect_enabled","bus_idx","effect_idx"),&AudioServer::is_bus_effect_enabled); - ClassDB::bind_method(_MD("get_bus_peak_volume_left_db","bus_idx","channel"),&AudioServer::get_bus_peak_volume_left_db); - ClassDB::bind_method(_MD("get_bus_peak_volume_right_db","bus_idx","channel"),&AudioServer::get_bus_peak_volume_right_db); + ClassDB::bind_method(D_METHOD("get_bus_peak_volume_left_db","bus_idx","channel"),&AudioServer::get_bus_peak_volume_left_db); + ClassDB::bind_method(D_METHOD("get_bus_peak_volume_right_db","bus_idx","channel"),&AudioServer::get_bus_peak_volume_right_db); - ClassDB::bind_method(_MD("lock"),&AudioServer::lock); - ClassDB::bind_method(_MD("unlock"),&AudioServer::unlock); + ClassDB::bind_method(D_METHOD("lock"),&AudioServer::lock); + ClassDB::bind_method(D_METHOD("unlock"),&AudioServer::unlock); - ClassDB::bind_method(_MD("get_speaker_mode"),&AudioServer::get_speaker_mode); - ClassDB::bind_method(_MD("get_mix_rate"),&AudioServer::get_mix_rate); + ClassDB::bind_method(D_METHOD("get_speaker_mode"),&AudioServer::get_speaker_mode); + ClassDB::bind_method(D_METHOD("get_mix_rate"),&AudioServer::get_mix_rate); - ClassDB::bind_method(_MD("set_state","state:AudioServerState"),&AudioServer::set_bus_layout); - ClassDB::bind_method(_MD("generate_state:AudioServerState"),&AudioServer::generate_bus_layout); + ClassDB::bind_method(D_METHOD("set_state","state:AudioServerState"),&AudioServer::set_bus_layout); + ClassDB::bind_method(D_METHOD("generate_state:AudioServerState"),&AudioServer::generate_bus_layout); ADD_SIGNAL(MethodInfo("bus_layout_changed") ); } diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 39b790111b..bdbe85612f 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -73,40 +73,40 @@ Physics2DServer * Physics2DServer::get_singleton() { void Physics2DDirectBodyState::_bind_methods() { - ClassDB::bind_method(_MD("get_total_gravity"),&Physics2DDirectBodyState::get_total_gravity); - ClassDB::bind_method(_MD("get_total_linear_damp"),&Physics2DDirectBodyState::get_total_linear_damp); - ClassDB::bind_method(_MD("get_total_angular_damp"),&Physics2DDirectBodyState::get_total_angular_damp); + ClassDB::bind_method(D_METHOD("get_total_gravity"),&Physics2DDirectBodyState::get_total_gravity); + ClassDB::bind_method(D_METHOD("get_total_linear_damp"),&Physics2DDirectBodyState::get_total_linear_damp); + ClassDB::bind_method(D_METHOD("get_total_angular_damp"),&Physics2DDirectBodyState::get_total_angular_damp); - ClassDB::bind_method(_MD("get_inverse_mass"),&Physics2DDirectBodyState::get_inverse_mass); - ClassDB::bind_method(_MD("get_inverse_inertia"),&Physics2DDirectBodyState::get_inverse_inertia); + ClassDB::bind_method(D_METHOD("get_inverse_mass"),&Physics2DDirectBodyState::get_inverse_mass); + ClassDB::bind_method(D_METHOD("get_inverse_inertia"),&Physics2DDirectBodyState::get_inverse_inertia); - ClassDB::bind_method(_MD("set_linear_velocity","velocity"),&Physics2DDirectBodyState::set_linear_velocity); - ClassDB::bind_method(_MD("get_linear_velocity"),&Physics2DDirectBodyState::get_linear_velocity); + ClassDB::bind_method(D_METHOD("set_linear_velocity","velocity"),&Physics2DDirectBodyState::set_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&Physics2DDirectBodyState::get_linear_velocity); - ClassDB::bind_method(_MD("set_angular_velocity","velocity"),&Physics2DDirectBodyState::set_angular_velocity); - ClassDB::bind_method(_MD("get_angular_velocity"),&Physics2DDirectBodyState::get_angular_velocity); + ClassDB::bind_method(D_METHOD("set_angular_velocity","velocity"),&Physics2DDirectBodyState::set_angular_velocity); + ClassDB::bind_method(D_METHOD("get_angular_velocity"),&Physics2DDirectBodyState::get_angular_velocity); - ClassDB::bind_method(_MD("set_transform","transform"),&Physics2DDirectBodyState::set_transform); - ClassDB::bind_method(_MD("get_transform"),&Physics2DDirectBodyState::get_transform); + ClassDB::bind_method(D_METHOD("set_transform","transform"),&Physics2DDirectBodyState::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"),&Physics2DDirectBodyState::get_transform); - ClassDB::bind_method(_MD("set_sleep_state","enabled"),&Physics2DDirectBodyState::set_sleep_state); - ClassDB::bind_method(_MD("is_sleeping"),&Physics2DDirectBodyState::is_sleeping); + ClassDB::bind_method(D_METHOD("set_sleep_state","enabled"),&Physics2DDirectBodyState::set_sleep_state); + ClassDB::bind_method(D_METHOD("is_sleeping"),&Physics2DDirectBodyState::is_sleeping); - ClassDB::bind_method(_MD("get_contact_count"),&Physics2DDirectBodyState::get_contact_count); + ClassDB::bind_method(D_METHOD("get_contact_count"),&Physics2DDirectBodyState::get_contact_count); - ClassDB::bind_method(_MD("get_contact_local_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_local_pos); - ClassDB::bind_method(_MD("get_contact_local_normal","contact_idx"),&Physics2DDirectBodyState::get_contact_local_normal); - ClassDB::bind_method(_MD("get_contact_local_shape","contact_idx"),&Physics2DDirectBodyState::get_contact_local_shape); - ClassDB::bind_method(_MD("get_contact_collider","contact_idx"),&Physics2DDirectBodyState::get_contact_collider); - ClassDB::bind_method(_MD("get_contact_collider_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_pos); - ClassDB::bind_method(_MD("get_contact_collider_id","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_id); - ClassDB::bind_method(_MD("get_contact_collider_object","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_object); - ClassDB::bind_method(_MD("get_contact_collider_shape","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_shape); - ClassDB::bind_method(_MD("get_contact_collider_shape_metadata:Variant","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_shape_metadata); - ClassDB::bind_method(_MD("get_contact_collider_velocity_at_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_velocity_at_pos); - ClassDB::bind_method(_MD("get_step"),&Physics2DDirectBodyState::get_step); - ClassDB::bind_method(_MD("integrate_forces"),&Physics2DDirectBodyState::integrate_forces); - ClassDB::bind_method(_MD("get_space_state:Physics2DDirectSpaceState"),&Physics2DDirectBodyState::get_space_state); + ClassDB::bind_method(D_METHOD("get_contact_local_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_local_pos); + ClassDB::bind_method(D_METHOD("get_contact_local_normal","contact_idx"),&Physics2DDirectBodyState::get_contact_local_normal); + ClassDB::bind_method(D_METHOD("get_contact_local_shape","contact_idx"),&Physics2DDirectBodyState::get_contact_local_shape); + ClassDB::bind_method(D_METHOD("get_contact_collider","contact_idx"),&Physics2DDirectBodyState::get_contact_collider); + ClassDB::bind_method(D_METHOD("get_contact_collider_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_pos); + ClassDB::bind_method(D_METHOD("get_contact_collider_id","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_id); + ClassDB::bind_method(D_METHOD("get_contact_collider_object","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_object); + ClassDB::bind_method(D_METHOD("get_contact_collider_shape","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_shape); + ClassDB::bind_method(D_METHOD("get_contact_collider_shape_metadata:Variant","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_shape_metadata); + ClassDB::bind_method(D_METHOD("get_contact_collider_velocity_at_pos","contact_idx"),&Physics2DDirectBodyState::get_contact_collider_velocity_at_pos); + ClassDB::bind_method(D_METHOD("get_step"),&Physics2DDirectBodyState::get_step); + ClassDB::bind_method(D_METHOD("integrate_forces"),&Physics2DDirectBodyState::integrate_forces); + ClassDB::bind_method(D_METHOD("get_space_state:Physics2DDirectSpaceState"),&Physics2DDirectBodyState::get_space_state); } @@ -198,27 +198,27 @@ Vector<RID> Physics2DShapeQueryParameters::get_exclude() const{ void Physics2DShapeQueryParameters::_bind_methods() { - ClassDB::bind_method(_MD("set_shape","shape:Shape2D"),&Physics2DShapeQueryParameters::set_shape); - ClassDB::bind_method(_MD("set_shape_rid","shape"),&Physics2DShapeQueryParameters::set_shape_rid); - ClassDB::bind_method(_MD("get_shape_rid"),&Physics2DShapeQueryParameters::get_shape_rid); + ClassDB::bind_method(D_METHOD("set_shape","shape:Shape2D"),&Physics2DShapeQueryParameters::set_shape); + ClassDB::bind_method(D_METHOD("set_shape_rid","shape"),&Physics2DShapeQueryParameters::set_shape_rid); + ClassDB::bind_method(D_METHOD("get_shape_rid"),&Physics2DShapeQueryParameters::get_shape_rid); - ClassDB::bind_method(_MD("set_transform","transform"),&Physics2DShapeQueryParameters::set_transform); - ClassDB::bind_method(_MD("get_transform"),&Physics2DShapeQueryParameters::get_transform); + ClassDB::bind_method(D_METHOD("set_transform","transform"),&Physics2DShapeQueryParameters::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"),&Physics2DShapeQueryParameters::get_transform); - ClassDB::bind_method(_MD("set_motion","motion"),&Physics2DShapeQueryParameters::set_motion); - ClassDB::bind_method(_MD("get_motion"),&Physics2DShapeQueryParameters::get_motion); + ClassDB::bind_method(D_METHOD("set_motion","motion"),&Physics2DShapeQueryParameters::set_motion); + ClassDB::bind_method(D_METHOD("get_motion"),&Physics2DShapeQueryParameters::get_motion); - ClassDB::bind_method(_MD("set_margin","margin"),&Physics2DShapeQueryParameters::set_margin); - ClassDB::bind_method(_MD("get_margin"),&Physics2DShapeQueryParameters::get_margin); + ClassDB::bind_method(D_METHOD("set_margin","margin"),&Physics2DShapeQueryParameters::set_margin); + ClassDB::bind_method(D_METHOD("get_margin"),&Physics2DShapeQueryParameters::get_margin); - ClassDB::bind_method(_MD("set_layer_mask","layer_mask"),&Physics2DShapeQueryParameters::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&Physics2DShapeQueryParameters::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","layer_mask"),&Physics2DShapeQueryParameters::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&Physics2DShapeQueryParameters::get_layer_mask); - ClassDB::bind_method(_MD("set_object_type_mask","object_type_mask"),&Physics2DShapeQueryParameters::set_object_type_mask); - ClassDB::bind_method(_MD("get_object_type_mask"),&Physics2DShapeQueryParameters::get_object_type_mask); + ClassDB::bind_method(D_METHOD("set_object_type_mask","object_type_mask"),&Physics2DShapeQueryParameters::set_object_type_mask); + ClassDB::bind_method(D_METHOD("get_object_type_mask"),&Physics2DShapeQueryParameters::get_object_type_mask); - ClassDB::bind_method(_MD("set_exclude","exclude"),&Physics2DShapeQueryParameters::set_exclude); - ClassDB::bind_method(_MD("get_exclude"),&Physics2DShapeQueryParameters::get_exclude); + ClassDB::bind_method(D_METHOD("set_exclude","exclude"),&Physics2DShapeQueryParameters::set_exclude); + ClassDB::bind_method(D_METHOD("get_exclude"),&Physics2DShapeQueryParameters::get_exclude); } @@ -366,13 +366,13 @@ Physics2DDirectSpaceState::Physics2DDirectSpaceState() { void Physics2DDirectSpaceState::_bind_methods() { - ClassDB::bind_method(_MD("intersect_point","point","max_results","exclude","layer_mask","type_mask"),&Physics2DDirectSpaceState::_intersect_point,DEFVAL(32),DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); - ClassDB::bind_method(_MD("intersect_ray:Dictionary","from","to","exclude","layer_mask","type_mask"),&Physics2DDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); - ClassDB::bind_method(_MD("intersect_shape","shape:Physics2DShapeQueryParameters","max_results"),&Physics2DDirectSpaceState::_intersect_shape,DEFVAL(32)); - ClassDB::bind_method(_MD("cast_motion","shape:Physics2DShapeQueryParameters"),&Physics2DDirectSpaceState::_cast_motion); - ClassDB::bind_method(_MD("collide_shape","shape:Physics2DShapeQueryParameters","max_results"),&Physics2DDirectSpaceState::_collide_shape,DEFVAL(32)); - ClassDB::bind_method(_MD("get_rest_info","shape:Physics2DShapeQueryParameters"),&Physics2DDirectSpaceState::_get_rest_info); - //ClassDB::bind_method(_MD("cast_motion","shape","xform","motion","exclude","umask"),&Physics2DDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); + ClassDB::bind_method(D_METHOD("intersect_point","point","max_results","exclude","layer_mask","type_mask"),&Physics2DDirectSpaceState::_intersect_point,DEFVAL(32),DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); + ClassDB::bind_method(D_METHOD("intersect_ray:Dictionary","from","to","exclude","layer_mask","type_mask"),&Physics2DDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); + ClassDB::bind_method(D_METHOD("intersect_shape","shape:Physics2DShapeQueryParameters","max_results"),&Physics2DDirectSpaceState::_intersect_shape,DEFVAL(32)); + ClassDB::bind_method(D_METHOD("cast_motion","shape:Physics2DShapeQueryParameters"),&Physics2DDirectSpaceState::_cast_motion); + ClassDB::bind_method(D_METHOD("collide_shape","shape:Physics2DShapeQueryParameters","max_results"),&Physics2DDirectSpaceState::_collide_shape,DEFVAL(32)); + ClassDB::bind_method(D_METHOD("get_rest_info","shape:Physics2DShapeQueryParameters"),&Physics2DDirectSpaceState::_get_rest_info); + //ClassDB::bind_method(D_METHOD("cast_motion","shape","xform","motion","exclude","umask"),&Physics2DDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); BIND_CONSTANT( TYPE_MASK_STATIC_BODY ); BIND_CONSTANT( TYPE_MASK_KINEMATIC_BODY ); @@ -412,11 +412,11 @@ Physics2DShapeQueryResult::Physics2DShapeQueryResult() { void Physics2DShapeQueryResult::_bind_methods() { - ClassDB::bind_method(_MD("get_result_count"),&Physics2DShapeQueryResult::get_result_count); - ClassDB::bind_method(_MD("get_result_rid","idx"),&Physics2DShapeQueryResult::get_result_rid); - ClassDB::bind_method(_MD("get_result_object_id","idx"),&Physics2DShapeQueryResult::get_result_object_id); - ClassDB::bind_method(_MD("get_result_object","idx"),&Physics2DShapeQueryResult::get_result_object); - ClassDB::bind_method(_MD("get_result_object_shape","idx"),&Physics2DShapeQueryResult::get_result_object_shape); + ClassDB::bind_method(D_METHOD("get_result_count"),&Physics2DShapeQueryResult::get_result_count); + ClassDB::bind_method(D_METHOD("get_result_rid","idx"),&Physics2DShapeQueryResult::get_result_rid); + ClassDB::bind_method(D_METHOD("get_result_object_id","idx"),&Physics2DShapeQueryResult::get_result_object_id); + ClassDB::bind_method(D_METHOD("get_result_object","idx"),&Physics2DShapeQueryResult::get_result_object); + ClassDB::bind_method(D_METHOD("get_result_object_shape","idx"),&Physics2DShapeQueryResult::get_result_object_shape); } @@ -468,16 +468,16 @@ int Physics2DTestMotionResult::get_collider_shape() const{ void Physics2DTestMotionResult::_bind_methods() { - //ClassDB::bind_method(_MD("is_colliding"),&Physics2DTestMotionResult::is_colliding); - ClassDB::bind_method(_MD("get_motion"),&Physics2DTestMotionResult::get_motion); - ClassDB::bind_method(_MD("get_motion_remainder"),&Physics2DTestMotionResult::get_motion_remainder); - ClassDB::bind_method(_MD("get_collision_point"),&Physics2DTestMotionResult::get_collision_point); - ClassDB::bind_method(_MD("get_collision_normal"),&Physics2DTestMotionResult::get_collision_normal); - ClassDB::bind_method(_MD("get_collider_velocity"),&Physics2DTestMotionResult::get_collider_velocity); - ClassDB::bind_method(_MD("get_collider_id"),&Physics2DTestMotionResult::get_collider_id); - ClassDB::bind_method(_MD("get_collider_rid"),&Physics2DTestMotionResult::get_collider_rid); - ClassDB::bind_method(_MD("get_collider"),&Physics2DTestMotionResult::get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&Physics2DTestMotionResult::get_collider_shape); + //ClassDB::bind_method(D_METHOD("is_colliding"),&Physics2DTestMotionResult::is_colliding); + ClassDB::bind_method(D_METHOD("get_motion"),&Physics2DTestMotionResult::get_motion); + ClassDB::bind_method(D_METHOD("get_motion_remainder"),&Physics2DTestMotionResult::get_motion_remainder); + ClassDB::bind_method(D_METHOD("get_collision_point"),&Physics2DTestMotionResult::get_collision_point); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&Physics2DTestMotionResult::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider_velocity"),&Physics2DTestMotionResult::get_collider_velocity); + ClassDB::bind_method(D_METHOD("get_collider_id"),&Physics2DTestMotionResult::get_collider_id); + ClassDB::bind_method(D_METHOD("get_collider_rid"),&Physics2DTestMotionResult::get_collider_rid); + ClassDB::bind_method(D_METHOD("get_collider"),&Physics2DTestMotionResult::get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&Physics2DTestMotionResult::get_collider_shape); } @@ -504,147 +504,147 @@ bool Physics2DServer::_body_test_motion(RID p_body,const Transform2D& p_from,con void Physics2DServer::_bind_methods() { - ClassDB::bind_method(_MD("shape_create","type"),&Physics2DServer::shape_create); - ClassDB::bind_method(_MD("shape_set_data","shape","data"),&Physics2DServer::shape_set_data); + ClassDB::bind_method(D_METHOD("shape_create","type"),&Physics2DServer::shape_create); + ClassDB::bind_method(D_METHOD("shape_set_data","shape","data"),&Physics2DServer::shape_set_data); - ClassDB::bind_method(_MD("shape_get_type","shape"),&Physics2DServer::shape_get_type); - ClassDB::bind_method(_MD("shape_get_data","shape"),&Physics2DServer::shape_get_data); + ClassDB::bind_method(D_METHOD("shape_get_type","shape"),&Physics2DServer::shape_get_type); + ClassDB::bind_method(D_METHOD("shape_get_data","shape"),&Physics2DServer::shape_get_data); - ClassDB::bind_method(_MD("space_create"),&Physics2DServer::space_create); - ClassDB::bind_method(_MD("space_set_active","space","active"),&Physics2DServer::space_set_active); - ClassDB::bind_method(_MD("space_is_active","space"),&Physics2DServer::space_is_active); - ClassDB::bind_method(_MD("space_set_param","space","param","value"),&Physics2DServer::space_set_param); - ClassDB::bind_method(_MD("space_get_param","space","param"),&Physics2DServer::space_get_param); - ClassDB::bind_method(_MD("space_get_direct_state:Physics2DDirectSpaceState","space"),&Physics2DServer::space_get_direct_state); + ClassDB::bind_method(D_METHOD("space_create"),&Physics2DServer::space_create); + ClassDB::bind_method(D_METHOD("space_set_active","space","active"),&Physics2DServer::space_set_active); + ClassDB::bind_method(D_METHOD("space_is_active","space"),&Physics2DServer::space_is_active); + ClassDB::bind_method(D_METHOD("space_set_param","space","param","value"),&Physics2DServer::space_set_param); + ClassDB::bind_method(D_METHOD("space_get_param","space","param"),&Physics2DServer::space_get_param); + ClassDB::bind_method(D_METHOD("space_get_direct_state:Physics2DDirectSpaceState","space"),&Physics2DServer::space_get_direct_state); - ClassDB::bind_method(_MD("area_create"),&Physics2DServer::area_create); - ClassDB::bind_method(_MD("area_set_space","area","space"),&Physics2DServer::area_set_space); - ClassDB::bind_method(_MD("area_get_space","area"),&Physics2DServer::area_get_space); + ClassDB::bind_method(D_METHOD("area_create"),&Physics2DServer::area_create); + ClassDB::bind_method(D_METHOD("area_set_space","area","space"),&Physics2DServer::area_set_space); + ClassDB::bind_method(D_METHOD("area_get_space","area"),&Physics2DServer::area_get_space); - ClassDB::bind_method(_MD("area_set_space_override_mode","area","mode"),&Physics2DServer::area_set_space_override_mode); - ClassDB::bind_method(_MD("area_get_space_override_mode","area"),&Physics2DServer::area_get_space_override_mode); + ClassDB::bind_method(D_METHOD("area_set_space_override_mode","area","mode"),&Physics2DServer::area_set_space_override_mode); + ClassDB::bind_method(D_METHOD("area_get_space_override_mode","area"),&Physics2DServer::area_get_space_override_mode); - ClassDB::bind_method(_MD("area_add_shape","area","shape","transform"),&Physics2DServer::area_add_shape,DEFVAL(Transform2D())); - ClassDB::bind_method(_MD("area_set_shape","area","shape_idx","shape"),&Physics2DServer::area_set_shape); - ClassDB::bind_method(_MD("area_set_shape_transform","area","shape_idx","transform"),&Physics2DServer::area_set_shape_transform); + ClassDB::bind_method(D_METHOD("area_add_shape","area","shape","transform"),&Physics2DServer::area_add_shape,DEFVAL(Transform2D())); + ClassDB::bind_method(D_METHOD("area_set_shape","area","shape_idx","shape"),&Physics2DServer::area_set_shape); + ClassDB::bind_method(D_METHOD("area_set_shape_transform","area","shape_idx","transform"),&Physics2DServer::area_set_shape_transform); - ClassDB::bind_method(_MD("area_get_shape_count","area"),&Physics2DServer::area_get_shape_count); - ClassDB::bind_method(_MD("area_get_shape","area","shape_idx"),&Physics2DServer::area_get_shape); - ClassDB::bind_method(_MD("area_get_shape_transform","area","shape_idx"),&Physics2DServer::area_get_shape_transform); + ClassDB::bind_method(D_METHOD("area_get_shape_count","area"),&Physics2DServer::area_get_shape_count); + ClassDB::bind_method(D_METHOD("area_get_shape","area","shape_idx"),&Physics2DServer::area_get_shape); + ClassDB::bind_method(D_METHOD("area_get_shape_transform","area","shape_idx"),&Physics2DServer::area_get_shape_transform); - ClassDB::bind_method(_MD("area_remove_shape","area","shape_idx"),&Physics2DServer::area_remove_shape); - ClassDB::bind_method(_MD("area_clear_shapes","area"),&Physics2DServer::area_clear_shapes); + ClassDB::bind_method(D_METHOD("area_remove_shape","area","shape_idx"),&Physics2DServer::area_remove_shape); + ClassDB::bind_method(D_METHOD("area_clear_shapes","area"),&Physics2DServer::area_clear_shapes); - ClassDB::bind_method(_MD("area_set_layer_mask","area","mask"),&Physics2DServer::area_set_layer_mask); - ClassDB::bind_method(_MD("area_set_collision_mask","area","mask"),&Physics2DServer::area_set_collision_mask); + ClassDB::bind_method(D_METHOD("area_set_layer_mask","area","mask"),&Physics2DServer::area_set_layer_mask); + ClassDB::bind_method(D_METHOD("area_set_collision_mask","area","mask"),&Physics2DServer::area_set_collision_mask); - ClassDB::bind_method(_MD("area_set_param","area","param","value"),&Physics2DServer::area_set_param); - ClassDB::bind_method(_MD("area_set_transform","area","transform"),&Physics2DServer::area_set_transform); + ClassDB::bind_method(D_METHOD("area_set_param","area","param","value"),&Physics2DServer::area_set_param); + ClassDB::bind_method(D_METHOD("area_set_transform","area","transform"),&Physics2DServer::area_set_transform); - ClassDB::bind_method(_MD("area_get_param","area","param"),&Physics2DServer::area_get_param); - ClassDB::bind_method(_MD("area_get_transform","area"),&Physics2DServer::area_get_transform); + ClassDB::bind_method(D_METHOD("area_get_param","area","param"),&Physics2DServer::area_get_param); + ClassDB::bind_method(D_METHOD("area_get_transform","area"),&Physics2DServer::area_get_transform); - ClassDB::bind_method(_MD("area_attach_object_instance_ID","area","id"),&Physics2DServer::area_attach_object_instance_ID); - ClassDB::bind_method(_MD("area_get_object_instance_ID","area"),&Physics2DServer::area_get_object_instance_ID); + ClassDB::bind_method(D_METHOD("area_attach_object_instance_ID","area","id"),&Physics2DServer::area_attach_object_instance_ID); + ClassDB::bind_method(D_METHOD("area_get_object_instance_ID","area"),&Physics2DServer::area_get_object_instance_ID); - ClassDB::bind_method(_MD("area_set_monitor_callback","area","receiver","method"),&Physics2DServer::area_set_monitor_callback); + ClassDB::bind_method(D_METHOD("area_set_monitor_callback","area","receiver","method"),&Physics2DServer::area_set_monitor_callback); - ClassDB::bind_method(_MD("body_create","mode","init_sleeping"),&Physics2DServer::body_create,DEFVAL(BODY_MODE_RIGID),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("body_create","mode","init_sleeping"),&Physics2DServer::body_create,DEFVAL(BODY_MODE_RIGID),DEFVAL(false)); - ClassDB::bind_method(_MD("body_set_space","body","space"),&Physics2DServer::body_set_space); - ClassDB::bind_method(_MD("body_get_space","body"),&Physics2DServer::body_get_space); + ClassDB::bind_method(D_METHOD("body_set_space","body","space"),&Physics2DServer::body_set_space); + ClassDB::bind_method(D_METHOD("body_get_space","body"),&Physics2DServer::body_get_space); - ClassDB::bind_method(_MD("body_set_mode","body","mode"),&Physics2DServer::body_set_mode); - ClassDB::bind_method(_MD("body_get_mode","body"),&Physics2DServer::body_get_mode); + ClassDB::bind_method(D_METHOD("body_set_mode","body","mode"),&Physics2DServer::body_set_mode); + ClassDB::bind_method(D_METHOD("body_get_mode","body"),&Physics2DServer::body_get_mode); - ClassDB::bind_method(_MD("body_add_shape","body","shape","transform"),&Physics2DServer::body_add_shape,DEFVAL(Transform2D())); - ClassDB::bind_method(_MD("body_set_shape","body","shape_idx","shape"),&Physics2DServer::body_set_shape); - ClassDB::bind_method(_MD("body_set_shape_transform","body","shape_idx","transform"),&Physics2DServer::body_set_shape_transform); - ClassDB::bind_method(_MD("body_set_shape_metadata","body","shape_idx","metadata"),&Physics2DServer::body_set_shape_metadata); + ClassDB::bind_method(D_METHOD("body_add_shape","body","shape","transform"),&Physics2DServer::body_add_shape,DEFVAL(Transform2D())); + ClassDB::bind_method(D_METHOD("body_set_shape","body","shape_idx","shape"),&Physics2DServer::body_set_shape); + ClassDB::bind_method(D_METHOD("body_set_shape_transform","body","shape_idx","transform"),&Physics2DServer::body_set_shape_transform); + ClassDB::bind_method(D_METHOD("body_set_shape_metadata","body","shape_idx","metadata"),&Physics2DServer::body_set_shape_metadata); - ClassDB::bind_method(_MD("body_get_shape_count","body"),&Physics2DServer::body_get_shape_count); - ClassDB::bind_method(_MD("body_get_shape","body","shape_idx"),&Physics2DServer::body_get_shape); - ClassDB::bind_method(_MD("body_get_shape_transform","body","shape_idx"),&Physics2DServer::body_get_shape_transform); - ClassDB::bind_method(_MD("body_get_shape_metadata","body","shape_idx"),&Physics2DServer::body_get_shape_metadata); + ClassDB::bind_method(D_METHOD("body_get_shape_count","body"),&Physics2DServer::body_get_shape_count); + ClassDB::bind_method(D_METHOD("body_get_shape","body","shape_idx"),&Physics2DServer::body_get_shape); + ClassDB::bind_method(D_METHOD("body_get_shape_transform","body","shape_idx"),&Physics2DServer::body_get_shape_transform); + ClassDB::bind_method(D_METHOD("body_get_shape_metadata","body","shape_idx"),&Physics2DServer::body_get_shape_metadata); - ClassDB::bind_method(_MD("body_remove_shape","body","shape_idx"),&Physics2DServer::body_remove_shape); - ClassDB::bind_method(_MD("body_clear_shapes","body"),&Physics2DServer::body_clear_shapes); + ClassDB::bind_method(D_METHOD("body_remove_shape","body","shape_idx"),&Physics2DServer::body_remove_shape); + ClassDB::bind_method(D_METHOD("body_clear_shapes","body"),&Physics2DServer::body_clear_shapes); - ClassDB::bind_method(_MD("body_set_shape_as_trigger","body","shape_idx","enable"),&Physics2DServer::body_set_shape_as_trigger); - ClassDB::bind_method(_MD("body_is_shape_set_as_trigger","body","shape_idx"),&Physics2DServer::body_is_shape_set_as_trigger); + ClassDB::bind_method(D_METHOD("body_set_shape_as_trigger","body","shape_idx","enable"),&Physics2DServer::body_set_shape_as_trigger); + ClassDB::bind_method(D_METHOD("body_is_shape_set_as_trigger","body","shape_idx"),&Physics2DServer::body_is_shape_set_as_trigger); - ClassDB::bind_method(_MD("body_attach_object_instance_ID","body","id"),&Physics2DServer::body_attach_object_instance_ID); - ClassDB::bind_method(_MD("body_get_object_instance_ID","body"),&Physics2DServer::body_get_object_instance_ID); + ClassDB::bind_method(D_METHOD("body_attach_object_instance_ID","body","id"),&Physics2DServer::body_attach_object_instance_ID); + ClassDB::bind_method(D_METHOD("body_get_object_instance_ID","body"),&Physics2DServer::body_get_object_instance_ID); - ClassDB::bind_method(_MD("body_set_continuous_collision_detection_mode","body","mode"),&Physics2DServer::body_set_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("body_get_continuous_collision_detection_mode","body"),&Physics2DServer::body_get_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("body_set_continuous_collision_detection_mode","body","mode"),&Physics2DServer::body_set_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("body_get_continuous_collision_detection_mode","body"),&Physics2DServer::body_get_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("body_set_layer_mask","body","mask"),&Physics2DServer::body_set_layer_mask); - ClassDB::bind_method(_MD("body_get_layer_mask","body"),&Physics2DServer::body_get_layer_mask); + ClassDB::bind_method(D_METHOD("body_set_layer_mask","body","mask"),&Physics2DServer::body_set_layer_mask); + ClassDB::bind_method(D_METHOD("body_get_layer_mask","body"),&Physics2DServer::body_get_layer_mask); - ClassDB::bind_method(_MD("body_set_collision_mask","body","mask"),&Physics2DServer::body_set_collision_mask); - ClassDB::bind_method(_MD("body_get_collision_mask","body"),&Physics2DServer::body_get_collision_mask); + ClassDB::bind_method(D_METHOD("body_set_collision_mask","body","mask"),&Physics2DServer::body_set_collision_mask); + ClassDB::bind_method(D_METHOD("body_get_collision_mask","body"),&Physics2DServer::body_get_collision_mask); - ClassDB::bind_method(_MD("body_set_param","body","param","value"),&Physics2DServer::body_set_param); - ClassDB::bind_method(_MD("body_get_param","body","param"),&Physics2DServer::body_get_param); + ClassDB::bind_method(D_METHOD("body_set_param","body","param","value"),&Physics2DServer::body_set_param); + ClassDB::bind_method(D_METHOD("body_get_param","body","param"),&Physics2DServer::body_get_param); - ClassDB::bind_method(_MD("body_set_state","body","state","value"),&Physics2DServer::body_set_state); - ClassDB::bind_method(_MD("body_get_state","body","state"),&Physics2DServer::body_get_state); + ClassDB::bind_method(D_METHOD("body_set_state","body","state","value"),&Physics2DServer::body_set_state); + ClassDB::bind_method(D_METHOD("body_get_state","body","state"),&Physics2DServer::body_get_state); - ClassDB::bind_method(_MD("body_apply_impulse","body","pos","impulse"),&Physics2DServer::body_apply_impulse); - ClassDB::bind_method(_MD("body_add_force","body","offset","force"),&Physics2DServer::body_add_force); - ClassDB::bind_method(_MD("body_set_axis_velocity","body","axis_velocity"),&Physics2DServer::body_set_axis_velocity); + ClassDB::bind_method(D_METHOD("body_apply_impulse","body","pos","impulse"),&Physics2DServer::body_apply_impulse); + ClassDB::bind_method(D_METHOD("body_add_force","body","offset","force"),&Physics2DServer::body_add_force); + ClassDB::bind_method(D_METHOD("body_set_axis_velocity","body","axis_velocity"),&Physics2DServer::body_set_axis_velocity); - ClassDB::bind_method(_MD("body_add_collision_exception","body","excepted_body"),&Physics2DServer::body_add_collision_exception); - ClassDB::bind_method(_MD("body_remove_collision_exception","body","excepted_body"),&Physics2DServer::body_remove_collision_exception); + ClassDB::bind_method(D_METHOD("body_add_collision_exception","body","excepted_body"),&Physics2DServer::body_add_collision_exception); + ClassDB::bind_method(D_METHOD("body_remove_collision_exception","body","excepted_body"),&Physics2DServer::body_remove_collision_exception); //virtual void body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions)=0; - ClassDB::bind_method(_MD("body_set_max_contacts_reported","body","amount"),&Physics2DServer::body_set_max_contacts_reported); - ClassDB::bind_method(_MD("body_get_max_contacts_reported","body"),&Physics2DServer::body_get_max_contacts_reported); + ClassDB::bind_method(D_METHOD("body_set_max_contacts_reported","body","amount"),&Physics2DServer::body_set_max_contacts_reported); + ClassDB::bind_method(D_METHOD("body_get_max_contacts_reported","body"),&Physics2DServer::body_get_max_contacts_reported); - ClassDB::bind_method(_MD("body_set_one_way_collision_direction","body","normal"),&Physics2DServer::body_set_one_way_collision_direction); - ClassDB::bind_method(_MD("body_get_one_way_collision_direction","body"),&Physics2DServer::body_get_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("body_set_one_way_collision_direction","body","normal"),&Physics2DServer::body_set_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("body_get_one_way_collision_direction","body"),&Physics2DServer::body_get_one_way_collision_direction); - ClassDB::bind_method(_MD("body_set_one_way_collision_max_depth","body","depth"),&Physics2DServer::body_set_one_way_collision_max_depth); - ClassDB::bind_method(_MD("body_get_one_way_collision_max_depth","body"),&Physics2DServer::body_get_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("body_set_one_way_collision_max_depth","body","depth"),&Physics2DServer::body_set_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("body_get_one_way_collision_max_depth","body"),&Physics2DServer::body_get_one_way_collision_max_depth); - ClassDB::bind_method(_MD("body_set_omit_force_integration","body","enable"),&Physics2DServer::body_set_omit_force_integration); - ClassDB::bind_method(_MD("body_is_omitting_force_integration","body"),&Physics2DServer::body_is_omitting_force_integration); + ClassDB::bind_method(D_METHOD("body_set_omit_force_integration","body","enable"),&Physics2DServer::body_set_omit_force_integration); + ClassDB::bind_method(D_METHOD("body_is_omitting_force_integration","body"),&Physics2DServer::body_is_omitting_force_integration); - ClassDB::bind_method(_MD("body_set_force_integration_callback","body","receiver","method","userdata"),&Physics2DServer::body_set_force_integration_callback,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("body_set_force_integration_callback","body","receiver","method","userdata"),&Physics2DServer::body_set_force_integration_callback,DEFVAL(Variant())); - ClassDB::bind_method(_MD("body_test_motion","body","from","motion","margin","result:Physics2DTestMotionResult"),&Physics2DServer::_body_test_motion,DEFVAL(0.08),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("body_test_motion","body","from","motion","margin","result:Physics2DTestMotionResult"),&Physics2DServer::_body_test_motion,DEFVAL(0.08),DEFVAL(Variant())); /* JOINT API */ - ClassDB::bind_method(_MD("joint_set_param","joint","param","value"),&Physics2DServer::joint_set_param); - ClassDB::bind_method(_MD("joint_get_param","joint","param"),&Physics2DServer::joint_get_param); + ClassDB::bind_method(D_METHOD("joint_set_param","joint","param","value"),&Physics2DServer::joint_set_param); + ClassDB::bind_method(D_METHOD("joint_get_param","joint","param"),&Physics2DServer::joint_get_param); - ClassDB::bind_method(_MD("pin_joint_create","anchor","body_a","body_b"),&Physics2DServer::pin_joint_create,DEFVAL(RID())); - ClassDB::bind_method(_MD("groove_joint_create","groove1_a","groove2_a","anchor_b","body_a","body_b"),&Physics2DServer::groove_joint_create,DEFVAL(RID()),DEFVAL(RID())); - ClassDB::bind_method(_MD("damped_spring_joint_create","anchor_a","anchor_b","body_a","body_b"),&Physics2DServer::damped_spring_joint_create,DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("pin_joint_create","anchor","body_a","body_b"),&Physics2DServer::pin_joint_create,DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("groove_joint_create","groove1_a","groove2_a","anchor_b","body_a","body_b"),&Physics2DServer::groove_joint_create,DEFVAL(RID()),DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("damped_spring_joint_create","anchor_a","anchor_b","body_a","body_b"),&Physics2DServer::damped_spring_joint_create,DEFVAL(RID())); - ClassDB::bind_method(_MD("damped_string_joint_set_param","joint","param","value"),&Physics2DServer::damped_string_joint_set_param); - ClassDB::bind_method(_MD("damped_string_joint_get_param","joint","param"),&Physics2DServer::damped_string_joint_get_param); + ClassDB::bind_method(D_METHOD("damped_string_joint_set_param","joint","param","value"),&Physics2DServer::damped_string_joint_set_param); + ClassDB::bind_method(D_METHOD("damped_string_joint_get_param","joint","param"),&Physics2DServer::damped_string_joint_get_param); - ClassDB::bind_method(_MD("joint_get_type","joint"),&Physics2DServer::joint_get_type); + ClassDB::bind_method(D_METHOD("joint_get_type","joint"),&Physics2DServer::joint_get_type); - ClassDB::bind_method(_MD("free_rid","rid"),&Physics2DServer::free); + ClassDB::bind_method(D_METHOD("free_rid","rid"),&Physics2DServer::free); - ClassDB::bind_method(_MD("set_active","active"),&Physics2DServer::set_active); + ClassDB::bind_method(D_METHOD("set_active","active"),&Physics2DServer::set_active); - ClassDB::bind_method(_MD("get_process_info","process_info"),&Physics2DServer::get_process_info); + ClassDB::bind_method(D_METHOD("get_process_info","process_info"),&Physics2DServer::get_process_info); - //ClassDB::bind_method(_MD("init"),&Physics2DServer::init); - //ClassDB::bind_method(_MD("step"),&Physics2DServer::step); - //ClassDB::bind_method(_MD("sync"),&Physics2DServer::sync); - //ClassDB::bind_method(_MD("flush_queries"),&Physics2DServer::flush_queries); + //ClassDB::bind_method(D_METHOD("init"),&Physics2DServer::init); + //ClassDB::bind_method(D_METHOD("step"),&Physics2DServer::step); + //ClassDB::bind_method(D_METHOD("sync"),&Physics2DServer::sync); + //ClassDB::bind_method(D_METHOD("flush_queries"),&Physics2DServer::flush_queries); BIND_CONSTANT( SPACE_PARAM_CONTACT_RECYCLE_RADIUS ); BIND_CONSTANT( SPACE_PARAM_CONTACT_MAX_SEPARATION ); diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index ab13e2b3a5..e76bfd113c 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -74,46 +74,46 @@ PhysicsServer * PhysicsServer::get_singleton() { void PhysicsDirectBodyState::_bind_methods() { - ClassDB::bind_method(_MD("get_total_gravity"),&PhysicsDirectBodyState::get_total_gravity); - ClassDB::bind_method(_MD("get_total_linear_damp"),&PhysicsDirectBodyState::get_total_linear_damp); - ClassDB::bind_method(_MD("get_total_angular_damp"),&PhysicsDirectBodyState::get_total_angular_damp); + ClassDB::bind_method(D_METHOD("get_total_gravity"),&PhysicsDirectBodyState::get_total_gravity); + ClassDB::bind_method(D_METHOD("get_total_linear_damp"),&PhysicsDirectBodyState::get_total_linear_damp); + ClassDB::bind_method(D_METHOD("get_total_angular_damp"),&PhysicsDirectBodyState::get_total_angular_damp); - ClassDB::bind_method(_MD("get_center_of_mass"),&PhysicsDirectBodyState::get_center_of_mass); - ClassDB::bind_method(_MD("get_principal_inetria_axes"),&PhysicsDirectBodyState::get_principal_inertia_axes); + ClassDB::bind_method(D_METHOD("get_center_of_mass"),&PhysicsDirectBodyState::get_center_of_mass); + ClassDB::bind_method(D_METHOD("get_principal_inetria_axes"),&PhysicsDirectBodyState::get_principal_inertia_axes); - ClassDB::bind_method(_MD("get_inverse_mass"),&PhysicsDirectBodyState::get_inverse_mass); - ClassDB::bind_method(_MD("get_inverse_inertia"),&PhysicsDirectBodyState::get_inverse_inertia); + ClassDB::bind_method(D_METHOD("get_inverse_mass"),&PhysicsDirectBodyState::get_inverse_mass); + ClassDB::bind_method(D_METHOD("get_inverse_inertia"),&PhysicsDirectBodyState::get_inverse_inertia); - ClassDB::bind_method(_MD("set_linear_velocity","velocity"),&PhysicsDirectBodyState::set_linear_velocity); - ClassDB::bind_method(_MD("get_linear_velocity"),&PhysicsDirectBodyState::get_linear_velocity); + ClassDB::bind_method(D_METHOD("set_linear_velocity","velocity"),&PhysicsDirectBodyState::set_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&PhysicsDirectBodyState::get_linear_velocity); - ClassDB::bind_method(_MD("set_angular_velocity","velocity"),&PhysicsDirectBodyState::set_angular_velocity); - ClassDB::bind_method(_MD("get_angular_velocity"),&PhysicsDirectBodyState::get_angular_velocity); + ClassDB::bind_method(D_METHOD("set_angular_velocity","velocity"),&PhysicsDirectBodyState::set_angular_velocity); + ClassDB::bind_method(D_METHOD("get_angular_velocity"),&PhysicsDirectBodyState::get_angular_velocity); - ClassDB::bind_method(_MD("set_transform","transform"),&PhysicsDirectBodyState::set_transform); - ClassDB::bind_method(_MD("get_transform"),&PhysicsDirectBodyState::get_transform); + ClassDB::bind_method(D_METHOD("set_transform","transform"),&PhysicsDirectBodyState::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"),&PhysicsDirectBodyState::get_transform); - ClassDB::bind_method(_MD("add_force","force","pos"),&PhysicsDirectBodyState::add_force); - ClassDB::bind_method(_MD("apply_impulse","pos","j"),&PhysicsDirectBodyState::apply_impulse); - ClassDB::bind_method(_MD("apply_torqe_impulse","j"),&PhysicsDirectBodyState::apply_torque_impulse); + ClassDB::bind_method(D_METHOD("add_force","force","pos"),&PhysicsDirectBodyState::add_force); + ClassDB::bind_method(D_METHOD("apply_impulse","pos","j"),&PhysicsDirectBodyState::apply_impulse); + ClassDB::bind_method(D_METHOD("apply_torqe_impulse","j"),&PhysicsDirectBodyState::apply_torque_impulse); - ClassDB::bind_method(_MD("set_sleep_state","enabled"),&PhysicsDirectBodyState::set_sleep_state); - ClassDB::bind_method(_MD("is_sleeping"),&PhysicsDirectBodyState::is_sleeping); + ClassDB::bind_method(D_METHOD("set_sleep_state","enabled"),&PhysicsDirectBodyState::set_sleep_state); + ClassDB::bind_method(D_METHOD("is_sleeping"),&PhysicsDirectBodyState::is_sleeping); - ClassDB::bind_method(_MD("get_contact_count"),&PhysicsDirectBodyState::get_contact_count); + ClassDB::bind_method(D_METHOD("get_contact_count"),&PhysicsDirectBodyState::get_contact_count); - ClassDB::bind_method(_MD("get_contact_local_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_local_pos); - ClassDB::bind_method(_MD("get_contact_local_normal","contact_idx"),&PhysicsDirectBodyState::get_contact_local_normal); - ClassDB::bind_method(_MD("get_contact_local_shape","contact_idx"),&PhysicsDirectBodyState::get_contact_local_shape); - ClassDB::bind_method(_MD("get_contact_collider","contact_idx"),&PhysicsDirectBodyState::get_contact_collider); - ClassDB::bind_method(_MD("get_contact_collider_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_pos); - ClassDB::bind_method(_MD("get_contact_collider_id","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_id); - ClassDB::bind_method(_MD("get_contact_collider_object","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_object); - ClassDB::bind_method(_MD("get_contact_collider_shape","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_shape); - ClassDB::bind_method(_MD("get_contact_collider_velocity_at_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_velocity_at_pos); - ClassDB::bind_method(_MD("get_step"),&PhysicsDirectBodyState::get_step); - ClassDB::bind_method(_MD("integrate_forces"),&PhysicsDirectBodyState::integrate_forces); - ClassDB::bind_method(_MD("get_space_state:PhysicsDirectSpaceState"),&PhysicsDirectBodyState::get_space_state); + ClassDB::bind_method(D_METHOD("get_contact_local_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_local_pos); + ClassDB::bind_method(D_METHOD("get_contact_local_normal","contact_idx"),&PhysicsDirectBodyState::get_contact_local_normal); + ClassDB::bind_method(D_METHOD("get_contact_local_shape","contact_idx"),&PhysicsDirectBodyState::get_contact_local_shape); + ClassDB::bind_method(D_METHOD("get_contact_collider","contact_idx"),&PhysicsDirectBodyState::get_contact_collider); + ClassDB::bind_method(D_METHOD("get_contact_collider_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_pos); + ClassDB::bind_method(D_METHOD("get_contact_collider_id","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_id); + ClassDB::bind_method(D_METHOD("get_contact_collider_object","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_object); + ClassDB::bind_method(D_METHOD("get_contact_collider_shape","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_shape); + ClassDB::bind_method(D_METHOD("get_contact_collider_velocity_at_pos","contact_idx"),&PhysicsDirectBodyState::get_contact_collider_velocity_at_pos); + ClassDB::bind_method(D_METHOD("get_step"),&PhysicsDirectBodyState::get_step); + ClassDB::bind_method(D_METHOD("integrate_forces"),&PhysicsDirectBodyState::integrate_forces); + ClassDB::bind_method(D_METHOD("get_space_state:PhysicsDirectSpaceState"),&PhysicsDirectBodyState::get_space_state); } @@ -197,24 +197,24 @@ Vector<RID> PhysicsShapeQueryParameters::get_exclude() const{ void PhysicsShapeQueryParameters::_bind_methods() { - ClassDB::bind_method(_MD("set_shape","shape:Shape"),&PhysicsShapeQueryParameters::set_shape); - ClassDB::bind_method(_MD("set_shape_rid","shape"),&PhysicsShapeQueryParameters::set_shape_rid); - ClassDB::bind_method(_MD("get_shape_rid"),&PhysicsShapeQueryParameters::get_shape_rid); + ClassDB::bind_method(D_METHOD("set_shape","shape:Shape"),&PhysicsShapeQueryParameters::set_shape); + ClassDB::bind_method(D_METHOD("set_shape_rid","shape"),&PhysicsShapeQueryParameters::set_shape_rid); + ClassDB::bind_method(D_METHOD("get_shape_rid"),&PhysicsShapeQueryParameters::get_shape_rid); - ClassDB::bind_method(_MD("set_transform","transform"),&PhysicsShapeQueryParameters::set_transform); - ClassDB::bind_method(_MD("get_transform"),&PhysicsShapeQueryParameters::get_transform); + ClassDB::bind_method(D_METHOD("set_transform","transform"),&PhysicsShapeQueryParameters::set_transform); + ClassDB::bind_method(D_METHOD("get_transform"),&PhysicsShapeQueryParameters::get_transform); - ClassDB::bind_method(_MD("set_margin","margin"),&PhysicsShapeQueryParameters::set_margin); - ClassDB::bind_method(_MD("get_margin"),&PhysicsShapeQueryParameters::get_margin); + ClassDB::bind_method(D_METHOD("set_margin","margin"),&PhysicsShapeQueryParameters::set_margin); + ClassDB::bind_method(D_METHOD("get_margin"),&PhysicsShapeQueryParameters::get_margin); - ClassDB::bind_method(_MD("set_layer_mask","layer_mask"),&PhysicsShapeQueryParameters::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&PhysicsShapeQueryParameters::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","layer_mask"),&PhysicsShapeQueryParameters::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&PhysicsShapeQueryParameters::get_layer_mask); - ClassDB::bind_method(_MD("set_object_type_mask","object_type_mask"),&PhysicsShapeQueryParameters::set_object_type_mask); - ClassDB::bind_method(_MD("get_object_type_mask"),&PhysicsShapeQueryParameters::get_object_type_mask); + ClassDB::bind_method(D_METHOD("set_object_type_mask","object_type_mask"),&PhysicsShapeQueryParameters::set_object_type_mask); + ClassDB::bind_method(D_METHOD("get_object_type_mask"),&PhysicsShapeQueryParameters::get_object_type_mask); - ClassDB::bind_method(_MD("set_exclude","exclude"),&PhysicsShapeQueryParameters::set_exclude); - ClassDB::bind_method(_MD("get_exclude"),&PhysicsShapeQueryParameters::get_exclude); + ClassDB::bind_method(D_METHOD("set_exclude","exclude"),&PhysicsShapeQueryParameters::set_exclude); + ClassDB::bind_method(D_METHOD("get_exclude"),&PhysicsShapeQueryParameters::get_exclude); } @@ -363,14 +363,14 @@ PhysicsDirectSpaceState::PhysicsDirectSpaceState() { void PhysicsDirectSpaceState::_bind_methods() { - //ClassDB::bind_method(_MD("intersect_ray","from","to","exclude","umask"),&PhysicsDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0)); - //ClassDB::bind_method(_MD("intersect_shape:PhysicsShapeQueryResult","shape","xform","result_max","exclude","umask"),&PhysicsDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("intersect_ray","from","to","exclude","umask"),&PhysicsDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0)); + //ClassDB::bind_method(D_METHOD("intersect_shape:PhysicsShapeQueryResult","shape","xform","result_max","exclude","umask"),&PhysicsDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); - ClassDB::bind_method(_MD("intersect_ray:Dictionary","from","to","exclude","layer_mask","type_mask"),&PhysicsDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); - ClassDB::bind_method(_MD("intersect_shape","shape:PhysicsShapeQueryParameters","max_results"),&PhysicsDirectSpaceState::_intersect_shape,DEFVAL(32)); - ClassDB::bind_method(_MD("cast_motion","shape:PhysicsShapeQueryParameters","motion"),&PhysicsDirectSpaceState::_cast_motion); - ClassDB::bind_method(_MD("collide_shape","shape:PhysicsShapeQueryParameters","max_results"),&PhysicsDirectSpaceState::_collide_shape,DEFVAL(32)); - ClassDB::bind_method(_MD("get_rest_info","shape:PhysicsShapeQueryParameters"),&PhysicsDirectSpaceState::_get_rest_info); + ClassDB::bind_method(D_METHOD("intersect_ray:Dictionary","from","to","exclude","layer_mask","type_mask"),&PhysicsDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0x7FFFFFFF),DEFVAL(TYPE_MASK_COLLISION)); + ClassDB::bind_method(D_METHOD("intersect_shape","shape:PhysicsShapeQueryParameters","max_results"),&PhysicsDirectSpaceState::_intersect_shape,DEFVAL(32)); + ClassDB::bind_method(D_METHOD("cast_motion","shape:PhysicsShapeQueryParameters","motion"),&PhysicsDirectSpaceState::_cast_motion); + ClassDB::bind_method(D_METHOD("collide_shape","shape:PhysicsShapeQueryParameters","max_results"),&PhysicsDirectSpaceState::_collide_shape,DEFVAL(32)); + ClassDB::bind_method(D_METHOD("get_rest_info","shape:PhysicsShapeQueryParameters"),&PhysicsDirectSpaceState::_get_rest_info); BIND_CONSTANT( TYPE_MASK_STATIC_BODY ); @@ -411,11 +411,11 @@ PhysicsShapeQueryResult::PhysicsShapeQueryResult() { void PhysicsShapeQueryResult::_bind_methods() { - ClassDB::bind_method(_MD("get_result_count"),&PhysicsShapeQueryResult::get_result_count); - ClassDB::bind_method(_MD("get_result_rid","idx"),&PhysicsShapeQueryResult::get_result_rid); - ClassDB::bind_method(_MD("get_result_object_id","idx"),&PhysicsShapeQueryResult::get_result_object_id); - ClassDB::bind_method(_MD("get_result_object","idx"),&PhysicsShapeQueryResult::get_result_object); - ClassDB::bind_method(_MD("get_result_object_shape","idx"),&PhysicsShapeQueryResult::get_result_object_shape); + ClassDB::bind_method(D_METHOD("get_result_count"),&PhysicsShapeQueryResult::get_result_count); + ClassDB::bind_method(D_METHOD("get_result_rid","idx"),&PhysicsShapeQueryResult::get_result_rid); + ClassDB::bind_method(D_METHOD("get_result_object_id","idx"),&PhysicsShapeQueryResult::get_result_object_id); + ClassDB::bind_method(D_METHOD("get_result_object","idx"),&PhysicsShapeQueryResult::get_result_object); + ClassDB::bind_method(D_METHOD("get_result_object_shape","idx"),&PhysicsShapeQueryResult::get_result_object_shape); } @@ -429,118 +429,118 @@ void PhysicsShapeQueryResult::_bind_methods() { void PhysicsServer::_bind_methods() { - ClassDB::bind_method(_MD("shape_create","type"),&PhysicsServer::shape_create); - ClassDB::bind_method(_MD("shape_set_data","shape","data"),&PhysicsServer::shape_set_data); + ClassDB::bind_method(D_METHOD("shape_create","type"),&PhysicsServer::shape_create); + ClassDB::bind_method(D_METHOD("shape_set_data","shape","data"),&PhysicsServer::shape_set_data); - ClassDB::bind_method(_MD("shape_get_type","shape"),&PhysicsServer::shape_get_type); - ClassDB::bind_method(_MD("shape_get_data","shape"),&PhysicsServer::shape_get_data); + ClassDB::bind_method(D_METHOD("shape_get_type","shape"),&PhysicsServer::shape_get_type); + ClassDB::bind_method(D_METHOD("shape_get_data","shape"),&PhysicsServer::shape_get_data); - ClassDB::bind_method(_MD("space_create"),&PhysicsServer::space_create); - ClassDB::bind_method(_MD("space_set_active","space","active"),&PhysicsServer::space_set_active); - ClassDB::bind_method(_MD("space_is_active","space"),&PhysicsServer::space_is_active); - ClassDB::bind_method(_MD("space_set_param","space","param","value"),&PhysicsServer::space_set_param); - ClassDB::bind_method(_MD("space_get_param","space","param"),&PhysicsServer::space_get_param); - ClassDB::bind_method(_MD("space_get_direct_state:PhysicsDirectSpaceState","space"),&PhysicsServer::space_get_direct_state); + ClassDB::bind_method(D_METHOD("space_create"),&PhysicsServer::space_create); + ClassDB::bind_method(D_METHOD("space_set_active","space","active"),&PhysicsServer::space_set_active); + ClassDB::bind_method(D_METHOD("space_is_active","space"),&PhysicsServer::space_is_active); + ClassDB::bind_method(D_METHOD("space_set_param","space","param","value"),&PhysicsServer::space_set_param); + ClassDB::bind_method(D_METHOD("space_get_param","space","param"),&PhysicsServer::space_get_param); + ClassDB::bind_method(D_METHOD("space_get_direct_state:PhysicsDirectSpaceState","space"),&PhysicsServer::space_get_direct_state); - ClassDB::bind_method(_MD("area_create"),&PhysicsServer::area_create); - ClassDB::bind_method(_MD("area_set_space","area","space"),&PhysicsServer::area_set_space); - ClassDB::bind_method(_MD("area_get_space","area"),&PhysicsServer::area_get_space); + ClassDB::bind_method(D_METHOD("area_create"),&PhysicsServer::area_create); + ClassDB::bind_method(D_METHOD("area_set_space","area","space"),&PhysicsServer::area_set_space); + ClassDB::bind_method(D_METHOD("area_get_space","area"),&PhysicsServer::area_get_space); - ClassDB::bind_method(_MD("area_set_space_override_mode","area","mode"),&PhysicsServer::area_set_space_override_mode); - ClassDB::bind_method(_MD("area_get_space_override_mode","area"),&PhysicsServer::area_get_space_override_mode); + ClassDB::bind_method(D_METHOD("area_set_space_override_mode","area","mode"),&PhysicsServer::area_set_space_override_mode); + ClassDB::bind_method(D_METHOD("area_get_space_override_mode","area"),&PhysicsServer::area_get_space_override_mode); - ClassDB::bind_method(_MD("area_add_shape","area","shape","transform"),&PhysicsServer::area_add_shape,DEFVAL(Transform())); - ClassDB::bind_method(_MD("area_set_shape","area","shape_idx","shape"),&PhysicsServer::area_set_shape); - ClassDB::bind_method(_MD("area_set_shape_transform","area","shape_idx","transform"),&PhysicsServer::area_set_shape_transform); + ClassDB::bind_method(D_METHOD("area_add_shape","area","shape","transform"),&PhysicsServer::area_add_shape,DEFVAL(Transform())); + ClassDB::bind_method(D_METHOD("area_set_shape","area","shape_idx","shape"),&PhysicsServer::area_set_shape); + ClassDB::bind_method(D_METHOD("area_set_shape_transform","area","shape_idx","transform"),&PhysicsServer::area_set_shape_transform); - ClassDB::bind_method(_MD("area_get_shape_count","area"),&PhysicsServer::area_get_shape_count); - ClassDB::bind_method(_MD("area_get_shape","area","shape_idx"),&PhysicsServer::area_get_shape); - ClassDB::bind_method(_MD("area_get_shape_transform","area","shape_idx"),&PhysicsServer::area_get_shape_transform); + ClassDB::bind_method(D_METHOD("area_get_shape_count","area"),&PhysicsServer::area_get_shape_count); + ClassDB::bind_method(D_METHOD("area_get_shape","area","shape_idx"),&PhysicsServer::area_get_shape); + ClassDB::bind_method(D_METHOD("area_get_shape_transform","area","shape_idx"),&PhysicsServer::area_get_shape_transform); - ClassDB::bind_method(_MD("area_remove_shape","area","shape_idx"),&PhysicsServer::area_remove_shape); - ClassDB::bind_method(_MD("area_clear_shapes","area"),&PhysicsServer::area_clear_shapes); + ClassDB::bind_method(D_METHOD("area_remove_shape","area","shape_idx"),&PhysicsServer::area_remove_shape); + ClassDB::bind_method(D_METHOD("area_clear_shapes","area"),&PhysicsServer::area_clear_shapes); - ClassDB::bind_method(_MD("area_set_layer_mask","area","mask"),&PhysicsServer::area_set_layer_mask); - ClassDB::bind_method(_MD("area_set_collision_mask","area","mask"),&PhysicsServer::area_set_collision_mask); + ClassDB::bind_method(D_METHOD("area_set_layer_mask","area","mask"),&PhysicsServer::area_set_layer_mask); + ClassDB::bind_method(D_METHOD("area_set_collision_mask","area","mask"),&PhysicsServer::area_set_collision_mask); - ClassDB::bind_method(_MD("area_set_param","area","param","value"),&PhysicsServer::area_set_param); - ClassDB::bind_method(_MD("area_set_transform","area","transform"),&PhysicsServer::area_set_transform); + ClassDB::bind_method(D_METHOD("area_set_param","area","param","value"),&PhysicsServer::area_set_param); + ClassDB::bind_method(D_METHOD("area_set_transform","area","transform"),&PhysicsServer::area_set_transform); - ClassDB::bind_method(_MD("area_get_param","area","param"),&PhysicsServer::area_get_param); - ClassDB::bind_method(_MD("area_get_transform","area"),&PhysicsServer::area_get_transform); + ClassDB::bind_method(D_METHOD("area_get_param","area","param"),&PhysicsServer::area_get_param); + ClassDB::bind_method(D_METHOD("area_get_transform","area"),&PhysicsServer::area_get_transform); - ClassDB::bind_method(_MD("area_attach_object_instance_ID","area","id"),&PhysicsServer::area_attach_object_instance_ID); - ClassDB::bind_method(_MD("area_get_object_instance_ID","area"),&PhysicsServer::area_get_object_instance_ID); + ClassDB::bind_method(D_METHOD("area_attach_object_instance_ID","area","id"),&PhysicsServer::area_attach_object_instance_ID); + ClassDB::bind_method(D_METHOD("area_get_object_instance_ID","area"),&PhysicsServer::area_get_object_instance_ID); - ClassDB::bind_method(_MD("area_set_monitor_callback","area","receiver","method"),&PhysicsServer::area_set_monitor_callback); + ClassDB::bind_method(D_METHOD("area_set_monitor_callback","area","receiver","method"),&PhysicsServer::area_set_monitor_callback); - ClassDB::bind_method(_MD("area_set_ray_pickable","area","enable"),&PhysicsServer::area_set_ray_pickable); - ClassDB::bind_method(_MD("area_is_ray_pickable","area"),&PhysicsServer::area_is_ray_pickable); + ClassDB::bind_method(D_METHOD("area_set_ray_pickable","area","enable"),&PhysicsServer::area_set_ray_pickable); + ClassDB::bind_method(D_METHOD("area_is_ray_pickable","area"),&PhysicsServer::area_is_ray_pickable); - ClassDB::bind_method(_MD("body_create","mode","init_sleeping"),&PhysicsServer::body_create,DEFVAL(BODY_MODE_RIGID),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("body_create","mode","init_sleeping"),&PhysicsServer::body_create,DEFVAL(BODY_MODE_RIGID),DEFVAL(false)); - ClassDB::bind_method(_MD("body_set_space","body","space"),&PhysicsServer::body_set_space); - ClassDB::bind_method(_MD("body_get_space","body"),&PhysicsServer::body_get_space); + ClassDB::bind_method(D_METHOD("body_set_space","body","space"),&PhysicsServer::body_set_space); + ClassDB::bind_method(D_METHOD("body_get_space","body"),&PhysicsServer::body_get_space); - ClassDB::bind_method(_MD("body_set_mode","body","mode"),&PhysicsServer::body_set_mode); - ClassDB::bind_method(_MD("body_get_mode","body"),&PhysicsServer::body_get_mode); + ClassDB::bind_method(D_METHOD("body_set_mode","body","mode"),&PhysicsServer::body_set_mode); + ClassDB::bind_method(D_METHOD("body_get_mode","body"),&PhysicsServer::body_get_mode); - ClassDB::bind_method(_MD("body_set_layer_mask","body","mask"),&PhysicsServer::body_set_layer_mask); - ClassDB::bind_method(_MD("body_get_layer_mask","body"),&PhysicsServer::body_get_layer_mask); + ClassDB::bind_method(D_METHOD("body_set_layer_mask","body","mask"),&PhysicsServer::body_set_layer_mask); + ClassDB::bind_method(D_METHOD("body_get_layer_mask","body"),&PhysicsServer::body_get_layer_mask); - ClassDB::bind_method(_MD("body_set_collision_mask","body","mask"),&PhysicsServer::body_set_collision_mask); - ClassDB::bind_method(_MD("body_get_collision_mask","body"),&PhysicsServer::body_get_collision_mask); + ClassDB::bind_method(D_METHOD("body_set_collision_mask","body","mask"),&PhysicsServer::body_set_collision_mask); + ClassDB::bind_method(D_METHOD("body_get_collision_mask","body"),&PhysicsServer::body_get_collision_mask); - ClassDB::bind_method(_MD("body_add_shape","body","shape","transform"),&PhysicsServer::body_add_shape,DEFVAL(Transform())); - ClassDB::bind_method(_MD("body_set_shape","body","shape_idx","shape"),&PhysicsServer::body_set_shape); - ClassDB::bind_method(_MD("body_set_shape_transform","body","shape_idx","transform"),&PhysicsServer::body_set_shape_transform); + ClassDB::bind_method(D_METHOD("body_add_shape","body","shape","transform"),&PhysicsServer::body_add_shape,DEFVAL(Transform())); + ClassDB::bind_method(D_METHOD("body_set_shape","body","shape_idx","shape"),&PhysicsServer::body_set_shape); + ClassDB::bind_method(D_METHOD("body_set_shape_transform","body","shape_idx","transform"),&PhysicsServer::body_set_shape_transform); - ClassDB::bind_method(_MD("body_get_shape_count","body"),&PhysicsServer::body_get_shape_count); - ClassDB::bind_method(_MD("body_get_shape","body","shape_idx"),&PhysicsServer::body_get_shape); - ClassDB::bind_method(_MD("body_get_shape_transform","body","shape_idx"),&PhysicsServer::body_get_shape_transform); + ClassDB::bind_method(D_METHOD("body_get_shape_count","body"),&PhysicsServer::body_get_shape_count); + ClassDB::bind_method(D_METHOD("body_get_shape","body","shape_idx"),&PhysicsServer::body_get_shape); + ClassDB::bind_method(D_METHOD("body_get_shape_transform","body","shape_idx"),&PhysicsServer::body_get_shape_transform); - ClassDB::bind_method(_MD("body_remove_shape","body","shape_idx"),&PhysicsServer::body_remove_shape); - ClassDB::bind_method(_MD("body_clear_shapes","body"),&PhysicsServer::body_clear_shapes); + ClassDB::bind_method(D_METHOD("body_remove_shape","body","shape_idx"),&PhysicsServer::body_remove_shape); + ClassDB::bind_method(D_METHOD("body_clear_shapes","body"),&PhysicsServer::body_clear_shapes); - ClassDB::bind_method(_MD("body_attach_object_instance_ID","body","id"),&PhysicsServer::body_attach_object_instance_ID); - ClassDB::bind_method(_MD("body_get_object_instance_ID","body"),&PhysicsServer::body_get_object_instance_ID); + ClassDB::bind_method(D_METHOD("body_attach_object_instance_ID","body","id"),&PhysicsServer::body_attach_object_instance_ID); + ClassDB::bind_method(D_METHOD("body_get_object_instance_ID","body"),&PhysicsServer::body_get_object_instance_ID); - ClassDB::bind_method(_MD("body_set_enable_continuous_collision_detection","body","enable"),&PhysicsServer::body_set_enable_continuous_collision_detection); - ClassDB::bind_method(_MD("body_is_continuous_collision_detection_enabled","body"),&PhysicsServer::body_is_continuous_collision_detection_enabled); + ClassDB::bind_method(D_METHOD("body_set_enable_continuous_collision_detection","body","enable"),&PhysicsServer::body_set_enable_continuous_collision_detection); + ClassDB::bind_method(D_METHOD("body_is_continuous_collision_detection_enabled","body"),&PhysicsServer::body_is_continuous_collision_detection_enabled); - //ClassDB::bind_method(_MD("body_set_user_flags","flags""),&PhysicsServer::body_set_shape,DEFVAL(Transform)); - //ClassDB::bind_method(_MD("body_get_user_flags","body","shape_idx","shape"),&PhysicsServer::body_get_shape); + //ClassDB::bind_method(D_METHOD("body_set_user_flags","flags""),&PhysicsServer::body_set_shape,DEFVAL(Transform)); + //ClassDB::bind_method(D_METHOD("body_get_user_flags","body","shape_idx","shape"),&PhysicsServer::body_get_shape); - ClassDB::bind_method(_MD("body_set_param","body","param","value"),&PhysicsServer::body_set_param); - ClassDB::bind_method(_MD("body_get_param","body","param"),&PhysicsServer::body_get_param); + ClassDB::bind_method(D_METHOD("body_set_param","body","param","value"),&PhysicsServer::body_set_param); + ClassDB::bind_method(D_METHOD("body_get_param","body","param"),&PhysicsServer::body_get_param); - ClassDB::bind_method(_MD("body_set_state","body","state","value"),&PhysicsServer::body_set_state); - ClassDB::bind_method(_MD("body_get_state","body","state"),&PhysicsServer::body_get_state); + ClassDB::bind_method(D_METHOD("body_set_state","body","state","value"),&PhysicsServer::body_set_state); + ClassDB::bind_method(D_METHOD("body_get_state","body","state"),&PhysicsServer::body_get_state); - ClassDB::bind_method(_MD("body_apply_impulse","body","pos","impulse"),&PhysicsServer::body_apply_impulse); - ClassDB::bind_method(_MD("body_apply_torque_impulse","body","impulse"),&PhysicsServer::body_apply_torque_impulse); - ClassDB::bind_method(_MD("body_set_axis_velocity","body","axis_velocity"),&PhysicsServer::body_set_axis_velocity); + ClassDB::bind_method(D_METHOD("body_apply_impulse","body","pos","impulse"),&PhysicsServer::body_apply_impulse); + ClassDB::bind_method(D_METHOD("body_apply_torque_impulse","body","impulse"),&PhysicsServer::body_apply_torque_impulse); + ClassDB::bind_method(D_METHOD("body_set_axis_velocity","body","axis_velocity"),&PhysicsServer::body_set_axis_velocity); - ClassDB::bind_method(_MD("body_set_axis_lock","body","axis"),&PhysicsServer::body_set_axis_lock); - ClassDB::bind_method(_MD("body_get_axis_lock","body"),&PhysicsServer::body_get_axis_lock); + ClassDB::bind_method(D_METHOD("body_set_axis_lock","body","axis"),&PhysicsServer::body_set_axis_lock); + ClassDB::bind_method(D_METHOD("body_get_axis_lock","body"),&PhysicsServer::body_get_axis_lock); - ClassDB::bind_method(_MD("body_add_collision_exception","body","excepted_body"),&PhysicsServer::body_add_collision_exception); - ClassDB::bind_method(_MD("body_remove_collision_exception","body","excepted_body"),&PhysicsServer::body_remove_collision_exception); + ClassDB::bind_method(D_METHOD("body_add_collision_exception","body","excepted_body"),&PhysicsServer::body_add_collision_exception); + ClassDB::bind_method(D_METHOD("body_remove_collision_exception","body","excepted_body"),&PhysicsServer::body_remove_collision_exception); //virtual void body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions)=0; - ClassDB::bind_method(_MD("body_set_max_contacts_reported","body","amount"),&PhysicsServer::body_set_max_contacts_reported); - ClassDB::bind_method(_MD("body_get_max_contacts_reported","body"),&PhysicsServer::body_get_max_contacts_reported); + ClassDB::bind_method(D_METHOD("body_set_max_contacts_reported","body","amount"),&PhysicsServer::body_set_max_contacts_reported); + ClassDB::bind_method(D_METHOD("body_get_max_contacts_reported","body"),&PhysicsServer::body_get_max_contacts_reported); - ClassDB::bind_method(_MD("body_set_omit_force_integration","body","enable"),&PhysicsServer::body_set_omit_force_integration); - ClassDB::bind_method(_MD("body_is_omitting_force_integration","body"),&PhysicsServer::body_is_omitting_force_integration); + ClassDB::bind_method(D_METHOD("body_set_omit_force_integration","body","enable"),&PhysicsServer::body_set_omit_force_integration); + ClassDB::bind_method(D_METHOD("body_is_omitting_force_integration","body"),&PhysicsServer::body_is_omitting_force_integration); - ClassDB::bind_method(_MD("body_set_force_integration_callback","body","receiver","method","userdata"),&PhysicsServer::body_set_force_integration_callback,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("body_set_force_integration_callback","body","receiver","method","userdata"),&PhysicsServer::body_set_force_integration_callback,DEFVAL(Variant())); - ClassDB::bind_method(_MD("body_set_ray_pickable","body","enable"),&PhysicsServer::body_set_ray_pickable); - ClassDB::bind_method(_MD("body_is_ray_pickable","body"),&PhysicsServer::body_is_ray_pickable); + ClassDB::bind_method(D_METHOD("body_set_ray_pickable","body","enable"),&PhysicsServer::body_set_ray_pickable); + ClassDB::bind_method(D_METHOD("body_is_ray_pickable","body"),&PhysicsServer::body_is_ray_pickable); /* JOINT API */ @@ -550,15 +550,15 @@ void PhysicsServer::_bind_methods() { BIND_CONSTANT( JOINT_CONE_TWIST ); BIND_CONSTANT( JOINT_6DOF ); - ClassDB::bind_method(_MD("joint_create_pin","body_A","local_A","body_B","local_B"),&PhysicsServer::joint_create_pin); - ClassDB::bind_method(_MD("pin_joint_set_param","joint","param","value"),&PhysicsServer::pin_joint_set_param); - ClassDB::bind_method(_MD("pin_joint_get_param","joint","param"),&PhysicsServer::pin_joint_get_param); + ClassDB::bind_method(D_METHOD("joint_create_pin","body_A","local_A","body_B","local_B"),&PhysicsServer::joint_create_pin); + ClassDB::bind_method(D_METHOD("pin_joint_set_param","joint","param","value"),&PhysicsServer::pin_joint_set_param); + ClassDB::bind_method(D_METHOD("pin_joint_get_param","joint","param"),&PhysicsServer::pin_joint_get_param); - ClassDB::bind_method(_MD("pin_joint_set_local_A","joint","local_A"),&PhysicsServer::pin_joint_set_local_A); - ClassDB::bind_method(_MD("pin_joint_get_local_A","joint"),&PhysicsServer::pin_joint_get_local_A); + ClassDB::bind_method(D_METHOD("pin_joint_set_local_A","joint","local_A"),&PhysicsServer::pin_joint_set_local_A); + ClassDB::bind_method(D_METHOD("pin_joint_get_local_A","joint"),&PhysicsServer::pin_joint_get_local_A); - ClassDB::bind_method(_MD("pin_joint_set_local_B","joint","local_B"),&PhysicsServer::pin_joint_set_local_B); - ClassDB::bind_method(_MD("pin_joint_get_local_B","joint"),&PhysicsServer::pin_joint_get_local_B); + ClassDB::bind_method(D_METHOD("pin_joint_set_local_B","joint","local_B"),&PhysicsServer::pin_joint_set_local_B); + ClassDB::bind_method(D_METHOD("pin_joint_get_local_B","joint"),&PhysicsServer::pin_joint_get_local_B); BIND_CONSTANT(PIN_JOINT_BIAS ); BIND_CONSTANT(PIN_JOINT_DAMPING ); @@ -576,18 +576,18 @@ void PhysicsServer::_bind_methods() { BIND_CONSTANT(HINGE_JOINT_FLAG_USE_LIMIT); BIND_CONSTANT(HINGE_JOINT_FLAG_ENABLE_MOTOR); - ClassDB::bind_method(_MD("joint_create_hinge","body_A","hinge_A","body_B","hinge_B"),&PhysicsServer::joint_create_hinge); + ClassDB::bind_method(D_METHOD("joint_create_hinge","body_A","hinge_A","body_B","hinge_B"),&PhysicsServer::joint_create_hinge); - ClassDB::bind_method(_MD("hinge_joint_set_param","joint","param","value"),&PhysicsServer::hinge_joint_set_param); - ClassDB::bind_method(_MD("hinge_joint_get_param","joint","param"),&PhysicsServer::hinge_joint_get_param); + ClassDB::bind_method(D_METHOD("hinge_joint_set_param","joint","param","value"),&PhysicsServer::hinge_joint_set_param); + ClassDB::bind_method(D_METHOD("hinge_joint_get_param","joint","param"),&PhysicsServer::hinge_joint_get_param); - ClassDB::bind_method(_MD("hinge_joint_set_flag","joint","flag","enabled"),&PhysicsServer::hinge_joint_set_flag); - ClassDB::bind_method(_MD("hinge_joint_get_flag","joint","flag"),&PhysicsServer::hinge_joint_get_flag); + ClassDB::bind_method(D_METHOD("hinge_joint_set_flag","joint","flag","enabled"),&PhysicsServer::hinge_joint_set_flag); + ClassDB::bind_method(D_METHOD("hinge_joint_get_flag","joint","flag"),&PhysicsServer::hinge_joint_get_flag); - ClassDB::bind_method(_MD("joint_create_slider","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_slider); + ClassDB::bind_method(D_METHOD("joint_create_slider","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_slider); - ClassDB::bind_method(_MD("slider_joint_set_param","joint","param","value"),&PhysicsServer::slider_joint_set_param); - ClassDB::bind_method(_MD("slider_joint_get_param","joint","param"),&PhysicsServer::slider_joint_get_param); + ClassDB::bind_method(D_METHOD("slider_joint_set_param","joint","param","value"),&PhysicsServer::slider_joint_set_param); + ClassDB::bind_method(D_METHOD("slider_joint_get_param","joint","param"),&PhysicsServer::slider_joint_get_param); BIND_CONSTANT( SLIDER_JOINT_LINEAR_LIMIT_UPPER ); BIND_CONSTANT( SLIDER_JOINT_LINEAR_LIMIT_LOWER ); @@ -615,10 +615,10 @@ void PhysicsServer::_bind_methods() { BIND_CONSTANT( SLIDER_JOINT_MAX ); - ClassDB::bind_method(_MD("joint_create_cone_twist","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_cone_twist); + ClassDB::bind_method(D_METHOD("joint_create_cone_twist","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_cone_twist); - ClassDB::bind_method(_MD("cone_twist_joint_set_param","joint","param","value"),&PhysicsServer::cone_twist_joint_set_param); - ClassDB::bind_method(_MD("cone_twist_joint_get_param","joint","param"),&PhysicsServer::cone_twist_joint_get_param); + ClassDB::bind_method(D_METHOD("cone_twist_joint_set_param","joint","param","value"),&PhysicsServer::cone_twist_joint_set_param); + ClassDB::bind_method(D_METHOD("cone_twist_joint_get_param","joint","param"),&PhysicsServer::cone_twist_joint_get_param); BIND_CONSTANT( CONE_TWIST_JOINT_SWING_SPAN ); BIND_CONSTANT( CONE_TWIST_JOINT_TWIST_SPAN ); @@ -647,44 +647,44 @@ void PhysicsServer::_bind_methods() { BIND_CONSTANT( G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT ); BIND_CONSTANT( G6DOF_JOINT_FLAG_ENABLE_MOTOR ); - ClassDB::bind_method(_MD("joint_get_type","joint"),&PhysicsServer::joint_get_type); + ClassDB::bind_method(D_METHOD("joint_get_type","joint"),&PhysicsServer::joint_get_type); - ClassDB::bind_method(_MD("joint_set_solver_priority","joint","priority"),&PhysicsServer::joint_set_solver_priority); - ClassDB::bind_method(_MD("joint_get_solver_priority","joint"),&PhysicsServer::joint_get_solver_priority); + ClassDB::bind_method(D_METHOD("joint_set_solver_priority","joint","priority"),&PhysicsServer::joint_set_solver_priority); + ClassDB::bind_method(D_METHOD("joint_get_solver_priority","joint"),&PhysicsServer::joint_get_solver_priority); - ClassDB::bind_method(_MD("joint_create_generic_6dof","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_generic_6dof); + ClassDB::bind_method(D_METHOD("joint_create_generic_6dof","body_A","local_ref_A","body_B","local_ref_B"),&PhysicsServer::joint_create_generic_6dof); - ClassDB::bind_method(_MD("generic_6dof_joint_set_param","joint","axis","param","value"),&PhysicsServer::generic_6dof_joint_set_param); - ClassDB::bind_method(_MD("generic_6dof_joint_get_param","joint","axis","param"),&PhysicsServer::generic_6dof_joint_get_param); + ClassDB::bind_method(D_METHOD("generic_6dof_joint_set_param","joint","axis","param","value"),&PhysicsServer::generic_6dof_joint_set_param); + ClassDB::bind_method(D_METHOD("generic_6dof_joint_get_param","joint","axis","param"),&PhysicsServer::generic_6dof_joint_get_param); - ClassDB::bind_method(_MD("generic_6dof_joint_set_flag","joint","axis","flag","enable"),&PhysicsServer::generic_6dof_joint_set_flag); - ClassDB::bind_method(_MD("generic_6dof_joint_get_flag","joint","axis","flag"),&PhysicsServer::generic_6dof_joint_get_flag); + ClassDB::bind_method(D_METHOD("generic_6dof_joint_set_flag","joint","axis","flag","enable"),&PhysicsServer::generic_6dof_joint_set_flag); + ClassDB::bind_method(D_METHOD("generic_6dof_joint_get_flag","joint","axis","flag"),&PhysicsServer::generic_6dof_joint_get_flag); /* - ClassDB::bind_method(_MD("joint_set_param","joint","param","value"),&PhysicsServer::joint_set_param); - ClassDB::bind_method(_MD("joint_get_param","joint","param"),&PhysicsServer::joint_get_param); + ClassDB::bind_method(D_METHOD("joint_set_param","joint","param","value"),&PhysicsServer::joint_set_param); + ClassDB::bind_method(D_METHOD("joint_get_param","joint","param"),&PhysicsServer::joint_get_param); - ClassDB::bind_method(_MD("pin_joint_create","anchor","body_a","body_b"),&PhysicsServer::pin_joint_create,DEFVAL(RID())); - ClassDB::bind_method(_MD("groove_joint_create","groove1_a","groove2_a","anchor_b","body_a","body_b"),&PhysicsServer::groove_joint_create,DEFVAL(RID()),DEFVAL(RID())); - ClassDB::bind_method(_MD("damped_spring_joint_create","anchor_a","anchor_b","body_a","body_b"),&PhysicsServer::damped_spring_joint_create,DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("pin_joint_create","anchor","body_a","body_b"),&PhysicsServer::pin_joint_create,DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("groove_joint_create","groove1_a","groove2_a","anchor_b","body_a","body_b"),&PhysicsServer::groove_joint_create,DEFVAL(RID()),DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("damped_spring_joint_create","anchor_a","anchor_b","body_a","body_b"),&PhysicsServer::damped_spring_joint_create,DEFVAL(RID())); - ClassDB::bind_method(_MD("damped_string_joint_set_param","joint","param","value"),&PhysicsServer::damped_string_joint_set_param,DEFVAL(RID())); - ClassDB::bind_method(_MD("damped_string_joint_get_param","joint","param"),&PhysicsServer::damped_string_joint_get_param); + ClassDB::bind_method(D_METHOD("damped_string_joint_set_param","joint","param","value"),&PhysicsServer::damped_string_joint_set_param,DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("damped_string_joint_get_param","joint","param"),&PhysicsServer::damped_string_joint_get_param); - ClassDB::bind_method(_MD("joint_get_type","joint"),&PhysicsServer::joint_get_type); + ClassDB::bind_method(D_METHOD("joint_get_type","joint"),&PhysicsServer::joint_get_type); */ - ClassDB::bind_method(_MD("free_rid","rid"),&PhysicsServer::free); + ClassDB::bind_method(D_METHOD("free_rid","rid"),&PhysicsServer::free); - ClassDB::bind_method(_MD("set_active","active"),&PhysicsServer::set_active); + ClassDB::bind_method(D_METHOD("set_active","active"),&PhysicsServer::set_active); - //ClassDB::bind_method(_MD("init"),&PhysicsServer::init); - //ClassDB::bind_method(_MD("step"),&PhysicsServer::step); - //ClassDB::bind_method(_MD("sync"),&PhysicsServer::sync); - //ClassDB::bind_method(_MD("flush_queries"),&PhysicsServer::flush_queries); + //ClassDB::bind_method(D_METHOD("init"),&PhysicsServer::init); + //ClassDB::bind_method(D_METHOD("step"),&PhysicsServer::step); + //ClassDB::bind_method(D_METHOD("sync"),&PhysicsServer::sync); + //ClassDB::bind_method(D_METHOD("flush_queries"),&PhysicsServer::flush_queries); - ClassDB::bind_method(_MD("get_process_info","process_info"),&PhysicsServer::get_process_info); + ClassDB::bind_method(D_METHOD("get_process_info","process_info"),&PhysicsServer::get_process_info); BIND_CONSTANT( SHAPE_PLANE ); BIND_CONSTANT( SHAPE_RAY ); diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 1799585576..68767da4ce 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1566,17 +1566,17 @@ Array VisualServer::mesh_surface_get_arrays(RID p_mesh,int p_surface) const { void VisualServer::_bind_methods() { - ClassDB::bind_method(_MD("texture_create"),&VisualServer::texture_create); - ClassDB::bind_method(_MD("texture_create_from_image"),&VisualServer::texture_create_from_image,DEFVAL( TEXTURE_FLAGS_DEFAULT ) ); - //ClassDB::bind_method(_MD("texture_allocate"),&VisualServer::texture_allocate,DEFVAL( TEXTURE_FLAGS_DEFAULT ) ); - //ClassDB::bind_method(_MD("texture_set_data"),&VisualServer::texture_blit_rect,DEFVAL( CUBEMAP_LEFT ) ); - //ClassDB::bind_method(_MD("texture_get_rect"),&VisualServer::texture_get_rect ); - ClassDB::bind_method(_MD("texture_set_flags"),&VisualServer::texture_set_flags ); - ClassDB::bind_method(_MD("texture_get_flags"),&VisualServer::texture_get_flags ); - ClassDB::bind_method(_MD("texture_get_width"),&VisualServer::texture_get_width ); - ClassDB::bind_method(_MD("texture_get_height"),&VisualServer::texture_get_height ); - - ClassDB::bind_method(_MD("texture_set_shrink_all_x2_on_set_data","shrink"),&VisualServer::texture_set_shrink_all_x2_on_set_data ); + ClassDB::bind_method(D_METHOD("texture_create"),&VisualServer::texture_create); + ClassDB::bind_method(D_METHOD("texture_create_from_image"),&VisualServer::texture_create_from_image,DEFVAL( TEXTURE_FLAGS_DEFAULT ) ); + //ClassDB::bind_method(D_METHOD("texture_allocate"),&VisualServer::texture_allocate,DEFVAL( TEXTURE_FLAGS_DEFAULT ) ); + //ClassDB::bind_method(D_METHOD("texture_set_data"),&VisualServer::texture_blit_rect,DEFVAL( CUBEMAP_LEFT ) ); + //ClassDB::bind_method(D_METHOD("texture_get_rect"),&VisualServer::texture_get_rect ); + ClassDB::bind_method(D_METHOD("texture_set_flags"),&VisualServer::texture_set_flags ); + ClassDB::bind_method(D_METHOD("texture_get_flags"),&VisualServer::texture_get_flags ); + ClassDB::bind_method(D_METHOD("texture_get_width"),&VisualServer::texture_get_width ); + ClassDB::bind_method(D_METHOD("texture_get_height"),&VisualServer::texture_get_height ); + + ClassDB::bind_method(D_METHOD("texture_set_shrink_all_x2_on_set_data","shrink"),&VisualServer::texture_set_shrink_all_x2_on_set_data ); diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index f256e351ae..d675c6a6bb 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3922,48 +3922,48 @@ void AnimationKeyEditor::cleanup() { void AnimationKeyEditor::_bind_methods() { - ClassDB::bind_method(_MD("_root_removed"),&AnimationKeyEditor::_root_removed); - ClassDB::bind_method(_MD("_scale"),&AnimationKeyEditor::_scale); - ClassDB::bind_method(_MD("set_root"),&AnimationKeyEditor::set_root); + ClassDB::bind_method(D_METHOD("_root_removed"),&AnimationKeyEditor::_root_removed); + ClassDB::bind_method(D_METHOD("_scale"),&AnimationKeyEditor::_scale); + ClassDB::bind_method(D_METHOD("set_root"),&AnimationKeyEditor::set_root); - //ClassDB::bind_method(_MD("_confirm_insert"),&AnimationKeyEditor::_confirm_insert); - ClassDB::bind_method(_MD("_confirm_insert_list"),&AnimationKeyEditor::_confirm_insert_list); + //ClassDB::bind_method(D_METHOD("_confirm_insert"),&AnimationKeyEditor::_confirm_insert); + ClassDB::bind_method(D_METHOD("_confirm_insert_list"),&AnimationKeyEditor::_confirm_insert_list); - ClassDB::bind_method(_MD("_update_paths"),&AnimationKeyEditor::_update_paths); - ClassDB::bind_method(_MD("_track_editor_draw"),&AnimationKeyEditor::_track_editor_draw); + ClassDB::bind_method(D_METHOD("_update_paths"),&AnimationKeyEditor::_update_paths); + ClassDB::bind_method(D_METHOD("_track_editor_draw"),&AnimationKeyEditor::_track_editor_draw); - ClassDB::bind_method(_MD("_animation_changed"),&AnimationKeyEditor::_animation_changed); - ClassDB::bind_method(_MD("_scroll_changed"),&AnimationKeyEditor::_scroll_changed); - ClassDB::bind_method(_MD("_track_editor_gui_input"),&AnimationKeyEditor::_track_editor_gui_input); - ClassDB::bind_method(_MD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed); - ClassDB::bind_method(_MD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected); - ClassDB::bind_method(_MD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track); - ClassDB::bind_method(_MD("_menu_track"),&AnimationKeyEditor::_menu_track); - ClassDB::bind_method(_MD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim); - ClassDB::bind_method(_MD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim); - ClassDB::bind_method(_MD("_track_pos_draw"),&AnimationKeyEditor::_track_pos_draw); - ClassDB::bind_method(_MD("_insert_delay"),&AnimationKeyEditor::_insert_delay); - ClassDB::bind_method(_MD("_step_changed"),&AnimationKeyEditor::_step_changed); + ClassDB::bind_method(D_METHOD("_animation_changed"),&AnimationKeyEditor::_animation_changed); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&AnimationKeyEditor::_scroll_changed); + ClassDB::bind_method(D_METHOD("_track_editor_gui_input"),&AnimationKeyEditor::_track_editor_gui_input); + ClassDB::bind_method(D_METHOD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed); + ClassDB::bind_method(D_METHOD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected); + ClassDB::bind_method(D_METHOD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track); + ClassDB::bind_method(D_METHOD("_menu_track"),&AnimationKeyEditor::_menu_track); + ClassDB::bind_method(D_METHOD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim); + ClassDB::bind_method(D_METHOD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim); + ClassDB::bind_method(D_METHOD("_track_pos_draw"),&AnimationKeyEditor::_track_pos_draw); + ClassDB::bind_method(D_METHOD("_insert_delay"),&AnimationKeyEditor::_insert_delay); + ClassDB::bind_method(D_METHOD("_step_changed"),&AnimationKeyEditor::_step_changed); - ClassDB::bind_method(_MD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed); - ClassDB::bind_method(_MD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed); - ClassDB::bind_method(_MD("_create_value_item"),&AnimationKeyEditor::_create_value_item); - ClassDB::bind_method(_MD("_pane_drag"),&AnimationKeyEditor::_pane_drag); + ClassDB::bind_method(D_METHOD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed); + ClassDB::bind_method(D_METHOD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed); + ClassDB::bind_method(D_METHOD("_create_value_item"),&AnimationKeyEditor::_create_value_item); + ClassDB::bind_method(D_METHOD("_pane_drag"),&AnimationKeyEditor::_pane_drag); - ClassDB::bind_method(_MD("_animation_len_update"),&AnimationKeyEditor::_animation_len_update); + ClassDB::bind_method(D_METHOD("_animation_len_update"),&AnimationKeyEditor::_animation_len_update); - ClassDB::bind_method(_MD("set_animation"),&AnimationKeyEditor::set_animation); - ClassDB::bind_method(_MD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize); - ClassDB::bind_method(_MD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed); - ClassDB::bind_method(_MD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves); - ClassDB::bind_method(_MD("_add_call_track"),&AnimationKeyEditor::_add_call_track); + ClassDB::bind_method(D_METHOD("set_animation"),&AnimationKeyEditor::set_animation); + ClassDB::bind_method(D_METHOD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize); + ClassDB::bind_method(D_METHOD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed); + ClassDB::bind_method(D_METHOD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves); + ClassDB::bind_method(D_METHOD("_add_call_track"),&AnimationKeyEditor::_add_call_track); ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) ); diff --git a/tools/editor/array_property_edit.cpp b/tools/editor/array_property_edit.cpp index b587c4f830..7304d8dddf 100644 --- a/tools/editor/array_property_edit.cpp +++ b/tools/editor/array_property_edit.cpp @@ -288,10 +288,10 @@ Node *ArrayPropertyEdit::get_node() { void ArrayPropertyEdit::_bind_methods() { - ClassDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size); - ClassDB::bind_method(_MD("_set_value"),&ArrayPropertyEdit::_set_value); - ClassDB::bind_method(_MD("_notif_change"),&ArrayPropertyEdit::_notif_change); - ClassDB::bind_method(_MD("_notif_changev"),&ArrayPropertyEdit::_notif_changev); + ClassDB::bind_method(D_METHOD("_set_size"),&ArrayPropertyEdit::_set_size); + ClassDB::bind_method(D_METHOD("_set_value"),&ArrayPropertyEdit::_set_value); + ClassDB::bind_method(D_METHOD("_notif_change"),&ArrayPropertyEdit::_notif_change); + ClassDB::bind_method(D_METHOD("_notif_changev"),&ArrayPropertyEdit::_notif_changev); } ArrayPropertyEdit::ArrayPropertyEdit() diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp index 6ba7a7e79b..1c1b6c91e3 100644 --- a/tools/editor/asset_library_editor_plugin.cpp +++ b/tools/editor/asset_library_editor_plugin.cpp @@ -199,9 +199,9 @@ void EditorAssetLibraryItemDescription::set_image(int p_type,int p_index,const R } void EditorAssetLibraryItemDescription::_bind_methods() { - ClassDB::bind_method(_MD("set_image"),&EditorAssetLibraryItemDescription::set_image); - ClassDB::bind_method(_MD("_link_click"),&EditorAssetLibraryItemDescription::_link_click); - ClassDB::bind_method(_MD("_preview_click"),&EditorAssetLibraryItemDescription::_preview_click); + ClassDB::bind_method(D_METHOD("set_image"),&EditorAssetLibraryItemDescription::set_image); + ClassDB::bind_method(D_METHOD("_link_click"),&EditorAssetLibraryItemDescription::_link_click); + ClassDB::bind_method(D_METHOD("_preview_click"),&EditorAssetLibraryItemDescription::_preview_click); } diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index 53e968f389..58bb148ce1 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -624,15 +624,15 @@ void CreateDialog::drop_data_fw(const Point2& p_point,const Variant& p_data,Cont void CreateDialog::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&CreateDialog::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&CreateDialog::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&CreateDialog::_sbox_input); - ClassDB::bind_method(_MD("_item_selected"),&CreateDialog::_item_selected); - ClassDB::bind_method(_MD("_favorite_toggled"),&CreateDialog::_favorite_toggled); - ClassDB::bind_method(_MD("_history_selected"),&CreateDialog::_history_selected); - ClassDB::bind_method(_MD("_favorite_selected"),&CreateDialog::_favorite_selected); - ClassDB::bind_method(_MD("_history_activated"),&CreateDialog::_history_activated); - ClassDB::bind_method(_MD("_favorite_activated"),&CreateDialog::_favorite_activated); + ClassDB::bind_method(D_METHOD("_text_changed"),&CreateDialog::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&CreateDialog::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&CreateDialog::_sbox_input); + ClassDB::bind_method(D_METHOD("_item_selected"),&CreateDialog::_item_selected); + ClassDB::bind_method(D_METHOD("_favorite_toggled"),&CreateDialog::_favorite_toggled); + ClassDB::bind_method(D_METHOD("_history_selected"),&CreateDialog::_history_selected); + ClassDB::bind_method(D_METHOD("_favorite_selected"),&CreateDialog::_favorite_selected); + ClassDB::bind_method(D_METHOD("_history_activated"),&CreateDialog::_history_activated); + ClassDB::bind_method(D_METHOD("_favorite_activated"),&CreateDialog::_favorite_activated); ClassDB::bind_method("get_drag_data_fw",&CreateDialog::get_drag_data_fw); diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp index a01383a868..d7e04db86e 100644 --- a/tools/editor/dependency_editor.cpp +++ b/tools/editor/dependency_editor.cpp @@ -251,9 +251,9 @@ void DependencyEditor::edit(const String& p_path) { void DependencyEditor::_bind_methods() { - ClassDB::bind_method(_MD("_searched"),&DependencyEditor::_searched); - ClassDB::bind_method(_MD("_load_pressed"),&DependencyEditor::_load_pressed); - ClassDB::bind_method(_MD("_fix_all"),&DependencyEditor::_fix_all); + ClassDB::bind_method(D_METHOD("_searched"),&DependencyEditor::_searched); + ClassDB::bind_method(D_METHOD("_load_pressed"),&DependencyEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_fix_all"),&DependencyEditor::_fix_all); } @@ -691,8 +691,8 @@ void OrphanResourcesDialog::_button_pressed(Object *p_item,int p_column, int p_i void OrphanResourcesDialog::_bind_methods() { - ClassDB::bind_method(_MD("_delete_confirm"),&OrphanResourcesDialog::_delete_confirm); - ClassDB::bind_method(_MD("_button_pressed"),&OrphanResourcesDialog::_button_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm"),&OrphanResourcesDialog::_delete_confirm); + ClassDB::bind_method(D_METHOD("_button_pressed"),&OrphanResourcesDialog::_button_pressed); } diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp index ef839d7e74..2a3c55229a 100644 --- a/tools/editor/editor_data.cpp +++ b/tools/editor/editor_data.cpp @@ -886,12 +886,12 @@ Array EditorSelection::_get_selected_nodes() { void EditorSelection::_bind_methods() { - ClassDB::bind_method(_MD("_node_removed"),&EditorSelection::_node_removed); - ClassDB::bind_method(_MD("clear"),&EditorSelection::clear); - ClassDB::bind_method(_MD("add_node","node:Node"),&EditorSelection::add_node); - ClassDB::bind_method(_MD("remove_node","node:Node"),&EditorSelection::remove_node); - ClassDB::bind_method(_MD("get_selected_nodes"),&EditorSelection::_get_selected_nodes); - ClassDB::bind_method(_MD("get_transformable_selected_nodes"),&EditorSelection::_get_transformable_selected_nodes); + ClassDB::bind_method(D_METHOD("_node_removed"),&EditorSelection::_node_removed); + ClassDB::bind_method(D_METHOD("clear"),&EditorSelection::clear); + ClassDB::bind_method(D_METHOD("add_node","node:Node"),&EditorSelection::add_node); + ClassDB::bind_method(D_METHOD("remove_node","node:Node"),&EditorSelection::remove_node); + ClassDB::bind_method(D_METHOD("get_selected_nodes"),&EditorSelection::_get_selected_nodes); + ClassDB::bind_method(D_METHOD("get_transformable_selected_nodes"),&EditorSelection::_get_transformable_selected_nodes); ADD_SIGNAL( MethodInfo("selection_changed") ); } diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp index bb9ddc2aef..c353e43070 100644 --- a/tools/editor/editor_dir_dialog.cpp +++ b/tools/editor/editor_dir_dialog.cpp @@ -225,10 +225,10 @@ void EditorDirDialog::_make_dir_confirm() { void EditorDirDialog::_bind_methods() { - ClassDB::bind_method(_MD("_item_collapsed"),&EditorDirDialog::_item_collapsed); - ClassDB::bind_method(_MD("_make_dir"),&EditorDirDialog::_make_dir); - ClassDB::bind_method(_MD("_make_dir_confirm"),&EditorDirDialog::_make_dir_confirm); - ClassDB::bind_method(_MD("reload"),&EditorDirDialog::reload); + ClassDB::bind_method(D_METHOD("_item_collapsed"),&EditorDirDialog::_item_collapsed); + ClassDB::bind_method(D_METHOD("_make_dir"),&EditorDirDialog::_make_dir); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"),&EditorDirDialog::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("reload"),&EditorDirDialog::reload); ADD_SIGNAL(MethodInfo("dir_selected",PropertyInfo(Variant::STRING,"dir"))); } diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index e23e2419d8..bfaf1906d8 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -1164,55 +1164,55 @@ EditorFileDialog::DisplayMode EditorFileDialog::get_display_mode() const{ void EditorFileDialog::_bind_methods() { - ClassDB::bind_method(_MD("_unhandled_input"),&EditorFileDialog::_unhandled_input); - - ClassDB::bind_method(_MD("_item_selected"),&EditorFileDialog::_item_selected); - ClassDB::bind_method(_MD("_item_db_selected"),&EditorFileDialog::_item_dc_selected); - ClassDB::bind_method(_MD("_dir_entered"),&EditorFileDialog::_dir_entered); - ClassDB::bind_method(_MD("_file_entered"),&EditorFileDialog::_file_entered); - ClassDB::bind_method(_MD("_action_pressed"),&EditorFileDialog::_action_pressed); - ClassDB::bind_method(_MD("_cancel_pressed"),&EditorFileDialog::_cancel_pressed); - ClassDB::bind_method(_MD("_filter_selected"),&EditorFileDialog::_filter_selected); - ClassDB::bind_method(_MD("_save_confirm_pressed"),&EditorFileDialog::_save_confirm_pressed); - - ClassDB::bind_method(_MD("clear_filters"),&EditorFileDialog::clear_filters); - ClassDB::bind_method(_MD("add_filter","filter"),&EditorFileDialog::add_filter); - ClassDB::bind_method(_MD("get_current_dir"),&EditorFileDialog::get_current_dir); - ClassDB::bind_method(_MD("get_current_file"),&EditorFileDialog::get_current_file); - ClassDB::bind_method(_MD("get_current_path"),&EditorFileDialog::get_current_path); - ClassDB::bind_method(_MD("set_current_dir","dir"),&EditorFileDialog::set_current_dir); - ClassDB::bind_method(_MD("set_current_file","file"),&EditorFileDialog::set_current_file); - ClassDB::bind_method(_MD("set_current_path","path"),&EditorFileDialog::set_current_path); - ClassDB::bind_method(_MD("set_mode","mode"),&EditorFileDialog::set_mode); - ClassDB::bind_method(_MD("get_mode"),&EditorFileDialog::get_mode); - ClassDB::bind_method(_MD("get_vbox:VBoxContainer"),&EditorFileDialog::get_vbox); - ClassDB::bind_method(_MD("set_access","access"),&EditorFileDialog::set_access); - ClassDB::bind_method(_MD("get_access"),&EditorFileDialog::get_access); - ClassDB::bind_method(_MD("set_show_hidden_files","show"),&EditorFileDialog::set_show_hidden_files); - ClassDB::bind_method(_MD("is_showing_hidden_files"),&EditorFileDialog::is_showing_hidden_files); - ClassDB::bind_method(_MD("_select_drive"),&EditorFileDialog::_select_drive); - ClassDB::bind_method(_MD("_make_dir"),&EditorFileDialog::_make_dir); - ClassDB::bind_method(_MD("_make_dir_confirm"),&EditorFileDialog::_make_dir_confirm); - ClassDB::bind_method(_MD("_update_file_list"),&EditorFileDialog::update_file_list); - ClassDB::bind_method(_MD("_update_dir"),&EditorFileDialog::update_dir); - ClassDB::bind_method(_MD("_thumbnail_done"),&EditorFileDialog::_thumbnail_done); - ClassDB::bind_method(_MD("set_display_mode","mode"),&EditorFileDialog::set_display_mode); - ClassDB::bind_method(_MD("get_display_mode"),&EditorFileDialog::get_display_mode); - ClassDB::bind_method(_MD("_thumbnail_result"),&EditorFileDialog::_thumbnail_result); - ClassDB::bind_method(_MD("set_disable_overwrite_warning","disable"),&EditorFileDialog::set_disable_overwrite_warning); - ClassDB::bind_method(_MD("is_overwrite_warning_disabled"),&EditorFileDialog::is_overwrite_warning_disabled); - - ClassDB::bind_method(_MD("_recent_selected"),&EditorFileDialog::_recent_selected); - ClassDB::bind_method(_MD("_go_back"),&EditorFileDialog::_go_back); - ClassDB::bind_method(_MD("_go_forward"),&EditorFileDialog::_go_forward); - ClassDB::bind_method(_MD("_go_up"),&EditorFileDialog::_go_up); - - ClassDB::bind_method(_MD("_favorite_toggled"),&EditorFileDialog::_favorite_toggled); - ClassDB::bind_method(_MD("_favorite_selected"),&EditorFileDialog::_favorite_selected); - ClassDB::bind_method(_MD("_favorite_move_up"),&EditorFileDialog::_favorite_move_up); - ClassDB::bind_method(_MD("_favorite_move_down"),&EditorFileDialog::_favorite_move_down); - - ClassDB::bind_method(_MD("invalidate"),&EditorFileDialog::invalidate); + ClassDB::bind_method(D_METHOD("_unhandled_input"),&EditorFileDialog::_unhandled_input); + + ClassDB::bind_method(D_METHOD("_item_selected"),&EditorFileDialog::_item_selected); + ClassDB::bind_method(D_METHOD("_item_db_selected"),&EditorFileDialog::_item_dc_selected); + ClassDB::bind_method(D_METHOD("_dir_entered"),&EditorFileDialog::_dir_entered); + ClassDB::bind_method(D_METHOD("_file_entered"),&EditorFileDialog::_file_entered); + ClassDB::bind_method(D_METHOD("_action_pressed"),&EditorFileDialog::_action_pressed); + ClassDB::bind_method(D_METHOD("_cancel_pressed"),&EditorFileDialog::_cancel_pressed); + ClassDB::bind_method(D_METHOD("_filter_selected"),&EditorFileDialog::_filter_selected); + ClassDB::bind_method(D_METHOD("_save_confirm_pressed"),&EditorFileDialog::_save_confirm_pressed); + + ClassDB::bind_method(D_METHOD("clear_filters"),&EditorFileDialog::clear_filters); + ClassDB::bind_method(D_METHOD("add_filter","filter"),&EditorFileDialog::add_filter); + ClassDB::bind_method(D_METHOD("get_current_dir"),&EditorFileDialog::get_current_dir); + ClassDB::bind_method(D_METHOD("get_current_file"),&EditorFileDialog::get_current_file); + ClassDB::bind_method(D_METHOD("get_current_path"),&EditorFileDialog::get_current_path); + ClassDB::bind_method(D_METHOD("set_current_dir","dir"),&EditorFileDialog::set_current_dir); + ClassDB::bind_method(D_METHOD("set_current_file","file"),&EditorFileDialog::set_current_file); + ClassDB::bind_method(D_METHOD("set_current_path","path"),&EditorFileDialog::set_current_path); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&EditorFileDialog::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&EditorFileDialog::get_mode); + ClassDB::bind_method(D_METHOD("get_vbox:VBoxContainer"),&EditorFileDialog::get_vbox); + ClassDB::bind_method(D_METHOD("set_access","access"),&EditorFileDialog::set_access); + ClassDB::bind_method(D_METHOD("get_access"),&EditorFileDialog::get_access); + ClassDB::bind_method(D_METHOD("set_show_hidden_files","show"),&EditorFileDialog::set_show_hidden_files); + ClassDB::bind_method(D_METHOD("is_showing_hidden_files"),&EditorFileDialog::is_showing_hidden_files); + ClassDB::bind_method(D_METHOD("_select_drive"),&EditorFileDialog::_select_drive); + ClassDB::bind_method(D_METHOD("_make_dir"),&EditorFileDialog::_make_dir); + ClassDB::bind_method(D_METHOD("_make_dir_confirm"),&EditorFileDialog::_make_dir_confirm); + ClassDB::bind_method(D_METHOD("_update_file_list"),&EditorFileDialog::update_file_list); + ClassDB::bind_method(D_METHOD("_update_dir"),&EditorFileDialog::update_dir); + ClassDB::bind_method(D_METHOD("_thumbnail_done"),&EditorFileDialog::_thumbnail_done); + ClassDB::bind_method(D_METHOD("set_display_mode","mode"),&EditorFileDialog::set_display_mode); + ClassDB::bind_method(D_METHOD("get_display_mode"),&EditorFileDialog::get_display_mode); + ClassDB::bind_method(D_METHOD("_thumbnail_result"),&EditorFileDialog::_thumbnail_result); + ClassDB::bind_method(D_METHOD("set_disable_overwrite_warning","disable"),&EditorFileDialog::set_disable_overwrite_warning); + ClassDB::bind_method(D_METHOD("is_overwrite_warning_disabled"),&EditorFileDialog::is_overwrite_warning_disabled); + + ClassDB::bind_method(D_METHOD("_recent_selected"),&EditorFileDialog::_recent_selected); + ClassDB::bind_method(D_METHOD("_go_back"),&EditorFileDialog::_go_back); + ClassDB::bind_method(D_METHOD("_go_forward"),&EditorFileDialog::_go_forward); + ClassDB::bind_method(D_METHOD("_go_up"),&EditorFileDialog::_go_up); + + ClassDB::bind_method(D_METHOD("_favorite_toggled"),&EditorFileDialog::_favorite_toggled); + ClassDB::bind_method(D_METHOD("_favorite_selected"),&EditorFileDialog::_favorite_selected); + ClassDB::bind_method(D_METHOD("_favorite_move_up"),&EditorFileDialog::_favorite_move_up); + ClassDB::bind_method(D_METHOD("_favorite_move_down"),&EditorFileDialog::_favorite_move_down); + + ClassDB::bind_method(D_METHOD("invalidate"),&EditorFileDialog::invalidate); ADD_SIGNAL(MethodInfo("file_selected",PropertyInfo( Variant::STRING,"path"))); ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::POOL_STRING_ARRAY,"paths"))); @@ -1493,11 +1493,11 @@ EditorFileDialog::~EditorFileDialog() { void EditorLineEditFileChooser::_bind_methods() { - ClassDB::bind_method(_MD("_browse"),&EditorLineEditFileChooser::_browse); - ClassDB::bind_method(_MD("_chosen"),&EditorLineEditFileChooser::_chosen); - ClassDB::bind_method(_MD("get_button:Button"),&EditorLineEditFileChooser::get_button); - ClassDB::bind_method(_MD("get_line_edit:LineEdit"),&EditorLineEditFileChooser::get_line_edit); - ClassDB::bind_method(_MD("get_file_dialog:EditorFileDialog"),&EditorLineEditFileChooser::get_file_dialog); + ClassDB::bind_method(D_METHOD("_browse"),&EditorLineEditFileChooser::_browse); + ClassDB::bind_method(D_METHOD("_chosen"),&EditorLineEditFileChooser::_chosen); + ClassDB::bind_method(D_METHOD("get_button:Button"),&EditorLineEditFileChooser::get_button); + ClassDB::bind_method(D_METHOD("get_line_edit:LineEdit"),&EditorLineEditFileChooser::get_line_edit); + ClassDB::bind_method(D_METHOD("get_file_dialog:EditorFileDialog"),&EditorLineEditFileChooser::get_file_dialog); } diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index c7b50a3c09..b9b8345282 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -144,17 +144,17 @@ EditorFileSystemDirectory *EditorFileSystemDirectory::get_parent() { void EditorFileSystemDirectory::_bind_methods() { - ClassDB::bind_method(_MD("get_subdir_count"),&EditorFileSystemDirectory::get_subdir_count); - ClassDB::bind_method(_MD("get_subdir","idx"),&EditorFileSystemDirectory::get_subdir); - ClassDB::bind_method(_MD("get_file_count"),&EditorFileSystemDirectory::get_file_count); - ClassDB::bind_method(_MD("get_file","idx"),&EditorFileSystemDirectory::get_file); - ClassDB::bind_method(_MD("get_file_path","idx"),&EditorFileSystemDirectory::get_file_path); - ClassDB::bind_method(_MD("get_file_type","idx"),&EditorFileSystemDirectory::get_file_type); - ClassDB::bind_method(_MD("get_name"),&EditorFileSystemDirectory::get_name); - ClassDB::bind_method(_MD("get_path"),&EditorFileSystemDirectory::get_path); - ClassDB::bind_method(_MD("get_parent:EditorFileSystemDirectory"),&EditorFileSystemDirectory::get_parent); - ClassDB::bind_method(_MD("find_file_index","name"),&EditorFileSystemDirectory::find_file_index); - ClassDB::bind_method(_MD("find_dir_index","name"),&EditorFileSystemDirectory::find_dir_index); + ClassDB::bind_method(D_METHOD("get_subdir_count"),&EditorFileSystemDirectory::get_subdir_count); + ClassDB::bind_method(D_METHOD("get_subdir","idx"),&EditorFileSystemDirectory::get_subdir); + ClassDB::bind_method(D_METHOD("get_file_count"),&EditorFileSystemDirectory::get_file_count); + ClassDB::bind_method(D_METHOD("get_file","idx"),&EditorFileSystemDirectory::get_file); + ClassDB::bind_method(D_METHOD("get_file_path","idx"),&EditorFileSystemDirectory::get_file_path); + ClassDB::bind_method(D_METHOD("get_file_type","idx"),&EditorFileSystemDirectory::get_file_type); + ClassDB::bind_method(D_METHOD("get_name"),&EditorFileSystemDirectory::get_name); + ClassDB::bind_method(D_METHOD("get_path"),&EditorFileSystemDirectory::get_path); + ClassDB::bind_method(D_METHOD("get_parent:EditorFileSystemDirectory"),&EditorFileSystemDirectory::get_parent); + ClassDB::bind_method(D_METHOD("find_file_index","name"),&EditorFileSystemDirectory::find_file_index); + ClassDB::bind_method(D_METHOD("find_dir_index","name"),&EditorFileSystemDirectory::find_dir_index); } @@ -1484,14 +1484,14 @@ void EditorFileSystem::reimport_files(const Vector<String>& p_files) { void EditorFileSystem::_bind_methods() { - ClassDB::bind_method(_MD("get_filesystem:EditorFileSystemDirectory"),&EditorFileSystem::get_filesystem); - ClassDB::bind_method(_MD("is_scanning"),&EditorFileSystem::is_scanning); - ClassDB::bind_method(_MD("get_scanning_progress"),&EditorFileSystem::get_scanning_progress); - ClassDB::bind_method(_MD("scan"),&EditorFileSystem::scan); - ClassDB::bind_method(_MD("scan_sources"),&EditorFileSystem::scan_changes); - ClassDB::bind_method(_MD("update_file","path"),&EditorFileSystem::update_file); - ClassDB::bind_method(_MD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); - ClassDB::bind_method(_MD("get_file_type","path"),&EditorFileSystem::get_file_type); + ClassDB::bind_method(D_METHOD("get_filesystem:EditorFileSystemDirectory"),&EditorFileSystem::get_filesystem); + ClassDB::bind_method(D_METHOD("is_scanning"),&EditorFileSystem::is_scanning); + ClassDB::bind_method(D_METHOD("get_scanning_progress"),&EditorFileSystem::get_scanning_progress); + ClassDB::bind_method(D_METHOD("scan"),&EditorFileSystem::scan); + ClassDB::bind_method(D_METHOD("scan_sources"),&EditorFileSystem::scan_changes); + ClassDB::bind_method(D_METHOD("update_file","path"),&EditorFileSystem::update_file); + ClassDB::bind_method(D_METHOD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); + ClassDB::bind_method(D_METHOD("get_file_type","path"),&EditorFileSystem::get_file_type); ADD_SIGNAL( MethodInfo("filesystem_changed") ); ADD_SIGNAL( MethodInfo("sources_changed",PropertyInfo(Variant::BOOL,"exist")) ); diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp index 03e631cbc3..5b629b2590 100644 --- a/tools/editor/editor_help.cpp +++ b/tools/editor/editor_help.cpp @@ -297,10 +297,10 @@ void EditorHelpSearch::_notification(int p_what) { void EditorHelpSearch::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&EditorHelpSearch::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&EditorHelpSearch::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&EditorHelpSearch::_sbox_input); - ClassDB::bind_method(_MD("_update_search"),&EditorHelpSearch::_update_search); + ClassDB::bind_method(D_METHOD("_text_changed"),&EditorHelpSearch::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&EditorHelpSearch::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&EditorHelpSearch::_sbox_input); + ClassDB::bind_method(D_METHOD("_update_search"),&EditorHelpSearch::_update_search); ADD_SIGNAL(MethodInfo("go_to_help")); diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 69a004fc08..320c45776d 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -79,8 +79,8 @@ String EditorImportPlugin::_expand_source_path(const String& p_path) { void EditorImportPlugin::_bind_methods() { - ClassDB::bind_method(_MD("validate_source_path","path"),&EditorImportPlugin::_validate_source_path); - ClassDB::bind_method(_MD("expand_source_path","path"),&EditorImportPlugin::_expand_source_path); + ClassDB::bind_method(D_METHOD("validate_source_path","path"),&EditorImportPlugin::_validate_source_path); + ClassDB::bind_method(D_METHOD("expand_source_path","path"),&EditorImportPlugin::_expand_source_path); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_name")); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_visible_name")); @@ -745,7 +745,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func } break; //use default } - String image_list_md5; + String image_listD_METHOD5; { MD5_CTX ctx; @@ -758,7 +758,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func } MD5Final(&ctx); - image_list_md5=String::md5(ctx.digest); + image_listD_METHOD5=String::md5(ctx.digest); } //ok see if cached String md5; @@ -803,7 +803,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (atlas_valid) { //check md5 of list of image /names/ - if (f->get_line().strip_edges()!=image_list_md5) { + if (f->get_line().strip_edges()!=image_listD_METHOD5) { atlas_valid=false; print_line("IMAGE MD5 INVALID!"); } @@ -829,10 +829,10 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func uint64_t file_mod_time = FileAccess::get_modified_time(F->get()); if (mod_time!=file_mod_time) { - String image_md5 = slices[1]; - String file_md5 = FileAccess::get_md5(F->get()); + String imageD_METHOD5 = slices[1]; + String fileD_METHOD5 = FileAccess::getD_METHOD5(F->get()); - if (image_md5!=file_md5) { + if (imageD_METHOD5!=fileD_METHOD5) { atlas_valid=false; print_line("IMAGE INVALID "+slices[0]); break; @@ -867,7 +867,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) { - imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::get_md5(F->get())); + imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::getD_METHOD5(F->get())); } @@ -925,7 +925,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func options["shrink"]=EditorImportExport::get_singleton()->image_export_group_get_shrink(E->get()); options["image_format"]=group_format; //f->store_line(options.to_json()); - f->store_line(image_list_md5); + f->store_line(image_listD_METHOD5); } //go through all ATEX files @@ -961,8 +961,8 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (f) { //recreating deps.. String depline; - //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get()); name unneccesary by top md5 - depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get()); + //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unneccesary by top md5 + depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); depline+="::"+itos(region.pos.x)+"::"+itos(region.pos.y)+"::"+itos(region.size.x)+"::"+itos(region.size.y); depline+="::"+itos(margin.pos.x)+"::"+itos(margin.pos.y)+"::"+itos(margin.size.x)+"::"+itos(margin.size.y); f->store_line(depline); @@ -2210,49 +2210,49 @@ PoolVector<String> EditorImportExport::_get_export_platforms() { void EditorImportExport::_bind_methods() { - ClassDB::bind_method(_MD("add_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::add_import_plugin); - ClassDB::bind_method(_MD("remove_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::remove_import_plugin); - ClassDB::bind_method(_MD("get_import_plugin_count"),&EditorImportExport::get_import_plugin_count); - ClassDB::bind_method(_MD("get_import_plugin:EditorImportPlugin","idx"),&EditorImportExport::get_import_plugin); - ClassDB::bind_method(_MD("get_import_plugin_by_name:EditorImportPlugin","name"),&EditorImportExport::get_import_plugin_by_name); - - ClassDB::bind_method(_MD("add_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::add_export_plugin); - ClassDB::bind_method(_MD("remove_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::remove_export_plugin); - ClassDB::bind_method(_MD("get_export_plugin_count"),&EditorImportExport::get_export_plugin_count); - ClassDB::bind_method(_MD("get_export_plugin:EditorExportPlugin","idx"),&EditorImportExport::get_export_plugin); - - ClassDB::bind_method(_MD("set_export_file_action","file","action"),&EditorImportExport::set_export_file_action); - ClassDB::bind_method(_MD("get_export_file_action","file"),&EditorImportExport::get_export_file_action); - ClassDB::bind_method(_MD("get_export_file_list"),&EditorImportExport::_get_export_file_list); - - ClassDB::bind_method(_MD("add_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); - //ClassDB::bind_method(_MD("remove_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); - ClassDB::bind_method(_MD("get_export_platform:EditorExportPlatform","name"),&EditorImportExport::get_export_platform); - ClassDB::bind_method(_MD("get_export_platforms"),&EditorImportExport::_get_export_platforms); - - ClassDB::bind_method(_MD("set_export_filter","filter"),&EditorImportExport::set_export_filter); - ClassDB::bind_method(_MD("get_export_filter"),&EditorImportExport::get_export_filter); - - ClassDB::bind_method(_MD("set_export_custom_filter","filter"),&EditorImportExport::set_export_custom_filter); - ClassDB::bind_method(_MD("get_export_custom_filter"),&EditorImportExport::get_export_custom_filter); - - ClassDB::bind_method(_MD("set_export_custom_filter_exclude","filter_exclude"),&EditorImportExport::set_export_custom_filter_exclude); - ClassDB::bind_method(_MD("get_export_custom_filter_exclude"),&EditorImportExport::get_export_custom_filter_exclude); - - - ClassDB::bind_method(_MD("image_export_group_create"),&EditorImportExport::image_export_group_create); - ClassDB::bind_method(_MD("image_export_group_remove"),&EditorImportExport::image_export_group_remove); - ClassDB::bind_method(_MD("image_export_group_set_image_action"),&EditorImportExport::image_export_group_set_image_action); - ClassDB::bind_method(_MD("image_export_group_set_make_atlas"),&EditorImportExport::image_export_group_set_make_atlas); - ClassDB::bind_method(_MD("image_export_group_set_shrink"),&EditorImportExport::image_export_group_set_shrink); - ClassDB::bind_method(_MD("image_export_group_get_image_action"),&EditorImportExport::image_export_group_get_image_action); - ClassDB::bind_method(_MD("image_export_group_get_make_atlas"),&EditorImportExport::image_export_group_get_make_atlas); - ClassDB::bind_method(_MD("image_export_group_get_shrink"),&EditorImportExport::image_export_group_get_shrink); - ClassDB::bind_method(_MD("image_add_to_export_group"),&EditorImportExport::image_add_to_export_group); - ClassDB::bind_method(_MD("script_set_action"),&EditorImportExport::script_set_action); - ClassDB::bind_method(_MD("script_set_encryption_key"),&EditorImportExport::script_set_encryption_key); - ClassDB::bind_method(_MD("script_get_action"),&EditorImportExport::script_get_action); - ClassDB::bind_method(_MD("script_get_encryption_key"),&EditorImportExport::script_get_encryption_key); + ClassDB::bind_method(D_METHOD("add_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::add_import_plugin); + ClassDB::bind_method(D_METHOD("remove_import_plugin","plugin:EditorImportPlugin"),&EditorImportExport::remove_import_plugin); + ClassDB::bind_method(D_METHOD("get_import_plugin_count"),&EditorImportExport::get_import_plugin_count); + ClassDB::bind_method(D_METHOD("get_import_plugin:EditorImportPlugin","idx"),&EditorImportExport::get_import_plugin); + ClassDB::bind_method(D_METHOD("get_import_plugin_by_name:EditorImportPlugin","name"),&EditorImportExport::get_import_plugin_by_name); + + ClassDB::bind_method(D_METHOD("add_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::add_export_plugin); + ClassDB::bind_method(D_METHOD("remove_export_plugin","plugin:EditorExportPlugin"),&EditorImportExport::remove_export_plugin); + ClassDB::bind_method(D_METHOD("get_export_plugin_count"),&EditorImportExport::get_export_plugin_count); + ClassDB::bind_method(D_METHOD("get_export_plugin:EditorExportPlugin","idx"),&EditorImportExport::get_export_plugin); + + ClassDB::bind_method(D_METHOD("set_export_file_action","file","action"),&EditorImportExport::set_export_file_action); + ClassDB::bind_method(D_METHOD("get_export_file_action","file"),&EditorImportExport::get_export_file_action); + ClassDB::bind_method(D_METHOD("get_export_file_list"),&EditorImportExport::_get_export_file_list); + + ClassDB::bind_method(D_METHOD("add_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); + //ClassDB::bind_method(D_METHOD("remove_export_platform","platform:EditorExportplatform"),&EditorImportExport::add_export_platform); + ClassDB::bind_method(D_METHOD("get_export_platform:EditorExportPlatform","name"),&EditorImportExport::get_export_platform); + ClassDB::bind_method(D_METHOD("get_export_platforms"),&EditorImportExport::_get_export_platforms); + + ClassDB::bind_method(D_METHOD("set_export_filter","filter"),&EditorImportExport::set_export_filter); + ClassDB::bind_method(D_METHOD("get_export_filter"),&EditorImportExport::get_export_filter); + + ClassDB::bind_method(D_METHOD("set_export_custom_filter","filter"),&EditorImportExport::set_export_custom_filter); + ClassDB::bind_method(D_METHOD("get_export_custom_filter"),&EditorImportExport::get_export_custom_filter); + + ClassDB::bind_method(D_METHOD("set_export_custom_filter_exclude","filter_exclude"),&EditorImportExport::set_export_custom_filter_exclude); + ClassDB::bind_method(D_METHOD("get_export_custom_filter_exclude"),&EditorImportExport::get_export_custom_filter_exclude); + + + ClassDB::bind_method(D_METHOD("image_export_group_create"),&EditorImportExport::image_export_group_create); + ClassDB::bind_method(D_METHOD("image_export_group_remove"),&EditorImportExport::image_export_group_remove); + ClassDB::bind_method(D_METHOD("image_export_group_set_image_action"),&EditorImportExport::image_export_group_set_image_action); + ClassDB::bind_method(D_METHOD("image_export_group_set_make_atlas"),&EditorImportExport::image_export_group_set_make_atlas); + ClassDB::bind_method(D_METHOD("image_export_group_set_shrink"),&EditorImportExport::image_export_group_set_shrink); + ClassDB::bind_method(D_METHOD("image_export_group_get_image_action"),&EditorImportExport::image_export_group_get_image_action); + ClassDB::bind_method(D_METHOD("image_export_group_get_make_atlas"),&EditorImportExport::image_export_group_get_make_atlas); + ClassDB::bind_method(D_METHOD("image_export_group_get_shrink"),&EditorImportExport::image_export_group_get_shrink); + ClassDB::bind_method(D_METHOD("image_add_to_export_group"),&EditorImportExport::image_add_to_export_group); + ClassDB::bind_method(D_METHOD("script_set_action"),&EditorImportExport::script_set_action); + ClassDB::bind_method(D_METHOD("script_set_encryption_key"),&EditorImportExport::script_set_encryption_key); + ClassDB::bind_method(D_METHOD("script_get_action"),&EditorImportExport::script_get_action); + ClassDB::bind_method(D_METHOD("script_get_encryption_key"),&EditorImportExport::script_get_encryption_key); diff --git a/tools/editor/editor_log.cpp b/tools/editor/editor_log.cpp index 6b6a1b9988..850d9273f8 100644 --- a/tools/editor/editor_log.cpp +++ b/tools/editor/editor_log.cpp @@ -167,9 +167,9 @@ void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) { void EditorLog::_bind_methods() { - ClassDB::bind_method(_MD("_clear_request"),&EditorLog::_clear_request ); + ClassDB::bind_method(D_METHOD("_clear_request"),&EditorLog::_clear_request ); ClassDB::bind_method("_override_logger_styles",&EditorLog::_override_logger_styles ); - //ClassDB::bind_method(_MD("_dragged"),&EditorLog::_dragged ); + //ClassDB::bind_method(D_METHOD("_dragged"),&EditorLog::_dragged ); ADD_SIGNAL( MethodInfo("clear_request")); } diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 9fac8dfbeb..da9138e5d9 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5098,13 +5098,13 @@ void EditorNode::_bind_methods() { -// ClassDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin); - //ClassDB::bind_method(_MD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin); - ClassDB::bind_method(_MD("get_gui_base"), &EditorNode::get_gui_base); - ClassDB::bind_method(_MD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch); +// ClassDB::bind_method(D_METHOD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin); + //ClassDB::bind_method(D_METHOD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin); + ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base); + ClassDB::bind_method(D_METHOD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch); - ClassDB::bind_method(_MD("_open_imported"), &EditorNode::_open_imported); - ClassDB::bind_method(_MD("_inherit_imported"), &EditorNode::_inherit_imported); + ClassDB::bind_method(D_METHOD("_open_imported"), &EditorNode::_open_imported); + ClassDB::bind_method(D_METHOD("_inherit_imported"), &EditorNode::_inherit_imported); ADD_SIGNAL( MethodInfo("play_pressed") ); ADD_SIGNAL( MethodInfo("pause_pressed") ); diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp index 2f44b5558c..2a0efa5be9 100644 --- a/tools/editor/editor_plugin.cpp +++ b/tools/editor/editor_plugin.cpp @@ -345,33 +345,33 @@ EditorFileSystem *EditorPlugin::get_resource_file_system() { void EditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("add_control_to_container","container","control:Control"),&EditorPlugin::add_control_to_container); - ClassDB::bind_method(_MD("add_control_to_bottom_panel:ToolButton","control:Control","title"),&EditorPlugin::add_control_to_bottom_panel); - ClassDB::bind_method(_MD("add_control_to_dock","slot","control:Control"),&EditorPlugin::add_control_to_dock); - ClassDB::bind_method(_MD("remove_control_from_docks","control:Control"),&EditorPlugin::remove_control_from_docks); - ClassDB::bind_method(_MD("remove_control_from_bottom_panel","control:Control"),&EditorPlugin::remove_control_from_bottom_panel); - //ClassDB::bind_method(_MD("add_tool_menu_item", "name", "handler", "callback", "ud"),&EditorPlugin::add_tool_menu_item,DEFVAL(Variant())); - ClassDB::bind_method(_MD("add_tool_submenu_item", "name", "submenu:PopupMenu"),&EditorPlugin::add_tool_submenu_item); - //ClassDB::bind_method(_MD("remove_tool_menu_item", "name"),&EditorPlugin::remove_tool_menu_item); - ClassDB::bind_method(_MD("add_custom_type","type","base","script:Script","icon:Texture"),&EditorPlugin::add_custom_type); - ClassDB::bind_method(_MD("remove_custom_type","type"),&EditorPlugin::remove_custom_type); - ClassDB::bind_method(_MD("get_editor_viewport:Control"), &EditorPlugin::get_editor_viewport); - - ClassDB::bind_method(_MD("get_resource_previewer:EditorResourcePreview"),&EditorPlugin::get_resource_previewer); - ClassDB::bind_method(_MD("get_resource_filesystem:EditorFileSystem"),&EditorPlugin::get_resource_file_system); - - ClassDB::bind_method(_MD("inspect_object","object","for_property"),&EditorPlugin::inspect_object,DEFVAL(String())); - ClassDB::bind_method(_MD("update_canvas"),&EditorPlugin::update_canvas); - - ClassDB::bind_method(_MD("make_bottom_panel_item_visible","item:Control"), &EditorPlugin::make_bottom_panel_item_visible); - ClassDB::bind_method(_MD("hide_bottom_panel"), &EditorPlugin::hide_bottom_panel); - - ClassDB::bind_method(_MD("get_base_control:Control"),&EditorPlugin::get_base_control); - ClassDB::bind_method(_MD("get_undo_redo:UndoRedo"),&EditorPlugin::_get_undo_redo); - ClassDB::bind_method(_MD("get_selection:EditorSelection"),&EditorPlugin::get_selection); - ClassDB::bind_method(_MD("get_editor_settings:EditorSettings"),&EditorPlugin::get_editor_settings); - ClassDB::bind_method(_MD("queue_save_layout"),&EditorPlugin::queue_save_layout); - ClassDB::bind_method(_MD("edit_resource"),&EditorPlugin::edit_resource); + ClassDB::bind_method(D_METHOD("add_control_to_container","container","control:Control"),&EditorPlugin::add_control_to_container); + ClassDB::bind_method(D_METHOD("add_control_to_bottom_panel:ToolButton","control:Control","title"),&EditorPlugin::add_control_to_bottom_panel); + ClassDB::bind_method(D_METHOD("add_control_to_dock","slot","control:Control"),&EditorPlugin::add_control_to_dock); + ClassDB::bind_method(D_METHOD("remove_control_from_docks","control:Control"),&EditorPlugin::remove_control_from_docks); + ClassDB::bind_method(D_METHOD("remove_control_from_bottom_panel","control:Control"),&EditorPlugin::remove_control_from_bottom_panel); + //ClassDB::bind_method(D_METHOD("add_tool_menu_item", "name", "handler", "callback", "ud"),&EditorPlugin::add_tool_menu_item,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("add_tool_submenu_item", "name", "submenu:PopupMenu"),&EditorPlugin::add_tool_submenu_item); + //ClassDB::bind_method(D_METHOD("remove_tool_menu_item", "name"),&EditorPlugin::remove_tool_menu_item); + ClassDB::bind_method(D_METHOD("add_custom_type","type","base","script:Script","icon:Texture"),&EditorPlugin::add_custom_type); + ClassDB::bind_method(D_METHOD("remove_custom_type","type"),&EditorPlugin::remove_custom_type); + ClassDB::bind_method(D_METHOD("get_editor_viewport:Control"), &EditorPlugin::get_editor_viewport); + + ClassDB::bind_method(D_METHOD("get_resource_previewer:EditorResourcePreview"),&EditorPlugin::get_resource_previewer); + ClassDB::bind_method(D_METHOD("get_resource_filesystem:EditorFileSystem"),&EditorPlugin::get_resource_file_system); + + ClassDB::bind_method(D_METHOD("inspect_object","object","for_property"),&EditorPlugin::inspect_object,DEFVAL(String())); + ClassDB::bind_method(D_METHOD("update_canvas"),&EditorPlugin::update_canvas); + + ClassDB::bind_method(D_METHOD("make_bottom_panel_item_visible","item:Control"), &EditorPlugin::make_bottom_panel_item_visible); + ClassDB::bind_method(D_METHOD("hide_bottom_panel"), &EditorPlugin::hide_bottom_panel); + + ClassDB::bind_method(D_METHOD("get_base_control:Control"),&EditorPlugin::get_base_control); + ClassDB::bind_method(D_METHOD("get_undo_redo:UndoRedo"),&EditorPlugin::_get_undo_redo); + ClassDB::bind_method(D_METHOD("get_selection:EditorSelection"),&EditorPlugin::get_selection); + ClassDB::bind_method(D_METHOD("get_editor_settings:EditorSettings"),&EditorPlugin::get_editor_settings); + ClassDB::bind_method(D_METHOD("queue_save_layout"),&EditorPlugin::queue_save_layout); + ClassDB::bind_method(D_METHOD("edit_resource"),&EditorPlugin::edit_resource); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"forward_canvas_gui_input",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::INPUT_EVENT,"event"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo("forward_draw_over_canvas",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::OBJECT,"canvas:Control"))); diff --git a/tools/editor/editor_profiler.cpp b/tools/editor/editor_profiler.cpp index 94ec059ea7..d9a4174246 100644 --- a/tools/editor/editor_profiler.cpp +++ b/tools/editor/editor_profiler.cpp @@ -646,16 +646,16 @@ void EditorProfiler::_combo_changed(int) { void EditorProfiler::_bind_methods() { - ClassDB::bind_method(_MD("_update_frame"),&EditorProfiler::_update_frame); - ClassDB::bind_method(_MD("_update_plot"),&EditorProfiler::_update_plot); - ClassDB::bind_method(_MD("_activate_pressed"),&EditorProfiler::_activate_pressed); - ClassDB::bind_method(_MD("_graph_tex_draw"),&EditorProfiler::_graph_tex_draw); - ClassDB::bind_method(_MD("_graph_tex_input"),&EditorProfiler::_graph_tex_input); - ClassDB::bind_method(_MD("_graph_tex_mouse_exit"),&EditorProfiler::_graph_tex_mouse_exit); - ClassDB::bind_method(_MD("_cursor_metric_changed"),&EditorProfiler::_cursor_metric_changed); - ClassDB::bind_method(_MD("_combo_changed"),&EditorProfiler::_combo_changed); - - ClassDB::bind_method(_MD("_item_edited"),&EditorProfiler::_item_edited); + ClassDB::bind_method(D_METHOD("_update_frame"),&EditorProfiler::_update_frame); + ClassDB::bind_method(D_METHOD("_update_plot"),&EditorProfiler::_update_plot); + ClassDB::bind_method(D_METHOD("_activate_pressed"),&EditorProfiler::_activate_pressed); + ClassDB::bind_method(D_METHOD("_graph_tex_draw"),&EditorProfiler::_graph_tex_draw); + ClassDB::bind_method(D_METHOD("_graph_tex_input"),&EditorProfiler::_graph_tex_input); + ClassDB::bind_method(D_METHOD("_graph_tex_mouse_exit"),&EditorProfiler::_graph_tex_mouse_exit); + ClassDB::bind_method(D_METHOD("_cursor_metric_changed"),&EditorProfiler::_cursor_metric_changed); + ClassDB::bind_method(D_METHOD("_combo_changed"),&EditorProfiler::_combo_changed); + + ClassDB::bind_method(D_METHOD("_item_edited"),&EditorProfiler::_item_edited); ADD_SIGNAL( MethodInfo("enable_profiling",PropertyInfo(Variant::BOOL,"enable"))); ADD_SIGNAL( MethodInfo("break_request")); diff --git a/tools/editor/editor_resource_preview.cpp b/tools/editor/editor_resource_preview.cpp index b4c459a493..b6cf24e527 100644 --- a/tools/editor/editor_resource_preview.cpp +++ b/tools/editor/editor_resource_preview.cpp @@ -379,11 +379,11 @@ void EditorResourcePreview::_bind_methods() { ClassDB::bind_method("_preview_ready",&EditorResourcePreview::_preview_ready); - ClassDB::bind_method(_MD("queue_resource_preview","path","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_resource_preview); - ClassDB::bind_method(_MD("queue_edited_resource_preview","resource:Resource","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_edited_resource_preview); - ClassDB::bind_method(_MD("add_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::add_preview_generator); - ClassDB::bind_method(_MD("remove_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::remove_preview_generator); - ClassDB::bind_method(_MD("check_for_invalidation","path"),&EditorResourcePreview::check_for_invalidation); + ClassDB::bind_method(D_METHOD("queue_resource_preview","path","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_resource_preview); + ClassDB::bind_method(D_METHOD("queue_edited_resource_preview","resource:Resource","receiver","receiver_func","userdata:Variant"),&EditorResourcePreview::queue_edited_resource_preview); + ClassDB::bind_method(D_METHOD("add_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::add_preview_generator); + ClassDB::bind_method(D_METHOD("remove_preview_generator","generator:EditorResourcePreviewGenerator"),&EditorResourcePreview::remove_preview_generator); + ClassDB::bind_method(D_METHOD("check_for_invalidation","path"),&EditorResourcePreview::check_for_invalidation); ADD_SIGNAL(MethodInfo("preview_invalidated",PropertyInfo(Variant::STRING,"path"))); diff --git a/tools/editor/editor_run_script.cpp b/tools/editor/editor_run_script.cpp index 6a980019e4..77dc7bd4bf 100644 --- a/tools/editor/editor_run_script.cpp +++ b/tools/editor/editor_run_script.cpp @@ -83,8 +83,8 @@ void EditorScript::set_editor(EditorNode *p_editor) { void EditorScript::_bind_methods() { - ClassDB::bind_method(_MD("add_root_node","node"),&EditorScript::add_root_node); - ClassDB::bind_method(_MD("get_scene"),&EditorScript::get_scene); + ClassDB::bind_method(D_METHOD("add_root_node","node"),&EditorScript::add_root_node); + ClassDB::bind_method(D_METHOD("get_scene"),&EditorScript::get_scene); BIND_VMETHOD( MethodInfo("_run") ); diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 6d9f1bd979..2e32cfe38b 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -1058,17 +1058,17 @@ void EditorSettings::set_project_metadata(const String& p_section, const String& void EditorSettings::_bind_methods() { - ClassDB::bind_method(_MD("erase","property"),&EditorSettings::erase); - ClassDB::bind_method(_MD("get_settings_path"),&EditorSettings::get_settings_path); - ClassDB::bind_method(_MD("get_project_settings_path"),&EditorSettings::get_project_settings_path); + ClassDB::bind_method(D_METHOD("erase","property"),&EditorSettings::erase); + ClassDB::bind_method(D_METHOD("get_settings_path"),&EditorSettings::get_settings_path); + ClassDB::bind_method(D_METHOD("get_project_settings_path"),&EditorSettings::get_project_settings_path); - ClassDB::bind_method(_MD("add_property_info", "info"),&EditorSettings::_add_property_info_bind); + ClassDB::bind_method(D_METHOD("add_property_info", "info"),&EditorSettings::_add_property_info_bind); - ClassDB::bind_method(_MD("set_favorite_dirs","dirs"),&EditorSettings::set_favorite_dirs); - ClassDB::bind_method(_MD("get_favorite_dirs"),&EditorSettings::get_favorite_dirs); + ClassDB::bind_method(D_METHOD("set_favorite_dirs","dirs"),&EditorSettings::set_favorite_dirs); + ClassDB::bind_method(D_METHOD("get_favorite_dirs"),&EditorSettings::get_favorite_dirs); - ClassDB::bind_method(_MD("set_recent_dirs","dirs"),&EditorSettings::set_recent_dirs); - ClassDB::bind_method(_MD("get_recent_dirs"),&EditorSettings::get_recent_dirs); + ClassDB::bind_method(D_METHOD("set_recent_dirs","dirs"),&EditorSettings::set_recent_dirs); + ClassDB::bind_method(D_METHOD("get_recent_dirs"),&EditorSettings::get_recent_dirs); ADD_SIGNAL(MethodInfo("settings_changed")); diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp index 094cf049b3..917560b540 100644 --- a/tools/editor/editor_sub_scene.cpp +++ b/tools/editor/editor_sub_scene.cpp @@ -187,9 +187,9 @@ void EditorSubScene::clear() { void EditorSubScene::_bind_methods() { - ClassDB::bind_method(_MD("_path_selected"),&EditorSubScene::_path_selected); - ClassDB::bind_method(_MD("_path_changed"),&EditorSubScene::_path_changed); - ClassDB::bind_method(_MD("_path_browse"),&EditorSubScene::_path_browse); + ClassDB::bind_method(D_METHOD("_path_selected"),&EditorSubScene::_path_selected); + ClassDB::bind_method(D_METHOD("_path_changed"),&EditorSubScene::_path_changed); + ClassDB::bind_method(D_METHOD("_path_browse"),&EditorSubScene::_path_browse); ADD_SIGNAL( MethodInfo("subscene_selected")); } diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp index 08b8307eb4..c6c1a02f3f 100644 --- a/tools/editor/filesystem_dock.cpp +++ b/tools/editor/filesystem_dock.cpp @@ -1641,37 +1641,37 @@ void FileSystemDock::_file_selected() { void FileSystemDock::_bind_methods() { - ClassDB::bind_method(_MD("_update_tree"),&FileSystemDock::_update_tree); - ClassDB::bind_method(_MD("_rescan"),&FileSystemDock::_rescan); - ClassDB::bind_method(_MD("_favorites_pressed"),&FileSystemDock::_favorites_pressed); - //ClassDB::bind_method(_MD("_instance_pressed"),&ScenesDock::_instance_pressed); - ClassDB::bind_method(_MD("_open_pressed"),&FileSystemDock::_open_pressed); - ClassDB::bind_method(_MD("_dir_rmb_pressed"),&FileSystemDock::_dir_rmb_pressed); - - ClassDB::bind_method(_MD("_thumbnail_done"),&FileSystemDock::_thumbnail_done); - ClassDB::bind_method(_MD("_select_file"), &FileSystemDock::_select_file); - ClassDB::bind_method(_MD("_go_to_tree"), &FileSystemDock::_go_to_tree); - ClassDB::bind_method(_MD("_go_to_dir"), &FileSystemDock::_go_to_dir); - ClassDB::bind_method(_MD("_change_file_display"), &FileSystemDock::_change_file_display); - ClassDB::bind_method(_MD("_fw_history"), &FileSystemDock::_fw_history); - ClassDB::bind_method(_MD("_bw_history"), &FileSystemDock::_bw_history); - ClassDB::bind_method(_MD("_fs_changed"), &FileSystemDock::_fs_changed); - ClassDB::bind_method(_MD("_dir_selected"), &FileSystemDock::_dir_selected); - ClassDB::bind_method(_MD("_file_option"), &FileSystemDock::_file_option); - ClassDB::bind_method(_MD("_folder_option"), &FileSystemDock::_folder_option); - ClassDB::bind_method(_MD("_move_operation"), &FileSystemDock::_move_operation); - ClassDB::bind_method(_MD("_rename_operation"), &FileSystemDock::_rename_operation); - - ClassDB::bind_method(_MD("_search_changed"), &FileSystemDock::_search_changed); - - ClassDB::bind_method(_MD("get_drag_data_fw"), &FileSystemDock::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &FileSystemDock::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &FileSystemDock::drop_data_fw); - ClassDB::bind_method(_MD("_files_list_rmb_select"),&FileSystemDock::_files_list_rmb_select); - - ClassDB::bind_method(_MD("_preview_invalidated"),&FileSystemDock::_preview_invalidated); - ClassDB::bind_method(_MD("_file_selected"),&FileSystemDock::_file_selected); - ClassDB::bind_method(_MD("_file_multi_selected"),&FileSystemDock::_file_multi_selected); + ClassDB::bind_method(D_METHOD("_update_tree"),&FileSystemDock::_update_tree); + ClassDB::bind_method(D_METHOD("_rescan"),&FileSystemDock::_rescan); + ClassDB::bind_method(D_METHOD("_favorites_pressed"),&FileSystemDock::_favorites_pressed); + //ClassDB::bind_method(D_METHOD("_instance_pressed"),&ScenesDock::_instance_pressed); + ClassDB::bind_method(D_METHOD("_open_pressed"),&FileSystemDock::_open_pressed); + ClassDB::bind_method(D_METHOD("_dir_rmb_pressed"),&FileSystemDock::_dir_rmb_pressed); + + ClassDB::bind_method(D_METHOD("_thumbnail_done"),&FileSystemDock::_thumbnail_done); + ClassDB::bind_method(D_METHOD("_select_file"), &FileSystemDock::_select_file); + ClassDB::bind_method(D_METHOD("_go_to_tree"), &FileSystemDock::_go_to_tree); + ClassDB::bind_method(D_METHOD("_go_to_dir"), &FileSystemDock::_go_to_dir); + ClassDB::bind_method(D_METHOD("_change_file_display"), &FileSystemDock::_change_file_display); + ClassDB::bind_method(D_METHOD("_fw_history"), &FileSystemDock::_fw_history); + ClassDB::bind_method(D_METHOD("_bw_history"), &FileSystemDock::_bw_history); + ClassDB::bind_method(D_METHOD("_fs_changed"), &FileSystemDock::_fs_changed); + ClassDB::bind_method(D_METHOD("_dir_selected"), &FileSystemDock::_dir_selected); + ClassDB::bind_method(D_METHOD("_file_option"), &FileSystemDock::_file_option); + ClassDB::bind_method(D_METHOD("_folder_option"), &FileSystemDock::_folder_option); + ClassDB::bind_method(D_METHOD("_move_operation"), &FileSystemDock::_move_operation); + ClassDB::bind_method(D_METHOD("_rename_operation"), &FileSystemDock::_rename_operation); + + ClassDB::bind_method(D_METHOD("_search_changed"), &FileSystemDock::_search_changed); + + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &FileSystemDock::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &FileSystemDock::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &FileSystemDock::drop_data_fw); + ClassDB::bind_method(D_METHOD("_files_list_rmb_select"),&FileSystemDock::_files_list_rmb_select); + + ClassDB::bind_method(D_METHOD("_preview_invalidated"),&FileSystemDock::_preview_invalidated); + ClassDB::bind_method(D_METHOD("_file_selected"),&FileSystemDock::_file_selected); + ClassDB::bind_method(D_METHOD("_file_multi_selected"),&FileSystemDock::_file_multi_selected); ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::POOL_STRING_ARRAY, "files"))); diff --git a/tools/editor/import_dock.cpp b/tools/editor/import_dock.cpp index b1bd698239..bf61ca4df0 100644 --- a/tools/editor/import_dock.cpp +++ b/tools/editor/import_dock.cpp @@ -285,8 +285,8 @@ void ImportDock::_reimport() { void ImportDock::_bind_methods() { - ClassDB::bind_method(_MD("_reimport"),&ImportDock::_reimport); - ClassDB::bind_method(_MD("_preset_selected"),&ImportDock::_preset_selected); + ClassDB::bind_method(D_METHOD("_reimport"),&ImportDock::_reimport); + ClassDB::bind_method(D_METHOD("_preset_selected"),&ImportDock::_preset_selected); } ImportDock::ImportDock() { diff --git a/tools/editor/node_dock.cpp b/tools/editor/node_dock.cpp index 3d906cf960..fed3d2efb4 100644 --- a/tools/editor/node_dock.cpp +++ b/tools/editor/node_dock.cpp @@ -49,8 +49,8 @@ void NodeDock::show_connections(){ void NodeDock::_bind_methods() { - ClassDB::bind_method(_MD("show_groups"),&NodeDock::show_groups); - ClassDB::bind_method(_MD("show_connections"),&NodeDock::show_connections); + ClassDB::bind_method(D_METHOD("show_groups"),&NodeDock::show_groups); + ClassDB::bind_method(D_METHOD("show_connections"),&NodeDock::show_connections); } void NodeDock::_notification(int p_what) { diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index f10526fb77..7d6598bd4b 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -1258,43 +1258,43 @@ void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) { void AnimationPlayerEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&AnimationPlayerEditor::_gui_input); - ClassDB::bind_method(_MD("_node_removed"),&AnimationPlayerEditor::_node_removed); - ClassDB::bind_method(_MD("_play_pressed"),&AnimationPlayerEditor::_play_pressed); - ClassDB::bind_method(_MD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed); - ClassDB::bind_method(_MD("_play_bw_pressed"),&AnimationPlayerEditor::_play_bw_pressed); - ClassDB::bind_method(_MD("_play_bw_from_pressed"),&AnimationPlayerEditor::_play_bw_from_pressed); - ClassDB::bind_method(_MD("_stop_pressed"),&AnimationPlayerEditor::_stop_pressed); - ClassDB::bind_method(_MD("_autoplay_pressed"),&AnimationPlayerEditor::_autoplay_pressed); - ClassDB::bind_method(_MD("_pause_pressed"),&AnimationPlayerEditor::_pause_pressed); - ClassDB::bind_method(_MD("_animation_selected"),&AnimationPlayerEditor::_animation_selected); - ClassDB::bind_method(_MD("_animation_name_edited"),&AnimationPlayerEditor::_animation_name_edited); - ClassDB::bind_method(_MD("_animation_new"),&AnimationPlayerEditor::_animation_new); - ClassDB::bind_method(_MD("_animation_rename"),&AnimationPlayerEditor::_animation_rename); - ClassDB::bind_method(_MD("_animation_load"),&AnimationPlayerEditor::_animation_load); - ClassDB::bind_method(_MD("_animation_remove"),&AnimationPlayerEditor::_animation_remove); - ClassDB::bind_method(_MD("_animation_remove_confirmed"),&AnimationPlayerEditor::_animation_remove_confirmed); - ClassDB::bind_method(_MD("_animation_blend"),&AnimationPlayerEditor::_animation_blend); - ClassDB::bind_method(_MD("_animation_edit"),&AnimationPlayerEditor::_animation_edit); - ClassDB::bind_method(_MD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit); - ClassDB::bind_method(_MD("_dialog_action"),&AnimationPlayerEditor::_dialog_action); - ClassDB::bind_method(_MD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed,DEFVAL(true)); - ClassDB::bind_method(_MD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed); - ClassDB::bind_method(_MD("_blend_edited"),&AnimationPlayerEditor::_blend_edited); - //ClassDB::bind_method(_MD("_seek_frame_changed"),&AnimationPlayerEditor::_seek_frame_changed); - ClassDB::bind_method(_MD("_scale_changed"),&AnimationPlayerEditor::_scale_changed); - //ClassDB::bind_method(_MD("_editor_store_all"),&AnimationPlayerEditor::_editor_store_all); - ///jectTypeDB::bind_method(_MD("_editor_load_all"),&AnimationPlayerEditor::_editor_load_all); - ClassDB::bind_method(_MD("_list_changed"),&AnimationPlayerEditor::_list_changed); - ClassDB::bind_method(_MD("_animation_key_editor_seek"),&AnimationPlayerEditor::_animation_key_editor_seek); - ClassDB::bind_method(_MD("_animation_key_editor_anim_len_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_len_changed); - ClassDB::bind_method(_MD("_animation_key_editor_anim_step_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_step_changed); - ClassDB::bind_method(_MD("_hide_anim_editors"),&AnimationPlayerEditor::_hide_anim_editors); - ClassDB::bind_method(_MD("_animation_duplicate"),&AnimationPlayerEditor::_animation_duplicate); - ClassDB::bind_method(_MD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed); - ClassDB::bind_method(_MD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input); - ClassDB::bind_method(_MD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu); - ClassDB::bind_method(_MD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu); + ClassDB::bind_method(D_METHOD("_gui_input"),&AnimationPlayerEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_node_removed"),&AnimationPlayerEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_play_pressed"),&AnimationPlayerEditor::_play_pressed); + ClassDB::bind_method(D_METHOD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_pressed"),&AnimationPlayerEditor::_play_bw_pressed); + ClassDB::bind_method(D_METHOD("_play_bw_from_pressed"),&AnimationPlayerEditor::_play_bw_from_pressed); + ClassDB::bind_method(D_METHOD("_stop_pressed"),&AnimationPlayerEditor::_stop_pressed); + ClassDB::bind_method(D_METHOD("_autoplay_pressed"),&AnimationPlayerEditor::_autoplay_pressed); + ClassDB::bind_method(D_METHOD("_pause_pressed"),&AnimationPlayerEditor::_pause_pressed); + ClassDB::bind_method(D_METHOD("_animation_selected"),&AnimationPlayerEditor::_animation_selected); + ClassDB::bind_method(D_METHOD("_animation_name_edited"),&AnimationPlayerEditor::_animation_name_edited); + ClassDB::bind_method(D_METHOD("_animation_new"),&AnimationPlayerEditor::_animation_new); + ClassDB::bind_method(D_METHOD("_animation_rename"),&AnimationPlayerEditor::_animation_rename); + ClassDB::bind_method(D_METHOD("_animation_load"),&AnimationPlayerEditor::_animation_load); + ClassDB::bind_method(D_METHOD("_animation_remove"),&AnimationPlayerEditor::_animation_remove); + ClassDB::bind_method(D_METHOD("_animation_remove_confirmed"),&AnimationPlayerEditor::_animation_remove_confirmed); + ClassDB::bind_method(D_METHOD("_animation_blend"),&AnimationPlayerEditor::_animation_blend); + ClassDB::bind_method(D_METHOD("_animation_edit"),&AnimationPlayerEditor::_animation_edit); + ClassDB::bind_method(D_METHOD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit); + ClassDB::bind_method(D_METHOD("_dialog_action"),&AnimationPlayerEditor::_dialog_action); + ClassDB::bind_method(D_METHOD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed); + ClassDB::bind_method(D_METHOD("_blend_edited"),&AnimationPlayerEditor::_blend_edited); + //ClassDB::bind_method(D_METHOD("_seek_frame_changed"),&AnimationPlayerEditor::_seek_frame_changed); + ClassDB::bind_method(D_METHOD("_scale_changed"),&AnimationPlayerEditor::_scale_changed); + //ClassDB::bind_method(D_METHOD("_editor_store_all"),&AnimationPlayerEditor::_editor_store_all); + //ClassDB::bind_method(D_METHOD("_editor_load_all"),&AnimationPlayerEditor::_editor_load_all); + ClassDB::bind_method(D_METHOD("_list_changed"),&AnimationPlayerEditor::_list_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_seek"),&AnimationPlayerEditor::_animation_key_editor_seek); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_len_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_len_changed); + ClassDB::bind_method(D_METHOD("_animation_key_editor_anim_step_changed"),&AnimationPlayerEditor::_animation_key_editor_anim_step_changed); + ClassDB::bind_method(D_METHOD("_hide_anim_editors"),&AnimationPlayerEditor::_hide_anim_editors); + ClassDB::bind_method(D_METHOD("_animation_duplicate"),&AnimationPlayerEditor::_animation_duplicate); + ClassDB::bind_method(D_METHOD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu); + ClassDB::bind_method(D_METHOD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu); diff --git a/tools/editor/plugins/camera_editor_plugin.cpp b/tools/editor/plugins/camera_editor_plugin.cpp index 1e0ec2b4a0..7073acd2c0 100644 --- a/tools/editor/plugins/camera_editor_plugin.cpp +++ b/tools/editor/plugins/camera_editor_plugin.cpp @@ -62,7 +62,7 @@ void CameraEditor::_pressed() { void CameraEditor::_bind_methods() { - ClassDB::bind_method(_MD("_pressed"),&CameraEditor::_pressed); + ClassDB::bind_method(D_METHOD("_pressed"),&CameraEditor::_pressed); } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index bec7956b8c..0830556ac1 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -3212,8 +3212,8 @@ void CanvasItemEditor::_bind_methods() { ClassDB::bind_method("_viewport_draw",&CanvasItemEditor::_viewport_draw); ClassDB::bind_method("_viewport_gui_input",&CanvasItemEditor::_viewport_gui_input); ClassDB::bind_method("_snap_changed",&CanvasItemEditor::_snap_changed); - ClassDB::bind_method(_MD("_selection_result_pressed"),&CanvasItemEditor::_selection_result_pressed); - ClassDB::bind_method(_MD("_selection_menu_hide"),&CanvasItemEditor::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("_selection_result_pressed"),&CanvasItemEditor::_selection_result_pressed); + ClassDB::bind_method(D_METHOD("_selection_menu_hide"),&CanvasItemEditor::_selection_menu_hide); ADD_SIGNAL( MethodInfo("item_lock_status_changed") ); ADD_SIGNAL( MethodInfo("item_group_status_changed") ); @@ -3984,9 +3984,9 @@ void CanvasItemEditorViewport::_notification(int p_what) { } void CanvasItemEditorViewport::_bind_methods() { - ClassDB::bind_method(_MD("_on_select_type"),&CanvasItemEditorViewport::_on_select_type); - ClassDB::bind_method(_MD("_on_change_type"),&CanvasItemEditorViewport::_on_change_type); - ClassDB::bind_method(_MD("_on_mouse_exit"),&CanvasItemEditorViewport::_on_mouse_exit); + ClassDB::bind_method(D_METHOD("_on_select_type"),&CanvasItemEditorViewport::_on_select_type); + ClassDB::bind_method(D_METHOD("_on_change_type"),&CanvasItemEditorViewport::_on_change_type); + ClassDB::bind_method(D_METHOD("_on_mouse_exit"),&CanvasItemEditorViewport::_on_mouse_exit); } CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor* p_canvas) { diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 263d96ecdf..43d3ad5774 100644 --- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -398,9 +398,9 @@ void CollisionPolygon2DEditor::edit(Node *p_collision_polygon) { void CollisionPolygon2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&CollisionPolygon2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&CollisionPolygon2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&CollisionPolygon2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_menu_option"),&CollisionPolygon2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&CollisionPolygon2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&CollisionPolygon2DEditor::_node_removed); } diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_editor_plugin.cpp index c5cd15cf72..406c12b00a 100644 --- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_editor_plugin.cpp @@ -530,9 +530,9 @@ void CollisionPolygonEditor::edit(Node *p_collision_polygon) { void CollisionPolygonEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&CollisionPolygonEditor::_menu_option); - ClassDB::bind_method(_MD("_polygon_draw"),&CollisionPolygonEditor::_polygon_draw); - ClassDB::bind_method(_MD("_node_removed"),&CollisionPolygonEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_menu_option"),&CollisionPolygonEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_polygon_draw"),&CollisionPolygonEditor::_polygon_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&CollisionPolygonEditor::_node_removed); } diff --git a/tools/editor/plugins/color_ramp_editor_plugin.cpp b/tools/editor/plugins/color_ramp_editor_plugin.cpp index 9509eb1b03..82674fabb8 100644 --- a/tools/editor/plugins/color_ramp_editor_plugin.cpp +++ b/tools/editor/plugins/color_ramp_editor_plugin.cpp @@ -107,6 +107,6 @@ ColorRampEditorPlugin::~ColorRampEditorPlugin(){ } void ColorRampEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("ramp_changed"),&ColorRampEditorPlugin::_ramp_changed); - ClassDB::bind_method(_MD("undo_redo_color_ramp","offsets","colors"),&ColorRampEditorPlugin::_undo_redo_color_ramp); + ClassDB::bind_method(D_METHOD("ramp_changed"),&ColorRampEditorPlugin::_ramp_changed); + ClassDB::bind_method(D_METHOD("undo_redo_color_ramp","offsets","colors"),&ColorRampEditorPlugin::_undo_redo_color_ramp); } diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp index f6a51632a0..e3b02e851f 100644 --- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -427,10 +427,10 @@ void LightOccluder2DEditor::_create_poly() { void LightOccluder2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&LightOccluder2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&LightOccluder2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&LightOccluder2DEditor::_node_removed); - ClassDB::bind_method(_MD("_create_poly"),&LightOccluder2DEditor::_create_poly); + ClassDB::bind_method(D_METHOD("_menu_option"),&LightOccluder2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&LightOccluder2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&LightOccluder2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_create_poly"),&LightOccluder2DEditor::_create_poly); } diff --git a/tools/editor/plugins/line_2d_editor_plugin.cpp b/tools/editor/plugins/line_2d_editor_plugin.cpp index 054a2c62e0..5ecbcaac45 100644 --- a/tools/editor/plugins/line_2d_editor_plugin.cpp +++ b/tools/editor/plugins/line_2d_editor_plugin.cpp @@ -185,9 +185,9 @@ void Line2DEditor::edit(Node *p_line2d) { } void Line2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_canvas_draw"), &Line2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_visibility_changed"), &Line2DEditor::_node_visibility_changed); - ClassDB::bind_method(_MD("_mode_selected"), &Line2DEditor::_mode_selected); + ClassDB::bind_method(D_METHOD("_canvas_draw"), &Line2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_visibility_changed"), &Line2DEditor::_node_visibility_changed); + ClassDB::bind_method(D_METHOD("_mode_selected"), &Line2DEditor::_mode_selected); } void Line2DEditor::_mode_selected(int p_mode) { diff --git a/tools/editor/plugins/material_editor_plugin.cpp b/tools/editor/plugins/material_editor_plugin.cpp index 1aababa91b..cdf7c70d39 100644 --- a/tools/editor/plugins/material_editor_plugin.cpp +++ b/tools/editor/plugins/material_editor_plugin.cpp @@ -122,8 +122,8 @@ void MaterialEditor::_button_pressed(Node* p_button) { void MaterialEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&MaterialEditor::_gui_input); - ClassDB::bind_method(_MD("_button_pressed"),&MaterialEditor::_button_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&MaterialEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_button_pressed"),&MaterialEditor::_button_pressed); } diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp index 49cb02c9d8..93f417247e 100644 --- a/tools/editor/plugins/mesh_editor_plugin.cpp +++ b/tools/editor/plugins/mesh_editor_plugin.cpp @@ -136,8 +136,8 @@ void MeshEditor::_button_pressed(Node* p_button) { void MeshEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&MeshEditor::_gui_input); - ClassDB::bind_method(_MD("_button_pressed"),&MeshEditor::_button_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&MeshEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_button_pressed"),&MeshEditor::_button_pressed); } diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp index e70f2be9fa..93a35cf8b0 100644 --- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -477,10 +477,10 @@ void NavigationPolygonEditor::edit(Node *p_collision_polygon) { void NavigationPolygonEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&NavigationPolygonEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&NavigationPolygonEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_removed"),&NavigationPolygonEditor::_node_removed); - ClassDB::bind_method(_MD("_create_nav"),&NavigationPolygonEditor::_create_nav); + ClassDB::bind_method(D_METHOD("_menu_option"),&NavigationPolygonEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&NavigationPolygonEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_removed"),&NavigationPolygonEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_create_nav"),&NavigationPolygonEditor::_create_nav); } diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp index 20b1b9d1ca..1efdbe9e68 100644 --- a/tools/editor/plugins/particles_2d_editor_plugin.cpp +++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp @@ -152,8 +152,8 @@ void Particles2DEditorPlugin::_notification(int p_what) { void Particles2DEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("_menu_callback"),&Particles2DEditorPlugin::_menu_callback); - ClassDB::bind_method(_MD("_file_selected"),&Particles2DEditorPlugin::_file_selected); + ClassDB::bind_method(D_METHOD("_menu_callback"),&Particles2DEditorPlugin::_menu_callback); + ClassDB::bind_method(D_METHOD("_file_selected"),&Particles2DEditorPlugin::_file_selected); } diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp index 8e475e56f7..88dded72ae 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.cpp +++ b/tools/editor/plugins/path_2d_editor_plugin.cpp @@ -550,10 +550,10 @@ void Path2DEditor::edit(Node *p_path2d) { void Path2DEditor::_bind_methods() { - //ClassDB::bind_method(_MD("_menu_option"),&Path2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&Path2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_node_visibility_changed"),&Path2DEditor::_node_visibility_changed); - ClassDB::bind_method(_MD("_mode_selected"),&Path2DEditor::_mode_selected); + //ClassDB::bind_method(D_METHOD("_menu_option"),&Path2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&Path2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_node_visibility_changed"),&Path2DEditor::_node_visibility_changed); + ClassDB::bind_method(D_METHOD("_mode_selected"),&Path2DEditor::_mode_selected); } void Path2DEditor::_mode_selected(int p_mode) { diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp index 2e148d6486..a3df39fdaa 100644 --- a/tools/editor/plugins/path_editor_plugin.cpp +++ b/tools/editor/plugins/path_editor_plugin.cpp @@ -517,8 +517,8 @@ void PathEditorPlugin::_notification(int p_what) { void PathEditorPlugin::_bind_methods() { - ClassDB::bind_method(_MD("_mode_changed"),&PathEditorPlugin::_mode_changed); - ClassDB::bind_method(_MD("_close_curve"),&PathEditorPlugin::_close_curve); + ClassDB::bind_method(D_METHOD("_mode_changed"),&PathEditorPlugin::_mode_changed); + ClassDB::bind_method(D_METHOD("_close_curve"),&PathEditorPlugin::_close_curve); } PathEditorPlugin* PathEditorPlugin::singleton=NULL; diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index 7958dce75a..3fdf9a4da6 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -775,19 +775,19 @@ void Polygon2DEditor::edit(Node *p_collision_polygon) { void Polygon2DEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&Polygon2DEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&Polygon2DEditor::_canvas_draw); - ClassDB::bind_method(_MD("_uv_mode"),&Polygon2DEditor::_uv_mode); - ClassDB::bind_method(_MD("_uv_draw"),&Polygon2DEditor::_uv_draw); - ClassDB::bind_method(_MD("_uv_input"),&Polygon2DEditor::_uv_input); - ClassDB::bind_method(_MD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed); - ClassDB::bind_method(_MD("_node_removed"),&Polygon2DEditor::_node_removed); - ClassDB::bind_method(_MD("_set_use_snap"),&Polygon2DEditor::_set_use_snap); - ClassDB::bind_method(_MD("_set_show_grid"),&Polygon2DEditor::_set_show_grid); - ClassDB::bind_method(_MD("_set_snap_off_x"),&Polygon2DEditor::_set_snap_off_x); - ClassDB::bind_method(_MD("_set_snap_off_y"),&Polygon2DEditor::_set_snap_off_y); - ClassDB::bind_method(_MD("_set_snap_step_x"),&Polygon2DEditor::_set_snap_step_x); - ClassDB::bind_method(_MD("_set_snap_step_y"),&Polygon2DEditor::_set_snap_step_y); + ClassDB::bind_method(D_METHOD("_menu_option"),&Polygon2DEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&Polygon2DEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_uv_mode"),&Polygon2DEditor::_uv_mode); + ClassDB::bind_method(D_METHOD("_uv_draw"),&Polygon2DEditor::_uv_draw); + ClassDB::bind_method(D_METHOD("_uv_input"),&Polygon2DEditor::_uv_input); + ClassDB::bind_method(D_METHOD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed); + ClassDB::bind_method(D_METHOD("_node_removed"),&Polygon2DEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_set_use_snap"),&Polygon2DEditor::_set_use_snap); + ClassDB::bind_method(D_METHOD("_set_show_grid"),&Polygon2DEditor::_set_show_grid); + ClassDB::bind_method(D_METHOD("_set_snap_off_x"),&Polygon2DEditor::_set_snap_off_x); + ClassDB::bind_method(D_METHOD("_set_snap_off_y"),&Polygon2DEditor::_set_snap_off_y); + ClassDB::bind_method(D_METHOD("_set_snap_step_x"),&Polygon2DEditor::_set_snap_step_x); + ClassDB::bind_method(D_METHOD("_set_snap_step_y"),&Polygon2DEditor::_set_snap_step_y); } diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp index cb139cbe24..cfdfbdc1c6 100644 --- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp @@ -380,19 +380,19 @@ void ResourcePreloaderEditor::drop_data_fw(const Point2& p_point,const Variant& void ResourcePreloaderEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&ResourcePreloaderEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&ResourcePreloaderEditor::_load_pressed); - ClassDB::bind_method(_MD("_item_edited"),&ResourcePreloaderEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&ResourcePreloaderEditor::_delete_pressed); - ClassDB::bind_method(_MD("_paste_pressed"),&ResourcePreloaderEditor::_paste_pressed); - ClassDB::bind_method(_MD("_delete_confirm_pressed"),&ResourcePreloaderEditor::_delete_confirm_pressed); - ClassDB::bind_method(_MD("_files_load_request"),&ResourcePreloaderEditor::_files_load_request); - ClassDB::bind_method(_MD("_update_library"),&ResourcePreloaderEditor::_update_library); - - - ClassDB::bind_method(_MD("get_drag_data_fw"), &ResourcePreloaderEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &ResourcePreloaderEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &ResourcePreloaderEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("_gui_input"),&ResourcePreloaderEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&ResourcePreloaderEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&ResourcePreloaderEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&ResourcePreloaderEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_paste_pressed"),&ResourcePreloaderEditor::_paste_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm_pressed"),&ResourcePreloaderEditor::_delete_confirm_pressed); + ClassDB::bind_method(D_METHOD("_files_load_request"),&ResourcePreloaderEditor::_files_load_request); + ClassDB::bind_method(D_METHOD("_update_library"),&ResourcePreloaderEditor::_update_library); + + + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &ResourcePreloaderEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &ResourcePreloaderEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &ResourcePreloaderEditor::drop_data_fw); } diff --git a/tools/editor/plugins/rich_text_editor_plugin.cpp b/tools/editor/plugins/rich_text_editor_plugin.cpp index 8629d6ec8f..797ee8e8ea 100644 --- a/tools/editor/plugins/rich_text_editor_plugin.cpp +++ b/tools/editor/plugins/rich_text_editor_plugin.cpp @@ -90,8 +90,8 @@ void RichTextEditor::_menu_option(int p_option) { void RichTextEditor::_bind_methods() { - ClassDB::bind_method(_MD("_menu_option"),&RichTextEditor::_menu_option); - ClassDB::bind_method(_MD("_file_selected"),&RichTextEditor::_file_selected); + ClassDB::bind_method(D_METHOD("_menu_option"),&RichTextEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_file_selected"),&RichTextEditor::_file_selected); } diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp index c333ba017f..cb60134c2c 100644 --- a/tools/editor/plugins/sample_editor_plugin.cpp +++ b/tools/editor/plugins/sample_editor_plugin.cpp @@ -349,9 +349,9 @@ void SampleEditor::edit(Ref<Sample> p_sample) { void SampleEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SampleEditor::_gui_input); - ClassDB::bind_method(_MD("_play_pressed"),&SampleEditor::_play_pressed); - ClassDB::bind_method(_MD("_stop_pressed"),&SampleEditor::_stop_pressed); + ClassDB::bind_method(D_METHOD("_gui_input"),&SampleEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_play_pressed"),&SampleEditor::_play_pressed); + ClassDB::bind_method(D_METHOD("_stop_pressed"),&SampleEditor::_stop_pressed); } diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp index 116c5d11b6..d0ff33c881 100644 --- a/tools/editor/plugins/sample_library_editor_plugin.cpp +++ b/tools/editor/plugins/sample_library_editor_plugin.cpp @@ -413,17 +413,17 @@ void SampleLibraryEditor::drop_data_fw(const Point2& p_point,const Variant& p_da void SampleLibraryEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SampleLibraryEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&SampleLibraryEditor::_load_pressed); - ClassDB::bind_method(_MD("_item_edited"),&SampleLibraryEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&SampleLibraryEditor::_delete_pressed); - ClassDB::bind_method(_MD("_file_load_request"),&SampleLibraryEditor::_file_load_request); - ClassDB::bind_method(_MD("_update_library"),&SampleLibraryEditor::_update_library); - ClassDB::bind_method(_MD("_button_pressed"),&SampleLibraryEditor::_button_pressed); - - ClassDB::bind_method(_MD("get_drag_data_fw"), &SampleLibraryEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SampleLibraryEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SampleLibraryEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("_gui_input"),&SampleLibraryEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&SampleLibraryEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&SampleLibraryEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&SampleLibraryEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_file_load_request"),&SampleLibraryEditor::_file_load_request); + ClassDB::bind_method(D_METHOD("_update_library"),&SampleLibraryEditor::_update_library); + ClassDB::bind_method(D_METHOD("_button_pressed"),&SampleLibraryEditor::_button_pressed); + + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SampleLibraryEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SampleLibraryEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SampleLibraryEditor::drop_data_fw); } diff --git a/tools/editor/plugins/sample_player_editor_plugin.cpp b/tools/editor/plugins/sample_player_editor_plugin.cpp index dd6450bfe7..7e2683dedf 100644 --- a/tools/editor/plugins/sample_player_editor_plugin.cpp +++ b/tools/editor/plugins/sample_player_editor_plugin.cpp @@ -54,8 +54,8 @@ void SamplePlayerEditor::_node_removed(Node *p_node) { void SamplePlayerEditor::_bind_methods() { - ClassDB::bind_method(_MD("_play"),&SamplePlayerEditor::_play); - ClassDB::bind_method(_MD("_stop"),&SamplePlayerEditor::_stop); + ClassDB::bind_method(D_METHOD("_play"),&SamplePlayerEditor::_play); + ClassDB::bind_method(D_METHOD("_stop"),&SamplePlayerEditor::_stop); } diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 5f97fce4e7..0a880de35b 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -241,9 +241,9 @@ void ScriptEditorQuickOpen::_notification(int p_what) { void ScriptEditorQuickOpen::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&ScriptEditorQuickOpen::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&ScriptEditorQuickOpen::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input); + ClassDB::bind_method(D_METHOD("_text_changed"),&ScriptEditorQuickOpen::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&ScriptEditorQuickOpen::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input); ADD_SIGNAL(MethodInfo("goto_line",PropertyInfo(Variant::INT,"line"))); diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index d86fec11d8..dac63b4a9f 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -296,8 +296,8 @@ Vector<Color> GraphColorRampEdit::get_colors() const{ void GraphColorRampEdit::_bind_methods(){ - ClassDB::bind_method(_MD("_gui_input"),&GraphColorRampEdit::_gui_input); - ClassDB::bind_method(_MD("_color_changed"),&GraphColorRampEdit::_color_changed); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphColorRampEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_color_changed"),&GraphColorRampEdit::_color_changed); ADD_SIGNAL(MethodInfo("ramp_changed")); } @@ -657,7 +657,7 @@ Vector<Vector2> GraphCurveMapEdit::get_points() const { void GraphCurveMapEdit::_bind_methods(){ - ClassDB::bind_method(_MD("_gui_input"),&GraphCurveMapEdit::_gui_input); + ClassDB::bind_method(D_METHOD("_gui_input"),&GraphCurveMapEdit::_gui_input); ADD_SIGNAL(MethodInfo("curve_changed")); } @@ -2732,9 +2732,9 @@ void ShaderGraphView::_bind_methods() { ClassDB::bind_method("_color_ramp_changed",&ShaderGraphView::_color_ramp_changed); ClassDB::bind_method("_curve_changed",&ShaderGraphView::_curve_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &ShaderGraphView::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &ShaderGraphView::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &ShaderGraphView::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &ShaderGraphView::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &ShaderGraphView::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &ShaderGraphView::drop_data_fw); ClassDB::bind_method("_sg_updated",&ShaderGraphView::_sg_updated); } diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 3ba1a2cbdc..5e425ef3c4 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2221,15 +2221,15 @@ Dictionary SpatialEditorViewport::get_state() const { void SpatialEditorViewport::_bind_methods(){ - ClassDB::bind_method(_MD("_draw"),&SpatialEditorViewport::_draw); - ClassDB::bind_method(_MD("_smouseenter"),&SpatialEditorViewport::_smouseenter); - ClassDB::bind_method(_MD("_sinput"),&SpatialEditorViewport::_sinput); - ClassDB::bind_method(_MD("_menu_option"),&SpatialEditorViewport::_menu_option); - ClassDB::bind_method(_MD("_toggle_camera_preview"),&SpatialEditorViewport::_toggle_camera_preview); - ClassDB::bind_method(_MD("_preview_exited_scene"),&SpatialEditorViewport::_preview_exited_scene); - ClassDB::bind_method(_MD("update_transform_gizmo_view"),&SpatialEditorViewport::update_transform_gizmo_view); - ClassDB::bind_method(_MD("_selection_result_pressed"),&SpatialEditorViewport::_selection_result_pressed); - ClassDB::bind_method(_MD("_selection_menu_hide"),&SpatialEditorViewport::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("_draw"),&SpatialEditorViewport::_draw); + ClassDB::bind_method(D_METHOD("_smouseenter"),&SpatialEditorViewport::_smouseenter); + ClassDB::bind_method(D_METHOD("_sinput"),&SpatialEditorViewport::_sinput); + ClassDB::bind_method(D_METHOD("_menu_option"),&SpatialEditorViewport::_menu_option); + ClassDB::bind_method(D_METHOD("_toggle_camera_preview"),&SpatialEditorViewport::_toggle_camera_preview); + ClassDB::bind_method(D_METHOD("_preview_exited_scene"),&SpatialEditorViewport::_preview_exited_scene); + ClassDB::bind_method(D_METHOD("update_transform_gizmo_view"),&SpatialEditorViewport::update_transform_gizmo_view); + ClassDB::bind_method(D_METHOD("_selection_result_pressed"),&SpatialEditorViewport::_selection_result_pressed); + ClassDB::bind_method(D_METHOD("_selection_menu_hide"),&SpatialEditorViewport::_selection_menu_hide); ADD_SIGNAL( MethodInfo("toggle_maximize_view", PropertyInfo(Variant::OBJECT, "viewport")) ); } diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp index 095b059836..48808d9e04 100644 --- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp @@ -754,27 +754,27 @@ void SpriteFramesEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat void SpriteFramesEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&SpriteFramesEditor::_gui_input); - ClassDB::bind_method(_MD("_load_pressed"),&SpriteFramesEditor::_load_pressed); - ClassDB::bind_method(_MD("_empty_pressed"),&SpriteFramesEditor::_empty_pressed); - ClassDB::bind_method(_MD("_empty2_pressed"),&SpriteFramesEditor::_empty2_pressed); - ClassDB::bind_method(_MD("_item_edited"),&SpriteFramesEditor::_item_edited); - ClassDB::bind_method(_MD("_delete_pressed"),&SpriteFramesEditor::_delete_pressed); - ClassDB::bind_method(_MD("_paste_pressed"),&SpriteFramesEditor::_paste_pressed); - ClassDB::bind_method(_MD("_delete_confirm_pressed"),&SpriteFramesEditor::_delete_confirm_pressed); - ClassDB::bind_method(_MD("_file_load_request","files","atpos"),&SpriteFramesEditor::_file_load_request,DEFVAL(-1)); - ClassDB::bind_method(_MD("_update_library","skipsel"),&SpriteFramesEditor::_update_library,DEFVAL(false)); - ClassDB::bind_method(_MD("_up_pressed"),&SpriteFramesEditor::_up_pressed); - ClassDB::bind_method(_MD("_down_pressed"),&SpriteFramesEditor::_down_pressed); - ClassDB::bind_method(_MD("_animation_select"),&SpriteFramesEditor::_animation_select); - ClassDB::bind_method(_MD("_animation_name_edited"),&SpriteFramesEditor::_animation_name_edited); - ClassDB::bind_method(_MD("_animation_add"),&SpriteFramesEditor::_animation_add); - ClassDB::bind_method(_MD("_animation_remove"),&SpriteFramesEditor::_animation_remove); - ClassDB::bind_method(_MD("_animation_loop_changed"),&SpriteFramesEditor::_animation_loop_changed); - ClassDB::bind_method(_MD("_animation_fps_changed"),&SpriteFramesEditor::_animation_fps_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &SpriteFramesEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SpriteFramesEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SpriteFramesEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("_gui_input"),&SpriteFramesEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_load_pressed"),&SpriteFramesEditor::_load_pressed); + ClassDB::bind_method(D_METHOD("_empty_pressed"),&SpriteFramesEditor::_empty_pressed); + ClassDB::bind_method(D_METHOD("_empty2_pressed"),&SpriteFramesEditor::_empty2_pressed); + ClassDB::bind_method(D_METHOD("_item_edited"),&SpriteFramesEditor::_item_edited); + ClassDB::bind_method(D_METHOD("_delete_pressed"),&SpriteFramesEditor::_delete_pressed); + ClassDB::bind_method(D_METHOD("_paste_pressed"),&SpriteFramesEditor::_paste_pressed); + ClassDB::bind_method(D_METHOD("_delete_confirm_pressed"),&SpriteFramesEditor::_delete_confirm_pressed); + ClassDB::bind_method(D_METHOD("_file_load_request","files","atpos"),&SpriteFramesEditor::_file_load_request,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("_update_library","skipsel"),&SpriteFramesEditor::_update_library,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("_up_pressed"),&SpriteFramesEditor::_up_pressed); + ClassDB::bind_method(D_METHOD("_down_pressed"),&SpriteFramesEditor::_down_pressed); + ClassDB::bind_method(D_METHOD("_animation_select"),&SpriteFramesEditor::_animation_select); + ClassDB::bind_method(D_METHOD("_animation_name_edited"),&SpriteFramesEditor::_animation_name_edited); + ClassDB::bind_method(D_METHOD("_animation_add"),&SpriteFramesEditor::_animation_add); + ClassDB::bind_method(D_METHOD("_animation_remove"),&SpriteFramesEditor::_animation_remove); + ClassDB::bind_method(D_METHOD("_animation_loop_changed"),&SpriteFramesEditor::_animation_loop_changed); + ClassDB::bind_method(D_METHOD("_animation_fps_changed"),&SpriteFramesEditor::_animation_fps_changed); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SpriteFramesEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SpriteFramesEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SpriteFramesEditor::drop_data_fw); } diff --git a/tools/editor/plugins/stream_editor_plugin.cpp b/tools/editor/plugins/stream_editor_plugin.cpp index 991c29b6db..449f6f610e 100644 --- a/tools/editor/plugins/stream_editor_plugin.cpp +++ b/tools/editor/plugins/stream_editor_plugin.cpp @@ -59,8 +59,8 @@ void StreamEditor::_stop() { void StreamEditor::_bind_methods() { - ClassDB::bind_method(_MD("_play"),&StreamEditor::_play); - ClassDB::bind_method(_MD("_stop"),&StreamEditor::_stop); + ClassDB::bind_method(D_METHOD("_play"),&StreamEditor::_play); + ClassDB::bind_method(D_METHOD("_stop"),&StreamEditor::_stop); } diff --git a/tools/editor/plugins/texture_editor_plugin.cpp b/tools/editor/plugins/texture_editor_plugin.cpp index 82cba7ac0e..1bfc05e2a7 100644 --- a/tools/editor/plugins/texture_editor_plugin.cpp +++ b/tools/editor/plugins/texture_editor_plugin.cpp @@ -112,7 +112,7 @@ void TextureEditor::edit(Ref<Texture> p_texture) { void TextureEditor::_bind_methods() { - ClassDB::bind_method(_MD("_gui_input"),&TextureEditor::_gui_input); + ClassDB::bind_method(D_METHOD("_gui_input"),&TextureEditor::_gui_input); } diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index 9b0ca0a482..bffca6b81e 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -614,21 +614,21 @@ void TextureRegionEditor::_node_removed(Object *p_obj) void TextureRegionEditor::_bind_methods() { - ClassDB::bind_method(_MD("_edit_region"),&TextureRegionEditor::_edit_region); - ClassDB::bind_method(_MD("_region_draw"),&TextureRegionEditor::_region_draw); - ClassDB::bind_method(_MD("_region_input"),&TextureRegionEditor::_region_input); - ClassDB::bind_method(_MD("_scroll_changed"),&TextureRegionEditor::_scroll_changed); - ClassDB::bind_method(_MD("_node_removed"),&TextureRegionEditor::_node_removed); - ClassDB::bind_method(_MD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode); - ClassDB::bind_method(_MD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x); - ClassDB::bind_method(_MD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y); - ClassDB::bind_method(_MD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x); - ClassDB::bind_method(_MD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y); - ClassDB::bind_method(_MD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x); - ClassDB::bind_method(_MD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y); - ClassDB::bind_method(_MD("_zoom_in"),&TextureRegionEditor::_zoom_in); - ClassDB::bind_method(_MD("_zoom_reset"),&TextureRegionEditor::_zoom_reset); - ClassDB::bind_method(_MD("_zoom_out"),&TextureRegionEditor::_zoom_out); + ClassDB::bind_method(D_METHOD("_edit_region"),&TextureRegionEditor::_edit_region); + ClassDB::bind_method(D_METHOD("_region_draw"),&TextureRegionEditor::_region_draw); + ClassDB::bind_method(D_METHOD("_region_input"),&TextureRegionEditor::_region_input); + ClassDB::bind_method(D_METHOD("_scroll_changed"),&TextureRegionEditor::_scroll_changed); + ClassDB::bind_method(D_METHOD("_node_removed"),&TextureRegionEditor::_node_removed); + ClassDB::bind_method(D_METHOD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode); + ClassDB::bind_method(D_METHOD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x); + ClassDB::bind_method(D_METHOD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y); + ClassDB::bind_method(D_METHOD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x); + ClassDB::bind_method(D_METHOD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y); + ClassDB::bind_method(D_METHOD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x); + ClassDB::bind_method(D_METHOD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y); + ClassDB::bind_method(D_METHOD("_zoom_in"),&TextureRegionEditor::_zoom_in); + ClassDB::bind_method(D_METHOD("_zoom_reset"),&TextureRegionEditor::_zoom_reset); + ClassDB::bind_method(D_METHOD("_zoom_out"),&TextureRegionEditor::_zoom_out); } void TextureRegionEditor::edit(Object *p_obj) diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 7c232f0c32..16b354c8b1 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -1344,20 +1344,20 @@ void TileMapEditor::_icon_size_changed(float p_value) { void TileMapEditor::_bind_methods() { - ClassDB::bind_method(_MD("_text_entered"),&TileMapEditor::_text_entered); - ClassDB::bind_method(_MD("_text_changed"),&TileMapEditor::_text_changed); - ClassDB::bind_method(_MD("_sbox_input"),&TileMapEditor::_sbox_input); - ClassDB::bind_method(_MD("_menu_option"),&TileMapEditor::_menu_option); - ClassDB::bind_method(_MD("_canvas_draw"),&TileMapEditor::_canvas_draw); - ClassDB::bind_method(_MD("_canvas_mouse_enter"),&TileMapEditor::_canvas_mouse_enter); - ClassDB::bind_method(_MD("_canvas_mouse_exit"),&TileMapEditor::_canvas_mouse_exit); - ClassDB::bind_method(_MD("_tileset_settings_changed"),&TileMapEditor::_tileset_settings_changed); - ClassDB::bind_method(_MD("_update_transform_buttons"),&TileMapEditor::_update_transform_buttons); - - ClassDB::bind_method(_MD("_fill_points"),&TileMapEditor::_fill_points); - ClassDB::bind_method(_MD("_erase_points"),&TileMapEditor::_erase_points); - - ClassDB::bind_method(_MD("_icon_size_changed"), &TileMapEditor::_icon_size_changed); + ClassDB::bind_method(D_METHOD("_text_entered"),&TileMapEditor::_text_entered); + ClassDB::bind_method(D_METHOD("_text_changed"),&TileMapEditor::_text_changed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&TileMapEditor::_sbox_input); + ClassDB::bind_method(D_METHOD("_menu_option"),&TileMapEditor::_menu_option); + ClassDB::bind_method(D_METHOD("_canvas_draw"),&TileMapEditor::_canvas_draw); + ClassDB::bind_method(D_METHOD("_canvas_mouse_enter"),&TileMapEditor::_canvas_mouse_enter); + ClassDB::bind_method(D_METHOD("_canvas_mouse_exit"),&TileMapEditor::_canvas_mouse_exit); + ClassDB::bind_method(D_METHOD("_tileset_settings_changed"),&TileMapEditor::_tileset_settings_changed); + ClassDB::bind_method(D_METHOD("_update_transform_buttons"),&TileMapEditor::_update_transform_buttons); + + ClassDB::bind_method(D_METHOD("_fill_points"),&TileMapEditor::_fill_points); + ClassDB::bind_method(D_METHOD("_erase_points"),&TileMapEditor::_erase_points); + + ClassDB::bind_method(D_METHOD("_icon_size_changed"), &TileMapEditor::_icon_size_changed); } TileMapEditor::CellOp TileMapEditor::_get_op_from_cell(const Point2i& p_pos) diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 2fa62df5bc..c760e45025 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -1290,44 +1290,44 @@ void ProjectExportDialog::_image_filter_changed(String) { void ProjectExportDialog::_bind_methods() { - ClassDB::bind_method(_MD("_rescan"),&ProjectExportDialog::_rescan); - ClassDB::bind_method(_MD("_tree_changed"),&ProjectExportDialog::_tree_changed); - ClassDB::bind_method(_MD("_scan_finished"),&ProjectExportDialog::_scan_finished); - ClassDB::bind_method(_MD("_platform_selected"),&ProjectExportDialog::_platform_selected); - ClassDB::bind_method(_MD("_prop_edited"),&ProjectExportDialog::_prop_edited); - ClassDB::bind_method(_MD("_export_mode_changed"),&ProjectExportDialog::_export_mode_changed); - ClassDB::bind_method(_MD("_filters_edited"),&ProjectExportDialog::_filters_edited); - ClassDB::bind_method(_MD("_filters_exclude_edited"),&ProjectExportDialog::_filters_exclude_edited); - ClassDB::bind_method(_MD("_export_action"),&ProjectExportDialog::_export_action); - ClassDB::bind_method(_MD("_export_action_pck"),&ProjectExportDialog::_export_action_pck); - ClassDB::bind_method(_MD("_quality_edited"),&ProjectExportDialog::_quality_edited); - ClassDB::bind_method(_MD("_shrink_edited"),&ProjectExportDialog::_shrink_edited); - ClassDB::bind_method(_MD("_image_export_edited"),&ProjectExportDialog::_image_export_edited); - ClassDB::bind_method(_MD("_format_toggled"),&ProjectExportDialog::_format_toggled); - ClassDB::bind_method(_MD("_group_changed"),&ProjectExportDialog::_group_changed); - ClassDB::bind_method(_MD("_group_add"),&ProjectExportDialog::_group_add); - ClassDB::bind_method(_MD("_group_del"),&ProjectExportDialog::_group_del); - ClassDB::bind_method(_MD("_group_selected"),&ProjectExportDialog::_group_selected); - ClassDB::bind_method(_MD("_update_group"),&ProjectExportDialog::_update_group); - ClassDB::bind_method(_MD("_update_group_list"),&ProjectExportDialog::_update_group_list); - ClassDB::bind_method(_MD("_select_group"),&ProjectExportDialog::_select_group); - ClassDB::bind_method(_MD("_update_group_tree"),&ProjectExportDialog::_update_group_tree); - ClassDB::bind_method(_MD("_group_item_edited"),&ProjectExportDialog::_group_item_edited); - ClassDB::bind_method(_MD("_save_export_cfg"),&ProjectExportDialog::_save_export_cfg); - ClassDB::bind_method(_MD("_image_filter_changed"),&ProjectExportDialog::_image_filter_changed); - ClassDB::bind_method(_MD("_group_atlas_preview"),&ProjectExportDialog::_group_atlas_preview); - ClassDB::bind_method(_MD("_group_select_all"),&ProjectExportDialog::_group_select_all); - ClassDB::bind_method(_MD("_group_select_none"),&ProjectExportDialog::_group_select_none); - ClassDB::bind_method(_MD("_script_edited"),&ProjectExportDialog::_script_edited); - ClassDB::bind_method(_MD("_update_script"),&ProjectExportDialog::_update_script); - ClassDB::bind_method(_MD("_sample_convert_edited"),&ProjectExportDialog::_sample_convert_edited); - - - ClassDB::bind_method(_MD("export_platform"),&ProjectExportDialog::export_platform); - ClassDB::bind_method(_MD("_create_android_keystore"),&ProjectExportDialog::_create_android_keystore); - ClassDB::bind_method(_MD("_check_keystore_path"),&ProjectExportDialog::_check_keystore_path); - ClassDB::bind_method(_MD("_keystore_dir_selected"),&ProjectExportDialog::_keystore_dir_selected); - ClassDB::bind_method(_MD("_keystore_created"),&ProjectExportDialog::_keystore_created); + ClassDB::bind_method(D_METHOD("_rescan"),&ProjectExportDialog::_rescan); + ClassDB::bind_method(D_METHOD("_tree_changed"),&ProjectExportDialog::_tree_changed); + ClassDB::bind_method(D_METHOD("_scan_finished"),&ProjectExportDialog::_scan_finished); + ClassDB::bind_method(D_METHOD("_platform_selected"),&ProjectExportDialog::_platform_selected); + ClassDB::bind_method(D_METHOD("_prop_edited"),&ProjectExportDialog::_prop_edited); + ClassDB::bind_method(D_METHOD("_export_mode_changed"),&ProjectExportDialog::_export_mode_changed); + ClassDB::bind_method(D_METHOD("_filters_edited"),&ProjectExportDialog::_filters_edited); + ClassDB::bind_method(D_METHOD("_filters_exclude_edited"),&ProjectExportDialog::_filters_exclude_edited); + ClassDB::bind_method(D_METHOD("_export_action"),&ProjectExportDialog::_export_action); + ClassDB::bind_method(D_METHOD("_export_action_pck"),&ProjectExportDialog::_export_action_pck); + ClassDB::bind_method(D_METHOD("_quality_edited"),&ProjectExportDialog::_quality_edited); + ClassDB::bind_method(D_METHOD("_shrink_edited"),&ProjectExportDialog::_shrink_edited); + ClassDB::bind_method(D_METHOD("_image_export_edited"),&ProjectExportDialog::_image_export_edited); + ClassDB::bind_method(D_METHOD("_format_toggled"),&ProjectExportDialog::_format_toggled); + ClassDB::bind_method(D_METHOD("_group_changed"),&ProjectExportDialog::_group_changed); + ClassDB::bind_method(D_METHOD("_group_add"),&ProjectExportDialog::_group_add); + ClassDB::bind_method(D_METHOD("_group_del"),&ProjectExportDialog::_group_del); + ClassDB::bind_method(D_METHOD("_group_selected"),&ProjectExportDialog::_group_selected); + ClassDB::bind_method(D_METHOD("_update_group"),&ProjectExportDialog::_update_group); + ClassDB::bind_method(D_METHOD("_update_group_list"),&ProjectExportDialog::_update_group_list); + ClassDB::bind_method(D_METHOD("_select_group"),&ProjectExportDialog::_select_group); + ClassDB::bind_method(D_METHOD("_update_group_tree"),&ProjectExportDialog::_update_group_tree); + ClassDB::bind_method(D_METHOD("_group_item_edited"),&ProjectExportDialog::_group_item_edited); + ClassDB::bind_method(D_METHOD("_save_export_cfg"),&ProjectExportDialog::_save_export_cfg); + ClassDB::bind_method(D_METHOD("_image_filter_changed"),&ProjectExportDialog::_image_filter_changed); + ClassDB::bind_method(D_METHOD("_group_atlas_preview"),&ProjectExportDialog::_group_atlas_preview); + ClassDB::bind_method(D_METHOD("_group_select_all"),&ProjectExportDialog::_group_select_all); + ClassDB::bind_method(D_METHOD("_group_select_none"),&ProjectExportDialog::_group_select_none); + ClassDB::bind_method(D_METHOD("_script_edited"),&ProjectExportDialog::_script_edited); + ClassDB::bind_method(D_METHOD("_update_script"),&ProjectExportDialog::_update_script); + ClassDB::bind_method(D_METHOD("_sample_convert_edited"),&ProjectExportDialog::_sample_convert_edited); + + + ClassDB::bind_method(D_METHOD("export_platform"),&ProjectExportDialog::export_platform); + ClassDB::bind_method(D_METHOD("_create_android_keystore"),&ProjectExportDialog::_create_android_keystore); + ClassDB::bind_method(D_METHOD("_check_keystore_path"),&ProjectExportDialog::_check_keystore_path); + ClassDB::bind_method(D_METHOD("_keystore_dir_selected"),&ProjectExportDialog::_keystore_dir_selected); + ClassDB::bind_method(D_METHOD("_keystore_created"),&ProjectExportDialog::_keystore_created); //ADD_SIGNAL(MethodInfo("instance")); diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index af73414ab0..34b2d3e82c 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -1200,7 +1200,7 @@ void ProjectManager::_bind_methods() { ClassDB::bind_method("_favorite_pressed",&ProjectManager::_favorite_pressed); ClassDB::bind_method("_install_project",&ProjectManager::_install_project); ClassDB::bind_method("_files_dropped",&ProjectManager::_files_dropped); - ClassDB::bind_method(_MD("_scan_multiple_folders", "files"),&ProjectManager::_scan_multiple_folders); + ClassDB::bind_method(D_METHOD("_scan_multiple_folders", "files"),&ProjectManager::_scan_multiple_folders); } @@ -1483,9 +1483,9 @@ void ProjectListFilter::_notification(int p_what) { void ProjectListFilter::_bind_methods() { - ClassDB::bind_method(_MD("_command"),&ProjectListFilter::_command); - ClassDB::bind_method(_MD("_search_text_changed"), &ProjectListFilter::_search_text_changed); - ClassDB::bind_method(_MD("_filter_option_selected"), &ProjectListFilter::_filter_option_selected); + ClassDB::bind_method(D_METHOD("_command"),&ProjectListFilter::_command); + ClassDB::bind_method(D_METHOD("_search_text_changed"), &ProjectListFilter::_search_text_changed); + ClassDB::bind_method(D_METHOD("_filter_option_selected"), &ProjectListFilter::_filter_option_selected); ADD_SIGNAL( MethodInfo("filter_changed") ); } diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index e725786f94..99afe9f3a1 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -1175,41 +1175,41 @@ void ProjectSettings::set_plugins_page() { void ProjectSettings::_bind_methods() { - ClassDB::bind_method(_MD("_item_selected"),&ProjectSettings::_item_selected); - ClassDB::bind_method(_MD("_item_add"),&ProjectSettings::_item_add); - ClassDB::bind_method(_MD("_item_adds"),&ProjectSettings::_item_adds); - ClassDB::bind_method(_MD("_item_del"),&ProjectSettings::_item_del); - ClassDB::bind_method(_MD("_item_checked"),&ProjectSettings::_item_checked); - ClassDB::bind_method(_MD("_save"),&ProjectSettings::_save); - ClassDB::bind_method(_MD("_action_add"),&ProjectSettings::_action_add); - ClassDB::bind_method(_MD("_action_adds"),&ProjectSettings::_action_adds); - ClassDB::bind_method(_MD("_action_selected"),&ProjectSettings::_action_selected); - ClassDB::bind_method(_MD("_action_edited"),&ProjectSettings::_action_edited); - ClassDB::bind_method(_MD("_action_button_pressed"),&ProjectSettings::_action_button_pressed); - ClassDB::bind_method(_MD("_update_actions"),&ProjectSettings::_update_actions); - ClassDB::bind_method(_MD("_wait_for_key"),&ProjectSettings::_wait_for_key); - ClassDB::bind_method(_MD("_add_item"),&ProjectSettings::_add_item); - ClassDB::bind_method(_MD("_device_input_add"),&ProjectSettings::_device_input_add); - ClassDB::bind_method(_MD("_press_a_key_confirm"),&ProjectSettings::_press_a_key_confirm); - ClassDB::bind_method(_MD("_settings_prop_edited"),&ProjectSettings::_settings_prop_edited); - ClassDB::bind_method(_MD("_copy_to_platform"),&ProjectSettings::_copy_to_platform); - ClassDB::bind_method(_MD("_update_translations"),&ProjectSettings::_update_translations); - ClassDB::bind_method(_MD("_translation_delete"),&ProjectSettings::_translation_delete); - ClassDB::bind_method(_MD("_settings_changed"),&ProjectSettings::_settings_changed); - ClassDB::bind_method(_MD("_translation_add"),&ProjectSettings::_translation_add); - ClassDB::bind_method(_MD("_translation_file_open"),&ProjectSettings::_translation_file_open); - - ClassDB::bind_method(_MD("_translation_res_add"),&ProjectSettings::_translation_res_add); - ClassDB::bind_method(_MD("_translation_res_file_open"),&ProjectSettings::_translation_res_file_open); - ClassDB::bind_method(_MD("_translation_res_option_add"),&ProjectSettings::_translation_res_option_add); - ClassDB::bind_method(_MD("_translation_res_option_file_open"),&ProjectSettings::_translation_res_option_file_open); - ClassDB::bind_method(_MD("_translation_res_select"),&ProjectSettings::_translation_res_select); - ClassDB::bind_method(_MD("_translation_res_option_changed"),&ProjectSettings::_translation_res_option_changed); - ClassDB::bind_method(_MD("_translation_res_delete"),&ProjectSettings::_translation_res_delete); - ClassDB::bind_method(_MD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete); - - ClassDB::bind_method(_MD("_clear_search_box"),&ProjectSettings::_clear_search_box); - ClassDB::bind_method(_MD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar); + ClassDB::bind_method(D_METHOD("_item_selected"),&ProjectSettings::_item_selected); + ClassDB::bind_method(D_METHOD("_item_add"),&ProjectSettings::_item_add); + ClassDB::bind_method(D_METHOD("_item_adds"),&ProjectSettings::_item_adds); + ClassDB::bind_method(D_METHOD("_item_del"),&ProjectSettings::_item_del); + ClassDB::bind_method(D_METHOD("_item_checked"),&ProjectSettings::_item_checked); + ClassDB::bind_method(D_METHOD("_save"),&ProjectSettings::_save); + ClassDB::bind_method(D_METHOD("_action_add"),&ProjectSettings::_action_add); + ClassDB::bind_method(D_METHOD("_action_adds"),&ProjectSettings::_action_adds); + ClassDB::bind_method(D_METHOD("_action_selected"),&ProjectSettings::_action_selected); + ClassDB::bind_method(D_METHOD("_action_edited"),&ProjectSettings::_action_edited); + ClassDB::bind_method(D_METHOD("_action_button_pressed"),&ProjectSettings::_action_button_pressed); + ClassDB::bind_method(D_METHOD("_update_actions"),&ProjectSettings::_update_actions); + ClassDB::bind_method(D_METHOD("_wait_for_key"),&ProjectSettings::_wait_for_key); + ClassDB::bind_method(D_METHOD("_add_item"),&ProjectSettings::_add_item); + ClassDB::bind_method(D_METHOD("_device_input_add"),&ProjectSettings::_device_input_add); + ClassDB::bind_method(D_METHOD("_press_a_key_confirm"),&ProjectSettings::_press_a_key_confirm); + ClassDB::bind_method(D_METHOD("_settings_prop_edited"),&ProjectSettings::_settings_prop_edited); + ClassDB::bind_method(D_METHOD("_copy_to_platform"),&ProjectSettings::_copy_to_platform); + ClassDB::bind_method(D_METHOD("_update_translations"),&ProjectSettings::_update_translations); + ClassDB::bind_method(D_METHOD("_translation_delete"),&ProjectSettings::_translation_delete); + ClassDB::bind_method(D_METHOD("_settings_changed"),&ProjectSettings::_settings_changed); + ClassDB::bind_method(D_METHOD("_translation_add"),&ProjectSettings::_translation_add); + ClassDB::bind_method(D_METHOD("_translation_file_open"),&ProjectSettings::_translation_file_open); + + ClassDB::bind_method(D_METHOD("_translation_res_add"),&ProjectSettings::_translation_res_add); + ClassDB::bind_method(D_METHOD("_translation_res_file_open"),&ProjectSettings::_translation_res_file_open); + ClassDB::bind_method(D_METHOD("_translation_res_option_add"),&ProjectSettings::_translation_res_option_add); + ClassDB::bind_method(D_METHOD("_translation_res_option_file_open"),&ProjectSettings::_translation_res_option_file_open); + ClassDB::bind_method(D_METHOD("_translation_res_select"),&ProjectSettings::_translation_res_select); + ClassDB::bind_method(D_METHOD("_translation_res_option_changed"),&ProjectSettings::_translation_res_option_changed); + ClassDB::bind_method(D_METHOD("_translation_res_delete"),&ProjectSettings::_translation_res_delete); + ClassDB::bind_method(D_METHOD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete); + + ClassDB::bind_method(D_METHOD("_clear_search_box"),&ProjectSettings::_clear_search_box); + ClassDB::bind_method(D_METHOD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar); } diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 8e3791eb8d..9a5fff3fb4 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -4403,9 +4403,9 @@ void PropertyEditor::_bind_methods() { ClassDB::bind_method( "refresh",&PropertyEditor::refresh); ClassDB::bind_method( "_draw_transparency",&PropertyEditor::_draw_transparency); - ClassDB::bind_method(_MD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &PropertyEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &PropertyEditor::drop_data_fw); ADD_SIGNAL( MethodInfo("property_toggled",PropertyInfo( Variant::STRING, "property"),PropertyInfo( Variant::BOOL, "value"))); ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) ); diff --git a/tools/editor/property_selector.cpp b/tools/editor/property_selector.cpp index 3eeec1634d..71ffae4729 100644 --- a/tools/editor/property_selector.cpp +++ b/tools/editor/property_selector.cpp @@ -587,10 +587,10 @@ void PropertySelector::select_property_from_instance(Object* p_instance, const S void PropertySelector::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&PropertySelector::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&PropertySelector::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&PropertySelector::_sbox_input); - ClassDB::bind_method(_MD("_item_selected"),&PropertySelector::_item_selected); + ClassDB::bind_method(D_METHOD("_text_changed"),&PropertySelector::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&PropertySelector::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&PropertySelector::_sbox_input); + ClassDB::bind_method(D_METHOD("_item_selected"),&PropertySelector::_item_selected); ADD_SIGNAL(MethodInfo("selected",PropertyInfo(Variant::STRING,"name"))); diff --git a/tools/editor/quick_open.cpp b/tools/editor/quick_open.cpp index 615b42b411..f43189a7bf 100644 --- a/tools/editor/quick_open.cpp +++ b/tools/editor/quick_open.cpp @@ -252,9 +252,9 @@ StringName EditorQuickOpen::get_base_type() const { void EditorQuickOpen::_bind_methods() { - ClassDB::bind_method(_MD("_text_changed"),&EditorQuickOpen::_text_changed); - ClassDB::bind_method(_MD("_confirmed"),&EditorQuickOpen::_confirmed); - ClassDB::bind_method(_MD("_sbox_input"),&EditorQuickOpen::_sbox_input); + ClassDB::bind_method(D_METHOD("_text_changed"),&EditorQuickOpen::_text_changed); + ClassDB::bind_method(D_METHOD("_confirmed"),&EditorQuickOpen::_confirmed); + ClassDB::bind_method(D_METHOD("_sbox_input"),&EditorQuickOpen::_sbox_input); ADD_SIGNAL(MethodInfo("quick_open")); diff --git a/tools/editor/resources_dock.cpp b/tools/editor/resources_dock.cpp index e89262db25..5348c8c122 100644 --- a/tools/editor/resources_dock.cpp +++ b/tools/editor/resources_dock.cpp @@ -322,12 +322,12 @@ void ResourcesDock::_create() { void ResourcesDock::_bind_methods() { - ClassDB::bind_method(_MD("_tool_selected"),&ResourcesDock::_tool_selected); - ClassDB::bind_method(_MD("_create"),&ResourcesDock::_create); - ClassDB::bind_method(_MD("_resource_selected"),&ResourcesDock::_resource_selected); - ClassDB::bind_method(_MD("_delete"),&ResourcesDock::_delete); - ClassDB::bind_method(_MD("remove_resource"),&ResourcesDock::remove_resource); - ClassDB::bind_method(_MD("_file_action"),&ResourcesDock::_file_action); + ClassDB::bind_method(D_METHOD("_tool_selected"),&ResourcesDock::_tool_selected); + ClassDB::bind_method(D_METHOD("_create"),&ResourcesDock::_create); + ClassDB::bind_method(D_METHOD("_resource_selected"),&ResourcesDock::_resource_selected); + ClassDB::bind_method(D_METHOD("_delete"),&ResourcesDock::_delete); + ClassDB::bind_method(D_METHOD("remove_resource"),&ResourcesDock::remove_resource); + ClassDB::bind_method(D_METHOD("_file_action"),&ResourcesDock::_file_action); diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index f3e5fd85de..eee4aefce3 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1886,33 +1886,33 @@ void SceneTreeDock::open_script_dialog(Node* p_for_node) { void SceneTreeDock::_bind_methods() { - ClassDB::bind_method(_MD("_tool_selected"),&SceneTreeDock::_tool_selected,DEFVAL(false)); - ClassDB::bind_method(_MD("_create"),&SceneTreeDock::_create); - //ClassDB::bind_method(_MD("_script_created"),&SceneTreeDock::_script_created); - ClassDB::bind_method(_MD("_node_reparent"),&SceneTreeDock::_node_reparent); - ClassDB::bind_method(_MD("_set_owners"),&SceneTreeDock::_set_owners); - ClassDB::bind_method(_MD("_node_selected"),&SceneTreeDock::_node_selected); - ClassDB::bind_method(_MD("_node_renamed"),&SceneTreeDock::_node_renamed); - ClassDB::bind_method(_MD("_script_created"),&SceneTreeDock::_script_created); - ClassDB::bind_method(_MD("_load_request"),&SceneTreeDock::_load_request); - ClassDB::bind_method(_MD("_script_open_request"),&SceneTreeDock::_script_open_request); - ClassDB::bind_method(_MD("_unhandled_key_input"),&SceneTreeDock::_unhandled_key_input); - ClassDB::bind_method(_MD("_input"),&SceneTreeDock::_input); - ClassDB::bind_method(_MD("_nodes_drag_begin"),&SceneTreeDock::_nodes_drag_begin); - ClassDB::bind_method(_MD("_delete_confirm"),&SceneTreeDock::_delete_confirm); - ClassDB::bind_method(_MD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed); - ClassDB::bind_method(_MD("_import_subscene"),&SceneTreeDock::_import_subscene); - ClassDB::bind_method(_MD("_selection_changed"),&SceneTreeDock::_selection_changed); - ClassDB::bind_method(_MD("_new_scene_from"),&SceneTreeDock::_new_scene_from); - ClassDB::bind_method(_MD("_nodes_dragged"),&SceneTreeDock::_nodes_dragged); - ClassDB::bind_method(_MD("_files_dropped"),&SceneTreeDock::_files_dropped); - ClassDB::bind_method(_MD("_script_dropped"),&SceneTreeDock::_script_dropped); - ClassDB::bind_method(_MD("_tree_rmb"),&SceneTreeDock::_tree_rmb); - ClassDB::bind_method(_MD("_filter_changed"),&SceneTreeDock::_filter_changed); - ClassDB::bind_method(_MD("_focus_node"),&SceneTreeDock::_focus_node); - - - ClassDB::bind_method(_MD("instance"),&SceneTreeDock::instance); + ClassDB::bind_method(D_METHOD("_tool_selected"),&SceneTreeDock::_tool_selected,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("_create"),&SceneTreeDock::_create); + //ClassDB::bind_method(D_METHOD("_script_created"),&SceneTreeDock::_script_created); + ClassDB::bind_method(D_METHOD("_node_reparent"),&SceneTreeDock::_node_reparent); + ClassDB::bind_method(D_METHOD("_set_owners"),&SceneTreeDock::_set_owners); + ClassDB::bind_method(D_METHOD("_node_selected"),&SceneTreeDock::_node_selected); + ClassDB::bind_method(D_METHOD("_node_renamed"),&SceneTreeDock::_node_renamed); + ClassDB::bind_method(D_METHOD("_script_created"),&SceneTreeDock::_script_created); + ClassDB::bind_method(D_METHOD("_load_request"),&SceneTreeDock::_load_request); + ClassDB::bind_method(D_METHOD("_script_open_request"),&SceneTreeDock::_script_open_request); + ClassDB::bind_method(D_METHOD("_unhandled_key_input"),&SceneTreeDock::_unhandled_key_input); + ClassDB::bind_method(D_METHOD("_input"),&SceneTreeDock::_input); + ClassDB::bind_method(D_METHOD("_nodes_drag_begin"),&SceneTreeDock::_nodes_drag_begin); + ClassDB::bind_method(D_METHOD("_delete_confirm"),&SceneTreeDock::_delete_confirm); + ClassDB::bind_method(D_METHOD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed); + ClassDB::bind_method(D_METHOD("_import_subscene"),&SceneTreeDock::_import_subscene); + ClassDB::bind_method(D_METHOD("_selection_changed"),&SceneTreeDock::_selection_changed); + ClassDB::bind_method(D_METHOD("_new_scene_from"),&SceneTreeDock::_new_scene_from); + ClassDB::bind_method(D_METHOD("_nodes_dragged"),&SceneTreeDock::_nodes_dragged); + ClassDB::bind_method(D_METHOD("_files_dropped"),&SceneTreeDock::_files_dropped); + ClassDB::bind_method(D_METHOD("_script_dropped"),&SceneTreeDock::_script_dropped); + ClassDB::bind_method(D_METHOD("_tree_rmb"),&SceneTreeDock::_tree_rmb); + ClassDB::bind_method(D_METHOD("_filter_changed"),&SceneTreeDock::_filter_changed); + ClassDB::bind_method(D_METHOD("_focus_node"),&SceneTreeDock::_focus_node); + + + ClassDB::bind_method(D_METHOD("instance"),&SceneTreeDock::instance); } diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index dd1fdeb400..0e15040a35 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -1124,11 +1124,11 @@ void SceneTreeEditor::_bind_methods() { ClassDB::bind_method("_editor_settings_changed", &SceneTreeEditor::_editor_settings_changed); - ClassDB::bind_method(_MD("get_drag_data_fw"), &SceneTreeEditor::get_drag_data_fw); - ClassDB::bind_method(_MD("can_drop_data_fw"), &SceneTreeEditor::can_drop_data_fw); - ClassDB::bind_method(_MD("drop_data_fw"), &SceneTreeEditor::drop_data_fw); + ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &SceneTreeEditor::get_drag_data_fw); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SceneTreeEditor::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SceneTreeEditor::drop_data_fw); - ClassDB::bind_method(_MD("update_tree"), &SceneTreeEditor::update_tree); + ClassDB::bind_method(D_METHOD("update_tree"), &SceneTreeEditor::update_tree); ADD_SIGNAL( MethodInfo("node_selected") ); ADD_SIGNAL( MethodInfo("node_renamed") ); diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index d5cca06820..248eecc1c8 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -1635,39 +1635,39 @@ void ScriptEditorDebugger::_paused() { void ScriptEditorDebugger::_bind_methods() { - ClassDB::bind_method(_MD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected); - ClassDB::bind_method(_MD("debug_next"),&ScriptEditorDebugger::debug_next); - ClassDB::bind_method(_MD("debug_step"),&ScriptEditorDebugger::debug_step); - ClassDB::bind_method(_MD("debug_break"),&ScriptEditorDebugger::debug_break); - ClassDB::bind_method(_MD("debug_continue"),&ScriptEditorDebugger::debug_continue); - ClassDB::bind_method(_MD("_output_clear"),&ScriptEditorDebugger::_output_clear); - ClassDB::bind_method(_MD("_performance_draw"),&ScriptEditorDebugger::_performance_draw); - ClassDB::bind_method(_MD("_performance_select"),&ScriptEditorDebugger::_performance_select); - ClassDB::bind_method(_MD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request); - ClassDB::bind_method(_MD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request); - ClassDB::bind_method(_MD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set); - ClassDB::bind_method(_MD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear); - - ClassDB::bind_method(_MD("_error_selected"),&ScriptEditorDebugger::_error_selected); - ClassDB::bind_method(_MD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected); - ClassDB::bind_method(_MD("_profiler_activate"),&ScriptEditorDebugger::_profiler_activate); - ClassDB::bind_method(_MD("_profiler_seeked"),&ScriptEditorDebugger::_profiler_seeked); - - ClassDB::bind_method(_MD("_paused"),&ScriptEditorDebugger::_paused); - - ClassDB::bind_method(_MD("_scene_tree_selected"),&ScriptEditorDebugger::_scene_tree_selected); - ClassDB::bind_method(_MD("_scene_tree_folded"),&ScriptEditorDebugger::_scene_tree_folded); - - - ClassDB::bind_method(_MD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node); - ClassDB::bind_method(_MD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node); - ClassDB::bind_method(_MD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node); - ClassDB::bind_method(_MD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node); - ClassDB::bind_method(_MD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node); - ClassDB::bind_method(_MD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node); - ClassDB::bind_method(_MD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node); - ClassDB::bind_method(_MD("_scene_tree_property_select_object"),&ScriptEditorDebugger::_scene_tree_property_select_object); - ClassDB::bind_method(_MD("_scene_tree_property_value_edited"),&ScriptEditorDebugger::_scene_tree_property_value_edited); + ClassDB::bind_method(D_METHOD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected); + ClassDB::bind_method(D_METHOD("debug_next"),&ScriptEditorDebugger::debug_next); + ClassDB::bind_method(D_METHOD("debug_step"),&ScriptEditorDebugger::debug_step); + ClassDB::bind_method(D_METHOD("debug_break"),&ScriptEditorDebugger::debug_break); + ClassDB::bind_method(D_METHOD("debug_continue"),&ScriptEditorDebugger::debug_continue); + ClassDB::bind_method(D_METHOD("_output_clear"),&ScriptEditorDebugger::_output_clear); + ClassDB::bind_method(D_METHOD("_performance_draw"),&ScriptEditorDebugger::_performance_draw); + ClassDB::bind_method(D_METHOD("_performance_select"),&ScriptEditorDebugger::_performance_select); + ClassDB::bind_method(D_METHOD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request); + ClassDB::bind_method(D_METHOD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request); + ClassDB::bind_method(D_METHOD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set); + ClassDB::bind_method(D_METHOD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear); + + ClassDB::bind_method(D_METHOD("_error_selected"),&ScriptEditorDebugger::_error_selected); + ClassDB::bind_method(D_METHOD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected); + ClassDB::bind_method(D_METHOD("_profiler_activate"),&ScriptEditorDebugger::_profiler_activate); + ClassDB::bind_method(D_METHOD("_profiler_seeked"),&ScriptEditorDebugger::_profiler_seeked); + + ClassDB::bind_method(D_METHOD("_paused"),&ScriptEditorDebugger::_paused); + + ClassDB::bind_method(D_METHOD("_scene_tree_selected"),&ScriptEditorDebugger::_scene_tree_selected); + ClassDB::bind_method(D_METHOD("_scene_tree_folded"),&ScriptEditorDebugger::_scene_tree_folded); + + + ClassDB::bind_method(D_METHOD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node); + ClassDB::bind_method(D_METHOD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node); + ClassDB::bind_method(D_METHOD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node); + ClassDB::bind_method(D_METHOD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node); + ClassDB::bind_method(D_METHOD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node); + ClassDB::bind_method(D_METHOD("_scene_tree_property_select_object"),&ScriptEditorDebugger::_scene_tree_property_select_object); + ClassDB::bind_method(D_METHOD("_scene_tree_property_value_edited"),&ScriptEditorDebugger::_scene_tree_property_value_edited); ADD_SIGNAL(MethodInfo("goto_script_line")); ADD_SIGNAL(MethodInfo("breaked",PropertyInfo(Variant::BOOL,"reallydid"),PropertyInfo(Variant::BOOL,"can_debug"))); diff --git a/tools/editor/settings_config_dialog.cpp b/tools/editor/settings_config_dialog.cpp index 31cbcee5ae..cd8403b271 100644 --- a/tools/editor/settings_config_dialog.cpp +++ b/tools/editor/settings_config_dialog.cpp @@ -289,16 +289,16 @@ void EditorSettingsDialog::_press_a_key_confirm() { void EditorSettingsDialog::_bind_methods() { - ClassDB::bind_method(_MD("_settings_save"),&EditorSettingsDialog::_settings_save); - ClassDB::bind_method(_MD("_settings_changed"),&EditorSettingsDialog::_settings_changed); - ClassDB::bind_method(_MD("_settings_property_edited"),&EditorSettingsDialog::_settings_property_edited); - ClassDB::bind_method(_MD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box); - ClassDB::bind_method(_MD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box); - ClassDB::bind_method(_MD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed); - ClassDB::bind_method(_MD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts); - ClassDB::bind_method(_MD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts); - ClassDB::bind_method(_MD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm); - ClassDB::bind_method(_MD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key); + ClassDB::bind_method(D_METHOD("_settings_save"),&EditorSettingsDialog::_settings_save); + ClassDB::bind_method(D_METHOD("_settings_changed"),&EditorSettingsDialog::_settings_changed); + ClassDB::bind_method(D_METHOD("_settings_property_edited"),&EditorSettingsDialog::_settings_property_edited); + ClassDB::bind_method(D_METHOD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box); + ClassDB::bind_method(D_METHOD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box); + ClassDB::bind_method(D_METHOD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed); + ClassDB::bind_method(D_METHOD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts); + ClassDB::bind_method(D_METHOD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts); + ClassDB::bind_method(D_METHOD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm); + ClassDB::bind_method(D_METHOD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key); } diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp index 3ed101cdd6..825db5356b 100644 --- a/tools/editor/spatial_editor_gizmos.cpp +++ b/tools/editor/spatial_editor_gizmos.cpp @@ -618,14 +618,14 @@ void EditorSpatialGizmo::free(){ void EditorSpatialGizmo::_bind_methods() { - ClassDB::bind_method(_MD("add_lines","lines","material:Material","billboard"),&EditorSpatialGizmo::add_lines,DEFVAL(false)); - ClassDB::bind_method(_MD("add_mesh","mesh:Mesh","billboard","skeleton"),&EditorSpatialGizmo::add_mesh,DEFVAL(false),DEFVAL(RID())); - ClassDB::bind_method(_MD("add_collision_segments","segments"),&EditorSpatialGizmo::add_collision_segments); - ClassDB::bind_method(_MD("add_collision_triangles","triangles:TriangleMesh"),&EditorSpatialGizmo::add_collision_triangles); - ClassDB::bind_method(_MD("add_unscaled_billboard","material:Material","default_scale"),&EditorSpatialGizmo::add_unscaled_billboard,DEFVAL(1)); - ClassDB::bind_method(_MD("add_handles","handles","billboard","secondary"),&EditorSpatialGizmo::add_handles,DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("set_spatial_node","node:Spatial"),&EditorSpatialGizmo::_set_spatial_node); - ClassDB::bind_method(_MD("clear"),&EditorSpatialGizmo::clear); + ClassDB::bind_method(D_METHOD("add_lines","lines","material:Material","billboard"),&EditorSpatialGizmo::add_lines,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("add_mesh","mesh:Mesh","billboard","skeleton"),&EditorSpatialGizmo::add_mesh,DEFVAL(false),DEFVAL(RID())); + ClassDB::bind_method(D_METHOD("add_collision_segments","segments"),&EditorSpatialGizmo::add_collision_segments); + ClassDB::bind_method(D_METHOD("add_collision_triangles","triangles:TriangleMesh"),&EditorSpatialGizmo::add_collision_triangles); + ClassDB::bind_method(D_METHOD("add_unscaled_billboard","material:Material","default_scale"),&EditorSpatialGizmo::add_unscaled_billboard,DEFVAL(1)); + ClassDB::bind_method(D_METHOD("add_handles","handles","billboard","secondary"),&EditorSpatialGizmo::add_handles,DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_spatial_node","node:Spatial"),&EditorSpatialGizmo::_set_spatial_node); + ClassDB::bind_method(D_METHOD("clear"),&EditorSpatialGizmo::clear); BIND_VMETHOD( MethodInfo("redraw")); BIND_VMETHOD( MethodInfo(Variant::STRING,"get_handle_name",PropertyInfo(Variant::INT,"index"))); |