resolve #266

markaren · Jun 24, 2024 · 50374db · 50374db
1 parent 18486d4
commit 50374db
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/include/threepp/extras/core/Curve.hpp b/include/threepp/extras/core/Curve.hpp
@@ -91,22 +91,18 @@ namespace threepp {
         mutable std::vector<float> cacheArcLengths;
     };
 
+    struct FrenetFrames {
 
-    typedef Curve<Vector2> Curve2;
-
-    class Curve3: public Curve<Vector3> {
-
-    public:
-        struct FrenetFrames {
+        std::vector<Vector3> tangents;
+        std::vector<Vector3> normals;
+        std::vector<Vector3> binormals;
 
-            std::vector<Vector3> tangents;
-            std::vector<Vector3> normals;
-            std::vector<Vector3> binormals;
-        };
-
-        FrenetFrames computeFrenetFrames(unsigned int segments, bool closed);
+        static FrenetFrames compute(const Curve<Vector3>& curve, unsigned int segments, bool closed);
     };
 
+    typedef Curve<Vector2> Curve2;
+    typedef Curve<Vector3> Curve3;
+
     extern template class threepp::Curve<Vector2>;
     extern template class threepp::Curve<Vector3>;
 

diff --git a/include/threepp/geometries/TubeGeometry.hpp b/include/threepp/geometries/TubeGeometry.hpp
@@ -43,7 +43,7 @@ namespace threepp {
                 bool closed = false);
 
     private:
-        Curve3::FrenetFrames frames;
+        FrenetFrames frames;
 
         TubeGeometry(std::shared_ptr<Curve3> path, const Params& params);
     };

diff --git a/src/threepp/extras/core/Curve.cpp b/src/threepp/extras/core/Curve.cpp
@@ -190,7 +190,7 @@ void Curve<T>::getTangentAt(float u, T& optionalTarget) const {
     this->getTangent(t, optionalTarget);
 }
 
-Curve3::FrenetFrames Curve3::computeFrenetFrames(unsigned int segments, bool closed) {
+FrenetFrames FrenetFrames::compute(const Curve<Vector3>& curve, unsigned int segments, bool closed) {
 
     // see http://www.cs.indiana.edu/pub/techreports/TR425.pdf
 
@@ -210,7 +210,7 @@ Curve3::FrenetFrames Curve3::computeFrenetFrames(unsigned int segments, bool clo
         const float u = static_cast<float>(i) / static_cast<float>(segments);
 
         auto& tangent = tangents.emplace_back();
-        this->getTangentAt(u, tangent);
+        curve.getTangentAt(u, tangent);
         tangent.normalize();
     }
 

diff --git a/src/threepp/geometries/ExtrudeGeometry.cpp b/src/threepp/geometries/ExtrudeGeometry.cpp
@@ -267,7 +267,7 @@ ExtrudeGeometry::ExtrudeGeometry(const std::vector<Shape>& shapes, const Extrude
 
         std::vector<Vector3> extrudePts;
         bool extrudeByPath = false;
-        Curve3::FrenetFrames splineTube;
+        FrenetFrames splineTube;
         Vector3 binormal, normal, position2;
 
         if (extrudePath) {
@@ -281,7 +281,7 @@ ExtrudeGeometry::ExtrudeGeometry(const std::vector<Shape>& shapes, const Extrude
 
             // TODO1 - have a .isClosed in spline?
 
-            splineTube = extrudePath->computeFrenetFrames(steps, false);
+            splineTube = FrenetFrames::compute(*extrudePath, steps, false);
         }
 
         // Safeguards if bevels are not enabled

diff --git a/src/threepp/geometries/TubeGeometry.cpp b/src/threepp/geometries/TubeGeometry.cpp
@@ -10,7 +10,7 @@ using namespace threepp;
 TubeGeometry::TubeGeometry(std::shared_ptr<Curve3> path, const Params& params)
     : path(std::move(path)), radius(params.radius) {
 
-    this->frames = this->path->computeFrenetFrames(params.tubularSegments, params.closed);
+    this->frames = FrenetFrames::compute(*this->path, params.tubularSegments, params.closed);
 
     // helper variables