diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-05-29 12:52:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-05-29 12:52:11 +0200 |
| commit | a37133e18f81d990a9bdd0c515efaaa4c4a72043 (patch) | |
| tree | f5af70ceda1c85d7080a07e884aacf187a061ca7 /src | |
| parent | ab972a9e97644bcb6bee0c7972d9e070877dbdbd (diff) | |
Core/Movement: Spline<float> compile fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/Spline/Spline.h | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/SplineImpl.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 0a755f1b20e..436ee77cc9f 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -150,7 +150,7 @@ protected: LengthArray lengths; - index_type computeIndexInBounds(length_type length) const; + index_type computeIndexInBoundsAtLength(length_type length) const; public: explicit Spline(){ } diff --git a/src/server/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h index 970b6dd2c35..c2ea53ccc20 100644 --- a/src/server/game/Movement/Spline/SplineImpl.h +++ b/src/server/game/Movement/Spline/SplineImpl.h @@ -33,7 +33,7 @@ template<typename length_type> void Spline<length_type>::evaluate_derivative(flo evaluate_derivative(Index, u, hermite); } -template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds(length_type length_) const +template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBoundsAtLength(length_type length_) const { // Temporary disabled: causes infinite loop with t = 1.f /* @@ -64,7 +64,7 @@ template<typename length_type> void Spline<length_type>::computeIndex(float t, i { ASSERT(t >= 0.f && t <= 1.f); length_type length_ = t * length(); - out_idx = computeIndexInBounds(length_); + out_idx = computeIndexInBoundsAtLength(length_); ASSERT(out_idx < index_hi); out_u = (length_ - length(out_idx)) / (float)length(out_idx, out_idx+1); } @@ -72,7 +72,7 @@ template<typename length_type> void Spline<length_type>::computeIndex(float t, i template<typename length_type> SplineBase::index_type Spline<length_type>::computeIndexInBounds( float t ) const { ASSERT(t >= 0.f && t <= 1.f); - return computeIndexInBounds(t * length()); + return computeIndexInBoundsAtLength(t * length()); } template<typename length_type> void Spline<length_type>::initLengths() |