From f93b255c60b18c102437c2cf868f1aade4f26b0d Mon Sep 17 00:00:00 2001
From: Justin Lin <justin.sdk@gmail.com>
Date: Thu, 10 Dec 2020 09:27:26 +0800
Subject: [PATCH] fix warning in OpenSCAD 2020

---
 src/_impl/_bezier_curve_impl.scad        | 35 ++++++++++++++++++------
 src/_impl/_shape_glued2circles_impl.scad |  4 +--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/_impl/_bezier_curve_impl.scad b/src/_impl/_bezier_curve_impl.scad
index b7a3ae11..6a08f369 100644
--- a/src/_impl/_bezier_curve_impl.scad
+++ b/src/_impl/_bezier_curve_impl.scad
@@ -18,7 +18,22 @@ function bezier_curve_coordinate(t, pn, n, i = 0) =
         (_combi(n, i) * pn[i] * pow(1 - t, n - i) * pow(t, i) + 
             bezier_curve_coordinate(t, pn, n, i + 1));
         
-function _bezier_curve_point(t, points) = 
+function _bezier_curve_point2(t, points) = 
+    let(n = len(points) - 1) 
+    [
+        bezier_curve_coordinate(
+            t, 
+            [for(p = points) p[0]], 
+            n
+        ),
+        bezier_curve_coordinate(
+            t,  
+            [for(p = points) p[1]], 
+            n
+        )
+    ];
+
+function _bezier_curve_point3(t, points) = 
     let(n = len(points) - 1) 
     [
         bezier_curve_coordinate(
@@ -39,11 +54,13 @@ function _bezier_curve_point(t, points) =
     ];
 
 function _bezier_curve_impl(t_step, points) = 
-    let(
-        t_end = ceil(1 / t_step),
-        pts = concat([
-            for(t = 0; t < t_end; t = t + 1)
-                _bezier_curve_point(t * t_step, points)
-        ], [_bezier_curve_point(1, points)])
-    ) 
-    len(points[0]) == 3 ? pts : [for(pt = pts) __to2d(pt)];
+    let(t_end = ceil(1 / t_step)) 
+    len(points[0]) == 3 ? 
+            concat([
+                for(t = 0; t < t_end; t = t + 1)
+                    _bezier_curve_point3(t * t_step, points)
+            ], [_bezier_curve_point3(1, points)]) :
+            concat([
+                for(t = 0; t < t_end; t = t + 1)
+                    _bezier_curve_point2(t * t_step, points)
+            ], [_bezier_curve_point2(1, points)]);
diff --git a/src/_impl/_shape_glued2circles_impl.scad b/src/_impl/_shape_glued2circles_impl.scad
index ea9ace30..f737a17d 100644
--- a/src/_impl/_shape_glued2circles_impl.scad
+++ b/src/_impl/_shape_glued2circles_impl.scad
@@ -18,8 +18,8 @@ function _glued2circles_bezier(radius, centre_dist, tangent_angle, t_step, ctrl_
         ctrl_p = ptf_rotate([radius * tan(tangent_angle), -radius], tangent_angle),
         ctrl_p2 = [-ctrl_p[0], ctrl_p[1]] + [centre_dist / 2, 0],
         ctrl_p3 = [-ctrl_p2[0], ctrl_p2[1]],
-        ctrl_p4 = [-ctrl_p1[0], ctrl_p1[1]]            
-    )
+        ctrl_p4 = [-ctrl_p1[0], ctrl_p1[1]]
+    ) 
     bezier_curve(
         t_step,
         [