From 72c5ddafeca52d0636957a682ce0c4dcf27699d0 Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Tue, 28 Jan 2020 09:52:16 +0800
Subject: [PATCH] refactor deps

---
 examples/taiwan/SD_Card_Taiwan.scad           |  6 +++---
 examples/taiwan/TaiwaneseBlackBear.scad       | 12 +++++-------
 examples/taiwan/cargo_container_landmark.scad |  4 ++--
 examples/taiwan/chair_score.scad              |  3 +--
 examples/taiwan/dancing_taiwan.scad           | 14 +++++++-------
 examples/taiwan/golden_taiwan.scad            | 15 +++++----------
 examples/taiwan/leopard_cat_taiwan.scad       |  4 ++--
 examples/taiwan/spiral_cube.scad              |  8 ++------
 8 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/examples/taiwan/SD_Card_Taiwan.scad b/examples/taiwan/SD_Card_Taiwan.scad
index 822934d3..774fc45d 100644
--- a/examples/taiwan/SD_Card_Taiwan.scad
+++ b/examples/taiwan/SD_Card_Taiwan.scad
@@ -1,6 +1,6 @@
-include <shape_taiwan.scad>;
-include <ellipse_extrude.scad>;
-include <midpt_smooth.scad>;
+use <shape_taiwan.scad>;
+use <ellipse_extrude.scad>;
+use <midpt_smooth.scad>;
 
 smooth_times = 40;
 slices = 2;
diff --git a/examples/taiwan/TaiwaneseBlackBear.scad b/examples/taiwan/TaiwaneseBlackBear.scad
index 8e30937a..84aba230 100644
--- a/examples/taiwan/TaiwaneseBlackBear.scad
+++ b/examples/taiwan/TaiwaneseBlackBear.scad
@@ -1,10 +1,8 @@
-include <in_shape.scad>;
-include <shape_taiwan.scad>;
-include <pixel/px_line.scad>;
-include <pixel/px_polyline.scad>;
-include <pixel/px_sphere.scad>;
-include <pixel/px_cylinder.scad>;
-include <pixel/px_polygon.scad>;
+use <shape_taiwan.scad>;
+use <pixel/px_polyline.scad>;
+use <pixel/px_sphere.scad>;
+use <pixel/px_cylinder.scad>;
+use <pixel/px_polygon.scad>;
 
 module blocks(points) {
     for(pt = points) {
diff --git a/examples/taiwan/cargo_container_landmark.scad b/examples/taiwan/cargo_container_landmark.scad
index 23983488..dd1c9cab 100644
--- a/examples/taiwan/cargo_container_landmark.scad
+++ b/examples/taiwan/cargo_container_landmark.scad
@@ -1,5 +1,5 @@
-include <along_with.scad>;
-include <box_extrude.scad>;
+use <along_with.scad>;
+use <box_extrude.scad>;
 
 platform = "YES"; // [YES, NO]
 cube_only = "NO";   // [YES, NO]
diff --git a/examples/taiwan/chair_score.scad b/examples/taiwan/chair_score.scad
index a3a72ca1..2b043054 100644
--- a/examples/taiwan/chair_score.scad
+++ b/examples/taiwan/chair_score.scad
@@ -1,5 +1,4 @@
-include <arc.scad>;
-include <util/rand.scad>;
+use <util/rand.scad>;
 
 layer = 15;  // [1:15]
 radial = 30; // [1:30]
diff --git a/examples/taiwan/dancing_taiwan.scad b/examples/taiwan/dancing_taiwan.scad
index 7dcd0e2a..2c612c21 100644
--- a/examples/taiwan/dancing_taiwan.scad
+++ b/examples/taiwan/dancing_taiwan.scad
@@ -1,10 +1,10 @@
-include <trim_shape.scad>;
-include <bezier_curve.scad>;
-include <shape_taiwan.scad>;
-include <path_scaling_sections.scad>;
-include <polysections.scad>;
-include <rotate_p.scad>;
-include <bijection_offset.scad>;
+use <trim_shape.scad>;
+use <bezier_curve.scad>;
+use <shape_taiwan.scad>;
+use <path_scaling_sections.scad>;
+use <polysections.scad>;
+use <rotate_p.scad>;
+use <bijection_offset.scad>;
 
 x1 = 4; // [-20:4]
 x2 = 3; // [-20:4]
diff --git a/examples/taiwan/golden_taiwan.scad b/examples/taiwan/golden_taiwan.scad
index 1d4d0076..75f41f3a 100644
--- a/examples/taiwan/golden_taiwan.scad
+++ b/examples/taiwan/golden_taiwan.scad
@@ -1,13 +1,8 @@
-include <shape_taiwan.scad>;
-include <circle_path.scad>;
-include <rotate_p.scad>;
-include <golden_spiral.scad>;
-include <cross_sections.scad>;
-include <polysections.scad>;
-include <golden_spiral_extrude.scad>;
-include <bezier_curve.scad>;
-include <bezier_surface.scad>;
-include <function_grapher.scad>;
+use <shape_taiwan.scad>;
+use <golden_spiral.scad>;
+use <golden_spiral_extrude.scad>;
+use <bezier_surface.scad>;
+use <function_grapher.scad>;
 
 // smaller values are better
 taiwan_fineness = 5;  
diff --git a/examples/taiwan/leopard_cat_taiwan.scad b/examples/taiwan/leopard_cat_taiwan.scad
index 2b8cf613..7dcfa46d 100644
--- a/examples/taiwan/leopard_cat_taiwan.scad
+++ b/examples/taiwan/leopard_cat_taiwan.scad
@@ -1,5 +1,5 @@
-include <pixel/px_gray.scad>;
-include <shape_taiwan.scad>;
+use <pixel/px_gray.scad>;
+use <shape_taiwan.scad>;
 
 levels = [
 	[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 30, 40, 32, 22, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
diff --git a/examples/taiwan/spiral_cube.scad b/examples/taiwan/spiral_cube.scad
index aebd0fa3..3ce4e2dd 100644
--- a/examples/taiwan/spiral_cube.scad
+++ b/examples/taiwan/spiral_cube.scad
@@ -1,13 +1,9 @@
-include <rotate_p.scad>;
-include <cross_sections.scad>;
-include <polysections.scad>;
-include <ring_extrude.scad>;
-include <crystal_ball.scad>;
+use <crystal_ball.scad>;
 
 leng = 30;
 leng_diff = 3;
 min_leng = 2;
-model = "Base"; // [Cube, Base]
+model = "Cube"; // [Cube, Base]
 
 module spiral_cube(leng, leng_diff, min_leng) {
     thickness = leng_diff / 3;