Commit 7f0385d0 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Trimesh doesn't need to be memoized anymore - internal vertex set cache is

used
parent 0467986e
...@@ -38,7 +38,6 @@ import numpy as np ...@@ -38,7 +38,6 @@ import numpy as np
import fsl.utils.meta as meta import fsl.utils.meta as meta
import fsl.utils.notifier as notifier import fsl.utils.notifier as notifier
import fsl.utils.memoize as memoize
import fsl.utils.transform as transform import fsl.utils.transform as transform
...@@ -54,7 +53,7 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -54,7 +53,7 @@ class Mesh(notifier.Notifier, meta.Meta):
A ``Mesh`` instance has the following attributes: A ``Mesh`` instance has the following attributes:
============== ==================================================== ============== ======================================================
``name`` A name, typically the file name sans-suffix. ``name`` A name, typically the file name sans-suffix.
``dataSource`` Full path to the mesh file (or ``None`` if there is ``dataSource`` Full path to the mesh file (or ``None`` if there is
...@@ -74,7 +73,11 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -74,7 +73,11 @@ class Mesh(notifier.Notifier, meta.Meta):
``vnormals`` A ``(n, 3)`` array containing vertex normals for the ``vnormals`` A ``(n, 3)`` array containing vertex normals for the
the current vertices. the current vertices.
============== ====================================================
``trimesh`` (if the `trimesh <https://github.com/mikedh/trimesh>`_
library is present) A ``trimesh.Trimesh`` object which
can be used for geometric queries on the mesh.
============== ======================================================
**Vertex sets** **Vertex sets**
...@@ -476,7 +479,7 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -476,7 +479,7 @@ class Mesh(notifier.Notifier, meta.Meta):
return list(self.__vertexData.keys()) return list(self.__vertexData.keys())
@memoize.Instanceify(memoize.memoize) @property
def trimesh(self): def trimesh(self):
"""Reference to a ``trimesh.Trimesh`` object which can be used for """Reference to a ``trimesh.Trimesh`` object which can be used for
geometric operations on the mesh. geometric operations on the mesh.
...@@ -528,7 +531,7 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -528,7 +531,7 @@ class Mesh(notifier.Notifier, meta.Meta):
``n`` rays. ``n`` rays.
""" """
trimesh = self.trimesh() trimesh = self.trimesh
if trimesh is None: if trimesh is None:
return np.zeros((0, 3)), np.zeros((0,)) return np.zeros((0, 3)), np.zeros((0,))
...@@ -567,7 +570,7 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -567,7 +570,7 @@ class Mesh(notifier.Notifier, meta.Meta):
point to the nearest vertex. point to the nearest vertex.
""" """
trimesh = self.trimesh() trimesh = self.trimesh
if trimesh is None: if trimesh is None:
return np.zeros((0, 3)), np.zeros((0, )), np.zeros((0, )) return np.zeros((0, 3)), np.zeros((0, )), np.zeros((0, ))
...@@ -607,7 +610,7 @@ class Mesh(notifier.Notifier, meta.Meta): ...@@ -607,7 +610,7 @@ class Mesh(notifier.Notifier, meta.Meta):
triangle. triangle.
""" """
trimesh = self.trimesh() trimesh = self.trimesh
if trimesh is None: if trimesh is None:
return np.zeros((0, 3)), np.zeros((0, 3)) return np.zeros((0, 3)), np.zeros((0, 3))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment