Skip to content

Commit a903e01

Browse files
committed
Add addObject as reusable method and use it in Collision to enable kwargs
1 parent 9b7afa7 commit a903e01

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

splib/core/utils.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from typing import List, Callable, Tuple, Dict
22
from functools import wraps
3+
from node_wrapper import ReusableMethod
4+
35

46
class defaultValueType():
57
def __init__(self):
@@ -32,5 +34,9 @@ def wrapper(*args, **kwargs):
3234
return MapArg
3335

3436

37+
@ReusableMethod
38+
def addObject(node,typeName : str, name : str , **kwargs):
39+
node.addObject(typeName, name = name, **kwargs)
40+
3541

3642

stlib/prefabs/collision.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from stlib.geometry import Geometry, GeometryParameters
44
from stlib.geometry.file import FileParameters
55
from splib.core.enum_types import CollisionPrimitive
6-
from splib.core.utils import DEFAULT_VALUE
6+
from splib.core.utils import DEFAULT_VALUE, addObject
77
from splib.mechanics.collision_model import addCollisionModels
88
from Sofa.Core import Object
99

@@ -28,7 +28,7 @@ def __init__(self, params: CollisionParameters):
2828

2929
geom = self.add(Geometry, params.geometry)
3030

31-
self.addObject("MechanicalObject",template="Vec3", position=f"@{params.geometry.name}/container.position")
31+
addObject(self,"MechanicalObject",name="MechanicalObject",template="Vec3", position=f"@{params.geometry.name}/container.position", **params.kwargs)
3232
for primitive in params.primitives:
3333
addCollisionModels(self,primitive,
3434
topology=f"@{params.geometry.name}/container",

0 commit comments

Comments
 (0)