Merge pull request #70 from jonathanhogg/enh_model_hash_ids

Identify 3D models using an integer ID instead of a name (+ other fixes, performance improvements and testing)

examples/sdf.fl

@@ -1,4 +1,8 @@
 
+-- This is the same as the internal SDF function for !cone, but slower
+func cone(p)
+    max(hypot(p[..2])+p[2], abs(p[2]))-0.5
+
 !window size=1080
     !record filename=(OUTPUT if frame == run_time * fps - 1)
         !canvas3d samples=4
@@ -13,7 +17,7 @@
                                     !cone
                             for i in ..2
                                 !transform rotate_x=0.25+i/2 translate=0;0;0.7 scale=0.3;0.3;0.6
-                                    !cone
+                                    !sdf function=cone
                         !trim normal=0;1;0 origin=0;0.25;0 smooth=0.1
                             !difference chamfer=0.05
                                 !intersect fillet=0.1

src/flitter/language/vm.pxd

@@ -1,7 +1,7 @@
 
 from cpython cimport PyObject
 
-from libc.stdint cimport int64_t
+from libc.stdint cimport int64_t, uint64_t
 
 from ..model cimport Vector, Node, Context
 
@@ -31,6 +31,22 @@ cdef class VectorStack:
     cpdef void poke_at(self, int64_t offset, Vector vector)
 
 
+cdef class Function:
+    cdef readonly str __name__
+    cdef readonly Vector vself
+    cdef readonly tuple parameters
+    cdef readonly tuple defaults
+    cdef readonly Program program
+    cdef readonly int64_t address
+    cdef readonly bint record_stats
+    cdef readonly tuple captures
+    cdef readonly int64_t call_depth
+    cdef readonly uint64_t _hash
+
+    cdef uint64_t hash(self)
+    cdef Vector call_one_fast(self, Context context, Vector arg)
+
+
 cdef enum OpCode:
     Add
     Append

src/flitter/language/vm.pyx

@@ -479,21 +479,19 @@ cdef inline void poke_at(VectorStack stack, int64_t offset, Vector vector):
 
 
 cdef class Function:
-    cdef readonly str __name__
-    cdef readonly Vector vself
-    cdef readonly tuple parameters
-    cdef readonly tuple defaults
-    cdef readonly Program program
-    cdef readonly int64_t address
-    cdef readonly bint record_stats
-    cdef readonly tuple captures
-    cdef readonly int64_t call_depth
-    cdef readonly int64_t hash
+    cdef uint64_t hash(self):
+        if self._hash == 0:
+            self._hash = <uint64_t>(id(self.program) ^ self.address ^ hash(self.defaults) ^ hash(self.captures))
+        return self._hash
 
     def __hash__(self):
-        if self.hash == 0:
-            self.hash = id(self.program) ^ self.address ^ hash(self.defaults) ^ hash(self.captures)
-        return self.hash
+        return self.hash()
+
+    def __repr__(self):
+        return f'<Function: {self.__name__}>'
+
+    def __str__(self):
+        return self.__name__
 
     def __call__(self, Context context, *args, **kwargs):
         if self.call_depth == MAX_CALL_DEPTH:
@@ -532,6 +530,21 @@ cdef class Function:
         assert lnames.top == lnames_top, "Bad function return lnames"
         return result
 
+    cdef Vector call_one_fast(self, Context context, Vector arg):
+        cdef int64_t i, k=PyTuple_GET_SIZE(self.captures), m=PyTuple_GET_SIZE(self.parameters)
+        cdef VectorStack lnames = context.lnames
+        cdef VectorStack stack = context.stack
+        for i in range(k):
+            push(lnames, <Vector>PyTuple_GET_ITEM(self.captures, i))
+        push(lnames, self.vself)
+        if m:
+            push(lnames, arg)
+            for i in range(1, m):
+                push(lnames, <Vector>PyTuple_GET_ITEM(self.defaults, i))
+        self.program._execute(context, self.address, self.record_stats)
+        drop(lnames, k + 1 + m)
+        return pop(stack)
+
 
 cdef class LoopSource:
     cdef Vector source

src/flitter/model.pxd

@@ -21,7 +21,7 @@ cdef inline uint64_t HASH_UPDATE(uint64_t _hash, uint64_t y) noexcept:
 
 
 # FNV-1a hash algorithm [https://en.wikipedia.org/wiki/Fowler–Noll–Vo_hash_function#FNV-1a_hash]
-cdef inline uint64_t HASH_STRING(str value):
+cdef inline uint64_t HASH_STRING(str value) noexcept:
     cdef void* data = PyUnicode_DATA(value)
     cdef uint64_t i, n=PyUnicode_GET_LENGTH(value), kind=PyUnicode_KIND(value)
     cdef Py_UCS4 c
@@ -32,6 +32,11 @@ cdef inline uint64_t HASH_STRING(str value):
     return y
 
 
+cdef union double_long:
+    double f
+    uint64_t l
+
+
 cdef class Vector:
     cdef int64_t length
     cdef tuple objects

src/flitter/model.pyx

@@ -30,11 +30,6 @@ cdef dict SymbolTable = {}
 cdef dict ReverseSymbolTable = {}
 
 
-cdef union double_long:
-    double f
-    uint64_t l
-
-
 cdef inline int64_t vector_compare(Vector left, Vector right) noexcept:
     if left is right:
         return 0

src/flitter/render/window/canvas3d.pyx

@@ -23,6 +23,7 @@ from ...model cimport Node, Vector, Matrix44, Matrix33, Quaternion, null_, true_
 from .models cimport Model, DefaultSegments, DefaultSnapAngle
 from .target import RenderTarget, COLOR_FORMATS
 from ...plugins import get_plugin
+from ...language.vm import Function
 
 
 logger = name_patch(logger, __name__)
@@ -493,7 +494,7 @@ cdef Model get_model(Node node, bint top):
         minimum = node.get_fvec('minimum', 3, node.get_fvec('min', 3, maximum.neg()))
         resolution = node.get_float('resolution', (maximum.maximum() - minimum.minimum()) / 100)
         if 'function' in node and (function := node['function']) and function.length == 1 and \
-                function.objects is not None and callable(f := function.objects[0]):
+                function.objects is not None and isinstance(f := function.objects[0], Function):
             model = Model._sdf(f, None, minimum, maximum, resolution)
         else:
             model = Model._boolean('union', [get_model(child, False) for child in node._children],

src/flitter/render/window/models.pxd

@@ -1,15 +1,16 @@
 
 from ...model cimport Node, Vector, Matrix44
+from ...language.vm cimport Function
 
-from libc.stdint cimport int64_t
+from libc.stdint cimport int64_t, uint64_t
 
 
 cdef double DefaultSnapAngle
 cdef int64_t DefaultSegments
 
 
 cdef class Model:
-    cdef readonly str name
+    cdef readonly uint64_t id
     cdef readonly double touch_timestamp
     cdef readonly double cache_timestamp
     cdef readonly dict cache
@@ -61,7 +62,7 @@ cdef class Model:
     cdef Model _vector(Vector vertices, Vector faces)
 
     @staticmethod
-    cdef Model _sdf(function, Model original, Vector minimum, Vector maximum, double resolution)
+    cdef Model _sdf(Function function, Model original, Vector minimum, Vector maximum, double resolution)
 
     @staticmethod
     cdef Model _mix(list models, Vector weights)