diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-04-25 09:57:52 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-04-25 09:57:52 +0200 |
| commit | be00dcd72410fa0a62a22a393e6eda1d17788bb6 (patch) | |
| tree | e0fa8ed539399d77f5150fb7429dc4d29c29b27f /modules | |
| parent | 76d33d187f65dfea52d0f7219b30c73dc468abbb (diff) | |
| parent | fac8a918f97e831de6070377e7f3475071d4ed84 (diff) | |
| download | redot-engine-be00dcd72410fa0a62a22a393e6eda1d17788bb6.tar.gz | |
Merge pull request #73656 from TokageItLab/expose-3d-tracks
Expose interpolation methods for 3D track in `Animation` class
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index efdc3b0d2d..4a07183b0d 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -6478,7 +6478,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Vector3 scale; - Error err = p_animation->scale_track_interpolate(p_track_i, time, &scale); + Error err = p_animation->try_scale_track_interpolate(p_track_i, time, &scale); ERR_CONTINUE(err != OK); p_track.scale_track.values.push_back(scale); p_track.scale_track.times.push_back(time); @@ -6513,7 +6513,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Vector3 scale; - Error err = p_animation->position_track_interpolate(p_track_i, time, &scale); + Error err = p_animation->try_position_track_interpolate(p_track_i, time, &scale); ERR_CONTINUE(err != OK); p_track.position_track.values.push_back(scale); p_track.position_track.times.push_back(time); @@ -6548,7 +6548,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Quaternion rotation; - Error err = p_animation->rotation_track_interpolate(p_track_i, time, &rotation); + Error err = p_animation->try_rotation_track_interpolate(p_track_i, time, &rotation); ERR_CONTINUE(err != OK); p_track.rotation_track.values.push_back(rotation); p_track.rotation_track.times.push_back(time); @@ -6588,7 +6588,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Vector3 position; - Error err = p_animation->position_track_interpolate(p_track_i, time, &position); + Error err = p_animation->try_position_track_interpolate(p_track_i, time, &position); ERR_CONTINUE(err != OK); p_track.position_track.values.push_back(position); p_track.position_track.times.push_back(time); @@ -6621,7 +6621,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Quaternion rotation; - Error err = p_animation->rotation_track_interpolate(p_track_i, time, &rotation); + Error err = p_animation->try_rotation_track_interpolate(p_track_i, time, &rotation); ERR_CONTINUE(err != OK); p_track.rotation_track.values.push_back(rotation); p_track.rotation_track.times.push_back(time); @@ -6657,7 +6657,7 @@ GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> p_sta bool last = false; while (true) { Vector3 scale; - Error err = p_animation->scale_track_interpolate(p_track_i, time, &scale); + Error err = p_animation->try_scale_track_interpolate(p_track_i, time, &scale); ERR_CONTINUE(err != OK); p_track.scale_track.values.push_back(scale); p_track.scale_track.times.push_back(time); |