work on Tuesday : visual, geometry

Author: hugtalbot

stlib/core/basePrefab.py

@@ -1,5 +1,29 @@
+import copy
 import Sofa.Core
-from baseParameters import BaseParameters
+from stlib.core.basePrefabParameters import BasePrefabParameters
+
+
+def addFromTypeName(self : Sofa.Core.Node, typeName, params = BasePrefabParameters, **kwargs):  
+    def findName(cname, node):
+        """Compute a working unique name in the node"""
+        rname = cname 
+        for i in range(0, len(node.children)):
+            if rname not in node.children:
+                return rname
+            rname = cname + str(i+1)
+        return rname
+
+    for k,v in kwargs.items():
+        if hasattr(params, k):
+            setattr(params, k, v)
+
+    params = copy.copy(params)
+    if params.name in self.children:
+        params.name = findName(params.name, self)
+
+    return typeName(parent = self, parameters=params) 
+
+Sofa.Core.Node.add = addFromTypeName
 
 
 class BasePrefab(Sofa.Core.Prefab):
@@ -8,4 +32,8 @@ class BasePrefab(Sofa.Core.Prefab):
     """
 
     def __init__(self, params: BaseParameters):
-        Sofa.Core.Prefab.__init__(self, name=params.name)
+        Sofa.Core.Prefab.__init__(self, name=params.name)
+
+    def localToGlobalCoordinates(pointCloudInput, pointCloudOutput):
+        raise NotImplemented("Send an email to Damien, he will help you. Guaranteed :)")
+        

stlib/entities/__entity__.py

@@ -43,13 +43,15 @@ def __init__(self, parent=None, parameters=EntityParameters(), **kwargs):
         self.parameters = parameters
 
         self.addMechanicalModel(**parameters.mechanical)
+        # ????
         self.addSimulation(parameters=parameters.simulation)
         self.addVisualModel(parameters=parameters.visual)
         self.addCollisionModel()
 
     def addMechanicalModel(self, **kwargs): 
         self.addObject("MechanicalObject", **kwargs)
 
+    # ????
     def addSimulation(self, **kwargs): 
         self.parameters.addSimulation(self, **kwargs)
 

stlib/entities/deformable/__deformable__.py

@@ -18,17 +18,15 @@ def __init__(self, params : DeformableParameters, **kwargs):
         self.__addConstitutiveLaw__()
         self.add(Collision, params.collision)
 
+
     #@customizable
     # Need generic way of defining paramaters (linear/hyper...)
     def __addConstitutiveLaw__(self):
         self.params.addConstitutiveLaw()
 
 
-    
     #@customizable
     def __addVisual__(self):
-        #Exctract surface and add indentity mapping
-
+        #Extract surface and add identity mapping
         self.add(Visual, params.visual)
 
-        pass

stlib/geometry/__geometry__.py

@@ -9,13 +9,19 @@
 class GeometryParameters(BaseParameters):
     @dataclasses.dataclass
     class Data(object):
-        elementType : Optional[ElementType]
+        # Initial positions
         positions : Any
+
+        # Type of the highest degree element
+        elementType : Optional[ElementType]
+
+        # Topology information
         edges : Optional[Any]
         triangles : Optional[Any]
+        quads : Optional[Any]
         tetrahedra : Optional[Any]
         hexahedra : Optional[Any]
-        quads : Optional[Any]
+
     dynamicTopology : bool = False
     data : Data
 
@@ -32,6 +38,3 @@ def __init__(self, params: GeometryParameters):
                 raise ValueError
         else:
             addStaticTopology(self, **dataclasses.asdict(params.data), **params.kargs)
-
-
-

stlib/geometry/file.py

@@ -21,5 +21,7 @@ def createData(filename) -> GeometryParameters.Data :
         data.triangles = node.loader.triangles.value
         data.tetrahedra = node.loader.tetras.value
 
+        node.cleanUp()
+
         return data
 

stlib/prefabs/visual.py

@@ -1,6 +1,6 @@
 from stlib.core.basePrefab import BasePrefab
 from stlib.core.baseParameters import BaseParameters, Callable, Optional, dataclasses, Any
-from stlib.geometry import GeometryParameters
+from stlib.geometry import Geometry, GeometryParameters
 from Sofa.Core import Object 
 
 @dataclasses.dataclass
@@ -16,6 +16,13 @@ class Visual(BasePrefab):
     container :  Object # This should be more specialized into the right SOFA type
     modifier : Optional[Object]
 
-    def __init__(self, params: GeometryParameters):
+    def __init__(self, params: VisualParameters):
         BasePrefab.__init__(self, params)
 
+        geom = self.add(Geometry, params.geometry)
+        # TODO : handle optional color, texture using DEFAULT_VALUE mechanism (as implemented by Paul)
+        self.addObject("OglModel", color=params.color, src=geom.container.linkpath)
+
+        if params.addMapping is not None:
+            params.addMapping(self)
+