-Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc.

-Better interpolation of discrete tracks, fixes #4417

8 files changed, 60 insertions, 27 deletions

diff --git a/scene/2d/sample_player_2d.cpp b/scene/2d/sample_player_2d.cpp
index 4d719b532b..7c997b3f12 100644
--- a/scene/2d/sample_player_2d.cpp
+++ b/scene/2d/sample_player_2d.cpp
@@ -81,7 +81,7 @@ void SamplePlayer2D::_get_property_list(List<PropertyInfo> *p_list) const {
 		}
 	}
 
-	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR));
+	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_ANIMATE_AS_TRIGGER));
 }
 
 void SamplePlayer2D::_notification(int p_what) {
diff --git a/scene/3d/spatial_sample_player.cpp b/scene/3d/spatial_sample_player.cpp
index 0df921f208..4c5b2c240e 100644
--- a/scene/3d/spatial_sample_player.cpp
+++ b/scene/3d/spatial_sample_player.cpp
@@ -82,7 +82,7 @@ void SpatialSamplePlayer::_get_property_list(List<PropertyInfo> *p_list) const {
 		}
 	}
 
-	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR));
+	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_ANIMATE_AS_TRIGGER));
 
 }
 void SpatialSamplePlayer::_notification(int p_what) {
diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp
index b1123897b2..113e2c2278 100644
--- a/scene/animation/animation_cache.cpp
+++ b/scene/animation/animation_cache.cpp
@@ -301,7 +301,7 @@ void AnimationCache::set_all(float p_time, float p_delta) {
 			} break;
 			case Animation::TYPE_VALUE: {
 
-				if (animation->value_track_is_continuous(i)) {
+				if (animation->value_track_get_update_mode(i)==Animation::UPDATE_CONTINUOUS || (animation->value_track_get_update_mode(i)==Animation::UPDATE_DISCRETE && p_delta==0)) {
 					Variant v = animation->value_track_interpolate(i,p_time);
 					set_track_value(i,v);
 				} else {
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 2399bee539..30af9b0094 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -174,7 +174,7 @@ void AnimationPlayer::_get_property_list( List<PropertyInfo> *p_list) const {
 			hint+=E->get();
 		}
 
-		p_list->push_back( PropertyInfo( Variant::STRING, "playback/play", PROPERTY_HINT_ENUM, hint,PROPERTY_USAGE_EDITOR) );
+		p_list->push_back( PropertyInfo( Variant::STRING, "playback/play", PROPERTY_HINT_ENUM, hint,PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_ANIMATE_AS_TRIGGER) );
 		p_list->push_back( PropertyInfo( Variant::BOOL, "playback/active", PROPERTY_HINT_NONE,"" ) );
 		p_list->push_back( PropertyInfo( Variant::REAL, "playback/speed", PROPERTY_HINT_RANGE, "-64,64,0.01") );
 
@@ -421,12 +421,13 @@ void AnimationPlayer::_animation_process_animation(AnimationData* p_anim,float p
 				TrackNodeCache::PropertyAnim *pa = &E->get();
 
 
-				if (a->value_track_is_continuous(i) || p_delta==0) { //delta == 0 means seek
+				if (a->value_track_get_update_mode(i)==Animation::UPDATE_CONTINUOUS || (p_delta==0 && a->value_track_get_update_mode(i)==Animation::UPDATE_DISCRETE)) { //delta == 0 means seek
 
 
 					Variant value=a->value_track_interpolate(i,p_time);
-					if (p_delta==0 && value.get_type()==Variant::STRING)
-						continue; // doing this with strings is messy, should find another way
+					//thanks to trigger mode, this should be solved now..
+					//if (p_delta==0 && value.get_type()==Variant::STRING)
+					//	continue; // doing this with strings is messy, should find another way
 					if (pa->accum_pass!=accum_pass) {
 						ERR_CONTINUE( cache_update_prop_size >= NODE_CACHE_UPDATE_MAX );
 						cache_update_prop[cache_update_prop_size++]=pa;
@@ -437,11 +438,12 @@ void AnimationPlayer::_animation_process_animation(AnimationData* p_anim,float p
 					}
 
 
-				} else if (p_allow_discrete) {
+				} else if (p_allow_discrete && p_delta!=0) {
 
 					List<int> indices;
 					a->value_track_get_key_indices(i,p_time,p_delta,&indices);
 
+
 					for(List<int>::Element *F=indices.front();F;F=F->next()) {
 
 						Variant value=a->track_get_key_value(i,F->get());
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 0f7ed1cb29..628edf09de 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -825,7 +825,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
 					} break;
 					case Animation::TYPE_VALUE: { ///< Set a value in a property, can be interpolated.
 
-						if (a->value_track_is_continuous(tr.local_track)) {
+						if (a->value_track_get_update_mode(tr.local_track)==Animation::UPDATE_CONTINUOUS) {
 							Variant value = a->value_track_interpolate(tr.local_track,anim_list->time);
 							Variant::blend(tr.track->value,value,blend,tr.track->value);
 						} else {
diff --git a/scene/audio/sample_player.cpp b/scene/audio/sample_player.cpp
index bcd4354975..3827d40a71 100644
--- a/scene/audio/sample_player.cpp
+++ b/scene/audio/sample_player.cpp
@@ -152,7 +152,7 @@ void SamplePlayer::_get_property_list(List<PropertyInfo> *p_list) const {
 		}
 	}
 
-	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR));
+	p_list->push_back( PropertyInfo( Variant::STRING, "play/play", PROPERTY_HINT_ENUM, en,PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_ANIMATE_AS_TRIGGER));
 	p_list->push_back( PropertyInfo( Variant::INT, "config/polyphony", PROPERTY_HINT_RANGE, "1,256,1"));
 	p_list->push_back( PropertyInfo( Variant::OBJECT, "config/samples", PROPERTY_HINT_RESOURCE_TYPE, "SampleLibrary"));
 	p_list->push_back( PropertyInfo( Variant::REAL, "default/volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01"));
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index f7d5ddc744..e897e1515c 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -154,8 +154,20 @@ bool Animation::_set(const StringName& p_name, const Variant& p_value) {
 				Dictionary d = p_value;
 				ERR_FAIL_COND_V(!d.has("times"),false);
 				ERR_FAIL_COND_V(!d.has("values"),false);
-				if (d.has("cont"))
-					vt->continuous=d["cont"];
+				if (d.has("cont")) {
+					bool v = d["cont"];
+					vt->update_mode=v?UPDATE_CONTINUOUS:UPDATE_DISCRETE;
+				}
+
+				if (d.has("update")) {
+					int um =d["update"];
+					if (um<0)
+						um=0;
+					else if (um>2)
+						um=2;
+					vt->update_mode=UpdateMode(um);
+				}
+
 
 				DVector<float> times=d["times"];
 				Array values=d["values"];
@@ -353,7 +365,7 @@ bool Animation::_get(const StringName& p_name,Variant &r_ret) const {
 				d["transitions"]=key_transitions;
 				d["values"]=key_values;
 				if (track_get_type(track)==TYPE_VALUE) {
-					d["cont"]=value_track_is_continuous(track);
+					d["update"]=value_track_get_update_mode(track);
 				}
 
 				r_ret=d;
@@ -394,7 +406,7 @@ bool Animation::_get(const StringName& p_name,Variant &r_ret) const {
 				d["transitions"]=key_transitions;
 				d["values"]=key_values;
 				if (track_get_type(track)==TYPE_VALUE) {
-					d["cont"]=value_track_is_continuous(track);
+					d["update"]=value_track_get_update_mode(track);
 				}
 
 				r_ret=d;
@@ -1373,7 +1385,7 @@ Variant Animation::value_track_interpolate(int p_track, float p_time) const {
 	bool ok;
 
 
-	Variant res = _interpolate( vt->values, p_time, vt->interpolation, &ok );
+	Variant res = _interpolate( vt->values, p_time, vt->update_mode==UPDATE_CONTINUOUS?vt->interpolation:INTERPOLATION_NEAREST, &ok );
 
 
 	if (ok) {
@@ -1461,28 +1473,30 @@ void Animation::value_track_get_key_indices(int p_track, float p_time, float p_d
 
 }
 
-void Animation::value_track_set_continuous(int p_track, bool p_continuous) {
+void Animation::value_track_set_update_mode(int p_track, UpdateMode p_mode) {
 
 	ERR_FAIL_INDEX(p_track, tracks.size());
 	Track *t=tracks[p_track];
 	ERR_FAIL_COND( t->type != TYPE_VALUE );
+	ERR_FAIL_INDEX(p_mode,3);
 
 	ValueTrack * vt = static_cast<ValueTrack*>(t);
-	vt->continuous=p_continuous;
+	vt->update_mode=p_mode;
 
 }
 
-bool Animation::value_track_is_continuous(int p_track) const{
+Animation::UpdateMode Animation::value_track_get_update_mode(int p_track) const {
 
-	ERR_FAIL_INDEX_V(p_track, tracks.size(), false);
+	ERR_FAIL_INDEX_V(p_track, tracks.size(), UPDATE_CONTINUOUS);
 	Track *t=tracks[p_track];
-	ERR_FAIL_COND_V( t->type != TYPE_VALUE, false );
+	ERR_FAIL_COND_V( t->type != TYPE_VALUE, UPDATE_CONTINUOUS );
 
 	ValueTrack * vt = static_cast<ValueTrack*>(t);
-	return vt->continuous;
+	return vt->update_mode;
 
 }
 
+
 void Animation::_method_track_get_key_indices_in_range(const MethodTrack * mt, float from_time, float to_time,List<int> *p_indices) const {
 
 	if (from_time!=length && to_time==length)
@@ -1676,8 +1690,8 @@ void Animation::_bind_methods() {
 
 
 	ObjectTypeDB::bind_method(_MD("transform_track_interpolate","idx","time_sec"),&Animation::_transform_track_interpolate);
-	ObjectTypeDB::bind_method(_MD("value_track_set_continuous","idx","continuous"),&Animation::value_track_set_continuous);
-	ObjectTypeDB::bind_method(_MD("value_track_is_continuous","idx"),&Animation::value_track_is_continuous);
+	ObjectTypeDB::bind_method(_MD("value_track_set_update_mode","idx","mode"),&Animation::value_track_set_update_mode);
+	ObjectTypeDB::bind_method(_MD("value_track_get_update_mode","idx"),&Animation::value_track_get_update_mode);
 
 	ObjectTypeDB::bind_method(_MD("value_track_get_key_indices","idx","time_sec","delta"),&Animation::_value_track_get_key_indices);
 
@@ -1704,6 +1718,11 @@ void Animation::_bind_methods() {
 	BIND_CONSTANT( INTERPOLATION_LINEAR );
 	BIND_CONSTANT( INTERPOLATION_CUBIC );
 
+	BIND_CONSTANT( UPDATE_CONTINUOUS );
+	BIND_CONSTANT( UPDATE_DISCRETE );
+	BIND_CONSTANT( UPDATE_TRIGGER );
+
+
 }
 
 void Animation::clear() {
diff --git a/scene/resources/animation.h b/scene/resources/animation.h
index 1f2d9b80ab..5be76d7780 100644
--- a/scene/resources/animation.h
+++ b/scene/resources/animation.h
@@ -58,6 +58,13 @@ public:
 		INTERPOLATION_CUBIC
 	};
 
+	enum UpdateMode {
+		UPDATE_CONTINUOUS,
+		UPDATE_DISCRETE,
+		UPDATE_TRIGGER,
+
+	};
+
 private:
 
 	struct Track {
@@ -105,10 +112,11 @@ private:
 
 	struct ValueTrack : public Track {
 
-		bool continuous;
+		UpdateMode update_mode;
+		bool update_on_seek;
 		Vector< TKey<Variant> > values;
 
-		ValueTrack() { type=TYPE_VALUE; continuous=true; }
+		ValueTrack() { type=TYPE_VALUE; update_mode=UPDATE_CONTINUOUS; }
 	};
 
 
@@ -253,8 +261,9 @@ public:
 
 	Variant value_track_interpolate(int p_track, float p_time) const;
 	void value_track_get_key_indices(int p_track, float p_time, float p_delta,List<int> *p_indices) const;
-	void value_track_set_continuous(int p_track, bool p_continuous);
-	bool value_track_is_continuous(int p_track) const;
+	void value_track_set_update_mode(int p_track, UpdateMode p_mode);
+	UpdateMode value_track_get_update_mode(int p_track) const;
+
 
 	void method_track_get_key_indices(int p_track, float p_time, float p_delta,List<int> *p_indices) const;
 	Vector<Variant> method_track_get_params(int p_track,int p_key_idx) const;
@@ -281,5 +290,8 @@ public:
 
 VARIANT_ENUM_CAST( Animation::TrackType );
 VARIANT_ENUM_CAST( Animation::InterpolationType );
+VARIANT_ENUM_CAST( Animation::UpdateMode );
+
+
 
 #endif