godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Replace Animation::_clear() with explicit .clear() calls.

Browse Source
This commit is contained in:
Lukas Tenbrink
2025-01-09 16:43:57 +01:00
parent eb4a9977c3
commit dcb4e5b22a
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scene/resources/animation.cpp
View File

@@ -948,50 +948,50 @@ void Animation::remove_track(int p_track) {
case TYPE_POSITION_3D: { case TYPE_POSITION_3D: {
PositionTrack *tt = static_cast<PositionTrack *>(t); PositionTrack *tt = static_cast<PositionTrack *>(t);
ERR_FAIL_COND_MSG(tt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first."); ERR_FAIL_COND_MSG(tt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
_clear(tt->positions); tt->positions.clear();
} break; } break;
case TYPE_ROTATION_3D: { case TYPE_ROTATION_3D: {
RotationTrack *rt = static_cast<RotationTrack *>(t); RotationTrack *rt = static_cast<RotationTrack *>(t);
ERR_FAIL_COND_MSG(rt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first."); ERR_FAIL_COND_MSG(rt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
_clear(rt->rotations); rt->rotations.clear();
} break; } break;
case TYPE_SCALE_3D: { case TYPE_SCALE_3D: {
ScaleTrack *st = static_cast<ScaleTrack *>(t); ScaleTrack *st = static_cast<ScaleTrack *>(t);
ERR_FAIL_COND_MSG(st->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first."); ERR_FAIL_COND_MSG(st->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
_clear(st->scales); st->scales.clear();
} break; } break;
case TYPE_BLEND_SHAPE: { case TYPE_BLEND_SHAPE: {
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t); BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
ERR_FAIL_COND_MSG(bst->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first."); ERR_FAIL_COND_MSG(bst->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
_clear(bst->blend_shapes); bst->blend_shapes.clear();
} break; } break;
case TYPE_VALUE: { case TYPE_VALUE: {
ValueTrack *vt = static_cast<ValueTrack *>(t); ValueTrack *vt = static_cast<ValueTrack *>(t);
_clear(vt->values); vt->values.clear();
} break; } break;
case TYPE_METHOD: { case TYPE_METHOD: {
MethodTrack *mt = static_cast<MethodTrack *>(t); MethodTrack *mt = static_cast<MethodTrack *>(t);
_clear(mt->methods); mt->methods.clear();
} break; } break;
case TYPE_BEZIER: { case TYPE_BEZIER: {
BezierTrack *bz = static_cast<BezierTrack *>(t); BezierTrack *bz = static_cast<BezierTrack *>(t);
_clear(bz->values); bz->values.clear();
} break; } break;
case TYPE_AUDIO: { case TYPE_AUDIO: {
AudioTrack *ad = static_cast<AudioTrack *>(t); AudioTrack *ad = static_cast<AudioTrack *>(t);
_clear(ad->values); ad->values.clear();
} break; } break;
case TYPE_ANIMATION: { case TYPE_ANIMATION: {
AnimationTrack *an = static_cast<AnimationTrack *>(t); AnimationTrack *an = static_cast<AnimationTrack *>(t);
_clear(an->values); an->values.clear();
} break; } break;
} }
@@ -1137,11 +1137,6 @@ int Animation::_marker_insert(double p_time, Vector<MarkerKey> &p_keys, const Ma
return -1; return -1;
} }
template <typename T>
void Animation::_clear(T &p_keys) {
p_keys.clear();
}
//// ////
int Animation::position_track_insert_key(int p_track, double p_time, const Vector3 &p_position) { int Animation::position_track_insert_key(int p_track, double p_time, const Vector3 &p_position) {

3
scene/resources/animation.h
View File

@@ -253,9 +253,6 @@ private:
Vector<Track *> tracks; Vector<Track *> tracks;
template <typename T>
void _clear(T &p_keys);
template <typename T, typename V> template <typename T, typename V>
int _insert(double p_time, T &p_keys, const V &p_value); int _insert(double p_time, T &p_keys, const V &p_value);