|
|
@@ -2705,106 +2705,6 @@ Variant Animation::value_track_interpolate(int p_track, double p_time) const {
|
|
|
return Variant();
|
|
|
}
|
|
|
|
|
|
-void Animation::_value_track_get_key_indices_in_range(const ValueTrack *vt, double from_time, double to_time, List<int> *p_indices) const {
|
|
|
- if (from_time != length && to_time == length) {
|
|
|
- to_time = length + CMP_EPSILON; //include a little more if at the end
|
|
|
- }
|
|
|
- int to = _find(vt->values, to_time);
|
|
|
-
|
|
|
- if (to >= 0 && from_time == to_time && vt->values[to].time == from_time) {
|
|
|
- //find exact (0 delta), return if found
|
|
|
- p_indices->push_back(to);
|
|
|
- return;
|
|
|
- }
|
|
|
- // can't really send the events == time, will be sent in the next frame.
|
|
|
- // if event>=len then it will probably never be requested by the anim player.
|
|
|
-
|
|
|
- if (to >= 0 && vt->values[to].time >= to_time) {
|
|
|
- to--;
|
|
|
- }
|
|
|
-
|
|
|
- if (to < 0) {
|
|
|
- return; // not bother
|
|
|
- }
|
|
|
-
|
|
|
- int from = _find(vt->values, from_time);
|
|
|
-
|
|
|
- // position in the right first event.+
|
|
|
- if (from < 0 || vt->values[from].time < from_time) {
|
|
|
- from++;
|
|
|
- }
|
|
|
-
|
|
|
- int max = vt->values.size();
|
|
|
-
|
|
|
- for (int i = from; i <= to; i++) {
|
|
|
- ERR_CONTINUE(i < 0 || i >= max); // shouldn't happen
|
|
|
- p_indices->push_back(i);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-void Animation::value_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const {
|
|
|
- ERR_FAIL_INDEX(p_track, tracks.size());
|
|
|
- Track *t = tracks[p_track];
|
|
|
- ERR_FAIL_COND(t->type != TYPE_VALUE);
|
|
|
-
|
|
|
- ValueTrack *vt = static_cast<ValueTrack *>(t);
|
|
|
-
|
|
|
- double from_time = p_time - p_delta;
|
|
|
- double to_time = p_time;
|
|
|
-
|
|
|
- if (from_time > to_time) {
|
|
|
- SWAP(from_time, to_time);
|
|
|
- }
|
|
|
-
|
|
|
- switch (loop_mode) {
|
|
|
- case LOOP_NONE: {
|
|
|
- if (from_time < 0) {
|
|
|
- from_time = 0;
|
|
|
- }
|
|
|
- if (from_time > length) {
|
|
|
- from_time = length;
|
|
|
- }
|
|
|
-
|
|
|
- if (to_time < 0) {
|
|
|
- to_time = 0;
|
|
|
- }
|
|
|
- if (to_time > length) {
|
|
|
- to_time = length;
|
|
|
- }
|
|
|
- } break;
|
|
|
- case LOOP_LINEAR: {
|
|
|
- from_time = Math::fposmod(from_time, length);
|
|
|
- to_time = Math::fposmod(to_time, length);
|
|
|
-
|
|
|
- if (from_time > to_time) {
|
|
|
- // handle loop by splitting
|
|
|
- _value_track_get_key_indices_in_range(vt, from_time, length, p_indices);
|
|
|
- _value_track_get_key_indices_in_range(vt, 0, to_time, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- } break;
|
|
|
- case LOOP_PINGPONG: {
|
|
|
- from_time = Math::pingpong(from_time, length);
|
|
|
- to_time = Math::pingpong(to_time, length);
|
|
|
-
|
|
|
- if (p_pingponged == -1) {
|
|
|
- // handle loop by splitting
|
|
|
- _value_track_get_key_indices_in_range(vt, 0, from_time, p_indices);
|
|
|
- _value_track_get_key_indices_in_range(vt, 0, to_time, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- if (p_pingponged == 1) {
|
|
|
- // handle loop by splitting
|
|
|
- _value_track_get_key_indices_in_range(vt, from_time, length, p_indices);
|
|
|
- _value_track_get_key_indices_in_range(vt, to_time, length, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- } break;
|
|
|
- }
|
|
|
-
|
|
|
- _value_track_get_key_indices_in_range(vt, from_time, to_time, p_indices);
|
|
|
-}
|
|
|
-
|
|
|
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];
|
|
|
@@ -2827,7 +2727,7 @@ Animation::UpdateMode Animation::value_track_get_update_mode(int p_track) const
|
|
|
|
|
|
template <class T>
|
|
|
void Animation::_track_get_key_indices_in_range(const Vector<T> &p_array, double from_time, double to_time, List<int> *p_indices) const {
|
|
|
- if (from_time != length && to_time == length) {
|
|
|
+ if (to_time == length) {
|
|
|
to_time = length + CMP_EPSILON; //include a little more if at the end
|
|
|
}
|
|
|
|
|
|
@@ -2861,6 +2761,11 @@ void Animation::_track_get_key_indices_in_range(const Vector<T> &p_array, double
|
|
|
|
|
|
void Animation::track_get_key_indices_in_range(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const {
|
|
|
ERR_FAIL_INDEX(p_track, tracks.size());
|
|
|
+
|
|
|
+ if (p_delta == 0) {
|
|
|
+ return; // Prevent to get key continuously.
|
|
|
+ }
|
|
|
+
|
|
|
const Track *t = tracks[p_track];
|
|
|
|
|
|
double from_time = p_time - p_delta;
|
|
|
@@ -2977,86 +2882,88 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
|
if ((int)Math::floor(abs(p_delta) / length) % 2 == 0) {
|
|
|
if (p_pingponged == -1) {
|
|
|
// handle loop by splitting
|
|
|
+ to_time = MAX(CMP_EPSILON, to_time); // To avoid overlapping keys at the turnaround point, one of the point will needs to be shifted slightly.
|
|
|
switch (t->type) {
|
|
|
case TYPE_POSITION_3D: {
|
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
|
if (tt->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<3>(tt->compressed_track, 0, from_time, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<3>(tt->compressed_track, 0, to_time, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<3>(tt->compressed_track, CMP_EPSILON, to_time, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(tt->positions, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(tt->positions, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(tt->positions, CMP_EPSILON, to_time, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_ROTATION_3D: {
|
|
|
const RotationTrack *rt = static_cast<const RotationTrack *>(t);
|
|
|
if (rt->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<3>(rt->compressed_track, 0, from_time, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<3>(rt->compressed_track, 0, to_time, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<3>(rt->compressed_track, CMP_EPSILON, to_time, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(rt->rotations, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(rt->rotations, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(rt->rotations, CMP_EPSILON, to_time, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_SCALE_3D: {
|
|
|
const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
|
|
|
if (st->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<3>(st->compressed_track, 0, from_time, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<3>(st->compressed_track, 0, to_time, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<3>(st->compressed_track, CMP_EPSILON, to_time, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(st->scales, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(st->scales, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(st->scales, CMP_EPSILON, to_time, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_BLEND_SHAPE: {
|
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
|
if (bst->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<1>(bst->compressed_track, 0, from_time, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<1>(bst->compressed_track, 0, to_time, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<1>(bst->compressed_track, CMP_EPSILON, to_time, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(bst->blend_shapes, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(bst->blend_shapes, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(bst->blend_shapes, CMP_EPSILON, to_time, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_VALUE: {
|
|
|
const ValueTrack *vt = static_cast<const ValueTrack *>(t);
|
|
|
_track_get_key_indices_in_range(vt->values, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(vt->values, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(vt->values, CMP_EPSILON, to_time, p_indices);
|
|
|
} break;
|
|
|
case TYPE_METHOD: {
|
|
|
const MethodTrack *mt = static_cast<const MethodTrack *>(t);
|
|
|
_track_get_key_indices_in_range(mt->methods, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(mt->methods, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(mt->methods, CMP_EPSILON, to_time, p_indices);
|
|
|
} break;
|
|
|
case TYPE_BEZIER: {
|
|
|
const BezierTrack *bz = static_cast<const BezierTrack *>(t);
|
|
|
_track_get_key_indices_in_range(bz->values, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(bz->values, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(bz->values, CMP_EPSILON, to_time, p_indices);
|
|
|
} break;
|
|
|
case TYPE_AUDIO: {
|
|
|
const AudioTrack *ad = static_cast<const AudioTrack *>(t);
|
|
|
_track_get_key_indices_in_range(ad->values, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(ad->values, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(ad->values, CMP_EPSILON, to_time, p_indices);
|
|
|
} break;
|
|
|
case TYPE_ANIMATION: {
|
|
|
const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
|
|
|
_track_get_key_indices_in_range(an->values, 0, from_time, p_indices);
|
|
|
- _track_get_key_indices_in_range(an->values, 0, to_time, p_indices);
|
|
|
+ _track_get_key_indices_in_range(an->values, CMP_EPSILON, to_time, p_indices);
|
|
|
} break;
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
if (p_pingponged == 1) {
|
|
|
// handle loop by splitting
|
|
|
+ to_time = MIN(length - CMP_EPSILON, to_time);
|
|
|
switch (t->type) {
|
|
|
case TYPE_POSITION_3D: {
|
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
|
if (tt->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, length, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<3>(tt->compressed_track, to_time, length, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<3>(tt->compressed_track, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(tt->positions, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(tt->positions, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(tt->positions, to_time, length - CMP_EPSILON, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_ROTATION_3D: {
|
|
|
@@ -3066,7 +2973,7 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
|
_get_compressed_key_indices_in_range<3>(rt->compressed_track, to_time, length, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(rt->rotations, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(rt->rotations, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(rt->rotations, to_time, length - CMP_EPSILON, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_SCALE_3D: {
|
|
|
@@ -3076,43 +2983,43 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
|
_get_compressed_key_indices_in_range<3>(st->compressed_track, to_time, length, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(st->scales, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(st->scales, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(st->scales, to_time, length - CMP_EPSILON, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_BLEND_SHAPE: {
|
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
|
if (bst->compressed_track >= 0) {
|
|
|
_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, length, p_indices);
|
|
|
- _get_compressed_key_indices_in_range<1>(bst->compressed_track, to_time, length, p_indices);
|
|
|
+ _get_compressed_key_indices_in_range<1>(bst->compressed_track, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} else {
|
|
|
_track_get_key_indices_in_range(bst->blend_shapes, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(bst->blend_shapes, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(bst->blend_shapes, to_time, length - CMP_EPSILON, p_indices);
|
|
|
}
|
|
|
} break;
|
|
|
case TYPE_VALUE: {
|
|
|
const ValueTrack *vt = static_cast<const ValueTrack *>(t);
|
|
|
_track_get_key_indices_in_range(vt->values, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(vt->values, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(vt->values, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} break;
|
|
|
case TYPE_METHOD: {
|
|
|
const MethodTrack *mt = static_cast<const MethodTrack *>(t);
|
|
|
_track_get_key_indices_in_range(mt->methods, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(mt->methods, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(mt->methods, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} break;
|
|
|
case TYPE_BEZIER: {
|
|
|
const BezierTrack *bz = static_cast<const BezierTrack *>(t);
|
|
|
_track_get_key_indices_in_range(bz->values, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(bz->values, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(bz->values, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} break;
|
|
|
case TYPE_AUDIO: {
|
|
|
const AudioTrack *ad = static_cast<const AudioTrack *>(t);
|
|
|
_track_get_key_indices_in_range(ad->values, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(ad->values, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(ad->values, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} break;
|
|
|
case TYPE_ANIMATION: {
|
|
|
const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
|
|
|
_track_get_key_indices_in_range(an->values, from_time, length, p_indices);
|
|
|
- _track_get_key_indices_in_range(an->values, to_time, length, p_indices);
|
|
|
+ _track_get_key_indices_in_range(an->values, to_time, length - CMP_EPSILON, p_indices);
|
|
|
} break;
|
|
|
}
|
|
|
return;
|
|
|
@@ -3177,110 +3084,6 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void Animation::_method_track_get_key_indices_in_range(const MethodTrack *mt, double from_time, double to_time, List<int> *p_indices) const {
|
|
|
- if (from_time != length && to_time == length) {
|
|
|
- to_time = length + CMP_EPSILON; //include a little more if at the end
|
|
|
- }
|
|
|
-
|
|
|
- int to = _find(mt->methods, to_time);
|
|
|
-
|
|
|
- // can't really send the events == time, will be sent in the next frame.
|
|
|
- // if event>=len then it will probably never be requested by the anim player.
|
|
|
-
|
|
|
- if (to >= 0 && mt->methods[to].time >= to_time) {
|
|
|
- to--;
|
|
|
- }
|
|
|
-
|
|
|
- if (to < 0) {
|
|
|
- return; // not bother
|
|
|
- }
|
|
|
-
|
|
|
- int from = _find(mt->methods, from_time);
|
|
|
-
|
|
|
- // position in the right first event.+
|
|
|
- if (from < 0 || mt->methods[from].time < from_time) {
|
|
|
- from++;
|
|
|
- }
|
|
|
-
|
|
|
- int max = mt->methods.size();
|
|
|
-
|
|
|
- for (int i = from; i <= to; i++) {
|
|
|
- ERR_CONTINUE(i < 0 || i >= max); // shouldn't happen
|
|
|
- p_indices->push_back(i);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-void Animation::method_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const {
|
|
|
- ERR_FAIL_INDEX(p_track, tracks.size());
|
|
|
- Track *t = tracks[p_track];
|
|
|
- ERR_FAIL_COND(t->type != TYPE_METHOD);
|
|
|
-
|
|
|
- MethodTrack *mt = static_cast<MethodTrack *>(t);
|
|
|
-
|
|
|
- double from_time = p_time - p_delta;
|
|
|
- double to_time = p_time;
|
|
|
-
|
|
|
- if (from_time > to_time) {
|
|
|
- SWAP(from_time, to_time);
|
|
|
- }
|
|
|
-
|
|
|
- switch (loop_mode) {
|
|
|
- case LOOP_NONE: {
|
|
|
- if (from_time < 0) {
|
|
|
- from_time = 0;
|
|
|
- }
|
|
|
- if (from_time > length) {
|
|
|
- from_time = length;
|
|
|
- }
|
|
|
-
|
|
|
- if (to_time < 0) {
|
|
|
- to_time = 0;
|
|
|
- }
|
|
|
- if (to_time > length) {
|
|
|
- to_time = length;
|
|
|
- }
|
|
|
- } break;
|
|
|
- case LOOP_LINEAR: {
|
|
|
- if (from_time > length || from_time < 0) {
|
|
|
- from_time = Math::fposmod(from_time, length);
|
|
|
- }
|
|
|
- if (to_time > length || to_time < 0) {
|
|
|
- to_time = Math::fposmod(to_time, length);
|
|
|
- }
|
|
|
-
|
|
|
- if (from_time > to_time) {
|
|
|
- // handle loop by splitting
|
|
|
- _method_track_get_key_indices_in_range(mt, from_time, length, p_indices);
|
|
|
- _method_track_get_key_indices_in_range(mt, 0, to_time, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- } break;
|
|
|
- case LOOP_PINGPONG: {
|
|
|
- if (from_time > length || from_time < 0) {
|
|
|
- from_time = Math::pingpong(from_time, length);
|
|
|
- }
|
|
|
- if (to_time > length || to_time < 0) {
|
|
|
- to_time = Math::pingpong(to_time, length);
|
|
|
- }
|
|
|
-
|
|
|
- if (p_pingponged == -1) {
|
|
|
- _method_track_get_key_indices_in_range(mt, 0, from_time, p_indices);
|
|
|
- _method_track_get_key_indices_in_range(mt, 0, to_time, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- if (p_pingponged == 1) {
|
|
|
- _method_track_get_key_indices_in_range(mt, from_time, length, p_indices);
|
|
|
- _method_track_get_key_indices_in_range(mt, to_time, length, p_indices);
|
|
|
- return;
|
|
|
- }
|
|
|
- } break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- _method_track_get_key_indices_in_range(mt, from_time, to_time, p_indices);
|
|
|
-}
|
|
|
-
|
|
|
Vector<Variant> Animation::method_track_get_params(int p_track, int p_key_idx) const {
|
|
|
ERR_FAIL_INDEX_V(p_track, tracks.size(), Vector<Variant>());
|
|
|
Track *t = tracks[p_track];
|
|
|
@@ -3941,10 +3744,8 @@ void Animation::_bind_methods() {
|
|
|
ClassDB::bind_method(D_METHOD("value_track_set_update_mode", "track_idx", "mode"), &Animation::value_track_set_update_mode);
|
|
|
ClassDB::bind_method(D_METHOD("value_track_get_update_mode", "track_idx"), &Animation::value_track_get_update_mode);
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("value_track_get_key_indices", "track_idx", "time_sec", "delta"), &Animation::_value_track_get_key_indices);
|
|
|
ClassDB::bind_method(D_METHOD("value_track_interpolate", "track_idx", "time_sec"), &Animation::value_track_interpolate);
|
|
|
|
|
|
- ClassDB::bind_method(D_METHOD("method_track_get_key_indices", "track_idx", "time_sec", "delta"), &Animation::_method_track_get_key_indices);
|
|
|
ClassDB::bind_method(D_METHOD("method_track_get_name", "track_idx", "key_idx"), &Animation::method_track_get_name);
|
|
|
ClassDB::bind_method(D_METHOD("method_track_get_params", "track_idx", "key_idx"), &Animation::method_track_get_params);
|
|
|
|
Rémi Verschelde