replaced Customizer with ScadInterface

Author: jeff-dh

solid/__init__.py

@@ -5,5 +5,5 @@
 from .extensions.operators import __nothing__
 from .extensions.convenience import *
 from .extensions.access_syntax import __nothing__
-from .extensions.customizer import Customizer
+from .extensions.scad_interface import ScadInterface, scad_inline
 

solid/core/__init__.py

@@ -6,4 +6,3 @@
 
 from .scad_import import import_scad, use, include
 
-from .object_base import scad_inline

solid/core/object_base.py

@@ -105,9 +105,6 @@ def __repr__(self):
     def _render(self):
         return self.name
 
-def scad_inline(code):
-    return OpenSCADConstant(code)
-
 def py2openscad(o):
     if type(o) == bool:
         return str(o).lower()

solid/core/scad_render.py

@@ -8,7 +8,7 @@
 # =========================================
 # = Rendering Python code to OpenSCAD code=
 # =========================================
-def scad_render(root, file_header = '', _fn=None):
+def scad_render(root, file_header = '', _fn=None, scad_interface=None):
     #get a list of all used and included files
     includes = get_include_string()
 
@@ -29,17 +29,21 @@ def scad_render(root, file_header = '', _fn=None):
     if _fn:
         file_header += f'$fn = {_fn};\n\n'
 
+    if scad_interface != None:
+        file_header += scad_interface.get_header_str()
+
     return file_header + includes + extensions_header_str + scad_body \
                        + extensions_footer_str
 
 def scad_render_to_file(scad_object, filename=None, out_dir='',
-                        file_header='', include_orig_code=True, _fn=None):
+                        file_header='', include_orig_code=True, _fn=None,
+                        scad_interface = None):
 
     if out_dir == None:
         out_dir = ''
     header = f"// Generated by ExpSolidPython\n" + file_header + "\n"
 
-    rendered_string = scad_render(scad_object, header, _fn)
+    rendered_string = scad_render(scad_object, header, _fn, scad_interface)
 
     return _write_to_file(rendered_string, filename, out_dir)
 

solid/examples/10-customizer.py

@@ -9,14 +9,14 @@
 
 from solid import *
 
-customizer = Customizer()
+scad = ScadInterface()
 
 #register all the custom variables you want to use
-customizer.register("objects", "4", "[2, 4, 6]")
-customizer.register("side", "4")
-customizer.register("cube_pos", "[5, 5, 5]")
-customizer.register("cube_size", "5")
-customizer.register("text", '"customize me!"' ,' ["customize me!", "Thank you!"]')
+scad.register_customizer_var("objects", "4", "[2, 4, 6]")
+scad.register_customizer_var("side", "4")
+scad.register_customizer_var("cube_pos", "[5, 5, 5]")
+scad.register_customizer_var("cube_size", "5")
+scad.register_customizer_var("text", '"customize me!"' ,' ["customize me!", "Thank you!"]')
 
 #use scad_inline to use them
 scene = scad_inline("""
@@ -29,13 +29,13 @@
 
 #use the customizer.get function to use them as parameters
 py_factor = 2
-cube_size = customizer.get(f"cube_size - cube_pos[0] * {py_factor}")
+cube_size = scad.inline(f"cube_size - cube_pos[0] * {py_factor}")
 
-scene += translate(customizer.get("cube_pos")) (
+scene += translate(scad.inline("cube_pos")) (
             cube(cube_size))
 
 scene += translate([0, -20, 0]) (
-            text(customizer.get("text")))
+            text(scad.inline("text")))
 
-scad_render_to_file(scene, file_header = customizer.header)
+scad_render_to_file(scene, scad_interface=scad)
 

solid/examples/12-animation.py

@@ -9,13 +9,15 @@
 
 from solid import *
 
-view_port_magic = ("""
-                       $vpt = [4, 3, 15];
-                       $vpr = [60, 0, 360 * $t];
-                       $vpd = 100;
-                   """)
+scad = ScadInterface()
 
-c = cube(scad_inline("$t*10"))
+scad.register_customizer_var("rotation_speed", 1.0)
 
-scad_render_to_file(c, file_header=view_port_magic)
+scad.set_global_var("$vpt", [4, 3, 15])
+scad.set_global_var("$vpr", "[60, 0, 360 * $t * rotation_speed]")
+scad.set_global_var("$vpd", 100)
+
+c = cube(scad.inline("$t * 10"))
+
+scad_render_to_file(c, scad_interface=scad)
 

solid/examples/13-animated-bouncing-ball.py

@@ -29,18 +29,23 @@ def get_bouncing_ball_data(pos=np.array([0.0, 0.0, 0.0]), vel=np.array([5.0, 5.0
 
     return data
 
+scad = ScadInterface()
+scad.set_global_var("$vpt", [700, 900, 200])
+scad.set_global_var("$vpr", [80, 0, 20])
+scad.set_global_var("$vpd", 6000)
+
 #store pre computed data in global OpenSCAD variable
-ball_data = f'bouncing_ball_data = {get_bouncing_ball_data()};'
+scad.set_global_var("bouncing_ball_data", get_bouncing_ball_data())
 
 #get "dynamic ball position over time" from the data set
-ball_pos_over_time = scad_inline("bouncing_ball_data[$t * 1000]")
+ball_pos_over_time = scad.inline("bouncing_ball_data[$t * 1000]")
 
 #do some regular solid stuff with it
 ball = translate(ball_pos_over_time)(sphere(ball_radius))
 floor = background(cube([2000, 2000, 0.01]))
 
 #render it with the pre computed data stored in the header
-scad_render_to_file(ball + floor, file_header=ball_data)
+scad_render_to_file(ball + floor, scad_interface=scad)
 
 # I think if you really want to do something like this you could put the data
 # into a seprate .scad file and include it into the main .scad file. You should

solid/extensions/customizer.py

@@ -0,0 +1,26 @@
+from ..core.object_base import OpenSCADConstant
+
+class ScadInterface:
+    def __init__(self):
+        self.header = ''
+
+    def register_customizer_var(self, name, value, options=''):
+        self.header += f'{name} = {value}; //{options}\n'
+
+    def set_global_var(self, name, value):
+        self.header += f'{name} = {value};\n'
+
+    def get_header_str(self):
+        return self.header
+
+    @staticmethod
+    def get(name):
+        return self.inline(name)
+
+    @staticmethod
+    def inline(code):
+        return scad_inline(code)
+
+def scad_inline(code):
+    return OpenSCADConstant(code)
+