@mlightcad/data-model 1.1.5 → 1.1.6

package/dist/data-model.js

@@ -9211,28 +9211,29 @@ class ut {
   }
 }
 class Ut extends Ee {
-  constructor(t, e, s, n) {
+  constructor(t, e, s, n, i) {
     super();
-    const i = +(t !== void 0) + +(e !== void 0) + +(s !== void 0) + +(n !== void 0);
-    if (i < 2 || i > 4)
+    const a = arguments.length;
+    if (a < 2 || a > 5)
       throw ot.ILLEGAL_PARAMETERS;
-    const a = 3;
-    if (this._closed = n || !1, Array.isArray(e)) {
-      if (this._controlPoints = t, i >= 4 && (this._closed = n), this._controlPoints.length < 4)
+    if (this._degree = 3, this._closed = !1, Array.isArray(e)) {
+      this._controlPoints = t;
+      let o, c = 3, l = !1;
+      if (a >= 3 && (Array.isArray(s) ? (o = s, a >= 4 && (c = n || 3), a >= 5 && (l = i)) : s !== void 0 && (c = s || 3, a >= 4 && (l = n))), s === void 0 && a >= 4 && (c = n || 3, a >= 5 && (l = i)), this._degree = c, this._closed = l, this._controlPoints.length < this._degree + 1)
         throw ot.ILLEGAL_PARAMETERS;
       this._nurbsCurve = ut.byKnotsControlPointsWeights(
-        a,
+        this._degree,
         e,
         this._controlPoints,
-        s
+        o
       );
     } else {
-      if (this._fitPoints = t, this._knotParameterization = e, i >= 3 && (this._closed = s), this._fitPoints.length < 4)
+      if (this._fitPoints = t, this._knotParameterization = e, a >= 3 && (this._degree = s || 3), a >= 4 && (this._closed = n), this._fitPoints.length < this._degree + 1)
         throw ot.ILLEGAL_PARAMETERS;
       const o = this.toNurbsPoints(this._fitPoints);
       this._nurbsCurve = ut.byPoints(
         o,
-        a,
+        this._degree,
         this._knotParameterization
       ), this._controlPoints = this._nurbsCurve.controlPoints();
     }
@@ -9246,14 +9247,14 @@ class Ut extends Ee {
       if (this._closed)
         this._nurbsCurve = ut.createClosedCurve(
           this._fitPoints,
-          3,
+          this._degree,
           this._knotParameterization
         );
       else {
         const t = this.toNurbsPoints(this._fitPoints);
         this._nurbsCurve = ut.byPoints(
           t,
-          3,
+          this._degree,
           this._knotParameterization
         );
       }
@@ -9263,13 +9264,13 @@ class Ut extends Ee {
         const t = this._knotParameterization || "Chord";
         this._nurbsCurve = ut.createClosedCurve(
           this._controlPoints,
-          3,
+          this._degree,
           t
         ), this._controlPoints = this._nurbsCurve.controlPoints();
       } else {
         const t = this._nurbsCurve.knots(), e = this._nurbsCurve.weights();
         this._nurbsCurve = ut.byKnotsControlPointsWeights(
-          3,
+          this._degree,
           t,
           this._controlPoints,
           e
@@ -9286,7 +9287,7 @@ class Ut extends Ee {
    * Degree of the spline to be created.
    */
   get degree() {
-    return this._nurbsCurve.degree();
+    return this._degree;
   }
   get knotParameterization() {
     return this._knotParameterization;
@@ -9391,12 +9392,13 @@ class Ut extends Ee {
    * Create a closed spline from fit points using AcGeNurbsCurve.createClosedCurve
    * @param fitPoints - Array of fit points defining the curve
    * @param parameterization - Knot parameterization type for NURBS
+   * @param degree - Optional degree of the spline (default: 3)
    * @returns A closed spline
    */
-  static createClosedSpline(t, e = "Uniform") {
-    if (t.length < 4)
-      throw new Error("At least 4 points are required for a closed spline");
-    return new Ut(t, e, !0);
+  static createClosedSpline(t, e = "Uniform", s = 3) {
+    if (t.length < s + 1)
+      throw new Error(`At least ${s + 1} points are required for a degree ${s} closed spline`);
+    return new Ut(t, e, s, !0);
   }
 }
 var Vt = 256, Pn = [], Js = 256, Fe;
@@ -11774,20 +11776,22 @@ class oo extends Tt {
   }
 }
 class tr extends mt {
-  constructor(t, e, s, n) {
+  constructor(t, e, s, n, i) {
     super();
-    const i = +(t !== void 0) + +(e !== void 0) + +(s !== void 0) + +(n !== void 0);
-    if (i < 2 || i > 4)
+    const a = +(t !== void 0) + +(e !== void 0) + +(s !== void 0) + +(n !== void 0) + +(i !== void 0);
+    if (a < 2 || a > 5)
       throw ot.ILLEGAL_PARAMETERS;
-    i <= 3 && !Array.isArray(e) ? this._geo = new Ut(
+    !Array.isArray(e) ? this._geo = new Ut(
       t,
       e,
-      s
+      s,
+      n
     ) : this._geo = new Ut(
       t,
       e,
       s,
-      n
+      n,
+      i
     );
   }
   /**
@@ -15155,6 +15159,7 @@ class rr {
         t.controlPoints,
         t.knots,
         t.weights,
+        t.degree,
         !!(t.flag & 1)
       );
     if (t.numberOfFitPoints > 0) {
@@ -15163,7 +15168,7 @@ class rr {
         t.numberOfFitPoints
       );
       if (e != null)
-        return new tr(e, "Uniform", !!(t.flag & 1));
+        return new tr(e, "Uniform", t.degree, !!(t.flag & 1));
     }
     return null;
   }