removed trigonometric functions from solid2 namespace (#44)

Author: jeff-dh

solid2/core/__init__.py

@@ -7,8 +7,7 @@
 
 from .scad_import import import_scad, use, include
 
-from .object_base import scad_inline, scad_inline_parameter_func, sin, cos,\
-                         tan, asin, acos, atan, sqrt, not_
+from .object_base import scad_inline, scad_inline_parameter_func
 
 from .extension_manager import register_access_syntax, register_pre_render,\
                                register_post_render, register_root_wrapper

solid2/core/builtins/openscad_functions.py

@@ -34,4 +34,5 @@ def concat(*args):  return _base_fn('concat', *args)
 def cross(*args):   return _base_fn('cross', *args)
 def lookup(*args):  return _base_fn('lookup', *args)
 def rands(*args):   return _base_fn('rands', *args)
+def not_(*args):    return _base_fn('!', *args)
 

solid2/core/object_base/object_base_impl.py

@@ -169,16 +169,6 @@ def _render(self):
         from textwrap import dedent
         return dedent(self.value)
 
-import math
-sin = lambda x: OpenSCADConstant(f'sin({x})') if isinstance(x, OpenSCADConstant) else math.sin(x)
-cos = lambda x: OpenSCADConstant(f'cos({x})') if isinstance(x, OpenSCADConstant) else math.cos(x)
-tan = lambda x: OpenSCADConstant(f'tan({x})') if isinstance(x, OpenSCADConstant) else math.tan(x)
-asin = lambda x: OpenSCADConstant(f'asin({x})') if isinstance(x, OpenSCADConstant) else math.asin(x)
-acos = lambda x: OpenSCADConstant(f'acos({x})') if isinstance(x, OpenSCADConstant) else math.acos(x)
-atan = lambda x: OpenSCADConstant(f'atan({x})') if isinstance(x, OpenSCADConstant) else math.atan(x)
-sqrt = lambda x: OpenSCADConstant(f'sqrt({x})') if isinstance(x, OpenSCADConstant) else math.sqrt(x)
-not_ = lambda x: OpenSCADConstant(f'!{x}')
-
 def scad_inline(code):
     return OpenSCADConstant(code)
 

solid2/examples/17-greedy-scad-interface.py

@@ -3,7 +3,7 @@
 from solid2 import *
 
 set_global_fn(32)
-set_global_viewport_distance(abs(sin(get_animation_time() * 360)) * 10 + 5)
+set_global_viewport_distance(abs(openscad_functions.sin(get_animation_time() * 360)) * 10 + 5)
 set_global_viewport_translation([0, -1, 0])
 set_global_viewport_rotation([63, 0, get_animation_time() * 360])
 set_global_viewport_fov(25)
@@ -24,7 +24,7 @@ def funny_cube():
                                                            tab = "Animation")
 
     return color(customized_color) (
-                cube(abs(sin(get_animation_time() * 360 * customized_animation_factor)), center=True)
+                cube(abs(openscad_functions.sin(get_animation_time() * 360 * customized_animation_factor)), center=True)
            )
 
 def funny_sphere():
@@ -33,7 +33,7 @@ def funny_sphere():
 
     return translate([0, -2, 0]) (
                 color(customized_color) (
-                    sphere(r = abs(sin(get_animation_time() * 360 * customized_animation_factor - 90)))
+                    sphere(r = abs(openscad_functions.sin(get_animation_time() * 360 * customized_animation_factor - 90)))
                 )
            )