![[Jenkins]](/sofa-ci-dev/static/97c79d73/images/svgs/logo.svg){kind=logo}
Started by upstream project "clean-old-builds" build number 128 originally caused by: Started by upstream project "launch-nightly-full-builds" build number 131 originally caused by: Started by timer [EnvInject] - Loading node environment variables. Building remotely on _launcher_ in workspace /builds/workspace/clean-old-builds [EnvInject] - Inject global passwords. [EnvInject] - Mask passwords that will be passed as build parameters. [clean-old-builds] $ bash /tmp/jenkins2352890691120039664.sh --------------- Clone/update CI scripts --------------- pwd = /builds/workspace/clean-old-builds From https://github.com/sofa-framework/ci + c80a307...4c32216 testing -> origin/testing (forced update) HEAD is now at bdf76cb Update Assimp on Windows VMs CI scripts are available in /builds/workspace/clean-old-builds/ci/scripts ------------------------------------------------------- ------------- Update reference_repo/sofa -------------- From https://github.com/sofa-framework/sofa 54ff05b..cf0af8f master -> origin/master 61a8423..fd02a61 ng -> origin/ng * [new branch] sofaqtquickgui_dev -> origin/sofaqtquickgui_dev 5086b1e..f91ca34 stc5 -> origin/stc5 * [new branch] v18.06 -> origin/v18.06 * [new tag] v18.06.01 -> v18.06.01 * [new tag] v18.06.00 -> v18.06.00 Updating 54ff05b..cf0af8f Fast-forward CHANGELOG.md | 27 +- CMakeLists.txt | 229 +- SofaAdvanced/CMakeLists.txt | 2 +- SofaGeneral/CMakeLists.txt | 8 +- SofaGeneral/SofaGeneralConfig.cmake.in | 10 - SofaGeneral/config.h.in | 16 - SofaGui/CMakeLists.txt | 54 +- SofaGui/SofaGuiConfig.cmake.in | 3 - SofaGui/config.h.in | 2 + SofaKernel/CMakeLists.txt | 11 +- SofaKernel/SofaBase/CMakeLists.txt | 2 +- SofaKernel/SofaCommon/CMakeLists.txt | 2 +- SofaKernel/SofaFramework/CMakeLists.txt | 81 +- .../SofaFramework/SofaFrameworkConfig.cmake.in | 6 - SofaKernel/SofaFramework/SofaMacros.cmake | 447 +- SofaKernel/SofaFramework/config.h.in | 4 +- SofaKernel/SofaSimulation/CMakeLists.txt | 2 +- SofaKernel/extlibs/json/nlohmann_json.h | 25289 ++++++++++--------- SofaKernel/framework/framework_test/CMakeLists.txt | 1 - .../framework_test/core/DataEngine_test.cpp | 60 +- .../framework_test/helper/Quater_test.cpp | 46 +- .../framework_test/helper/logging/logging_test.cpp | 2 +- .../helper/system/PluginManager_test.cpp | 6 +- .../plugins/TestPlugin/initTestPlugin.cpp | 2 +- SofaKernel/framework/sofa/core/CMakeLists.txt | 17 +- SofaKernel/framework/sofa/core/DataEngine.h | 66 + SofaKernel/framework/sofa/core/Mapping.cpp | 94 +- SofaKernel/framework/sofa/core/Mapping.h | 110 +- SofaKernel/framework/sofa/core/MultiMapping.cpp | 70 +- SofaKernel/framework/sofa/core/MultiMapping.h | 84 +- SofaKernel/framework/sofa/core/ObjectFactory.cpp | 4 + SofaKernel/framework/sofa/core/ObjectFactory.h | 5 + .../sofa/core/behavior/BaseMechanicalState.h | 6 +- SofaKernel/framework/sofa/core/behavior/Mass.h | 13 +- .../framework/sofa/core/loader/BaseLoader.cpp | 18 +- .../framework/sofa/core/loader/MeshLoader.cpp | 136 +- SofaKernel/framework/sofa/core/loader/MeshLoader.h | 40 +- .../logging/RichConsoleStyleMessageFormatter.cpp | 93 +- .../logging/RichConsoleStyleMessageFormatter.h | 32 +- .../framework/sofa/core/objectmodel/Base.cpp | 29 +- .../framework/sofa/core/objectmodel/BaseData.h | 2 + .../framework/sofa/core/objectmodel/BaseLink.cpp | 4 +- SofaKernel/framework/sofa/core/objectmodel/Data.h | 6 +- .../sofa/core/objectmodel/DataFileName.cpp | 9 +- .../framework/sofa/core/objectmodel/DataFileName.h | 6 + SofaKernel/framework/sofa/core/objectmodel/Link.h | 22 +- .../sofa/core/objectmodel}/ScriptEvent.cpp | 3 +- .../framework/sofa/core/objectmodel}/ScriptEvent.h | 13 +- .../sofa/core/topology/BaseMeshTopology.h | 39 +- SofaKernel/framework/sofa/core/topology/Topology.h | 23 +- .../framework/sofa/core/topology/TopologyChange.h | 422 +- .../sofa/core/topology/TopologyElementHandler.h | 24 +- .../framework/sofa/core/visual/DisplayFlags.cpp | 132 +- .../framework/sofa/core/visual/DisplayFlags.h | 39 +- SofaKernel/framework/sofa/core/visual/DrawTool.h | 9 +- .../framework/sofa/core/visual/DrawToolGL.cpp | 42 +- SofaKernel/framework/sofa/core/visual/DrawToolGL.h | 7 +- .../framework/sofa/defaulttype/CMakeLists.txt | 5 +- .../framework/sofa/defaulttype/DataTypeInfo.h | 6 + SofaKernel/framework/sofa/helper/CMakeLists.txt | 18 +- .../framework/sofa/helper/ComponentChange.cpp | 14 + SofaKernel/framework/sofa/helper/LCPcalc.cpp | 3 +- SofaKernel/framework/sofa/helper/Quater.inl | 33 +- SofaKernel/framework/sofa/helper/Utils.cpp | 14 +- .../framework/sofa/helper/gl/BasicShapesGL.h | 6 +- .../framework/sofa/helper/gl/BasicShapesGL.inl | 56 +- SofaKernel/framework/sofa/helper/gl/glText.inl | 2 +- SofaKernel/framework/sofa/helper/init.cpp | 1 - SofaKernel/framework/sofa/helper/io/ImageDDS.cpp | 2 +- SofaKernel/framework/sofa/helper/io/Mesh.cpp | 3 +- SofaKernel/framework/sofa/helper/io/Mesh.h | 81 +- SofaKernel/framework/sofa/helper/io/MeshGmsh.cpp | 352 + .../sofa/helper/io/{MeshSTL.h => MeshGmsh.h} | 20 +- SofaKernel/framework/sofa/helper/io/MeshOBJ.cpp | 22 +- SofaKernel/framework/sofa/helper/io/MeshSTL.cpp | 268 - .../sofa/helper/io/MeshTopologyLoader.cpp | 808 +- .../framework/sofa/helper/io/MeshTopologyLoader.h | 23 +- SofaKernel/framework/sofa/helper/io/MeshTrian.cpp | 128 - SofaKernel/framework/sofa/helper/io/MeshVTK.cpp | 148 - .../helper/logging/ClangStyleMessageFormatter.cpp | 32 +- .../helper/logging/ClangStyleMessageFormatter.h | 17 +- .../logging/DefaultStyleMessageFormatter.cpp | 39 +- .../helper/logging/DefaultStyleMessageFormatter.h | 23 +- .../sofa/helper/logging/LoggingMessageHandler.cpp | 10 +- .../sofa/helper/logging/LoggingMessageHandler.h | 12 +- .../sofa/helper/logging/MessageFormatter.cpp | 74 + .../sofa/helper/logging/MessageFormatter.h | 7 +- .../framework/sofa/helper/system/PluginManager.cpp | 2 +- .../framework/sofa/helper/system/PluginManager.h | 2 +- .../framework/sofa/helper/system/console.cpp | 210 +- SofaKernel/framework/sofa/helper/system/console.h | 228 +- .../sofa/helper/system/console_internal.h | 373 + .../framework/sofa/helper/testing/BaseTest.cpp | 5 +- SofaKernel/framework/sofa/helper/types/RGBAColor.h | 2 + .../framework/sofa/simulation/CMakeLists.txt | 5 +- .../sofa/simulation/DefaultVisualManagerLoop.cpp | 12 - .../sofa/simulation/MechanicalMatrixVisitor.h | 2 +- .../framework/sofa/simulation/MechanicalVisitor.h | 39 - .../DefaultMultiMatrixAccessor.cpp | 68 +- .../DefaultMultiMatrixAccessor.h | 10 +- .../SofaBaseLinearSolver/MatrixLinearSolver.h | 2 +- .../SofaBaseLinearSolver/MatrixLinearSolver.inl | 2 + .../SofaBaseMechanics/AddMToMatrixFunctor.h | 5 - .../SofaBaseMechanics/BarycentricMapping.inl | 366 +- .../modules/SofaBaseMechanics/DiagonalMass.cpp | 16 +- .../modules/SofaBaseMechanics/DiagonalMass.h | 67 +- .../modules/SofaBaseMechanics/DiagonalMass.inl | 720 +- .../modules/SofaBaseMechanics/IdentityMapping.h | 3 - .../modules/SofaBaseMechanics/IdentityMapping.inl | 32 - .../modules/SofaBaseMechanics/MechanicalObject.cpp | 28 - .../modules/SofaBaseMechanics/MechanicalObject.h | 11 +- .../modules/SofaBaseMechanics/MechanicalObject.inl | 18 +- .../SofaBaseMechanics_test/DiagonalMass_test.cpp | 323 +- .../SofaBaseMechanics_test/UniformMass_test.cpp | 203 +- .../modules/SofaBaseMechanics/SubsetMapping.inl | 31 - .../modules/SofaBaseMechanics/UniformMass.cpp | 124 +- SofaKernel/modules/SofaBaseMechanics/UniformMass.h | 60 +- .../modules/SofaBaseMechanics/UniformMass.inl | 278 +- .../SofaBaseTopology/EdgeSetGeometryAlgorithms.cpp | 1 - .../SofaBaseTopology/EdgeSetGeometryAlgorithms.h | 13 +- .../SofaBaseTopology/EdgeSetGeometryAlgorithms.inl | 102 +- .../SofaBaseTopology/EdgeSetTopologyAlgorithms.cpp | 1 - .../SofaBaseTopology/EdgeSetTopologyContainer.cpp | 204 +- .../SofaBaseTopology/EdgeSetTopologyContainer.h | 22 +- .../SofaBaseTopology/EdgeSetTopologyModifier.cpp | 380 +- .../SofaBaseTopology/EdgeSetTopologyModifier.h | 80 +- .../modules/SofaBaseTopology/GridTopology.cpp | 16 +- SofaKernel/modules/SofaBaseTopology/GridTopology.h | 7 +- .../HexahedronSetGeometryAlgorithms.cpp | 1 - .../HexahedronSetGeometryAlgorithms.inl | 12 +- .../HexahedronSetTopologyAlgorithms.cpp | 1 - .../HexahedronSetTopologyContainer.cpp | 175 +- .../HexahedronSetTopologyContainer.h | 6 +- .../HexahedronSetTopologyModifier.cpp | 174 +- .../HexahedronSetTopologyModifier.h | 37 +- .../modules/SofaBaseTopology/MeshTopology.cpp | 54 +- SofaKernel/modules/SofaBaseTopology/MeshTopology.h | 135 +- .../SofaBaseTopology/PointSetGeometryAlgorithms.h | 2 +- .../PointSetGeometryAlgorithms.inl | 4 +- .../SofaBaseTopology/PointSetTopologyContainer.cpp | 2 +- .../SofaBaseTopology/PointSetTopologyContainer.h | 2 +- .../SofaBaseTopology/PointSetTopologyModifier.cpp | 66 +- .../SofaBaseTopology/PointSetTopologyModifier.h | 49 +- .../SofaBaseTopology/QuadSetGeometryAlgorithms.h | 3 +- .../SofaBaseTopology/QuadSetGeometryAlgorithms.inl | 28 +- .../SofaBaseTopology/QuadSetTopologyContainer.cpp | 73 +- .../SofaBaseTopology/QuadSetTopologyContainer.h | 6 +- .../SofaBaseTopology/QuadSetTopologyModifier.cpp | 132 +- .../SofaBaseTopology/QuadSetTopologyModifier.h | 34 +- .../SofaBaseTopology_test/CMakeLists.txt | 13 +- .../SofaBaseTopology_test/EdgeSetTopology_test.cpp | 212 + .../HexahedronSetTopology_test.cpp | 444 + .../SofaBaseTopology_test/MeshTopology_test.cpp | 620 + .../SofaBaseTopology_test/QuadSetTopology_test.cpp | 330 + .../TetrahedronSetTopology_test.cpp | 447 + .../TriangleSetTopology_test.cpp | 329 + .../SofaBaseTopology_test/fake_TopologyScene.cpp | 81 + .../SofaBaseTopology_test/fake_TopologyScene.h | 57 + .../SofaBaseTopology/SparseGridTopology.cpp | 128 +- .../modules/SofaBaseTopology/SparseGridTopology.h | 13 +- .../TetrahedronSetGeometryAlgorithms.cpp | 1 - .../TetrahedronSetGeometryAlgorithms.h | 7 +- .../TetrahedronSetGeometryAlgorithms.inl | 74 +- .../TetrahedronSetTopologyAlgorithms.cpp | 1 - .../TetrahedronSetTopologyAlgorithms.h | 7 +- .../TetrahedronSetTopologyAlgorithms.inl | 156 +- .../TetrahedronSetTopologyContainer.cpp | 196 +- .../TetrahedronSetTopologyContainer.h | 63 +- .../TetrahedronSetTopologyModifier.cpp | 154 +- .../TetrahedronSetTopologyModifier.h | 39 +- .../SofaBaseTopology/TopologySparseDataHandler.inl | 7 +- .../TriangleSetGeometryAlgorithms.cpp | 1 - .../TriangleSetGeometryAlgorithms.h | 44 +- .../TriangleSetGeometryAlgorithms.inl | 220 +- .../TriangleSetTopologyAlgorithms.cpp | 78 +- .../TriangleSetTopologyAlgorithms.h | 64 +- .../TriangleSetTopologyAlgorithms.inl | 516 +- .../TriangleSetTopologyContainer.cpp | 524 +- .../TriangleSetTopologyContainer.h | 28 +- .../TriangleSetTopologyModifier.cpp | 237 +- .../SofaBaseTopology/TriangleSetTopologyModifier.h | 72 +- .../modules/SofaBaseVisual}/BackgroundSetting.cpp | 8 +- .../modules/SofaBaseVisual/BackgroundSetting.h | 60 + SofaKernel/modules/SofaBaseVisual/BaseCamera.cpp | 67 +- SofaKernel/modules/SofaBaseVisual/BaseCamera.h | 9 +- SofaKernel/modules/SofaBaseVisual/CMakeLists.txt | 4 + .../modules/SofaBaseVisual/Camera.cpp | 32 +- .../modules/SofaBaseVisual/Camera.h | 37 +- .../modules/SofaBaseVisual/InteractiveCamera.cpp | 3 +- .../modules/SofaBaseVisual/VisualModelImpl.cpp | 52 +- .../MakeAliasComponent_test.cpp | 2 +- .../MakeDataAliasComponent_test.cpp | 2 +- .../SofaComponentBase/messageHandlerComponent.cpp | 2 +- .../SofaDeformable/MeshSpringForceField.inl | 9 +- .../modules/SofaEigen2Solver/EigenSparseMatrix.h | 12 +- .../modules/SofaExplicitOdeSolver/EulerSolver.cpp | 3 +- .../modules/SofaExplicitOdeSolver/EulerSolver.h | 1 + .../SofaImplicitOdeSolver/EulerImplicitSolver.cpp | 23 +- .../SofaImplicitOdeSolver/EulerImplicitSolver.h | 2 + .../EulerImplicitSolverStatic_test.cpp | 4 +- .../scenes/EulerImplicitSpringDynamicTest.xml | 4 +- .../scenes/NewmarkSpringDynamicTest.xml | 2 +- .../modules/SofaImplicitOdeSolver/StaticSolver.cpp | 3 +- .../modules/SofaImplicitOdeSolver/StaticSolver.h | 1 + SofaKernel/modules/SofaLoader/MeshObjLoader.cpp | 698 +- SofaKernel/modules/SofaLoader/MeshObjLoader.h | 35 +- .../SofaRigid_test/RigidRigidMapping_test.cpp | 10 +- .../SofaSimpleFem/HexahedronFEMForceField.h | 12 - .../SofaSimpleFem/HexahedronFEMForceField.inl | 77 +- .../SofaSimpleFem/TetrahedronFEMForceField.inl | 24 +- .../modules/SofaSimulationCommon/CMakeLists.txt | 4 +- .../modules/SofaSimulationGraph/CMakeLists.txt | 4 +- .../modules/SofaSimulationTree/CMakeLists.txt | 4 +- .../simulation_test/scenes/PatchTestConstraint.scn | 2 +- SofaMisc/CMakeLists.txt | 2 +- .../SofaAllCommonComponents/CMakeLists.txt | 2 +- applications/plugins/CGALPlugin/CMakeLists.txt | 9 + applications/plugins/CGALPlugin/CylinderMesh.cpp | 21 +- .../plugins/CGALPlugin/MeshGenerationFromImage.cpp | 2 - .../plugins/CGALPlugin/MeshGenerationFromImage.h | 2 - applications/plugins/CImgPlugin/CMakeLists.txt | 33 +- applications/plugins/CMakeLists.txt | 5 +- .../Compliant/Compliant_test/Compliant_test.h | 4 +- .../Compliant_test/DampedOscillator_test.cpp | 4 +- .../Compliant/compliance/DampingCompliance.cpp | 1 + .../Compliant/compliance/DampingCompliance.h | 19 +- .../Compliant/compliance/DiagonalCompliance.cpp | 2 +- .../Compliant/compliance/DiagonalCompliance.h | 20 +- .../Compliant/compliance/FullCompliance.cpp | 2 + .../plugins/Compliant/compliance/FullCompliance.h | 19 +- .../compliance/LinearDiagonalCompliance.cpp | 2 + .../compliance/LinearDiagonalCompliance.h | 17 +- .../Compliant/compliance/UniformCompliance.cpp | 2 + .../Compliant/compliance/UniformCompliance.h | 21 +- .../Compliant/examples/CantileverBeam_4_4_20.scn | 2 +- .../compliance/LinearDiagonalCompliance.scn | 4 +- .../forcefield/CompliantPenaltyForceField.scn | 2 +- .../Compliant/examples/pseudoStaticSolver.scn | 4 +- applications/plugins/Compliant/examples/stops.scn | 4 +- .../Compliant/mapping/ProjectionMapping.cpp | 2 + .../plugins/Compliant/mapping/ProjectionMapping.h | 15 +- .../Compliant/mapping/RigidRestJointMapping.cpp | 1 + .../Compliant/mapping/RigidRestJointMapping.h | 11 +- .../examples/VRPNImagerRigidPhysics1.scn | 4 +- .../examples/demos/linearHexaFEM-armadillo.scn | 95 +- .../examples/misc/staticProjectiveDynamics.scn | 6 +- .../examples/shapeFunction/BezierTetrahedron.scn | 3 +- .../examples/shapeFunction/linear_Vec3F331.scn | 2 +- .../shapeFunction/test_linear_Vec3F331.scn | 2 +- .../examples/shapeFunction/test_shapefunction.scn | 2 +- .../types/ComponentSpecializations.cpp.inl | 162 +- applications/plugins/Geomagic/CMakeLists.txt | 8 +- .../plugins/Geomagic/GeomagicConfig.cmake.in | 15 + .../plugins/Geomagic/scenes/Geomagic-Demo.scn | 2 +- .../plugins/Geomagic/scenes/Geomagic-FEMLiver.scn | 4 +- .../Geomagic/scenes/Geomagic-RigidSkull.scn | 2 +- .../plugins/Geomagic/src/GeomagicDriver.cpp | 588 +- applications/plugins/Geomagic/src/GeomagicDriver.h | 67 +- .../plugins/Geomagic/src/config.h | 23 +- applications/plugins/Haption/exemple/haption1.scn | 6 +- applications/plugins/Haption/exemple/temp1.scn | 6 +- .../InvertibleFVM/InvertibleFVMForceField.inl | 25 +- .../plugins/InvertibleFVM/examples/plane.scn | 4 +- .../plugins/InvertibleFVM/examples/simple.scn | 4 +- ...leManifoldTesselatedTetraTopologicalMapping.scn | 3 +- .../SimpleTesselatedTetraTopologicalMapping.scn | 3 +- .../plugins/MeshSTEPLoader/MeshSTEPLoader.cpp | 110 +- .../plugins/MeshSTEPLoader/STEPShapeMapping.cpp | 26 +- .../plugins/MeshSTEPLoader/STEPShapeMapping.h | 2 +- applications/plugins/MultiThreading/CMakeLists.txt | 76 +- .../plugins/MultiThreading/config.h.in | 23 +- .../examples/BeamLinearMapping_mt.scn | 2 +- .../examples/TriangularForceFieldComparison.scn | 2 +- .../plugins/MultiThreading/examples/livers.scn | 43 +- .../examples/liversMeanPositions.scn | 175 + .../src/AnimationLoopParallelScheduler.cpp | 86 +- .../src/AnimationLoopParallelScheduler.h | 11 +- .../MultiThreading/src/AnimationLoopTasks.cpp | 108 +- .../MultiThreading/src/AnimationLoopTasks.h | 104 +- .../MultiThreading/src/BeamLinearMapping_mt.h | 8 +- .../MultiThreading/src/BeamLinearMapping_mt.inl | 77 +- .../MultiThreading/src/BeamLinearMapping_tasks.inl | 18 +- .../plugins/MultiThreading/src/DataExchange.cpp | 4 +- .../plugins/MultiThreading/src/DataExchange.h | 10 + .../MultiThreading/src/DefaultTaskScheduler.cpp | 469 + .../MultiThreading/src/DefaultTaskScheduler.h | 251 + .../plugins/MultiThreading/src/InitTasks.cpp | 82 + .../plugins/MultiThreading/src/InitTasks.h | 47 +- applications/plugins/MultiThreading/src/Locks.h | 109 + .../plugins/MultiThreading/src/MeanComputation.cpp | 62 + .../plugins/MultiThreading/src/MeanComputation.h | 111 + .../plugins/MultiThreading/src/MeanComputation.inl | 148 + applications/plugins/MultiThreading/src/Task.cpp | 60 + .../plugins/MultiThreading/src/{Tasks.h => Task.h} | 147 +- .../plugins/MultiThreading/src/TaskScheduler.cpp | 98 + .../plugins/MultiThreading/src/TaskScheduler.h | 104 + .../MultiThreading/src/TaskSchedulerBoost.cpp | 535 - .../MultiThreading/src/TaskSchedulerBoost.h | 282 - applications/plugins/MultiThreading/src/Tasks.cpp | 69 - applications/plugins/MultiThreading/src/Tasks.inl | 47 - .../plugins/MultiThreading/src/VisitorAsync.h | 61 + .../plugins/MultiThreading/test/CMakeLists.txt | 21 + .../MultiThreading/test/TaskSchedulerTestTasks.cpp | 72 + .../MultiThreading/test/TaskSchedulerTestTasks.h | 53 + .../MultiThreading/test/TaskSchedulerTests.cpp | 102 + .../plugins/OpenCTMPlugin/OpenCTMPlugin.txt | 2 +- .../PersistentContactBarycentricMapping.inl | 16 - .../Registration/Registration_run/cubes.scn | 4 +- .../Registration/examples/imageregistration.scn | 2 +- applications/plugins/SceneCreator/CMakeLists.txt | 7 +- applications/plugins/SceneCreator/SceneCreator.cpp | 12 +- .../SceneCreatorBenchmarks.cpp | 2 +- applications/plugins/Sensable/PluginSensable.txt | 2 +- .../plugins/Sensable/examples/CameraAlignment.scn | 2 +- applications/plugins/Sensable/examples/Carving.scn | 2 +- .../Sensable/examples/Deformable-Method1.scn | 2 +- .../examples/Dentistry/dentalSurgery_06.scn | 2 +- .../examples/Dentistry/dentalSurgery_07.scn | 2 +- .../examples/Dentistry/dentalSurgery_08.scn | 2 +- .../Sensable/examples/SimpleBox-DistanceGrid.scn | 2 +- .../Sensable/examples/SimpleBox-Method2.scn | 2 +- .../Sensable/examples/SimpleBox-TriangleModel.scn | 2 +- .../plugins/Sensable/examples/SimpleBoxLarge.scn | 2 +- .../Sensable/examples/SimpleTooth-DistanceGrid.scn | 2 +- .../examples/SimpleTooth-TriangleModel.scn | 2 +- .../plugins/Sensable/examples/SpecifyingCamera.scn | 2 +- .../Sensable/examples/TwoTeeth-DistanceGrid.scn | 2 +- .../Sensable/examples/TwoTeeth-TriangleModel.scn | 2 +- .../examples/SimpleBox-Method2.scn | 2 +- applications/plugins/SofaAssimp/AssimpLoader.cpp | 215 + applications/plugins/SofaAssimp/AssimpLoader.h | 85 + applications/plugins/SofaAssimp/CMakeLists.txt | 55 + .../plugins/SofaAssimp/README_AssimpPlugin.txt | 31 + .../plugins/SofaAssimp/SofaAssimpConfig.cmake.in | 15 + .../plugins/SofaAssimp/cmake/FindAssimp.cmake | 82 + applications/plugins/SofaAssimp/config.h | 38 + .../SofaAssimp/examples/AssimpFbxLoader.scn | 26 + .../SofaAssimp/examples/AssimpObjLoader.scn | 26 + .../plugins/SofaAssimp/examples/mesh/Sofa.fbx | Bin 0 -> 682928 bytes .../plugins/SofaAssimp/initAssimpPlugin.cpp | 83 + .../plugins/SofaCUDA/examples/.scene-tests | 2 + .../SofaCUDA/examples/CudaDiagonalMass3f.scn | 20 + .../SofaCUDA/examples/CudaMeshMatrixMass3f.scn | 20 + .../StandardTetrahedralFEMForceFieldCPU.scn | 6 +- .../StandardTetrahedralFEMForceFieldCUDA.scn | 6 +- .../TetrahedralTensorMassForceFieldCPU.scn | 6 +- .../TetrahedralTensorMassForceFieldCUDA.scn | 6 +- .../sofa/gpu/cuda/CudaBarycentricMapping-3f.cpp | 22 +- .../gpu/cuda/CudaBarycentricMapping-3f1-3f.cpp | 44 +- .../sofa/gpu/cuda/CudaBarycentricMapping-3f1.cpp | 65 +- .../sofa/gpu/cuda/CudaBarycentricMapping.inl | 28 +- .../SofaCUDA/sofa/gpu/cuda/CudaDiagonalMass.inl | 16 +- .../SofaCUDA/sofa/gpu/cuda/CudaMeshMatrixMass.cpp | 18 +- .../SofaCUDA/sofa/gpu/cuda/CudaMeshMatrixMass.cu | 235 + .../SofaCUDA/sofa/gpu/cuda/CudaMeshMatrixMass.h | 55 + .../SofaCUDA/sofa/gpu/cuda/CudaMeshMatrixMass.inl | 119 +- .../SofaCUDA/sofa/gpu/cuda/CudaUniformMass.inl | 50 +- applications/plugins/SofaCarving/CMakeLists.txt | 30 +- .../plugins/SofaCarving/CarvingManager.cpp | 210 +- applications/plugins/SofaCarving/CarvingManager.h | 75 +- applications/plugins/SofaCarving/SofaCarving.txt | 13 +- .../plugins/SofaCarving/SofaCarvingConfig.cmake.in | 9 + .../SofaCarving/SofaCarving_test/CMakeLists.txt | 14 + .../SofaCarving_test/SofaCarving_test.cpp | 335 + .../plugins/SofaCarving/examples/CarvingTool.scn | 59 + .../plugins/SofaCarving/examples/SimpleCarving.scn | 66 +- .../examples/SimpleCarving_withPenetration.scn | 46 + .../SofaCarving/examples/data/mesh/cylinder.msh | 2946 --- .../SofaCarving/images/carvingTool_result.png | Bin 0 -> 186577 bytes .../SofaCarving/images/simpleCarving_results.png | Bin 0 -> 670546 bytes .../plugins/SofaCarving/initSofaCarving.cpp | 4 +- .../collision/DistanceGridCollisionModel.cpp | 37 +- .../examples/DistanceGridCollisionModel.scn | 2 +- .../examples/DistanceGridForceField-liver.scn | 2 +- .../examples/FFDDistanceGridCollisionModel.scn | 4 +- .../examples/ImplicitSurfaceMapping.scn | 2 +- .../plugins/SofaMiscCollision/CMakeLists.txt | 5 +- .../plugins/SofaMiscCollision/TetrahedronModel.cpp | 137 +- .../plugins/SofaMiscCollision/TetrahedronModel.h | 1 + .../TriangleModelInRegularGrid.cpp | 1 - applications/plugins/SofaPython/Binding.cpp | 2 + applications/plugins/SofaPython/Binding_Base.cpp | 334 +- .../plugins/SofaPython/Binding_BaseObject.cpp | 7 + .../plugins/SofaPython/Binding_BoundingBoxData.cpp | 68 + .../plugins/SofaPython/Binding_BoundingBoxData.h | 13 +- .../plugins/SofaPython/Binding_DataEngine.cpp | 8 +- .../SofaPython/Binding_PythonScriptController.cpp | 15 + applications/plugins/SofaPython/CMakeLists.txt | 9 +- .../SofaPython/PythonMainScriptController.cpp | 5 + .../SofaPython/PythonMainScriptController.h | 1 + .../plugins/SofaPython/PythonScriptController.cpp | 10 + .../plugins/SofaPython/PythonScriptController.h | 2 + .../plugins/SofaPython/PythonScriptEvent.h | 2 +- .../plugins/SofaPython/ScriptController.cpp | 1 + applications/plugins/SofaPython/ScriptController.h | 3 +- applications/plugins/SofaPython/ScriptDataEngine.h | 2 +- .../SofaPython_test/python/test_BindingBase.py | 2 +- .../python/test_BindingBaseObject.py | 4 +- .../SofaPython_test/python/test_BindingData.py | 2 +- applications/plugins/SofaPython/examples/DAG.py | 2 +- .../SofaPython/examples/ExampleController.py | 6 +- .../examples/PSDEExamples/01-basic/DataEngine.py | 12 - .../examples/PSDEExamples/01-basic/PSDEBasic.pyscn | 31 - .../PSDEExamples/02-advanced/Compound.pyscn | 140 - .../PSDEExamples/02-advanced/Controller.py | 42 - .../02-advanced/DataEngineIntersection.py | 42 - .../PSDEExamples/02-advanced/DataEngineROI1.py | 30 - .../PSDEExamples/02-advanced/DataEngineROI2.py | 33 - .../PSDEExamples/02-advanced/DataEngineROI3.py | 31 - .../PSDEExamples/02-advanced/DataEngineROI4.py | 29 - .../PSDEExamples/02-advanced/DataEngineUnion1.py | 27 - .../PSDEExamples/02-advanced/DataEngineUnion2.py | 27 - .../examples/PSDEExamples/02-advanced/ROI.py | 63 - .../02-advanced/VolumetricMeshGeneration.pyscn | 48 - .../SofaPython/examples/PSDEExamples/DataEngine.py | 12 + .../examples/PSDEExamples/DataEngine2.py | 13 + .../examples/PSDEExamples/PSDEAvgEngine.pyscn | 57 + .../examples/PSDEExamples/PSDEBasic.pyscn | 17 + .../SofaPython/examples/RegularGridFromMesh.py | 49 + .../plugins/SofaPython/examples/fontain.scn | 29 - .../examples/{fontain.py => fountain.py} | 92 +- .../plugins/SofaPython/examples/fountain.scn | 23 + .../SofaPython/examples/keyboardControl.scn | 21 +- applications/plugins/SofaSphFluid/ParticleSink.h | 38 +- .../SofaSphFluid/ParticlesRepulsionForceField.inl | 36 +- .../plugins/SofaSphFluid/SPHFluidForceField.inl | 80 +- .../SofaSphFluid/SPHFluidSurfaceMapping.inl | 30 +- applications/plugins/SofaTest/DataEngine_test.h | 15 +- applications/plugins/SofaTest/Elasticity_test.inl | 10 +- applications/plugins/SofaTest/Mapping_test.h | 2 +- applications/plugins/SofaTest/Python_test.cpp | 13 + applications/plugins/SofaTest/Python_test.h | 7 + .../SofaTest/SofaTest_test/regression/gravity.scn | 2 +- .../SofaTest/SofaTest_test/scenes/damping.py | 2 +- applications/plugins/SofaTest/Sofa_test.h | 18 +- .../plugins/Xitact/examples/XitactGrasping.scn | 2 +- .../examples/XitactGraspingWithForceFeedBack.scn | 2 +- .../examples/XitactGrasping_coupledModel.scn | 2 +- .../XitactGrasping_coupledModel_withITP.scn | 2 +- applications/plugins/image/CMakeLists.txt | 22 +- applications/plugins/image/ImageTypes.cpp | 45 +- applications/plugins/image/Kinect.h | 2 + applications/plugins/image/config.h.in | 2 + .../plugins/image/examples/loadimage_mt.scn | 19 + .../plugins/image/examples/sampler_HexaFEM.scn | 2 +- applications/projects/CMakeLists.txt | 5 +- applications/projects/Modeler/exec/CMakeLists.txt | 5 - applications/projects/Modeler/lib/CMakeLists.txt | 13 - .../SofaPhysicsAPI/SofaPhysicsSimulation.cpp | 1 - .../projects/getDeprecatedComponents/main.cpp | 2 +- applications/projects/runSofa/CMakeLists.txt | 46 +- applications/projects/runSofa/Main.cpp | 46 +- .../runSofa/cmake/GeneratePluginConfig.cmake | 59 +- .../projects/runSofa/cmake/bundle-post.cmake | 14 + applications/projects/runSofa/cmake/bundle.cmake | 78 +- applications/projects/runSofa/etc/runSofa.ini.in | 1 + applications/sofa/gui/GUIManager.cpp | 2 +- applications/sofa/gui/SofaGuiCommon/CMakeLists.txt | 5 +- applications/sofa/gui/SofaGuiMain/CMakeLists.txt | 14 +- .../sofa/gui/headlessRecorder/HeadlessRecorder.cpp | 2 +- .../sofa/gui/headlessRecorder/HeadlessRecorder.h | 8 +- .../gui/headlessRecorder/VideoRecorderFFMpeg.cpp | 10 +- applications/sofa/gui/qt/CMakeLists.txt | 58 +- .../sofa/gui/qt/DisplayFlagsDataWidget.cpp | 8 +- applications/sofa/gui/qt/GenGraphForm.cpp | 6 +- applications/sofa/gui/qt/GenGraphForm.h | 2 +- applications/sofa/gui/qt/QSofaListView.cpp | 2 +- applications/sofa/gui/qt/RealGUI.cpp | 117 +- applications/sofa/gui/qt/etc/SofaGuiQt.ini.in | 1 + applications/sofa/gui/qt/viewer/qgl/QtGLViewer.cpp | 8 + applications/sofa/gui/qt/viewer/qt/QtViewer.cpp | 27 +- applications/sofa/gui/qt/viewer/qt/QtViewer.h | 1 + applications/tutorials/CMakeLists.txt | 4 +- applications/tutorials/chainHybrid/CMakeLists.txt | 17 +- applications/tutorials/chainHybrid/chainHybrid.cpp | 119 +- .../tutorials/oneTetrahedron/oneTetrahedron.cpp | 83 +- cmake/Modules/FindCython.cmake | 48 + cmake/Modules/FindICU.cmake | 690 + .../animationloop/FreeMotionAnimationLoop.scn | 2 +- .../animationloop/MechanicalMatrixMapper.html | 26 + .../animationloop/MechanicalMatrixMapper.pyscn | 48 + .../Components/collision/RayTraceCollision.scn | 20 +- .../collision/RuleBasedContactManager.scn | 6 +- .../Components/collision/SpatialGridPointModel.scn | 2 +- examples/Components/collision/SphereModel.scn | 2 +- examples/Components/collision/TriangleModel.scn | 2 +- .../constraint/AffineMovementConstraint.scn | 2 +- .../constraint/AffineMovementConstraint3D.scn | 2 +- .../Components/constraint/AttachConstraint.scn | 14 +- .../constraint/AttachConstraintMatrix.scn | 8 +- .../constraint/BilateralInteractionConstraint.scn | 8 +- .../BilateralInteractionConstraint_Rigid.scn | 4 +- .../Components/constraint/BilinearConstraint.scn | 2 +- .../Components/constraint/BilinearConstraint3D.scn | 2 +- examples/Components/constraint/BoxConstraint.scn | 2 +- .../constraint/DOFBlockerLMConstraint.scn | 10 +- .../Components/constraint/DistanceLMConstraint.scn | 6 +- .../constraint/DistanceLMContactConstraint.scn | 2 +- .../DistanceLMContactConstraint_DirectSolver.scn | 4 +- examples/Components/constraint/FixedConstraint.scn | 2 +- .../Components/constraint/FixedPlaneConstraint.scn | 2 +- examples/Components/constraint/FrictionContact.scn | 4 +- .../FrictionContact_VelocityConstraints.scn | 12 +- .../constraint/HermiteSplineConstraint.scn | 5 +- .../Components/constraint/InextensiblePendulum.scn | 5 +- .../constraint/LMConstraintCollisionResponse.scn | 94 +- .../constraint/NonBuiltConstraintCorrection.scn | 8 +- .../Components/constraint/OscillatorConstraint.scn | 3 +- .../Components/constraint/ParabolicConstraint.scn | 2 +- .../constraint/PartialFixedConstraint.scn | 2 +- examples/Components/constraint/ParticleSink.scn | 2 +- examples/Components/constraint/ParticleSource.scn | 2 +- examples/Components/constraint/PlaneConstraint.scn | 2 +- .../Components/constraint/SlidingConstraint.scn | 4 +- .../ArticulatedHierarchyBVHController.scn | 2 +- .../Components/controller/EdgeSetController.scn | 2 +- .../controller/MechanicalStateController.scn | 2 +- .../MechanicalStateControllerTranslation.scn | 2 +- examples/Components/engine/GenerateRigidMass.scn | 8 +- .../engine/SubsetTopology_refiningMesh.scn | 4 +- .../engine/SubsetTopology_subsetbehaviormodel.scn | 2 +- examples/Components/engine/TransformEngine.scn | 2 +- .../engine/ValuesFromPositions_vectorField.scn | 2 +- examples/Components/engine/vertex2frame.scn | 2 +- .../Components/forcefield/BeamFEMForceField.scn | 4 +- .../forcefield/BoxConstantForceField.scn | 2 +- .../Components/forcefield/BuoyantForceField.scn | 2 +- .../forcefield/BuoyantForceField2Boxes.scn | 2 +- .../Components/forcefield/ConicalForceField.scn | 2 +- .../Components/forcefield/ConstantForceField.scn | 2 +- .../Components/forcefield/EllipsoidForceField.scn | 2 +- ...etrahedronCorotationalForceField_validation.scn | 3 +- examples/Components/forcefield/ForceMaskOff.scn | 2 +- .../Components/forcefield/GearSpringForceField.scn | 2 +- .../forcefield/HexahedronFEMForceField.scn | 2 +- .../forcefield/JointSpringForceField.scn | 2 +- .../forcefield/LennardJonesForceField.scn | 2 +- .../Components/forcefield/MeshSpringForceField.scn | 8 +- .../forcefield/ParticlesRepulsionForceField.scn | 2 +- examples/Components/forcefield/PlaneForceField.scn | 4 +- .../Components/forcefield/QuadBendingSprings.scn | 2 +- .../forcefield/RegularGridSpringForceField.scn | 8 +- .../forcefield/RestShapeSpringsForceField.scn | 8 +- .../forcefield/RestShapeSpringsForceField2.scn | 8 +- .../Components/forcefield/SPHFluidForceField.scn | 2 +- .../Components/forcefield/SphereForceField.scn | 2 +- .../StandardTetrahedralFEMForceField.scn | 3 +- .../forcefield/SurfacePressureForceField.scn | 4 +- .../TetrahedralCorotationalFEMForceField.scn | 1 + .../forcefield/TetrahedronFEMForceField.scn | 6 +- .../TetrahedronFEMForceField_plasticity.scn | 8 +- .../forcefield/TriangleBendingSprings.scn | 6 +- .../forcefield/TriangleFEMForceField.scn | 6 +- .../forcefield/WashingMachineForceField.scn | 2 +- .../BoxStiffSpringForceField.scn | 6 +- .../InteractionEllipsoidForceField.scn | 4 +- .../Components/linearsolver/CGLinearSolver.scn | 2 +- examples/Components/linearsolver/Eigen3-SVD.scn | 2 +- .../linearsolver/FEMBAR-PCGLinearSolver.scn | 18 + .../linearsolver/FEMBAR-SparseCholeskySolver.scn | 18 + .../linearsolver/FEMBAR-SparseLDLSolver.scn | 18 + .../linearsolver/FEMBAR-SparseLUSolver.scn | 18 + .../Components/linearsolver/MinResLinearSolver.scn | 2 +- examples/Components/loader/MeshSTLLoader.scn | 4 - .../Components/loader/MeshSTLLoader_binary.scn | 3 - .../mapping/ArticulatedSystemMapping.scn | 2 +- examples/Components/mapping/BarycentricMapping.scn | 30 +- .../mapping/BarycentricMappingTrussBeam.scn | 9 +- .../Components/mapping/CatmullRomSplineMapping.scn | 4 +- .../Components/mapping/CenterOfMassMapping.scn | 2 +- examples/Components/mapping/IdentityMapping.scn | 2 +- .../Components/mapping/IdentityMultiMapping.scn | 2 +- examples/Components/mapping/RigidRigidMapping.scn | 2 +- .../Components/mapping/SPHFluidSurfaceMapping.scn | 2 +- examples/Components/mapping/SkinningMapping.scn | 2 +- examples/Components/mapping/SubsetMultiMapping.scn | 4 +- examples/Components/mass/UniformMass.scn | 2 +- examples/Components/misc/Gravity.scn | 4 +- examples/Components/misc/MeshTetraStuffing.scn | 2 +- examples/Components/misc/Monitor.scn | 10 +- examples/Components/misc/MonitorTest.scn | 2 +- examples/Components/misc/ReadState.xml | 19 + examples/Components/misc/WriteState.xml | 22 + examples/Components/misc/sleep/test_sleep.scn | 4 +- examples/Components/misc/sleep/test_sleep2.scn | 6 +- examples/Components/misc/sleep/test_sleep3.scn | 6 +- examples/Components/solver/DampVelocitySolver.scn | 2 +- examples/Components/solver/EulerExplicitSolver.scn | 2 +- examples/Components/solver/EulerImplicitSolver.scn | 8 +- .../Components/solver/NewmarkImplicitSolver.scn | 2 +- examples/Components/solver/RungeKutta4Solver.scn | 2 +- examples/Components/solver/StaticSolver.scn | 12 +- .../solver/VariationalSymplecticSolver.scn | 2 +- examples/Components/topology/CubeTopology.scn | 2 +- .../Components/topology/CylinderGridTopology.scn | 6 +- .../topology/Hexa2TetraTopologicalMapping.scn | 2 +- .../Hexa2TetraTopologicalMapping_export.scn | 2 +- .../topology/Mesh2PointTopologicalMapping.scn | 3 +- examples/Components/topology/MeshTopology.scn | 2 +- .../Components/topology/RegularGridTopology.scn | 4 +- .../topology/RegularGridTopology_dimension.scn | 6 +- .../SimpleTesselatedTetraTopologicalMapping.scn | 3 +- .../topology/SparseGridMultipleTopology.scn | 2 +- .../Components/topology/SparseGridTopology.scn | 6 +- .../Components/topology/SphereGridTopology.scn | 6 +- .../AddingHexa2QuadProcess.scn | 2 +- .../AddingQuad2TriangleProcess.scn | 7 +- .../AddingTetra2TriangleProcess.scn | 2 +- .../AddingTrianglesProcess.scn | 2 +- .../HexahedronForceFieldTopologyChangeHandling.scn | 2 +- .../QuadForceFieldTopologyChangeHandling.scn | 4 +- .../RemovingHexa2TetraProcess.scn | 2 +- .../RemovingTetra2TriangleProcess.scn | 2 - .../RemovingTetra2TriangleProcess.txt | 18 +- ...movingTetra2TriangleProcess_performanceTest.scn | 2 - examples/Components/visualmodel/DataDisplay.scn | 2 +- examples/Components/visualmodel/OglLabel.scn | 2 +- examples/Components/visualmodel/OglShader.scn | 2 +- .../Components/visualmodel/PointSplatModel.scn | 2 +- examples/Demos/2d.scn | 10 +- examples/Demos/2d_explicit.scn | 10 +- examples/Demos/caduceus.scn | 2 +- examples/Demos/caduceusOculus.scn | 2 +- examples/Demos/chainAll.scn | 30 +- examples/Demos/collisionMultiple.scn | 6 +- examples/Demos/collisionMultipleMask.scn | 6 +- examples/Objects/InstrumentCoil.xml | 2 +- examples/Objects/SMP/TorusFEM.xml | 2 +- examples/Objects/SMP/TorusFFD.xml | 2 +- examples/Objects/SMP/TorusSpring.xml | 2 +- examples/Objects/TorusFEM.xml | 2 +- examples/Objects/TorusFFD.xml | 4 +- examples/Objects/TorusSpring.xml | 2 +- examples/Tutorials/Basic/TutorialBasicCube.scn | 2 +- examples/Tutorials/Basic/TutorialBasicPendulum.scn | 2 +- .../Collision/AdvancedResponseConstraintBased.scn | 4 +- .../AdvancedSolversMultipleGroupsSolver.scn | 8 +- .../Collision/ModelizationSphereBased.scn | 2 +- .../Collision/ModelizationTriangleBased.scn | 2 +- .../MultipleObjectsDynamicCollisionGroups.scn | 8 +- .../MultipleObjectsStaticCollisionGroups.scn | 8 +- .../Collision/MultipleObjectsTwoCubes.scn | 4 +- .../ForceFields/TutorialForceFieldLiverFEM.scn | 5 +- .../ForceFields/TutorialForceFieldLiverHexaFEM.scn | 2 +- .../ForceFields/TutorialForceFieldLiverSprings.scn | 3 +- .../TutorialForceFieldLiverTriangleFEM.scn | 5 +- .../Mappings/TutorialMappingCubeSurface.scn | 2 +- .../Mappings/TutorialMappingDragonBarycentric.scn | 2 +- .../Mappings/TutorialMappingOctopusArticulated.scn | 2 +- examples/Tutorials/OldTutorials/demo1.scn | 10 +- examples/Tutorials/OldTutorials/demo10.scn | 8 +- examples/Tutorials/OldTutorials/demo10Triangle.scn | 8 +- examples/Tutorials/OldTutorials/tutorial1.scn | 6 +- examples/Tutorials/OldTutorials/tutorial2.scn | 6 +- examples/Tutorials/OldTutorials/tutorial3.scn | 4 +- examples/Tutorials/OldTutorials/tutorial4.scn | 6 +- examples/Tutorials/OldTutorials/tutorial4FEM.scn | 6 +- .../Dentistry_Haptics/dentalSurgery_03.scn | 2 +- .../Dentistry_Haptics/dentalSurgery_04.scn | 2 +- .../Dentistry_Haptics/dentalSurgery_05.scn | 2 +- .../Dentistry_Python/3_InstrumentControl.scn | 2 +- .../StepByStep/Dentistry_Python/4_Collisions.scn | 2 +- .../StepByStep/Dentistry_Python/6_FEM1.scn | 2 +- .../StepByStep/Dentistry_Python/6_FEM2.scn | 2 +- .../Dentistry_Python/7_CompleteScene.scn | 2 +- .../StepByStep/FullObject/5_FullObject.scn | 3 +- .../StepByStep/FullObject/6_FullObject.scn | 6 +- .../StepByStep/FullObject/7_FullObject.scn | 6 +- .../StepByStep/FullObject/8_FullObject.scn | 6 +- .../TopologicalMapping/5_TopoMapping.scn | 3 +- .../TopologicalMapping/6_TopoMapping.scn | 3 +- .../Topologies/TopologyDynamicSurfaceMesh.scn | 4 +- .../TopologyHexa2QuadTopologicalMapping.scn | 2 +- .../TopologyHexa2TetraTopologicalMapping.scn | 2 +- .../Topologies/TopologyLinearDifferentMesh.scn | 6 +- .../Tutorials/Topologies/TopologyLinearMesh.scn | 4 +- .../Topologies/TopologySurfaceDifferentMesh.scn | 67 +- .../Topologies/TopologySurfaceDifferentMesh_01.png | Bin 64337 -> 17305 bytes .../Topologies/TopologySurfaceDifferentMesh_02.png | Bin 55233 -> 113273 bytes .../Topologies/TopologyVolumeDifferentMesh.scn | 12 +- extlibs/SuiteSparse/CMakeLists.txt | 4 +- .../libQGLViewer-2.7.1/QGLViewer/CMakeLists.txt | 38 +- modules/CMakeLists.txt | 7 + .../SofaBoundaryCondition/BuoyantForceField.inl | 1 - modules/SofaBoundaryCondition/ConicalForceField.h | 2 - .../SofaBoundaryCondition/ConicalForceField.inl | 35 +- .../EdgePressureForceField.inl | 26 +- .../SofaBoundaryCondition/EllipsoidForceField.h | 2 - .../SofaBoundaryCondition/EllipsoidForceField.inl | 19 +- modules/SofaBoundaryCondition/FixedConstraint.cpp | 30 +- modules/SofaBoundaryCondition/FixedConstraint.h | 22 +- modules/SofaBoundaryCondition/FixedConstraint.inl | 115 +- .../SofaBoundaryCondition/FixedPlaneConstraint.inl | 1 - .../FixedTranslationConstraint.cpp | 62 - .../FixedTranslationConstraint.h | 10 - .../FixedTranslationConstraint.inl | 33 +- .../HermiteSplineConstraint.inl | 60 +- .../LinearMovementConstraint.inl | 41 +- .../LinearVelocityConstraint.cpp | 71 - .../LinearVelocityConstraint.h | 17 - .../LinearVelocityConstraint.inl | 29 +- .../OscillatingTorsionPressureForceField.inl | 30 +- .../SofaBoundaryCondition/OscillatorConstraint.cpp | 1 - .../SofaBoundaryCondition/ParabolicConstraint.cpp | 2 - .../SofaBoundaryCondition/ParabolicConstraint.inl | 39 +- .../PartialFixedConstraint.cpp | 91 - .../SofaBoundaryCondition/PartialFixedConstraint.h | 81 +- .../PartialFixedConstraint.inl | 330 +- .../PartialLinearMovementConstraint.inl | 36 +- .../PatchTestMovementConstraint.inl | 1 - modules/SofaBoundaryCondition/PlaneForceField.h | 10 + modules/SofaBoundaryCondition/PlaneForceField.inl | 24 +- modules/SofaBoundaryCondition/PointConstraint.inl | 30 +- .../PositionBasedDynamicsConstraint.inl | 1 - .../ProjectDirectionConstraint.cpp | 16 - .../ProjectDirectionConstraint.h | 8 - .../ProjectDirectionConstraint.inl | 31 +- .../ProjectToLineConstraint.cpp | 16 - .../ProjectToLineConstraint.h | 9 - .../ProjectToLineConstraint.inl | 30 +- .../ProjectToPlaneConstraint.cpp | 115 - .../ProjectToPlaneConstraint.h | 9 - .../ProjectToPlaneConstraint.inl | 33 +- .../ProjectToPointConstraint.cpp | 107 - .../ProjectToPointConstraint.h | 5 - .../ProjectToPointConstraint.inl | 27 +- .../QuadPressureForceField.inl | 27 +- .../SkeletalMotionConstraint.inl | 1 - .../SofaBoundaryCondition_test/CMakeLists.txt | 11 +- .../FixedConstraint_test.cpp | 14 +- ...straint.cpp => PartialFixedConstraint_test.cpp} | 78 +- .../PlaneForceField_test.cpp | 2 +- modules/SofaBoundaryCondition/SphereForceField.h | 2 - modules/SofaBoundaryCondition/SphereForceField.inl | 14 +- .../SurfacePressureForceField.h | 7 - .../SurfacePressureForceField.inl | 183 +- .../TaitSurfacePressureForceField.inl | 1 - .../TrianglePressureForceField.inl | 107 +- .../SofaBoundaryCondition/VaccumSphereForceField.h | 2 - .../VaccumSphereForceField.inl | 13 +- modules/SofaComponentGeneral/CMakeLists.txt | 2 +- .../SofaComponentGeneral/initComponentGeneral.cpp | 10 +- .../BilateralInteractionConstraint.cpp | 2 +- .../BilateralInteractionConstraint.inl | 69 +- modules/SofaConstraint/DOFBlockerLMConstraint.inl | 14 +- modules/SofaConstraint/DistanceLMConstraint.inl | 5 +- .../SofaConstraint/DistanceLMContactConstraint.inl | 4 +- modules/SofaConstraint/FixedLMConstraint.cpp | 50 - modules/SofaConstraint/FixedLMConstraint.inl | 12 - modules/SofaConstraint/FreeMotionAnimationLoop.cpp | 9 +- modules/SofaConstraint/FreeMotionAnimationLoop.h | 2 + modules/SofaConstraint/GenericConstraintSolver.cpp | 3 - modules/SofaConstraint/LCPConstraintSolver.cpp | 16 +- .../LinearSolverConstraintCorrection.h | 2 +- modules/SofaConstraint/LocalMinDistance.inl | 1 - .../PrecomputedConstraintCorrection.inl | 79 +- modules/SofaConstraint/SlidingConstraint.inl | 45 +- .../scenes_test/BilateralInteractionConstraint.scn | 2 +- modules/SofaConstraint/StopperConstraint.inl | 2 +- .../UncoupledConstraintCorrection.cpp | 2 +- .../UnilateralInteractionConstraint.inl | 68 +- modules/SofaExporter/MeshExporter.cpp | 102 +- modules/SofaExporter/STLExporter.cpp | 1 + .../SofaExporter/SofaExporter_test/CMakeLists.txt | 8 +- .../SofaExporter_test/STLExporter_test.cpp | 6 +- .../SofaExporter_test/WriteState_test.cpp | 259 + .../files/particleGravityV-reference.data | 14 + .../files/particleGravityX-reference.data | 14 + modules/SofaExporter/VTKExporter.cpp | 58 +- modules/SofaExporter/WriteState.cpp | 8 +- modules/SofaExporter/WriteState.h | 28 +- modules/SofaExporter/WriteState.inl | 224 +- modules/SofaGeneralAnimationLoop/CMakeLists.txt | 9 +- .../MechanicalMatrixMapper.cpp | 77 + .../MechanicalMatrixMapper.h | 282 + .../MechanicalMatrixMapper.inl | 558 + .../FastTriangularBendingSprings.inl | 38 +- .../FrameSpringForceField.inl | 52 +- .../QuadularBendingSprings.inl | 138 +- .../RegularGridSpringForceField.inl | 142 +- .../TriangularBendingSprings.inl | 101 +- .../TriangularBiquadraticSpringsForceField.inl | 49 +- .../TriangularQuadraticSpringsForceField.inl | 69 +- .../TriangularTensorMassForceField.inl | 45 +- .../VectorSpringForceField.inl | 8 +- modules/SofaGeneralEngine/AverageCoord.inl | 1 - modules/SofaGeneralEngine/ClusteringEngine.inl | 27 +- .../ExtrudeEdgesAndGenerateQuads.inl | 2 - .../ExtrudeQuadsAndGenerateHexas.inl | 2 - modules/SofaGeneralEngine/ExtrudeSurface.inl | 47 +- modules/SofaGeneralEngine/HausdorffDistance.inl | 1 - modules/SofaGeneralEngine/IndicesFromValues.inl | 1 - modules/SofaGeneralEngine/MapIndices.inl | 1 - modules/SofaGeneralEngine/MergeMeshes.inl | 1 - modules/SofaGeneralEngine/MergePoints.inl | 1 - modules/SofaGeneralEngine/MergeSets.inl | 1 - .../MeshBarycentricMapperEngine.inl | 11 +- modules/SofaGeneralEngine/MeshROI.cpp | 8 +- modules/SofaGeneralEngine/MeshROI.inl | 258 +- modules/SofaGeneralEngine/MeshSampler.inl | 1 - modules/SofaGeneralEngine/NormalsFromPoints.inl | 1 - modules/SofaGeneralEngine/PairBoxRoi.inl | 85 +- modules/SofaGeneralEngine/PlaneROI.inl | 131 +- modules/SofaGeneralEngine/PointsFromIndices.inl | 1 - modules/SofaGeneralEngine/ProximityROI.h | 1 - modules/SofaGeneralEngine/ProximityROI.inl | 31 +- .../RandomPointDistributionInSurface.inl | 54 +- modules/SofaGeneralEngine/ShapeMatching.inl | 1 - modules/SofaGeneralEngine/SmoothMeshEngine.inl | 63 +- .../SofaGeneralEngine_test/MeshROI_test.cpp | 4 +- modules/SofaGeneralEngine/SphereROI.h | 1 - modules/SofaGeneralEngine/SphereROI.inl | 96 +- modules/SofaGeneralEngine/Spiral.inl | 2 - modules/SofaGeneralEngine/SubsetTopology.inl | 94 +- modules/SofaGeneralEngine/TransformEngine.h | 11 +- modules/SofaGeneralEngine/TransformEngine.inl | 6 +- modules/SofaGeneralEngine/TransformPosition.inl | 4 +- modules/SofaGeneralEngine/ValuesFromIndices.inl | 1 - modules/SofaGeneralEngine/ValuesFromPositions.inl | 31 +- .../CentralDifferenceSolver.cpp | 3 +- .../CentralDifferenceSolver.h | 2 +- .../VariationalSymplecticSolver.cpp | 5 +- .../VariationalSymplecticSolver.h | 1 + modules/SofaGeneralLoader/GIDMeshLoader.cpp | 106 +- modules/SofaGeneralLoader/MeshGmshLoader.cpp | 40 +- modules/SofaGeneralLoader/MeshOffLoader.cpp | 6 +- modules/SofaGeneralLoader/MeshSTLLoader.cpp | 76 +- modules/SofaGeneralLoader/MeshTrianLoader.cpp | 4 +- modules/SofaGeneralLoader/MeshXspLoader.cpp | 29 +- modules/SofaGeneralLoader/ReadState.cpp | 2 +- modules/SofaGeneralLoader/ReadState.h | 10 +- modules/SofaGeneralLoader/ReadState.inl | 31 +- .../SofaGeneralLoader_test/CMakeLists.txt | 6 +- .../SofaGeneralLoader_test/MeshSTLLoader_test.cpp | 0 .../SofaGeneralLoader_test/ReadState_test.cpp | 146 + .../files/particleGravityX.data | 14 + modules/SofaGeneralLoader/VoxelGridLoader.cpp | 4 +- .../AttachConstraint.inl | 38 +- .../BoxStiffSpringForceField.inl | 138 +- .../InteractionEllipsoidForceField.inl | 76 +- .../SofaGeneralRigid/ArticulatedSystemMapping.inl | 5 +- modules/SofaGeneralRigid/LineSetSkinningMapping.h | 1 - .../SofaGeneralRigid/LineSetSkinningMapping.inl | 26 +- modules/SofaGeneralRigid/SkinningMapping.inl | 39 +- modules/SofaGeneralSimpleFem/BeamFEMForceField.inl | 6 +- .../SofaGeneralSimpleFem/HexahedralFEMForceField.h | 1 - .../HexahedralFEMForceField.inl | 116 +- .../HexahedralFEMForceFieldAndMass.inl | 29 +- .../HexahedronFEMForceFieldAndMass.inl | 26 +- .../TetrahedralCorotationalFEMForceField.inl | 6 +- modules/SofaGeneralVisual/RecordedCamera.cpp | 48 +- modules/SofaGraphComponent/APIVersion.h | 2 +- modules/SofaGraphComponent/BackgroundSetting.h | 36 +- modules/SofaGraphComponent/CMakeLists.txt | 15 +- modules/SofaGraphComponent/SceneCheck.h | 66 + ...CheckAPIChanges.cpp => SceneCheckAPIChange.cpp} | 53 +- ...ceneCheckAPIChanges.h => SceneCheckAPIChange.h} | 59 +- .../SceneCheckDuplicatedName.cpp | 101 + .../SofaGraphComponent/SceneCheckDuplicatedName.h | 57 +- ...cks.cpp => SceneCheckMissingRequiredPlugin.cpp} | 125 +- .../SceneCheckMissingRequiredPlugin.h | 69 + .../SofaGraphComponent/SceneCheckUsingAlias.cpp | 107 + modules/SofaGraphComponent/SceneCheckUsingAlias.h | 65 + modules/SofaGraphComponent/SceneCheckerVisitor.cpp | 43 +- modules/SofaGraphComponent/SceneCheckerVisitor.h | 13 +- modules/SofaGraphComponent/SceneChecks.h | 104 - .../SofaGraphComponent_test/SceneChecker_test.cpp | 222 +- modules/SofaMiscEngine/Distances.inl | 15 +- .../FastTetrahedralCorotationalForceField.inl | 5 +- .../SofaMiscFem/SofaMiscFem_test/CMakeLists.txt | 14 +- ...dronHyperelasticityFEMForceField_scene_test.cpp | 2 - ...etrahedronHyperelasticityFEMForceField_test.scn | 46 +- .../StandardTetrahedralFEMForceField.inl | 28 - .../TetrahedralTensorMassForceField.inl | 46 +- .../TetrahedronHyperelasticityFEMForceField.inl | 4 +- modules/SofaMiscFem/TriangleFEMForceField.inl | 34 +- .../TriangularAnisotropicFEMForceField.h | 6 +- .../TriangularAnisotropicFEMForceField.inl | 22 +- modules/SofaMiscFem/TriangularFEMForceField.inl | 78 +- .../SofaMiscForceField/GearSpringForceField.inl | 61 +- .../SofaMiscForceField/LennardJonesForceField.inl | 4 +- modules/SofaMiscForceField/MatrixMass.inl | 2 - modules/SofaMiscForceField/MeshMatrixMass.cpp | 9 +- modules/SofaMiscForceField/MeshMatrixMass.h | 178 +- modules/SofaMiscForceField/MeshMatrixMass.inl | 1307 +- .../SofaMiscForceField_test/CMakeLists.txt | 12 + .../MeshMatrixMass_test.cpp | 1423 ++ modules/SofaMiscForceField/initMiscForcefield.cpp | 1 + .../SofaMiscMapping/BarycentricMappingRigid.inl | 12 +- modules/SofaMiscMapping/BeamLinearMapping.inl | 3 +- .../SofaMiscMapping/CatmullRomSplineMapping.inl | 37 +- modules/SofaMiscMapping/CenterOfMassMapping.inl | 8 +- modules/SofaMiscMapping/CurveMapping.inl | 6 +- modules/SofaMiscSolver/NewmarkImplicitSolver.cpp | 5 +- modules/SofaMiscSolver/NewmarkImplicitSolver.h | 2 + .../TopologicalChangeProcessor.cpp | 58 +- .../SofaMiscTopology/TopologicalChangeProcessor.h | 2 +- .../HexahedronCompositeFEMForceFieldAndMass.h | 2 +- .../HexahedronCompositeFEMForceFieldAndMass.inl | 677 +- .../HexahedronCompositeFEMMapping.inl | 1 - .../NonUniformHexahedronFEMForceFieldAndMass.h | 4 - .../NonUniformHexahedronFEMForceFieldAndMass.inl | 21 - modules/SofaOpenglVisual/CompositingVisualLoop.cpp | 4 +- modules/SofaOpenglVisual/Light.cpp | 144 +- modules/SofaOpenglVisual/Light.h | 6 + modules/SofaOpenglVisual/OglViewport.cpp | 2 +- modules/SofaPreconditioner/CMakeLists.txt | 77 +- .../SofaPreconditionerConfig.cmake.in | 11 + .../BlockJacobiPreconditioner.cpp | 0 .../BlockJacobiPreconditioner.h | 0 .../BlockJacobiPreconditioner.inl | 0 .../SofaPreconditioner}/JacobiPreconditioner.cpp | 0 .../SofaPreconditioner}/JacobiPreconditioner.h | 0 .../SofaPreconditioner}/JacobiPreconditioner.inl | 0 .../PrecomputedWarpPreconditioner.cpp | 0 .../PrecomputedWarpPreconditioner.h | 0 .../PrecomputedWarpPreconditioner.inl | 11 +- .../SofaPreconditioner}/Preconditioner.cpp | 0 .../{ => src/SofaPreconditioner}/Preconditioner.h | 0 .../SofaPreconditioner}/SSORPreconditioner.cpp | 0 .../SofaPreconditioner}/SSORPreconditioner.h | 0 .../SofaPreconditioner}/SSORPreconditioner.inl | 0 .../ShewchukPCGLinearSolver.cpp | 36 +- .../SofaPreconditioner}/ShewchukPCGLinearSolver.h | 2 +- .../SofaPreconditioner}/WarpPreconditioner.cpp | 0 .../SofaPreconditioner}/WarpPreconditioner.h | 0 .../SofaPreconditioner}/WarpPreconditioner.inl | 1 - .../{ => src/SofaPreconditioner}/config.h | 9 +- .../src/SofaPreconditioner/initPreconditioner.cpp | 90 + modules/SofaSparseSolver/CMakeLists.txt | 91 +- .../SofaSparseSolverConfig.cmake.in | 11 + .../examples/FEM_SparseCholeskySolver.scn | 2 +- .../examples/FEM_SparseLDLSolver.scn | 17 + .../examples/FEM_SparseLUSolver.scn | 17 + .../SofaSparseSolver}/PrecomputedLinearSolver.cpp | 2 +- .../SofaSparseSolver}/PrecomputedLinearSolver.h | 0 .../SofaSparseSolver}/PrecomputedLinearSolver.inl | 1 + .../SofaSparseSolver}/SparseCholeskySolver.cpp | 4 +- .../SofaSparseSolver}/SparseCholeskySolver.h | 4 +- .../{ => src/SofaSparseSolver}/SparseLDLSolver.cpp | 8 +- .../{ => src/SofaSparseSolver}/SparseLDLSolver.h | 16 +- .../{ => src/SofaSparseSolver}/SparseLDLSolver.inl | 2 +- .../SofaSparseSolver}/SparseLDLSolverImpl.h | 2 +- .../{ => src/SofaSparseSolver}/SparseLUSolver.cpp | 0 .../{ => src/SofaSparseSolver}/SparseLUSolver.h | 0 .../{ => src/SofaSparseSolver}/SparseLUSolver.inl | 0 .../{ => src/SofaSparseSolver}/SparseSolver.cpp | 0 .../{ => src/SofaSparseSolver}/SparseSolver.h | 6 +- .../{ => src/SofaSparseSolver}/config.h | 9 +- .../src/SofaSparseSolver/initSparseSolver.cpp | 92 + .../CenterPointTopologicalMapping.cpp | 2 +- .../Edge2QuadTopologicalMapping.cpp | 16 +- .../Hexa2QuadTopologicalMapping.cpp | 13 +- .../Hexa2TetraTopologicalMapping.cpp | 24 +- .../Mesh2PointTopologicalMapping.cpp | 40 +- .../Mesh2PointTopologicalMapping.h | 4 +- .../Quad2TriangleTopologicalMapping.cpp | 14 +- .../SimpleTesselatedHexaTopologicalMapping.cpp | 8 +- .../SimpleTesselatedTetraTopologicalMapping.cpp | 16 +- .../SubsetTopologicalMapping.cpp | 46 +- .../Tetra2TriangleTopologicalMapping.cpp | 23 +- .../Triangle2EdgeTopologicalMapping.cpp | 23 +- modules/SofaUserInteraction/EdgeSetController.inl | 36 +- modules/SofaUserInteraction/GraspingManager.cpp | 1 - .../InciseAlongPathPerformer.cpp | 22 +- modules/SofaUserInteraction/RayModel.cpp | 23 +- modules/SofaUserInteraction/RayTraceDetection.cpp | 32 +- .../RemovePrimitivePerformer.inl | 47 +- modules/SofaValidation/CompareState.cpp | 8 +- modules/SofaValidation/EvalPointsDistance.h | 2 +- modules/SofaValidation/EvalPointsDistance.inl | 30 +- modules/SofaValidation/EvalSurfaceDistance.inl | 5 +- .../SofaValidation_test/Monitor_test.cpp | 30 +- modules/tests/CMakeLists.txt | 3 +- package.cmake | 53 + scripts/ci/configure.sh | 7 + scripts/update-mass-data.sh | 62 + share/BehaviorModels/card.rigid | 2 +- share/BehaviorModels/torus.rigid | 2 +- share/BehaviorModels/torus2.rigid | 2 +- share/mesh/cube_low_res.msh | 79 + .../mesh/dental_instrument_light.obj | 0 share/mesh/square1_edges.mtl | 2 + share/mesh/square1_edges.obj | 69 + share/mesh/square1_quads.mtl | 10 + share/mesh/square1_quads.obj | 32 + 986 files changed, 39789 insertions(+), 30341 deletions(-) rename {applications/plugins/SofaPython => SofaKernel/framework/sofa/core/objectmodel}/ScriptEvent.cpp (97%) rename {applications/plugins/SofaPython => SofaKernel/framework/sofa/core/objectmodel}/ScriptEvent.h (89%) create mode 100644 SofaKernel/framework/sofa/helper/io/MeshGmsh.cpp rename SofaKernel/framework/sofa/helper/io/{MeshSTL.h => MeshGmsh.h} (80%) delete mode 100644 SofaKernel/framework/sofa/helper/io/MeshSTL.cpp delete mode 100644 SofaKernel/framework/sofa/helper/io/MeshTrian.cpp delete mode 100644 SofaKernel/framework/sofa/helper/io/MeshVTK.cpp create mode 100644 SofaKernel/framework/sofa/helper/logging/MessageFormatter.cpp create mode 100644 SofaKernel/framework/sofa/helper/system/console_internal.h create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/EdgeSetTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/HexahedronSetTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/MeshTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/QuadSetTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/TetrahedronSetTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/TriangleSetTopology_test.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/fake_TopologyScene.cpp create mode 100644 SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/fake_TopologyScene.h rename {modules/SofaGraphComponent => SofaKernel/modules/SofaBaseVisual}/BackgroundSetting.cpp (89%) create mode 100644 SofaKernel/modules/SofaBaseVisual/BackgroundSetting.h rename modules/SofaSparseSolver/initSparseSolver.cpp => SofaKernel/modules/SofaBaseVisual/Camera.cpp (81%) rename modules/SofaPreconditioner/initPreconditioner.cpp => SofaKernel/modules/SofaBaseVisual/Camera.h (77%) create mode 100644 applications/plugins/Geomagic/GeomagicConfig.cmake.in rename modules/SofaSparseSolver/initSparseSolver.h => applications/plugins/Geomagic/src/config.h (87%) rename modules/SofaPreconditioner/initPreconditioner.h => applications/plugins/MultiThreading/config.h.in (85%) create mode 100644 applications/plugins/MultiThreading/examples/liversMeanPositions.scn create mode 100644 applications/plugins/MultiThreading/src/DefaultTaskScheduler.cpp create mode 100644 applications/plugins/MultiThreading/src/DefaultTaskScheduler.h create mode 100644 applications/plugins/MultiThreading/src/InitTasks.cpp rename SofaKernel/framework/sofa/helper/io/MeshVTK.h => applications/plugins/MultiThreading/src/InitTasks.h (71%) create mode 100644 applications/plugins/MultiThreading/src/Locks.h create mode 100644 applications/plugins/MultiThreading/src/MeanComputation.cpp create mode 100644 applications/plugins/MultiThreading/src/MeanComputation.h create mode 100644 applications/plugins/MultiThreading/src/MeanComputation.inl create mode 100644 applications/plugins/MultiThreading/src/Task.cpp rename applications/plugins/MultiThreading/src/{Tasks.h => Task.h} (50%) create mode 100644 applications/plugins/MultiThreading/src/TaskScheduler.cpp create mode 100644 applications/plugins/MultiThreading/src/TaskScheduler.h delete mode 100644 applications/plugins/MultiThreading/src/TaskSchedulerBoost.cpp delete mode 100644 applications/plugins/MultiThreading/src/TaskSchedulerBoost.h delete mode 100644 applications/plugins/MultiThreading/src/Tasks.cpp delete mode 100644 applications/plugins/MultiThreading/src/Tasks.inl create mode 100644 applications/plugins/MultiThreading/src/VisitorAsync.h create mode 100644 applications/plugins/MultiThreading/test/CMakeLists.txt create mode 100644 applications/plugins/MultiThreading/test/TaskSchedulerTestTasks.cpp create mode 100644 applications/plugins/MultiThreading/test/TaskSchedulerTestTasks.h create mode 100644 applications/plugins/MultiThreading/test/TaskSchedulerTests.cpp create mode 100644 applications/plugins/SofaAssimp/AssimpLoader.cpp create mode 100644 applications/plugins/SofaAssimp/AssimpLoader.h create mode 100644 applications/plugins/SofaAssimp/CMakeLists.txt create mode 100644 applications/plugins/SofaAssimp/README_AssimpPlugin.txt create mode 100644 applications/plugins/SofaAssimp/SofaAssimpConfig.cmake.in create mode 100644 applications/plugins/SofaAssimp/cmake/FindAssimp.cmake create mode 100644 applications/plugins/SofaAssimp/config.h create mode 100644 applications/plugins/SofaAssimp/examples/AssimpFbxLoader.scn create mode 100644 applications/plugins/SofaAssimp/examples/AssimpObjLoader.scn create mode 100644 applications/plugins/SofaAssimp/examples/mesh/Sofa.fbx create mode 100644 applications/plugins/SofaAssimp/initAssimpPlugin.cpp create mode 100644 applications/plugins/SofaCUDA/examples/CudaDiagonalMass3f.scn create mode 100644 applications/plugins/SofaCUDA/examples/CudaMeshMatrixMass3f.scn create mode 100644 applications/plugins/SofaCarving/SofaCarvingConfig.cmake.in create mode 100644 applications/plugins/SofaCarving/SofaCarving_test/CMakeLists.txt create mode 100644 applications/plugins/SofaCarving/SofaCarving_test/SofaCarving_test.cpp create mode 100644 applications/plugins/SofaCarving/examples/CarvingTool.scn create mode 100644 applications/plugins/SofaCarving/examples/SimpleCarving_withPenetration.scn delete mode 100644 applications/plugins/SofaCarving/examples/data/mesh/cylinder.msh create mode 100644 applications/plugins/SofaCarving/images/carvingTool_result.png create mode 100644 applications/plugins/SofaCarving/images/simpleCarving_results.png create mode 100644 applications/plugins/SofaPython/Binding_BoundingBoxData.cpp rename SofaKernel/SofaFramework/build_option_experimental_features.h.in => applications/plugins/SofaPython/Binding_BoundingBoxData.h (87%) delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/01-basic/DataEngine.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/01-basic/PSDEBasic.pyscn delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/Compound.pyscn delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/Controller.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineIntersection.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineROI1.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineROI2.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineROI3.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineROI4.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineUnion1.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/DataEngineUnion2.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/ROI.py delete mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/02-advanced/VolumetricMeshGeneration.pyscn create mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/DataEngine.py create mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/DataEngine2.py create mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/PSDEAvgEngine.pyscn create mode 100644 applications/plugins/SofaPython/examples/PSDEExamples/PSDEBasic.pyscn create mode 100644 applications/plugins/SofaPython/examples/RegularGridFromMesh.py delete mode 100644 applications/plugins/SofaPython/examples/fontain.scn rename applications/plugins/SofaPython/examples/{fontain.py => fountain.py} (54%) create mode 100644 applications/plugins/SofaPython/examples/fountain.scn create mode 100644 applications/plugins/image/examples/loadimage_mt.scn create mode 100644 applications/projects/runSofa/cmake/bundle-post.cmake create mode 100644 applications/projects/runSofa/etc/runSofa.ini.in create mode 100644 applications/sofa/gui/qt/etc/SofaGuiQt.ini.in create mode 100644 cmake/Modules/FindCython.cmake create mode 100644 cmake/Modules/FindICU.cmake create mode 100644 examples/Components/animationloop/MechanicalMatrixMapper.html create mode 100644 examples/Components/animationloop/MechanicalMatrixMapper.pyscn create mode 100644 examples/Components/linearsolver/FEMBAR-PCGLinearSolver.scn create mode 100644 examples/Components/linearsolver/FEMBAR-SparseCholeskySolver.scn create mode 100644 examples/Components/linearsolver/FEMBAR-SparseLDLSolver.scn create mode 100644 examples/Components/linearsolver/FEMBAR-SparseLUSolver.scn create mode 100644 examples/Components/misc/ReadState.xml create mode 100644 examples/Components/misc/WriteState.xml create mode 100644 modules/CMakeLists.txt rename modules/SofaBoundaryCondition/SofaBoundaryCondition_test/{PartialFixedConstraint.cpp => PartialFixedConstraint_test.cpp} (77%) create mode 100644 modules/SofaExporter/SofaExporter_test/WriteState_test.cpp create mode 100644 modules/SofaExporter/SofaExporter_test/files/particleGravityV-reference.data create mode 100644 modules/SofaExporter/SofaExporter_test/files/particleGravityX-reference.data create mode 100644 modules/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp create mode 100644 modules/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h create mode 100644 modules/SofaGeneralAnimationLoop/MechanicalMatrixMapper.inl rename SofaKernel/framework/framework_test/helper/io/MeshSTL_test.cpp => modules/SofaGeneralLoader/SofaGeneralLoader_test/MeshSTLLoader_test.cpp (100%) create mode 100644 modules/SofaGeneralLoader/SofaGeneralLoader_test/ReadState_test.cpp create mode 100644 modules/SofaGeneralLoader/SofaGeneralLoader_test/files/particleGravityX.data create mode 100644 modules/SofaGraphComponent/SceneCheck.h rename modules/SofaGraphComponent/{SceneCheckAPIChanges.cpp => SceneCheckAPIChange.cpp} (82%) rename modules/SofaGraphComponent/{SceneCheckAPIChanges.h => SceneCheckAPIChange.h} (69%) create mode 100644 modules/SofaGraphComponent/SceneCheckDuplicatedName.cpp rename SofaKernel/framework/sofa/helper/io/MeshTrian.h => modules/SofaGraphComponent/SceneCheckDuplicatedName.h (64%) rename modules/SofaGraphComponent/{SceneChecks.cpp => SceneCheckMissingRequiredPlugin.cpp} (55%) create mode 100644 modules/SofaGraphComponent/SceneCheckMissingRequiredPlugin.h create mode 100644 modules/SofaGraphComponent/SceneCheckUsingAlias.cpp create mode 100644 modules/SofaGraphComponent/SceneCheckUsingAlias.h delete mode 100644 modules/SofaGraphComponent/SceneChecks.h create mode 100644 modules/SofaMiscForceField/SofaMiscForceField_test/CMakeLists.txt create mode 100644 modules/SofaMiscForceField/SofaMiscForceField_test/MeshMatrixMass_test.cpp create mode 100644 modules/SofaPreconditioner/SofaPreconditionerConfig.cmake.in rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/BlockJacobiPreconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/BlockJacobiPreconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/BlockJacobiPreconditioner.inl (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/JacobiPreconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/JacobiPreconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/JacobiPreconditioner.inl (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/PrecomputedWarpPreconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/PrecomputedWarpPreconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/PrecomputedWarpPreconditioner.inl (98%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/Preconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/Preconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/SSORPreconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/SSORPreconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/SSORPreconditioner.inl (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/ShewchukPCGLinearSolver.cpp (90%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/ShewchukPCGLinearSolver.h (98%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/WarpPreconditioner.cpp (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/WarpPreconditioner.h (100%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/WarpPreconditioner.inl (99%) rename modules/SofaPreconditioner/{ => src/SofaPreconditioner}/config.h (87%) create mode 100644 modules/SofaPreconditioner/src/SofaPreconditioner/initPreconditioner.cpp create mode 100644 modules/SofaSparseSolver/SofaSparseSolverConfig.cmake.in rename examples/Components/linearsolver/CSPARSE-SparseCholeskySolver.scn => modules/SofaSparseSolver/examples/FEM_SparseCholeskySolver.scn (97%) create mode 100644 modules/SofaSparseSolver/examples/FEM_SparseLDLSolver.scn create mode 100644 modules/SofaSparseSolver/examples/FEM_SparseLUSolver.scn rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/PrecomputedLinearSolver.cpp (97%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/PrecomputedLinearSolver.h (100%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/PrecomputedLinearSolver.inl (99%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseCholeskySolver.cpp (96%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseCholeskySolver.h (93%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLDLSolver.cpp (84%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLDLSolver.h (83%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLDLSolver.inl (99%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLDLSolverImpl.h (99%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLUSolver.cpp (100%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLUSolver.h (100%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseLUSolver.inl (100%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseSolver.cpp (100%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/SparseSolver.h (91%) rename modules/SofaSparseSolver/{ => src/SofaSparseSolver}/config.h (86%) create mode 100644 modules/SofaSparseSolver/src/SofaSparseSolver/initSparseSolver.cpp create mode 100644 package.cmake create mode 100755 scripts/update-mass-data.sh create mode 100644 share/mesh/cube_low_res.msh rename applications/plugins/SofaCarving/examples/data/mesh/dental_instrument.obj => share/mesh/dental_instrument_light.obj (100%) create mode 100644 share/mesh/square1_edges.mtl create mode 100644 share/mesh/square1_edges.obj create mode 100644 share/mesh/square1_quads.mtl create mode 100644 share/mesh/square1_quads.obj ------------------------------------------------------- Filesystem Size Used Avail Use% Mounted on udev 2.0G 0 2.0G 0% /dev tmpfs 396M 11M 385M 3% /run /dev/vda1 18G 9.4G 7.3G 57% / tmpfs 2.0G 108K 2.0G 1% /dev/shm tmpfs 5.0M 0 5.0M 0% /run/lock tmpfs 2.0G 0 2.0G 0% /sys/fs/cgroup /dev/vdb1 20G 11G 8.3G 56% /builds tmpfs 396M 24K 396M 1% /run/user/111 tmpfs 396M 0 396M 0% /run/user/1000 ----------------- clean-old-builds.sh ----------------- Cleaning in /builds/workspace/clean-old-builds/../launcher/sofa-framework ENV VARS: load /builds/workspace/clean-old-builds/ci/scripts/env/default ENV VARS: load node specific /builds/workspace/clean-old-builds/ci/scripts/env/_launcher_ master: not removed ng: not removed PR-218: not removed PR-534: not removed PR-572: not removed PR-596: not removed PR-625: not removed PR-650: not removed PR-700: not removed PR-706: not removed PR-707: not removed PR-735: not removed PR-747: not removed PR-750: not removed PR-751: not removed PR-756: not removed PR-771: not removed PR-777: not removed PR-780: not removed PR-787: not removed PR-788: not removed PR-790: not removed PR-792: not removed PR-793: not removed stc5: not removed v15.03: not removed v15.09: not removed v15.12: not removed v16.05: not removed v16.08: not removed v16.12: not removed v17.06: not removed v17.12: not removed v18.06: not removed ------------------------------------------------------- Filesystem Size Used Avail Use% Mounted on udev 2.0G 0 2.0G 0% /dev tmpfs 396M 11M 385M 3% /run /dev/vda1 18G 9.4G 7.3G 57% / tmpfs 2.0G 108K 2.0G 1% /dev/shm tmpfs 5.0M 0 5.0M 0% /run/lock tmpfs 2.0G 0 2.0G 0% /sys/fs/cgroup /dev/vdb1 20G 11G 8.3G 56% /builds tmpfs 396M 24K 396M 1% /run/user/111 tmpfs 396M 0 396M 0% /run/user/1000 Finished: SUCCESS