diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 12:31:14 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 12:31:14 -0300 |
commit | 8ecc34bfaeb6b444333c0aa2412e412f6423915d (patch) | |
tree | 052418f9cc28956565f9df6796f65551d04b9b20 /scene/2d/animated_sprite.cpp | |
parent | d9ca9d778db3e49e2f3376881b4ca11eb6d6d172 (diff) |
removed unnecesary modulate funtions, which were superseded by self_modulate
Diffstat (limited to 'scene/2d/animated_sprite.cpp')
-rw-r--r-- | scene/2d/animated_sprite.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index bde3f50754..f9f6525686 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -428,7 +428,7 @@ void AnimatedSprite::_notification(int p_what) { dst_rect.size.y=-dst_rect.size.y; //texture->draw_rect(ci,dst_rect,false,modulate); - texture->draw_rect_region(ci,dst_rect,Rect2(Vector2(),texture->get_size()),modulate); + texture->draw_rect_region(ci,dst_rect,Rect2(Vector2(),texture->get_size())); // VisualServer::get_singleton()->canvas_item_add_texture_rect_region(ci,dst_rect,texture->get_rid(),src_rect,modulate); } break; @@ -544,17 +544,6 @@ bool AnimatedSprite::is_flipped_v() const { } -void AnimatedSprite::set_modulate(const Color& p_color) { - - modulate=p_color; - update(); -} - -Color AnimatedSprite::get_modulate() const{ - - return modulate; -} - Rect2 AnimatedSprite::get_item_rect() const { @@ -692,9 +681,6 @@ void AnimatedSprite::_bind_methods() { ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite::set_frame); ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite::get_frame); - ClassDB::bind_method(_MD("set_modulate","modulate"),&AnimatedSprite::set_modulate); - ClassDB::bind_method(_MD("get_modulate"),&AnimatedSprite::get_modulate); - ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed); @@ -709,7 +695,7 @@ void AnimatedSprite::_bind_methods() { ADD_PROPERTYNZ( PropertyInfo( Variant::VECTOR2, "offset"), _SCS("set_offset"),_SCS("get_offset")); ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "flip_h"), _SCS("set_flip_h"),_SCS("is_flipped_h")); ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "flip_v"), _SCS("set_flip_v"),_SCS("is_flipped_v")); - ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate")); + } @@ -722,7 +708,6 @@ AnimatedSprite::AnimatedSprite() { frame=0; playing=false; animation="default"; - modulate=Color(1,1,1,1); timeout=0; |