Skip to content

Apply changes from SOFA PR #6117 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bakpaul wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Apply changes from SOFA PR #6117 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a669964
Fix scenes with new integration schemes names
bakpaul Jun 11, 2026
9a429aa
Add missing scenes
bakpaul Jun 11, 2026
ae713e7
Fix requiredPlugins
bakpaul Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Registration_run/cubes.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!-- Using a rigid cube using collision triangles, lines and points -->
<Node name="Cube1">
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
<EulerImplicitIntegrationScheme name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="CG Solver"/>
<MechanicalObject name="Cube1 RigidDOF" template="Rigid3d" dy="0" />
<UniformMass name="UniformMass1" totalMass="10.0" />
Expand All @@ -27,7 +27,7 @@
</Node>-->
</Node>
<Node name="Cube2">
<EulerImplicitSolver name="EulerImplicit" />
<EulerImplicitIntegrationScheme name="EulerImplicit" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="CG Solver"/>
<MechanicalObject name="Cube2 RigidDOF" template="Rigid3d" dy="0" dx="0" />
<UniformMass name="UniformMass2" totalMass="10.0" />
Expand Down
2 changes: 1 addition & 1 deletion examples/ICPRegistration_MeshSpring.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RequiredPlugin name="Registration" pluginName="Registration" />

<VisualStyle displayFlags="showBehavior showVisual" />
<EulerImplicitSolver rayleighStiffness="0.5" rayleighMass="0.5" vdamping="0.01"/>
<EulerImplicitIntegrationScheme rayleighStiffness="0.5" rayleighMass="0.5" vdamping="0.01"/>
<CGLinearSolver template="GraphScattered" iterations="15" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
Expand Down
2 changes: 1 addition & 1 deletion examples/ICPRegistration_ShapeMatching_Engine.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<VisualStyle displayFlags="showForceFields showVisual" />

<EulerImplicitSolver rayleighStiffness="0.5" rayleighMass="0.5" />
<EulerImplicitIntegrationScheme rayleighStiffness="0.5" rayleighMass="0.5" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
Expand Down
4 changes: 2 additions & 2 deletions examples/imageregistration.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<RequiredPlugin pluginName="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
<RequiredPlugin pluginName="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [BarycentricMapping] -->
<RequiredPlugin pluginName="Sofa.Component.Mass"/> <!-- Needed to use components [UniformMass] -->
<RequiredPlugin pluginName="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
<RequiredPlugin pluginName="Sofa.Component.IntegrationSchemes.Backward"/> <!-- Needed to use components [EulerImplicitIntegrationScheme] -->
<RequiredPlugin pluginName="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
<RequiredPlugin pluginName="Sofa.Component.StateContainer"/> <!-- Needed to use components [MechanicalObject] -->
<RequiredPlugin pluginName="Sofa.Component.Topology.Container.Constant"/> <!-- Needed to use components [MeshTopology] -->
Expand All @@ -21,7 +21,7 @@

<VisualStyle displayFlags="showForceFields showVisual" />

<EulerImplicitSolver rayleighStiffness="0.2" rayleighMass="0.2" />
<EulerImplicitIntegrationScheme rayleighStiffness="0.2" rayleighMass="0.2" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
Expand Down
2 changes: 1 addition & 1 deletion examples/test_InertiaAlign.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RequiredPlugin name="SofaOpenglVisual"/>
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<EulerImplicitIntegrationScheme name="EulerImplicitIntegrationScheme1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshOBJLoader name="meshLoader_0" filename="data/boxes.obj" translation="0 0 0" rotation="0 0 0" scale3d="1 1 1" handleSeams="1" />
Expand Down
2 changes: 1 addition & 1 deletion examples/test_InertiaAlign2.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RequiredPlugin name="SofaOpenglVisual"/>
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<EulerImplicitIntegrationScheme name="EulerImplicitIntegrationScheme1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshOBJLoader name="meshLoader_0" filename="data/femur_m.obj" translation="0 0 0" rotation="0 0 0" scale3d="1 1 1" handleSeams="1" />
Expand Down
2 changes: 1 addition & 1 deletion examples/test_InertiaAlign3.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RequiredPlugin name="SofaOpenglVisual"/>
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<EulerImplicitIntegrationScheme name="EulerImplicitIntegrationScheme1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshOBJLoader name="meshLoader_0" filename="data/femur_m.obj" translation="3 2 1" rotation="30 40 50" scale3d="1 1 1" handleSeams="1" />
Expand Down
Loading