Skip to content

Commit

Permalink
[all] fixes tests (FrictionContactConstraint response)
Browse files Browse the repository at this point in the history
  • Loading branch information
EulalieCoevoet committed Jul 28, 2022
1 parent 35f5099 commit 4cb9292
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def createScene(rootNode):
rootNode.addObject('DefaultPipeline')
rootNode.addObject('BruteForceBroadPhase')
rootNode.addObject('BVHNarrowPhase')
rootNode.addObject('DefaultContactManager', response='FrictionContact', responseParams='mu=0.6')
rootNode.addObject('DefaultContactManager', response='FrictionContactConstraint', responseParams='mu=0.6')
rootNode.addObject('LocalMinDistance', name='Proximity', alarmDistance=5, contactDistance=1, angleCone=0.0)

rootNode.addObject('BackgroundSetting', color=[0, 0.168627, 0.211765, 1.])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def createScene(rootNode):
rootNode.addObject('GenericConstraintSolver', tolerance=1e-12, maxIterations=10000)
rootNode.addObject('DefaultPipeline')
rootNode.addObject('BruteForceDetection')
rootNode.addObject('DefaultContactManager', response='FrictionContact', responseParams='mu=0.6')
rootNode.addObject('DefaultContactManager', response='FrictionContactConstraint', responseParams='mu=0.6')
rootNode.addObject('LocalMinDistance', name='Proximity', alarmDistance=5, contactDistance=1, angleCone=0.0)

rootNode.addObject('BackgroundSetting', color=[0, 0.168627, 0.211765])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<CollisionPipeline verbose='0'/>
<BruteForceBroadPhase name="N2" />
<BVHNarrowPhase />
<CollisionResponse response='FrictionContact'/>
<CollisionResponse response='FrictionContactConstraint'/>
<LocalMinDistance name="Proximity" alarmDistance='3' contactDistance='0.5'/>
<GenericConstraintSolver name="GenericConstraintSolver" maxIterations='250' printLog='0' tolerance = '0.0000001'/>

Expand Down

0 comments on commit 4cb9292

Please sign in to comment.