WIP FileParameters

bakpaul · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025
commit 97eda8954d3afc56d94835a8135d9b4c4bd9473b
diff --git a/stlib/entities/__entity__.py b/stlib/entities/__entity__.py
@@ -1,8 +1,25 @@
-from stlib.core.parameters import EntityParameters
+from stlib.core.baseParameters import BaseParameters
 import dataclasses
 from typing import Callable, Optional, overload
 import Sofa
 
+@dataclasses.dataclass
+class EntityParameters(BaseParameters): 
+    name : str = "Entity"
+
+    addSimulation : Callable = Simulation
+    addCollisionModel : Callable = CollisionModel
+    addVisualModel : Callable = VisualModel 
+
+    #setConstitutiveLaw # : Callable = addBidule
+    #setBoundaryCondition #: Callable = addBidule
+
+    mechanical : dict = dataclasses.field(default_factory=dict)
+    collision : CollisionModel.Parameters = CollisionModel.Parameters()
+    visual : VisualModelParameters = VisualModelParameters()
+    simulation : SimulationParameters = SimulationParameters()
+
+
 
 class Entity(Sofa.Core.BaseEntity): 
 
@@ -13,22 +30,6 @@ class Entity(Sofa.Core.BaseEntity):
 
     parameters : EntityParameters
 
-    @dataclasses.dataclass
-    class Parameters(EntityParameters): 
-        name : str = "Entity"
-
-        addSimulation : Callable = Simulation
-        addCollisionModel : Callable = CollisionModel
-        addVisualModel : Callable = VisualModel 
-
-        #setConstitutiveLaw # : Callable = addBidule
-        #setBoundaryCondition #: Callable = addBidule
-
-        mechanical : dict = dataclasses.field(default_factory=dict)
-        collision : CollisionModel.Parameters = CollisionModel.Parameters()
-        visual : VisualModelParameters = VisualModelParameters()
-        simulation : SimulationParameters = SimulationParameters()
-
 
     def __init__(self, parent=None, parameters=EntityParameters(), **kwargs):
         Sofa.Core.Node.__init__(self, name=parameters.name)        

diff --git a/stlib/geometry/__geometry__.py b/stlib/geometry/__geometry__.py
@@ -1,29 +1,76 @@
 from stlib.core.basePrefab import BasePrefab
-from stlib.core.baseParameters import BaseParameters, Optional
+from stlib.core.baseParameters import BaseParameters, Optional, dataclasses
 from splib.topology.loader import loadMesh
+from splib.topology.dynamic import addDynamicTopology
 from splib.core.enum_types import ElementType
 from Sofa.Core import Object 
 
-class Geometry(BasePrefab):
-    topology :  Object # This should be more specialized into the right SOFA type
-    topologyModifier : Optional[Object]
-
-    def __init__(self, *args, **kwargs):
-        BasePrefab.__init__(self, *args, **kwargs)
 
 
+@dataclasses.dataclass
 class GeometryParameter(BaseParameters):
-    isDynamic : bool
+    isDynamic : bool = False
     elementType : Optional[ElementType]
+    positions : Optional[list]
+    edges : Optional[list]
+    triangles : Optional[list]
+    tetrahedra : Optional[list]
+    hexahedra : Optional[list]
+    quads : Optional[list]
+
+
+class Geometry(BasePrefab):
+    container :  Object # This should be more specialized into the right SOFA type
+    modifier : Optional[Object]
 
+    def __init__(self, params: GeometryParameter):
+        BasePrefab.__init__(self, params)
+        if(param.isDynamic):
+            if(param.elementType is not None):
+                addDynamicTopology(self, param.elementType, **kargs)
+            else:
+                raise ValueError
 
-class FileGeometryParamtetrs(GeometryParameter):
+
+@dataclasses.dataclass
+class FileGeometryParameters(GeometryParameter):
     filename : str
 
 
 class FileGeometry(Geometry):
-    fileLoader : Object
+    loader : Object
+
+    def __init__(self,param : FileGeometryParameters):
+        loadMesh(self, param.filename, **param.kwargs)
+        param.positions = "@loader.positions"
+        param.edges = "@loader.edges"
+        param.positions = "@loader.positions"
+        param.positions = "@loader.positions"
+        Geometry.__init__(self,param)
 
-    def __init__(self):
         pass
-
+
+
+
+def createScene(root):
+    from stlib.entities.deformable import Deformable 
+
+    fileParameters =  FileGeometryParameters(filename = "MyFile.obj",
+                                             isDynamic = True,
+                                             elementType=ElementType.TETRA,
+                                             name="geometry")
+
+
+
+    cubeGeometry = FileGeometry(FileGeometryParameters)
+
+    entityParam = Deformable.getParameters( geometry = cubeGeometry, name="MyCube")
+
+
+    myCube = root.addChild("MyCube")
+    cubeGeomtry = myCube.addChild("geometry")
+
+    cubeGeomtry.addObject("MeshObjLoader", name="loader", filenmae="MyFile.obj")
+    cubeGeomtry.addObject("TetrahedronSetTopologyContainer", name="container", positions="@loader.positions")
+    cubeGeomtry.addObject("TetrahedronSetTopologyModifier", name="modifier")
+