diff --git a/Core/Scripts/Editor/Config/CopyConfigPostProcessor.cs b/Core/Scripts/Editor/Config/CopyConfigPostProcessor.cs index 8d91b270..9f4bc104 100644 --- a/Core/Scripts/Editor/Config/CopyConfigPostProcessor.cs +++ b/Core/Scripts/Editor/Config/CopyConfigPostProcessor.cs @@ -23,7 +23,7 @@ static CopyConfigPostProcessor() outputIniFile.WriteLine("SHARE_DIR=C:/projects/sofa-src/share/"); outputIniFile.WriteLine("EXAMPLES_DIR=" + SofaUnityDir); outputIniFile.WriteLine("LICENSE_DIR=" + Application.dataPath + "/SofaUnity/License/"); - outputIniFile.WriteLine("PYTHON_DIR=" + Application.dataPath + "/SofaUnity/Core/Plugins/Native/x64/"); + outputIniFile.WriteLine("BUILD_DIR=" + Application.dataPath + "/SofaUnity/Core/Plugins/Native/x64/"); } } diff --git a/Scenes/SofaScenes/liver.py b/Scenes/SofaScenes/liver.py index aa696e6f..32188b01 100644 --- a/Scenes/SofaScenes/liver.py +++ b/Scenes/SofaScenes/liver.py @@ -52,7 +52,7 @@ def createScene(root): root.addObject('CollisionPipeline', name="CollisionPipeline") root.addObject('BruteForceBroadPhase', name="BroadPhase") root.addObject('BVHNarrowPhase', name="NarrowPhase") - root.addObject('DefaultContactManager', name="CollisionResponse", response="PenalityContactForceField") + root.addObject('CollisionResponse', name="CollisionResponse", response="PenalityContactForceField") root.addObject('DiscreteIntersection') root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj") @@ -66,7 +66,7 @@ def createScene(root): liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo") liver.addObject('DiagonalMass', name="Mass", massDensity="1.0") liver.addObject('TetrahedralCorotationalFEMForceField', template="Vec3d", name="FEM", method="large", poissonRatio="0.3", youngModulus="3000", computeGlobalMatrix="0") - liver.addObject('FixedConstraint', name="FixedConstraint", indices="3 39 64") + liver.addObject('FixedProjectiveConstraint', name="FixedConstraint", indices="3 39 64") visu = liver.addChild('Visu') visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface") diff --git a/Scenes/SofaScenes/liver_interaction.py b/Scenes/SofaScenes/liver_interaction.py index 55db84ed..23dcff54 100644 --- a/Scenes/SofaScenes/liver_interaction.py +++ b/Scenes/SofaScenes/liver_interaction.py @@ -105,11 +105,11 @@ def createScene(root): root.addObject('DefaultAnimationLoop') - root.addObject('VisualStyle', displayFlags="hideCollisionModels") + root.addObject('VisualStyle', displayFlags="showCollisionModels") root.addObject('CollisionPipeline', name="CollisionPipeline") root.addObject('BruteForceBroadPhase', name="BroadPhase") root.addObject('BVHNarrowPhase', name="NarrowPhase") - root.addObject('DefaultContactManager', name="CollisionResponse", response="PenalityContactForceField") + root.addObject('CollisionResponse', name="CollisionResponse", response="PenalityContactForceField") root.addObject('DiscreteIntersection') root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj") @@ -123,7 +123,7 @@ def createScene(root): liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo") liver.addObject('DiagonalMass', name="Mass", massDensity="1.0") liver.addObject('TetrahedralCorotationalFEMForceField', template="Vec3d", name="FEM", method="large", poissonRatio="0.3", youngModulus="3000", computeGlobalMatrix="0") - liver.addObject('FixedConstraint', name="FixedConstraint", indices="3 39 64") + liver.addObject('FixedProjectiveConstraint', name="FixedConstraint", indices="3 39 64") visu = liver.addChild('Visu') visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface")