godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #60151 from Klowner/pathfollow3d-parallel-transport-improvement

Browse Source 
PathFollow3D parallel transport frame reliability improvements
This commit is contained in:
Rémi Verschelde
2022-06-15 23:54:00 +02:00
committed by GitHub
parent cfacc400a3 281cf5fb81
commit 9ddf13e7ad
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scene/3d/path_3d.cpp
View File

@@ -157,10 +157,14 @@ void PathFollow3D::_update_transform(bool p_update_xyz_rot) {
// for a discussion about why not Frenet frame. // for a discussion about why not Frenet frame.
t.origin = pos; t.origin = pos;
if (p_update_xyz_rot && prev_offset != offset) { // Only update rotation if some parameter has changed - i.e. not on addition to scene tree.
if (p_update_xyz_rot && delta_offset != 0) { // Only update rotation if some parameter has changed - i.e. not on addition to scene tree. real_t sample_distance = bi * 0.01;
Vector3 t_prev = (pos - c->interpolate_baked(offset - delta_offset, cubic)).normalized(); Vector3 t_prev_pos_a = c->interpolate_baked(prev_offset - sample_distance, cubic);
Vector3 t_cur = (c->interpolate_baked(offset + delta_offset, cubic) - pos).normalized(); Vector3 t_prev_pos_b = c->interpolate_baked(prev_offset + sample_distance, cubic);
Vector3 t_cur_pos_a = c->interpolate_baked(offset - sample_distance, cubic);
Vector3 t_cur_pos_b = c->interpolate_baked(offset + sample_distance, cubic);
Vector3 t_prev = (t_prev_pos_a - t_prev_pos_b).normalized();
Vector3 t_cur = (t_cur_pos_a - t_cur_pos_b).normalized();
Vector3 axis = t_prev.cross(t_cur); Vector3 axis = t_prev.cross(t_cur);
real_t dot = t_prev.dot(t_cur); real_t dot = t_prev.dot(t_cur);
@@ -303,7 +307,7 @@ void PathFollow3D::_bind_methods() {
} }
void PathFollow3D::set_offset(real_t p_offset) { void PathFollow3D::set_offset(real_t p_offset) {
delta_offset = p_offset - offset; prev_offset = offset;
offset = p_offset; offset = p_offset;
if (path) { if (path) {

2
scene/3d/path_3d.h
View File

@@ -65,7 +65,7 @@ public:
private: private:
Path3D *path = nullptr; Path3D *path = nullptr;
real_t delta_offset = 0.0; // Change in offset since last _update_transform. real_t prev_offset = 0.0; // Offset during the last _update_transform.
real_t offset = 0.0; real_t offset = 0.0;
real_t h_offset = 0.0; real_t h_offset = 0.0;
real_t v_offset = 0.0; real_t v_offset = 0.0;