Skip to content

Apply changes from PR #6261 #239

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
damienmarchal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply changes from PR #6261 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 BeamAdapter_test/BeamInterpolation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ using sofa::core::ExecParams ;
#include <sofa/simulation/common/SceneLoaderXML.h>
using sofa::simulation::SceneLoaderXML;

#include <sofa/simulation/graph/DAGSimulation.h>
using sofa::simulation::graph::DAGSimulation;
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation;
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
Expand Down
6 changes: 3 additions & 3 deletions BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ using sofa::defaulttype::Rigid3Types ;
#include <sofa/simulation/common/SceneLoaderXML.h>
using sofa::simulation::SceneLoaderXML ;

#include <sofa/simulation/graph/DAGSimulation.h>
using sofa::simulation::graph::DAGSimulation;
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation;
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
Expand All @@ -55,7 +55,7 @@ template <typename DataTypes>
struct AdaptiveBeamSlidingConstraintTest : public sofa::testing::BaseSimulationTest, AdaptiveBeamSlidingConstraint<DataTypes>
{
void normalBehavior(){
simulation::Simulation* simu = sofa::simulation::getSimulation();
simulation::Simulation* simu = sofa::simulation::MainSimulation::getSimulation();
assert(simu);

typename AdaptiveBeamSlidingConstraint<DataTypes>::SPtr thisObject = New<AdaptiveBeamSlidingConstraint<DataTypes>>();
Expand Down
4 changes: 2 additions & 2 deletions BeamAdapter_test/component/controller/InterventionalRadiologyController_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <sofa/simulation/common/SceneLoaderXML.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>

#include <BeamAdapter/component/controller/InterventionalRadiologyController.h>
#include <BeamAdapter/component/WireBeamInterpolation.h>
Expand Down Expand Up @@ -60,7 +60,7 @@ class InterventionalRadiologyController_test : public BaseTest
sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.Spring);
sofa::simpleapi::importPlugin(Sofa.Component.AnimationLoop);

m_root = sofa::simpleapi::createRootNode(sofa::simulation::getSimulation(), "root");
m_root = sofa::simpleapi::createRootNode(sofa::simulation::MainSimulation::getSimulation(), "root");
}

void doTearDown() override
Expand Down
2 changes: 1 addition & 1 deletion BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <sofa/simpleapi/SimpleApi.h>
using std::string ;
#include <sofa/component/mapping/testing/MappingTestCreation.h>
#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
#include <sofa/defaulttype/VecTypes.h>
#include <sofa/defaulttype/RigidTypes.h>
#include <sofa/simulation/UpdateLinksVisitor.h>
Expand Down
4 changes: 2 additions & 2 deletions BeamAdapter_test/component/model/WireRestShape_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <sofa/simulation/common/SceneLoaderXML.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>

#include <BeamAdapter/component/engine/WireRestShape.h>
#include <sofa/core/topology/BaseMeshTopology.h>
Expand All @@ -48,7 +48,7 @@ class WireRestShape_test : public BaseTest

void doSetUp() override
{
m_root = sofa::simpleapi::createRootNode(sofa::simulation::getSimulation(), "root");
m_root = sofa::simpleapi::createRootNode(sofa::simulation::MainSimulation::getSimulation(), "root");

sofa::simpleapi::importPlugin("BeamAdapter");
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic");
Expand Down
Loading