asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed some string names and animation playback options, closes #9446

Browse source
This commit is contained in:
Juan Linietsky 2017-08-06 22:51:56 -03:00
parent 378b1e6cf0
commit 7e4970214c
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/animation/animation_player.cpp
View file

@ -1268,7 +1268,7 @@ void AnimationPlayer::_bind_methods() {
ClassDB::bind_method(D_METHOD("advance", "delta"), &AnimationPlayer::advance); ClassDB::bind_method(D_METHOD("advance", "delta"), &AnimationPlayer::advance);
ADD_GROUP("Playback", "playback_"); ADD_GROUP("Playback Options", "playback_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "playback_process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_animation_process_mode", "get_animation_process_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "playback_process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_animation_process_mode", "get_animation_process_mode");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "playback_default_blend_time", PROPERTY_HINT_RANGE, "0,4096,0.01"), "set_default_blend_time", "get_default_blend_time"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "playback_default_blend_time", PROPERTY_HINT_RANGE, "0,4096,0.01"), "set_default_blend_time", "get_default_blend_time");
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "root_node"), "set_root", "get_root"); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "root_node"), "set_root", "get_root");

8
scene/scene_string_names.cpp
View file

@ -142,9 +142,9 @@ SceneStringNames::SceneStringNames() {
h_offset = StaticCString::create("h_offset"); h_offset = StaticCString::create("h_offset");
v_offset = StaticCString::create("v_offset"); v_offset = StaticCString::create("v_offset");
transform_pos = StaticCString::create("transform/pos"); transform_pos = StaticCString::create("position");
transform_rot = StaticCString::create("transform/rot"); transform_rot = StaticCString::create("rotation_deg");
transform_scale = StaticCString::create("transform/scale"); transform_scale = StaticCString::create("scale");
_update_remote = StaticCString::create("_update_remote"); _update_remote = StaticCString::create("_update_remote");
_update_pairs = StaticCString::create("_update_pairs"); _update_pairs = StaticCString::create("_update_pairs");
@ -158,8 +158,6 @@ SceneStringNames::SceneStringNames() {
line_separation = StaticCString::create("line_separation"); line_separation = StaticCString::create("line_separation");
play_play = StaticCString::create("play/play");
get_drag_data = StaticCString::create("get_drag_data"); get_drag_data = StaticCString::create("get_drag_data");
drop_data = StaticCString::create("drop_data"); drop_data = StaticCString::create("drop_data");
can_drop_data = StaticCString::create("can_drop_data"); can_drop_data = StaticCString::create("can_drop_data");

2
scene/scene_string_names.h
View file

@ -173,8 +173,6 @@ public:
StringName _get_minimum_size; StringName _get_minimum_size;
StringName play_play;
StringName _im_update; StringName _im_update;
StringName _queue_update; StringName _queue_update;