From 17b731ad8fba8c777edbf93dacef663190e0aaad Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Thu, 20 Jun 2019 09:19:42 +0800
Subject: [PATCH] use dir to simulate namespace

---
 src/{ => pixel}/px_circle.scad         | 0
 src/{ => pixel}/px_line.scad           | 4 ++--
 src/{ => pixel}/px_polyline.scad       | 6 +++---
 test/{ => pixel}/test_px_circle.scad   | 2 +-
 test/{ => pixel}/test_px_line.scad     | 2 +-
 test/{ => pixel}/test_px_polyline.scad | 4 ++--
 test/test_all.scad                     | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{ => pixel}/px_circle.scad (100%)
 rename src/{ => pixel}/px_line.scad (98%)
 rename src/{ => pixel}/px_polyline.scad (70%)
 rename test/{ => pixel}/test_px_circle.scad (99%)
 rename test/{ => pixel}/test_px_line.scad (96%)
 rename test/{ => pixel}/test_px_polyline.scad (96%)

diff --git a/src/px_circle.scad b/src/pixel/px_circle.scad
similarity index 100%
rename from src/px_circle.scad
rename to src/pixel/px_circle.scad
diff --git a/src/px_line.scad b/src/pixel/px_line.scad
similarity index 98%
rename from src/px_line.scad
rename to src/pixel/px_line.scad
index 33755922..8881fc48 100644
--- a/src/px_line.scad
+++ b/src/pixel/px_line.scad
@@ -1,5 +1,5 @@
-include <__private__/__to3d.scad>;
-include <__private__/__to2d.scad>;
+include <../__private__/__to3d.scad>;
+include <../__private__/__to2d.scad>;
 
 function _px_line_zsgn(a) = a == 0 ? a : a / abs(a);
     
