aboutsummaryrefslogtreecommitdiff
path: root/dep/g3dlite/source/SplineBase.cpp
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-08-23 16:41:54 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-08-23 16:41:54 +0200
commit4a29c73403c4dc713a8a31cb96289adff2b910c1 (patch)
treede0c6b191031bac7fb2764edb2a81382a331f81c /dep/g3dlite/source/SplineBase.cpp
parentb90329d63acaecb1f074dd2b303561baa9f639a2 (diff)
parent1255434882777053bca06656786abc1a598deda9 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'dep/g3dlite/source/SplineBase.cpp')
-rw-r--r--dep/g3dlite/source/SplineBase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/g3dlite/source/SplineBase.cpp b/dep/g3dlite/source/SplineBase.cpp
index 41221624b06..5904e9a1aa2 100644
--- a/dep/g3dlite/source/SplineBase.cpp
+++ b/dep/g3dlite/source/SplineBase.cpp
@@ -4,7 +4,7 @@
namespace G3D {
float SplineBase::getFinalInterval() const {
- if (! cyclic) {
+ if (extrapolationMode != SplineExtrapolationMode::CYCLIC) {
return 0;
} else if (finalInterval <= 0) {
int N = time.size();
@@ -97,7 +97,7 @@ void SplineBase::computeIndex(float s, int& i, float& u) const {
// No control points to work with
i = 0;
u = 0.0;
- } else if (cyclic) {
+ } else if (extrapolationMode == SplineExtrapolationMode::CYCLIC) {
float fi = getFinalInterval();
// Cyclic spline
@@ -156,7 +156,7 @@ void SplineBase::computeIndex(float s, int& i, float& u) const {
computeIndexInBounds(s, i, u);
} // if in bounds
- } // if cyclic
+ } // extrapolation Mode
}
}