summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_player.cpp12
-rw-r--r--scene/animation/animation_player.h4
-rw-r--r--scene/animation/animation_tree_player.cpp16
-rw-r--r--scene/animation/animation_tree_player.h2
-rw-r--r--scene/animation/tween.cpp12
5 files changed, 23 insertions, 23 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 97efb26753..3f41a790b4 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -214,14 +214,14 @@ void AnimationPlayer::_notification(int p_what) {
set_autoplay(""); //this line is the fix for autoplay issues with animatio
}
} break;
- case NOTIFICATION_PROCESS: {
+ case NOTIFICATION_INTERNAL_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_FIXED)
break;
if (processing)
_animation_process( get_process_delta_time() );
} break;
- case NOTIFICATION_FIXED_PROCESS: {
+ case NOTIFICATION_INTERNAL_FIXED_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_IDLE)
break;
@@ -733,7 +733,7 @@ void AnimationPlayer::_animation_process(float p_delta) {
playing = false;
_set_process(false);
end_notify=false;
- emit_signal(SceneStringNames::get_singleton()->finished);
+ emit_signal(SceneStringNames::get_singleton()->animation_finished,playback.assigned);
}
}
@@ -1231,8 +1231,8 @@ void AnimationPlayer::_set_process(bool p_process,bool p_force) {
switch(animation_process_mode) {
- case ANIMATION_PROCESS_FIXED: set_fixed_process(p_process && active); break;
- case ANIMATION_PROCESS_IDLE: set_process(p_process && active); break;
+ case ANIMATION_PROCESS_FIXED: set_fixed_process_internal(p_process && active); break;
+ case ANIMATION_PROCESS_IDLE: set_process_internal(p_process && active); break;
}
processing=p_process;
@@ -1353,7 +1353,7 @@ void AnimationPlayer::_bind_methods() {
ADD_PROPERTY( PropertyInfo( Variant::REAL, "playback_default_blend_time", PROPERTY_HINT_RANGE, "0,4096,0.01"), _SCS("set_default_blend_time"), _SCS("get_default_blend_time"));
ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "root_node"), _SCS("set_root"), _SCS("get_root"));
- ADD_SIGNAL( MethodInfo("finished") );
+ ADD_SIGNAL( MethodInfo("animation_finished", PropertyInfo(Variant::STRING,"name")) );
ADD_SIGNAL( MethodInfo("animation_changed", PropertyInfo(Variant::STRING,"old_name"), PropertyInfo(Variant::STRING,"new_name")) );
ADD_SIGNAL( MethodInfo("animation_started", PropertyInfo(Variant::STRING,"name")) );
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index c03762549b..94955bec60 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -208,11 +208,11 @@ private:
void _node_removed(Node *p_node);
// bind helpers
- DVector<String> _get_animation_list() const {
+ PoolVector<String> _get_animation_list() const {
List<StringName> animations;
get_animation_list(&animations);
- DVector<String> ret;
+ PoolVector<String> ret;
while(animations.size()) {
ret.push_back( animations.front()->get());
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 2ed8e52615..dbcdb284be 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -58,8 +58,8 @@ void AnimationTreePlayer::_set_process(bool p_process, bool p_force)
switch (animation_process_mode) {
- case ANIMATION_PROCESS_FIXED: set_fixed_process(p_process && active); break;
- case ANIMATION_PROCESS_IDLE: set_process(p_process && active); break;
+ case ANIMATION_PROCESS_FIXED: set_fixed_process_internal(p_process && active); break;
+ case ANIMATION_PROCESS_IDLE: set_process_internal(p_process && active); break;
}
processing = p_process;
@@ -416,8 +416,8 @@ void AnimationTreePlayer::_notification(int p_what) {
if (!processing) {
//make sure that a previous process state was not saved
//only process if "processing" is set
- set_fixed_process(false);
- set_process(false);
+ set_fixed_process_internal(false);
+ set_process_internal(false);
}
} break;
case NOTIFICATION_READY: {
@@ -426,14 +426,14 @@ void AnimationTreePlayer::_notification(int p_what) {
_update_sources();
}
} break;
- case NOTIFICATION_PROCESS: {
+ case NOTIFICATION_INTERNAL_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_FIXED)
break;
if (processing)
_process_animation( get_process_delta_time() );
} break;
- case NOTIFICATION_FIXED_PROCESS: {
+ case NOTIFICATION_INTERNAL_FIXED_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_IDLE)
break;
@@ -1740,11 +1740,11 @@ NodePath AnimationTreePlayer::get_master_player() const{
return master;
}
-DVector<String> AnimationTreePlayer::_get_node_list() {
+PoolVector<String> AnimationTreePlayer::_get_node_list() {
List<StringName> nl;
get_node_list(&nl);
- DVector<String> ret;
+ PoolVector<String> ret;
ret.resize(nl.size());
int idx=0;
for(List<StringName>::Element *E=nl.front();E;E=E->next()) {
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 6d9db5dc63..ae2fe8c2bb 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -282,7 +282,7 @@ private:
Track* _find_track(const NodePath& p_path);
void _recompute_caches();
void _recompute_caches(const StringName& p_node);
- DVector<String> _get_node_list();
+ PoolVector<String> _get_node_list();
void _compute_weights(float *p_fallback_weight, HashMap<NodePath,float> *p_weights, float p_coeff, const HashMap<NodePath,bool> *p_filter = NULL, float p_filtered_coeff = 0);
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
index 02fef7ec29..5bc9a81c85 100644
--- a/scene/animation/tween.cpp
+++ b/scene/animation/tween.cpp
@@ -155,21 +155,21 @@ void Tween::_notification(int p_what) {
if (!processing) {
//make sure that a previous process state was not saved
//only process if "processing" is set
- set_fixed_process(false);
- set_process(false);
+ set_fixed_process_internal(false);
+ set_process_internal(false);
}
} break;
case NOTIFICATION_READY: {
} break;
- case NOTIFICATION_PROCESS: {
+ case NOTIFICATION_INTERNAL_PROCESS: {
if (tween_process_mode==TWEEN_PROCESS_FIXED)
break;
if (processing)
_tween_process( get_process_delta_time() );
} break;
- case NOTIFICATION_FIXED_PROCESS: {
+ case NOTIFICATION_INTERNAL_FIXED_PROCESS: {
if (tween_process_mode==TWEEN_PROCESS_IDLE)
break;
@@ -666,8 +666,8 @@ void Tween::_set_process(bool p_process,bool p_force) {
switch(tween_process_mode) {
- case TWEEN_PROCESS_FIXED: set_fixed_process(p_process && active); break;
- case TWEEN_PROCESS_IDLE: set_process(p_process && active); break;
+ case TWEEN_PROCESS_FIXED: set_fixed_process_internal(p_process && active); break;
+ case TWEEN_PROCESS_IDLE: set_process_internal(p_process && active); break;
}
processing=p_process;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-03 02:52:12 +0000