[Prefabs] Reorder files to match concepts (#547)

* Reorder files to match concepts

* Put every prefab in root to avoid having a useless prefix

* Fix bad import in bunny example

* Update examples/stlib/PrefabScene_beginner.py

Co-authored-by: EulalieCoevoet <[email protected]>

---------

Co-authored-by: EulalieCoevoet <[email protected]>

Author: bakpaul

examples/stlib/PrefabScene_beginner.py

@@ -1,7 +1,7 @@
-from stlib.entities.rigid import Rigid
-from stlib.entities.deformable import Deformable
-from stlib.geometry.cube import CubeParameters
-from stlib.geometry.file import FileParameters
+from stlib.materials.rigid import Rigid
+from stlib.materials.deformable import Deformable
+from stlib.geometries.cube import CubeParameters
+from stlib.geometries.file import FileParameters
 from splib.simulation.headers import setupLagrangianCollision
 from splib.simulation.linear_solvers import addLinearSolver
 from splib.simulation.ode_solvers import addImplicitODE

stlib/__init__.py

@@ -1,4 +1,4 @@
-__all__ = ["core","entities","prefabs","shapes"]
+__all__ = ["core","entities","geometries","materials","collision","visual"]
 
 import Sofa.Core
 def __genericAdd(self : Sofa.Core.Node, typeName, **kwargs):
@@ -11,7 +11,7 @@ def findName(cname, names):
             rname = cname + str(i+1)
         return rname
 
-    # Check if a name is provided, if not, use the one of the class
+    # Check if a name is provided, if not, use the one of the class
     params = kwargs.copy()
     isNode = False
     if "name" not in params:
@@ -31,7 +31,7 @@ def findName(cname, names):
         else:
             raise RuntimeError("Invalid argument ", typeName)
 
-    # Check if the name already exists, if this happens, create a new one.
+    # Check if the name already exists, if this happens, create a new one.
     if params["name"] in self.children or params["name"] in self.objects:
         names = {node.name.value for node in self.children}
         names = names.union({object.name.value for object in self.objects})

stlib/prefabs/collision.py stlib/collision.pystlib/prefabs/collision.py renamed to stlib/collision.py

@@ -1,7 +1,7 @@
 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 stlib.core.baseParameters import BaseParameters, Optional, dataclasses
+from stlib.geometries import Geometry, GeometryParameters
+from stlib.geometries.file import FileParameters
 from splib.core.enum_types import CollisionPrimitive
 from splib.core.utils import DEFAULT_VALUE
 from splib.mechanics.collision_model import addCollisionModels

stlib/entities/__entity__.py

@@ -1,15 +1,12 @@
 from stlib.core.baseParameters import BaseParameters
-from stlib.core.basePrefab import BasePrefab
-from stlib.prefabs.collision import CollisionParameters, Collision
-from stlib.prefabs.visual import VisualParameters, Visual
-from stlib.prefabs.material import Material, MaterialParameters
-from stlib.geometry import Geometry
-from stlib.geometry.extract import ExtractParameters
+from stlib.collision import CollisionParameters, Collision
+from stlib.visual import VisualParameters, Visual
+from stlib.materials import Material, MaterialParameters
+from stlib.geometries import Geometry
 import dataclasses
-from typing import Callable, Optional, overload, Any
-from stlib.geometry import GeometryParameters
+from typing import Callable, Optional
+from stlib.geometries import GeometryParameters
 from splib.core.enum_types import StateType
-import Sofa
 from stlib.core.basePrefab import BasePrefab