Fix visual example

bakpaul · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025
commit 00fd16b4f22838570e7a18c755efac6315effd9e
diff --git a/examples/stlib/PrefabScene_beginner.py b/examples/stlib/PrefabScene_beginner.py
@@ -22,11 +22,9 @@ def createScene(root):
     rigidParams.geometry = CubeParameters([0, 0, 0], 1, 3)
     root.add(Rigid,rigidParams)
 
-
     deformableParams = Deformable.getParameters()
     #Add transformation somewhere here
     deformableParams.geometry = FileParameters("SofaScene/Logo.vtk")
     root.add(Deformable,deformableParams)
 
-
     return root
diff --git a/examples/stlib/PrefabScene_intermediate.py b/examples/stlib/PrefabScene_intermediate.py
@@ -3,12 +3,6 @@
 
 
 def createScene(root):
-    Entity.Deformable(Mesh,MechaProperties)
 
-    return root
 
-
-if __name__=="__main__":
-    root = exportScene()
-    createScene(root)
-    pass
+    return root
diff --git a/stlib/core/baseParameters.py b/stlib/core/baseParameters.py
@@ -2,7 +2,7 @@
 from splib.core.utils import DEFAULT_VALUE
 
 import dataclasses
-from types import Callable, Optional
+from typing import Callable, Optional, Any
 
 @dataclasses.dataclass
 class BaseParameters(object): 

diff --git a/stlib/core/basePrefab.py b/stlib/core/basePrefab.py
@@ -1,5 +1,6 @@
 import copy
-import Sofa.Core
+import Sofa 
+import Sofa.Core 
 from stlib.core.basePrefabParameters import BasePrefabParameters
 
 
@@ -21,18 +22,18 @@ def findName(cname, node):
     if params.name in self.children:
         params.name = findName(params.name, self)
 
-    return typeName(parent = self, parameters=params) 
+    return self.addChild(typeName(params)) 
 
 Sofa.Core.Node.add = addFromTypeName
 
 
-class BasePrefab(Sofa.Core.Prefab):
+class BasePrefab(Sofa.Core.Node):
     """
     A Prefab is a Sofa.Node that assembles a set of components and nodes
     """
 
-    def __init__(self, params: BaseParameters):
-        Sofa.Core.Prefab.__init__(self, name=params.name)
+    def __init__(self, params: BasePrefabParameters):
+        Sofa.Core.Node.__init__(self, name=params.name)
 
     def localToGlobalCoordinates(pointCloudInput, pointCloudOutput):
         raise NotImplemented("Send an email to Damien, he will help you. Guaranteed :)")

diff --git a/stlib/core/basePrefabParameters.py b/stlib/core/basePrefabParameters.py
@@ -7,9 +7,9 @@ class BasePrefabParameters(object):
 
     # Transformation information
     # TODO: these data are going to be added in Node in SOFA (C++ implementation)
-    translation : list[float] = [0., 0., 0.]
-    rotation : list[float] = [0., 0., 0.]
-    scale : list[float] = [1., 1., 1.]
+    translation : list[float] = dataclasses.field(default_factory = lambda : [0., 0., 0.])
+    rotation : list[float] = dataclasses.field(default_factory = lambda : [0., 0., 0.])
+    scale : list[float] = dataclasses.field(default_factory = lambda : [1., 1., 1.])
 
     def toDict(self):
         return dataclasses.asdict(self)
diff --git a/stlib/entities/deformable/__init__.py b/stlib/entities/deformable/__init__.py
@@ -1,2 +1,2 @@
-from  __deformable__ import *
-from  __parameters__ import *
+from  .__deformable__ import *
+from  .__parameters__ import *
diff --git a/stlib/entities/rigid/__init__.py b/stlib/entities/rigid/__init__.py
@@ -1 +1 @@
-from __rigid__ import *
+from .__rigid__ import *
diff --git a/stlib/geometry/__geometry__.py b/stlib/geometry/__geometry__.py
@@ -11,7 +11,7 @@ class Geometry(BasePrefab):...
 
 @dataclasses.dataclass
 class InternalDataProvider(object):
-    positions : Any
+    position : Any = None
     # Topology information
     edges : Any = DEFAULT_VALUE
     triangles : Any  = DEFAULT_VALUE
@@ -27,10 +27,12 @@ def generateAttribute(self, parent : Geometry):
 class GeometryParameters(BaseParameters):
 
     # Type of the highest degree element
-    elementType : Optional[ElementType]
+    elementType : Optional[ElementType] = None
+    data : Optional[InternalDataProvider] = None
 
     dynamicTopology : bool = False
-    data : Optional[InternalDataProvider]
+
+
 
 
 
