[Bindings] Follow the renaming of OBJExporter into VisualModelOBJExporter (#220)

Author: hugtalbot

bindings/SofaExporter/CMakeLists.txt

@@ -3,13 +3,13 @@ project(Bindings.SofaExporter)
 set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_STLExporter.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_STLExporter_doc.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_OBJExporter.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_OBJExporter_doc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_VisualModelOBJExporter.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_VisualModelOBJExporter_doc.h
 )
 
 set(SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_STLExporter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_OBJExporter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Binding_VisualModelOBJExporter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaExporter/Module_SofaExporter.cpp
 )
 

…src/SofaExporter/Binding_OBJExporter.cpp …orter/Binding_VisualModelOBJExporter.cppbindings/SofaExporter/src/SofaExporter/Binding_OBJExporter.cpp renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter.cpp bindings/SofaExporter/src/SofaExporter/Binding_OBJExporter.cpp renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter.cpp

@@ -19,29 +19,32 @@
 ******************************************************************************/
 
 #include <SofaPython3/Sofa/Core/Binding_Base.h>
-#include <SofaExporter/Binding_OBJExporter.h>
-#include <SofaExporter/Binding_OBJExporter_doc.h>
+#include <SofaExporter/Binding_VisualModelOBJExporter.h>
+#include <SofaExporter/Binding_VisualModelOBJExporter_doc.h>
 
 #include <SofaPython3/PythonFactory.h>
 #include <SofaPython3/Sofa/Core/Binding_BaseObject.h>
-#include <SofaExporter/OBJExporter.h>
+#include <SofaExporter/VisualModelOBJExporter.h>
 
-using  sofa::component::exporter::OBJExporter;
+using  sofa::component::exporter::VisualModelOBJExporter;
 
 namespace py { using namespace pybind11; }
 
 namespace sofapython3 {
 
-void moduleAddOBJExporter(py::module &m)
+void moduleAddVisualModelOBJExporter(py::module &m)
 {
-    PythonFactory::registerType<OBJExporter>([](sofa::core::objectmodel::Base* object)
+    PythonFactory::registerType<VisualModelOBJExporter>([](sofa::core::objectmodel::Base* object)
     {
-        return py::cast(dynamic_cast<OBJExporter*>(object));
+        return py::cast(dynamic_cast<VisualModelOBJExporter*>(object));
     });
 
-    py::class_<OBJExporter, sofa::core::objectmodel::BaseObject, py_shared_ptr<OBJExporter>> p(m, "OBJExporter");
+    py::class_<VisualModelOBJExporter, sofa::core::objectmodel::BaseObject, py_shared_ptr<VisualModelOBJExporter>> p(m, "VisualModelOBJExporter");
 
-    p.def("write", &OBJExporter::write, sofapython3::doc::SofaExporter::OBJExporter::write::docstring);
+    p.def("write", &VisualModelOBJExporter::write, sofapython3::doc::SofaExporter::VisualModelOBJExporter::write::docstring);
+
+    SOFA_ATTRIBUTE_DISABLED("v21.12", "PR#2505", "The OBJExporter class has been renamed in VisualModelOBJExporter.")
+    py::class_<VisualModelOBJExporter, sofa::core::objectmodel::BaseObject, py_shared_ptr<VisualModelOBJExporter>> p_deprecated(m, "OBJExporter");
 }
 
 } // namespace sofapython3

…r/src/SofaExporter/Binding_OBJExporter.h …xporter/Binding_VisualModelOBJExporter.hbindings/SofaExporter/src/SofaExporter/Binding_OBJExporter.h renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter.h bindings/SofaExporter/src/SofaExporter/Binding_OBJExporter.h renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter.h

@@ -24,6 +24,6 @@
 
 namespace sofapython3 {
 
-void moduleAddOBJExporter(pybind11::module &m);
+void moduleAddVisualModelOBJExporter(pybind11::module &m);
 
 } /// namespace sofapython3

…c/SofaExporter/Binding_OBJExporter_doc.h …ter/Binding_VisualModelOBJExporter_doc.hbindings/SofaExporter/src/SofaExporter/Binding_OBJExporter_doc.h renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter_doc.h bindings/SofaExporter/src/SofaExporter/Binding_OBJExporter_doc.h renamed to bindings/SofaExporter/src/SofaExporter/Binding_VisualModelOBJExporter_doc.h

@@ -20,14 +20,14 @@
 
 #pragma once
 
-namespace sofapython3::doc::SofaExporter::OBJExporter::write {
+namespace sofapython3::doc::SofaExporter::VisualModelOBJExporter::write {
 
 static auto docstring =
         R"(
         Exports an OBJ file
         ---------------------------------------
 
-        Will export a binary or ascii file depending on the binary flag of OBJExporter
+        Will export a binary or ascii file depending on the binary flag of VisualModelOBJExporter
         Will auto-number the exported files
 
         Example of use:
@@ -40,7 +40,7 @@ static auto docstring =
              n = Sofa.Core.Node("root"")
 
              # Add STLExporter
-             n.addObject("OBJExporter", name="exporter", ...)
+             n.addObject("VisualModelOBJExporter", name="exporter", ...)
 
              # writes down the stl file
              n.exporter.write()

bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp

@@ -22,7 +22,7 @@
 namespace py = pybind11;
 
 #include <SofaExporter/Binding_STLExporter.h>
-#include <SofaExporter/Binding_OBJExporter.h>
+#include <SofaExporter/Binding_VisualModelOBJExporter.h>
 
 namespace sofapython3
 {
@@ -44,14 +44,14 @@ PYBIND11_MODULE(SofaExporter, m) {
                   :toctree: _autosummary/_autosummary
 
                   SofaExporter.STLExporter
-                  SofaExporter.OBJExporter
+                  SofaExporter.VisualModelOBJExporter
 
               )doc";
 
     py::module::import("Sofa.Core");
 
     moduleAddSTLExporter(m);
-    moduleAddOBJExporter(m);
+    moduleAddVisualModelOBJExporter(m);
 }
 
 }  // namespace sofapython3

examples/liver.py

@@ -35,9 +35,10 @@ def createScene(root):
     root.addObject('DefaultAnimationLoop')
 
     root.addObject('VisualStyle', displayFlags="showCollisionModels")
-    root.addObject('RequiredPlugin', pluginName="SofaOpenglVisual SofaBoundaryCondition SofaGeneralLoader SofaGeneralSimpleFem")
+    root.addObject('RequiredPlugin', pluginName="SofaImplicitOdeSolver SofaLoader SofaOpenglVisual SofaBoundaryCondition SofaGeneralLoader SofaGeneralSimpleFem")
     root.addObject('DefaultPipeline', name="CollisionPipeline")
-    root.addObject('BruteForceDetection', name="N2")
+    root.addObject('BruteForceBroadPhase', name="BroadPhase")
+    root.addObject('BVHNarrowPhase', name="NarrowPhase")
     root.addObject('DefaultContactManager', name="CollisionResponse", response="default")
     root.addObject('DiscreteIntersection')