diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-02-13 15:46:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 15:46:17 +0100 |
commit | ea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378 (patch) | |
tree | 65ed57ff55cadd49b881e248e2f87331ca5eee28 /core | |
parent | f6859fd31b5c3cc1a112b7f77b3c1783df8c8919 (diff) | |
parent | 411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (diff) |
Merge pull request #7795 from hpvb/rename-md-macro
Rename the _MD macro to D_METHOD
Diffstat (limited to 'core')
30 files changed, 604 insertions, 602 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); |