Skip to content

Apply changes from PR #6261 #352

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 #352

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
2 changes: 1 addition & 1 deletion tests/component/constraint/SurfacePressureConstraintTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ using sofa::simulation::SceneLoaderXML ;

#include <sofa/simpleapi/SimpleApi.h>

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
Expand Down
4 changes: 2 additions & 2 deletions tests/component/constraint/UnilateralPlaneConstraintTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using sofa::defaulttype::Vec3Types ;
#include <sofa/simulation/common/SceneLoaderXML.h>
using sofa::simulation::SceneLoaderXML ;

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
#include <sofa/simulation/Node.h>
using sofa::simulation::Node ;
Expand Down Expand Up @@ -88,7 +88,7 @@ struct UnilateralPlaneConstraintTest : public sofa::testing::BaseTest,

void normalTests()
{
const Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
const Node::SPtr node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
typename ThisClass::SPtr thisobject = New<ThisClass >() ;

Expand Down
5 changes: 3 additions & 2 deletions tests/component/controller/AnimationEditorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ using sofa::simulation::DefaultAnimationLoop;
using sofa::core::topology::BaseMeshTopology ;
using sofa::core::objectmodel::Data ;

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;

#include <sofa/simulation/Node.h>
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
Expand Down Expand Up @@ -92,7 +93,7 @@ struct AnimationEditorTest : public sofa::testing::BaseTest, controller::Animati

void doSetUp() override
{
m_node = sofa::simulation::getSimulation()->createNewGraph("root");
m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
m_mecaobject = New<MechanicalObject<DataTypes> >() ;
m_mecaobject->init() ;
m_node->addObject(m_mecaobject) ;
Expand Down
4 changes: 2 additions & 2 deletions tests/component/controller/DataVariationLimiterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using std::string ;

#include <sofa/linearalgebra/FullVector.h>

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
#include <sofa/simulation/Node.h>
using sofa::simulation::Node ;
Expand Down Expand Up @@ -76,7 +76,7 @@ struct DataVariationLimiterTest : public sofa::testing::BaseTest, DataVariationL

void doSetUp() override
{
m_node = sofa::simulation::getSimulation()->createNewGraph("root");
m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
}

void normalTests(){
Expand Down
5 changes: 3 additions & 2 deletions tests/component/controller/SerialPortBridgeGenericTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ using std::string ;

#include <sofa/linearalgebra/FullVector.h>

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;

#include <sofa/simulation/Node.h>
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
Expand Down Expand Up @@ -84,7 +85,7 @@ struct SerialPortBridgeGenericTest : public sofa::testing::BaseTest, SerialPortB

void doSetUp() override
{
m_node = sofa::simulation::getSimulation()->createNewGraph("root");
m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
}

void normalTests(){
Expand Down
Loading