diff --git a/src/px_polyline.scad b/src/pixel/px_polyline.scad
similarity index 70%
rename from src/px_polyline.scad
rename to src/pixel/px_polyline.scad
index 26e50dd0..e7fdeaa1 100644
--- a/src/px_polyline.scad
+++ b/src/pixel/px_polyline.scad
@@ -1,6 +1,6 @@
-include <__private__/__to3d.scad>;
-include <__private__/__to2d.scad>;
-include <__private__/__lines_from.scad>;
+include <../__private__/__to3d.scad>;
+include <../__private__/__to2d.scad>;
+include <../__private__/__lines_from.scad>;
 
 function px_polyline(points) =
     let(
diff --git a/test/test_px_circle.scad b/test/pixel/test_px_circle.scad
similarity index 99%
rename from test/test_px_circle.scad
rename to test/pixel/test_px_circle.scad
index 045090ae..ae287851 100644
--- a/test/test_px_circle.scad
+++ b/test/pixel/test_px_circle.scad
@@ -3,7 +3,7 @@ module test_px_circle() {
     echo("==== test_px_circle ====");
 
     include <unittest.scad>;
-    include <px_circle.scad>;
+    include <pixel/px_circle.scad>;
     expected = [[-0.5, 9.5], [-0.5, -10.5], [-10.5, -0.5], [-9.5, -0.5], [-8.5, -0.5], [-7.5, -0.5], [-6.5, -0.5], [-5.5, -0.5], [-4.5, -0.5], [-3.5, -0.5], [-2.5, -0.5], [-1.5, -0.5], [-0.5, -0.5], [0.5, -0.5], [1.5, -0.5], [2.5, -0.5], [3.5, -0.5], [4.5, -0.5], [5.5, -0.5], [6.5, -0.5], [7.5, -0.5], [8.5, -0.5], [9.5, -0.5], [0.5, 9.5], [-0.5, 9.5], [-1.5, 9.5], [9.5, 0.5], [8.5, 0.5], [7.5, 0.5], [6.5, 0.5], [5.5, 0.5], [4.5, 0.5], [3.5, 0.5], [2.5, 0.5], [1.5, 0.5], [0.5, 0.5], [-0.5, 0.5], [-1.5, 0.5], [-2.5, 0.5], [-3.5, 0.5], [-4.5, 0.5], [-5.5, 0.5], [-6.5, 0.5], [-7.5, 0.5], [-8.5, 0.5], [-9.5, 0.5], [-10.5, 0.5], [9.5, -1.5], [8.5, -1.5], [7.5, -1.5], [6.5, -1.5], [5.5, -1.5], [4.5, -1.5], [3.5, -1.5], [2.5, -1.5], [1.5, -1.5], [0.5, -1.5], [-0.5, -1.5], [-1.5, -1.5], [-2.5, -1.5], [-3.5, -1.5], [-4.5, -1.5], [-5.5, -1.5], [-6.5, -1.5], [-7.5, -1.5], [-8.5, -1.5], [-9.5, -1.5], [-10.5, -1.5], [0.5, -10.5], [-0.5, -10.5], [-1.5, -10.5], [1.5, 9.5], [0.5, 9.5], [-0.5, 9.5], [-1.5, 9.5], [-2.5, 9.5], [9.5, 1.5], [8.5, 1.5], [7.5, 1.5], [6.5, 1.5], [5.5, 1.5], [4.5, 1.5], [3.5, 1.5], [2.5, 1.5], [1.5, 1.5], [0.5, 1.5], [-0.5, 1.5], [-1.5, 1.5], [-2.5, 1.5], [-3.5, 1.5], [-4.5, 1.5], [-5.5, 1.5], [-6.5, 1.5], [-7.5, 1.5], [-8.5, 1.5], [-9.5, 1.5], [-10.5, 1.5], [9.5, -2.5], [8.5, -2.5], [7.5, -2.5], [6.5, -2.5], [5.5, -2.5], [4.5, -2.5], [3.5, -2.5], [2.5, -2.5], [1.5, -2.5], [0.5, -2.5], [-0.5, -2.5], [-1.5, -2.5], [-2.5, -2.5], [-3.5, -2.5], [-4.5, -2.5], [-5.5, -2.5], [-6.5, -2.5], [-7.5, -2.5], [-8.5, -2.5], [-9.5, -2.5], [-10.5, -2.5], [1.5, -10.5], [0.5, -10.5], [-0.5, -10.5], [-1.5, -10.5], [-2.5, -10.5], [2.5, 9.5], [1.5, 9.5], [0.5, 9.5], [-0.5, 9.5], [-1.5, 9.5], [-2.5, 9.5], [-3.5, 9.5], [9.5, 2.5], [8.5, 2.5], [7.5, 2.5], [6.5, 2.5], [5.5, 2.5], [4.5, 2.5], [3.5, 2.5], [2.5, 2.5], [1.5, 2.5], [0.5, 2.5], [-0.5, 2.5], [-1.5, 2.5], [-2.5, 2.5], [-3.5, 2.5], [-4.5, 2.5], [-5.5, 2.5], [-6.5, 2.5], [-7.5, 2.5], [-8.5, 2.5], [-9.5, 2.5], [-10.5, 2.5], [9.5, -3.5], [8.5, -3.5], [7.5, -3.5], [6.5, -3.5], [5.5, -3.5], [4.5, -3.5], [3.5, -3.5], [2.5, -3.5], [1.5, -3.5], [0.5, -3.5], [-0.5, -3.5], [-1.5, -3.5], [-2.5, -3.5], [-3.5, -3.5], [-4.5, -3.5], [-5.5, -3.5], [-6.5, -3.5], [-7.5, -3.5], [-8.5, -3.5], [-9.5, -3.5], [-10.5, -3.5], [2.5, -10.5], [1.5, -10.5], [0.5, -10.5], [-0.5, -10.5], [-1.5, -10.5], [-2.5, -10.5], [-3.5, -10.5], [3.5, 8.5], [2.5, 8.5], [1.5, 8.5], [0.5, 8.5], [-0.5, 8.5], [-1.5, 8.5], [-2.5, 8.5], [-3.5, 8.5], [-4.5, 8.5], [8.5, 3.5], [7.5, 3.5], [6.5, 3.5], [5.5, 3.5], [4.5, 3.5], [3.5, 3.5], [2.5, 3.5], [1.5, 3.5], [0.5, 3.5], [-0.5, 3.5], [-1.5, 3.5], [-2.5, 3.5], [-3.5, 3.5], [-4.5, 3.5], [-5.5, 3.5], [-6.5, 3.5], [-7.5, 3.5], [-8.5, 3.5], [-9.5, 3.5], [8.5, -4.5], [7.5, -4.5], [6.5, -4.5], [5.5, -4.5], [4.5, -4.5], [3.5, -4.5], [2.5, -4.5], [1.5, -4.5], [0.5, -4.5], [-0.5, -4.5], [-1.5, -4.5], [-2.5, -4.5], [-3.5, -4.5], [-4.5, -4.5], [-5.5, -4.5], [-6.5, -4.5], [-7.5, -4.5], [-8.5, -4.5], [-9.5, -4.5], [3.5, -9.5], [2.5, -9.5], [1.5, -9.5], [0.5, -9.5], [-0.5, -9.5], [-1.5, -9.5], [-2.5, -9.5], [-3.5, -9.5], [-4.5, -9.5], [4.5, 8.5], [3.5, 8.5], [2.5, 8.5], [1.5, 8.5], [0.5, 8.5], [-0.5, 8.5], [-1.5, 8.5], [-2.5, 8.5], [-3.5, 8.5], [-4.5, 8.5], [-5.5, 8.5], [8.5, 4.5], [7.5, 4.5], [6.5, 4.5], [5.5, 4.5], [4.5, 4.5], [3.5, 4.5], [2.5, 4.5], [1.5, 4.5], [0.5, 4.5], [-0.5, 4.5], [-1.5, 4.5], [-2.5, 4.5], [-3.5, 4.5], [-4.5, 4.5], [-5.5, 4.5], [-6.5, 4.5], [-7.5, 4.5], [-8.5, 4.5], [-9.5, 4.5], [8.5, -5.5], [7.5, -5.5], [6.5, -5.5], [5.5, -5.5], [4.5, -5.5], [3.5, -5.5], [2.5, -5.5], [1.5, -5.5], [0.5, -5.5], [-0.5, -5.5], [-1.5, -5.5], [-2.5, -5.5], [-3.5, -5.5], [-4.5, -5.5], [-5.5, -5.5], [-6.5, -5.5], [-7.5, -5.5], [-8.5, -5.5], [-9.5, -5.5], [4.5, -9.5], [3.5, -9.5], [2.5, -9.5], [1.5, -9.5], [0.5, -9.5], [-0.5, -9.5], [-1.5, -9.5], [-2.5, -9.5], [-3.5, -9.5], [-4.5, -9.5], [-5.5, -9.5], [5.5, 7.5], [4.5, 7.5], [3.5, 7.5], [2.5, 7.5], [1.5, 7.5], [0.5, 7.5], [-0.5, 7.5], [-1.5, 7.5], [-2.5, 7.5], [-3.5, 7.5], [-4.5, 7.5], [-5.5, 7.5], [-6.5, 7.5], [7.5, 5.5], [6.5, 5.5], [5.5, 5.5], [4.5, 5.5], [3.5, 5.5], [2.5, 5.5], [1.5, 5.5], [0.5, 5.5], [-0.5, 5.5], [-1.5, 5.5], [-2.5, 5.5], [-3.5, 5.5], [-4.5, 5.5], [-5.5, 5.5], [-6.5, 5.5], [-7.5, 5.5], [-8.5, 5.5], [7.5, -6.5], [6.5, -6.5], [5.5, -6.5], [4.5, -6.5], [3.5, -6.5], [2.5, -6.5], [1.5, -6.5], [0.5, -6.5], [-0.5, -6.5], [-1.5, -6.5], [-2.5, -6.5], [-3.5, -6.5], [-4.5, -6.5], [-5.5, -6.5], [-6.5, -6.5], [-7.5, -6.5], [-8.5, -6.5], [5.5, -8.5], [4.5, -8.5], [3.5, -8.5], [2.5, -8.5], [1.5, -8.5], [0.5, -8.5], [-0.5, -8.5], [-1.5, -8.5], [-2.5, -8.5], [-3.5, -8.5], [-4.5, -8.5], [-5.5, -8.5], [-6.5, -8.5], [6.5, 6.5], [5.5, 6.5], [4.5, 6.5], [3.5, 6.5], [2.5, 6.5], [1.5, 6.5], [0.5, 6.5], [-0.5, 6.5], [-1.5, 6.5], [-2.5, 6.5], [-3.5, 6.5], [-4.5, 6.5], [-5.5, 6.5], [-6.5, 6.5], [-7.5, 6.5], [6.5, 6.5], [5.5, 6.5], [4.5, 6.5], [3.5, 6.5], [2.5, 6.5], [1.5, 6.5], [0.5, 6.5], [-0.5, 6.5], [-1.5, 6.5], [-2.5, 6.5], [-3.5, 6.5], [-4.5, 6.5], [-5.5, 6.5], [-6.5, 6.5], [-7.5, 6.5], [6.5, -7.5], [5.5, -7.5], [4.5, -7.5], [3.5, -7.5], [2.5, -7.5], [1.5, -7.5], [0.5, -7.5], [-0.5, -7.5], [-1.5, -7.5], [-2.5, -7.5], [-3.5, -7.5], [-4.5, -7.5], [-5.5, -7.5], [-6.5, -7.5], [-7.5, -7.5], [6.5, -7.5], [5.5, -7.5], [4.5, -7.5], [3.5, -7.5], [2.5, -7.5], [1.5, -7.5], [0.5, -7.5], [-0.5, -7.5], [-1.5, -7.5], [-2.5, -7.5], [-3.5, -7.5], [-4.5, -7.5], [-5.5, -7.5], [-6.5, -7.5], [-7.5, -7.5]];
     actual = px_circle([-0.5, -0.5], 10, true);
 
diff --git a/test/test_px_line.scad b/test/pixel/test_px_line.scad
similarity index 96%
rename from test/test_px_line.scad
rename to test/pixel/test_px_line.scad
index 2e89c5c9..6dbfd515 100644
--- a/test/test_px_line.scad
+++ b/test/pixel/test_px_line.scad
@@ -3,7 +3,7 @@ module test_px_line() {
     echo("==== test_px_line ====");
 
     include <unittest.scad>;
-    include <px_line.scad>;
+    include <pixel/px_line.scad>;
     expected =  [[-10, 0, -10], [-9, 1, -10], [-9, 2, -9], [-8, 3, -9], [-8, 4, -8], [-7, 5, -8], [-6, 6, -8], [-6, 7, -7], [-5, 8, -7], [-5, 9, -6], [-4, 10, -6], [-3, 11, -6], [-3, 12, -5], [-2, 13, -5], [-2, 14, -4], [-1, 15, -4], [0, 16, -4], [0, 17, -3], [1, 18, -3], [1, 19, -2], [2, 20, -2], [3, 21, -2], [3, 22, -1], [4, 23, -1], [4, 24, 0], [5, 25, 0], [6, 26, 0], [6, 27, 1], [7, 28, 1], [7, 29, 2], [8, 30, 2], [9, 31, 2], [9, 32, 3], [10, 33, 3], [10, 34, 4], [11, 35, 4], [12, 36, 4], [12, 37, 5], [13, 38, 5], [13, 39, 6], [14, 40, 6], [15, 41, 6], [15, 42, 7], [16, 43, 7], [16, 44, 8], [17, 45, 8], [18, 46, 8], [18, 47, 9], [19, 48, 9], [19, 49, 10]];
     actual = px_line([-10, 0, -10], [20, 50, 10]);
 
diff --git a/test/test_px_polyline.scad b/test/pixel/test_px_polyline.scad
similarity index 96%
rename from test/test_px_polyline.scad
rename to test/pixel/test_px_polyline.scad
index 6eb850f7..66584b36 100644
--- a/test/test_px_polyline.scad
+++ b/test/pixel/test_px_polyline.scad
@@ -3,8 +3,8 @@ module test_px_polyline() {
     echo("==== test_px_polyline ====");
 
     include <unittest.scad>;
-    include <px_line.scad>;
-    include <px_polyline.scad>;
+    include <pixel/px_line.scad>;
+    include <pixel/px_polyline.scad>;
     expected = [[5, 10, 5], [4, 9, 5], [3, 8, 5], [2, 7, 6], [1, 6, 6], [0, 5, 6], [-1, 4, 6], [-2, 3, 6], [-3, 2, 6], [-4, 1, 7], [-5, 0, 7], [-6, -1, 7], [-7, -2, 7], [-8, -3, 7], [-9, -4, 7], [-10, -5, 8], [-11, -6, 8], [-12, -7, 8], [-13, -8, 8], [-14, -9, 8], [-15, -10, 8], [-16, -11, 9], [-17, -12, 9], [-18, -13, 9], [-19, -14, 9], [-20, -15, 9], [-21, -16, 9], [-22, -17, 10], [-23, -18, 10], [-24, -19, 10], [-25, -20, 10], [-25, -19, 10], [-25, -18, 10], [-25, -17, 10], [-25, -16, 11], [-25, -15, 11], [-25, -14, 11], [-25, -13, 11], [-25, -12, 11], [-25, -11, 11], [-25, -10, 11], [-25, -9, 12], [-25, -8, 12], [-25, -7, 12], [-25, -6, 12], [-25, -5, 12], [-25, -4, 12], [-25, -3, 12], [-25, -2, 13], [-25, -1, 13], [-25, 0, 13], [-25, 1, 13], [-25, 2, 13], [-25, 3, 13], [-25, 4, 13], [-25, 5, 14], [-25, 6, 14], [-25, 7, 14], [-25, 8, 14], [-25, 9, 14], [-25, 10, 14], [-25, 11, 14], [-25, 12, 15], [-25, 13, 15], [-25, 14, 15], [-25, 15, 15], [-24, 15, 15], [-23, 15, 15], [-22, 16, 15], [-21, 16, 15], [-20, 16, 16], [-19, 16, 16], [-18, 16, 16], [-17, 17, 16], [-16, 17, 16], [-15, 17, 16], [-14, 17, 16], [-13, 17, 16], [-12, 18, 16], [-11, 18, 16], [-10, 18, 17], [-9, 18, 17], [-8, 18, 17], [-7, 19, 17], [-6, 19, 17], [-5, 19, 17], [-4, 19, 17], [-3, 19, 17], [-2, 20, 17], [-1, 20, 17], [0, 20, 18], [1, 20, 18], [2, 20, 18], [3, 21, 18], [4, 21, 18], [5, 21, 18], [6, 21, 18], [7, 21, 18], [8, 22, 18], [9, 22, 18], [10, 22, 19], [11, 22, 19], [12, 22, 19], [13, 23, 19], [14, 23, 19], [15, 23, 19], [16, 23, 19], [17, 23, 19], [18, 24, 19], [19, 24, 19], [20, 24, 20], [21, 24, 20], [22, 24, 20], [23, 25, 20], [24, 25, 20]];
     actual = px_polyline([[5, 10, 5], [-25, -20, 10], [-25, 15, 15], [25, 25, 20]]);
 
diff --git a/test/test_all.scad b/test/test_all.scad
index d184d299..947b9faf 100644
--- a/test/test_all.scad
+++ b/test/test_all.scad
@@ -67,6 +67,6 @@ include <test_sphere_spiral_extrude.scad>;
 include <test_path_extrude.scad>;
 
 // Pixel
-include <test_px_line.scad>;
-include <test_px_polyline.scad>;
-include <test_px_circle.scad>;
\ No newline at end of file
+include <pixel/test_px_line.scad>;
+include <pixel/test_px_polyline.scad>;
+include <pixel/test_px_circle.scad>;
\ No newline at end of file