Move scad files not meant for end users to "src" directory

kennetek · Oct 17, 2024 · 2216f76 · 2216f76
1 parent cf377bd
commit 2216f76
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 14 deletions.
diff --git a/gridfinity-rebuilt-baseplate.scad b/gridfinity-rebuilt-baseplate.scad
@@ -1,7 +1,3 @@
-include <gridfinity-rebuilt-utility.scad>
-include <standard.scad>
-use <gridfinity-rebuilt-holes.scad>
-
 // ===== INFORMATION ===== //
 /*
  IMPORTANT: rendering will be better for analyzing the model if fast-csg is enabled. As of writing, this feature is only available in the development builds and not the official release of OpenSCAD, but it makes rendering only take a couple seconds, even for comically large bins. Enable it in Edit > Preferences > Features > fast-csg
@@ -10,6 +6,11 @@ https://github.com/kennetek/gridfinity-rebuilt-openscad
 
 */
 
+include <src/core/standard.scad>
+use <src/core/gridfinity-rebuilt-utility.scad>
+use <src/core/gridfinity-rebuilt-holes.scad>
+use <src/helpers/generic-helpers.scad>
+
 // ===== PARAMETERS ===== //
 
 /* [Setup Parameters] */

diff --git a/gridfinity-rebuilt-bins.scad b/gridfinity-rebuilt-bins.scad
@@ -1,5 +1,3 @@
-include <gridfinity-rebuilt-utility.scad>
-
 // ===== INFORMATION ===== //
 /*
  IMPORTANT: rendering will be better for analyzing the model if fast-csg is enabled. As of writing, this feature is only available in the development builds and not the official release of OpenSCAD, but it makes rendering only take a couple seconds, even for comically large bins. Enable it in Edit > Preferences > Features > fast-csg
@@ -26,6 +24,9 @@ https://github.com/kennetek/gridfinity-rebuilt-openscad
 
 */
 
+use <src/core/gridfinity-rebuilt-utility.scad>
+use <src/core/gridfinity-rebuilt-holes.scad>
+
 // ===== PARAMETERS ===== //
 
 /* [Setup Parameters] */

diff --git a/gridfinity-rebuilt-lite.scad b/gridfinity-rebuilt-lite.scad
@@ -1,5 +1,3 @@
-include <gridfinity-rebuilt-utility.scad>
-
 // ===== INFORMATION ===== //
 /*
  IMPORTANT: rendering will be better for analyzing the model if fast-csg is enabled. As of writing, this feature is only available in the development builds and not the official release of OpenSCAD, but it makes rendering only take a couple seconds, even for comically large bins. Enable it in Edit > Preferences > Features > fast-csg
@@ -8,6 +6,11 @@ https://github.com/kennetek/gridfinity-rebuilt-openscad
 
 */
 
+include <src/core/standard.scad>
+use <src/core/gridfinity-rebuilt-utility.scad>
+use <src/core/gridfinity-rebuilt-holes.scad>
+use <src/helpers/generic-helpers.scad>
+
 // ===== PARAMETERS ===== //
 
 /* [Setup Parameters] */

diff --git a/gridfinity-spiral-vase.scad b/gridfinity-spiral-vase.scad
@@ -1,5 +1,3 @@
-include <gridfinity-rebuilt-utility.scad>
-
 // ===== INFORMATION ===== //
 /*
  IMPORTANT: rendering will be better for analyzing the model if fast-csg is enabled. As of writing, this feature is only available in the development builds and not the official release of OpenSCAD, but it makes rendering only take a couple seconds, even for comically large bins. Enable it in Edit > Preferences > Features > fast-csg
@@ -8,6 +6,10 @@ https://github.com/kennetek/gridfinity-rebuilt-openscad
 
 */
 
+include <src/core/standard.scad>
+use <src/core/gridfinity-rebuilt-utility.scad>
+use <src/helpers/generic-helpers.scad>
+
 // ===== PARAMETERS ===== //
 
 /* [Special Variables] */

diff --git a/gridfinity-rebuilt-holes.scad → src/core/gridfinity-rebuilt-holes.scad b/gridfinity-rebuilt-holes.scad → src/core/gridfinity-rebuilt-holes.scad
@@ -4,7 +4,7 @@
  */
 
 include <standard.scad>
-use <generic-helpers.scad>
+use <../helpers/generic-helpers.scad>
 
 /**
  * @brief Determines the number of fragments in a circle. Aka, Circle resolution.

diff --git a/gridfinity-rebuilt-utility.scad → src/core/gridfinity-rebuilt-utility.scad b/gridfinity-rebuilt-utility.scad → src/core/gridfinity-rebuilt-utility.scad
@@ -5,9 +5,9 @@
  */
 
 include <standard.scad>
-use <generic-helpers.scad>
 use <gridfinity-rebuilt-holes.scad>
-use <external/threads-scad/threads.scad>
+use <../helpers/generic-helpers.scad>
+use <../external/threads-scad/threads.scad>
 
 // ===== User Modules ===== //
 

diff --git a/standard.scad → src/core/standard.scad b/standard.scad → src/core/standard.scad
diff --git a/external/threads-scad/threads.scad → src/external/threads-scad/threads.scad b/external/threads-scad/threads.scad → src/external/threads-scad/threads.scad
diff --git a/generic-helpers.scad → src/helpers/generic-helpers.scad b/generic-helpers.scad → src/helpers/generic-helpers.scad
diff --git a/tests/test_holes.py b/tests/test_holes.py
@@ -10,7 +10,7 @@
 
 @pytest.fixture
 def openscad_runner(pytestconfig) -> OpenScadRunner:
-    scad_path = pytestconfig.rootpath.joinpath('gridfinity-rebuilt-holes.scad')
+    scad_path = pytestconfig.rootpath.joinpath('src/core/gridfinity-rebuilt-holes.scad')
     scad_runner = OpenScadRunner(scad_path)
     scad_runner.image_folder_base = pytestconfig.rootpath.joinpath('images/hole_cutouts/')
     scad_runner.camera_arguments = CameraArguments(Vec3(0,0,0), CameraRotations.AngledTop, 50)