address comments

Author: Medyan-Naser

application/F3DStarter.cxx

@@ -1900,8 +1900,6 @@ void F3DStarter::LoadFileGroupInternal(
   options.ui.drop_zone.enable = options.ui.drop_zone.show_logo =
     this->Internals->LoadedFiles.empty();
   options.ui.filename_info = filenameInfo;
-  auto hierarchy = scene.GetSceneHierarchyNodes(); // changed to NodeInfo vector
-  this->Internals->Engine->getWindow().SetSceneHierarchy(hierarchy);
 }
 
 //----------------------------------------------------------------------------

library/CMakeLists.txt

@@ -7,7 +7,6 @@ set(F3D_VTK_MODULES
   VTK::IOImage
   VTK::InteractionWidgets
   f3d::vtkext
-  f3d::vtkextPrivate
 )
 
 # Check modules
@@ -152,7 +151,7 @@ target_include_directories(libf3d
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 
-vtk_module_autoinit(TARGETS libf3d MODULES ${F3D_VTK_MODULES})
+vtk_module_autoinit(TARGETS libf3d MODULES ${F3D_VTK_MODULES} f3d::vtkextPrivate)
 
 # The initialize function pointer of the static plugins must be added to the map of static plugins
 # in the factory constructor. When loading a plugin, there's a lookup into this map.
@@ -173,19 +172,9 @@ configure_file(
 # libf3d links with the static plugins.
 list(TRANSFORM F3D_STATIC_PLUGIN_TARGETS PREPEND "f3d-plugin-")
 
-# target_link_libraries(libf3d PRIVATE ${F3D_VTK_MODULES} ${F3D_STATIC_PLUGIN_TARGETS})
 target_link_libraries(libf3d
-    PUBLIC
-        VTK::CommonSystem
-        VTK::CommonColor
-        VTK::IOImage
-        VTK::InteractionWidgets
-        f3d::vtkext
-    PRIVATE
-        f3d::vtkextPrivate
-        ${F3D_STATIC_PLUGIN_TARGETS}
-)
-
+  PUBLIC ${F3D_VTK_MODULES}
+  PRIVATE f3d::vtkextPrivate ${F3D_STATIC_PLUGIN_TARGETS})
 
 target_compile_options(libf3d PUBLIC ${f3d_compile_options_public} PRIVATE ${f3d_compile_options_private})
 target_link_options(libf3d PUBLIC ${f3d_link_options_public})

library/private/scene_impl.h

@@ -12,6 +12,8 @@
 #include "log.h"
 #include "scene.h"
 
+#include "F3DNodeInfo.h"
+
 #include <memory>
 
 namespace f3d
@@ -62,15 +64,15 @@ class scene_impl : public scene
    */
   void PrintImporterDescription(log::VerboseLevel level);
 
+  /**
+   * Get scene hierarchy nodes for display and control.
+   * This is used internally to update the window.
+   */
+  std::vector<NodeInfo> GetSceneHierarchyNodes();
+
 private:
   class internals;
   std::unique_ptr<internals> Internals;
-
-public:
-  /**
-   * Get scene hierarchy nodes for display and control
-   */
-  std::vector<NodeInfo> GetSceneHierarchyNodes() override;
 };
 }
 }

library/private/window_impl.h

@@ -15,6 +15,8 @@
 #include "log.h"
 #include "window.h"
 
+#include "F3DNodeInfo.h"
+
 #include <filesystem>
 #include <memory>
 #include <optional>
@@ -59,10 +61,16 @@ class window_impl : public window
   window& setWindowName(std::string_view windowName) override;
   point3_t getWorldFromDisplay(const point3_t& displayPoint) const override;
   point3_t getDisplayFromWorld(const point3_t& worldPoint) const override;
-  void SetSceneHierarchy(const std::vector<NodeInfo>& hierarchy) override;
 
   ///@}
 
+  /**
+   * Implementation only API.
+   * Set the scene hierarchy for display in UI.
+   * This is called internally by the scene when content changes.
+   */
+  void SetSceneHierarchy(const std::vector<NodeInfo>& hierarchy);
+
   /**
    * Implementation only API.
    * Initialize the renderer by clearing it of all actors.

library/public/scene.h

@@ -12,8 +12,6 @@
 #include <vector>
 /// @endcond
 
-#include "F3DNodeInfo.h"
-
 namespace f3d
 {
 /**
@@ -186,17 +184,6 @@ class F3D_EXPORT scene
    */
   [[nodiscard]] virtual std::vector<std::string> getAnimationNames() = 0;
 
-protected:
-  //! @cond
-  scene() = default;
-  // virtual ~scene() = default;
-  scene(const scene& opt) = delete;
-  scene(scene&& opt) = delete;
-  scene& operator=(const scene& opt) = delete;
-  scene& operator=(scene&& opt) = delete;
-  //! @endcond
-
-public:
   /**
    * Get the scene hierarchy nodes for display and control.
    * Returns a vector of NodeInfo structures representing the actors in the scene.

library/public/window.h

@@ -8,10 +8,6 @@
 /// @cond
 #include <string>
 /// @endcond
-#include "F3DNodeInfo.h"
-
-#include <string>
-#include <vector>
 
 namespace f3d
 {
@@ -123,11 +119,6 @@ class F3D_EXPORT window
    */
   [[nodiscard]] virtual point3_t getDisplayFromWorld(const point3_t& worldPoint) const = 0;
 
-  /**
-   * Set the scene hierarchy for display in UI
-   */
-  virtual void SetSceneHierarchy(const std::vector<NodeInfo>& hierarchy) = 0;
-
 protected:
   //! @cond
   window() = default;

library/src/scene_impl.cxx

@@ -91,7 +91,7 @@ class scene_impl::internals
     data->timer->StartTimer();
   }
 
-  void Load(const std::vector<vtkSmartPointer<vtkImporter>>& importers)
+  void Load(const std::vector<vtkSmartPointer<vtkImporter>>& importers, scene_impl* sceneImpl)
   {
     for (const vtkSmartPointer<vtkImporter>& importer : importers)
     {
@@ -165,6 +165,13 @@ class scene_impl::internals
     }
 
     scene_impl::internals::DisplayAllInfo(this->MetaImporter, this->Window);
+
+    // Update the scene hierarchy in the window automatically
+    if (sceneImpl)
+    {
+      auto hierarchy = sceneImpl->GetSceneHierarchyNodes();
+      this->Window.SetSceneHierarchy(hierarchy);
+    }
   }
 
   static void DisplayImporterDescription(log::VerboseLevel level, vtkImporter* importer)
@@ -305,7 +312,7 @@ scene& scene_impl::add(const std::vector<fs::path>& filePaths)
   }
   log::debug("");
 
-  this->Internals->Load(importers);
+  this->Internals->Load(importers, this);
   return *this;
 }
 
@@ -379,7 +386,7 @@ scene& scene_impl::add(const mesh_t& mesh)
   importer->SetInternalReader(vtkSource);
 
   log::debug("Loading 3D scene from memory");
-  this->Internals->Load({ importer });
+  this->Internals->Load({ importer }, this);
   return *this;
 }