WIP

Author: bakpaul

splib/core/enum_types.py

@@ -48,3 +48,4 @@ def __str__(self):
             return "Vec1"
         if self == StateType.RIGID:
             return "Rigid3"
+        

stlib/entities/__entity__.py

@@ -9,26 +9,27 @@
 from stlib.geometry import GeometryParameters
 from splib.core.enum_types import StateType
 import Sofa
+from stlib.core.basePrefab import BasePrefab
 
 
 @dataclasses.dataclass
 class EntityParameters(BaseParameters): 
     name = "Entity"
 
-    template : StateType
+    template : StateType = None
 
     ### QUID 
     addCollision : Optional[Callable] = lambda x : Collision(CollisionParameters())
     addVisual : Optional[Callable] = lambda x : Visual(VisualParameters()) 
 
-    geometry : GeometryParameters
-    material : MaterialParameters
+    geometry : GeometryParameters = None
+    material : MaterialParameters = None
     collision : Optional[CollisionParameters] = None
     visual : Optional[VisualParameters] = None
 
 
 
-class Entity(Sofa.Core.BaseEntity): 
+class Entity(BasePrefab): 
 
     # A simulated object
     material : Material
@@ -39,11 +40,9 @@ class Entity(Sofa.Core.BaseEntity):
     parameters : EntityParameters
 
 
-    def __init__(self, parent=None, parameters=EntityParameters(), **kwargs):
+    def __init__(self, parameters=EntityParameters(), **kwargs):
         Sofa.Core.Node.__init__(self, name=parameters.name)        
 
-        if parent is not None: 
-            parent.addChild(self)
 
         self.parameters = parameters
 

stlib/entities/deformable/__deformable__.py

@@ -1,21 +1,21 @@
 from stlib.entities import Entity, EntityParameters
 from stlib.prefabs.material import Material, MaterialParameters
 from stlib.prefabs.visual import Visual
-from splib.core.enum_types import ConstitutiveLaw, ElementType
+from splib.core.enum_types import ConstitutiveLaw, ElementType, StateType
 from splib.mechanics.linear_elasticity import *
 from splib.mechanics.hyperelasticity import *
 from splib.mechanics.mass import addMass
 
 
 class DeformableBehaviorParameters(MaterialParameters):
 
-    constitutiveLawType : ConstitutiveLaw 
-    elementType : ElementType
-    parameters : list[float]
+    constitutiveLawType : ConstitutiveLaw = None
+    elementType : ElementType = None
+    parameters : list[float] = None
 
     def addMaterial(self, node):
 
-        addMass(node, node.stateType, massDensity=node.massDensity, lumping=node.massLumping)
+        addMass(node, str(node.stateType), massDensity=node.massDensity, lumping=node.massLumping)
 
         # TODO : change this with inheritance
         if(self.constitutiveLawType == ConstitutiveLaw.HYPERELASTIC):
@@ -61,9 +61,11 @@ def createScene(root) :
     # from stlib.geometry.extract import ExtractParameters    
 
     liverParameters = EntityParameters()
-    liverParameters.behavior = DeformableBehaviorParameters()
-    liverParameters.behavior.constitutiveLawType = ConstitutiveLaw.ELASTIC
-    liverParameters.behavior.parameters = [1000, 0.45]
+    liverParameters.template = StateType.VEC3
+    liverParameters.material = DeformableBehaviorParameters()
+    liverParameters.material.stateType = StateType.VEC3
+    liverParameters.material.constitutiveLawType = ConstitutiveLaw.ELASTIC
+    liverParameters.material.parameters = [1000, 0.45]
     liverParameters.geometry = FileParameters("liver.vtk")
     # liverParameters.visual = ExtractParameters()
     myDeformableObject = root.add(Entity, liverParameters)

stlib/prefabs/material.py

@@ -1,14 +1,14 @@
 from stlib.core.baseParameters import BaseParameters, Callable, Optional, dataclasses, Any
-from splib.core.enum_types import StateType
+from splib.core.enum_types import *
 from stlib.core.basePrefab import BasePrefab
 from splib.mechanics.mass import addMass
 
 @dataclasses.dataclass
 class MaterialParameters(BaseParameters):
     name: str = "Material"
 
-    massDensity: float
-    massLumping: bool
+    massDensity: float = 0
+    massLumping: bool = False
 
     stateType: StateType = StateType.VEC3
 
@@ -21,6 +21,8 @@ def __init__(self, params: MaterialParameters):
         BasePrefab.__init__(self, params)
 
         self.params = params
+
+        print(params.stateType.toString())
         self.addObject("MechanicalObject", name="States", template=str(self.params.stateType))
 
         if(params.addMaterial is not None):