From aa5fc938d08707c778289ab3b0513698f0f54c77 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Thu, 27 Jun 2019 07:32:05 +0800 Subject: [PATCH] change order --- src/pixel/px_sphere.scad | 4 ++-- test/pixel/test_px_sphere.scad | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pixel/px_sphere.scad b/src/pixel/px_sphere.scad index de12597b..c95709c5 100644 --- a/src/pixel/px_sphere.scad +++ b/src/pixel/px_sphere.scad @@ -8,9 +8,9 @@ function px_sphere(radius, filled = true) = ] : let(ishell = radius * radius - 2 * radius) [ - for(x = -radius; x < radius; x = x + 1) + for(z = -radius; z < radius; z = z + 1) for(y = -radius; y < radius; y = y + 1) - for(z = -radius; z < radius; z = z + 1) + for(x = -radius; x < radius; x = x + 1) let( v = [x, y, z], leng = norm(v) diff --git a/test/pixel/test_px_sphere.scad b/test/pixel/test_px_sphere.scad index 47907bd9..d0c4708f 100644 --- a/test/pixel/test_px_sphere.scad +++ b/test/pixel/test_px_sphere.scad @@ -4,7 +4,9 @@ module test_px_sphere() { include ; include ; - expected = [[-4, -2, -2], [-4, -2, -1], [-4, -2, 0], [-4, -2, 1], [-4, -2, 2], [-4, -1, -2], [-4, -1, -1], [-4, -1, 0], [-4, -1, 1], [-4, -1, 2], [-4, 0, -2], [-4, 0, -1], [-4, 0, 0], [-4, 0, 1], [-4, 0, 2], [-4, 1, -2], [-4, 1, -1], [-4, 1, 0], [-4, 1, 1], [-4, 1, 2], [-4, 2, -2], [-4, 2, -1], [-4, 2, 0], [-4, 2, 1], [-4, 2, 2], [-3, -3, -2], [-3, -3, -1], [-3, -3, 0], [-3, -3, 1], [-3, -3, 2], [-3, -2, -3], [-3, -2, -2], [-3, -2, 2], [-3, -2, 3], [-3, -1, -3], [-3, -1, 3], [-3, 0, -3], [-3, 0, 3], [-3, 1, -3], [-3, 1, 3], [-3, 2, -3], [-3, 2, -2], [-3, 2, 2], [-3, 2, 3], [-3, 3, -2], [-3, 3, -1], [-3, 3, 0], [-3, 3, 1], [-3, 3, 2], [-2, -4, -2], [-2, -4, -1], [-2, -4, 0], [-2, -4, 1], [-2, -4, 2], [-2, -3, -3], [-2, -3, -2], [-2, -3, 2], [-2, -3, 3], [-2, -2, -4], [-2, -2, -3], [-2, -2, 3], [-2, -2, 4], [-2, -1, -4], [-2, -1, 4], [-2, 0, -4], [-2, 0, 4], [-2, 1, -4], [-2, 1, 4], [-2, 2, -4], [-2, 2, -3], [-2, 2, 3], [-2, 2, 4], [-2, 3, -3], [-2, 3, -2], [-2, 3, 2], [-2, 3, 3], [-2, 4, -2], [-2, 4, -1], [-2, 4, 0], [-2, 4, 1], [-2, 4, 2], [-1, -4, -2], [-1, -4, -1], [-1, -4, 0], [-1, -4, 1], [-1, -4, 2], [-1, -3, -3], [-1, -3, 3], [-1, -2, -4], [-1, -2, 4], [-1, -1, -4], [-1, -1, 4], [-1, 0, -4], [-1, 0, 4], [-1, 1, -4], [-1, 1, 4], [-1, 2, -4], [-1, 2, 4], [-1, 3, -3], [-1, 3, 3], [-1, 4, -2], [-1, 4, -1], [-1, 4, 0], [-1, 4, 1], [-1, 4, 2], [0, -4, -2], [0, -4, -1], [0, -4, 0], [0, -4, 1], [0, -4, 2], [0, -3, -3], [0, -3, 3], [0, -2, -4], [0, -2, 4], [0, -1, -4], [0, -1, 4], [0, 0, -4], [0, 0, 4], [0, 1, -4], [0, 1, 4], [0, 2, -4], [0, 2, 4], [0, 3, -3], [0, 3, 3], [0, 4, -2], [0, 4, -1], [0, 4, 0], [0, 4, 1], [0, 4, 2], [1, -4, -2], [1, -4, -1], [1, -4, 0], [1, -4, 1], [1, -4, 2], [1, -3, -3], [1, -3, 3], [1, -2, -4], [1, -2, 4], [1, -1, -4], [1, -1, 4], [1, 0, -4], [1, 0, 4], [1, 1, -4], [1, 1, 4], [1, 2, -4], [1, 2, 4], [1, 3, -3], [1, 3, 3], [1, 4, -2], [1, 4, -1], [1, 4, 0], [1, 4, 1], [1, 4, 2], [2, -4, -2], [2, -4, -1], [2, -4, 0], [2, -4, 1], [2, -4, 2], [2, -3, -3], [2, -3, -2], [2, -3, 2], [2, -3, 3], [2, -2, -4], [2, -2, -3], [2, -2, 3], [2, -2, 4], [2, -1, -4], [2, -1, 4], [2, 0, -4], [2, 0, 4], [2, 1, -4], [2, 1, 4], [2, 2, -4], [2, 2, -3], [2, 2, 3], [2, 2, 4], [2, 3, -3], [2, 3, -2], [2, 3, 2], [2, 3, 3], [2, 4, -2], [2, 4, -1], [2, 4, 0], [2, 4, 1], [2, 4, 2], [3, -3, -2], [3, -3, -1], [3, -3, 0], [3, -3, 1], [3, -3, 2], [3, -2, -3], [3, -2, -2], [3, -2, 2], [3, -2, 3], [3, -1, -3], [3, -1, 3], [3, 0, -3], [3, 0, 3], [3, 1, -3], [3, 1, 3], [3, 2, -3], [3, 2, -2], [3, 2, 2], [3, 2, 3], [3, 3, -2], [3, 3, -1], [3, 3, 0], [3, 3, 1], [3, 3, 2], [4, -2, -2], [4, -2, -1], [4, -2, 0], [4, -2, 1], [4, -2, 2], [4, -1, -2], [4, -1, -1], [4, -1, 0], [4, -1, 1], [4, -1, 2], [4, 0, -2], [4, 0, -1], [4, 0, 0], [4, 0, 1], [4, 0, 2], [4, 1, -2], [4, 1, -1], [4, 1, 0], [4, 1, 1], [4, 1, 2], [4, 2, -2], [4, 2, -1], [4, 2, 0], [4, 2, 1], [4, 2, 2]]; actual = px_sphere(5, false); + expected = [[-2, -2, -4], [-1, -2, -4], [0, -2, -4], [1, -2, -4], [2, -2, -4], [-2, -1, -4], [-1, -1, -4], [0, -1, -4], [1, -1, -4], [2, -1, -4], [-2, 0, -4], [-1, 0, -4], [0, 0, -4], [1, 0, -4], [2, 0, -4], [-2, 1, -4], [-1, 1, -4], [0, 1, -4], [1, 1, -4], [2, 1, -4], [-2, 2, -4], [-1, 2, -4], [0, 2, -4], [1, 2, -4], [2, 2, -4], [-2, -3, -3], [-1, -3, -3], [0, -3, -3], [1, -3, -3], [2, -3, -3], [-3, -2, -3], [-2, -2, -3], [2, -2, -3], [3, -2, -3], [-3, -1, -3], [3, -1, -3], [-3, 0, -3], [3, 0, -3], [-3, 1, -3], [3, 1, -3], [-3, 2, -3], [-2, 2, -3], [2, 2, -3], [3, 2, -3], [-2, 3, -3], [-1, 3, -3], [0, 3, -3], [1, 3, -3], [2, 3, -3], [-2, -4, -2], [-1, -4, -2], [0, -4, -2], [1, -4, -2], [2, -4, -2], [-3, -3, -2], [-2, -3, -2], [2, -3, -2], [3, -3, -2], [-4, -2, -2], [-3, -2, -2], [3, -2, -2], [4, -2, -2], [-4, -1, -2], [4, -1, -2], [-4, 0, -2], [4, 0, -2], [-4, 1, -2], [4, 1, -2], [-4, 2, -2], [-3, 2, -2], [3, 2, -2], [4, 2, -2], [-3, 3, -2], [-2, 3, -2], [2, 3, -2], [3, 3, -2], [-2, 4, -2], [-1, 4, -2], [0, 4, -2], [1, 4, -2], [2, 4, -2], [-2, -4, -1], [-1, -4, -1], [0, -4, -1], [1, -4, -1], [2, -4, -1], [-3, -3, -1], [3, -3, -1], [-4, -2, -1], [4, -2, -1], [-4, -1, -1], [4, -1, -1], [-4, 0, -1], [4, 0, -1], [-4, 1, -1], [4, 1, -1], [-4, 2, -1], [4, 2, -1], [-3, 3, -1], [3, 3, -1], [-2, 4, -1], [-1, 4, -1], [0, 4, -1], [1, 4, -1], [2, 4, -1], [-2, -4, 0], [-1, -4, 0], [0, -4, 0], [1, -4, 0], [2, -4, 0], [-3, -3, 0], [3, -3, 0], [-4, -2, 0], [4, -2, 0], [-4, -1, 0], [4, -1, 0], [-4, 0, 0], [4, 0, 0], [-4, 1, 0], [4, 1, 0], [-4, 2, 0], [4, 2, 0], [-3, 3, 0], [3, 3, 0], [-2, 4, 0], [-1, 4, 0], [0, 4, 0], [1, 4, 0], [2, 4, 0], [-2, -4, 1], [-1, -4, 1], [0, -4, 1], [1, -4, 1], [2, -4, 1], [-3, -3, 1], [3, -3, 1], [-4, -2, 1], [4, -2, 1], [-4, -1, 1], [4, -1, 1], [-4, 0, 1], [4, 0, 1], [-4, 1, 1], [4, 1, 1], [-4, 2, 1], [4, 2, 1], [-3, 3, 1], [3, 3, 1], [-2, 4, 1], [-1, 4, 1], [0, 4, 1], [1, 4, 1], [2, 4, 1], [-2, -4, 2], [-1, -4, 2], [0, -4, 2], [1, -4, 2], [2, -4, 2], [-3, -3, 2], [-2, -3, 2], [2, -3, 2], [3, -3, 2], [-4, -2, 2], [-3, -2, 2], [3, -2, 2], [4, -2, 2], [-4, -1, 2], [4, -1, 2], [-4, 0, 2], [4, 0, 2], [-4, 1, 2], [4, 1, 2], [-4, 2, 2], [-3, 2, 2], [3, 2, 2], [4, 2, 2], [-3, 3, 2], [-2, 3, 2], [2, 3, 2], [3, 3, 2], [-2, 4, 2], [-1, 4, 2], [0, 4, 2], [1, 4, 2], [2, 4, 2], [-2, -3, 3], [-1, -3, 3], [0, -3, 3], [1, -3, 3], [2, -3, 3], [-3, -2, 3], [-2, -2, 3], [2, -2, 3], [3, -2, 3], [-3, -1, 3], [3, -1, 3], [-3, 0, 3], [3, 0, 3], [-3, 1, 3], [3, 1, 3], [-3, 2, 3], [-2, 2, 3], [2, 2, 3], [3, 2, 3], [-2, 3, 3], [-1, 3, 3], [0, 3, 3], [1, 3, 3], [2, 3, 3], [-2, -2, 4], [-1, -2, 4], [0, -2, 4], [1, -2, 4], [2, -2, 4], [-2, -1, 4], [-1, -1, 4], [0, -1, 4], [1, -1, 4], [2, -1, 4], [-2, 0, 4], [-1, 0, 4], [0, 0, 4], [1, 0, 4], [2, 0, 4], [-2, 1, 4], [-1, 1, 4], [0, 1, 4], [1, 1, 4], [2, 1, 4], [-2, 2, 4], [-1, 2, 4], [0, 2, 4], [1, 2, 4], [2, 2, 4]]; + actual = px_sphere(5, false); + assertEqualPoints(expected, actual); }