archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: Incorrect cyclic interpolation for nodes bezier spline

Browse Source 
The special case for the interpolation to the last point was being used
for every point in the last segment, because of the rounding. Instead,
make the function slightly more complicated to properly handle the
correct interolation in the cyclic and non-cyclic cases.
This commit is contained in:
Hans Goudey
2021-05-04 16:28:22 -05:00
parent 441160930b
commit 7ab7ae80c5
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/spline_bezier.cc
View File

@@ -423,15 +423,22 @@ BezierSpline::InterpolationData BezierSpline::interpolation_data_from_index_fact
const float index_factor) const
{
const int points_len = this->size();
const int index = std::floor(index_factor);
if (index == points_len) {
BLI_assert(is_cyclic_);
if (is_cyclic_) {
if (index_factor < points_len) {
const int index = std::floor(index_factor);
const int next_index = (index < points_len - 1) ? index + 1 : 0;
return InterpolationData{index, next_index, index_factor - index};
}
return InterpolationData{points_len - 1, 0, 1.0f};
}
if (index == points_len - 1) {
return InterpolationData{points_len - 2, points_len - 1, 1.0f};
if (index_factor < points_len - 1) {
const int index = std::floor(index_factor);
const int next_index = index + 1;
return InterpolationData{index, next_index, index_factor - index};
}
return InterpolationData{index, index + 1, index_factor - index};
return InterpolationData{points_len - 2, points_len - 1, 1.0f};
}
/* Use a spline argument to avoid adding this to the header. */