summaryrefslogtreecommitdiff
path: root/scene/2d/particles_2d.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-02-13 15:46:17 +0100
committerGitHub <noreply@github.com>2017-02-13 15:46:17 +0100
commitea7e8c8e8699c0a0da0731f59a2ee5dfbf34d378 (patch)
tree65ed57ff55cadd49b881e248e2f87331ca5eee28 /scene/2d/particles_2d.cpp
parentf6859fd31b5c3cc1a112b7f77b3c1783df8c8919 (diff)
parent411ee71b4d2dd4dfb3c137b057e0cfcdb55d6291 (diff)
Merge pull request #7795 from hpvb/rename-md-macro
Rename the _MD macro to D_METHOD
Diffstat (limited to 'scene/2d/particles_2d.cpp')
-rw-r--r--scene/2d/particles_2d.cpp124
1 files changed, 62 insertions, 62 deletions
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") ;