Skip to content

Propagates the removale of DAGNode and DAGSimulation #516

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

Propagates the removale of DAGNode and DAGSimulation #516

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
8 changes: 4 additions & 4 deletions Plugin/src/SofaPython3/Prefab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
******************************************************************************/

#pragma once
#include <sofa/simulation/graph/DAGNode.h>
#include <sofa/simulation/Node.h>
#include <sofa/core/objectmodel/DataCallback.h>

#include <sofa/helper/system/FileMonitor.h>
Expand All @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions Plugin/src/SofaPython3/SceneLoaderPY3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
#include <fstream>
#include <sofa/simulation/Simulation.h>

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

#include <SofaPython3/PythonEnvironment.h>
#include <SofaPython3/SceneLoaderPY3.h>
#include <SofaPython3/PythonFactory.h>
Expand Down
6 changes: 3 additions & 3 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@ std::string getLinkPath(Node* node){
}

py_shared_ptr<Node> __init__noname() {
auto dag_node = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>("unnamed");
auto dag_node = sofa::core::objectmodel::New<sofa::simulation::Node>("unnamed");
return std::move(dag_node);
}

py_shared_ptr<Node> __init__(const std::string& name) {
auto dag_node = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>(name);
auto dag_node = sofa::core::objectmodel::New<sofa::simulation::Node>(name);
return std::move(dag_node);
}

Expand Down Expand Up @@ -629,7 +629,7 @@ void moduleAddNode(py::module &m) {
sofa::core::objectmodel::Context, py_shared_ptr<Node>>
p(m, "Node", sofapython3::doc::sofa::core::Node::Class);

PythonFactory::registerType<sofa::simulation::graph::DAGNode>(
PythonFactory::registerType<sofa::simulation::Node>(
[](sofa::core::objectmodel::Base* object)
{
return py::cast(dynamic_cast<Node*>(object->toBaseNode()));
Expand Down
3 changes: 0 additions & 3 deletions bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
#include "SofaPython3/DataHelper.h"
using sofa::simulation::Simulation;

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

#include <sofa/simulation/Node.h>
using sofa::simulation::Node;
using namespace pybind11::literals;
Expand Down
3 changes: 1 addition & 2 deletions bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include <sofa/helper/system/PluginManager.h>
namespace py = pybind11;

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

#include <sofa/simpleapi/SimpleApi.h>
Expand Down
Loading