From 50bc8d3646a3a73cc1e9139cb66c43e664f59d9e Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Thu, 21 Feb 2019 13:32:28 -0800
Subject: [PATCH] added protected function to cubic hermite spline

---
 libraries/shared/src/CubicHermiteSpline.h | 42 ++++++++++-------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/libraries/shared/src/CubicHermiteSpline.h b/libraries/shared/src/CubicHermiteSpline.h
index 4742bb2e09..c83000996b 100644
--- a/libraries/shared/src/CubicHermiteSpline.h
+++ b/libraries/shared/src/CubicHermiteSpline.h
@@ -66,19 +66,8 @@ public:
         memset(_values, 0, sizeof(float) * (NUM_SUBDIVISIONS + 1));
     }
     CubicHermiteSplineFunctorWithArcLength(const glm::vec3& p0, const glm::vec3& m0, const glm::vec3& p1, const glm::vec3& m1) : CubicHermiteSplineFunctor(p0, m0, p1, m1) {
-        // initialize _values with the accumulated arcLength along the spline.
-        const float DELTA = 1.0f / NUM_SUBDIVISIONS;
-        float alpha = 0.0f;
-        float accum = 0.0f;
-        _values[0] = 0.0f;
-        glm::vec3 prevValue = this->operator()(alpha);
-        for (int i = 1; i < NUM_SUBDIVISIONS + 1; i++) {
-            glm::vec3 nextValue = this->operator()(alpha + DELTA);
-            accum += glm::distance(prevValue, nextValue);
-            alpha += DELTA;
-            _values[i] = accum;
-            prevValue = nextValue;
-        }
+
+        initValues();
     }
 
     CubicHermiteSplineFunctorWithArcLength(const glm::quat& tipRot, const glm::vec3& tipTrans, const glm::quat& baseRot, const glm::vec3& baseTrans, float baseGain = 1.0f, float tipGain = 1.0f) : CubicHermiteSplineFunctor() {
@@ -89,17 +78,7 @@ public:
         _p1 = tipTrans;
         _m1 = tipGain * linearDistance * (tipRot * Vectors::UNIT_Y);
 
-        // initialize _values with the accumulated arcLength along the spline.
-        const float DELTA = 1.0f / NUM_SUBDIVISIONS;
-        float alpha = 0.0f;
-        float accum = 0.0f;
-        _values[0] = 0.0f;
-        for (int i = 1; i < NUM_SUBDIVISIONS + 1; i++) {
-            accum += glm::distance(this->operator()(alpha),
-                this->operator()(alpha + DELTA));
-            alpha += DELTA;
-            _values[i] = accum;
-        }
+        initValues();
     }
 
     CubicHermiteSplineFunctorWithArcLength(const CubicHermiteSplineFunctorWithArcLength& orig) : CubicHermiteSplineFunctor(orig) {
@@ -131,6 +110,21 @@ public:
     }
 protected:
     float _values[NUM_SUBDIVISIONS + 1];
+
+    void initValues() {
+        // initialize _values with the accumulated arcLength along the spline.
+        const float DELTA = 1.0f / NUM_SUBDIVISIONS;
+        float alpha = 0.0f;
+        float accum = 0.0f;
+        _values[0] = 0.0f;
+        for (int i = 1; i < NUM_SUBDIVISIONS + 1; i++) {
+            accum += glm::distance(this->operator()(alpha),
+                this->operator()(alpha + DELTA));
+            alpha += DELTA;
+            _values[i] = accum;
+        }
+
+    }
 };
 
 #endif // hifi_CubicHermiteSpline_h