summaryrefslogtreecommitdiffstats
path: root/scene/3d/sprite_3d.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-02 23:03:46 -0300
commit118eed485e8f928a5a0dab530ae93211afa10525 (patch)
tree83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /scene/3d/sprite_3d.cpp
parentce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff)
downloadredot-engine-118eed485e8f928a5a0dab530ae93211afa10525.tar.gz
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
Diffstat (limited to 'scene/3d/sprite_3d.cpp')
-rw-r--r--scene/3d/sprite_3d.cpp102
1 files changed, 51 insertions, 51 deletions
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index a46ca7c132..82bec9e512 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -246,41 +246,41 @@ SpriteBase3D::AlphaCutMode SpriteBase3D::get_alpha_cut_mode() const{
void SpriteBase3D::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("set_centered","centered"),&SpriteBase3D::set_centered);
- ObjectTypeDB::bind_method(_MD("is_centered"),&SpriteBase3D::is_centered);
+ ClassDB::bind_method(_MD("set_centered","centered"),&SpriteBase3D::set_centered);
+ ClassDB::bind_method(_MD("is_centered"),&SpriteBase3D::is_centered);
- ObjectTypeDB::bind_method(_MD("set_offset","offset"),&SpriteBase3D::set_offset);
- ObjectTypeDB::bind_method(_MD("get_offset"),&SpriteBase3D::get_offset);
+ ClassDB::bind_method(_MD("set_offset","offset"),&SpriteBase3D::set_offset);
+ ClassDB::bind_method(_MD("get_offset"),&SpriteBase3D::get_offset);
- ObjectTypeDB::bind_method(_MD("set_flip_h","flip_h"),&SpriteBase3D::set_flip_h);
- ObjectTypeDB::bind_method(_MD("is_flipped_h"),&SpriteBase3D::is_flipped_h);
+ ClassDB::bind_method(_MD("set_flip_h","flip_h"),&SpriteBase3D::set_flip_h);
+ ClassDB::bind_method(_MD("is_flipped_h"),&SpriteBase3D::is_flipped_h);
- ObjectTypeDB::bind_method(_MD("set_flip_v","flip_v"),&SpriteBase3D::set_flip_v);
- ObjectTypeDB::bind_method(_MD("is_flipped_v"),&SpriteBase3D::is_flipped_v);
+ ClassDB::bind_method(_MD("set_flip_v","flip_v"),&SpriteBase3D::set_flip_v);
+ ClassDB::bind_method(_MD("is_flipped_v"),&SpriteBase3D::is_flipped_v);
- ObjectTypeDB::bind_method(_MD("set_modulate","modulate"),&SpriteBase3D::set_modulate);
- ObjectTypeDB::bind_method(_MD("get_modulate"),&SpriteBase3D::get_modulate);
+ ClassDB::bind_method(_MD("set_modulate","modulate"),&SpriteBase3D::set_modulate);
+ ClassDB::bind_method(_MD("get_modulate"),&SpriteBase3D::get_modulate);
- ObjectTypeDB::bind_method(_MD("set_opacity","opacity"),&SpriteBase3D::set_opacity);
- ObjectTypeDB::bind_method(_MD("get_opacity"),&SpriteBase3D::get_opacity);
+ ClassDB::bind_method(_MD("set_opacity","opacity"),&SpriteBase3D::set_opacity);
+ ClassDB::bind_method(_MD("get_opacity"),&SpriteBase3D::get_opacity);
- ObjectTypeDB::bind_method(_MD("set_pixel_size","pixel_size"),&SpriteBase3D::set_pixel_size);
- ObjectTypeDB::bind_method(_MD("get_pixel_size"),&SpriteBase3D::get_pixel_size);
+ ClassDB::bind_method(_MD("set_pixel_size","pixel_size"),&SpriteBase3D::set_pixel_size);
+ ClassDB::bind_method(_MD("get_pixel_size"),&SpriteBase3D::get_pixel_size);
- ObjectTypeDB::bind_method(_MD("set_axis","axis"),&SpriteBase3D::set_axis);
- ObjectTypeDB::bind_method(_MD("get_axis"),&SpriteBase3D::get_axis);
+ ClassDB::bind_method(_MD("set_axis","axis"),&SpriteBase3D::set_axis);
+ ClassDB::bind_method(_MD("get_axis"),&SpriteBase3D::get_axis);
- ObjectTypeDB::bind_method(_MD("set_draw_flag","flag","enabled"),&SpriteBase3D::set_draw_flag);
- ObjectTypeDB::bind_method(_MD("get_draw_flag","flag"),&SpriteBase3D::get_draw_flag);
+ ClassDB::bind_method(_MD("set_draw_flag","flag","enabled"),&SpriteBase3D::set_draw_flag);
+ ClassDB::bind_method(_MD("get_draw_flag","flag"),&SpriteBase3D::get_draw_flag);
- ObjectTypeDB::bind_method(_MD("set_alpha_cut_mode","mode"),&SpriteBase3D::set_alpha_cut_mode);
- ObjectTypeDB::bind_method(_MD("get_alpha_cut_mode"),&SpriteBase3D::get_alpha_cut_mode);
+ ClassDB::bind_method(_MD("set_alpha_cut_mode","mode"),&SpriteBase3D::set_alpha_cut_mode);
+ ClassDB::bind_method(_MD("get_alpha_cut_mode"),&SpriteBase3D::get_alpha_cut_mode);
- ObjectTypeDB::bind_method(_MD("get_item_rect"),&SpriteBase3D::get_item_rect);
+ ClassDB::bind_method(_MD("get_item_rect"),&SpriteBase3D::get_item_rect);
- ObjectTypeDB::bind_method(_MD("_queue_update"),&SpriteBase3D::_queue_update);
- ObjectTypeDB::bind_method(_MD("_im_update"),&SpriteBase3D::_im_update);
+ ClassDB::bind_method(_MD("_queue_update"),&SpriteBase3D::_queue_update);
+ ClassDB::bind_method(_MD("_im_update"),&SpriteBase3D::_im_update);
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "centered"), _SCS("set_centered"),_SCS("is_centered"));
@@ -598,23 +598,23 @@ void Sprite3D::_validate_property(PropertyInfo& property) const {
void Sprite3D::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite3D::set_texture);
- ObjectTypeDB::bind_method(_MD("get_texture:Texture"),&Sprite3D::get_texture);
+ ClassDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite3D::set_texture);
+ ClassDB::bind_method(_MD("get_texture:Texture"),&Sprite3D::get_texture);
- ObjectTypeDB::bind_method(_MD("set_region","enabled"),&Sprite3D::set_region);
- ObjectTypeDB::bind_method(_MD("is_region"),&Sprite3D::is_region);
+ ClassDB::bind_method(_MD("set_region","enabled"),&Sprite3D::set_region);
+ ClassDB::bind_method(_MD("is_region"),&Sprite3D::is_region);
- ObjectTypeDB::bind_method(_MD("set_region_rect","rect"),&Sprite3D::set_region_rect);
- ObjectTypeDB::bind_method(_MD("get_region_rect"),&Sprite3D::get_region_rect);
+ ClassDB::bind_method(_MD("set_region_rect","rect"),&Sprite3D::set_region_rect);
+ ClassDB::bind_method(_MD("get_region_rect"),&Sprite3D::get_region_rect);
- ObjectTypeDB::bind_method(_MD("set_frame","frame"),&Sprite3D::set_frame);
- ObjectTypeDB::bind_method(_MD("get_frame"),&Sprite3D::get_frame);
+ ClassDB::bind_method(_MD("set_frame","frame"),&Sprite3D::set_frame);
+ ClassDB::bind_method(_MD("get_frame"),&Sprite3D::get_frame);
- ObjectTypeDB::bind_method(_MD("set_vframes","vframes"),&Sprite3D::set_vframes);
- ObjectTypeDB::bind_method(_MD("get_vframes"),&Sprite3D::get_vframes);
+ ClassDB::bind_method(_MD("set_vframes","vframes"),&Sprite3D::set_vframes);
+ ClassDB::bind_method(_MD("get_vframes"),&Sprite3D::get_vframes);
- ObjectTypeDB::bind_method(_MD("set_hframes","hframes"),&Sprite3D::set_hframes);
- ObjectTypeDB::bind_method(_MD("get_hframes"),&Sprite3D::get_hframes);
+ ClassDB::bind_method(_MD("set_hframes","hframes"),&Sprite3D::set_hframes);
+ ClassDB::bind_method(_MD("get_hframes"),&Sprite3D::get_hframes);
ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_texture"),_SCS("get_texture"));
ADD_PROPERTY( PropertyInfo( Variant::INT, "vframes",PROPERTY_HINT_RANGE,"1,16384,1"), _SCS("set_vframes"),_SCS("get_vframes"));
@@ -761,10 +761,10 @@ void AnimatedSprite3D::_draw() {
void AnimatedSprite3D::_bind_methods(){
- ObjectTypeDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames);
- ObjectTypeDB::bind_method(_MD("get_sprite_frames:Texture"),&AnimatedSprite3D::get_sprite_frames);
- ObjectTypeDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame);
- ObjectTypeDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame);
+ ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames);
+ ClassDB::bind_method(_MD("get_sprite_frames:Texture"),&AnimatedSprite3D::get_sprite_frames);
+ ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame);
+ ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame);
ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "frames", PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), _SCS("set_sprite_frames"),_SCS("get_sprite_frames"));
ADD_PROPERTY( PropertyInfo( Variant::INT, "frame",PROPERTY_HINT_SPRITE_FRAME), _SCS("set_frame"),_SCS("get_frame"));
@@ -1309,24 +1309,24 @@ String AnimatedSprite3D::get_configuration_warning() const {
void AnimatedSprite3D::_bind_methods() {
- ObjectTypeDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames);
- ObjectTypeDB::bind_method(_MD("get_sprite_frames:SpriteFrames"),&AnimatedSprite3D::get_sprite_frames);
+ ClassDB::bind_method(_MD("set_sprite_frames","sprite_frames:SpriteFrames"),&AnimatedSprite3D::set_sprite_frames);
+ ClassDB::bind_method(_MD("get_sprite_frames:SpriteFrames"),&AnimatedSprite3D::get_sprite_frames);
- ObjectTypeDB::bind_method(_MD("set_animation","animation"),&AnimatedSprite3D::set_animation);
- ObjectTypeDB::bind_method(_MD("get_animation"),&AnimatedSprite3D::get_animation);
+ ClassDB::bind_method(_MD("set_animation","animation"),&AnimatedSprite3D::set_animation);
+ ClassDB::bind_method(_MD("get_animation"),&AnimatedSprite3D::get_animation);
- ObjectTypeDB::bind_method(_MD("_set_playing","playing"),&AnimatedSprite3D::_set_playing);
- ObjectTypeDB::bind_method(_MD("_is_playing"),&AnimatedSprite3D::_is_playing);
+ ClassDB::bind_method(_MD("_set_playing","playing"),&AnimatedSprite3D::_set_playing);
+ ClassDB::bind_method(_MD("_is_playing"),&AnimatedSprite3D::_is_playing);
- ObjectTypeDB::bind_method(_MD("play","anim"),&AnimatedSprite3D::play,DEFVAL(StringName()));
- ObjectTypeDB::bind_method(_MD("stop"),&AnimatedSprite3D::stop);
- ObjectTypeDB::bind_method(_MD("is_playing"),&AnimatedSprite3D::is_playing);
+ ClassDB::bind_method(_MD("play","anim"),&AnimatedSprite3D::play,DEFVAL(StringName()));
+ ClassDB::bind_method(_MD("stop"),&AnimatedSprite3D::stop);
+ ClassDB::bind_method(_MD("is_playing"),&AnimatedSprite3D::is_playing);
- ObjectTypeDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame);
- ObjectTypeDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame);
+ ClassDB::bind_method(_MD("set_frame","frame"),&AnimatedSprite3D::set_frame);
+ ClassDB::bind_method(_MD("get_frame"),&AnimatedSprite3D::get_frame);
- ObjectTypeDB::bind_method(_MD("_res_changed"),&AnimatedSprite3D::_res_changed);
+ ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite3D::_res_changed);
ADD_SIGNAL(MethodInfo("frame_changed"));