@@ -47,8 +49,8 @@ def __init__(self, params: GeometryParameters):
             params.data.generateAttribute(self)
         if(params.dynamicTopology):
             if(params.elementType is not None):
-                addDynamicTopology(self, container = {dataclasses.asdict(params.data)})
+                addDynamicTopology(self, container = dataclasses.asdict(params.data))
             else:
                 raise ValueError
         else:
-            addStaticTopology(self, container = {dataclasses.asdict(params.data)})
+            addStaticTopology(self, container = dataclasses.asdict(params.data))
diff --git a/stlib/geometry/__init__.py b/stlib/geometry/__init__.py
@@ -1 +1 @@
-from __geometry__ import *
+from .__geometry__ import *
diff --git a/stlib/geometry/extract.py b/stlib/geometry/extract.py
@@ -31,11 +31,11 @@ def generateAttribute(self, parent : Geometry):
         elif self.fromElemType == ElementType.HEXA:
             tmn.addObject("Hexa2QuadTopologicalMapping", input=fromLink, output=tmn.container.linkpath)
 
-        self.positions = tmn.container.position.linkpath
+        self.position = tmn.container.position.linkpath
         self.edges = tmn.container.edges.linkpath
         self.triangles = tmn.container.triangles.linkpath
         self.quads = tmn.container.quads.linkpath
-        self.hexaedra = tmn.container.hexaedra.linkpath
+        self.hexahedra = tmn.container.hexahedra.linkpath
         self.tetrahedra = tmn.container.tetras.linkpath
 
 

diff --git a/stlib/geometry/file.py b/stlib/geometry/file.py
@@ -7,7 +7,7 @@
 
 @dataclasses.dataclass
 class FileInternalDataProvider(InternalDataProvider):
-    filename : str
+    filename : str = "mesh/cube.obj"
 
     def __post_init__(self, **kwargs):
         InternalDataProvider.__init__(self,**kwargs)
@@ -16,16 +16,16 @@ def generateAttribute(self, parent : Geometry):
 
         loadMesh(parent, self.filename)
 
-        self.positions = parent.loader.position.linkpath
-        self.edges = parent.loader.edges.linkpath
-        self.triangles = parent.loader.triangles.linkpath
-        self.quads = parent.loader.quads.linkpath
-        self.hexaedra = parent.loader.hexaedra.linkpath
-        self.tetrahedra = parent.loader.tetras.linkpath
+        self.position = str(parent.loader.position.linkpath)
+        self.edges = str(parent.loader.edges.linkpath)
+        self.triangles = str(parent.loader.triangles.linkpath)
+        self.quads = str(parent.loader.quads.linkpath)
+        self.hexahedra = str(parent.loader.hexahedra.linkpath)
+        self.tetrahedra = str(parent.loader.tetras.linkpath)
 
 
 
 class FileParameters(GeometryParameters):
     def __init__(self,  filename, dynamicTopology = False, elementType : ElementType = None ):
-        GeometryParameters.__init__(data = FileInternalDataProvider(filename), dynamicTopology = dynamicTopology, elementType = elementType)
+        GeometryParameters.__init__(self,data = FileInternalDataProvider(filename), dynamicTopology = dynamicTopology, elementType = elementType)
 
diff --git a/stlib/prefabs/visual.py b/stlib/prefabs/visual.py
@@ -1,15 +1,16 @@
 from stlib.core.basePrefab import BasePrefab
 from stlib.core.baseParameters import BaseParameters, Callable, Optional, dataclasses, Any
 from stlib.geometry import Geometry, GeometryParameters
+from stlib.geometry.file import FileParameters
 from Sofa.Core import Object 
 
 @dataclasses.dataclass
 class VisualParameters(BaseParameters):
-    color : Optional[list[float]]
-    texture :  Optional[str]
+    color : Optional[list[float]] = None
+    texture :  Optional[str] = None
 
-    geometry : GeometryParameters
-    addMapping : Optional[Callable]
+    geometry : GeometryParameters = dataclasses.field(default_factory = lambda : GeometryParameters())
+    addMapping : Optional[Callable] = None
 
 
 class Visual(BasePrefab):
@@ -26,3 +27,14 @@ def __init__(self, params: VisualParameters):
         if params.addMapping is not None:
             params.addMapping(self)
 
+    @staticmethod
+    def getParameters(**kwargs) -> VisualParameters:
+        return VisualParameters(**kwargs)
+
+
+def createScene(root):
+
+    # Create a visual from a mesh file
+    params = Visual.getParameters()
+    params.geometry = FileParameters(filename="mesh/cube.obj")
+    root.add(Visual, params)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from __geometry__ import *
		from .__geometry__ import *