mxdraw 0.1.8 → 0.1.11

package/dist/lib/tools/three/index.js

@@ -57,6 +57,9 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
     if (isClose === void 0) { isClose = true; }
     if (cornerRadius.length > 0) {
         var curve = new three_1.CurvePath();
+        if (!isClose) {
+            points.push(points[0]);
+        }
         for (var i = 0; i < points.length - 1; i++) {
             //作为拐弯的弧度
             var R = cornerRadius[i] || 0;
@@ -65,16 +68,17 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
                 dir.normalize();
                 var p2_1 = points[1].clone();
                 p2_1.add(dir.clone().multiplyScalar(R));
-                var line_1 = new three_1.LineCurve3(points[0], p2_1);
-                curve.curves.push(line_1);
+                var line = new three_1.LineCurve3(points[0], p2_1);
+                curve.curves.push(line);
                 continue;
             }
             // 计算三个点构成的两条线的方向
-            var dir1 = !isClose && points[i - 1]
+            var dir1 = !isClose || points[i - 1]
                 ? points[i - 1].clone().sub(points[i])
                 : points[points.length - 1].clone().sub(points[0]);
             dir1.normalize();
-            var dir2 = !isClose && points[i + 1]
+            /* istanbul ignore next */
+            var dir2 = !isClose || points[i + 1]
                 ? points[i + 1].clone().sub(points[i])
                 : points[1].clone().sub(points[0]);
             dir2.normalize();
@@ -84,24 +88,26 @@ function getToGenerateRoundedCorners(points, cornerRadius, isClose) {
             var p2 = points[i].clone();
             var p3 = points[i].clone().add(dir2.clone().multiplyScalar(R));
             var beziercurve = new three_1.QuadraticBezierCurve3(p1, p2, p3);
-            var line1 = points[i].clone();
-            line1.add(dir2.clone().multiplyScalar(R));
-            var line2 = points[i + 1].clone();
-            if (i < points.length - (isClose ? 1 : 2)) {
-                //最后一段不用减掉半径尺寸
-                line2.add(dir2.clone().multiplyScalar(-R));
+            if (i === points.length - 2) {
+                var line1 = points[i].clone();
+                line1.add(dir2.clone().multiplyScalar(R));
+                var line2 = points[i + 1].clone();
+                isClose ? line2.add(dir2.clone().multiplyScalar(-R)) : line2.add(dir2.clone());
+                var line = new three_1.LineCurve3(line1, line2);
+                curve.curves.push(beziercurve, line);
+            }
+            else {
+                // 把转换曲线和直线插入曲线中
+                curve.curves.push(beziercurve);
             }
-            var line = new three_1.LineCurve3(line1, line2);
-            // 把转换曲线和直线插入曲线中
-            curve.curves.push(beziercurve, line);
             if (i === 0) {
                 points.push(points[0]);
             }
         }
-        return curve.getPoints(5);
+        return curve.getPoints(50);
     }
     else {
-        return [];
+        return points;
     }
 }
 exports.getToGenerateRoundedCorners = getToGenerateRoundedCorners;