diff --git a/Plugin/src/SofaPython3/Prefab.h b/Plugin/src/SofaPython3/Prefab.h index 0b212d0e..e5e4912a 100644 --- a/Plugin/src/SofaPython3/Prefab.h +++ b/Plugin/src/SofaPython3/Prefab.h @@ -19,7 +19,7 @@ ******************************************************************************/ #pragma once -#include +#include #include #include @@ -28,17 +28,17 @@ namespace sofa::core::objectmodel { -class SOFAPYTHON3_API BasePrefab : public sofa::simulation::graph::DAGNode +class SOFAPYTHON3_API BasePrefab : public sofa::simulation::Node { public: - SOFA_CLASS(BasePrefab, sofa::simulation::graph::DAGNode); + SOFA_CLASS(BasePrefab, sofa::simulation::Node); }; } // namespace sofa::core::objectmodel namespace sofapython3 { -using sofa::simulation::graph::DAGNode; +using sofa::simulation::Node; using sofa::core::objectmodel::BasePrefab; using sofa::core::objectmodel::DataCallback; diff --git a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp index a5a85109..9185e159 100644 --- a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp +++ b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp @@ -22,9 +22,6 @@ #include #include -#include -using sofa::simulation::graph::DAGNode; - #include #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp index 5cc88588..6c029ec9 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp @@ -164,12 +164,12 @@ std::string getLinkPath(Node* node){ } py_shared_ptr __init__noname() { - auto dag_node = sofa::core::objectmodel::New("unnamed"); + auto dag_node = sofa::core::objectmodel::New("unnamed"); return std::move(dag_node); } py_shared_ptr __init__(const std::string& name) { - auto dag_node = sofa::core::objectmodel::New(name); + auto dag_node = sofa::core::objectmodel::New(name); return std::move(dag_node); } @@ -629,7 +629,7 @@ void moduleAddNode(py::module &m) { sofa::core::objectmodel::Context, py_shared_ptr> p(m, "Node", sofapython3::doc::sofa::core::Node::Class); - PythonFactory::registerType( + PythonFactory::registerType( [](sofa::core::objectmodel::Base* object) { return py::cast(dynamic_cast(object->toBaseNode())); diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp index 384362f3..cf81ad04 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp @@ -26,9 +26,6 @@ #include "SofaPython3/DataHelper.h" using sofa::simulation::Simulation; -#include -using sofa::simulation::graph::DAGSimulation; - #include using sofa::simulation::Node; using namespace pybind11::literals; diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp index db70b874..23c366ba 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp @@ -22,8 +22,7 @@ #include namespace py = pybind11; -#include -using sofa::simulation::graph::DAGSimulation ; +#include using sofa::simulation::Simulation; #include