diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 12:47:24 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-02-13 12:50:02 +0100 |
| commit | 411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (patch) | |
| tree | a3c28058efb7a80faed23bff683fe0931859ed52 /scene/2d | |
| parent | bf64df4427836a4e7a5060ee11d75eea6da79b14 (diff) | |
Rename the _MD macro to D_METHOD
This new name also makes its purpose a little clearer
This is a step towards fixing #56
Diffstat (limited to 'scene/2d')
29 files changed, 757 insertions, 757 deletions
diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index 510eaacccd..faecbf3e6d 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -222,32 +222,32 @@ void SpriteFrames::_set_animations(const Array& p_animations) { void SpriteFrames::_bind_methods() { - ClassDB::bind_method(_MD("add_animation","anim"),&SpriteFrames::add_animation); - ClassDB::bind_method(_MD("has_animation","anim"),&SpriteFrames::has_animation); - ClassDB::bind_method(_MD("remove_animation","anim"),&SpriteFrames::remove_animation); - ClassDB::bind_method(_MD("rename_animation","anim","newname"),&SpriteFrames::rename_animation); + ClassDB::bind_method(D_METHOD("add_animation","anim"),&SpriteFrames::add_animation); + ClassDB::bind_method(D_METHOD("has_animation","anim"),&SpriteFrames::has_animation); + ClassDB::bind_method(D_METHOD("remove_animation","anim"),&SpriteFrames::remove_animation); + ClassDB::bind_method(D_METHOD("rename_animation","anim","newname"),&SpriteFrames::rename_animation); - ClassDB::bind_method(_MD("set_animation_speed","anim","speed"),&SpriteFrames::set_animation_speed); - ClassDB::bind_method(_MD("get_animation_speed","anim"),&SpriteFrames::get_animation_speed); + ClassDB::bind_method(D_METHOD("set_animation_speed","anim","speed"),&SpriteFrames::set_animation_speed); + ClassDB::bind_method(D_METHOD("get_animation_speed","anim"),&SpriteFrames::get_animation_speed); - ClassDB::bind_method(_MD("set_animation_loop","anim","loop"),&SpriteFrames::set_animation_loop); - ClassDB::bind_method(_MD("get_animation_loop","anim"),&SpriteFrames::get_animation_loop); + ClassDB::bind_method(D_METHOD("set_animation_loop","anim","loop"),&SpriteFrames::set_animation_loop); + ClassDB::bind_method(D_METHOD("get_animation_loop","anim"),&SpriteFrames::get_animation_loop); - ClassDB::bind_method(_MD("add_frame","anim","frame","atpos"),&SpriteFrames::add_frame,DEFVAL(-1)); - ClassDB::bind_method(_MD("get_frame_count","anim"),&SpriteFrames::get_frame_count); - ClassDB::bind_method(_MD("get_frame","anim","idx"),&SpriteFrames::get_frame); - ClassDB::bind_method(_MD("set_frame","anim","idx","txt"),&SpriteFrames::set_frame); - ClassDB::bind_method(_MD("remove_frame","anim","idx"),&SpriteFrames::remove_frame); - ClassDB::bind_method(_MD("clear","anim"),&SpriteFrames::clear); - ClassDB::bind_method(_MD("clear_all"),&SpriteFrames::clear_all); + ClassDB::bind_method(D_METHOD("add_frame","anim","frame","atpos"),&SpriteFrames::add_frame,DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("get_frame_count","anim"),&SpriteFrames::get_frame_count); + ClassDB::bind_method(D_METHOD("get_frame","anim","idx"),&SpriteFrames::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","anim","idx","txt"),&SpriteFrames::set_frame); + ClassDB::bind_method(D_METHOD("remove_frame","anim","idx"),&SpriteFrames::remove_frame); + ClassDB::bind_method(D_METHOD("clear","anim"),&SpriteFrames::clear); + ClassDB::bind_method(D_METHOD("clear_all"),&SpriteFrames::clear_all); - ClassDB::bind_method(_MD("_set_frames"),&SpriteFrames::_set_frames); - ClassDB::bind_method(_MD("_get_frames"),&SpriteFrames::_get_frames); + ClassDB::bind_method(D_METHOD("_set_frames"),&SpriteFrames::_set_frames); + ClassDB::bind_method(D_METHOD("_get_frames"),&SpriteFrames::_get_frames); ADD_PROPERTYNZ( PropertyInfo(Variant::ARRAY,"frames",PROPERTY_HINT_NONE,"",0),"_set_frames","_get_frames"); //compatibility - ClassDB::bind_method(_MD("_set_animations"),&SpriteFrames::_set_animations); - ClassDB::bind_method(_MD("_get_animations"),&SpriteFrames::_get_animations); + ClassDB::bind_method(D_METHOD("_set_animations"),&SpriteFrames::_set_animations); + ClassDB::bind_method(D_METHOD("_get_animations"),&SpriteFrames::_get_animations); ADD_PROPERTYNZ( PropertyInfo(Variant::ARRAY,"animations",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_animations","_get_animations"); //compatibility @@ -653,36 +653,36 @@ String AnimatedSprite::get_configuration_warning() const { void AnimatedSprite::_bind_methods() { - ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite::set_sprite_frames); - ClassDB::bind_method(_MD("get_sprite_frames:SpriteFrames"),&AnimatedSprite::get_sprite_frames); + ClassDB::bind_method(D_METHOD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite::set_sprite_frames); + ClassDB::bind_method(D_METHOD("get_sprite_frames:SpriteFrames"),&AnimatedSprite::get_sprite_frames); - ClassDB::bind_method(_MD("set_animation","animation"),&AnimatedSprite::set_animation); - ClassDB::bind_method(_MD("get_animation"),&AnimatedSprite::get_animation); + ClassDB::bind_method(D_METHOD("set_animation","animation"),&AnimatedSprite::set_animation); + ClassDB::bind_method(D_METHOD("get_animation"),&AnimatedSprite::get_animation); - ClassDB::bind_method(_MD("_set_playing","playing"),&AnimatedSprite::_set_playing); - ClassDB::bind_method(_MD("_is_playing"),&AnimatedSprite::_is_playing); + ClassDB::bind_method(D_METHOD("_set_playing","playing"),&AnimatedSprite::_set_playing); + ClassDB::bind_method(D_METHOD("_is_playing"),&AnimatedSprite::_is_playing); - ClassDB::bind_method(_MD("play","anim"),&AnimatedSprite::play,DEFVAL(StringName())); - ClassDB::bind_method(_MD("stop"),&AnimatedSprite::stop); - ClassDB::bind_method(_MD("is_playing"),&AnimatedSprite::is_playing); + ClassDB::bind_method(D_METHOD("play","anim"),&AnimatedSprite::play,DEFVAL(StringName())); + ClassDB::bind_method(D_METHOD("stop"),&AnimatedSprite::stop); + ClassDB::bind_method(D_METHOD("is_playing"),&AnimatedSprite::is_playing); - ClassDB::bind_method(_MD("set_centered","centered"),&AnimatedSprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&AnimatedSprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&AnimatedSprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&AnimatedSprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&AnimatedSprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&AnimatedSprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&AnimatedSprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&AnimatedSprite::get_offset); - ClassDB::bind_method(_MD("set_flip_h","flip_h"),&AnimatedSprite::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&AnimatedSprite::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","flip_h"),&AnimatedSprite::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&AnimatedSprite::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","flip_v"),&AnimatedSprite::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&AnimatedSprite::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","flip_v"),&AnimatedSprite::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&AnimatedSprite::is_flipped_v); - ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite::set_frame); - ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&AnimatedSprite::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&AnimatedSprite::get_frame); - ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed); + ClassDB::bind_method(D_METHOD("_res_changed"),&AnimatedSprite::_res_changed); ADD_SIGNAL(MethodInfo("frame_changed")); ADD_SIGNAL(MethodInfo("animation_finished")); diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 35d8a161c1..68228520b3 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -587,62 +587,62 @@ bool Area2D::get_layer_mask_bit(int p_bit) const{ void Area2D::_bind_methods() { - ClassDB::bind_method(_MD("_body_enter_tree","id"),&Area2D::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree","id"),&Area2D::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_body_enter_tree","id"),&Area2D::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree","id"),&Area2D::_body_exit_tree); - ClassDB::bind_method(_MD("_area_enter_tree","id"),&Area2D::_area_enter_tree); - ClassDB::bind_method(_MD("_area_exit_tree","id"),&Area2D::_area_exit_tree); + ClassDB::bind_method(D_METHOD("_area_enter_tree","id"),&Area2D::_area_enter_tree); + ClassDB::bind_method(D_METHOD("_area_exit_tree","id"),&Area2D::_area_exit_tree); - ClassDB::bind_method(_MD("set_space_override_mode","enable"),&Area2D::set_space_override_mode); - ClassDB::bind_method(_MD("get_space_override_mode"),&Area2D::get_space_override_mode); + ClassDB::bind_method(D_METHOD("set_space_override_mode","enable"),&Area2D::set_space_override_mode); + ClassDB::bind_method(D_METHOD("get_space_override_mode"),&Area2D::get_space_override_mode); - ClassDB::bind_method(_MD("set_gravity_is_point","enable"),&Area2D::set_gravity_is_point); - ClassDB::bind_method(_MD("is_gravity_a_point"),&Area2D::is_gravity_a_point); + ClassDB::bind_method(D_METHOD("set_gravity_is_point","enable"),&Area2D::set_gravity_is_point); + ClassDB::bind_method(D_METHOD("is_gravity_a_point"),&Area2D::is_gravity_a_point); - ClassDB::bind_method(_MD("set_gravity_distance_scale","distance_scale"),&Area2D::set_gravity_distance_scale); - ClassDB::bind_method(_MD("get_gravity_distance_scale"),&Area2D::get_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("set_gravity_distance_scale","distance_scale"),&Area2D::set_gravity_distance_scale); + ClassDB::bind_method(D_METHOD("get_gravity_distance_scale"),&Area2D::get_gravity_distance_scale); - ClassDB::bind_method(_MD("set_gravity_vector","vector"),&Area2D::set_gravity_vector); - ClassDB::bind_method(_MD("get_gravity_vector"),&Area2D::get_gravity_vector); + ClassDB::bind_method(D_METHOD("set_gravity_vector","vector"),&Area2D::set_gravity_vector); + ClassDB::bind_method(D_METHOD("get_gravity_vector"),&Area2D::get_gravity_vector); - ClassDB::bind_method(_MD("set_gravity","gravity"),&Area2D::set_gravity); - ClassDB::bind_method(_MD("get_gravity"),&Area2D::get_gravity); + ClassDB::bind_method(D_METHOD("set_gravity","gravity"),&Area2D::set_gravity); + ClassDB::bind_method(D_METHOD("get_gravity"),&Area2D::get_gravity); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&Area2D::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&Area2D::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&Area2D::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&Area2D::get_linear_damp); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&Area2D::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&Area2D::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&Area2D::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&Area2D::get_angular_damp); - ClassDB::bind_method(_MD("set_priority","priority"),&Area2D::set_priority); - ClassDB::bind_method(_MD("get_priority"),&Area2D::get_priority); + ClassDB::bind_method(D_METHOD("set_priority","priority"),&Area2D::set_priority); + ClassDB::bind_method(D_METHOD("get_priority"),&Area2D::get_priority); - ClassDB::bind_method(_MD("set_collision_mask","collision_mask"),&Area2D::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&Area2D::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","collision_mask"),&Area2D::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&Area2D::get_collision_mask); - ClassDB::bind_method(_MD("set_layer_mask","layer_mask"),&Area2D::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&Area2D::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","layer_mask"),&Area2D::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&Area2D::get_layer_mask); - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&Area2D::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&Area2D::get_collision_mask_bit); + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&Area2D::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&Area2D::get_collision_mask_bit); - ClassDB::bind_method(_MD("set_layer_mask_bit","bit","value"),&Area2D::set_layer_mask_bit); - ClassDB::bind_method(_MD("get_layer_mask_bit","bit"),&Area2D::get_layer_mask_bit); + ClassDB::bind_method(D_METHOD("set_layer_mask_bit","bit","value"),&Area2D::set_layer_mask_bit); + ClassDB::bind_method(D_METHOD("get_layer_mask_bit","bit"),&Area2D::get_layer_mask_bit); - ClassDB::bind_method(_MD("set_monitoring","enable"),&Area2D::set_monitoring); - ClassDB::bind_method(_MD("is_monitoring"),&Area2D::is_monitoring); + ClassDB::bind_method(D_METHOD("set_monitoring","enable"),&Area2D::set_monitoring); + ClassDB::bind_method(D_METHOD("is_monitoring"),&Area2D::is_monitoring); - ClassDB::bind_method(_MD("set_monitorable","enable"),&Area2D::set_monitorable); - ClassDB::bind_method(_MD("is_monitorable"),&Area2D::is_monitorable); + ClassDB::bind_method(D_METHOD("set_monitorable","enable"),&Area2D::set_monitorable); + ClassDB::bind_method(D_METHOD("is_monitorable"),&Area2D::is_monitorable); - ClassDB::bind_method(_MD("get_overlapping_bodies"),&Area2D::get_overlapping_bodies); - ClassDB::bind_method(_MD("get_overlapping_areas"),&Area2D::get_overlapping_areas); + ClassDB::bind_method(D_METHOD("get_overlapping_bodies"),&Area2D::get_overlapping_bodies); + ClassDB::bind_method(D_METHOD("get_overlapping_areas"),&Area2D::get_overlapping_areas); - ClassDB::bind_method(_MD("overlaps_body","body"),&Area2D::overlaps_body); - ClassDB::bind_method(_MD("overlaps_area","area"),&Area2D::overlaps_area); + ClassDB::bind_method(D_METHOD("overlaps_body","body"),&Area2D::overlaps_body); + ClassDB::bind_method(D_METHOD("overlaps_area","area"),&Area2D::overlaps_area); - ClassDB::bind_method(_MD("_body_inout"),&Area2D::_body_inout); - ClassDB::bind_method(_MD("_area_inout"),&Area2D::_area_inout); + ClassDB::bind_method(D_METHOD("_body_inout"),&Area2D::_body_inout); + ClassDB::bind_method(D_METHOD("_area_inout"),&Area2D::_area_inout); ADD_SIGNAL( MethodInfo("body_shape_entered",PropertyInfo(Variant::INT,"body_id"),PropertyInfo(Variant::OBJECT,"body",PROPERTY_HINT_RESOURCE_TYPE,"PhysicsBody2D"),PropertyInfo(Variant::INT,"body_shape"),PropertyInfo(Variant::INT,"area_shape"))); diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp index 1fdd1b9eef..eaa33fe70a 100644 --- a/scene/2d/back_buffer_copy.cpp +++ b/scene/2d/back_buffer_copy.cpp @@ -77,11 +77,11 @@ BackBufferCopy::CopyMode BackBufferCopy::get_copy_mode() const{ void BackBufferCopy::_bind_methods() { - ClassDB::bind_method(_MD("set_rect","rect"),&BackBufferCopy::set_rect); - ClassDB::bind_method(_MD("get_rect"),&BackBufferCopy::get_rect); + ClassDB::bind_method(D_METHOD("set_rect","rect"),&BackBufferCopy::set_rect); + ClassDB::bind_method(D_METHOD("get_rect"),&BackBufferCopy::get_rect); - ClassDB::bind_method(_MD("set_copy_mode","copy_mode"),&BackBufferCopy::set_copy_mode); - ClassDB::bind_method(_MD("get_copy_mode"),&BackBufferCopy::get_copy_mode); + ClassDB::bind_method(D_METHOD("set_copy_mode","copy_mode"),&BackBufferCopy::set_copy_mode); + ClassDB::bind_method(D_METHOD("get_copy_mode"),&BackBufferCopy::get_copy_mode); ADD_PROPERTY( PropertyInfo(Variant::INT,"copy_mode",PROPERTY_HINT_ENUM,"Disabled,Rect,Viewport"),"set_copy_mode","get_copy_mode"); ADD_PROPERTY( PropertyInfo(Variant::RECT2,"rect"),"set_rect","get_rect"); diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 2e7926c51b..9ae2315867 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -590,65 +590,65 @@ Node* Camera2D::get_custom_viewport() const { void Camera2D::_bind_methods() { - ClassDB::bind_method(_MD("set_offset","offset"),&Camera2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Camera2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Camera2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Camera2D::get_offset); - ClassDB::bind_method(_MD("set_anchor_mode","anchor_mode"),&Camera2D::set_anchor_mode); - ClassDB::bind_method(_MD("get_anchor_mode"),&Camera2D::get_anchor_mode); + ClassDB::bind_method(D_METHOD("set_anchor_mode","anchor_mode"),&Camera2D::set_anchor_mode); + ClassDB::bind_method(D_METHOD("get_anchor_mode"),&Camera2D::get_anchor_mode); - ClassDB::bind_method(_MD("set_rotating","rotating"),&Camera2D::set_rotating); - ClassDB::bind_method(_MD("is_rotating"),&Camera2D::is_rotating); + ClassDB::bind_method(D_METHOD("set_rotating","rotating"),&Camera2D::set_rotating); + ClassDB::bind_method(D_METHOD("is_rotating"),&Camera2D::is_rotating); - ClassDB::bind_method(_MD("make_current"),&Camera2D::make_current); - ClassDB::bind_method(_MD("clear_current"),&Camera2D::clear_current); - ClassDB::bind_method(_MD("_make_current"),&Camera2D::_make_current); + ClassDB::bind_method(D_METHOD("make_current"),&Camera2D::make_current); + ClassDB::bind_method(D_METHOD("clear_current"),&Camera2D::clear_current); + ClassDB::bind_method(D_METHOD("_make_current"),&Camera2D::_make_current); - ClassDB::bind_method(_MD("_update_scroll"),&Camera2D::_update_scroll); + ClassDB::bind_method(D_METHOD("_update_scroll"),&Camera2D::_update_scroll); - ClassDB::bind_method(_MD("_set_current","current"),&Camera2D::_set_current); - ClassDB::bind_method(_MD("is_current"),&Camera2D::is_current); + ClassDB::bind_method(D_METHOD("_set_current","current"),&Camera2D::_set_current); + ClassDB::bind_method(D_METHOD("is_current"),&Camera2D::is_current); - ClassDB::bind_method(_MD("set_limit","margin","limit"),&Camera2D::set_limit); - ClassDB::bind_method(_MD("get_limit","margin"),&Camera2D::get_limit); + ClassDB::bind_method(D_METHOD("set_limit","margin","limit"),&Camera2D::set_limit); + ClassDB::bind_method(D_METHOD("get_limit","margin"),&Camera2D::get_limit); - ClassDB::bind_method(_MD("set_limit_smoothing_enabled","limit_smoothing_enabled"),&Camera2D::set_limit_smoothing_enabled); - ClassDB::bind_method(_MD("is_limit_smoothing_enabled"),&Camera2D::is_limit_smoothing_enabled); + ClassDB::bind_method(D_METHOD("set_limit_smoothing_enabled","limit_smoothing_enabled"),&Camera2D::set_limit_smoothing_enabled); + ClassDB::bind_method(D_METHOD("is_limit_smoothing_enabled"),&Camera2D::is_limit_smoothing_enabled); - ClassDB::bind_method(_MD("set_v_drag_enabled","enabled"),&Camera2D::set_v_drag_enabled); - ClassDB::bind_method(_MD("is_v_drag_enabled"),&Camera2D::is_v_drag_enabled); + ClassDB::bind_method(D_METHOD("set_v_drag_enabled","enabled"),&Camera2D::set_v_drag_enabled); + ClassDB::bind_method(D_METHOD("is_v_drag_enabled"),&Camera2D::is_v_drag_enabled); - ClassDB::bind_method(_MD("set_h_drag_enabled","enabled"),&Camera2D::set_h_drag_enabled); - ClassDB::bind_method(_MD("is_h_drag_enabled"),&Camera2D::is_h_drag_enabled); + ClassDB::bind_method(D_METHOD("set_h_drag_enabled","enabled"),&Camera2D::set_h_drag_enabled); + ClassDB::bind_method(D_METHOD("is_h_drag_enabled"),&Camera2D::is_h_drag_enabled); - ClassDB::bind_method(_MD("set_v_offset","ofs"),&Camera2D::set_v_offset); - ClassDB::bind_method(_MD("get_v_offset"),&Camera2D::get_v_offset); + ClassDB::bind_method(D_METHOD("set_v_offset","ofs"),&Camera2D::set_v_offset); + ClassDB::bind_method(D_METHOD("get_v_offset"),&Camera2D::get_v_offset); - ClassDB::bind_method(_MD("set_h_offset","ofs"),&Camera2D::set_h_offset); - ClassDB::bind_method(_MD("get_h_offset"),&Camera2D::get_h_offset); + ClassDB::bind_method(D_METHOD("set_h_offset","ofs"),&Camera2D::set_h_offset); + ClassDB::bind_method(D_METHOD("get_h_offset"),&Camera2D::get_h_offset); - ClassDB::bind_method(_MD("set_drag_margin","margin","drag_margin"),&Camera2D::set_drag_margin); - ClassDB::bind_method(_MD("get_drag_margin","margin"),&Camera2D::get_drag_margin); + ClassDB::bind_method(D_METHOD("set_drag_margin","margin","drag_margin"),&Camera2D::set_drag_margin); + ClassDB::bind_method(D_METHOD("get_drag_margin","margin"),&Camera2D::get_drag_margin); - ClassDB::bind_method(_MD("get_camera_pos"),&Camera2D::get_camera_pos); - ClassDB::bind_method(_MD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); + ClassDB::bind_method(D_METHOD("get_camera_pos"),&Camera2D::get_camera_pos); + ClassDB::bind_method(D_METHOD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); - ClassDB::bind_method(_MD("set_zoom","zoom"),&Camera2D::set_zoom); - ClassDB::bind_method(_MD("get_zoom"),&Camera2D::get_zoom); + ClassDB::bind_method(D_METHOD("set_zoom","zoom"),&Camera2D::set_zoom); + ClassDB::bind_method(D_METHOD("get_zoom"),&Camera2D::get_zoom); - ClassDB::bind_method(_MD("set_custom_viewport","viewport:Viewport"),&Camera2D::set_custom_viewport); - ClassDB::bind_method(_MD("get_custom_viewport:Viewport"),&Camera2D::get_custom_viewport); + ClassDB::bind_method(D_METHOD("set_custom_viewport","viewport:Viewport"),&Camera2D::set_custom_viewport); + ClassDB::bind_method(D_METHOD("get_custom_viewport:Viewport"),&Camera2D::get_custom_viewport); - ClassDB::bind_method(_MD("set_follow_smoothing","follow_smoothing"),&Camera2D::set_follow_smoothing); - ClassDB::bind_method(_MD("get_follow_smoothing"),&Camera2D::get_follow_smoothing); + ClassDB::bind_method(D_METHOD("set_follow_smoothing","follow_smoothing"),&Camera2D::set_follow_smoothing); + ClassDB::bind_method(D_METHOD("get_follow_smoothing"),&Camera2D::get_follow_smoothing); - ClassDB::bind_method(_MD("set_enable_follow_smoothing","follow_smoothing"),&Camera2D::set_enable_follow_smoothing); - ClassDB::bind_method(_MD("is_follow_smoothing_enabled"),&Camera2D::is_follow_smoothing_enabled); + ClassDB::bind_method(D_METHOD("set_enable_follow_smoothing","follow_smoothing"),&Camera2D::set_enable_follow_smoothing); + ClassDB::bind_method(D_METHOD("is_follow_smoothing_enabled"),&Camera2D::is_follow_smoothing_enabled); - ClassDB::bind_method(_MD("force_update_scroll"),&Camera2D::force_update_scroll); - ClassDB::bind_method(_MD("reset_smoothing"),&Camera2D::reset_smoothing); - ClassDB::bind_method(_MD("align"),&Camera2D::align); + ClassDB::bind_method(D_METHOD("force_update_scroll"),&Camera2D::force_update_scroll); + ClassDB::bind_method(D_METHOD("reset_smoothing"),&Camera2D::reset_smoothing); + ClassDB::bind_method(D_METHOD("align"),&Camera2D::align); - ClassDB::bind_method(_MD("_set_old_smoothing","follow_smoothing"),&Camera2D::_set_old_smoothing); + ClassDB::bind_method(D_METHOD("_set_old_smoothing","follow_smoothing"),&Camera2D::_set_old_smoothing); ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),"set_offset","get_offset"); ADD_PROPERTY( PropertyInfo(Variant::INT,"anchor_mode",PROPERTY_HINT_ENUM,"Fixed TopLeft,Drag Center"),"set_anchor_mode","get_anchor_mode"); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 6e5885a410..3574a39940 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -135,10 +135,10 @@ Variant CanvasItemMaterial::get_shader_param(const StringName& p_param) const{ void CanvasItemMaterial::_bind_methods() { - ClassDB::bind_method(_MD("set_shader","shader:Shader"),&CanvasItemMaterial::set_shader); - ClassDB::bind_method(_MD("get_shader:Shader"),&CanvasItemMaterial::get_shader); - ClassDB::bind_method(_MD("set_shader_param","param","value"),&CanvasItemMaterial::set_shader_param); - ClassDB::bind_method(_MD("get_shader_param","param"),&CanvasItemMaterial::get_shader_param); + ClassDB::bind_method(D_METHOD("set_shader","shader:Shader"),&CanvasItemMaterial::set_shader); + ClassDB::bind_method(D_METHOD("get_shader:Shader"),&CanvasItemMaterial::get_shader); + ClassDB::bind_method(D_METHOD("set_shader_param","param","value"),&CanvasItemMaterial::set_shader_param); + ClassDB::bind_method(D_METHOD("get_shader_param","param"),&CanvasItemMaterial::get_shader_param); @@ -905,88 +905,88 @@ Vector2 CanvasItem::get_local_mouse_pos() const{ void CanvasItem::_bind_methods() { - ClassDB::bind_method(_MD("_toplevel_raise_self"),&CanvasItem::_toplevel_raise_self); - ClassDB::bind_method(_MD("_update_callback"),&CanvasItem::_update_callback); - - ClassDB::bind_method(_MD("edit_set_state","state"),&CanvasItem::edit_set_state); - ClassDB::bind_method(_MD("edit_get_state:Variant"),&CanvasItem::edit_get_state); - ClassDB::bind_method(_MD("edit_set_rect","rect"),&CanvasItem::edit_set_rect); - ClassDB::bind_method(_MD("edit_rotate","degrees"),&CanvasItem::edit_rotate); - - ClassDB::bind_method(_MD("get_item_rect"),&CanvasItem::get_item_rect); - ClassDB::bind_method(_MD("get_item_and_children_rect"),&CanvasItem::get_item_and_children_rect); - //ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - - ClassDB::bind_method(_MD("get_canvas_item"),&CanvasItem::get_canvas_item); - - ClassDB::bind_method(_MD("set_visible"),&CanvasItem::set_visible); - ClassDB::bind_method(_MD("is_visible"),&CanvasItem::is_visible); - ClassDB::bind_method(_MD("is_visible_in_tree"),&CanvasItem::is_visible_in_tree); - ClassDB::bind_method(_MD("show"),&CanvasItem::show); - ClassDB::bind_method(_MD("hide"),&CanvasItem::hide); - - ClassDB::bind_method(_MD("update"),&CanvasItem::update); - - ClassDB::bind_method(_MD("set_as_toplevel","enable"),&CanvasItem::set_as_toplevel); - ClassDB::bind_method(_MD("is_set_as_toplevel"),&CanvasItem::is_set_as_toplevel); - - ClassDB::bind_method(_MD("set_light_mask","light_mask"),&CanvasItem::set_light_mask); - ClassDB::bind_method(_MD("get_light_mask"),&CanvasItem::get_light_mask); - - ClassDB::bind_method(_MD("set_modulate","modulate"),&CanvasItem::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&CanvasItem::get_modulate); - ClassDB::bind_method(_MD("set_self_modulate","self_modulate"),&CanvasItem::set_self_modulate); - ClassDB::bind_method(_MD("get_self_modulate"),&CanvasItem::get_self_modulate); - - ClassDB::bind_method(_MD("set_draw_behind_parent","enable"),&CanvasItem::set_draw_behind_parent); - ClassDB::bind_method(_MD("is_draw_behind_parent_enabled"),&CanvasItem::is_draw_behind_parent_enabled); - - ClassDB::bind_method(_MD("_set_on_top","on_top"),&CanvasItem::_set_on_top); - ClassDB::bind_method(_MD("_is_on_top"),&CanvasItem::_is_on_top); - //ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - - ClassDB::bind_method(_MD("draw_line","from","to","color","width","antialiased"),&CanvasItem::draw_line,DEFVAL(1.0),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_rect","rect","color"),&CanvasItem::draw_rect); - ClassDB::bind_method(_MD("draw_circle","pos","radius","color"),&CanvasItem::draw_circle); - ClassDB::bind_method(_MD("draw_texture","texture:Texture","pos","modulate"),&CanvasItem::draw_texture,DEFVAL(Color(1,1,1,1))); - ClassDB::bind_method(_MD("draw_texture_rect","texture:Texture","rect","tile","modulate","transpose"),&CanvasItem::draw_texture_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_texture_rect_region","texture:Texture","rect","src_rect","modulate","transpose"),&CanvasItem::draw_texture_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ClassDB::bind_method(_MD("draw_style_box","style_box:StyleBox","rect"),&CanvasItem::draw_style_box); - ClassDB::bind_method(_MD("draw_primitive","points","colors","uvs","texture:Texture","width"),&CanvasItem::draw_primitive,DEFVAL(Variant()),DEFVAL(1.0)); - ClassDB::bind_method(_MD("draw_polygon","points","colors","uvs","texture:Texture"),&CanvasItem::draw_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("draw_colored_polygon","points","color","uvs","texture:Texture"),&CanvasItem::draw_colored_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); - ClassDB::bind_method(_MD("draw_string","font:Font","pos","text","modulate","clip_w"),&CanvasItem::draw_string,DEFVAL(Color(1,1,1)),DEFVAL(-1)); - ClassDB::bind_method(_MD("draw_char","font:Font","pos","char","next","modulate"),&CanvasItem::draw_char,DEFVAL(Color(1,1,1))); - - ClassDB::bind_method(_MD("draw_set_transform","pos","rot","scale"),&CanvasItem::draw_set_transform); - ClassDB::bind_method(_MD("draw_set_transform_matrix","xform"),&CanvasItem::draw_set_transform_matrix); - ClassDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform); - ClassDB::bind_method(_MD("get_global_transform"),&CanvasItem::get_global_transform); - ClassDB::bind_method(_MD("get_global_transform_with_canvas"),&CanvasItem::get_global_transform_with_canvas); - ClassDB::bind_method(_MD("get_viewport_transform"),&CanvasItem::get_viewport_transform); - ClassDB::bind_method(_MD("get_viewport_rect"),&CanvasItem::get_viewport_rect); - ClassDB::bind_method(_MD("get_canvas_transform"),&CanvasItem::get_canvas_transform); - ClassDB::bind_method(_MD("get_local_mouse_pos"),&CanvasItem::get_local_mouse_pos); - ClassDB::bind_method(_MD("get_global_mouse_pos"),&CanvasItem::get_global_mouse_pos); - ClassDB::bind_method(_MD("get_canvas"),&CanvasItem::get_canvas); - ClassDB::bind_method(_MD("get_world_2d"),&CanvasItem::get_world_2d); - //ClassDB::bind_method(_MD("get_viewport"),&CanvasItem::get_viewport); - - ClassDB::bind_method(_MD("set_material","material:CanvasItemMaterial"),&CanvasItem::set_material); - ClassDB::bind_method(_MD("get_material:CanvasItemMaterial"),&CanvasItem::get_material); - - ClassDB::bind_method(_MD("set_use_parent_material","enable"),&CanvasItem::set_use_parent_material); - ClassDB::bind_method(_MD("get_use_parent_material"),&CanvasItem::get_use_parent_material); - - ClassDB::bind_method(_MD("set_notify_local_transform","enable"),&CanvasItem::set_notify_local_transform); - ClassDB::bind_method(_MD("is_local_transform_notification_enabled"),&CanvasItem::is_local_transform_notification_enabled); - - ClassDB::bind_method(_MD("set_notify_transform","enable"),&CanvasItem::set_notify_transform); - ClassDB::bind_method(_MD("is_transform_notification_enabled"),&CanvasItem::is_transform_notification_enabled); - - ClassDB::bind_method(_MD("make_canvas_pos_local","screen_point"), + ClassDB::bind_method(D_METHOD("_toplevel_raise_self"),&CanvasItem::_toplevel_raise_self); + ClassDB::bind_method(D_METHOD("_update_callback"),&CanvasItem::_update_callback); + + ClassDB::bind_method(D_METHOD("edit_set_state","state"),&CanvasItem::edit_set_state); + ClassDB::bind_method(D_METHOD("edit_get_state:Variant"),&CanvasItem::edit_get_state); + ClassDB::bind_method(D_METHOD("edit_set_rect","rect"),&CanvasItem::edit_set_rect); + ClassDB::bind_method(D_METHOD("edit_rotate","degrees"),&CanvasItem::edit_rotate); + + ClassDB::bind_method(D_METHOD("get_item_rect"),&CanvasItem::get_item_rect); + ClassDB::bind_method(D_METHOD("get_item_and_children_rect"),&CanvasItem::get_item_and_children_rect); + //ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + + ClassDB::bind_method(D_METHOD("get_canvas_item"),&CanvasItem::get_canvas_item); + + ClassDB::bind_method(D_METHOD("set_visible"),&CanvasItem::set_visible); + ClassDB::bind_method(D_METHOD("is_visible"),&CanvasItem::is_visible); + ClassDB::bind_method(D_METHOD("is_visible_in_tree"),&CanvasItem::is_visible_in_tree); + ClassDB::bind_method(D_METHOD("show"),&CanvasItem::show); + ClassDB::bind_method(D_METHOD("hide"),&CanvasItem::hide); + + ClassDB::bind_method(D_METHOD("update"),&CanvasItem::update); + + ClassDB::bind_method(D_METHOD("set_as_toplevel","enable"),&CanvasItem::set_as_toplevel); + ClassDB::bind_method(D_METHOD("is_set_as_toplevel"),&CanvasItem::is_set_as_toplevel); + + ClassDB::bind_method(D_METHOD("set_light_mask","light_mask"),&CanvasItem::set_light_mask); + ClassDB::bind_method(D_METHOD("get_light_mask"),&CanvasItem::get_light_mask); + + ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&CanvasItem::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&CanvasItem::get_modulate); + ClassDB::bind_method(D_METHOD("set_self_modulate","self_modulate"),&CanvasItem::set_self_modulate); + ClassDB::bind_method(D_METHOD("get_self_modulate"),&CanvasItem::get_self_modulate); + + ClassDB::bind_method(D_METHOD("set_draw_behind_parent","enable"),&CanvasItem::set_draw_behind_parent); + ClassDB::bind_method(D_METHOD("is_draw_behind_parent_enabled"),&CanvasItem::is_draw_behind_parent_enabled); + + ClassDB::bind_method(D_METHOD("_set_on_top","on_top"),&CanvasItem::_set_on_top); + ClassDB::bind_method(D_METHOD("_is_on_top"),&CanvasItem::_is_on_top); + //ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + + ClassDB::bind_method(D_METHOD("draw_line","from","to","color","width","antialiased"),&CanvasItem::draw_line,DEFVAL(1.0),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_rect","rect","color"),&CanvasItem::draw_rect); + ClassDB::bind_method(D_METHOD("draw_circle","pos","radius","color"),&CanvasItem::draw_circle); + ClassDB::bind_method(D_METHOD("draw_texture","texture:Texture","pos","modulate"),&CanvasItem::draw_texture,DEFVAL(Color(1,1,1,1))); + ClassDB::bind_method(D_METHOD("draw_texture_rect","texture:Texture","rect","tile","modulate","transpose"),&CanvasItem::draw_texture_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_texture_rect_region","texture:Texture","rect","src_rect","modulate","transpose"),&CanvasItem::draw_texture_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("draw_style_box","style_box:StyleBox","rect"),&CanvasItem::draw_style_box); + ClassDB::bind_method(D_METHOD("draw_primitive","points","colors","uvs","texture:Texture","width"),&CanvasItem::draw_primitive,DEFVAL(Variant()),DEFVAL(1.0)); + ClassDB::bind_method(D_METHOD("draw_polygon","points","colors","uvs","texture:Texture"),&CanvasItem::draw_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("draw_colored_polygon","points","color","uvs","texture:Texture"),&CanvasItem::draw_colored_polygon,DEFVAL(PoolVector2Array()),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("draw_string","font:Font","pos","text","modulate","clip_w"),&CanvasItem::draw_string,DEFVAL(Color(1,1,1)),DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("draw_char","font:Font","pos","char","next","modulate"),&CanvasItem::draw_char,DEFVAL(Color(1,1,1))); + + ClassDB::bind_method(D_METHOD("draw_set_transform","pos","rot","scale"),&CanvasItem::draw_set_transform); + ClassDB::bind_method(D_METHOD("draw_set_transform_matrix","xform"),&CanvasItem::draw_set_transform_matrix); + ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + ClassDB::bind_method(D_METHOD("get_global_transform"),&CanvasItem::get_global_transform); + ClassDB::bind_method(D_METHOD("get_global_transform_with_canvas"),&CanvasItem::get_global_transform_with_canvas); + ClassDB::bind_method(D_METHOD("get_viewport_transform"),&CanvasItem::get_viewport_transform); + ClassDB::bind_method(D_METHOD("get_viewport_rect"),&CanvasItem::get_viewport_rect); + ClassDB::bind_method(D_METHOD("get_canvas_transform"),&CanvasItem::get_canvas_transform); + ClassDB::bind_method(D_METHOD("get_local_mouse_pos"),&CanvasItem::get_local_mouse_pos); + ClassDB::bind_method(D_METHOD("get_global_mouse_pos"),&CanvasItem::get_global_mouse_pos); + ClassDB::bind_method(D_METHOD("get_canvas"),&CanvasItem::get_canvas); + ClassDB::bind_method(D_METHOD("get_world_2d"),&CanvasItem::get_world_2d); + //ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasItem::get_viewport); + + ClassDB::bind_method(D_METHOD("set_material","material:CanvasItemMaterial"),&CanvasItem::set_material); + ClassDB::bind_method(D_METHOD("get_material:CanvasItemMaterial"),&CanvasItem::get_material); + + ClassDB::bind_method(D_METHOD("set_use_parent_material","enable"),&CanvasItem::set_use_parent_material); + ClassDB::bind_method(D_METHOD("get_use_parent_material"),&CanvasItem::get_use_parent_material); + + ClassDB::bind_method(D_METHOD("set_notify_local_transform","enable"),&CanvasItem::set_notify_local_transform); + ClassDB::bind_method(D_METHOD("is_local_transform_notification_enabled"),&CanvasItem::is_local_transform_notification_enabled); + + ClassDB::bind_method(D_METHOD("set_notify_transform","enable"),&CanvasItem::set_notify_transform); + ClassDB::bind_method(D_METHOD("is_transform_notification_enabled"),&CanvasItem::is_transform_notification_enabled); + + ClassDB::bind_method(D_METHOD("make_canvas_pos_local","screen_point"), &CanvasItem::make_canvas_pos_local); - ClassDB::bind_method(_MD("make_input_local","event"),&CanvasItem::make_input_local); + ClassDB::bind_method(D_METHOD("make_input_local","event"),&CanvasItem::make_input_local); BIND_VMETHOD(MethodInfo("_draw")); diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp index 3c84edf1e3..ecc11ea60f 100644 --- a/scene/2d/canvas_modulate.cpp +++ b/scene/2d/canvas_modulate.cpp @@ -62,8 +62,8 @@ void CanvasModulate::_notification(int p_what) { void CanvasModulate::_bind_methods(){ - ClassDB::bind_method(_MD("set_color","color"),&CanvasModulate::set_color); - ClassDB::bind_method(_MD("get_color"),&CanvasModulate::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&CanvasModulate::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&CanvasModulate::get_color); ADD_PROPERTY(PropertyInfo(Variant::COLOR,"color"),"set_color","get_color"); } diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 18313f8fa3..7b935e0d59 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -221,20 +221,20 @@ void CollisionObject2D::_update_pickable() { void CollisionObject2D::_bind_methods() { - ClassDB::bind_method(_MD("add_shape","shape:Shape2D","transform"),&CollisionObject2D::add_shape,DEFVAL(Transform2D())); - ClassDB::bind_method(_MD("get_shape_count"),&CollisionObject2D::get_shape_count); - ClassDB::bind_method(_MD("set_shape","shape_idx","shape:Shape"),&CollisionObject2D::set_shape); - ClassDB::bind_method(_MD("set_shape_transform","shape_idx","transform"),&CollisionObject2D::set_shape_transform); - ClassDB::bind_method(_MD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject2D::set_shape_as_trigger); - ClassDB::bind_method(_MD("get_shape:Shape2D","shape_idx"),&CollisionObject2D::get_shape); - ClassDB::bind_method(_MD("get_shape_transform","shape_idx"),&CollisionObject2D::get_shape_transform); - ClassDB::bind_method(_MD("is_shape_set_as_trigger","shape_idx"),&CollisionObject2D::is_shape_set_as_trigger); - ClassDB::bind_method(_MD("remove_shape","shape_idx"),&CollisionObject2D::remove_shape); - ClassDB::bind_method(_MD("clear_shapes"),&CollisionObject2D::clear_shapes); - ClassDB::bind_method(_MD("get_rid"),&CollisionObject2D::get_rid); - - ClassDB::bind_method(_MD("set_pickable","enabled"),&CollisionObject2D::set_pickable); - ClassDB::bind_method(_MD("is_pickable"),&CollisionObject2D::is_pickable); + ClassDB::bind_method(D_METHOD("add_shape","shape:Shape2D","transform"),&CollisionObject2D::add_shape,DEFVAL(Transform2D())); + ClassDB::bind_method(D_METHOD("get_shape_count"),&CollisionObject2D::get_shape_count); + ClassDB::bind_method(D_METHOD("set_shape","shape_idx","shape:Shape"),&CollisionObject2D::set_shape); + ClassDB::bind_method(D_METHOD("set_shape_transform","shape_idx","transform"),&CollisionObject2D::set_shape_transform); + ClassDB::bind_method(D_METHOD("set_shape_as_trigger","shape_idx","enable"),&CollisionObject2D::set_shape_as_trigger); + ClassDB::bind_method(D_METHOD("get_shape:Shape2D","shape_idx"),&CollisionObject2D::get_shape); + ClassDB::bind_method(D_METHOD("get_shape_transform","shape_idx"),&CollisionObject2D::get_shape_transform); + ClassDB::bind_method(D_METHOD("is_shape_set_as_trigger","shape_idx"),&CollisionObject2D::is_shape_set_as_trigger); + ClassDB::bind_method(D_METHOD("remove_shape","shape_idx"),&CollisionObject2D::remove_shape); + ClassDB::bind_method(D_METHOD("clear_shapes"),&CollisionObject2D::clear_shapes); + ClassDB::bind_method(D_METHOD("get_rid"),&CollisionObject2D::get_rid); + + ClassDB::bind_method(D_METHOD("set_pickable","enabled"),&CollisionObject2D::set_pickable); + ClassDB::bind_method(D_METHOD("is_pickable"),&CollisionObject2D::is_pickable); BIND_VMETHOD( MethodInfo("_input_event",PropertyInfo(Variant::OBJECT,"viewport"),PropertyInfo(Variant::INPUT_EVENT,"event"),PropertyInfo(Variant::INT,"shape_idx"))); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 2a57bd7616..85241a79e0 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -314,21 +314,21 @@ String CollisionPolygon2D::get_configuration_warning() const { void CollisionPolygon2D::_bind_methods() { - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionPolygon2D::_add_to_collision_object); - ClassDB::bind_method(_MD("set_polygon","polygon"),&CollisionPolygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&CollisionPolygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionPolygon2D::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&CollisionPolygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&CollisionPolygon2D::get_polygon); - ClassDB::bind_method(_MD("set_build_mode","build_mode"),&CollisionPolygon2D::set_build_mode); - ClassDB::bind_method(_MD("get_build_mode"),&CollisionPolygon2D::get_build_mode); + ClassDB::bind_method(D_METHOD("set_build_mode","build_mode"),&CollisionPolygon2D::set_build_mode); + ClassDB::bind_method(D_METHOD("get_build_mode"),&CollisionPolygon2D::get_build_mode); - ClassDB::bind_method(_MD("set_trigger","trigger"),&CollisionPolygon2D::set_trigger); - ClassDB::bind_method(_MD("is_trigger"),&CollisionPolygon2D::is_trigger); + ClassDB::bind_method(D_METHOD("set_trigger","trigger"),&CollisionPolygon2D::set_trigger); + ClassDB::bind_method(D_METHOD("is_trigger"),&CollisionPolygon2D::is_trigger); - ClassDB::bind_method(_MD("_set_shape_range","shape_range"),&CollisionPolygon2D::_set_shape_range); - ClassDB::bind_method(_MD("_get_shape_range"),&CollisionPolygon2D::_get_shape_range); + ClassDB::bind_method(D_METHOD("_set_shape_range","shape_range"),&CollisionPolygon2D::_set_shape_range); + ClassDB::bind_method(D_METHOD("_get_shape_range"),&CollisionPolygon2D::_get_shape_range); - ClassDB::bind_method(_MD("get_collision_object_first_shape"),&CollisionPolygon2D::get_collision_object_first_shape); - ClassDB::bind_method(_MD("get_collision_object_last_shape"),&CollisionPolygon2D::get_collision_object_last_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_first_shape"),&CollisionPolygon2D::get_collision_object_first_shape); + ClassDB::bind_method(D_METHOD("get_collision_object_last_shape"),&CollisionPolygon2D::get_collision_object_last_shape); ADD_PROPERTY( PropertyInfo(Variant::INT,"build_mode",PROPERTY_HINT_ENUM,"Solids,Segments"),"set_build_mode","get_build_mode"); ADD_PROPERTY( PropertyInfo(Variant::POOL_VECTOR2_ARRAY,"polygon"),"set_polygon","get_polygon"); diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 60f072e49d..37a49577b5 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -218,17 +218,17 @@ String CollisionShape2D::get_configuration_warning() const { void CollisionShape2D::_bind_methods() { - ClassDB::bind_method(_MD("set_shape","shape"),&CollisionShape2D::set_shape); - ClassDB::bind_method(_MD("get_shape"),&CollisionShape2D::get_shape); - ClassDB::bind_method(_MD("_shape_changed"),&CollisionShape2D::_shape_changed); - ClassDB::bind_method(_MD("_add_to_collision_object"),&CollisionShape2D::_add_to_collision_object); - ClassDB::bind_method(_MD("set_trigger","enable"),&CollisionShape2D::set_trigger); - ClassDB::bind_method(_MD("is_trigger"),&CollisionShape2D::is_trigger); + ClassDB::bind_method(D_METHOD("set_shape","shape"),&CollisionShape2D::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&CollisionShape2D::get_shape); + ClassDB::bind_method(D_METHOD("_shape_changed"),&CollisionShape2D::_shape_changed); + ClassDB::bind_method(D_METHOD("_add_to_collision_object"),&CollisionShape2D::_add_to_collision_object); + ClassDB::bind_method(D_METHOD("set_trigger","enable"),&CollisionShape2D::set_trigger); + ClassDB::bind_method(D_METHOD("is_trigger"),&CollisionShape2D::is_trigger); - ClassDB::bind_method(_MD("_set_update_shape_index","index"),&CollisionShape2D::_set_update_shape_index); - ClassDB::bind_method(_MD("_get_update_shape_index"),&CollisionShape2D::_get_update_shape_index); + ClassDB::bind_method(D_METHOD("_set_update_shape_index","index"),&CollisionShape2D::_set_update_shape_index); + ClassDB::bind_method(D_METHOD("_get_update_shape_index"),&CollisionShape2D::_get_update_shape_index); - ClassDB::bind_method(_MD("get_collision_object_shape_index"),&CollisionShape2D::get_collision_object_shape_index); + ClassDB::bind_method(D_METHOD("get_collision_object_shape_index"),&CollisionShape2D::get_collision_object_shape_index); ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"shape",PROPERTY_HINT_RESOURCE_TYPE,"Shape2D"),"set_shape","get_shape"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"trigger"),"set_trigger","is_trigger"); diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index 6e69e4bd7d..6754eb3981 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -128,17 +128,17 @@ bool Joint2D::get_exclude_nodes_from_collision() const{ void Joint2D::_bind_methods() { - ClassDB::bind_method( _MD("set_node_a","node"), &Joint2D::set_node_a ); - ClassDB::bind_method( _MD("get_node_a"), &Joint2D::get_node_a ); + ClassDB::bind_method( D_METHOD("set_node_a","node"), &Joint2D::set_node_a ); + ClassDB::bind_method( D_METHOD("get_node_a"), &Joint2D::get_node_a ); - ClassDB::bind_method( _MD("set_node_b","node"), &Joint2D::set_node_b ); - ClassDB::bind_method( _MD("get_node_b"), &Joint2D::get_node_b ); + ClassDB::bind_method( D_METHOD("set_node_b","node"), &Joint2D::set_node_b ); + ClassDB::bind_method( D_METHOD("get_node_b"), &Joint2D::get_node_b ); - ClassDB::bind_method( _MD("set_bias","bias"), &Joint2D::set_bias ); - ClassDB::bind_method( _MD("get_bias"), &Joint2D::get_bias ); + ClassDB::bind_method( D_METHOD("set_bias","bias"), &Joint2D::set_bias ); + ClassDB::bind_method( D_METHOD("get_bias"), &Joint2D::get_bias ); - ClassDB::bind_method( _MD("set_exclude_nodes_from_collision","enable"), &Joint2D::set_exclude_nodes_from_collision ); - ClassDB::bind_method( _MD("get_exclude_nodes_from_collision"), &Joint2D::get_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("set_exclude_nodes_from_collision","enable"), &Joint2D::set_exclude_nodes_from_collision ); + ClassDB::bind_method( D_METHOD("get_exclude_nodes_from_collision"), &Joint2D::get_exclude_nodes_from_collision ); ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "node_a"), "set_node_a","get_node_a") ; ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "node_b"), "set_node_b","get_node_b") ; @@ -225,8 +225,8 @@ real_t PinJoint2D::get_softness() const { void PinJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_softness","softness"), &PinJoint2D::set_softness); - ClassDB::bind_method(_MD("get_softness"), &PinJoint2D::get_softness); + ClassDB::bind_method(D_METHOD("set_softness","softness"), &PinJoint2D::set_softness); + ClassDB::bind_method(D_METHOD("get_softness"), &PinJoint2D::get_softness); ADD_PROPERTY( PropertyInfo( Variant::REAL, "softness", PROPERTY_HINT_EXP_RANGE,"0.00,16,0.01"), "set_softness", "get_softness"); } @@ -321,10 +321,10 @@ real_t GrooveJoint2D::get_initial_offset() const { void GrooveJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&GrooveJoint2D::set_length); - ClassDB::bind_method(_MD("get_length"),&GrooveJoint2D::get_length); - ClassDB::bind_method(_MD("set_initial_offset","offset"),&GrooveJoint2D::set_initial_offset); - ClassDB::bind_method(_MD("get_initial_offset"),&GrooveJoint2D::get_initial_offset); + ClassDB::bind_method(D_METHOD("set_length","length"),&GrooveJoint2D::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&GrooveJoint2D::get_length); + ClassDB::bind_method(D_METHOD("set_initial_offset","offset"),&GrooveJoint2D::set_initial_offset); + ClassDB::bind_method(D_METHOD("get_initial_offset"),&GrooveJoint2D::get_initial_offset); ADD_PROPERTY( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_length","get_length"); ADD_PROPERTY( PropertyInfo( Variant::REAL, "initial_offset", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_initial_offset","get_initial_offset"); @@ -453,14 +453,14 @@ real_t DampedSpringJoint2D::get_damping() const { void DampedSpringJoint2D::_bind_methods() { - ClassDB::bind_method(_MD("set_length","length"),&DampedSpringJoint2D::set_length); - ClassDB::bind_method(_MD("get_length"),&DampedSpringJoint2D::get_length); - ClassDB::bind_method(_MD("set_rest_length","rest_length"),&DampedSpringJoint2D::set_rest_length); - ClassDB::bind_method(_MD("get_rest_length"),&DampedSpringJoint2D::get_rest_length); - ClassDB::bind_method(_MD("set_stiffness","stiffness"),&DampedSpringJoint2D::set_stiffness); - ClassDB::bind_method(_MD("get_stiffness"),&DampedSpringJoint2D::get_stiffness); - ClassDB::bind_method(_MD("set_damping","damping"),&DampedSpringJoint2D::set_damping); - ClassDB::bind_method(_MD("get_damping"),&DampedSpringJoint2D::get_damping); + ClassDB::bind_method(D_METHOD("set_length","length"),&DampedSpringJoint2D::set_length); + ClassDB::bind_method(D_METHOD("get_length"),&DampedSpringJoint2D::get_length); + ClassDB::bind_method(D_METHOD("set_rest_length","rest_length"),&DampedSpringJoint2D::set_rest_length); + ClassDB::bind_method(D_METHOD("get_rest_length"),&DampedSpringJoint2D::get_rest_length); + ClassDB::bind_method(D_METHOD("set_stiffness","stiffness"),&DampedSpringJoint2D::set_stiffness); + ClassDB::bind_method(D_METHOD("get_stiffness"),&DampedSpringJoint2D::get_stiffness); + ClassDB::bind_method(D_METHOD("set_damping","damping"),&DampedSpringJoint2D::set_damping); + ClassDB::bind_method(D_METHOD("get_damping"),&DampedSpringJoint2D::get_damping); ADD_PROPERTY( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_EXP_RANGE,"1,65535,1"), "set_length","get_length"); ADD_PROPERTY( PropertyInfo( Variant::REAL, "rest_length", PROPERTY_HINT_EXP_RANGE,"0,65535,1"), "set_rest_length","get_rest_length"); diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 2f89026367..d7f5a890e8 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -365,67 +365,67 @@ String Light2D::get_configuration_warning() const { void Light2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&Light2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&Light2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&Light2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&Light2D::is_enabled); - ClassDB::bind_method(_MD("set_editor_only","editor_only"), &Light2D::set_editor_only ); - ClassDB::bind_method(_MD("is_editor_only"), &Light2D::is_editor_only ); + ClassDB::bind_method(D_METHOD("set_editor_only","editor_only"), &Light2D::set_editor_only ); + ClassDB::bind_method(D_METHOD("is_editor_only"), &Light2D::is_editor_only ); - ClassDB::bind_method(_MD("set_texture","texture"),&Light2D::set_texture); - ClassDB::bind_method(_MD("get_texture"),&Light2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&Light2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&Light2D::get_texture); - ClassDB::bind_method(_MD("set_texture_offset","texture_offset"),&Light2D::set_texture_offset); - ClassDB::bind_method(_MD("get_texture_offset"),&Light2D::get_texture_offset); + ClassDB::bind_method(D_METHOD("set_texture_offset","texture_offset"),&Light2D::set_texture_offset); + ClassDB::bind_method(D_METHOD("get_texture_offset"),&Light2D::get_texture_offset); - ClassDB::bind_method(_MD("set_color","color"),&Light2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Light2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Light2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Light2D::get_color); - ClassDB::bind_method(_MD("set_height","height"),&Light2D::set_height); - ClassDB::bind_method(_MD("get_height"),&Light2D::get_height); + ClassDB::bind_method(D_METHOD("set_height","height"),&Light2D::set_height); + ClassDB::bind_method(D_METHOD("get_height"),&Light2D::get_height); - ClassDB::bind_method(_MD("set_energy","energy"),&Light2D::set_energy); - ClassDB::bind_method(_MD("get_energy"),&Light2D::get_energy); + ClassDB::bind_method(D_METHOD("set_energy","energy"),&Light2D::set_energy); + ClassDB::bind_method(D_METHOD("get_energy"),&Light2D::get_energy); - ClassDB::bind_method(_MD("set_texture_scale","texture_scale"),&Light2D::set_texture_scale); - ClassDB::bind_method(_MD("get_texture_scale"),&Light2D::get_texture_scale); + ClassDB::bind_method(D_METHOD("set_texture_scale","texture_scale"),&Light2D::set_texture_scale); + ClassDB::bind_method(D_METHOD("get_texture_scale"),&Light2D::get_texture_scale); - ClassDB::bind_method(_MD("set_z_range_min","z"),&Light2D::set_z_range_min); - ClassDB::bind_method(_MD("get_z_range_min"),&Light2D::get_z_range_min); + ClassDB::bind_method(D_METHOD("set_z_range_min","z"),&Light2D::set_z_range_min); + ClassDB::bind_method(D_METHOD("get_z_range_min"),&Light2D::get_z_range_min); - ClassDB::bind_method(_MD("set_z_range_max","z"),&Light2D::set_z_range_max); - ClassDB::bind_method(_MD("get_z_range_max"),&Light2D::get_z_range_max); + ClassDB::bind_method(D_METHOD("set_z_range_max","z"),&Light2D::set_z_range_max); + ClassDB::bind_method(D_METHOD("get_z_range_max"),&Light2D::get_z_range_max); - ClassDB::bind_method(_MD("set_layer_range_min","layer"),&Light2D::set_layer_range_min); - ClassDB::bind_method(_MD("get_layer_range_min"),&Light2D::get_layer_range_min); + ClassDB::bind_method(D_METHOD("set_layer_range_min","layer"),&Light2D::set_layer_range_min); + ClassDB::bind_method(D_METHOD("get_layer_range_min"),&Light2D::get_layer_range_min); - ClassDB::bind_method(_MD("set_layer_range_max","layer"),&Light2D::set_layer_range_max); - ClassDB::bind_method(_MD("get_layer_range_max"),&Light2D::get_layer_range_max); + ClassDB::bind_method(D_METHOD("set_layer_range_max","layer"),&Light2D::set_layer_range_max); + ClassDB::bind_method(D_METHOD("get_layer_range_max"),&Light2D::get_layer_range_max); - ClassDB::bind_method(_MD("set_item_cull_mask","item_cull_mask"),&Light2D::set_item_cull_mask); - ClassDB::bind_method(_MD("get_item_cull_mask"),&Light2D::get_item_cull_mask); + ClassDB::bind_method(D_METHOD("set_item_cull_mask","item_cull_mask"),&Light2D::set_item_cull_mask); + ClassDB::bind_method(D_METHOD("get_item_cull_mask"),&Light2D::get_item_cull_mask); - ClassDB::bind_method(_MD("set_item_shadow_cull_mask","item_shadow_cull_mask"),&Light2D::set_item_shadow_cull_mask); - ClassDB::bind_method(_MD("get_item_shadow_cull_mask"),&Light2D::get_item_shadow_cull_mask); + ClassDB::bind_method(D_METHOD("set_item_shadow_cull_mask","item_shadow_cull_mask"),&Light2D::set_item_shadow_cull_mask); + ClassDB::bind_method(D_METHOD("get_item_shadow_cull_mask"),&Light2D::get_item_shadow_cull_mask); - ClassDB::bind_method(_MD("set_mode","mode"),&Light2D::set_mode); - ClassDB::bind_method(_MD("get_mode"),&Light2D::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&Light2D::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&Light2D::get_mode); - ClassDB::bind_method(_MD("set_shadow_enabled","enabled"),&Light2D::set_shadow_enabled); - ClassDB::bind_method(_MD("is_shadow_enabled"),&Light2D::is_shadow_enabled); + ClassDB::bind_method(D_METHOD("set_shadow_enabled","enabled"),&Light2D::set_shadow_enabled); + ClassDB::bind_method(D_METHOD("is_shadow_enabled"),&Light2D::is_shadow_enabled); - ClassDB::bind_method(_MD("set_shadow_buffer_size","size"),&Light2D::set_shadow_buffer_size); - ClassDB::bind_method(_MD("get_shadow_buffer_size"),&Light2D::get_shadow_buffer_size); + ClassDB::bind_method(D_METHOD("set_shadow_buffer_size","size"),&Light2D::set_shadow_buffer_size); + ClassDB::bind_method(D_METHOD("get_shadow_buffer_size"),&Light2D::get_shadow_buffer_size); - ClassDB::bind_method(_MD("set_shadow_gradient_length","multiplier"),&Light2D::set_shadow_gradient_length); - ClassDB::bind_method(_MD("get_shadow_gradient_length"),&Light2D::get_shadow_gradient_length); + ClassDB::bind_method(D_METHOD("set_shadow_gradient_length","multiplier"),&Light2D::set_shadow_gradient_length); + ClassDB::bind_method(D_METHOD("get_shadow_gradient_length"),&Light2D::get_shadow_gradient_length); - ClassDB::bind_method(_MD("set_shadow_filter","filter"),&Light2D::set_shadow_filter); - ClassDB::bind_method(_MD("get_shadow_filter"),&Light2D::get_shadow_filter); + ClassDB::bind_method(D_METHOD("set_shadow_filter","filter"),&Light2D::set_shadow_filter); + ClassDB::bind_method(D_METHOD("get_shadow_filter"),&Light2D::get_shadow_filter); - ClassDB::bind_method(_MD("set_shadow_color","shadow_color"),&Light2D::set_shadow_color); - ClassDB::bind_method(_MD("get_shadow_color"),&Light2D::get_shadow_color); + ClassDB::bind_method(D_METHOD("set_shadow_color","shadow_color"),&Light2D::set_shadow_color); + ClassDB::bind_method(D_METHOD("get_shadow_color"),&Light2D::get_shadow_color); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 299fdc0331..6a024fe330 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -78,14 +78,14 @@ RID OccluderPolygon2D::get_rid() const { void OccluderPolygon2D::_bind_methods() { - ClassDB::bind_method(_MD("set_closed","closed"),&OccluderPolygon2D::set_closed); - ClassDB::bind_method(_MD("is_closed"),&OccluderPolygon2D::is_closed); + ClassDB::bind_method(D_METHOD("set_closed","closed"),&OccluderPolygon2D::set_closed); + ClassDB::bind_method(D_METHOD("is_closed"),&OccluderPolygon2D::is_closed); - ClassDB::bind_method(_MD("set_cull_mode","cull_mode"),&OccluderPolygon2D::set_cull_mode); - ClassDB::bind_method(_MD("get_cull_mode"),&OccluderPolygon2D::get_cull_mode); + ClassDB::bind_method(D_METHOD("set_cull_mode","cull_mode"),&OccluderPolygon2D::set_cull_mode); + ClassDB::bind_method(D_METHOD("get_cull_mode"),&OccluderPolygon2D::get_cull_mode); - ClassDB::bind_method(_MD("set_polygon","polygon"),&OccluderPolygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&OccluderPolygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&OccluderPolygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&OccluderPolygon2D::get_polygon); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"closed"),"set_closed","is_closed"); ADD_PROPERTY( PropertyInfo(Variant::INT,"cull_mode",PROPERTY_HINT_ENUM,"Disabled,ClockWise,CounterClockWise"),"set_cull_mode","get_cull_mode"); @@ -224,11 +224,11 @@ String LightOccluder2D::get_configuration_warning() const { void LightOccluder2D::_bind_methods() { - ClassDB::bind_method(_MD("set_occluder_polygon","polygon:OccluderPolygon2D"),&LightOccluder2D::set_occluder_polygon); - ClassDB::bind_method(_MD("get_occluder_polygon:OccluderPolygon2D"),&LightOccluder2D::get_occluder_polygon); + ClassDB::bind_method(D_METHOD("set_occluder_polygon","polygon:OccluderPolygon2D"),&LightOccluder2D::set_occluder_polygon); + ClassDB::bind_method(D_METHOD("get_occluder_polygon:OccluderPolygon2D"),&LightOccluder2D::get_occluder_polygon); - ClassDB::bind_method(_MD("set_occluder_light_mask","mask"),&LightOccluder2D::set_occluder_light_mask); - ClassDB::bind_method(_MD("get_occluder_light_mask"),&LightOccluder2D::get_occluder_light_mask); + ClassDB::bind_method(D_METHOD("set_occluder_light_mask","mask"),&LightOccluder2D::set_occluder_light_mask); + ClassDB::bind_method(D_METHOD("get_occluder_light_mask"),&LightOccluder2D::get_occluder_light_mask); #ifdef DEBUG_ENABLED ClassDB::bind_method("_poly_changed",&LightOccluder2D::_poly_changed); diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index 91d6d341d7..3da29ef385 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -236,46 +236,46 @@ void Line2D::_gradient_changed() { // static void Line2D::_bind_methods() { - ClassDB::bind_method(_MD("set_points","points"), &Line2D::set_points); - ClassDB::bind_method(_MD("get_points"), &Line2D::get_points); + ClassDB::bind_method(D_METHOD("set_points","points"), &Line2D::set_points); + ClassDB::bind_method(D_METHOD("get_points"), &Line2D::get_points); - ClassDB::bind_method(_MD("set_point_pos","i", "pos"), &Line2D::set_point_pos); - ClassDB::bind_method(_MD("get_point_pos", "i"), &Line2D::get_point_pos); + ClassDB::bind_method(D_METHOD("set_point_pos","i", "pos"), &Line2D::set_point_pos); + ClassDB::bind_method(D_METHOD("get_point_pos", "i"), &Line2D::get_point_pos); - ClassDB::bind_method(_MD("get_point_count"), &Line2D::get_point_count); + ClassDB::bind_method(D_METHOD("get_point_count"), &Line2D::get_point_count); - ClassDB::bind_method(_MD("add_point", "pos"), &Line2D::add_point); - ClassDB::bind_method(_MD("remove_point", "i"), &Line2D::remove_point); + ClassDB::bind_method(D_METHOD("add_point", "pos"), &Line2D::add_point); + ClassDB::bind_method(D_METHOD("remove_point", "i"), &Line2D::remove_point); - ClassDB::bind_method(_MD("set_width","width"), &Line2D::set_width); - ClassDB::bind_method(_MD("get_width"), &Line2D::get_width); + ClassDB::bind_method(D_METHOD("set_width","width"), &Line2D::set_width); + ClassDB::bind_method(D_METHOD("get_width"), &Line2D::get_width); - ClassDB::bind_method(_MD("set_default_color", "color"), &Line2D::set_default_color); - ClassDB::bind_method(_MD("get_default_color"), &Line2D::get_default_color); + ClassDB::bind_method(D_METHOD("set_default_color", "color"), &Line2D::set_default_color); + ClassDB::bind_method(D_METHOD("get_default_color"), &Line2D::get_default_color); - ClassDB::bind_method(_MD("set_gradient", "color"), &Line2D::set_gradient); - ClassDB::bind_method(_MD("get_gradient"), &Line2D::get_gradient); + ClassDB::bind_method(D_METHOD("set_gradient", "color"), &Line2D::set_gradient); + ClassDB::bind_method(D_METHOD("get_gradient"), &Line2D::get_gradient); - ClassDB::bind_method(_MD("set_texture", "texture"), &Line2D::set_texture); - ClassDB::bind_method(_MD("get_texture"), &Line2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture", "texture"), &Line2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"), &Line2D::get_texture); - ClassDB::bind_method(_MD("set_texture_mode", "mode"), &Line2D::set_texture_mode); - ClassDB::bind_method(_MD("get_texture_mode"), &Line2D::get_texture_mode); + ClassDB::bind_method(D_METHOD("set_texture_mode", "mode"), &Line2D::set_texture_mode); + ClassDB::bind_method(D_METHOD("get_texture_mode"), &Line2D::get_texture_mode); - ClassDB::bind_method(_MD("set_joint_mode", "mode"), &Line2D::set_joint_mode); - ClassDB::bind_method(_MD("get_joint_mode"), &Line2D::get_joint_mode); + ClassDB::bind_method(D_METHOD("set_joint_mode", "mode"), &Line2D::set_joint_mode); + ClassDB::bind_method(D_METHOD("get_joint_mode"), &Line2D::get_joint_mode); - ClassDB::bind_method(_MD("set_begin_cap_mode", "mode"), &Line2D::set_begin_cap_mode); - ClassDB::bind_method(_MD("get_begin_cap_mode"), &Line2D::get_begin_cap_mode); + ClassDB::bind_method(D_METHOD("set_begin_cap_mode", "mode"), &Line2D::set_begin_cap_mode); + ClassDB::bind_method(D_METHOD("get_begin_cap_mode"), &Line2D::get_begin_cap_mode); - ClassDB::bind_method(_MD("set_end_cap_mode", "mode"), &Line2D::set_end_cap_mode); - ClassDB::bind_method(_MD("get_end_cap_mode"), &Line2D::get_end_cap_mode); + ClassDB::bind_method(D_METHOD("set_end_cap_mode", "mode"), &Line2D::set_end_cap_mode); + ClassDB::bind_method(D_METHOD("get_end_cap_mode"), &Line2D::get_end_cap_mode); - ClassDB::bind_method(_MD("set_sharp_limit", "limit"), &Line2D::set_sharp_limit); - ClassDB::bind_method(_MD("get_sharp_limit"), &Line2D::get_sharp_limit); + ClassDB::bind_method(D_METHOD("set_sharp_limit", "limit"), &Line2D::set_sharp_limit); + ClassDB::bind_method(D_METHOD("get_sharp_limit"), &Line2D::get_sharp_limit); - ClassDB::bind_method(_MD("set_round_precision", "precision"), &Line2D::set_round_precision); - ClassDB::bind_method(_MD("get_round_precision"), &Line2D::get_round_precision); + ClassDB::bind_method(D_METHOD("set_round_precision", "precision"), &Line2D::set_round_precision); + ClassDB::bind_method(D_METHOD("get_round_precision"), &Line2D::get_round_precision); ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "points"), "set_points", "get_points"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "width"), "set_width", "get_width"); @@ -300,7 +300,7 @@ void Line2D::_bind_methods() { BIND_CONSTANT(LINE_TEXTURE_NONE); BIND_CONSTANT(LINE_TEXTURE_TILE); - ClassDB::bind_method(_MD("_gradient_changed"), &Line2D::_gradient_changed); + ClassDB::bind_method(D_METHOD("_gradient_changed"), &Line2D::_gradient_changed); } diff --git a/scene/2d/navigation2d.cpp b/scene/2d/navigation2d.cpp index ec1109b41b..7f48749dc3 100644 --- a/scene/2d/navigation2d.cpp +++ b/scene/2d/navigation2d.cpp @@ -804,13 +804,13 @@ Object* Navigation2D::get_closest_point_owner(const Vector2& p_point) { void Navigation2D::_bind_methods() { - ClassDB::bind_method(_MD("navpoly_create","mesh:NavigationPolygon","xform","owner"),&Navigation2D::navpoly_create,DEFVAL(Variant())); - ClassDB::bind_method(_MD("navpoly_set_transform","id","xform"),&Navigation2D::navpoly_set_transform); - ClassDB::bind_method(_MD("navpoly_remove","id"),&Navigation2D::navpoly_remove); + ClassDB::bind_method(D_METHOD("navpoly_create","mesh:NavigationPolygon","xform","owner"),&Navigation2D::navpoly_create,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("navpoly_set_transform","id","xform"),&Navigation2D::navpoly_set_transform); + ClassDB::bind_method(D_METHOD("navpoly_remove","id"),&Navigation2D::navpoly_remove); - ClassDB::bind_method(_MD("get_simple_path","start","end","optimize"),&Navigation2D::get_simple_path,DEFVAL(true)); - ClassDB::bind_method(_MD("get_closest_point","to_point"),&Navigation2D::get_closest_point); - ClassDB::bind_method(_MD("get_closest_point_owner","to_point"),&Navigation2D::get_closest_point_owner); + ClassDB::bind_method(D_METHOD("get_simple_path","start","end","optimize"),&Navigation2D::get_simple_path,DEFVAL(true)); + ClassDB::bind_method(D_METHOD("get_closest_point","to_point"),&Navigation2D::get_closest_point); + ClassDB::bind_method(D_METHOD("get_closest_point_owner","to_point"),&Navigation2D::get_closest_point_owner); } diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index a647134c85..9dbbd34ae9 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -247,28 +247,28 @@ void NavigationPolygon::make_polygons_from_outlines(){ void NavigationPolygon::_bind_methods() { - ClassDB::bind_method(_MD("set_vertices","vertices"),&NavigationPolygon::set_vertices); - ClassDB::bind_method(_MD("get_vertices"),&NavigationPolygon::get_vertices); + ClassDB::bind_method(D_METHOD("set_vertices","vertices"),&NavigationPolygon::set_vertices); + ClassDB::bind_method(D_METHOD("get_vertices"),&NavigationPolygon::get_vertices); - ClassDB::bind_method(_MD("add_polygon","polygon"),&NavigationPolygon::add_polygon); - ClassDB::bind_method(_MD("get_polygon_count"),&NavigationPolygon::get_polygon_count); - ClassDB::bind_method(_MD("get_polygon","idx"),&NavigationPolygon::get_polygon); - ClassDB::bind_method(_MD("clear_polygons"),&NavigationPolygon::clear_polygons); + ClassDB::bind_method(D_METHOD("add_polygon","polygon"),&NavigationPolygon::add_polygon); + ClassDB::bind_method(D_METHOD("get_polygon_count"),&NavigationPolygon::get_polygon_count); + ClassDB::bind_method(D_METHOD("get_polygon","idx"),&NavigationPolygon::get_polygon); + ClassDB::bind_method(D_METHOD("clear_polygons"),&NavigationPolygon::clear_polygons); - ClassDB::bind_method(_MD("add_outline","outline"),&NavigationPolygon::add_outline); - ClassDB::bind_method(_MD("add_outline_at_index","outline","index"),&NavigationPolygon::add_outline_at_index); - ClassDB::bind_method(_MD("get_outline_count"),&NavigationPolygon::get_outline_count); - ClassDB::bind_method(_MD("set_outline","idx","outline"),&NavigationPolygon::set_outline); - ClassDB::bind_method(_MD("get_outline","idx"),&NavigationPolygon::get_outline); - ClassDB::bind_method(_MD("remove_outline","idx"),&NavigationPolygon::remove_outline); - ClassDB::bind_method(_MD("clear_outlines"),&NavigationPolygon::clear_outlines); - ClassDB::bind_method(_MD("make_polygons_from_outlines"),&NavigationPolygon::make_polygons_from_outlines); + ClassDB::bind_method(D_METHOD("add_outline","outline"),&NavigationPolygon::add_outline); + ClassDB::bind_method(D_METHOD("add_outline_at_index","outline","index"),&NavigationPolygon::add_outline_at_index); + ClassDB::bind_method(D_METHOD("get_outline_count"),&NavigationPolygon::get_outline_count); + ClassDB::bind_method(D_METHOD("set_outline","idx","outline"),&NavigationPolygon::set_outline); + ClassDB::bind_method(D_METHOD("get_outline","idx"),&NavigationPolygon::get_outline); + ClassDB::bind_method(D_METHOD("remove_outline","idx"),&NavigationPolygon::remove_outline); + ClassDB::bind_method(D_METHOD("clear_outlines"),&NavigationPolygon::clear_outlines); + ClassDB::bind_method(D_METHOD("make_polygons_from_outlines"),&NavigationPolygon::make_polygons_from_outlines); - ClassDB::bind_method(_MD("_set_polygons","polygons"),&NavigationPolygon::_set_polygons); - ClassDB::bind_method(_MD("_get_polygons"),&NavigationPolygon::_get_polygons); + ClassDB::bind_method(D_METHOD("_set_polygons","polygons"),&NavigationPolygon::_set_polygons); + ClassDB::bind_method(D_METHOD("_get_polygons"),&NavigationPolygon::_get_polygons); - ClassDB::bind_method(_MD("_set_outlines","outlines"),&NavigationPolygon::_set_outlines); - ClassDB::bind_method(_MD("_get_outlines"),&NavigationPolygon::_get_outlines); + ClassDB::bind_method(D_METHOD("_set_outlines","outlines"),&NavigationPolygon::_set_outlines); + ClassDB::bind_method(D_METHOD("_get_outlines"),&NavigationPolygon::_get_outlines); ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY,"vertices",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"set_vertices","get_vertices"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY,"polygons",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_polygons","_get_polygons"); @@ -480,13 +480,13 @@ String NavigationPolygonInstance::get_configuration_warning() const { void NavigationPolygonInstance::_bind_methods() { - ClassDB::bind_method(_MD("set_navigation_polygon","navpoly:NavigationPolygon"),&NavigationPolygonInstance::set_navigation_polygon); - ClassDB::bind_method(_MD("get_navigation_polygon:NavigationPolygon"),&NavigationPolygonInstance::get_navigation_polygon); + ClassDB::bind_method(D_METHOD("set_navigation_polygon","navpoly:NavigationPolygon"),&NavigationPolygonInstance::set_navigation_polygon); + ClassDB::bind_method(D_METHOD("get_navigation_polygon:NavigationPolygon"),&NavigationPolygonInstance::get_navigation_polygon); - ClassDB::bind_method(_MD("set_enabled","enabled"),&NavigationPolygonInstance::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&NavigationPolygonInstance::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&NavigationPolygonInstance::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&NavigationPolygonInstance::is_enabled); - ClassDB::bind_method(_MD("_navpoly_changed"),&NavigationPolygonInstance::_navpoly_changed); + ClassDB::bind_method(D_METHOD("_navpoly_changed"),&NavigationPolygonInstance::_navpoly_changed); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"navpoly",PROPERTY_HINT_RESOURCE_TYPE,"NavigationPolygon"),"set_navigation_polygon","get_navigation_polygon"); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 245fe2f296..710f9731c5 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -423,50 +423,50 @@ void Node2D::_bind_methods() { // TODO: Obsolete those two methods (old name) properly (GH-4397) - ClassDB::bind_method(_MD("_get_rotd"),&Node2D::_get_rotd); - ClassDB::bind_method(_MD("_set_rotd","degrees"),&Node2D::_set_rotd); - - ClassDB::bind_method(_MD("set_position","pos"),&Node2D::set_position); - ClassDB::bind_method(_MD("set_rotation","radians"),&Node2D::set_rotation); - ClassDB::bind_method(_MD("set_rotation_in_degrees","degrees"),&Node2D::set_rotation_in_degrees); - ClassDB::bind_method(_MD("set_scale","scale"),&Node2D::set_scale); - - ClassDB::bind_method(_MD("get_position"),&Node2D::get_position); - ClassDB::bind_method(_MD("get_rotation"),&Node2D::get_rotation); - ClassDB::bind_method(_MD("get_rotation_in_degrees"),&Node2D::get_rotation_in_degrees); - ClassDB::bind_method(_MD("get_scale"),&Node2D::get_scale); - - ClassDB::bind_method(_MD("rotate","radians"),&Node2D::rotate); - ClassDB::bind_method(_MD("move_local_x","delta","scaled"),&Node2D::move_x,DEFVAL(false)); - ClassDB::bind_method(_MD("move_local_y","delta","scaled"),&Node2D::move_y,DEFVAL(false)); - ClassDB::bind_method(_MD("translate","offset"),&Node2D::translate); - ClassDB::bind_method(_MD("global_translate","offset"),&Node2D::global_translate); - ClassDB::bind_method(_MD("scale","ratio"),&Node2D::scale); - - ClassDB::bind_method(_MD("set_global_position","pos"),&Node2D::set_global_position); - ClassDB::bind_method(_MD("get_global_position"),&Node2D::get_global_position); - ClassDB::bind_method(_MD("set_global_rotation","radians"),&Node2D::set_global_rotation); - ClassDB::bind_method(_MD("get_global_rotation"),&Node2D::get_global_rotation); - ClassDB::bind_method(_MD("set_global_rotation_in_degrees","degrees"),&Node2D::set_global_rotation_in_degrees); - ClassDB::bind_method(_MD("get_global_rotation_in_degrees"),&Node2D::get_global_rotation_in_degrees); - ClassDB::bind_method(_MD("set_global_scale","scale"),&Node2D::set_global_scale); - ClassDB::bind_method(_MD("get_global_scale"),&Node2D::get_global_scale); - - ClassDB::bind_method(_MD("set_transform","xform"),&Node2D::set_transform); - ClassDB::bind_method(_MD("set_global_transform","xform"),&Node2D::set_global_transform); - - ClassDB::bind_method(_MD("look_at","point"),&Node2D::look_at); - ClassDB::bind_method(_MD("get_angle_to","point"),&Node2D::get_angle_to); - - ClassDB::bind_method(_MD("set_z","z"),&Node2D::set_z); - ClassDB::bind_method(_MD("get_z"),&Node2D::get_z); - - ClassDB::bind_method(_MD("set_z_as_relative","enable"),&Node2D::set_z_as_relative); - ClassDB::bind_method(_MD("is_z_relative"),&Node2D::is_z_relative); - - ClassDB::bind_method(_MD("edit_set_pivot","pivot"),&Node2D::edit_set_pivot); - - ClassDB::bind_method(_MD("get_relative_transform_to_parent","parent"),&Node2D::get_relative_transform_to_parent); + ClassDB::bind_method(D_METHOD("_get_rotd"),&Node2D::_get_rotd); + ClassDB::bind_method(D_METHOD("_set_rotd","degrees"),&Node2D::_set_rotd); + + ClassDB::bind_method(D_METHOD("set_position","pos"),&Node2D::set_position); + ClassDB::bind_method(D_METHOD("set_rotation","radians"),&Node2D::set_rotation); + ClassDB::bind_method(D_METHOD("set_rotation_in_degrees","degrees"),&Node2D::set_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_scale","scale"),&Node2D::set_scale); + + ClassDB::bind_method(D_METHOD("get_position"),&Node2D::get_position); + ClassDB::bind_method(D_METHOD("get_rotation"),&Node2D::get_rotation); + ClassDB::bind_method(D_METHOD("get_rotation_in_degrees"),&Node2D::get_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("get_scale"),&Node2D::get_scale); + + ClassDB::bind_method(D_METHOD("rotate","radians"),&Node2D::rotate); + ClassDB::bind_method(D_METHOD("move_local_x","delta","scaled"),&Node2D::move_x,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("move_local_y","delta","scaled"),&Node2D::move_y,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("translate","offset"),&Node2D::translate); + ClassDB::bind_method(D_METHOD("global_translate","offset"),&Node2D::global_translate); + ClassDB::bind_method(D_METHOD("scale","ratio"),&Node2D::scale); + + ClassDB::bind_method(D_METHOD("set_global_position","pos"),&Node2D::set_global_position); + ClassDB::bind_method(D_METHOD("get_global_position"),&Node2D::get_global_position); + ClassDB::bind_method(D_METHOD("set_global_rotation","radians"),&Node2D::set_global_rotation); + ClassDB::bind_method(D_METHOD("get_global_rotation"),&Node2D::get_global_rotation); + ClassDB::bind_method(D_METHOD("set_global_rotation_in_degrees","degrees"),&Node2D::set_global_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("get_global_rotation_in_degrees"),&Node2D::get_global_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_global_scale","scale"),&Node2D::set_global_scale); + ClassDB::bind_method(D_METHOD("get_global_scale"),&Node2D::get_global_scale); + + ClassDB::bind_method(D_METHOD("set_transform","xform"),&Node2D::set_transform); + ClassDB::bind_method(D_METHOD("set_global_transform","xform"),&Node2D::set_global_transform); + + ClassDB::bind_method(D_METHOD("look_at","point"),&Node2D::look_at); + ClassDB::bind_method(D_METHOD("get_angle_to","point"),&Node2D::get_angle_to); + + ClassDB::bind_method(D_METHOD("set_z","z"),&Node2D::set_z); + ClassDB::bind_method(D_METHOD("get_z"),&Node2D::get_z); + + ClassDB::bind_method(D_METHOD("set_z_as_relative","enable"),&Node2D::set_z_as_relative); + ClassDB::bind_method(D_METHOD("is_z_relative"),&Node2D::is_z_relative); + + ClassDB::bind_method(D_METHOD("edit_set_pivot","pivot"),&Node2D::edit_set_pivot); + + ClassDB::bind_method(D_METHOD("get_relative_transform_to_parent","parent"),&Node2D::get_relative_transform_to_parent); ADD_GROUP("Transform",""); ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2,"position"),"set_position","get_position"); diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index 2011b91b71..9336dc51af 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -189,19 +189,19 @@ Vector2 ParallaxBackground::get_final_offset() const { void ParallaxBackground::_bind_methods() { - ClassDB::bind_method(_MD("_camera_moved"),&ParallaxBackground::_camera_moved); - ClassDB::bind_method(_MD("set_scroll_offset","ofs"),&ParallaxBackground::set_scroll_offset); - ClassDB::bind_method(_MD("get_scroll_offset"),&ParallaxBackground::get_scroll_offset); - ClassDB::bind_method(_MD("set_scroll_base_offset","ofs"),&ParallaxBackground::set_scroll_base_offset); - ClassDB::bind_method(_MD("get_scroll_base_offset"),&ParallaxBackground::get_scroll_base_offset); - ClassDB::bind_method(_MD("set_scroll_base_scale","scale"),&ParallaxBackground::set_scroll_base_scale); - ClassDB::bind_method(_MD("get_scroll_base_scale"),&ParallaxBackground::get_scroll_base_scale); - ClassDB::bind_method(_MD("set_limit_begin","ofs"),&ParallaxBackground::set_limit_begin); - ClassDB::bind_method(_MD("get_limit_begin"),&ParallaxBackground::get_limit_begin); - ClassDB::bind_method(_MD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); - ClassDB::bind_method(_MD("get_limit_end"),&ParallaxBackground::get_limit_end); - ClassDB::bind_method(_MD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); - ClassDB::bind_method(_MD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); + ClassDB::bind_method(D_METHOD("_camera_moved"),&ParallaxBackground::_camera_moved); + ClassDB::bind_method(D_METHOD("set_scroll_offset","ofs"),&ParallaxBackground::set_scroll_offset); + ClassDB::bind_method(D_METHOD("get_scroll_offset"),&ParallaxBackground::get_scroll_offset); + ClassDB::bind_method(D_METHOD("set_scroll_base_offset","ofs"),&ParallaxBackground::set_scroll_base_offset); + ClassDB::bind_method(D_METHOD("get_scroll_base_offset"),&ParallaxBackground::get_scroll_base_offset); + ClassDB::bind_method(D_METHOD("set_scroll_base_scale","scale"),&ParallaxBackground::set_scroll_base_scale); + ClassDB::bind_method(D_METHOD("get_scroll_base_scale"),&ParallaxBackground::get_scroll_base_scale); + ClassDB::bind_method(D_METHOD("set_limit_begin","ofs"),&ParallaxBackground::set_limit_begin); + ClassDB::bind_method(D_METHOD("get_limit_begin"),&ParallaxBackground::get_limit_begin); + ClassDB::bind_method(D_METHOD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); + ClassDB::bind_method(D_METHOD("get_limit_end"),&ParallaxBackground::get_limit_end); + ClassDB::bind_method(D_METHOD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); + ClassDB::bind_method(D_METHOD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); ADD_GROUP("Scroll","scroll_"); diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 8d7f38b6bb..37d8fb52f1 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -150,12 +150,12 @@ String ParallaxLayer::get_configuration_warning() const { void ParallaxLayer::_bind_methods() { - ClassDB::bind_method(_MD("set_motion_scale","scale"),&ParallaxLayer::set_motion_scale); - ClassDB::bind_method(_MD("get_motion_scale"),&ParallaxLayer::get_motion_scale); - ClassDB::bind_method(_MD("set_motion_offset","offset"),&ParallaxLayer::set_motion_offset); - ClassDB::bind_method(_MD("get_motion_offset"),&ParallaxLayer::get_motion_offset); - ClassDB::bind_method(_MD("set_mirroring","mirror"),&ParallaxLayer::set_mirroring); - ClassDB::bind_method(_MD("get_mirroring"),&ParallaxLayer::get_mirroring); + ClassDB::bind_method(D_METHOD("set_motion_scale","scale"),&ParallaxLayer::set_motion_scale); + ClassDB::bind_method(D_METHOD("get_motion_scale"),&ParallaxLayer::get_motion_scale); + ClassDB::bind_method(D_METHOD("set_motion_offset","offset"),&ParallaxLayer::set_motion_offset); + ClassDB::bind_method(D_METHOD("get_motion_offset"),&ParallaxLayer::get_motion_offset); + ClassDB::bind_method(D_METHOD("set_mirroring","mirror"),&ParallaxLayer::set_mirroring); + ClassDB::bind_method(D_METHOD("get_mirroring"),&ParallaxLayer::get_mirroring); ADD_GROUP("Motion","motion_"); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"motion_scale"),"set_motion_scale","get_motion_scale"); diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp index 020ba0fcc1..da49f1b420 100644 --- a/scene/2d/particles_2d.cpp +++ b/scene/2d/particles_2d.cpp @@ -113,23 +113,23 @@ void ParticleAttractor2D::_set_owner(Particles2D* p_owner) { void ParticleAttractor2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&ParticleAttractor2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&ParticleAttractor2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&ParticleAttractor2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&ParticleAttractor2D::is_enabled); - ClassDB::bind_method(_MD("set_radius","radius"),&ParticleAttractor2D::set_radius); - ClassDB::bind_method(_MD("get_radius"),&ParticleAttractor2D::get_radius); + ClassDB::bind_method(D_METHOD("set_radius","radius"),&ParticleAttractor2D::set_radius); + ClassDB::bind_method(D_METHOD("get_radius"),&ParticleAttractor2D::get_radius); - ClassDB::bind_method(_MD("set_disable_radius","radius"),&ParticleAttractor2D::set_disable_radius); - ClassDB::bind_method(_MD("get_disable_radius"),&ParticleAttractor2D::get_disable_radius); + ClassDB::bind_method(D_METHOD("set_disable_radius","radius"),&ParticleAttractor2D::set_disable_radius); + ClassDB::bind_method(D_METHOD("get_disable_radius"),&ParticleAttractor2D::get_disable_radius); - ClassDB::bind_method(_MD("set_gravity","gravity"),&ParticleAttractor2D::set_gravity); - ClassDB::bind_method(_MD("get_gravity"),&ParticleAttractor2D::get_gravity); + ClassDB::bind_method(D_METHOD("set_gravity","gravity"),&ParticleAttractor2D::set_gravity); + ClassDB::bind_method(D_METHOD("get_gravity"),&ParticleAttractor2D::get_gravity); - ClassDB::bind_method(_MD("set_absorption","absorption"),&ParticleAttractor2D::set_absorption); - ClassDB::bind_method(_MD("get_absorption"),&ParticleAttractor2D::get_absorption); + ClassDB::bind_method(D_METHOD("set_absorption","absorption"),&ParticleAttractor2D::set_absorption); + ClassDB::bind_method(D_METHOD("get_absorption"),&ParticleAttractor2D::get_absorption); - ClassDB::bind_method(_MD("set_particles_path","path"),&ParticleAttractor2D::set_particles_path); - ClassDB::bind_method(_MD("get_particles_path"),&ParticleAttractor2D::get_particles_path); + ClassDB::bind_method(D_METHOD("set_particles_path","path"),&ParticleAttractor2D::set_particles_path); + ClassDB::bind_method(D_METHOD("get_particles_path"),&ParticleAttractor2D::get_particles_path); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"radius",PROPERTY_HINT_RANGE,"0.1,16000,0.1"),"set_radius","get_radius"); @@ -1017,80 +1017,80 @@ void Particles2D::reset() { void Particles2D::_bind_methods() { - ClassDB::bind_method(_MD("set_emitting","active"),&Particles2D::set_emitting); - ClassDB::bind_method(_MD("is_emitting"),&Particles2D::is_emitting); + ClassDB::bind_method(D_METHOD("set_emitting","active"),&Particles2D::set_emitting); + ClassDB::bind_method(D_METHOD("is_emitting"),&Particles2D::is_emitting); - ClassDB::bind_method(_MD("set_amount","amount"),&Particles2D::set_amount); - ClassDB::bind_method(_MD("get_amount"),&Particles2D::get_amount); + ClassDB::bind_method(D_METHOD("set_amount","amount"),&Particles2D::set_amount); + ClassDB::bind_method(D_METHOD("get_amount"),&Particles2D::get_amount); - ClassDB::bind_method(_MD("set_lifetime","lifetime"),&Particles2D::set_lifetime); - ClassDB::bind_method(_MD("get_lifetime"),&Particles2D::get_lifetime); + ClassDB::bind_method(D_METHOD("set_lifetime","lifetime"),&Particles2D::set_lifetime); + ClassDB::bind_method(D_METHOD("get_lifetime"),&Particles2D::get_lifetime); - ClassDB::bind_method(_MD("set_time_scale","time_scale"),&Particles2D::set_time_scale); - ClassDB::bind_method(_MD("get_time_scale"),&Particles2D::get_time_scale); + ClassDB::bind_method(D_METHOD("set_time_scale","time_scale"),&Particles2D::set_time_scale); + ClassDB::bind_method(D_METHOD("get_time_scale"),&Particles2D::get_time_scale); - ClassDB::bind_method(_MD("set_pre_process_time","time"),&Particles2D::set_pre_process_time); - ClassDB::bind_method(_MD("get_pre_process_time"),&Particles2D::get_pre_process_time); + ClassDB::bind_method(D_METHOD("set_pre_process_time","time"),&Particles2D::set_pre_process_time); + ClassDB::bind_method(D_METHOD("get_pre_process_time"),&Particles2D::get_pre_process_time); - ClassDB::bind_method(_MD("set_emit_timeout","value"),&Particles2D::set_emit_timeout); - ClassDB::bind_method(_MD("get_emit_timeout"),&Particles2D::get_emit_timeout); + ClassDB::bind_method(D_METHOD("set_emit_timeout","value"),&Particles2D::set_emit_timeout); + ClassDB::bind_method(D_METHOD("get_emit_timeout"),&Particles2D::get_emit_timeout); - ClassDB::bind_method(_MD("set_param","param","value"),&Particles2D::set_param); - ClassDB::bind_method(_MD("get_param","param"),&Particles2D::get_param); + ClassDB::bind_method(D_METHOD("set_param","param","value"),&Particles2D::set_param); + ClassDB::bind_method(D_METHOD("get_param","param"),&Particles2D::get_param); - ClassDB::bind_method(_MD("set_randomness","param","value"),&Particles2D::set_randomness); - ClassDB::bind_method(_MD("get_randomness","param"),&Particles2D::get_randomness); + ClassDB::bind_method(D_METHOD("set_randomness","param","value"),&Particles2D::set_randomness); + ClassDB::bind_method(D_METHOD("get_randomness","param"),&Particles2D::get_randomness); - ClassDB::bind_method(_MD("set_texture:Texture","texture"),&Particles2D::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&Particles2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture:Texture","texture"),&Particles2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&Particles2D::get_texture); - ClassDB::bind_method(_MD("set_color","color"),&Particles2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Particles2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Particles2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Particles2D::get_color); - ClassDB::bind_method(_MD("set_color_ramp:ColorRamp","color_ramp"),&Particles2D::set_color_ramp); - ClassDB::bind_method(_MD("get_color_ramp:ColorRamp"),&Particles2D::get_color_ramp); + ClassDB::bind_method(D_METHOD("set_color_ramp:ColorRamp","color_ramp"),&Particles2D::set_color_ramp); + ClassDB::bind_method(D_METHOD("get_color_ramp:ColorRamp"),&Particles2D::get_color_ramp); - ClassDB::bind_method(_MD("set_emissor_offset","offset"),&Particles2D::set_emissor_offset); - ClassDB::bind_method(_MD("get_emissor_offset"),&Particles2D::get_emissor_offset); + ClassDB::bind_method(D_METHOD("set_emissor_offset","offset"),&Particles2D::set_emissor_offset); + ClassDB::bind_method(D_METHOD("get_emissor_offset"),&Particles2D::get_emissor_offset); - ClassDB::bind_method(_MD("set_flip_h","enable"),&Particles2D::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&Particles2D::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","enable"),&Particles2D::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&Particles2D::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","enable"),&Particles2D::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&Particles2D::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","enable"),&Particles2D::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&Particles2D::is_flipped_v); - ClassDB::bind_method(_MD("set_h_frames","enable"),&Particles2D::set_h_frames); - ClassDB::bind_method(_MD("get_h_frames"),&Particles2D::get_h_frames); + ClassDB::bind_method(D_METHOD("set_h_frames","enable"),&Particles2D::set_h_frames); + ClassDB::bind_method(D_METHOD("get_h_frames"),&Particles2D::get_h_frames); - ClassDB::bind_method(_MD("set_v_frames","enable"),&Particles2D::set_v_frames); - ClassDB::bind_method(_MD("get_v_frames"),&Particles2D::get_v_frames); + ClassDB::bind_method(D_METHOD("set_v_frames","enable"),&Particles2D::set_v_frames); + ClassDB::bind_method(D_METHOD("get_v_frames"),&Particles2D::get_v_frames); - ClassDB::bind_method(_MD("set_emission_half_extents","extents"),&Particles2D::set_emission_half_extents); - ClassDB::bind_method(_MD("get_emission_half_extents"),&Particles2D::get_emission_half_extents); + ClassDB::bind_method(D_METHOD("set_emission_half_extents","extents"),&Particles2D::set_emission_half_extents); + ClassDB::bind_method(D_METHOD("get_emission_half_extents"),&Particles2D::get_emission_half_extents); - ClassDB::bind_method(_MD("set_color_phases","phases"),&Particles2D::set_color_phases); - ClassDB::bind_method(_MD("get_color_phases"),&Particles2D::get_color_phases); + ClassDB::bind_method(D_METHOD("set_color_phases","phases"),&Particles2D::set_color_phases); + ClassDB::bind_method(D_METHOD("get_color_phases"),&Particles2D::get_color_phases); - ClassDB::bind_method(_MD("set_color_phase_color","phase","color"),&Particles2D::set_color_phase_color); - ClassDB::bind_method(_MD("get_color_phase_color","phase"),&Particles2D::get_color_phase_color); + ClassDB::bind_method(D_METHOD("set_color_phase_color","phase","color"),&Particles2D::set_color_phase_color); + ClassDB::bind_method(D_METHOD("get_color_phase_color","phase"),&Particles2D::get_color_phase_color); - ClassDB::bind_method(_MD("set_color_phase_pos","phase","pos"),&Particles2D::set_color_phase_pos); - ClassDB::bind_method(_MD("get_color_phase_pos","phase"),&Particles2D::get_color_phase_pos); + ClassDB::bind_method(D_METHOD("set_color_phase_pos","phase","pos"),&Particles2D::set_color_phase_pos); + ClassDB::bind_method(D_METHOD("get_color_phase_pos","phase"),&Particles2D::get_color_phase_pos); - ClassDB::bind_method(_MD("pre_process","time"),&Particles2D::pre_process); - ClassDB::bind_method(_MD("reset"),&Particles2D::reset); + ClassDB::bind_method(D_METHOD("pre_process","time"),&Particles2D::pre_process); + ClassDB::bind_method(D_METHOD("reset"),&Particles2D::reset); - ClassDB::bind_method(_MD("set_use_local_space","enable"),&Particles2D::set_use_local_space); - ClassDB::bind_method(_MD("is_using_local_space"),&Particles2D::is_using_local_space); + ClassDB::bind_method(D_METHOD("set_use_local_space","enable"),&Particles2D::set_use_local_space); + ClassDB::bind_method(D_METHOD("is_using_local_space"),&Particles2D::is_using_local_space); - ClassDB::bind_method(_MD("set_initial_velocity","velocity"),&Particles2D::set_initial_velocity); - ClassDB::bind_method(_MD("get_initial_velocity"),&Particles2D::get_initial_velocity); + ClassDB::bind_method(D_METHOD("set_initial_velocity","velocity"),&Particles2D::set_initial_velocity); + ClassDB::bind_method(D_METHOD("get_initial_velocity"),&Particles2D::get_initial_velocity); - ClassDB::bind_method(_MD("set_explosiveness","amount"),&Particles2D::set_explosiveness); - ClassDB::bind_method(_MD("get_explosiveness"),&Particles2D::get_explosiveness); + ClassDB::bind_method(D_METHOD("set_explosiveness","amount"),&Particles2D::set_explosiveness); + ClassDB::bind_method(D_METHOD("get_explosiveness"),&Particles2D::get_explosiveness); - ClassDB::bind_method(_MD("set_emission_points","points"),&Particles2D::set_emission_points); - ClassDB::bind_method(_MD("get_emission_points"),&Particles2D::get_emission_points); + ClassDB::bind_method(D_METHOD("set_emission_points","points"),&Particles2D::set_emission_points); + ClassDB::bind_method(D_METHOD("get_emission_points"),&Particles2D::get_emission_points); ADD_PROPERTY(PropertyInfo(Variant::INT,"config/amount",PROPERTY_HINT_EXP_RANGE,"1,1024"),"set_amount","get_amount") ; ADD_PROPERTY(PropertyInfo(Variant::REAL,"config/lifetime",PROPERTY_HINT_EXP_RANGE,"0.1,3600,0.1"),"set_lifetime","get_lifetime") ; diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 7b6c11dd8c..63531ae599 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -85,9 +85,9 @@ Ref<Curve2D> Path2D::get_curve() const{ void Path2D::_bind_methods() { - ClassDB::bind_method(_MD("set_curve","curve:Curve2D"),&Path2D::set_curve); - ClassDB::bind_method(_MD("get_curve:Curve2D","curve"),&Path2D::get_curve); - ClassDB::bind_method(_MD("_curve_changed"),&Path2D::_curve_changed); + ClassDB::bind_method(D_METHOD("set_curve","curve:Curve2D"),&Path2D::set_curve); + ClassDB::bind_method(D_METHOD("get_curve:Curve2D","curve"),&Path2D::get_curve); + ClassDB::bind_method(D_METHOD("_curve_changed"),&Path2D::_curve_changed); ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve2D"), "set_curve","get_curve"); } @@ -252,26 +252,26 @@ String PathFollow2D::get_configuration_warning() const { void PathFollow2D::_bind_methods() { - ClassDB::bind_method(_MD("set_offset","offset"),&PathFollow2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&PathFollow2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&PathFollow2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&PathFollow2D::get_offset); - ClassDB::bind_method(_MD("set_h_offset","h_offset"),&PathFollow2D::set_h_offset); - ClassDB::bind_method(_MD("get_h_offset"),&PathFollow2D::get_h_offset); + ClassDB::bind_method(D_METHOD("set_h_offset","h_offset"),&PathFollow2D::set_h_offset); + ClassDB::bind_method(D_METHOD("get_h_offset"),&PathFollow2D::get_h_offset); - ClassDB::bind_method(_MD("set_v_offset","v_offset"),&PathFollow2D::set_v_offset); - ClassDB::bind_method(_MD("get_v_offset"),&PathFollow2D::get_v_offset); + ClassDB::bind_method(D_METHOD("set_v_offset","v_offset"),&PathFollow2D::set_v_offset); + ClassDB::bind_method(D_METHOD("get_v_offset"),&PathFollow2D::get_v_offset); - ClassDB::bind_method(_MD("set_unit_offset","unit_offset"),&PathFollow2D::set_unit_offset); - ClassDB::bind_method(_MD("get_unit_offset"),&PathFollow2D::get_unit_offset); + ClassDB::bind_method(D_METHOD("set_unit_offset","unit_offset"),&PathFollow2D::set_unit_offset); + ClassDB::bind_method(D_METHOD("get_unit_offset"),&PathFollow2D::get_unit_offset); - ClassDB::bind_method(_MD("set_rotate","enable"),&PathFollow2D::set_rotate); - ClassDB::bind_method(_MD("is_rotating"),&PathFollow2D::is_rotating); + ClassDB::bind_method(D_METHOD("set_rotate","enable"),&PathFollow2D::set_rotate); + ClassDB::bind_method(D_METHOD("is_rotating"),&PathFollow2D::is_rotating); - ClassDB::bind_method(_MD("set_cubic_interpolation","enable"),&PathFollow2D::set_cubic_interpolation); - ClassDB::bind_method(_MD("get_cubic_interpolation"),&PathFollow2D::get_cubic_interpolation); + ClassDB::bind_method(D_METHOD("set_cubic_interpolation","enable"),&PathFollow2D::set_cubic_interpolation); + ClassDB::bind_method(D_METHOD("get_cubic_interpolation"),&PathFollow2D::get_cubic_interpolation); - ClassDB::bind_method(_MD("set_loop","loop"),&PathFollow2D::set_loop); - ClassDB::bind_method(_MD("has_loop"),&PathFollow2D::has_loop); + ClassDB::bind_method(D_METHOD("set_loop","loop"),&PathFollow2D::set_loop); + ClassDB::bind_method(D_METHOD("has_loop"),&PathFollow2D::has_loop); } diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 23891ececb..0ffaf81e3d 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -81,26 +81,26 @@ uint32_t PhysicsBody2D::_get_layers() const{ void PhysicsBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_collision_layer","mask"),&PhysicsBody2D::set_collision_layer); - ClassDB::bind_method(_MD("get_collision_layer"),&PhysicsBody2D::get_collision_layer); - ClassDB::bind_method(_MD("set_collision_mask","mask"),&PhysicsBody2D::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&PhysicsBody2D::get_collision_mask); - - - ClassDB::bind_method(_MD("set_collision_mask_bit","bit","value"),&PhysicsBody2D::set_collision_mask_bit); - ClassDB::bind_method(_MD("get_collision_mask_bit","bit"),&PhysicsBody2D::get_collision_mask_bit); - - ClassDB::bind_method(_MD("set_collision_layer_bit","bit","value"),&PhysicsBody2D::set_collision_layer_bit); - ClassDB::bind_method(_MD("get_collision_layer_bit","bit"),&PhysicsBody2D::get_collision_layer_bit); - - ClassDB::bind_method(_MD("_set_layers","mask"),&PhysicsBody2D::_set_layers); - ClassDB::bind_method(_MD("_get_layers"),&PhysicsBody2D::_get_layers); - ClassDB::bind_method(_MD("set_one_way_collision_direction","dir"),&PhysicsBody2D::set_one_way_collision_direction); - ClassDB::bind_method(_MD("get_one_way_collision_direction"),&PhysicsBody2D::get_one_way_collision_direction); - ClassDB::bind_method(_MD("set_one_way_collision_max_depth","depth"),&PhysicsBody2D::set_one_way_collision_max_depth); - ClassDB::bind_method(_MD("get_one_way_collision_max_depth"),&PhysicsBody2D::get_one_way_collision_max_depth); - ClassDB::bind_method(_MD("add_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::add_collision_exception_with); - ClassDB::bind_method(_MD("remove_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::remove_collision_exception_with); + ClassDB::bind_method(D_METHOD("set_collision_layer","mask"),&PhysicsBody2D::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"),&PhysicsBody2D::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&PhysicsBody2D::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&PhysicsBody2D::get_collision_mask); + + + ClassDB::bind_method(D_METHOD("set_collision_mask_bit","bit","value"),&PhysicsBody2D::set_collision_mask_bit); + ClassDB::bind_method(D_METHOD("get_collision_mask_bit","bit"),&PhysicsBody2D::get_collision_mask_bit); + + ClassDB::bind_method(D_METHOD("set_collision_layer_bit","bit","value"),&PhysicsBody2D::set_collision_layer_bit); + ClassDB::bind_method(D_METHOD("get_collision_layer_bit","bit"),&PhysicsBody2D::get_collision_layer_bit); + + ClassDB::bind_method(D_METHOD("_set_layers","mask"),&PhysicsBody2D::_set_layers); + ClassDB::bind_method(D_METHOD("_get_layers"),&PhysicsBody2D::_get_layers); + ClassDB::bind_method(D_METHOD("set_one_way_collision_direction","dir"),&PhysicsBody2D::set_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("get_one_way_collision_direction"),&PhysicsBody2D::get_one_way_collision_direction); + ClassDB::bind_method(D_METHOD("set_one_way_collision_max_depth","depth"),&PhysicsBody2D::set_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("get_one_way_collision_max_depth"),&PhysicsBody2D::get_one_way_collision_max_depth); + ClassDB::bind_method(D_METHOD("add_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::add_collision_exception_with); + ClassDB::bind_method(D_METHOD("remove_collision_exception_with","body:PhysicsBody2D"),&PhysicsBody2D::remove_collision_exception_with); ADD_PROPERTY(PropertyInfo(Variant::INT,"layers",PROPERTY_HINT_LAYERS_2D_PHYSICS,"",0),"_set_layers","_get_layers"); //for backwards compat ADD_GROUP("Collision","collision_"); @@ -271,15 +271,15 @@ real_t StaticBody2D::get_bounce() const{ void StaticBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_constant_linear_velocity","vel"),&StaticBody2D::set_constant_linear_velocity); - ClassDB::bind_method(_MD("set_constant_angular_velocity","vel"),&StaticBody2D::set_constant_angular_velocity); - ClassDB::bind_method(_MD("get_constant_linear_velocity"),&StaticBody2D::get_constant_linear_velocity); - ClassDB::bind_method(_MD("get_constant_angular_velocity"),&StaticBody2D::get_constant_angular_velocity); - ClassDB::bind_method(_MD("set_friction","friction"),&StaticBody2D::set_friction); - ClassDB::bind_method(_MD("get_friction"),&StaticBody2D::get_friction); + ClassDB::bind_method(D_METHOD("set_constant_linear_velocity","vel"),&StaticBody2D::set_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("set_constant_angular_velocity","vel"),&StaticBody2D::set_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("get_constant_linear_velocity"),&StaticBody2D::get_constant_linear_velocity); + ClassDB::bind_method(D_METHOD("get_constant_angular_velocity"),&StaticBody2D::get_constant_angular_velocity); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&StaticBody2D::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&StaticBody2D::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&StaticBody2D::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&StaticBody2D::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&StaticBody2D::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&StaticBody2D::get_bounce); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2,"constant_linear_velocity"),"set_constant_linear_velocity","get_constant_linear_velocity"); ADD_PROPERTY(PropertyInfo(Variant::REAL,"constant_angular_velocity"),"set_constant_angular_velocity","get_constant_angular_velocity"); @@ -882,75 +882,75 @@ bool RigidBody2D::is_contact_monitor_enabled() const { void RigidBody2D::_bind_methods() { - ClassDB::bind_method(_MD("set_mode","mode"),&RigidBody2D::set_mode); - ClassDB::bind_method(_MD("get_mode"),&RigidBody2D::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&RigidBody2D::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&RigidBody2D::get_mode); - ClassDB::bind_method(_MD("set_mass","mass"),&RigidBody2D::set_mass); - ClassDB::bind_method(_MD("get_mass"),&RigidBody2D::get_mass); + ClassDB::bind_method(D_METHOD("set_mass","mass"),&RigidBody2D::set_mass); + ClassDB::bind_method(D_METHOD("get_mass"),&RigidBody2D::get_mass); - ClassDB::bind_method(_MD("get_inertia"),&RigidBody2D::get_inertia); - ClassDB::bind_method(_MD("set_inertia","inertia"),&RigidBody2D::set_inertia); + ClassDB::bind_method(D_METHOD("get_inertia"),&RigidBody2D::get_inertia); + ClassDB::bind_method(D_METHOD("set_inertia","inertia"),&RigidBody2D::set_inertia); - ClassDB::bind_method(_MD("set_weight","weight"),&RigidBody2D::set_weight); - ClassDB::bind_method(_MD("get_weight"),&RigidBody2D::get_weight); + ClassDB::bind_method(D_METHOD("set_weight","weight"),&RigidBody2D::set_weight); + ClassDB::bind_method(D_METHOD("get_weight"),&RigidBody2D::get_weight); - ClassDB::bind_method(_MD("set_friction","friction"),&RigidBody2D::set_friction); - ClassDB::bind_method(_MD("get_friction"),&RigidBody2D::get_friction); + ClassDB::bind_method(D_METHOD("set_friction","friction"),&RigidBody2D::set_friction); + ClassDB::bind_method(D_METHOD("get_friction"),&RigidBody2D::get_friction); - ClassDB::bind_method(_MD("set_bounce","bounce"),&RigidBody2D::set_bounce); - ClassDB::bind_method(_MD("get_bounce"),&RigidBody2D::get_bounce); + ClassDB::bind_method(D_METHOD("set_bounce","bounce"),&RigidBody2D::set_bounce); + ClassDB::bind_method(D_METHOD("get_bounce"),&RigidBody2D::get_bounce); - ClassDB::bind_method(_MD("set_gravity_scale","gravity_scale"),&RigidBody2D::set_gravity_scale); - ClassDB::bind_method(_MD("get_gravity_scale"),&RigidBody2D::get_gravity_scale); + ClassDB::bind_method(D_METHOD("set_gravity_scale","gravity_scale"),&RigidBody2D::set_gravity_scale); + ClassDB::bind_method(D_METHOD("get_gravity_scale"),&RigidBody2D::get_gravity_scale); - ClassDB::bind_method(_MD("set_linear_damp","linear_damp"),&RigidBody2D::set_linear_damp); - ClassDB::bind_method(_MD("get_linear_damp"),&RigidBody2D::get_linear_damp); + ClassDB::bind_method(D_METHOD("set_linear_damp","linear_damp"),&RigidBody2D::set_linear_damp); + ClassDB::bind_method(D_METHOD("get_linear_damp"),&RigidBody2D::get_linear_damp); - ClassDB::bind_method(_MD("set_angular_damp","angular_damp"),&RigidBody2D::set_angular_damp); - ClassDB::bind_method(_MD("get_angular_damp"),&RigidBody2D::get_angular_damp); + ClassDB::bind_method(D_METHOD("set_angular_damp","angular_damp"),&RigidBody2D::set_angular_damp); + ClassDB::bind_method(D_METHOD("get_angular_damp"),&RigidBody2D::get_angular_damp); - ClassDB::bind_method(_MD("set_linear_velocity","linear_velocity"),&RigidBody2D::set_linear_velocity); - ClassDB::bind_method(_MD("get_linear_velocity"),&RigidBody2D::get_linear_velocity); + ClassDB::bind_method(D_METHOD("set_linear_velocity","linear_velocity"),&RigidBody2D::set_linear_velocity); + ClassDB::bind_method(D_METHOD("get_linear_velocity"),&RigidBody2D::get_linear_velocity); - ClassDB::bind_method(_MD("set_angular_velocity","angular_velocity"),&RigidBody2D::set_angular_velocity); - ClassDB::bind_method(_MD("get_angular_velocity"),&RigidBody2D::get_angular_velocity); + ClassDB::bind_method(D_METHOD("set_angular_velocity","angular_velocity"),&RigidBody2D::set_angular_velocity); + ClassDB::bind_method(D_METHOD("get_angular_velocity"),&RigidBody2D::get_angular_velocity); - ClassDB::bind_method(_MD("set_max_contacts_reported","amount"),&RigidBody2D::set_max_contacts_reported); - ClassDB::bind_method(_MD("get_max_contacts_reported"),&RigidBody2D::get_max_contacts_reported); + ClassDB::bind_method(D_METHOD("set_max_contacts_reported","amount"),&RigidBody2D::set_max_contacts_reported); + ClassDB::bind_method(D_METHOD("get_max_contacts_reported"),&RigidBody2D::get_max_contacts_reported); - ClassDB::bind_method(_MD("set_use_custom_integrator","enable"),&RigidBody2D::set_use_custom_integrator); - ClassDB::bind_method(_MD("is_using_custom_integrator"),&RigidBody2D::is_using_custom_integrator); + ClassDB::bind_method(D_METHOD("set_use_custom_integrator","enable"),&RigidBody2D::set_use_custom_integrator); + ClassDB::bind_method(D_METHOD("is_using_custom_integrator"),&RigidBody2D::is_using_custom_integrator); - ClassDB::bind_method(_MD("set_contact_monitor","enabled"),&RigidBody2D::set_contact_monitor); - ClassDB::bind_method(_MD("is_contact_monitor_enabled"),&RigidBody2D::is_contact_monitor_enabled); + ClassDB::bind_method(D_METHOD("set_contact_monitor","enabled"),&RigidBody2D::set_contact_monitor); + ClassDB::bind_method(D_METHOD("is_contact_monitor_enabled"),&RigidBody2D::is_contact_monitor_enabled); - ClassDB::bind_method(_MD("set_continuous_collision_detection_mode","mode"),&RigidBody2D::set_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("get_continuous_collision_detection_mode"),&RigidBody2D::get_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("set_continuous_collision_detection_mode","mode"),&RigidBody2D::set_continuous_collision_detection_mode); + ClassDB::bind_method(D_METHOD("get_continuous_collision_detection_mode"),&RigidBody2D::get_continuous_collision_detection_mode); - ClassDB::bind_method(_MD("set_axis_velocity","axis_velocity"),&RigidBody2D::set_axis_velocity); - ClassDB::bind_method(_MD("apply_impulse","offset","impulse"),&RigidBody2D::apply_impulse); + ClassDB::bind_method(D_METHOD("set_axis_velocity","axis_velocity"),&RigidBody2D::set_axis_velocity); + ClassDB::bind_method(D_METHOD("apply_impulse","offset","impulse"),&RigidBody2D::apply_impulse); - ClassDB::bind_method(_MD("set_applied_force","force"),&RigidBody2D::set_applied_force); - ClassDB::bind_method(_MD("get_applied_force"),&RigidBody2D::get_applied_force); + ClassDB::bind_method(D_METHOD("set_applied_force","force"),&RigidBody2D::set_applied_force); + ClassDB::bind_method(D_METHOD("get_applied_force"),&RigidBody2D::get_applied_force); - ClassDB::bind_method(_MD("set_applied_torque","torque"),&RigidBody2D::set_applied_torque); - ClassDB::bind_method(_MD("get_applied_torque"),&RigidBody2D::get_applied_torque); + ClassDB::bind_method(D_METHOD("set_applied_torque","torque"),&RigidBody2D::set_applied_torque); + ClassDB::bind_method(D_METHOD("get_applied_torque"),&RigidBody2D::get_applied_torque); - ClassDB::bind_method(_MD("add_force","offset","force"),&RigidBody2D::add_force); + ClassDB::bind_method(D_METHOD("add_force","offset","force"),&RigidBody2D::add_force); - ClassDB::bind_method(_MD("set_sleeping","sleeping"),&RigidBody2D::set_sleeping); - ClassDB::bind_method(_MD("is_sleeping"),&RigidBody2D::is_sleeping); + ClassDB::bind_method(D_METHOD("set_sleeping","sleeping"),&RigidBody2D::set_sleeping); + ClassDB::bind_method(D_METHOD("is_sleeping"),&RigidBody2D::is_sleeping); - ClassDB::bind_method(_MD("set_can_sleep","able_to_sleep"),&RigidBody2D::set_can_sleep); - ClassDB::bind_method(_MD("is_able_to_sleep"),&RigidBody2D::is_able_to_sleep); + ClassDB::bind_method(D_METHOD("set_can_sleep","able_to_sleep"),&RigidBody2D::set_can_sleep); + ClassDB::bind_method(D_METHOD("is_able_to_sleep"),&RigidBody2D::is_able_to_sleep); - ClassDB::bind_method(_MD("test_motion","motion","margin","result:Physics2DTestMotionResult"),&RigidBody2D::_test_motion,DEFVAL(0.08),DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("test_motion","motion","margin","result:Physics2DTestMotionResult"),&RigidBody2D::_test_motion,DEFVAL(0.08),DEFVAL(Variant())); - ClassDB::bind_method(_MD("_direct_state_changed"),&RigidBody2D::_direct_state_changed); - ClassDB::bind_method(_MD("_body_enter_tree"),&RigidBody2D::_body_enter_tree); - ClassDB::bind_method(_MD("_body_exit_tree"),&RigidBody2D::_body_exit_tree); + ClassDB::bind_method(D_METHOD("_direct_state_changed"),&RigidBody2D::_direct_state_changed); + ClassDB::bind_method(D_METHOD("_body_enter_tree"),&RigidBody2D::_body_enter_tree); + ClassDB::bind_method(D_METHOD("_body_exit_tree"),&RigidBody2D::_body_exit_tree); - ClassDB::bind_method(_MD("get_colliding_bodies"),&RigidBody2D::get_colliding_bodies); + ClassDB::bind_method(D_METHOD("get_colliding_bodies"),&RigidBody2D::get_colliding_bodies); BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:Physics2DDirectBodyState"))); @@ -1388,29 +1388,29 @@ float KinematicBody2D::get_collision_margin() const{ void KinematicBody2D::_bind_methods() { - ClassDB::bind_method(_MD("move","rel_vec"),&KinematicBody2D::move); - ClassDB::bind_method(_MD("move_to","position"),&KinematicBody2D::move_to); - ClassDB::bind_method(_MD("move_and_slide","linear_velocity","floor_normal","slope_stop_min_velocity","max_bounces"),&KinematicBody2D::move_and_slide,DEFVAL(Vector2(0,0)),DEFVAL(5),DEFVAL(4)); + ClassDB::bind_method(D_METHOD("move","rel_vec"),&KinematicBody2D::move); + ClassDB::bind_method(D_METHOD("move_to","position"),&KinematicBody2D::move_to); + ClassDB::bind_method(D_METHOD("move_and_slide","linear_velocity","floor_normal","slope_stop_min_velocity","max_bounces"),&KinematicBody2D::move_and_slide,DEFVAL(Vector2(0,0)),DEFVAL(5),DEFVAL(4)); - ClassDB::bind_method(_MD("test_move","from","rel_vec"),&KinematicBody2D::test_move); - ClassDB::bind_method(_MD("get_travel"),&KinematicBody2D::get_travel); - ClassDB::bind_method(_MD("revert_motion"),&KinematicBody2D::revert_motion); + ClassDB::bind_method(D_METHOD("test_move","from","rel_vec"),&KinematicBody2D::test_move); + ClassDB::bind_method(D_METHOD("get_travel"),&KinematicBody2D::get_travel); + ClassDB::bind_method(D_METHOD("revert_motion"),&KinematicBody2D::revert_motion); - ClassDB::bind_method(_MD("is_colliding"),&KinematicBody2D::is_colliding); + ClassDB::bind_method(D_METHOD("is_colliding"),&KinematicBody2D::is_colliding); - ClassDB::bind_method(_MD("get_collision_pos"),&KinematicBody2D::get_collision_pos); - ClassDB::bind_method(_MD("get_collision_normal"),&KinematicBody2D::get_collision_normal); - ClassDB::bind_method(_MD("get_collider_velocity"),&KinematicBody2D::get_collider_velocity); - ClassDB::bind_method(_MD("get_collider:Variant"),&KinematicBody2D::_get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&KinematicBody2D::get_collider_shape); - ClassDB::bind_method(_MD("get_collider_metadata:Variant"),&KinematicBody2D::get_collider_metadata); - ClassDB::bind_method(_MD("get_move_and_slide_colliders"),&KinematicBody2D::get_move_and_slide_colliders); - ClassDB::bind_method(_MD("is_move_and_slide_on_floor"),&KinematicBody2D::is_move_and_slide_on_floor); - ClassDB::bind_method(_MD("is_move_and_slide_on_ceiling"),&KinematicBody2D::is_move_and_slide_on_ceiling); - ClassDB::bind_method(_MD("is_move_and_slide_on_wall"),&KinematicBody2D::is_move_and_slide_on_wall); + ClassDB::bind_method(D_METHOD("get_collision_pos"),&KinematicBody2D::get_collision_pos); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&KinematicBody2D::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider_velocity"),&KinematicBody2D::get_collider_velocity); + ClassDB::bind_method(D_METHOD("get_collider:Variant"),&KinematicBody2D::_get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&KinematicBody2D::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collider_metadata:Variant"),&KinematicBody2D::get_collider_metadata); + ClassDB::bind_method(D_METHOD("get_move_and_slide_colliders"),&KinematicBody2D::get_move_and_slide_colliders); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_floor"),&KinematicBody2D::is_move_and_slide_on_floor); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_ceiling"),&KinematicBody2D::is_move_and_slide_on_ceiling); + ClassDB::bind_method(D_METHOD("is_move_and_slide_on_wall"),&KinematicBody2D::is_move_and_slide_on_wall); - ClassDB::bind_method(_MD("set_collision_margin","pixels"),&KinematicBody2D::set_collision_margin); - ClassDB::bind_method(_MD("get_collision_margin","pixels"),&KinematicBody2D::get_collision_margin); + ClassDB::bind_method(D_METHOD("set_collision_margin","pixels"),&KinematicBody2D::set_collision_margin); + ClassDB::bind_method(D_METHOD("get_collision_margin","pixels"),&KinematicBody2D::get_collision_margin); ADD_PROPERTY( PropertyInfo(Variant::REAL,"collision/margin",PROPERTY_HINT_RANGE,"0.001,256,0.001"),"set_collision_margin","get_collision_margin"); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index d71f21ba67..ec6729844b 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -333,42 +333,42 @@ Vector2 Polygon2D::get_offset() const { void Polygon2D::_bind_methods() { - ClassDB::bind_method(_MD("set_polygon","polygon"),&Polygon2D::set_polygon); - ClassDB::bind_method(_MD("get_polygon"),&Polygon2D::get_polygon); + ClassDB::bind_method(D_METHOD("set_polygon","polygon"),&Polygon2D::set_polygon); + ClassDB::bind_method(D_METHOD("get_polygon"),&Polygon2D::get_polygon); - ClassDB::bind_method(_MD("set_uv","uv"),&Polygon2D::set_uv); - ClassDB::bind_method(_MD("get_uv"),&Polygon2D::get_uv); + ClassDB::bind_method(D_METHOD("set_uv","uv"),&Polygon2D::set_uv); + ClassDB::bind_method(D_METHOD("get_uv"),&Polygon2D::get_uv); - ClassDB::bind_method(_MD("set_color","color"),&Polygon2D::set_color); - ClassDB::bind_method(_MD("get_color"),&Polygon2D::get_color); + ClassDB::bind_method(D_METHOD("set_color","color"),&Polygon2D::set_color); + ClassDB::bind_method(D_METHOD("get_color"),&Polygon2D::get_color); - ClassDB::bind_method(_MD("set_vertex_colors","vertex_colors"),&Polygon2D::set_vertex_colors); - ClassDB::bind_method(_MD("get_vertex_colors"),&Polygon2D::get_vertex_colors); + ClassDB::bind_method(D_METHOD("set_vertex_colors","vertex_colors"),&Polygon2D::set_vertex_colors); + ClassDB::bind_method(D_METHOD("get_vertex_colors"),&Polygon2D::get_vertex_colors); - ClassDB::bind_method(_MD("set_texture","texture"),&Polygon2D::set_texture); - ClassDB::bind_method(_MD("get_texture"),&Polygon2D::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&Polygon2D::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&Polygon2D::get_texture); - ClassDB::bind_method(_MD("set_texture_offset","texture_offset"),&Polygon2D::set_texture_offset); - ClassDB::bind_method(_MD("get_texture_offset"),&Polygon2D::get_texture_offset); + ClassDB::bind_method(D_METHOD("set_texture_offset","texture_offset"),&Polygon2D::set_texture_offset); + ClassDB::bind_method(D_METHOD("get_texture_offset"),&Polygon2D::get_texture_offset); - ClassDB::bind_method(_MD("set_texture_rotation","texture_rotation"),&Polygon2D::set_texture_rotation); - ClassDB::bind_method(_MD("get_texture_rotation"),&Polygon2D::get_texture_rotation); + ClassDB::bind_method(D_METHOD("set_texture_rotation","texture_rotation"),&Polygon2D::set_texture_rotation); + ClassDB::bind_method(D_METHOD("get_texture_rotation"),&Polygon2D::get_texture_rotation); - ClassDB::bind_method(_MD("_set_texture_rotationd","texture_rotation"),&Polygon2D::_set_texture_rotationd); - ClassDB::bind_method(_MD("_get_texture_rotationd"),&Polygon2D::_get_texture_rotationd); + ClassDB::bind_method(D_METHOD("_set_texture_rotationd","texture_rotation"),&Polygon2D::_set_texture_rotationd); + ClassDB::bind_method(D_METHOD("_get_texture_rotationd"),&Polygon2D::_get_texture_rotationd); - ClassDB::bind_method(_MD("set_texture_scale","texture_scale"),&Polygon2D::set_texture_scale); - ClassDB::bind_method(_MD("get_texture_scale"),&Polygon2D::get_texture_scale); + ClassDB::bind_method(D_METHOD("set_texture_scale","texture_scale"),&Polygon2D::set_texture_scale); + ClassDB::bind_method(D_METHOD("get_texture_scale"),&Polygon2D::get_texture_scale); - ClassDB::bind_method(_MD("set_invert","invert"),&Polygon2D::set_invert); - ClassDB::bind_method(_MD("get_invert"),&Polygon2D::get_invert); + ClassDB::bind_method(D_METHOD("set_invert","invert"),&Polygon2D::set_invert); + ClassDB::bind_method(D_METHOD("get_invert"),&Polygon2D::get_invert); - ClassDB::bind_method(_MD("set_invert_border","invert_border"),&Polygon2D::set_invert_border); - ClassDB::bind_method(_MD("get_invert_border"),&Polygon2D::get_invert_border); + ClassDB::bind_method(D_METHOD("set_invert_border","invert_border"),&Polygon2D::set_invert_border); + ClassDB::bind_method(D_METHOD("get_invert_border"),&Polygon2D::get_invert_border); - ClassDB::bind_method(_MD("set_offset","offset"),&Polygon2D::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Polygon2D::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Polygon2D::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Polygon2D::get_offset); diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index 2fa2dac8bb..72247811dc 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -263,36 +263,36 @@ void RayCast2D::clear_exceptions(){ void RayCast2D::_bind_methods() { - ClassDB::bind_method(_MD("set_enabled","enabled"),&RayCast2D::set_enabled); - ClassDB::bind_method(_MD("is_enabled"),&RayCast2D::is_enabled); + ClassDB::bind_method(D_METHOD("set_enabled","enabled"),&RayCast2D::set_enabled); + ClassDB::bind_method(D_METHOD("is_enabled"),&RayCast2D::is_enabled); - ClassDB::bind_method(_MD("set_cast_to","local_point"),&RayCast2D::set_cast_to); - ClassDB::bind_method(_MD("get_cast_to"),&RayCast2D::get_cast_to); + ClassDB::bind_method(D_METHOD("set_cast_to","local_point"),&RayCast2D::set_cast_to); + ClassDB::bind_method(D_METHOD("get_cast_to"),&RayCast2D::get_cast_to); - ClassDB::bind_method(_MD("is_colliding"),&RayCast2D::is_colliding); - ClassDB::bind_method(_MD("force_raycast_update"),&RayCast2D::force_raycast_update); + ClassDB::bind_method(D_METHOD("is_colliding"),&RayCast2D::is_colliding); + ClassDB::bind_method(D_METHOD("force_raycast_update"),&RayCast2D::force_raycast_update); - ClassDB::bind_method(_MD("get_collider"),&RayCast2D::get_collider); - ClassDB::bind_method(_MD("get_collider_shape"),&RayCast2D::get_collider_shape); - ClassDB::bind_method(_MD("get_collision_point"),&RayCast2D::get_collision_point); - ClassDB::bind_method(_MD("get_collision_normal"),&RayCast2D::get_collision_normal); + ClassDB::bind_method(D_METHOD("get_collider"),&RayCast2D::get_collider); + ClassDB::bind_method(D_METHOD("get_collider_shape"),&RayCast2D::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collision_point"),&RayCast2D::get_collision_point); + ClassDB::bind_method(D_METHOD("get_collision_normal"),&RayCast2D::get_collision_normal); - ClassDB::bind_method(_MD("add_exception_rid","rid"),&RayCast2D::add_exception_rid); - ClassDB::bind_method(_MD("add_exception","node"),&RayCast2D::add_exception); + ClassDB::bind_method(D_METHOD("add_exception_rid","rid"),&RayCast2D::add_exception_rid); + ClassDB::bind_method(D_METHOD("add_exception","node"),&RayCast2D::add_exception); - ClassDB::bind_method(_MD("remove_exception_rid","rid"),&RayCast2D::remove_exception_rid); - ClassDB::bind_method(_MD("remove_exception","node"),&RayCast2D::remove_exception); + ClassDB::bind_method(D_METHOD("remove_exception_rid","rid"),&RayCast2D::remove_exception_rid); + ClassDB::bind_method(D_METHOD("remove_exception","node"),&RayCast2D::remove_exception); - ClassDB::bind_method(_MD("clear_exceptions"),&RayCast2D::clear_exceptions); + ClassDB::bind_method(D_METHOD("clear_exceptions"),&RayCast2D::clear_exceptions); - ClassDB::bind_method(_MD("set_layer_mask","mask"),&RayCast2D::set_layer_mask); - ClassDB::bind_method(_MD("get_layer_mask"),&RayCast2D::get_layer_mask); + ClassDB::bind_method(D_METHOD("set_layer_mask","mask"),&RayCast2D::set_layer_mask); + ClassDB::bind_method(D_METHOD("get_layer_mask"),&RayCast2D::get_layer_mask); - ClassDB::bind_method(_MD("set_type_mask","mask"),&RayCast2D::set_type_mask); - ClassDB::bind_method(_MD("get_type_mask"),&RayCast2D::get_type_mask); + ClassDB::bind_method(D_METHOD("set_type_mask","mask"),&RayCast2D::set_type_mask); + ClassDB::bind_method(D_METHOD("get_type_mask"),&RayCast2D::get_type_mask); - ClassDB::bind_method(_MD("set_exclude_parent_body","mask"),&RayCast2D::set_exclude_parent_body); - ClassDB::bind_method(_MD("get_exclude_parent_body"),&RayCast2D::get_exclude_parent_body); + ClassDB::bind_method(D_METHOD("set_exclude_parent_body","mask"),&RayCast2D::set_exclude_parent_body); + ClassDB::bind_method(D_METHOD("get_exclude_parent_body"),&RayCast2D::get_exclude_parent_body); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"enabled"),"set_enabled","is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"exclude_parent"),"set_exclude_parent_body","get_exclude_parent_body"); diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index 90d8879f42..e1f360c0c1 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -118,8 +118,8 @@ String RemoteTransform2D::get_configuration_warning() const { void RemoteTransform2D::_bind_methods() { - ClassDB::bind_method(_MD("set_remote_node","path"),&RemoteTransform2D::set_remote_node); - ClassDB::bind_method(_MD("get_remote_node"),&RemoteTransform2D::get_remote_node); + ClassDB::bind_method(D_METHOD("set_remote_node","path"),&RemoteTransform2D::set_remote_node); + ClassDB::bind_method(D_METHOD("get_remote_node"),&RemoteTransform2D::get_remote_node); ADD_PROPERTY( PropertyInfo(Variant::NODE_PATH,"remote_path"),"set_remote_node","get_remote_node"); } diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index 8fc76247c5..efe23e67f2 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -359,33 +359,33 @@ bool TouchScreenButton::is_passby_press_enabled() const{ void TouchScreenButton::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture"),&TouchScreenButton::set_texture); - ClassDB::bind_method(_MD("get_texture"),&TouchScreenButton::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture"),&TouchScreenButton::set_texture); + ClassDB::bind_method(D_METHOD("get_texture"),&TouchScreenButton::get_texture); - ClassDB::bind_method(_MD("set_texture_pressed","texture_pressed"),&TouchScreenButton::set_texture_pressed); - ClassDB::bind_method(_MD("get_texture_pressed"),&TouchScreenButton::get_texture_pressed); + ClassDB::bind_method(D_METHOD("set_texture_pressed","texture_pressed"),&TouchScreenButton::set_texture_pressed); + ClassDB::bind_method(D_METHOD("get_texture_pressed"),&TouchScreenButton::get_texture_pressed); - ClassDB::bind_method(_MD("set_bitmask","bitmask"),&TouchScreenButton::set_bitmask); - ClassDB::bind_method(_MD("get_bitmask"),&TouchScreenButton::get_bitmask); + ClassDB::bind_method(D_METHOD("set_bitmask","bitmask"),&TouchScreenButton::set_bitmask); + ClassDB::bind_method(D_METHOD("get_bitmask"),&TouchScreenButton::get_bitmask); - ClassDB::bind_method(_MD("set_shape","shape"),&TouchScreenButton::set_shape); - ClassDB::bind_method(_MD("get_shape"),&TouchScreenButton::get_shape); + ClassDB::bind_method(D_METHOD("set_shape","shape"),&TouchScreenButton::set_shape); + ClassDB::bind_method(D_METHOD("get_shape"),&TouchScreenButton::get_shape); - ClassDB::bind_method(_MD("set_shape_centered","bool"),&TouchScreenButton::set_shape_centered); - ClassDB::bind_method(_MD("is_shape_centered"),&TouchScreenButton::is_shape_centered); + ClassDB::bind_method(D_METHOD("set_shape_centered","bool"),&TouchScreenButton::set_shape_centered); + ClassDB::bind_method(D_METHOD("is_shape_centered"),&TouchScreenButton::is_shape_centered); - ClassDB::bind_method(_MD("set_action","action"),&TouchScreenButton::set_action); - ClassDB::bind_method(_MD("get_action"),&TouchScreenButton::get_action); + ClassDB::bind_method(D_METHOD("set_action","action"),&TouchScreenButton::set_action); + ClassDB::bind_method(D_METHOD("get_action"),&TouchScreenButton::get_action); - ClassDB::bind_method(_MD("set_visibility_mode","mode"),&TouchScreenButton::set_visibility_mode); - ClassDB::bind_method(_MD("get_visibility_mode"),&TouchScreenButton::get_visibility_mode); + ClassDB::bind_method(D_METHOD("set_visibility_mode","mode"),&TouchScreenButton::set_visibility_mode); + ClassDB::bind_method(D_METHOD("get_visibility_mode"),&TouchScreenButton::get_visibility_mode); - ClassDB::bind_method(_MD("set_passby_press","enabled"),&TouchScreenButton::set_passby_press); - ClassDB::bind_method(_MD("is_passby_press_enabled"),&TouchScreenButton::is_passby_press_enabled); + ClassDB::bind_method(D_METHOD("set_passby_press","enabled"),&TouchScreenButton::set_passby_press); + ClassDB::bind_method(D_METHOD("is_passby_press_enabled"),&TouchScreenButton::is_passby_press_enabled); - ClassDB::bind_method(_MD("is_pressed"),&TouchScreenButton::is_pressed); + ClassDB::bind_method(D_METHOD("is_pressed"),&TouchScreenButton::is_pressed); - ClassDB::bind_method(_MD("_input"),&TouchScreenButton::_input); + ClassDB::bind_method(D_METHOD("_input"),&TouchScreenButton::_input); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),"set_texture","get_texture"); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"pressed",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),"set_texture_pressed","get_texture_pressed"); diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index b8a0a2dcd1..26c2756acd 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -294,35 +294,35 @@ void Sprite::_validate_property(PropertyInfo& property) const { void Sprite::_bind_methods() { - ClassDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite::set_texture); - ClassDB::bind_method(_MD("get_texture:Texture"),&Sprite::get_texture); + ClassDB::bind_method(D_METHOD("set_texture","texture:Texture"),&Sprite::set_texture); + ClassDB::bind_method(D_METHOD("get_texture:Texture"),&Sprite::get_texture); - ClassDB::bind_method(_MD("set_centered","centered"),&Sprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&Sprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&Sprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&Sprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&Sprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&Sprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&Sprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&Sprite::get_offset); - ClassDB::bind_method(_MD("set_flip_h","flip_h"),&Sprite::set_flip_h); - ClassDB::bind_method(_MD("is_flipped_h"),&Sprite::is_flipped_h); + ClassDB::bind_method(D_METHOD("set_flip_h","flip_h"),&Sprite::set_flip_h); + ClassDB::bind_method(D_METHOD("is_flipped_h"),&Sprite::is_flipped_h); - ClassDB::bind_method(_MD("set_flip_v","flip_v"),&Sprite::set_flip_v); - ClassDB::bind_method(_MD("is_flipped_v"),&Sprite::is_flipped_v); + ClassDB::bind_method(D_METHOD("set_flip_v","flip_v"),&Sprite::set_flip_v); + ClassDB::bind_method(D_METHOD("is_flipped_v"),&Sprite::is_flipped_v); - ClassDB::bind_method(_MD("set_region","enabled"),&Sprite::set_region); - ClassDB::bind_method(_MD("is_region"),&Sprite::is_region); + ClassDB::bind_method(D_METHOD("set_region","enabled"),&Sprite::set_region); + ClassDB::bind_method(D_METHOD("is_region"),&Sprite::is_region); - ClassDB::bind_method(_MD("set_region_rect","rect"),&Sprite::set_region_rect); - ClassDB::bind_method(_MD("get_region_rect"),&Sprite::get_region_rect); + ClassDB::bind_method(D_METHOD("set_region_rect","rect"),&Sprite::set_region_rect); + ClassDB::bind_method(D_METHOD("get_region_rect"),&Sprite::get_region_rect); - ClassDB::bind_method(_MD("set_frame","frame"),&Sprite::set_frame); - ClassDB::bind_method(_MD("get_frame"),&Sprite::get_frame); + ClassDB::bind_method(D_METHOD("set_frame","frame"),&Sprite::set_frame); + ClassDB::bind_method(D_METHOD("get_frame"),&Sprite::get_frame); - ClassDB::bind_method(_MD("set_vframes","vframes"),&Sprite::set_vframes); - ClassDB::bind_method(_MD("get_vframes"),&Sprite::get_vframes); + ClassDB::bind_method(D_METHOD("set_vframes","vframes"),&Sprite::set_vframes); + ClassDB::bind_method(D_METHOD("get_vframes"),&Sprite::get_vframes); - ClassDB::bind_method(_MD("set_hframes","hframes"),&Sprite::set_hframes); - ClassDB::bind_method(_MD("get_hframes"),&Sprite::get_hframes); + ClassDB::bind_method(D_METHOD("set_hframes","hframes"),&Sprite::set_hframes); + ClassDB::bind_method(D_METHOD("get_hframes"),&Sprite::get_hframes); ADD_SIGNAL(MethodInfo("frame_changed")); ADD_SIGNAL(MethodInfo("texture_changed")); @@ -552,17 +552,17 @@ String ViewportSprite::get_configuration_warning() const { void ViewportSprite::_bind_methods() { - ClassDB::bind_method(_MD("set_viewport_path","path"),&ViewportSprite::set_viewport_path); - ClassDB::bind_method(_MD("get_viewport_path"),&ViewportSprite::get_viewport_path); + ClassDB::bind_method(D_METHOD("set_viewport_path","path"),&ViewportSprite::set_viewport_path); + ClassDB::bind_method(D_METHOD("get_viewport_path"),&ViewportSprite::get_viewport_path); - ClassDB::bind_method(_MD("set_centered","centered"),&ViewportSprite::set_centered); - ClassDB::bind_method(_MD("is_centered"),&ViewportSprite::is_centered); + ClassDB::bind_method(D_METHOD("set_centered","centered"),&ViewportSprite::set_centered); + ClassDB::bind_method(D_METHOD("is_centered"),&ViewportSprite::is_centered); - ClassDB::bind_method(_MD("set_offset","offset"),&ViewportSprite::set_offset); - ClassDB::bind_method(_MD("get_offset"),&ViewportSprite::get_offset); + ClassDB::bind_method(D_METHOD("set_offset","offset"),&ViewportSprite::set_offset); + ClassDB::bind_method(D_METHOD("get_offset"),&ViewportSprite::get_offset); - ClassDB::bind_method(_MD("set_modulate","modulate"),&ViewportSprite::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&ViewportSprite::get_modulate); + ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&ViewportSprite::set_modulate); + ClassDB::bind_method(D_METHOD("get_modulate"),&ViewportSprite::get_modulate); ADD_PROPERTYNZ( PropertyInfo( Variant::NODE_PATH, "viewport"), "set_viewport_path","get_viewport_path"); ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "centered"), "set_centered","is_centered"); diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index be4661fc3f..5de0b93ed9 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -1189,78 +1189,78 @@ void TileMap::set_light_mask(int p_light_mask) { void TileMap::_bind_methods() { - ClassDB::bind_method(_MD("set_tileset","tileset:TileSet"),&TileMap::set_tileset); - ClassDB::bind_method(_MD("get_tileset:TileSet"),&TileMap::get_tileset); + ClassDB::bind_method(D_METHOD("set_tileset","tileset:TileSet"),&TileMap::set_tileset); + ClassDB::bind_method(D_METHOD("get_tileset:TileSet"),&TileMap::get_tileset); - ClassDB::bind_method(_MD("set_mode","mode"),&TileMap::set_mode); - ClassDB::bind_method(_MD("get_mode"),&TileMap::get_mode); + ClassDB::bind_method(D_METHOD("set_mode","mode"),&TileMap::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"),&TileMap::get_mode); - ClassDB::bind_method(_MD("set_half_offset","half_offset"),&TileMap::set_half_offset); - ClassDB::bind_method(_MD("get_half_offset"),&TileMap::get_half_offset); + ClassDB::bind_method(D_METHOD("set_half_offset","half_offset"),&TileMap::set_half_offset); + ClassDB::bind_method(D_METHOD("get_half_offset"),&TileMap::get_half_offset); - ClassDB::bind_method(_MD("set_custom_transform","custom_transform"),&TileMap::set_custom_transform); - ClassDB::bind_method(_MD("get_custom_transform"),&TileMap::get_custom_transform); + ClassDB::bind_method(D_METHOD("set_custom_transform","custom_transform"),&TileMap::set_custom_transform); + ClassDB::bind_method(D_METHOD("get_custom_transform"),&TileMap::get_custom_transform); - ClassDB::bind_method(_MD("set_cell_size","size"),&TileMap::set_cell_size); - ClassDB::bind_method(_MD("get_cell_size"),&TileMap::get_cell_size); + ClassDB::bind_method(D_METHOD("set_cell_size","size"),&TileMap::set_cell_size); + ClassDB::bind_method(D_METHOD("get_cell_size"),&TileMap::get_cell_size); - ClassDB::bind_method(_MD("_set_old_cell_size","size"),&TileMap::_set_old_cell_size); - ClassDB::bind_method(_MD("_get_old_cell_size"),&TileMap::_get_old_cell_size); + ClassDB::bind_method(D_METHOD("_set_old_cell_size","size"),&TileMap::_set_old_cell_size); + ClassDB::bind_method(D_METHOD("_get_old_cell_size"),&TileMap::_get_old_cell_size); - ClassDB::bind_method(_MD("set_quadrant_size","size"),&TileMap::set_quadrant_size); - ClassDB::bind_method(_MD("get_quadrant_size"),&TileMap::get_quadrant_size); + ClassDB::bind_method(D_METHOD("set_quadrant_size","size"),&TileMap::set_quadrant_size); + ClassDB::bind_method(D_METHOD("get_quadrant_size"),&TileMap::get_quadrant_size); - ClassDB::bind_method(_MD("set_tile_origin","origin"),&TileMap::set_tile_origin); - ClassDB::bind_method(_MD("get_tile_origin"),&TileMap::get_tile_origin); + ClassDB::bind_method(D_METHOD("set_tile_origin","origin"),&TileMap::set_tile_origin); + ClassDB::bind_method(D_METHOD("get_tile_origin"),&TileMap::get_tile_origin); - ClassDB::bind_method(_MD("set_center_x","enable"),&TileMap::set_center_x); - ClassDB::bind_method(_MD("get_center_x"),&TileMap::get_center_x); + ClassDB::bind_method(D_METHOD("set_center_x","enable"),&TileMap::set_center_x); + ClassDB::bind_method(D_METHOD("get_center_x"),&TileMap::get_center_x); - ClassDB::bind_method(_MD("set_center_y","enable"),&TileMap::set_center_y); - ClassDB::bind_method(_MD("get_center_y"),&TileMap::get_center_y); + ClassDB::bind_method(D_METHOD("set_center_y","enable"),&TileMap::set_center_y); + ClassDB::bind_method(D_METHOD("get_center_y"),&TileMap::get_center_y); - ClassDB::bind_method(_MD("set_y_sort_mode","enable"),&TileMap::set_y_sort_mode); - ClassDB::bind_method(_MD("is_y_sort_mode_enabled"),&TileMap::is_y_sort_mode_enabled); + ClassDB::bind_method(D_METHOD("set_y_sort_mode","enable"),&TileMap::set_y_sort_mode); + ClassDB::bind_method(D_METHOD("is_y_sort_mode_enabled"),&TileMap::is_y_sort_mode_enabled); - ClassDB::bind_method(_MD("set_collision_use_kinematic","use_kinematic"),&TileMap::set_collision_use_kinematic); - ClassDB::bind_method(_MD("get_collision_use_kinematic"),&TileMap::get_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("set_collision_use_kinematic","use_kinematic"),&TileMap::set_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("get_collision_use_kinematic"),&TileMap::get_collision_use_kinematic); - ClassDB::bind_method(_MD("set_collision_layer","mask"),&TileMap::set_collision_layer); - ClassDB::bind_method(_MD("get_collision_layer"),&TileMap::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_layer","mask"),&TileMap::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"),&TileMap::get_collision_layer); - ClassDB::bind_method(_MD("set_collision_mask","mask"),&TileMap::set_collision_mask); - ClassDB::bind_method(_MD("get_collision_mask"),&TileMap::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&TileMap::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"),&TileMap::get_collision_mask); - ClassDB::bind_method(_MD("set_collision_friction","value"),&TileMap::set_collision_friction); - ClassDB::bind_method(_MD("get_collision_friction"),&TileMap::get_collision_friction); + ClassDB::bind_method(D_METHOD("set_collision_friction","value"),&TileMap::set_collision_friction); + ClassDB::bind_method(D_METHOD("get_collision_friction"),&TileMap::get_collision_friction); - ClassDB::bind_method(_MD("set_collision_bounce","value"),&TileMap::set_collision_bounce); - ClassDB::bind_method(_MD("get_collision_bounce"),&TileMap::get_collision_bounce); + ClassDB::bind_method(D_METHOD("set_collision_bounce","value"),&TileMap::set_collision_bounce); + ClassDB::bind_method(D_METHOD("get_collision_bounce"),&TileMap::get_collision_bounce); - ClassDB::bind_method(_MD("set_occluder_light_mask","mask"),&TileMap::set_occluder_light_mask); - ClassDB::bind_method(_MD("get_occluder_light_mask"),&TileMap::get_occluder_light_mask); + ClassDB::bind_method(D_METHOD("set_occluder_light_mask","mask"),&TileMap::set_occluder_light_mask); + ClassDB::bind_method(D_METHOD("get_occluder_light_mask"),&TileMap::get_occluder_light_mask); - ClassDB::bind_method(_MD("set_cell","x","y","tile","flip_x","flip_y","transpose"),&TileMap::set_cell,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("set_cellv","pos","tile","flip_x","flip_y","transpose"),&TileMap::set_cellv,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(_MD("get_cell","x","y"),&TileMap::get_cell); - ClassDB::bind_method(_MD("get_cellv","pos"),&TileMap::get_cellv); - ClassDB::bind_method(_MD("is_cell_x_flipped","x","y"),&TileMap::is_cell_x_flipped); - ClassDB::bind_method(_MD("is_cell_y_flipped","x","y"),&TileMap::is_cell_y_flipped); - ClassDB::bind_method(_MD("is_cell_transposed","x","y"),&TileMap::is_cell_transposed); + ClassDB::bind_method(D_METHOD("set_cell","x","y","tile","flip_x","flip_y","transpose"),&TileMap::set_cell,DEFVAL(false),DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_cellv","pos","tile","flip_x","flip_y","transpose"),&TileMap::set_cellv,DEFVAL(false),DEFVAL(false),DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_cell","x","y"),&TileMap::get_cell); + ClassDB::bind_method(D_METHOD("get_cellv","pos"),&TileMap::get_cellv); + ClassDB::bind_method(D_METHOD("is_cell_x_flipped","x","y"),&TileMap::is_cell_x_flipped); + ClassDB::bind_method(D_METHOD("is_cell_y_flipped","x","y"),&TileMap::is_cell_y_flipped); + ClassDB::bind_method(D_METHOD("is_cell_transposed","x","y"),&TileMap::is_cell_transposed); - ClassDB::bind_method(_MD("clear"),&TileMap::clear); + ClassDB::bind_method(D_METHOD("clear"),&TileMap::clear); - ClassDB::bind_method(_MD("get_used_cells"),&TileMap::get_used_cells); + ClassDB::bind_method(D_METHOD("get_used_cells"),&TileMap::get_used_cells); - ClassDB::bind_method(_MD("map_to_world","mappos","ignore_half_ofs"),&TileMap::map_to_world,DEFVAL(false)); - ClassDB::bind_method(_MD("world_to_map","worldpos"),&TileMap::world_to_map); + ClassDB::bind_method(D_METHOD("map_to_world","mappos","ignore_half_ofs"),&TileMap::map_to_world,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("world_to_map","worldpos"),&TileMap::world_to_map); - ClassDB::bind_method(_MD("_clear_quadrants"),&TileMap::_clear_quadrants); - ClassDB::bind_method(_MD("_recreate_quadrants"),&TileMap::_recreate_quadrants); - ClassDB::bind_method(_MD("_update_dirty_quadrants"),&TileMap::_update_dirty_quadrants); + ClassDB::bind_method(D_METHOD("_clear_quadrants"),&TileMap::_clear_quadrants); + ClassDB::bind_method(D_METHOD("_recreate_quadrants"),&TileMap::_recreate_quadrants); + ClassDB::bind_method(D_METHOD("_update_dirty_quadrants"),&TileMap::_update_dirty_quadrants); - ClassDB::bind_method(_MD("_set_tile_data"),&TileMap::_set_tile_data); - ClassDB::bind_method(_MD("_get_tile_data"),&TileMap::_get_tile_data); + ClassDB::bind_method(D_METHOD("_set_tile_data"),&TileMap::_set_tile_data); + ClassDB::bind_method(D_METHOD("_get_tile_data"),&TileMap::_get_tile_data); ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Square,Isometric,Custom"),"set_mode","get_mode"); ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"tile_set",PROPERTY_HINT_RESOURCE_TYPE,"TileSet"),"set_tileset","get_tileset"); diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index 1068c83d97..64ab333e48 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -129,9 +129,9 @@ bool VisibilityNotifier2D::is_on_screen() const { void VisibilityNotifier2D::_bind_methods(){ - ClassDB::bind_method(_MD("set_rect","rect"),&VisibilityNotifier2D::set_rect); - ClassDB::bind_method(_MD("get_rect"),&VisibilityNotifier2D::get_rect); - ClassDB::bind_method(_MD("is_on_screen"),&VisibilityNotifier2D::is_on_screen); + ClassDB::bind_method(D_METHOD("set_rect","rect"),&VisibilityNotifier2D::set_rect); + ClassDB::bind_method(D_METHOD("get_rect"),&VisibilityNotifier2D::get_rect); + ClassDB::bind_method(D_METHOD("is_on_screen"),&VisibilityNotifier2D::is_on_screen); ADD_PROPERTY( PropertyInfo(Variant::RECT2,"rect"),"set_rect","get_rect"); @@ -355,9 +355,9 @@ String VisibilityEnabler2D::get_configuration_warning() const { void VisibilityEnabler2D::_bind_methods(){ - ClassDB::bind_method(_MD("set_enabler","enabler","enabled"),&VisibilityEnabler2D::set_enabler); - ClassDB::bind_method(_MD("is_enabler_enabled","enabler"),&VisibilityEnabler2D::is_enabler_enabled); - ClassDB::bind_method(_MD("_node_removed"),&VisibilityEnabler2D::_node_removed); + ClassDB::bind_method(D_METHOD("set_enabler","enabler","enabled"),&VisibilityEnabler2D::set_enabler); + ClassDB::bind_method(D_METHOD("is_enabler_enabled","enabler"),&VisibilityEnabler2D::is_enabler_enabled); + ClassDB::bind_method(D_METHOD("_node_removed"),&VisibilityEnabler2D::_node_removed); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"pause_animations"),"set_enabler","is_enabler_enabled", ENABLER_PAUSE_ANIMATIONS ); ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"freeze_bodies"),"set_enabler","is_enabler_enabled", ENABLER_FREEZE_BODIES); diff --git a/scene/2d/y_sort.cpp b/scene/2d/y_sort.cpp index bcef093ef5..cb9a494e87 100644 --- a/scene/2d/y_sort.cpp +++ b/scene/2d/y_sort.cpp @@ -43,8 +43,8 @@ bool YSort::is_sort_enabled() const { void YSort::_bind_methods() { - ClassDB::bind_method(_MD("set_sort_enabled","enabled"),&YSort::set_sort_enabled); - ClassDB::bind_method(_MD("is_sort_enabled"),&YSort::is_sort_enabled); + ClassDB::bind_method(D_METHOD("set_sort_enabled","enabled"),&YSort::set_sort_enabled); + ClassDB::bind_method(D_METHOD("is_sort_enabled"),&YSort::is_sort_enabled); ADD_GROUP("Sort","sort_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL,"sort_enabled"),"set_sort_enabled","is_sort_enabled"); |