use the scad interface to register fonts

Author: jeff-dh

solid/core/scad_import.py

@@ -9,7 +9,6 @@
 # = IMPORTING OPENSCAD CODE =
 # ===========================
 module_cache_by_resolved_filename = {}
-registered_fonts = []
 
 def check_module_cache(resolved_scad, use_not_include):
     global module_cache_by_resolved_filename
@@ -98,14 +97,6 @@ def get_callers_namespace_dict(depth=2):
         return frame.f_globals
 
 def use(filename):
-    #is this a font to register?
-    p_file = Path(filename)
-    if p_file.suffix == ".ttf" or p_file.suffix == ".otf":
-        global registered_fonts
-        registered_fonts += [p_file]
-        return
-
-    #otherwise load the scad file
     load_scad_file_or_dir_into_dict(filename, get_callers_namespace_dict(), True)
 
 def include(filename):

solid/core/scad_render.py

@@ -2,7 +2,7 @@
 
 from .utils import indent
 from .object_base import ObjectBase, OpenSCADObject
-from .scad_import import module_cache_by_resolved_filename, registered_fonts
+from .scad_import import module_cache_by_resolved_filename
 from ..config import config
 
 # =========================================
@@ -81,9 +81,6 @@ def get_include_string():
         else:
             strings.append(f"include <{k}>")
 
-    for f in registered_fonts:
-        strings.append(f"use <{f}>")
-
     s = "\n".join(strings)
     s += "\n\n" if s else ''
 

solid/examples/11-fonts.py

@@ -9,7 +9,9 @@
 
 from solid import *
 
-use("11-font/RichEatin.otf")
+scad = ScadInterface()
+scad.register_font("11-font/RichEatin.otf")
 
-text(font="Rich Eatin'", text="blablub").save_as_scad()
+t = text(font="Rich Eatin'", text="blablub")
+scad_render_to_file(t, scad_interface=scad)
 

solid/extensions/scad_interface.py

@@ -13,6 +13,9 @@ def set_global_var(self, name, value):
     def get_header_str(self):
         return self.header
 
+    def register_font(self, filename):
+        self.header += f'use <{filename}>\n'
+
     @staticmethod
     def get(name):
         return self.inline(name)