refactor: migrate vtk classes to use ObjectWrapper for model management and update registration logic

Geant4's G4EXPATShim creates EXPAT::EXPAT (uppercase) with
IMPORTED_LOCATION set to ${EXPAT_LIBRARY}, which is empty when EXPAT
is found via conda's config-mode package (expat::expat, lowercase).

After find_package(Geant4), patch EXPAT::EXPAT with the real library
path taken from expat::expat IMPORTED_LOCATION_NOCONFIG, falling back
to find_library if needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.agents/rules/context_exclude_vtk.md

@@ -0,0 +1,9 @@
+---
+trigger: manual
+---
+# Context Restriction: No VTK
+When this rule is active, restrict the operational context to libraries excluding the VTK layer.
+- **Exclude Path**: `src/Vtk`
+- **Include Paths**: `src/Core`, `src/Math`, `src/HEP`, `src/Root`, `src/Python`, `src/utils`
+- **Focus**: Tomographic reconstruction algorithms, data structures in `Core`, and physical modeling in `HEP`. 
+- **Constraint**: Avoid referencing `Prop3D`, `Viewport`, or any VTK-specific headers unless the user overrides this restriction.

.agents/rules/context_gcompose.md

@@ -0,0 +1,9 @@
+---
+trigger: manual
+---
+# Context Focus: gcompose Application
+When this rule is active, prioritize the `gcompose` GUI application.
+- **Primary Path**: `app/gcompose`
+- **Focus**: `MainPanel`, `ContextPanel`, `PropertiesPanel`, and `ViewportPane`.
+- **Integration**: Wiring of Qt signals/slots between the `uLib` core model and the GUI widgets.
+- **Dependency**: Reference `src/Vtk` and `src/Core` as the underlying framework for the application.

.agents/rules/context_vtk.md

@@ -0,0 +1,9 @@
+---
+trigger: always_on
+---
+# Context Inclusion: VTK
+When this rule is active, include the VTK visualization layer in the operational context.
+- **Priority Path**: `src/Vtk`
+- **Focus**: `Prop3D` hierarchy, `Viewport` management, and the synchronization between domain objects and VTK props.
+- **Key Classes**: `vtkViewport`, `vtkQViewport`, `vtkObjectsContext`, and all classes in `src/Vtk/HEP/Geant`.
+- **Logic**: Ensure transformations (TRS) applied to domain objects are correctly mirrored in the visualization layer and vice versa.

.agents/rules/micromamba.md

@@ -1,7 +0,0 @@
----
-trigger: always_on
----
-
-build in build directory using always micromamba "mutom" env.
-build with make flag -j$(nproc).
-

.agents/skills/micromamba_build.md

@@ -0,0 +1,39 @@
+# Skill: Build uLib with Micromamba
+
+This skill provides instructions for building the uLib project using the micromamba environment.
+
+## Context
+- **Environment**: micromamba `uLib`
+- **Output Directory**: `build`
+- **CPU Usage**: All available cores
+
+## Instructions
+
+1. **Environment Setup**:
+   Ensure micromamba is properly initialized and the `uLib` environment is active.
+   ```bash
+   export MAMBA_EXE="/home/share/micromamba/bin/micromamba"
+   export MAMBA_ROOT_PREFIX="/home/share/micromamba"
+   eval "$(/home/share/micromamba/bin/micromamba shell hook --shell bash)"
+   micromamba activate uLib
+   ```
+
+2. **Full Rebuild (if needed)**:
+   If the `build` directory does not exist or a full reconfiguration is required:
+   ```bash
+   conan profile detect --force
+   conan install . --output-folder=build --build=missing
+   cmake --preset conan-release
+   ```
+
+3. **Incremental Build**:
+   Run the build command from the root directory, pointing to the `build` folder and using all cores.
+   ```bash
+   cmake --build build -j$(nproc)
+   ```
+
+4. **Specific Target Build**:
+   To build a specific target (e.g., gcompose):
+   ```bash
+   cmake --build build --target gcompose -j$(nproc)
+   ```

.gitignore

@@ -1,6 +1,7 @@
 CMakeFiles/
-build/
+build*/
 .cache/
+CMakeUserPresets.json
 build_warnings*.log
 final_build.log
 cmake_configure.log
@@ -17,3 +18,5 @@ test_props.xml
 test_props2.xml
 test_boost.cpp
 .claude/settings.json
+build_output.log
+configure_output.log

.vscode/gdb_wrapper.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export DISPLAY=:1001.0
+/home/share/micromamba/bin/micromamba run -n uLib /usr/bin/gdb "$@"

.vscode/launch.json

@@ -0,0 +1,31 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "gcompose",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/app/gcompose/gcompose",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                { "name": "DISPLAY", "value": ":1001.0" }
+            ],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "preLaunchTask": "Build gcompose",
+            "miDebuggerPath": "${workspaceFolder}/.vscode/gdb_wrapper.sh"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build gcompose",
+            "type": "shell",
+            "command": "/home/share/micromamba/bin/micromamba run -n uLib cmake --build build --target gcompose -j$(nproc)",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        }
+    ]
+}

CLAUDE.md

@@ -10,9 +10,9 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 export MAMBA_EXE="/home/share/micromamba/bin/micromamba"
 export MAMBA_ROOT_PREFIX="/home/share/micromamba"
 eval "$(/home/share/micromamba/bin/micromamba shell hook --shell bash)"
-micromamba activate mutom
+micromamba activate uLib
 
-# Configure (from repo root, using Conan preset)
+# Configure (from repo root, using Conan preset — uses Ninja + ccache)
 cmake --preset conan-release
 
 # Build everything
@@ -40,6 +40,18 @@ conan install . --output-folder=build --build=missing
 cmake --preset conan-release
 ```
 
+### Build acceleration (already configured)
+- **Ninja** generator — used automatically via the conan default profile (`~/.conan2/profiles/default`)
+- **ccache** — enabled via `CMAKE_CXX_COMPILER_LAUNCHER=ccache`; cached rebuilds are nearly instant (~0.3s vs ~25s cold)
+- **Clang 22 + lld** profile available (`~/.conan2/profiles/fast`) but blocked by template overload ambiguities in `src/Core/Archives.h` that need fixing for full compatibility
+
+To reconfigure with the fast profile once Archives.h is fixed:
+```bash
+conan install . --output-folder=build --build=missing --profile=fast
+cmake -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
+cmake --build build -j$(nproc)
+```
+
 ## Architecture
 
 **uLib** is a C++ framework for Cosmic Muon Tomography (CMT), structured as layered shared libraries:
@@ -59,32 +71,32 @@ mutomCore  →  mutomMath  →  mutomDetectors  →  mutomGeant
 - `ObjectsContext` is a container owning a list of `Object*` pointers; signals `ObjectAdded`/`ObjectRemoved`
 
 ### VTK Layer (`src/Vtk/`)
-- `Puppet` (inherits `uLib::Object`): wraps a VTK `vtkProp` for rendering. Has `GetContent()` returning the underlying domain object. Display-only properties are registered via `ULIB_ACTIVATE_DISPLAY_PROPERTIES` macro.
-- `Viewport`: base class managing the VTK renderer, picking, selection logic. Maintains `m_Puppets` vector and `m_ObjectToPuppet` map.
-- `QViewport` (inherits `QWidget` + `Viewport`): Qt-embedded VTK widget. Emits Qt signal `puppetSelected(Puppet*)` on click-selection via `OnSelectionChanged`.
-- `vtkObjectsContext`: wraps `ObjectsContext`, creating/destroying `Puppet`s as objects come/go. Emits `PuppetAdded`/`PuppetRemoved`.
-- Display properties: `serialize_display()` + `display_properties_archive` registers selected `hrp<T>` fields as `PropertyBase*` in the puppet's `m_DisplayProperties`. `PropertyEditor::setObject(obj, displayOnly=true)` shows only those.
+- `Prop3D` (inherits `uLib::Object`): wraps a VTK `vtkProp` for rendering. Has `GetContent()` returning the underlying domain object. Display-only properties are registered via `ULIB_ACTIVATE_DISPLAY_PROPERTIES` macro.
+- `Viewport`: base class managing the VTK renderer, picking, selection logic. Maintains `m_Prop3Ds` vector and `m_ObjectToProp3D` map.
+- `QViewport` (inherits `QWidget` + `Viewport`): Qt-embedded VTK widget. Emits Qt signal `prop3dSelected(Prop3D*)` on click-selection via `OnSelectionChanged`.
+- `vtkObjectsContext`: wraps `ObjectsContext`, creating/destroying `Prop3D`s as objects come/go. Emits `Prop3DAdded`/`Prop3DRemoved`.
+- Display properties: `serialize_display()` + `display_properties_archive` registers selected `hrp<T>` fields as `PropertyBase*` in the prop3d's `m_DisplayProperties`. `PropertyEditor::setObject(obj, displayOnly=true)` shows only those.
 
 ### gcompose GUI App (`app/gcompose/src/`)
 - `MainPanel`: top-level widget. Owns `ContextPanel` (left) and `ViewportPane` (right). Wires together viewport↔context selection via signals.
 - `ContextPanel`: tree view of `ObjectsContext`. Emits `objectSelected(Object*)`. Contains an embedded `PropertiesPanel`.
 - `PropertiesPanel`: shows `uLib::Object` properties via `PropertyEditor`.
 - `ViewportPane`: embeds `QViewport` + a slide-out "Display Properties" panel (`PropertyEditor` in display-only mode).
-- `PropertyEditor`: populates widgets from `Object::GetProperties()` (all) or `Puppet::GetDisplayProperties()` (display-only mode).
+- `PropertyEditor`: populates widgets from `Object::GetProperties()` (all) or `Prop3D::GetDisplayProperties()` (display-only mode).
 
 ### Selection Sync Flow
 ```
-Viewport click  →  Viewport::SelectPuppet()  →  QViewport::OnSelectionChanged()
-                →  emit puppetSelected(p)
+Viewport click  →  Viewport::SelectProp3D()  →  QViewport::OnSelectionChanged()
+                →  emit prop3dSelected(p)
                 →  MainPanel: contextPanel->selectObject(p->GetContent())  [updates tree + PropertiesPanel]
                 →  MainPanel: firstPane->setObject(p)  [updates Display Properties panel]
 
 ContextPanel tree click  →  emit objectSelected(obj)
-                →  MainPanel: viewport->SelectPuppet(puppet)  [visual selection in VTK]
-                →  MainPanel: firstPane->setObject(puppet)  [updates Display Properties panel]
+                →  MainPanel: viewport->SelectProp3D(prop3d)  [visual selection in VTK]
+                →  MainPanel: firstPane->setObject(prop3d)  [updates Display Properties panel]
 ```
 
 ### Key Patterns
 - **Two signal systems coexist**: Qt signals (`Q_OBJECT`, `connect(...)`) for GUI; `uLib::Object::connect(...)` for domain signals.
-- **Display properties** flow: `Puppet::serialize_display()` → `display_properties_archive` → `RegisterDisplayProperty()` → `PropertyEditor(displayOnly=true)`. Must call `ULIB_ACTIVATE_DISPLAY_PROPERTIES` in the puppet constructor.
-- **Puppet ↔ Object map**: `Viewport::m_ObjectToPuppet` allows lookup by domain object; `vtkObjectsContext::GetPuppet(obj)` does the same.
+- **Display properties** flow: `Prop3D::serialize_display()` → `display_properties_archive` → `RegisterDisplayProperty()` → `PropertyEditor(displayOnly=true)`. Must call `ULIB_ACTIVATE_DISPLAY_PROPERTIES` in the prop3d constructor.
+- **Prop3D ↔ Object map**: `Viewport::m_ObjectToProp3D` allows lookup by domain object; `vtkObjectsContext::GetProp3D(obj)` does the same.

CMakeLists.txt

@@ -15,11 +15,20 @@ if(POLICY CMP0167)
     cmake_policy(SET CMP0167 NEW)
 endif()
 
-
 ## -------------------------------------------------------------------------- ##
 
 project(uLib)
 
+# Applica la flag SOLO se il compilatore è GCC
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-fno-merge-constants)
+endif()
+
+# Disabilita il warning se il compilatore è Clang (o AppleClang)
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-Wno-ignored-optimization-argument)
+endif()
+
 # CUDA Toolkit seems to be missing locally. Toggle ON if nvcc is made available.
 option(USE_CUDA "Enable CUDA support" OFF)
 if(USE_CUDA)
@@ -124,6 +133,8 @@ find_package(Eigen3 CONFIG REQUIRED)
 get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
 include_directories(${EIGEN3_INCLUDE_DIRS})
 
+find_package(OpenMP)
+
 find_package(ROOT CONFIG REQUIRED)
 include(${ROOT_USE_FILE})
 
@@ -145,6 +156,8 @@ else()
                                 IOXML
                                 IOXMLParser
                                 ImagingCore
+                                ImagingHybrid
+                                ImagingSources
                                 InteractionStyle
                                 InteractionWidgets
                                 RenderingAnnotation
@@ -169,6 +182,26 @@ if(Geant4_FOUND)
     add_compile_definitions(HAVE_GEANT4)
     set(HAVE_GEANT4 1)
 
+    # Workaround: Geant4's G4EXPATShim creates EXPAT::EXPAT (uppercase) with
+    # IMPORTED_LOCATION "${EXPAT_LIBRARY}", but EXPAT_LIBRARY is empty when using
+    # conda's config-mode expat package (which installs as expat::expat lowercase).
+    # Resolve the actual library path from expat::expat or via find_library.
+    if(TARGET EXPAT::EXPAT)
+        get_target_property(_expat_loc EXPAT::EXPAT IMPORTED_LOCATION)
+        if(NOT _expat_loc OR _expat_loc MATCHES "NOTFOUND|^$")
+            if(TARGET expat::expat)
+                get_target_property(_expat_loc expat::expat IMPORTED_LOCATION_NOCONFIG)
+            endif()
+            if(NOT _expat_loc OR _expat_loc MATCHES "NOTFOUND|^$")
+                find_library(_expat_loc NAMES expat)
+            endif()
+            if(_expat_loc)
+                set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION "${_expat_loc}")
+            endif()
+        endif()
+        unset(_expat_loc)
+    endif()
+
     # Sanitize Geant4 targets to remove Qt5 dependencies that conflict with VTK/Qt6
     if(TARGET Geant4::G4interfaces)
         set_target_properties(Geant4::G4interfaces PROPERTIES 

CMakePresets.json

@@ -12,6 +12,22 @@
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
             }
         },
+        {
+            "name": "fast",
+            "displayName": "Fast build: Ninja + clang + ccache",
+            "description": "Uses Ninja generator, clang/lld compiler, and ccache",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=lld",
+                "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=lld",
+                "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+                "CMAKE_C_COMPILER_LAUNCHER": "ccache"
+            }
+        },
         {
             "name": "mutom",
             "description": "",

CMakeUserPresets.json

@@ -1,9 +0,0 @@
-{
-    "version": 4,
-    "vendor": {
-        "conan": {}
-    },
-    "include": [
-        "build/CMakePresets.json"
-    ]
-}

README.md

@@ -30,18 +30,22 @@ You can create and activate the environment using either `micromamba` or `conda`
 **Using Micromamba:**
 ```bash
 micromamba env create -f condaenv.yml
-micromamba activate mutom
+micromamba activate uLib
 ```
 
 **Using Conda:**
 ```bash
 conda env create -f condaenv.yml
-conda activate mutom
+conda activate uLib
 ```
 
 ### Configure and Build
 
-1. **Configure Conan profile (if you haven't yet on your machine):**
+#### Standard build (GCC + Ninja + ccache)
+
+The default conan profile uses **Ninja** as the generator and **ccache** for compiler caching, dramatically speeding up incremental rebuilds.
+
+1. **Configure Conan profile (first time only):**
 ```bash
 conan profile detect
 ```
@@ -51,20 +55,54 @@ conan profile detect
 conan install . --output-folder=build --build=missing
 ```
 
-3. **Configure the project with CMake:**
+3. **Configure with CMake:**
 ```bash
 cmake --preset conan-release
 ```
-*(Alternatively: `cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release`)*
 
-4. **Build the project:**
+4. **Build:**
 ```bash
-cmake --build build -j10
+cmake --build build -j$(nproc)
 ```
 
+5. **Clean build (wipe and rebuild everything):**
+```bash
+cmake --build build --clean-first -j$(nproc)
+```
+
+6. **Run tests:**
+```bash
+cmake --build build --target test -j$(nproc)
+# or equivalently:
+ctest --test-dir build --output-on-failure -j$(nproc)
+```
+
+#### LLVM/Clang build (clang + lld + ccache — fastest)
+
+A `fast` conan profile is provided that uses **clang**, **lld** (LLVM linker), and **ccache**. Install them into your environment first:
+
+```bash
+micromamba install -n uLib -y clang clangxx lld -c conda-forge
+```
+
+Then build using the `fast` profile:
+
+```bash
+conan install . --output-folder=build --build=missing --profile=fast
+cmake -B build -G Ninja \
+      -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake \
+      -DCMAKE_BUILD_TYPE=Release
+cmake --build build -j$(nproc)
+```
+
+The `fast` profile is defined at `~/.conan2/profiles/fast` and sets:
+- `CMAKE_C_COMPILER=clang` / `CMAKE_CXX_COMPILER=clang++`
+- `CMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld`
+- `CMAKE_CXX_COMPILER_LAUNCHER=ccache`
+
 ### Make python package
 
 ```bash
-micromamba run -n mutom env USE_CUDA=ON poetry install
+micromamba run -n uLib env USE_CUDA=ON poetry install
 ```
 

app/gcompose/src/MainPanel.cpp

@@ -90,13 +90,13 @@ MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_m
     
     connect(m_contextPanel, &ContextPanel::objectSelected, [this](uLib::Object* obj) {
         if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
-            uLib::Vtk::Puppet* puppet = nullptr;
+            uLib::Vtk::Prop3D* prop3d = nullptr;
             if (m_mainVtkContext) {
-                puppet = m_mainVtkContext->GetPuppet(obj);
+                prop3d = m_mainVtkContext->GetProp3D(obj);
             }
-            viewport->SelectPuppet(puppet);
-            // Update the display properties in the viewport pane itself - use the puppet proxy if possible
-            m_firstPane->setObject(puppet ? (uLib::Object*)puppet : obj);
+            viewport->SelectProp3D(prop3d);
+            // Update the display properties in the viewport pane itself - use the prop3d proxy if possible
+            m_firstPane->setObject(prop3d ? (uLib::Object*)prop3d : obj);
         } else {
             m_firstPane->setObject(obj);
         }
@@ -116,7 +116,7 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
 
     if (m_mainVtkContext) {
         if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
-            viewport->RemovePuppet(*m_mainVtkContext);
+            viewport->RemoveProp3D(*m_mainVtkContext);
         }
         delete m_mainVtkContext;
         m_mainVtkContext = nullptr;
@@ -124,10 +124,10 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
 
     if (context) {
         if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
-            m_mainVtkContext = new uLib::Vtk::vtkObjectsContext(context);
-            // viewport->AddPuppet(*m_mainVtkContext); // redundant
+            m_mainVtkContext = new uLib::Vtk::ObjectsContext(context);
+            // viewport->AddProp3D(*m_mainVtkContext); // redundant
 
-            auto syncSelection = [this](uLib::Vtk::Puppet* p) {
+            auto syncSelection = [this](uLib::Vtk::Prop3D* p) {
                 if (!p) {
                     m_contextPanel->clearSelection();
                     m_firstPane->setObject(nullptr);
@@ -136,14 +136,14 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
                     m_firstPane->setObject(p);
                 }
             };
-            connect(viewport, &uLib::Vtk::QViewport::puppetSelected, syncSelection);
+            connect(viewport, &uLib::Vtk::QViewport::prop3dSelected, syncSelection);
 
-            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::vtkObjectsContext::PuppetAdded, [this](uLib::Vtk::Puppet* p) {
+            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DAdded, [this](uLib::Vtk::Prop3D* p) {
                 if (p) {
                     auto panes = this->findChildren<ViewportPane*>();
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->AddPuppet(*p);
+                            vp->AddProp3D(*p);
                             vp->ZoomAuto();
                             vp->Render();
                         }
@@ -151,25 +151,25 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
                 }
             });
 
-            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::vtkObjectsContext::PuppetRemoved, [this](uLib::Vtk::Puppet* p) {
+            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DRemoved, [this](uLib::Vtk::Prop3D* p) {
                 if (p) {
                     auto panes = this->findChildren<ViewportPane*>();
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->RemovePuppet(*p);
+                            vp->RemoveProp3D(*p);
                             vp->Render();
                         }
                     }
                 }
             });
 
-            // Add any puppets that were created during m_mainVtkContext's construction to all panes
+            // Add any prop3ds that were created during m_mainVtkContext's construction to all panes
             auto panes = this->findChildren<ViewportPane*>();
             for (auto* obj : context->GetObjects()) {
-                if (auto* p = m_mainVtkContext->GetPuppet(obj)) {
+                if (auto* p = m_mainVtkContext->GetProp3D(obj)) {
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->AddPuppet(*p);
+                            vp->AddProp3D(*p);
                         }
                     }
                 }

app/gcompose/src/MainPanel.h

@@ -11,7 +11,7 @@ class PropertiesPanel;
 namespace uLib {
     class ObjectsContext;
     namespace Vtk {
-        class vtkObjectsContext;
+        class ObjectsContext;
     }
 }
 
@@ -40,7 +40,7 @@ private:
     ViewportPane* m_firstPane;
     ContextPanel* m_contextPanel;
     uLib::ObjectsContext* m_context;
-    uLib::Vtk::vtkObjectsContext* m_mainVtkContext;
+    uLib::Vtk::ObjectsContext* m_mainVtkContext;
 };
 
 #endif // MAINPANEL_H

app/gcompose/src/PropertyWidgets.cpp

@@ -403,10 +403,10 @@ void PropertyEditor::setObject(::uLib::Object* obj, bool displayOnly) {
     const std::vector<::uLib::PropertyBase*>* props = &obj->GetProperties();
     
     if (displayOnly) {
-        if (auto* puppet = dynamic_cast<::uLib::Vtk::Puppet*>(obj)) {
-            props = &puppet->GetDisplayProperties();
+        if (auto* prop3d = dynamic_cast<::uLib::Vtk::Prop3D*>(obj)) {
+            props = &prop3d->GetDisplayProperties();
         } else {
-            // If it's not a puppet but displayOnly is requested, showing nothing or fallback?
+            // If it's not a prop3d but displayOnly is requested, showing nothing or fallback?
             // Fallback: core properties.
         }
     }

app/gcompose/src/QViewportPane.cpp

@@ -88,7 +88,7 @@ void QViewportPane::toggleDisplayPanel() {
 
 void QViewportPane::setObject(uLib::Object* obj) {
     m_displayEditor->setObject(obj, true);
-    // Auto-show panel if it's a puppet and we want to highlight this feature?
+    // Auto-show panel if it's a prop3d and we want to highlight this feature?
     // User asked for "hiding panel", so maybe we don't auto-show.
 }
 
@@ -179,9 +179,9 @@ void QViewportPane::AttemptSplit(Qt::Orientation orientation) {
     if (currentVtk) {
         auto* newVtk = qobject_cast<uLib::Vtk::QViewport*>(newPane->currentViewport());
         if (newVtk) {
-            // Copy puppets
-            for (auto* puppet : currentVtk->getPuppets()) {
-                newVtk->AddPuppet(*puppet);
+            // Copy prop3ds
+            for (auto* prop3d : currentVtk->getProp3Ds()) {
+                newVtk->AddProp3D(*prop3d);
             }
             // Copy camera
             if (currentVtk->GetRenderer() && newVtk->GetRenderer()) {

app/gcompose/src/ViewportPane.cpp

@@ -99,15 +99,15 @@ void ViewportPane::toggleDisplayPanel() {
 void ViewportPane::setObject(uLib::Object* obj) {
     m_displayEditor->setObject(obj, true);
     
-    // Check if the object is a Puppet (meaning it has display properties)
-    bool isPuppet = (dynamic_cast<::uLib::Vtk::Puppet*>(obj) != nullptr);
+    // Check if the object is a Prop3D (meaning it has display properties)
+    bool isProp3D = (dynamic_cast<::uLib::Vtk::Prop3D*>(obj) != nullptr);
     
-    // Only show the "Display" toggle button if it's a puppet
-    m_toggleBtn->setVisible(isPuppet);
+    // Only show the "Display" toggle button if it's a prop3d
+    m_toggleBtn->setVisible(isProp3D);
     
-    // If it's a puppet, we might want to keep the panel state if it was already open,
-    // or if it's NOT a puppet, definitely hide the toggle and panel.
-    if (!isPuppet) {
+    // If it's a prop3d, we might want to keep the panel state if it was already open,
+    // or if it's NOT a prop3d, definitely hide the toggle and panel.
+    if (!isProp3D) {
         m_toggleBtn->setChecked(false);
         m_displayPanel->hide();
     }

conanfile.txt

@@ -1,6 +1,6 @@
 [requires]
 eigen/3.4.0
-boost/1.83.0
+boost/1.86.0
 # pybind11/3.0.2
 hdf5/1.14.3
 

condaenv.yml

@@ -1,4 +1,4 @@
-name: mutom
+name: uLib
 channels:
   - conda-forge
 dependencies:
@@ -7,4 +7,15 @@ dependencies:
   - cmake
   - conan
   - root
-  - vtk
+  - vtk=9.4 # VTK 9.4
+  - pybind11
+#  - boost=1.86.0 # requested by VTK 9.4
+  - ninja
+  - clang
+  - clangxx
+  - lld
+  - ccache
+  - OpenMP
+  - Geant4
+  - gdb
+  - valgrind

docs/update_properties.md

@@ -1,21 +1,21 @@
 
 # Properties and the vtk-gui representation
 
-This is the rationale behind the connection between TRS properties and Puppet Transformation.
+This is the rationale behind the connection between TRS properties and Prop3D Transformation.
 
 The properties from model get propoagated via Object signalling system (the Update signal) to the vtkRepresentation and to the Qt widgets so that the overall transformation of the model reflects into a modification of its representation in vtk and in the gui. 
 
-In addition the properties need to be adjusted also from vtk, for example if user uses handlerwidget to change the transformation this is eventually applied to Puppet and Puppet should propagate the transformation change to the vtk representation object (for instance vtkContainerBox) and the latter eventually propagates the change into the model.
+In addition the properties need to be adjusted also from vtk, for example if user uses handlerwidget to change the transformation this is eventually applied to Prop3D and Prop3D should propagate the transformation change to the vtk representation object (for instance vtkContainerBox) and the latter eventually propagates the change into the model.
 
-the Puppet or the vtk representation wrapper ( vtkContainerBox for instance is the wrapper od ContainerBox ) should not directly show the transformation of the handlerwidget but it should show the transformation of the model once applied so we are always seeing the actual aspect of the model reflected to the vtk representation and not the other way around.
+the Prop3D or the vtk representation wrapper ( vtkContainerBox for instance is the wrapper od ContainerBox ) should not directly show the transformation of the handlerwidget but it should show the transformation of the model once applied so we are always seeing the actual aspect of the model reflected to the vtk representation and not the other way around.
 
 So in syntesis the model is the master and the vtk representation and the gui are the slaves of any modification, but the vtkHandlerWidget is able to apply a transform that should be applied to the model and then the model should propagate the transformation change to the vtk representation and to the gui.
 
-## The Puppet
+## The Prop3D
 
-The puppet is the proxy of the spatial placement of objects in the scene. Puppets should have an internal ContainerBox that is shown in the scene around the content to be able to pick Puppet from vtkViewport using the handler widget. The HandlerWidget moves the Puppet ContainerBox (the red Highlight element whe selected) to reflect the handler current transformation, but the transformation is propagated to the derived Puppet classes like vtkContainerBox. 
+The prop3d is the proxy of the spatial placement of objects in the scene. Prop3Ds should have an internal ContainerBox that is shown in the scene around the content to be able to pick Prop3D from vtkViewport using the handler widget. The HandlerWidget moves the Prop3D ContainerBox (the red Highlight element whe selected) to reflect the handler current transformation, but the transformation is propagated to the derived Prop3D classes like vtkContainerBox. 
 
-The vtkHandlerWidget should handle the transformation of the puppet internal ContainerBox. The changes of the ContainerBox will be propagated to the derived classes and eventually to the model. 
+The vtkHandlerWidget should handle the transformation of the prop3d internal ContainerBox. The changes of the ContainerBox will be propagated to the derived classes and eventually to the model. 
 
 
 

src/Core/Archives.h

@@ -80,6 +80,9 @@ template <class ArchiveImplementation> class polymorphic_iarchive_route;
 namespace boost {
 namespace serialization {
 template <typename T> struct hrp;
+template <typename T> struct hrp_val;
+template <typename T> struct hrp_enum;
+template <typename T> struct hrp_enum_val;
 }
 } // namespace boost
 
@@ -177,6 +180,24 @@ public:
     return *this->This();
   }
 
+  template <class T>
+  Archive &operator>>(const boost::serialization::hrp_val<T> &t) {
+    this->This()->load_override(const_cast<boost::serialization::hrp_val<T> &>(t));
+    return *this->This();
+  }
+
+  template <class T>
+  Archive &operator>>(const boost::serialization::hrp_enum<T> &t) {
+    this->This()->load_override(const_cast<boost::serialization::hrp_enum<T> &>(t));
+    return *this->This();
+  }
+
+  template <class T>
+  Archive &operator>>(const boost::serialization::hrp_enum_val<T> &t) {
+    this->This()->load_override(const_cast<boost::serialization::hrp_enum_val<T> &>(t));
+    return *this->This();
+  }
+
   // the & operator
   template <class T> Archive &operator&(T &t) { return *(this->This()) >> t; }
 
@@ -190,6 +211,21 @@ public:
     return *(this->This()) >> t;
   }
 
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_val<T> &t) {
+    return *(this->This()) >> t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_enum<T> &t) {
+    return *(this->This()) >> t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_enum_val<T> &t) {
+    return *(this->This()) >> t;
+  }
+
   // the == operator
   template <class T> Archive &operator==(T &t) { return this->operator&(t); }
 
@@ -230,11 +266,61 @@ public:
     return *this->This();
   }
 
+  template <class T> Archive &operator<<(const boost::serialization::hrp<T> &t) {
+    this->This()->save_override(t);
+    return *this->This();
+  }
+
+  template <class T> Archive &operator<<(const boost::serialization::hrp_val<T> &t) {
+    this->This()->save_override(t);
+    return *this->This();
+  }
+
+  template <class T> Archive &operator<<(const boost::serialization::hrp_enum<T> &t) {
+    this->This()->save_override(t);
+    return *this->This();
+  }
+
+  template <class T> Archive &operator<<(const boost::serialization::hrp_enum_val<T> &t) {
+    this->This()->save_override(t);
+    return *this->This();
+  }
+
+  template <class T> Archive &operator<<(const boost::serialization::nvp<T> &t) {
+    this->This()->save_override(t);
+    return *this->This();
+  }
+ 
   // the & operator
   template <class T> Archive &operator&(const T &t) {
     return *this->This() << t;
   }
 
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp<T> &t) {
+    return *this->This() << t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_val<T> &t) {
+    return *this->This() << t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_enum<T> &t) {
+    return *this->This() << t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp_enum_val<T> &t) {
+    return *this->This() << t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::nvp<T> &t) {
+    return *this->This() << t;
+  }
+
   // the == operator
   template <class T> Archive &operator==(T &t) { return this->operator&(t); }
 
@@ -338,8 +424,6 @@ public:
     }
   }
 
-  using basic_xml_iarchive::load_override;
-
   // Anything not an attribute should be a name value pair as nvp or hrp
   typedef boost::archive::detail::common_iarchive<Archive>
       detail_common_iarchive;
@@ -357,6 +441,9 @@ public:
   // class_name_type can't be handled here as it depends upon the
   // char type used by the stream.  So require the derived implementation.
   // derived in this case is xml_iarchive_impl or base ..
+  // Note: using base::load_override covers all basic_xml_iarchive overloads
+  // transitively, so a separate 'using basic_xml_iarchive::load_override'
+  // is redundant and creates ambiguity with clang.
   using base::load_override;
 
   void load_override(const char *str) {

src/Core/CMakeLists.txt

@@ -21,6 +21,7 @@ set(HEADERS
     StringReader.h 
     Threads.h
     Monitor.h
+    Property.h
     Types.h 
     Uuid.h 
     Vector.h

src/Core/Object.cpp

@@ -65,10 +65,19 @@ public:
   std::vector<Slot> slov;
   std::vector<PropertyBase*> m_Properties;
   std::vector<PropertyBase*> m_DynamicProperties;
+  std::vector<PropertyBase*> m_DisplayProperties;
   bool m_SignalsBlocked;
 };
 
 // Implementations of Property methods
+void Object::RegisterDisplayProperty(PropertyBase* prop) {
+    if (prop) d->m_DisplayProperties.push_back(prop);
+}
+
+const std::vector<PropertyBase*>& Object::GetDisplayProperties() const {
+    return d->m_DisplayProperties;
+}
+
 void Object::RegisterProperty(PropertyBase* prop) {
     if (prop) {
         d->m_Properties.push_back(prop);
@@ -104,32 +113,9 @@ void Object::NotifyPropertiesUpdated() {
     for (auto* p : d->m_DynamicProperties) p->Updated();
 }
 
-// In Object.h, the template serialize needs to be updated to call property serialization.
-// However, since Object::serialize is a template in the header, we might need a helper here.
-
-template <class ArchiveT>
-void Object::serialize(ArchiveT &ar, const unsigned int version) {
-    ar & boost::serialization::make_nvp("InstanceName", d->m_InstanceName);
-    for (auto* prop : d->m_Properties) {
-        prop->serialize(ar, version);
-    }
-}
-
 void Object::Updated() { ULIB_SIGNAL_EMIT(Object::Updated); }
 void Object::PropertyUpdated() { ULIB_SIGNAL_EMIT(Object::PropertyUpdated); }
 
-template <class ArchiveT>
-void Object::save_override(ArchiveT &ar, const unsigned int version) {}
-
-// Explicitly instantiate for all uLib archives
-template void Object::serialize(Archive::xml_oarchive &, const unsigned int);
-template void Object::serialize(Archive::xml_iarchive &, const unsigned int);
-template void Object::serialize(Archive::text_oarchive &, const unsigned int);
-template void Object::serialize(Archive::text_iarchive &, const unsigned int);
-template void Object::serialize(Archive::hrt_oarchive &, const unsigned int);
-template void Object::serialize(Archive::hrt_iarchive &, const unsigned int);
-template void Object::serialize(Archive::log_archive &, const unsigned int);
-
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

src/Core/Object.h

@@ -92,9 +92,11 @@ public:
 
   ////////////////////////////////////////////////////////////////////////////
   // PROPERTIES //
-  void RegisterProperty(PropertyBase* prop);
-  void RegisterDynamicProperty(PropertyBase* prop);
-  const std::vector<PropertyBase*>& GetProperties() const;
+  virtual void RegisterProperty(PropertyBase* property);
+  virtual void RegisterDynamicProperty(PropertyBase* property);
+  virtual void RegisterDisplayProperty(PropertyBase* property);
+  virtual const std::vector<PropertyBase*>& GetProperties() const;
+  virtual const std::vector<PropertyBase*>& GetDisplayProperties() const;
   PropertyBase* GetProperty(const std::string& name) const;
 
   /** @brief Sends an Updated signal for all properties of this object. useful for real-time UI refresh. */
@@ -124,7 +126,7 @@ public:
   virtual void serialize(Archive::log_archive & ar, const unsigned int version) {}
 
   template <class ArchiveT>
-  void save_override(ArchiveT &ar, const unsigned int version);
+  void save_override(ArchiveT &ar, const unsigned int version) {}
 
   void SaveConfig(std::ostream &os, int version = 0);
   void LoadConfig(std::istream &is, int version = 0);

src/Core/ObjectFactory.h

@@ -1,16 +1,18 @@
 #ifndef U_CORE_OBJECTFACTORY_H
 #define U_CORE_OBJECTFACTORY_H
 
-#include <string>
-#include <map>
-#include <vector>
-#include <functional>
 #include "Core/Object.h"
+#include <functional>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 namespace uLib {
 
 /**
- * @brief Singleton factory for dynamic Object instantiation based on class name.
+ * @brief Singleton factory for dynamic Object instantiation based on class
+ * name.
  */
 class ObjectFactory {
 public:
@@ -42,11 +44,11 @@ private:
 /**
  * @brief Helper class to statically register a factory function.
  */
-template <typename T>
-class ObjectRegistrar {
+template <typename T> class ObjectRegistrar {
 public:
   ObjectRegistrar(const std::string &className) {
-        ObjectFactory::Instance().Register(className, []() -> Object* { return new T(); });
+    ObjectFactory::Instance().Register(className,
+                                       []() -> Object * { return new T(); });
   }
 };
 
@@ -58,10 +60,62 @@ public:
  * Put this in the .cpp file of the class.
  */
 #define ULIB_REGISTER_OBJECT(className)                                        \
-    static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(g_ObjectRegistrar_, __LINE__)(#className);
+  static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(                     \
+      g_ObjectRegistrar_, __LINE__)(#className);
 
 #define ULIB_REGISTER_OBJECT_NAME(className, registeredName)                   \
-    static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(g_ObjectRegistrar_, __LINE__)(registeredName);
+  static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(                     \
+      g_ObjectRegistrar_, __LINE__)(registeredName);
+
+template <typename T> class ObjectWrapper {
+public:
+  ObjectWrapper(const std::string &className) {
+    ObjectFactory::Instance().Register(className,
+                                       []() -> Object * { return new T(); });
+  }
+
+  ObjectWrapper(T *model) : m_model(model) {}
+
+  template <typename U = T,
+            typename = std::enable_if_t<std::is_default_constructible_v<U>>>
+  ObjectWrapper() : m_model(new T()) {}
+
+  ObjectWrapper(const ObjectWrapper &other) : m_model(other.m_model) {}
+
+  ObjectWrapper &operator=(const ObjectWrapper &other) {
+    m_model = other.m_model;
+    return *this;
+  }
+
+  ObjectWrapper(ObjectWrapper &&other) noexcept
+      : m_model(std::move(other.m_model)) {}
+
+  ObjectWrapper &operator=(ObjectWrapper &&other) noexcept {
+    m_model = std::move(other.m_model);
+    return *this;
+  }
+
+  ~ObjectWrapper() = default;
+
+  T *operator->() const { return m_model.get(); }
+
+  T &operator*() const { return *m_model; }
+
+  T *get() const { return m_model.get(); }
+
+  bool operator==(const ObjectWrapper &other) const {
+    return m_model == other.m_model;
+  }
+
+  bool operator!=(const ObjectWrapper &other) const {
+    return m_model != other.m_model;
+  }
+
+  explicit operator bool() const { return m_model != nullptr; }
+
+protected:
+  SmartPointer<T> m_model;
+};
 
 } // namespace uLib
 

src/Core/Property.h

@@ -5,19 +5,23 @@
 #include <vector>
 #include <sstream>
 #include <typeinfo>
-#include <typeindex> // Added
+#include <typeindex>
 #include <boost/serialization/nvp.hpp>
 #include <boost/lexical_cast.hpp>
-#include <vector>
 #include <boost/type_traits/is_class.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/serialization/serialization.hpp>
+#include <set>
+#include <boost/type_traits/is_base_of.hpp>
 #include "Core/Archives.h"
 #include "Core/Signal.h"
 #include "Core/Object.h"
 
 namespace uLib {
 
+namespace Archive {
+class property_register_archive;
+}
+
 /**
  * @brief Base class for properties to allow runtime listing and identification.
  */
@@ -27,7 +31,7 @@ public:
   virtual const std::string& GetName() const = 0;
   virtual const char* GetTypeName() const = 0;
   virtual std::string GetValueAsString() const = 0;
-  virtual std::type_index GetTypeIndex() const = 0; // Added
+  virtual std::type_index GetTypeIndex() const = 0;
   virtual const std::string& GetUnits() const = 0;
   virtual void SetUnits(const std::string& units) = 0;
   virtual const std::vector<std::string>& GetEnumLabels() const {
@@ -61,42 +65,29 @@ public:
   virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int version) override = 0;
   virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int version) override = 0;
   virtual void serialize(Archive::log_archive & ar, const unsigned int version) override = 0;
+  
+  virtual void serialize(Archive::property_register_archive & ar, const unsigned int v) = 0;
 };
 
-
-
-
-
-
-
-
 /**
  * @brief Template class for typed properties.
  */
 template <typename T>
 class Property : public PropertyBase {
 public:
-  // PROXY: Use an existing variable as back-end storage
   Property(Object* owner, const std::string& name, T* valuePtr, const std::string& units = "", const std::string& group = "")
     : m_owner(owner), m_name(name), m_units(units), m_group(group), m_value(valuePtr), m_own(false),
       m_HasRange(false), m_HasDefault(false), m_ReadOnly(false) {
-      if (m_owner) {
-          m_owner->RegisterProperty(this);
-      }
+      if (m_owner) m_owner->RegisterProperty(this);
   }
 
-  // MANAGED: Create and own internal storage
   Property(Object* owner, const std::string& name, const T& defaultValue = T(), const std::string& units = "", const std::string& group = "")
     : m_owner(owner), m_name(name), m_units(units), m_group(group), m_value(new T(defaultValue)), m_own(true),
       m_HasRange(false), m_HasDefault(true), m_Default(defaultValue), m_ReadOnly(false) {
-      if (m_owner) {
-          m_owner->RegisterProperty(this);
-      }
+      if (m_owner) m_owner->RegisterProperty(this);
   }
 
-  virtual ~Property() {
-      if (m_own) delete m_value;
-  }
+  virtual ~Property() { if (m_own) delete m_value; }
 
   // Identification
   virtual const std::string& GetName() const override { return m_name; }
@@ -107,36 +98,18 @@ public:
   virtual const std::string& GetGroup() const override { return m_group; }
   virtual void SetGroup(const std::string& group) override { m_group = group; }
 
-  
   std::string GetValueAsString() const override {
-      try {
-          return boost::lexical_cast<std::string>(*m_value);
-      } catch (const boost::bad_lexical_cast&) {
-          std::stringstream ss;
-          ss << *m_value;
-          return ss.str();
-      }
+      try { return boost::lexical_cast<std::string>(*m_value); }
+      catch (...) { std::stringstream ss; ss << *m_value; return ss.str(); }
   }
 
   // Accessors
   const T& Get() const { return *m_value; }
-  template<typename U = T>
-  typename std::enable_if<std::is_arithmetic<U>::value, void>::type
-  ValidateT(T& val) {
-    if (m_HasRange) {
-        if (val < m_Min) val = m_Min;
-        if (val > m_Max) val = m_Max;
-    }
-  }
-
-  template<typename U = T>
-  typename std::enable_if<!std::is_arithmetic<U>::value, void>::type
-  ValidateT(T& val) {
-  }
-
   void Set(const T& value) {
     T val = value;
-    ValidateT<T>(val);
+    if constexpr (std::is_arithmetic<T>::value) {
+      if (m_HasRange) { if (val < m_Min) val = m_Min; if (val > m_Max) val = m_Max; }
+    }
     if (*m_value != val) {
       *m_value = val;
       ULIB_SIGNAL_EMIT(Property<T>::PropertyChanged);
@@ -150,65 +123,55 @@ public:
   void SetReadOnly(bool ro) { m_ReadOnly = ro; }
 
   virtual bool IsReadOnly() const override { return m_ReadOnly; }
-
   virtual bool HasRange() const override { return m_HasRange; }
+  virtual double GetMin() const override { return m_HasRange ? convert_to_double(m_Min) : 0.0; }
+  virtual double GetMax() const override { return m_HasRange ? convert_to_double(m_Max) : 0.0; }
   
-  template<typename U = T>
-  typename std::enable_if<std::is_arithmetic<U>::value, double>::type
-  GetMinT() const { return (double)m_Min; }
-
-  template<typename U = T>
-  typename std::enable_if<!std::is_arithmetic<U>::value, double>::type
-  GetMinT() const { return 0.0; }
-
-  template<typename U = T>
-  typename std::enable_if<std::is_arithmetic<U>::value, double>::type
-  GetMaxT() const { return (double)m_Max; }
-
-  template<typename U = T>
-  typename std::enable_if<!std::is_arithmetic<U>::value, double>::type
-  GetMaxT() const { return 0.0; }
-
-  virtual double GetMin() const override { return GetMinT<T>(); }
-  virtual double GetMax() const override { return GetMaxT<T>(); }
+  const T& GetMinTyped() const { return m_Min; }
+  const T& GetMaxTyped() const { return m_Max; }
 
   virtual bool HasDefault() const override { return m_HasDefault; }
   virtual std::string GetDefaultValueAsString() const override {
-      try { return boost::lexical_cast<std::string>(m_Default); } 
-      catch (...) { return ""; }
+      try { return boost::lexical_cast<std::string>(m_Default); } catch (...) { return ""; }
   }
 
-  // Operators for seamless usage
+  // Operators
   operator const T&() const { return *m_value; }
-  Property& operator=(const T& value) {
-    Set(value);
-    return *this;
-  }
+  Property& operator=(const T& value) { Set(value); return *this; }
 
-  // Signals
   signals:
   virtual void PropertyChanged() { ULIB_SIGNAL_EMIT(Property<T>::PropertyChanged); }
 
+private:
+  template <typename U>
+  static double convert_to_double(const U& val) {
+    return convert_to_double_impl(val, typename std::is_arithmetic<U>::type());
+  }
+  template <typename U>
+  static double convert_to_double_impl(const U& val, std::true_type) { return (double)val; }
+  template <typename U>
+  static double convert_to_double_impl(const U& val, std::false_type) { return 0.0; }
+
+public:
   // Serialization
   template <class ArchiveT>
-  void serialize_impl(ArchiveT & ar, const unsigned int version) {
-    ar & boost::serialization::make_nvp(m_name.c_str(), *m_value);
+  void serialize_helper(ArchiveT & ar, const unsigned int version) {
+    ar & boost::serialization::make_hrp(m_name.c_str(), *m_value, m_units.c_str());
   }
 
-  void serialize(Archive::xml_oarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::xml_iarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::text_oarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::text_iarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::hrt_oarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::hrt_iarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
-  void serialize(Archive::log_archive & ar, const unsigned int v) override { serialize_impl(ar, v); }
+  virtual void serialize(Archive::xml_oarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::xml_iarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::text_oarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::text_iarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int v) override { serialize_helper(ar, v); }
+  virtual void serialize(Archive::log_archive & ar, const unsigned int v) override { serialize_helper(ar, v); }
   
-  virtual void Updated() override {
-      PropertyBase::Updated();
-      this->PropertyChanged();
-  }
+  virtual void serialize(Archive::property_register_archive & ar, const unsigned int v) override;
 
-private:
+  virtual void Updated() override { PropertyBase::Updated(); this->PropertyChanged(); }
+
+protected:
   std::string m_name;
   std::string m_units;
   std::string m_group;
@@ -224,20 +187,7 @@ private:
 };
 
 /**
- * @brief Conveninent typedefs for common property types.
- */
-typedef Property<std::string> StringProperty;
-typedef Property<int>           IntProperty;
-typedef Property<unsigned int>  UIntProperty;
-typedef Property<long>          LongProperty;
-typedef Property<unsigned long> ULongProperty;
-typedef Property<float>         FloatProperty;
-typedef Property<double>        DoubleProperty;
-typedef Property<Bool_t>        BoolProperty;
-
-
-/**
- * @brief Property specialized for enumerations, providing labels for GUI representations.
+ * @brief Property specialized for enumerations.
  */
 class EnumProperty : public Property<int> {
 public:
@@ -248,68 +198,49 @@ public:
   const char* GetTypeName() const override { return "Enum"; }
   virtual std::type_index GetTypeIndex() const override { return std::type_index(typeid(EnumProperty)); }
 
+  template <class ArchiveT>
+  void serialize_enum_helper(ArchiveT & ar, const unsigned int version) {
+    ar & boost::serialization::make_hrp_enum(m_name.c_str(), *m_value, m_Labels, m_units.c_str());
+  }
+
+  virtual void serialize(Archive::xml_oarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::xml_iarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::text_oarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::text_iarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  virtual void serialize(Archive::log_archive & ar, const unsigned int v) override { serialize_enum_helper(ar, v); }
+  
+  virtual void serialize(Archive::property_register_archive & ar, const unsigned int v) override;
+
 private:
   std::vector<std::string> m_Labels;
 };
 
-
-
-
-
-
-
-
-
-
-
-/**
- * @brief Macro to simplify property declaration within a class.
- * Usage: ULIB_PROPERTY(float, Width, 1.0f)
- * It creates a raw member m_Width and a Property proxy Width.
- */
-#define ULIB_PROPERTY(type, name, defaultValue) \
-    type m_##name = defaultValue; \
-    Property<type> name = Property<type>(this, #name, &m_##name);
-
-
 } // namespace uLib
 
 namespace uLib {
 namespace Archive {
-class property_register_archive;
-} // namespace Archive
-} // namespace uLib
 
-namespace boost {
-namespace archive {
-namespace detail {
-template <>
-class interface_oarchive<uLib::Archive::property_register_archive>
-    : public uLib_interface_oarchive<uLib::Archive::property_register_archive> {};
-} // namespace detail
-} // namespace archive
-} // namespace boost
-
-namespace uLib {
-namespace Archive {
-
-/**
- * @brief A special archive that creates and registers Property proxies
- * for any member it encounters wrapped in HRP().
- */
-class property_register_archive : 
-    public boost::archive::detail::common_oarchive<property_register_archive>
-{
+class property_register_archive
+    : public boost::archive::detail::common_oarchive<property_register_archive> {
+protected:
     Object* m_Object;
+    bool m_DisplayOnly;
 public:
     friend class boost::archive::detail::interface_oarchive<property_register_archive>;
     friend class boost::archive::save_access;
 
-    typedef boost::archive::detail::common_oarchive<property_register_archive> detail_common_oarchive;
+    using boost::archive::detail::common_oarchive<property_register_archive>::save_override;
 
-    property_register_archive(Object* obj) : 
+    property_register_archive(Object* obj, bool displayOnly = false) : 
         boost::archive::detail::common_oarchive<property_register_archive>(boost::archive::no_header),
-        m_Object(obj) {}
+        m_Object(obj), m_DisplayOnly(displayOnly) {
+        if (obj) m_Visited.insert(dynamic_cast<const void*>(obj));
+    }
+
+    template<class T> property_register_archive &operator&(const T &t) { this->save_override(t); return *this; }
+    template<class T> property_register_archive &operator<<(const T &t) { this->save_override(t); return *this; }
     
     std::string GetCurrentGroup() const {
         std::string group;
@@ -320,77 +251,91 @@ public:
         return group;
     }
 
-    // Core logic: encounter HRP -> Create Dynamic Property
-    template<class T>
-    void save_override(const boost::serialization::hrp<T> &t) {
-        if (m_Object) {
-            Property<T>* p = new Property<T>(m_Object, t.name(), &const_cast<boost::serialization::hrp<T>&>(t).value(), t.units() ? t.units() : "", GetCurrentGroup());
-            if (t.has_range()) p->SetRange(t.min_val(), t.max_val());
-            if (t.has_default()) p->SetDefault(t.default_val());
-            p->SetReadOnly(t.is_read_only());
-            m_Object->RegisterDynamicProperty(p);
+    template<class T> void register_property(Property<T>& p) {
+        save_property_impl(p.GetName().c_str(), const_cast<T&>(p.Get()), p.GetUnits().c_str(), 
+                          p.HasRange(), p.GetMinTyped(), p.GetMaxTyped(), p.IsReadOnly());
+    }
+
+    void register_enum_property(EnumProperty& p) {
+        if (!m_Object) return;
+        EnumProperty* newP = new EnumProperty(m_Object, p.GetName(), const_cast<int*>(&p.Get()), p.GetEnumLabels(), p.GetUnits(), GetCurrentGroup());
+        newP->SetReadOnly(p.IsReadOnly());
+        if (m_DisplayOnly) {
+            m_Object->RegisterDisplayProperty(newP);
+            Object* obj = m_Object;
+            Object::connect(newP, &PropertyBase::Updated, [obj]() { obj->Updated(); });
+        } else {
+            m_Object->RegisterDynamicProperty(newP);
         }
     }
 
-    template<class T>
-    void save_override(const boost::serialization::hrp_val<T> &t) {
+    template<class T> void save_property_impl(const char* name, T& val, const char* units, bool hasRange, const T& minVal, const T& maxVal, bool isReadOnly) {
         if (m_Object) {
-            // Note: hrp_val stores by value. Property usually points to existing data.
-            // But here we are registering properties from HRP wrappers.
-            // If it's hrp_val, it means it's an rvalue from a getter. 
-            // The hrp_val wrapper itself owns the value.
-            // However, the property_register_archive is temporary.
-            // This is a bit tricky. Usually HRP(rvalue) is meant for read-only display.
-            // Let's use the address of the value in the wrapper, but mark it read-only.
-            Property<T>* p = new Property<T>(m_Object, t.name(), &const_cast<boost::serialization::hrp_val<T>&>(t).value(), t.units() ? t.units() : "", GetCurrentGroup());
-            if (t.has_range()) p->SetRange(t.min_val(), t.max_val());
-            if (t.has_default()) p->SetDefault(t.default_val());
-            p->SetReadOnly(t.is_read_only());
+            Property<T>* p = new Property<T>(m_Object, name, &val, units ? units : "", GetCurrentGroup());
+            set_range_helper(p, hasRange, minVal, maxVal, typename std::is_arithmetic<T>::type());
+            p->SetReadOnly(isReadOnly);
+            if (m_DisplayOnly) {
+                m_Object->RegisterDisplayProperty(p);
+                Object* obj = m_Object;
+                Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); });
+            } else {
                 m_Object->RegisterDynamicProperty(p);
             }
         }
+    }
 
-    template<class T>
-    void save_override(const boost::serialization::hrp_enum<T> &t) {
+    template<class U> static void set_range_helper(Property<U>* p, bool hasRange, const U& minVal, const U& maxVal, std::true_type) { if (hasRange) p->SetRange(minVal, maxVal); }
+    template<class U> static void set_range_helper(Property<U>* p, bool hasRange, const U& minVal, const U& maxVal, std::false_type) {}
+
+    template<class T> void save_override(const boost::serialization::hrp<T> &t) {
+        // To handle T correctly without deduction issues, we assume T can be passed to save_property_impl
+        T dummy = T(); // Ensure we can construct T
+        save_property_impl(t.name(), const_cast<boost::serialization::hrp<T>&>(t).value(), t.units(), t.has_range(), t.has_range() ? t.min_val() : dummy, t.has_range() ? t.max_val() : dummy, t.is_read_only());
+    }
+    template<class T> void save_override(const boost::serialization::hrp_val<T> &t) {
+        T dummy = T();
+        save_property_impl(t.name(), const_cast<boost::serialization::hrp_val<T>&>(t).value(), t.units(), t.has_range(), t.has_range() ? t.min_val() : dummy, t.has_range() ? t.max_val() : dummy, t.is_read_only());
+    }
+    template<class T> void save_override(const boost::serialization::hrp_enum<T> &t) {
         if (m_Object) {
             EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
             p->SetReadOnly(t.is_read_only());
-            m_Object->RegisterDynamicProperty(p);
+            if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); }); }
+            else { m_Object->RegisterDynamicProperty(p); }
         }
     }
-
-    template<class T>
-    void save_override(const boost::serialization::hrp_enum_val<T> &t) {
+    template<class T> void save_override(const boost::serialization::hrp_enum_val<T> &t) {
         if (m_Object) {
             EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum_val<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
             p->SetReadOnly(t.is_read_only());
-            m_Object->RegisterDynamicProperty(p);
+            if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); }); }
+            else { m_Object->RegisterDynamicProperty(p); }
         }
     }
 
-    // Handle standard NVPs by recursing (important for base classes)
-    template<class T>
-    void save_override(const boost::serialization::nvp<T> &t) {
+    template<class T> void save_override(const boost::serialization::nvp<T> &t) {
         if (t.name()) m_GroupStack.push_back(t.name());
         this->save_helper(t.const_value(), typename boost::is_class<T>::type());
         if (t.name()) m_GroupStack.pop_back();
     }
 
-    // Recursion for nested classes, ignore primitives
-    template<class T>
-    void save_override(const T &t) {
-        this->save_helper(t, typename boost::is_class<T>::type());
+    void save_override(const std::string &t) {}
+    template<class T> void save_override(T * const & t) {
+        if (!t) return;
+        this->save_pointer_helper(t, typename boost::is_base_of<Object, T>::type());
     }
-
-    template<class T>
-    void save_helper(const T &t, boost::mpl::true_) {
-        boost::serialization::serialize_adl(*this, const_cast<T&>(t), 0);
+    template<class T> void save_pointer_helper(T* t, boost::mpl::true_) {
+        const void* ptr = dynamic_cast<const void*>(t);
+        if (m_Visited.find(ptr) != m_Visited.end()) return;
+        m_Visited.insert(ptr);
+        this->save_override(*t);
     }
+    template<class T> void save_pointer_helper(T* t, boost::mpl::false_) {}
+    template<class T> void save_override(const T &t) { this->save_helper(t, typename boost::is_class<T>::type()); }
+    template<class T> void save_helper(const T &t, boost::mpl::true_) { boost::serialization::serialize_adl(*this, const_cast<T&>(t), 0); }
+    void save_helper(const std::string &t, boost::mpl::true_) {}
+    template<class T> void save_helper(const T &t, boost::mpl::false_) {}
 
-    template<class T>
-    void save_helper(const T &t, boost::mpl::false_) {}
-
-    // Required attribute overrides for common_oarchive
     void save_override(const boost::archive::object_id_type & t) {}
     void save_override(const boost::archive::object_reference_type & t) {}
     void save_override(const boost::archive::version_type & t) {}
@@ -400,30 +345,30 @@ public:
     void save_override(const boost::archive::class_name_type & t) {}
     void save_override(const boost::archive::tracking_type & t) {}
 
-private:
+protected:
     std::vector<std::string> m_GroupStack;
+    std::set<const void*> m_Visited;
 };
 
+} // namespace Archive
+} // namespace uLib
 
+namespace uLib {
+
+template <typename T>
+inline void Property<T>::serialize(Archive::property_register_archive & ar, const unsigned int v) {
+  ar.register_property(*this);
+}
+
+inline void EnumProperty::serialize(Archive::property_register_archive & ar, const unsigned int v) {
+  ar.register_enum_property(*this);
+}
+
+namespace Archive {
 
-/**
- * @brief Convenience macro to automatically activate and register all HRP members
- * as uLib properties. Usage: ULIB_ACTIVATE_PROPERTIES(obj)
- */
 #define ULIB_ACTIVATE_PROPERTIES(obj) \
     { uLib::Archive::property_register_archive _ar_tmp(&(obj)); _ar_tmp & (obj); }
 
-/**
- * @brief Declares a private member that automatically calls ULIB_ACTIVATE_PROPERTIES
- * in every constructor of the class. Place this macro as the last declaration
- * inside the class body (before the closing brace).
- *
- * Usage: ULIB_DECLARE_PROPERTIES(ClassName)
- *
- * This replaces per-constructor ULIB_ACTIVATE_PROPERTIES(*this) calls.
- * RegisterDynamicProperty deduplicates by qualified name, so re-registration
- * from inherited activators in a hierarchy is safe.
- */
 #define ULIB_DECLARE_PROPERTIES(SelfType) \
 private: \
     struct _PropActivator { \
@@ -434,6 +379,31 @@ private: \
     } _prop_activator{this};
 
 } // namespace Archive
+
+// Convenience macro: declares a named Property<T> member with a default value.
+// Usage inside a class body (requires 'this' to be available, so use in-class initializer):
+//   ULIB_PROPERTY(int, MyProp, 42)
+#define ULIB_PROPERTY(type, name, defaultVal) \
+    ::uLib::Property<type> name{this, #name, (type)(defaultVal)};
+
+// Common property type aliases
+typedef Property<bool>        BoolProperty;
+typedef Property<int>         IntProperty;
+typedef Property<float>       FloatProperty;
+typedef Property<double>      DoubleProperty;
+typedef Property<std::string> StringProperty;
+
+template <class ArchiveT>
+void serialize_properties_helper(ArchiveT &ar, const std::vector<PropertyBase*> &props, unsigned int version) {
+    for (auto* prop : props) prop->serialize(ar, version);
+}
+
+template <class ArchiveT>
+void Object::serialize(ArchiveT &ar, const unsigned int version) {
+    ar & boost::serialization::make_nvp("InstanceName", this->GetInstanceName());
+    serialize_properties_helper(ar, this->GetProperties(), version);
+}
+
 } // namespace uLib
 
 #endif // U_CORE_PROPERTY_H

src/Core/SmartPointer.h

@@ -23,89 +23,249 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-
-
 #ifndef U_CORE_SMARTPOINTER_H
 #define U_CORE_SMARTPOINTER_H
 
+#include <atomic>
+#include <functional>
+#include <type_traits>
+#include <utility>
 
 namespace uLib {
 
+/**
+ * @brief A smart pointer implementation inspired by std::shared_ptr.
+ * 
+ * Features modernized C++11/14/17 syntax, thread-safe reference counting,
+ * move semantics, and support for custom deleters.
+ * 
+ * NOTE: Default constructor allocates a new T following legacy behavior.
+ */
 template <typename T>
 class SmartPointer {
-    typedef T element_type;
 public:
+    using element_type = T;
 
-    explicit
-    SmartPointer(T* ptr = NULL) : m_counter(0) {
-        if(!ptr) ptr = new T;
+    /**
+     * @brief Constructor from raw pointer.
+     * If ptr is nullptr, a new T is allocated (legacy behavior).
+     */
+    explicit SmartPointer(T* ptr = nullptr) : m_counter(nullptr) {
+        if (!ptr) {
+            if constexpr (std::is_default_constructible_v<T>) {
+                ptr = new T(); 
+            }
+        }
         if (ptr) m_counter = new ReferenceCounter(ptr);
     }
 
-    // TakeReference //
-    SmartPointer(T &ref) : m_counter(new ReferenceCounter(&ref,0)) { }
-
-    SmartPointer(const SmartPointer& copy) throw () {
-        acquire(copy.m_counter);
+    /**
+     * @brief Constructor with custom deleter.
+     */
+    template <typename D>
+    SmartPointer(T* ptr, D deleter) : m_counter(nullptr) {
+        if (ptr) m_counter = new ReferenceCounter(ptr, deleter);
     }
 
-    SmartPointer(SmartPointer * copy) throw () {
-        acquire(copy->m_counter);
+    /**
+     * @brief Non-owning constructor from reference.
+     * Uses a no-op deleter to ensure the referenced object is not destroyed.
+     */
+    SmartPointer(T &ref) : m_counter(new ReferenceCounter(&ref, [](T*){}, 1)) { }
+
+    /**
+     * @brief Copy constructor.
+     */
+    SmartPointer(const SmartPointer& other) noexcept : m_counter(nullptr) {
+        acquire(other.m_counter);
     }
 
+    /**
+     * @brief Copy constructor from a pointer to SmartPointer (Legacy support).
+     */
+    SmartPointer(const SmartPointer* other) noexcept : m_counter(nullptr) {
+        if (other) acquire(other->m_counter);
+    }
+
+    /**
+     * @brief Move constructor.
+     */
+    SmartPointer(SmartPointer&& other) noexcept : m_counter(other.m_counter) {
+        other.m_counter = nullptr;
+    }
+
+    /**
+     * @brief Virtual destructor.
+     */
     virtual ~SmartPointer() { release(); }
 
-    SmartPointer & operator=(const SmartPointer& copy) {
-        if (this != &copy)
-        {
+    /**
+     * @brief Copy assignment.
+     */
+    SmartPointer& operator=(const SmartPointer& other) noexcept {
+        if (this != &other) {
             release();
-            acquire(copy.m_counter);
+            acquire(other.m_counter);
         }
         return *this;
     }
 
-    T & operator*() const throw () {  return *m_counter->ptr; }
-    T * operator->() const throw () {  return m_counter->ptr; }
+    /**
+     * @brief Move assignment.
+     */
+    SmartPointer& operator=(SmartPointer&& other) noexcept {
+        if (this != &other) {
+            release();
+            m_counter = other.m_counter;
+            other.m_counter = nullptr;
+        }
+        return *this;
+    }
 
-    T * get() const throw () {
-        return m_counter ? m_counter->ptr : 0; }
-    bool unique() const throw () {
-        return (m_counter ? m_counter->count == 1 : true);  }
+    /**
+     * @brief Resets the smart pointer to hold a new raw pointer.
+     */
+    void reset(T* ptr = nullptr) {
+        release();
+        if (ptr) m_counter = new ReferenceCounter(ptr);
+    }
 
+    /**
+     * @brief Resets the smart pointer with a custom deleter.
+     */
+    template <typename D>
+    void reset(T* ptr, D deleter) {
+        release();
+        if (ptr) m_counter = new ReferenceCounter(ptr, deleter);
+    }
+
+    /**
+     * @brief Swaps contents with another SmartPointer.
+     */
+    void swap(SmartPointer& other) noexcept {
+        std::swap(m_counter, other.m_counter);
+    }
+
+    /**
+     * @brief Dereference operator.
+     */
+    T& operator*() const noexcept { return *m_counter->ptr; }
+
+    /**
+     * @brief Member access operator.
+     */
+    T* operator->() const noexcept { return m_counter->ptr; }
+
+    /**
+     * @brief Returns the raw pointer.
+     */
+    T* get() const noexcept { return m_counter ? m_counter->ptr : nullptr; }
+
+    /**
+     * @brief Implicit conversion to raw pointer (legacy compatibility).
+     */
+    operator T*() const noexcept { return get(); }
+
+    /**
+     * @brief Returns the number of SmartPointers sharing ownership.
+     */
+    uint32_t use_count() const noexcept {
+        return m_counter ? m_counter->count.load(std::memory_order_relaxed) : 0;
+    }
+
+    /**
+     * @brief Returns true if this is the only SmartPointer owning the resource.
+     */
+    bool unique() const noexcept { return use_count() == 1; }
+
+    /**
+     * @brief Boolean conversion operator.
+     */
+    explicit operator bool() const noexcept { return get() != nullptr; }
 
 private:
-
-    struct ReferenceCounter
-    {
-      ReferenceCounter(T* ptr = 0, unsigned c = 1) : ptr(ptr), count(c) { }
+    struct ReferenceCounter {
         T* ptr;
-      unsigned count;
-    } * m_counter;
+        std::atomic<uint32_t> count;
+        std::function<void(T*)> deleter;
 
-    // increment the count
-    void acquire(ReferenceCounter* c) throw ()
-    {
-        m_counter = c;
-        if (c && c->count>0) ++c->count;
-    }
-
-    // decrement the count, delete if it is 0
-    void release() {
-        if (m_counter) {
-            if (--m_counter->count == 0) {
-                delete m_counter->ptr;
-            }
-            if (m_counter->count <= 0) {
-                delete m_counter;
-                m_counter = NULL;
-            }
-        }
-    }
+        ReferenceCounter(T* p, uint32_t initial_count = 1)
+            : ptr(p), count(initial_count), deleter([](T* ptr_to_del) { delete ptr_to_del; }) {}
 
+        template <typename D>
+        ReferenceCounter(T* p, D d, uint32_t initial_count = 1)
+            : ptr(p), count(initial_count), deleter(d) {}
     };
 
+    ReferenceCounter* m_counter;
 
-
+    void acquire(ReferenceCounter* c) noexcept {
+        m_counter = c;
+        if (c) {
+            c->count.fetch_add(1, std::memory_order_relaxed);
+        }
     }
 
-#endif // SMARTPOINTER_H
+    void release() noexcept {
+        if (m_counter) {
+            if (m_counter->count.fetch_sub(1, std::memory_order_acq_rel) == 1) {
+                if (m_counter->ptr) {
+                    m_counter->deleter(m_counter->ptr);
+                }
+                delete m_counter;
+            }
+            m_counter = nullptr;
+        }
+    }
+};
+
+/**
+ * @brief Global swap for SmartPointer.
+ */
+template <typename T>
+void swap(SmartPointer<T>& a, SmartPointer<T>& b) noexcept {
+    a.swap(b);
+}
+
+/**
+ * @brief Equality comparison.
+ */
+template <typename T, typename U>
+bool operator==(const SmartPointer<T>& a, const SmartPointer<U>& b) noexcept {
+    return a.get() == b.get();
+}
+
+/**
+ * @brief Inequality comparison.
+ */
+template <typename T, typename U>
+bool operator!=(const SmartPointer<T>& a, const SmartPointer<U>& b) noexcept {
+    return a.get() != b.get();
+}
+
+/**
+ * @brief Comparison with nullptr.
+ */
+template <typename T>
+bool operator==(const SmartPointer<T>& a, std::nullptr_t) noexcept {
+    return a.get() == nullptr;
+}
+
+template <typename T>
+bool operator==(std::nullptr_t, const SmartPointer<T>& a) noexcept {
+    return a.get() == nullptr;
+}
+
+template <typename T>
+bool operator!=(const SmartPointer<T>& a, std::nullptr_t) noexcept {
+    return a.get() != nullptr;
+}
+
+template <typename T>
+bool operator!=(std::nullptr_t, const SmartPointer<T>& a) noexcept {
+    return a.get() != nullptr;
+}
+
+} // namespace uLib
+
+#endif // U_CORE_SMARTPOINTER_H

src/Core/Types.h

@@ -139,7 +139,6 @@ typedef id_t Id_t;
 typedef void *Pointer_t;
 typedef bool Bool_t; // Boolean (0=false, 1=true) (bool)
 
-
 //--- bit manipulation ---------------------------------------------------------
 #ifndef BIT
 #define BIT(n) (1ULL << (n))
@@ -182,7 +181,7 @@ typedef bool Bool_t; // Boolean (0=false, 1=true) (bool)
                                                                                \
 public:                                                                        \
   typedef type_info::BaseClass BaseClass;                                      \
-  virtual const char *type_name() const { return type_info::name; }            \
+  virtual const char *type_name() const override { return type_info::name; }   \
   /**/
 
 /**

src/Core/testing/CMakeLists.txt

@@ -2,6 +2,8 @@
 # TESTS
 set( TESTS
         SmartVectorTest
+        SmartPointerTest
+        ObjectWrapperTest
         VectorTest
         ObjectFlagsTest
         ObjectParametersTest

src/Core/testing/ObjectWrapperTest.cpp

@@ -0,0 +1,26 @@
+#include "Core/ObjectFactory.h"
+#include <iostream>
+
+struct NonDefault {
+    NonDefault(int) {}
+};
+
+struct Default {
+    Default() : value(42) {}
+    int value;
+};
+
+int main() {
+    std::cout << "Testing ObjectWrapper with Default Constructible type..." << std::endl;
+    uLib::ObjectWrapper<Default> w1;
+    
+    std::cout << "Testing ObjectWrapper with Non-Default Constructible type..." << std::endl;
+    NonDefault nd(10);
+    uLib::ObjectWrapper<NonDefault> w2(&nd);
+    
+    // The following would NOT compile without SFINAE:
+    // uLib::ObjectWrapper<NonDefault> w3; 
+
+    std::cout << "Tests passed (compilation and manual instantiation)!" << std::endl;
+    return 0;
+}

src/Core/testing/VectorTest.cpp

@@ -38,7 +38,7 @@ inline const unsigned long VectorSplice(const _Tp &_it, const _Tp &_end,
 
   _Tp it = _it;
   _Tp end = _end - 1;
-  for (it; it != end;) {
+  for (; it != end;) {
     if (_comp(*it, value))
       it++;
     else if (_comp(*end, value)) {

src/HEP/Geant/EmitterPrimary.cpp

@@ -39,7 +39,7 @@ EmitterPrimary::EmitterPrimary()
   // Initial position and direction through AffineTransform
   // 10m on Z axis, pointing towards origin
   this->SetPosition(Vector3f(0, 0, 10000.0));
-  // Default orientation is identity (pointing along -Z if we rotate the puppet accordingly)
+  // Default orientation is identity (pointing along -Z if we rotate the prop3d accordingly)
   // But fParticleGun defaults are set here and overridden in GeneratePrimaries
 }
 

src/HEP/Geant/EmitterPrimary.hh

@@ -32,7 +32,7 @@ class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public AffineTransf
     virtual ~EmitterPrimary();
 
     // Metodo principale chiamato all'inizio di ogni evento
-    virtual void GeneratePrimaries(G4Event*);         
+    virtual void GeneratePrimaries(G4Event*) override;
 
     virtual void Updated() override { ULIB_SIGNAL_EMIT(EmitterPrimary::Updated); }
     
@@ -51,7 +51,7 @@ class SkyPlaneEmitterPrimary : public EmitterPrimary
     SkyPlaneEmitterPrimary();
     virtual ~SkyPlaneEmitterPrimary();
 
-    virtual void GeneratePrimaries(G4Event*);
+    virtual void GeneratePrimaries(G4Event*) override;
 
     void SetPlane(const uLib::Vector3f& p0, const uLib::Vector3f& normal);
     void SetSkySize(const uLib::Vector2f& size);
@@ -72,7 +72,7 @@ class CylinderEmitterPrimary : public EmitterPrimary
     CylinderEmitterPrimary();
     virtual ~CylinderEmitterPrimary();
 
-    virtual void GeneratePrimaries(G4Event*);
+    virtual void GeneratePrimaries(G4Event*) override;
 
     void SetRadius(float r);
     float GetRadius() const { return m_Radius; }
@@ -101,7 +101,7 @@ class QuadMeshEmitterPrimary : public EmitterPrimary
     virtual ~QuadMeshEmitterPrimary();
 
     // Metodo principale chiamato all'inizio di ogni evento
-    virtual void GeneratePrimaries(G4Event*);
+    virtual void GeneratePrimaries(G4Event*) override;
 
     void SetMesh(uLib::QuadMesh* mesh);
     

src/HEP/Geant/Solid.cpp

@@ -105,6 +105,8 @@ void Solid::SetTransform(Matrix4f transform) {
         m_Physical->SetTranslation(*m_Position);
         m_Physical->SetRotation(m_Rotation);
     }
+
+    std::cout << "Solid " << GetName() << " position: " << pos << " rotation: " << m << std::endl;
 }
 
 void Solid::SetParent(Solid *parent) {

src/Math/Assembly.h

@@ -41,7 +41,7 @@ namespace uLib {
  * transformation that is applied on top of each child's own transform.
  *
  * A bounding box is automatically computed from all contained objects and
- * can be queried or shown/hidden through the VTK puppet.
+ * can be queried or shown/hidden through the VTK prop3d.
  */
 class Assembly : public ObjectsContext, public TRS {
 public:
@@ -81,7 +81,7 @@ public:
 
     /**
      * @brief Controls whether the bounding box wireframe should be shown
-     * in the viewer (used by the VTK puppet).
+     * in the viewer (used by the VTK prop3d).
      */
     void SetShowBoundingBox(bool show);
     bool GetShowBoundingBox() const;

src/Math/MathRegistrations.cpp

@@ -1,12 +1,12 @@
 #include "Core/ObjectFactory.h"
+#include "Math/Assembly.h"
 #include "Math/ContainerBox.h"
 #include "Math/Cylinder.h"
 #include "Math/Geometry.h"
-#include "Math/TriangleMesh.h"
 #include "Math/QuadMesh.h"
-#include "Math/VoxImage.h"
-#include "Math/Assembly.h"
 #include "Math/StructuredData.h"
+#include "Math/TriangleMesh.h"
+#include "Math/VoxImage.h"
 
 namespace uLib {
 
@@ -14,8 +14,6 @@ ULIB_REGISTER_OBJECT(TRS)
 ULIB_REGISTER_OBJECT(ContainerBox)
 ULIB_REGISTER_OBJECT(Cylinder)
 ULIB_REGISTER_OBJECT(Assembly)
-ULIB_REGISTER_OBJECT(CylindricalGeometry)
-ULIB_REGISTER_OBJECT(SphericalGeometry)
 ULIB_REGISTER_OBJECT(TriangleMesh)
 ULIB_REGISTER_OBJECT(QuadMesh)
 ULIB_REGISTER_OBJECT_NAME(VoxImage<Voxel>, "VoxImage")

src/Vtk/CMakeLists.txt

@@ -37,6 +37,8 @@ list(APPEND HEADERS ${HEP_GEANT_HEADERS})
 set(LIBRARIES Eigen3::Eigen
               ${ROOT_LIBRARIES}
               ${VTK_LIBRARIES}
+              VTK::ImagingHybrid
+              VTK::ImagingSources
               ${PACKAGE_LIBPREFIX}Math
               ${PACKAGE_LIBPREFIX}Detectors
               ${PACKAGE_LIBPREFIX}Geant)
@@ -56,7 +58,7 @@ set_target_properties(${libname} PROPERTIES
                        AUTOMOC ON
                        AUTOUIC ON
                        AUTORCC ON)
-target_link_libraries(${libname} ${LIBRARIES} Qt6::Widgets)
+target_link_libraries(${libname} PUBLIC ${LIBRARIES} Qt6::Widgets)
 
 install(TARGETS ${libname}
         EXPORT "uLibTargets"

src/Vtk/HEP/Detectors/testing/vtkDetectorChamberTest.cpp

@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
-#include "HEP/Detectors/DetectorChamber.h"
+#include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 #include "Math/Units.h"
 
 #include "Vtk/uLibVtkViewer.h"
@@ -43,20 +43,20 @@ BOOST_AUTO_TEST_CASE(vtkDetectorChamberTest) {
   d2.Scale(Vector3f(1_m, 2_m, 20_cm));
   d2.Translate(Vector3f(1_m, 0, 10_m));
 
-  Vtk::vtkDetectorChamber v_d1(&d1);
-  Vtk::vtkDetectorChamber v_d2(&d2);
-  v_d1.SetRepresentation(Vtk::Puppet::Surface);
-  v_d2.SetRepresentation(Vtk::Puppet::Surface);
+  Vtk::DetectorChamber v_d1(&d1);
+  Vtk::DetectorChamber v_d2(&d2);
+  v_d1.SetRepresentation(Vtk::Prop3D::Surface);
+  v_d2.SetRepresentation(Vtk::Prop3D::Surface);
 
   if (!v_d1.GetProp()) {
-    BOOST_FAIL("vtkDetectorChamber::GetProp() returned NULL");
+    BOOST_FAIL("DetectorChamber::GetProp() returned NULL");
   }
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
     viewer.SetGridAxis(Vtk::Viewport::Y);
-    viewer.AddPuppet(v_d1);
-    viewer.AddPuppet(v_d2);
+    viewer.AddProp3D(v_d1);
+    viewer.AddProp3D(v_d2);
     viewer.Start();
   }
 

src/Vtk/HEP/Detectors/testing/vtkDetectorMuonProjectionTest.cpp

@@ -23,8 +23,8 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-#include "HEP/Detectors/DetectorChamber.h"
-#include "HEP/Detectors/MuonScatter.h"
+#include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
+#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
 #include "Math/Units.h"
 #include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 #include "Vtk/HEP/Detectors/vtkMuonScatter.h"
@@ -42,10 +42,10 @@
 
 using namespace uLib;
 
-// A simple puppet class to represent an arrow indicative of a projected muon hit
-class vtkArrowPuppet : public Vtk::Puppet {
+// A simple prop3d class to represent an arrow indicative of a projected muon hit
+class vtkArrowProp3D : public Vtk::Prop3D {
 public:
-  vtkArrowPuppet() : m_Actor(vtkActor::New()) {
+  vtkArrowProp3D() : m_Actor(vtkActor::New()) {
     vtkNew<vtkArrowSource> arrow;
     vtkNew<vtkPolyDataMapper> mapper;
     mapper->SetInputConnection(arrow->GetOutputPort());
@@ -54,7 +54,7 @@ public:
     m_Actor->GetProperty()->SetColor(1, 1, 0); // Yellow color for visibility
   }
 
-  virtual ~vtkArrowPuppet() { m_Actor->Delete(); }
+  virtual ~vtkArrowProp3D() { m_Actor->Delete(); }
 
   void SetProjection(const HLine3f &line) {
     HPoint3f p = line.origin;
@@ -125,30 +125,30 @@ BOOST_AUTO_TEST_CASE(vtkDetectorMuonProjectionTest) {
   MuonEvent mu_proj1 = d1.ProjectMuonEvent(mu_event);
   MuonEvent mu_proj2 = d2.ProjectMuonEvent(mu_event);
 
-  Vtk::vtkDetectorChamber v_d1(&d1);
-  Vtk::vtkDetectorChamber v_d2(&d2);
-  Vtk::vtkMuonScatter v_event(event);
+  Vtk::DetectorChamber v_d1(&d1);
+  Vtk::DetectorChamber v_d2(&d2);
+  Vtk::MuonScatter v_event(event);
   v_event.AddPocaPoint(HPoint3f(0, 0, 0));
   v_event.SetColor(1, 0, 0); // Red muon event
 
-  v_d1.SetRepresentation(Vtk::Puppet::Surface);
+  v_d1.SetRepresentation(Vtk::Prop3D::Surface);
   v_d1.SetOpacity(0.3);
-  v_d2.SetRepresentation(Vtk::Puppet::Surface);
+  v_d2.SetRepresentation(Vtk::Prop3D::Surface);
   v_d2.SetOpacity(0.3);
 
   // 5. Add two arrows to mark where the projection is located on the chambers
-  vtkArrowPuppet v_p1, v_p2;
+  vtkArrowProp3D v_p1, v_p2;
   v_p1.SetProjection(mu_proj1.LineIn());
   v_p2.SetProjection(mu_proj2.LineIn());
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
     viewer.SetGridAxis(Vtk::Viewport::Z);
-    viewer.AddPuppet(v_d1);
-    viewer.AddPuppet(v_d2);
-    viewer.AddPuppet(v_event);
-    viewer.AddPuppet(v_p1);
-    viewer.AddPuppet(v_p2);
+    viewer.AddProp3D(v_d1);
+    viewer.AddProp3D(v_d2);
+    viewer.AddProp3D(v_event);
+    viewer.AddProp3D(v_p1);
+    viewer.AddProp3D(v_p2);
     viewer.Start();
   }
 

src/Vtk/HEP/Detectors/testing/vtkMuonScatterTest.cpp

@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/HEP/Detectors/vtkMuonScatter.h"
-#include "HEP/Detectors/MuonScatter.h"
+#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
 
 #include "Vtk/uLibVtkViewer.h"
 
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(vtkMuonScatterTest) {
   event.LineOut().direction << 0, -1, 0, 0;
   event.LineOut().origin << 0, -1, 0, 1;
 
-  Vtk::vtkMuonScatter v_event(event);
+  Vtk::MuonScatter v_event(event);
   v_event.AddPocaPoint(HPoint3f(0, 0, 0));
 
   v_event.SaveToXMLFile("vtk_testing_muonevent.vtp");
@@ -49,12 +49,12 @@ BOOST_AUTO_TEST_CASE(vtkMuonScatterTest) {
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
 
-    //    Vtk::Tie<Vtk::vtkMuonScatter> tms;
+    //    Vtk::Tie<Vtk::MuonScatter> tms;
     //    tms.DoAction();
     //    Vtk::Tie<Vtk::Viewer> vms;
     //    vms.DoAction();
 
-    viewer.AddPuppet(v_event);
+    viewer.AddProp3D(v_event);
     viewer.Start();
   }
 

src/Vtk/HEP/Detectors/vtkDetectorChamber.cxx

@@ -48,8 +48,8 @@
 namespace uLib {
 namespace Vtk {
 
-vtkDetectorChamber::vtkDetectorChamber(DetectorChamber *content)
-    : vtkContainerBox(content) {
+DetectorChamber::DetectorChamber(uLib::DetectorChamber *content)
+    : ContainerBox(content) {
   m_PlaneSource = vtkPlaneSource::New();
   
   vtkNew<vtkPolyDataMapper> mapper;
@@ -67,20 +67,20 @@ vtkDetectorChamber::vtkDetectorChamber(DetectorChamber *content)
   this->Update();
 }
 
-vtkDetectorChamber::~vtkDetectorChamber() {
+DetectorChamber::~DetectorChamber() {
   m_PlaneSource->Delete();
   m_PlaneActor->Delete();
 }
 
-DetectorChamber *vtkDetectorChamber::GetContent() {
-  return static_cast<DetectorChamber *>(m_Content);
+DetectorChamber::Content *DetectorChamber::GetContent() const {
+  return static_cast<Content *>(this->m_model.get());
 }
 
-void vtkDetectorChamber::Update() {
+void DetectorChamber::Update() {
   this->BaseClass::Update();
 
-  if (!m_Content) return;
-  DetectorChamber *c = this->GetContent();
+  if (!this->m_model) return;
+  Content *c = this->GetContent();
   Vector3f size = c->GetSize();
   HLine3f plane = c->GetProjectionPlane();
 

src/Vtk/HEP/Detectors/vtkDetectorChamber.h

@@ -32,7 +32,7 @@
 #include <vtkTransform.h>
 
 #include "HEP/Detectors/DetectorChamber.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/uLibVtkInterface.h"
 #include "Vtk/Math/vtkContainerBox.h"
 #include <vtkActor.h>
@@ -44,17 +44,17 @@ class vtkPlaneSource;
 namespace uLib {
 namespace Vtk {
 
-// class vtkHandlerWidget; // Removed as we use vtkBoxWidget now
+// class HandlerWidget; // Removed as we use vtkBoxWidget now
 
-class vtkDetectorChamber : public vtkContainerBox {
-  typedef DetectorChamber Content;
-  typedef vtkContainerBox BaseClass;
+class DetectorChamber : public ContainerBox {
+  typedef uLib::DetectorChamber Content;
+  typedef ContainerBox BaseClass;
 
 public:
-  vtkDetectorChamber(DetectorChamber *content);
-  virtual ~vtkDetectorChamber();
+  DetectorChamber(uLib::DetectorChamber *content);
+  virtual ~DetectorChamber();
 
-  Content *GetContent();
+  Content *GetContent() const override;
 
   virtual void Update() override;
 

src/Vtk/HEP/Detectors/vtkMuonEvent.cxx

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/HEP/Detectors/vtkMuonEvent.h"
 
 namespace uLib {
@@ -38,7 +38,7 @@ namespace Vtk {
 class vtkWidgetCallback : public vtkCommand {
 public:
   static vtkWidgetCallback *New() { return new vtkWidgetCallback; }
-  void SetParent(uLib::Vtk::vtkMuonEvent *parent) { this->parent = parent; }
+  void SetParent(uLib::Vtk::MuonEvent *parent) { this->parent = parent; }
   virtual void Execute(vtkObject *caller, unsigned long, void *) {
     vtkSmartPointer<vtkTransform> t = vtkSmartPointer<vtkTransform>::New();
     vtkBoxWidget *widget = reinterpret_cast<vtkBoxWidget *>(caller);
@@ -48,30 +48,30 @@ public:
   }
 
 private:
-  uLib::Vtk::vtkMuonEvent *parent;
+  uLib::Vtk::MuonEvent *parent;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 /////  VTK MUON EVENT  /////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-vtkMuonEvent::vtkMuonEvent(MuonEventData &content)
+MuonEvent::MuonEvent(MuonEventData &content)
     : m_PolyData(NULL), m_Appender(vtkAppendPolyData::New()),
       content(&content) {
   InstallPipe();
 }
 
-vtkMuonEvent::vtkMuonEvent(const MuonEventData &content)
+MuonEvent::MuonEvent(const MuonEventData &content)
     : m_PolyData(NULL), m_Appender(vtkAppendPolyData::New()),
       content(const_cast<MuonEventData *>(&content)) {
   InstallPipe();
 }
 
-vtkMuonEvent::~vtkMuonEvent() {}
+MuonEvent::~MuonEvent() {}
 
-vtkMuonEvent::Content &vtkMuonEvent::GetContent() { return *content; }
+MuonEventData &MuonEvent::GetModel() { return *content; }
 
-void vtkMuonEvent::PrintSelf(std::ostream &o) const {
+void MuonEvent::PrintSelf(std::ostream &o) const {
   o << "..:: MuonEvent ::..\n"
        "\t[in]  Origin    > "
     << content->LineIn().origin.transpose() << "\n"
@@ -83,7 +83,7 @@ void vtkMuonEvent::PrintSelf(std::ostream &o) const {
     << "...................\n";
 }
 
-void vtkMuonEvent::InstallPipe() {
+void MuonEvent::InstallPipe() {
 
   vtkAppendPolyData *appender = m_Appender;
   vtkSmartPointer<vtkPolyDataMapper> mapper =
@@ -121,11 +121,11 @@ void vtkMuonEvent::InstallPipe() {
   this->SetProp(actor);
 }
 
-vtkPolyData *vtkMuonEvent::GetPolyData() const {
+vtkPolyData *MuonEvent::GetPolyData() const {
   return m_Appender->GetOutput();
 }
 
-void vtkMuonEvent::AddPocaPoint(HPoint3f poca) {
+void MuonEvent::AddPocaPoint(HPoint3f poca) {
   m_Poca = poca;
   vtkSmartPointer<vtkSphereSource> sphere =
       vtkSmartPointer<vtkSphereSource>::New();
@@ -139,7 +139,8 @@ void vtkMuonEvent::AddPocaPoint(HPoint3f poca) {
   m_Appender->Update();
 }
 
-HPoint3f vtkMuonEvent::GetPocaPoint() { return m_Poca; }
+HPoint3f MuonEvent::GetPocaPoint() { return m_Poca; }
 
+uLib::Object* MuonEvent::GetContent() const { return (uLib::Object*)content; }
 } // namespace Vtk
 } // namespace uLib

src/Vtk/HEP/Detectors/vtkMuonEvent.h

@@ -41,7 +41,7 @@
 #include <vtkCommand.h>
 #include <vtkTransform.h>
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 
 #include "HEP/Detectors/MuonEvent.h"
 #include "Vtk/uLibVtkInterface.h"
@@ -50,15 +50,16 @@
 namespace uLib {
 namespace Vtk {
 
-class vtkMuonEvent : public Puppet, public Polydata {
+class MuonEvent : public Prop3D, public Polydata {
   typedef MuonEventData Content;
 
 public:
-  vtkMuonEvent(const MuonEventData &content);
-  vtkMuonEvent(MuonEventData &content);
-  ~vtkMuonEvent();
+  MuonEvent(const MuonEventData &content);
+  MuonEvent(MuonEventData &content);
+  ~MuonEvent();
 
-  Content &GetContent();
+  Content &GetModel();
+  uLib::Object* GetContent() const override;
 
   void PrintSelf(std::ostream &o) const;
 
@@ -73,7 +74,7 @@ public:
 private:
   void InstallPipe();
 
-  vtkMuonEvent::Content *content;
+  MuonEvent::Content *content;
   vtkPolyData *m_PolyData;
 
   vtkAppendPolyData *m_Appender;

src/Vtk/HEP/Detectors/vtkMuonScatter.cxx

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/HEP/Detectors/vtkMuonScatter.h"
 
 namespace uLib {
@@ -37,21 +37,21 @@ namespace Vtk {
 /////  VTK MUON Scatter  ///////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-vtkMuonScatter::vtkMuonScatter(MuonScatter &content)
+MuonScatter::MuonScatter(uLib::MuonScatter &content)
     : m_Content(&content), m_LineIn(vtkLineSource::New()),
       m_LineOut(vtkLineSource::New()), m_PolyData(vtkPolyData::New()),
       m_SpherePoca(NULL), m_Asm(vtkAssembly::New()) {
   InstallPipe();
 }
 
-vtkMuonScatter::vtkMuonScatter(const MuonScatter &content)
-    : m_Content(const_cast<MuonScatter *>(&content)),
+MuonScatter::MuonScatter(const MuonScatter &content)
+    : m_Content(content.m_Content),
       m_LineIn(vtkLineSource::New()), m_LineOut(vtkLineSource::New()),
       m_PolyData(vtkPolyData::New()), m_SpherePoca(NULL), m_Asm(vtkAssembly::New()) {
   InstallPipe();
 }
 
-vtkMuonScatter::~vtkMuonScatter() {
+MuonScatter::~MuonScatter() {
   m_LineIn->Delete();
   m_LineOut->Delete();
   m_Asm->Delete();
@@ -59,11 +59,11 @@ vtkMuonScatter::~vtkMuonScatter() {
     m_SpherePoca->Delete();
 }
 
-vtkMuonScatter::Content &vtkMuonScatter::GetContent() { return *m_Content; }
+MuonScatter::Content &MuonScatter::GetModel() { return *m_Content; }
 
-void vtkMuonScatter::PrintSelf(std::ostream &o) const {}
+void MuonScatter::PrintSelf(std::ostream &o) const {}
 
-void vtkMuonScatter::InstallPipe() {
+void MuonScatter::InstallPipe() {
   if (m_Content) {
     vtkLineSource *line_in = m_LineIn;
     vtkLineSource *line_out = m_LineOut;
@@ -99,7 +99,7 @@ void vtkMuonScatter::InstallPipe() {
   this->SetProp(m_Asm);
 }
 
-vtkPolyData *vtkMuonScatter::GetPolyData() const {
+vtkPolyData *MuonScatter::GetPolyData() const {
   vtkSmartPointer<vtkAppendPolyData> append =
       vtkSmartPointer<vtkAppendPolyData>::New();
   append->AddInputConnection(m_LineIn->GetOutputPort());
@@ -111,7 +111,7 @@ vtkPolyData *vtkMuonScatter::GetPolyData() const {
   return m_PolyData;
 }
 
-void vtkMuonScatter::AddPocaPoint(HPoint3f poca) {
+void MuonScatter::AddPocaPoint(HPoint3f poca) {
   vtkSphereSource *sphere = vtkSphereSource::New();
   float size =
       (m_Content->LineIn().origin - m_Content->LineOut().origin).head(3).norm();
@@ -129,7 +129,7 @@ void vtkMuonScatter::AddPocaPoint(HPoint3f poca) {
   m_Asm->AddPart(actor);
 }
 
-HPoint3f vtkMuonScatter::GetPocaPoint() {
+HPoint3f MuonScatter::GetPocaPoint() {
   double center[3];
   if (m_SpherePoca) {
     m_SpherePoca->GetCenter(center);
@@ -139,7 +139,7 @@ HPoint3f vtkMuonScatter::GetPocaPoint() {
   }
 }
 
-void vtkMuonScatter::ConnectInteractor(vtkRenderWindowInteractor *interactor) {
+void MuonScatter::ConnectInteractor(vtkRenderWindowInteractor *interactor) {
   // TODO
 }
 

src/Vtk/HEP/Detectors/vtkMuonScatter.h

@@ -43,7 +43,7 @@
 #include <vtkCommand.h>
 #include <vtkTransform.h>
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 
 #include "HEP/Detectors/MuonScatter.h"
 #include "Vtk/uLibVtkInterface.h"
@@ -54,20 +54,21 @@ class vtkRenderWindowInteractor;
 namespace uLib {
 namespace Vtk {
 
-class vtkMuonScatter : public Puppet, public Polydata {
-  typedef MuonScatter Content;
+class MuonScatter : public Prop3D, public Polydata {
+  typedef uLib::MuonScatter Content;
 
 public:
-  vtkMuonScatter(const MuonScatter &content);
-  vtkMuonScatter(MuonScatter &content);
+  MuonScatter(const MuonScatter &content);
+  MuonScatter(uLib::MuonScatter &content);
 
-  ~vtkMuonScatter();
+  ~MuonScatter();
 
-  Content &GetContent();
+  Content &GetModel();
+  uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
 
-  void PrintSelf(std::ostream &o) const;
+  void PrintSelf(std::ostream &o) const override;
 
-  virtual vtkPolyData *GetPolyData() const;
+  virtual vtkPolyData *GetPolyData() const override;
 
   void AddPocaPoint(HPoint3f poca);
 
@@ -76,12 +77,12 @@ public:
   void vtkStartInteractive();
 
 protected:
-  void ConnectInteractor(vtkRenderWindowInteractor *interactor);
+  void ConnectInteractor(vtkRenderWindowInteractor *interactor) override;
 
 private:
   void InstallPipe();
 
-  vtkMuonScatter::Content *m_Content;
+  MuonScatter::Content *m_Content;
   vtkLineSource *m_LineIn;
   vtkLineSource *m_LineOut;
   vtkSphereSource *m_SpherePoca;

src/Vtk/HEP/Geant/testing/vtkCylinderEmitterPrimaryTest.cpp

@@ -10,11 +10,11 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Geant/Solid.h"
-#include "HEP/Geant/GeantEvent.h"
+#include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Math/Cylinder.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkCylinder.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Math/Units.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/HEP/Geant/vtkGeantEvent.h"
@@ -58,8 +58,8 @@ void KeyPressCallbackFunction(vtkObject* caller, long unsigned int eventId, void
             std::cout << "    Collected event " << lastEvent->GetEventID() 
                       << " with " << lastEvent->Path().size() << " steps." << std::endl;
                       
-            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
-            state->viewer->AddPuppet(*vtkEvent);
+            Vtk::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
+            state->viewer->AddProp3D(*vtkEvent);
             
             state->viewer->GetRenderer()->Render();
             state->viewer->GetRenderWindow()->Render();
@@ -97,21 +97,21 @@ int main(int argc, char** argv) {
     Vtk::Viewer viewer;
     viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
     
-    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
+    Vtk::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddPuppet(*vtkWorld);
+    viewer.AddProp3D(*vtkWorld);
     
-    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkIron);
 
     // Use vtkCylinderEmitterPrimary
     Vtk::vtkCylinderEmitterPrimary* vtkEmitter = new Vtk::vtkCylinderEmitterPrimary(*emitter);
     vtkEmitter->SetSelectable(false);
-    viewer.AddPuppet(*vtkEmitter);
+    viewer.AddProp3D(*vtkEmitter);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

src/Vtk/HEP/Geant/testing/vtkEmitterPrimaryTest.cpp

@@ -1,15 +1,15 @@
 #include "Geant/Solid.h"
-#include "HEP/Geant/GeantEvent.h"
+#include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Math/ContainerBox.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Math/Units.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "Vtk/HEP/Geant/vtkEmitterPrimary.h"
 #include "Vtk/Math/vtkContainerBox.h"
-#include "HEP/Detectors/DetectorChamber.h"
+#include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 #include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 
 #include <vtkSmartPointer.h>
@@ -51,8 +51,8 @@ void KeyPressCallbackFunction(vtkObject* caller, long unsigned int eventId, void
                       << " with " << lastEvent->Path().size() << " steps." << std::endl;
                       
             // Wrap it for VTK
-            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
-            state->viewer->AddPuppet(*vtkEvent);
+            Vtk::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
+            state->viewer->AddProp3D(*vtkEvent);
             
             // Re-render
             state->viewer->GetRenderer()->Render();
@@ -105,35 +105,35 @@ int main(int argc, char** argv) {
     viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
     
     // Visualize world box
-    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
+    Vtk::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddPuppet(*vtkWorld);
+    viewer.AddProp3D(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::vtkDetectorChamber* vtkTop = new Vtk::vtkDetectorChamber(top_chamber_box);
+    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
-    vtkTop->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkTop);
+    vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::vtkDetectorChamber* vtkBottom = new Vtk::vtkDetectorChamber(bottom_chamber_box);
+    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
-    vtkBottom->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkBottom);
+    vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkBottom);
 
     // Visualize Emitter
-    Vtk::vtkEmitterPrimary* vtkEmitter = new Vtk::vtkEmitterPrimary(*emitter);
-    viewer.AddPuppet(*vtkEmitter);
+    Vtk::EmitterPrimary* vtkEmitter = new Vtk::EmitterPrimary(*emitter);
+    viewer.AddProp3D(*vtkEmitter);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

src/Vtk/HEP/Geant/testing/vtkGeantEventTest.cpp

@@ -10,11 +10,11 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Geant/Solid.h"
-#include "HEP/Geant/GeantEvent.h"
+#include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Math/ContainerBox.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Math/Units.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/HEP/Geant/vtkGeantEvent.h"
@@ -82,8 +82,8 @@ void KeyPressCallbackFunction(vtkObject* caller, long unsigned int eventId, void
                       << " with " << lastEvent->Path().size() << " steps." << std::endl;
                       
             // Wrap it for VTK
-            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
-            state->viewer->AddPuppet(*vtkEvent);
+            Vtk::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
+            state->viewer->AddProp3D(*vtkEvent);
             
             // Re-render
             state->viewer->GetRenderer()->Render();
@@ -117,16 +117,16 @@ int main(int argc, char** argv) {
     viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
     
     // Visualize world box
-    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
+    Vtk::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
     // vtkWorld->ShowBoundingBox(true);
     vtkWorld->ShowScaleMeasures(true);
-    viewer.AddPuppet(*vtkWorld);
+    viewer.AddProp3D(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkIron);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

src/Vtk/HEP/Geant/testing/vtkGeantSceneTest.cpp

@@ -11,8 +11,8 @@
 
 #include "Geant/Solid.h"
 #include "HEP/Geant/Scene.h"
-#include "Math/ContainerBox.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Math/Units.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/HEP/Geant/vtkGeantScene.h"
@@ -46,11 +46,11 @@ int main(int argc, char** argv) {
     Vtk::Viewer viewer;
     viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
 
-    Vtk::vtkGeantScene vtkScene(&scene);
+    Vtk::GeantScene vtkScene(&scene);
     vtkScene.AddToViewer(viewer);
 
     std::cout << "==================================================" << std::endl;
-    std::cout << " vtkGeantScene Test" << std::endl;
+    std::cout << " GeantScene Test" << std::endl;
     std::cout << " World box + 1 iron cube displayed" << std::endl;
     std::cout << "==================================================" << std::endl;
 

src/Vtk/HEP/Geant/testing/vtkSkyPlaneEmitterPrimaryTest.cpp

@@ -1,15 +1,15 @@
 #include "Geant/Solid.h"
-#include "HEP/Geant/GeantEvent.h"
+#include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Math/ContainerBox.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Math/Units.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/HEP/Geant/vtkGeantEvent.h"
 #include "Vtk/HEP/Geant/vtkEmitterPrimary.h"
 #include "Vtk/Math/vtkContainerBox.h"
-#include "HEP/Detectors/DetectorChamber.h"
+#include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 #include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 
 #include <vtkSmartPointer.h>
@@ -49,8 +49,8 @@ void KeyPressCallbackFunction(vtkObject* caller, long unsigned int eventId, void
             std::cout << "    Collected event " << lastEvent->GetEventID() 
                       << " with " << lastEvent->Path().size() << " steps." << std::endl;
                       
-            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
-            state->viewer->AddPuppet(*vtkEvent);
+            Vtk::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
+            state->viewer->AddProp3D(*vtkEvent);
             
             state->viewer->GetRenderer()->Render();
             state->viewer->GetRenderWindow()->Render();
@@ -107,35 +107,35 @@ int main(int argc, char** argv) {
     Vtk::Viewer viewer;
     viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
     
-    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
+    Vtk::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddPuppet(*vtkWorld);
+    viewer.AddProp3D(*vtkWorld);
     
-    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::vtkDetectorChamber* vtkTop = new Vtk::vtkDetectorChamber(top_chamber_box);
+    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
-    vtkTop->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkTop);
+    vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::vtkDetectorChamber* vtkBottom = new Vtk::vtkDetectorChamber(bottom_chamber_box);
+    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
-    vtkBottom->SetRepresentation(Vtk::Puppet::Surface);
-    viewer.AddPuppet(*vtkBottom);
+    vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);
+    viewer.AddProp3D(*vtkBottom);
 
-    // Use vtkSkyPlaneEmitterPrimary instead of vtkEmitterPrimary
+    // Use vtkSkyPlaneEmitterPrimary instead of EmitterPrimary
     Vtk::vtkSkyPlaneEmitterPrimary* vtkEmitter = new Vtk::vtkSkyPlaneEmitterPrimary(*emitter);
     vtkEmitter->SetSelectable(false);
-    viewer.AddPuppet(*vtkEmitter);
+    viewer.AddProp3D(*vtkEmitter);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

src/Vtk/HEP/Geant/testing/vtkSolidsTest.cpp

@@ -13,8 +13,8 @@
 #include "Vtk/HEP/Geant/vtkTessellatedSolid.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "HEP/Geant/Solid.h"
-#include "Math/ContainerBox.h"
-#include "Math/TriangleMesh.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkTriangleMesh.h"
 #include "Math/Units.h"
 
 #include <vtkProperty.h>
@@ -31,7 +31,7 @@ int main(int argc, char** argv) {
     Geant::BoxSolid gBox("MyBox", &box);
     gBox.Update();
 
-    Vtk::vtkBoxSolid vtkBox(&gBox);
+    Vtk::BoxSolid vtkBox(&gBox);
 
     // 2. Create a TessellatedSolid
     Geant::TessellatedSolid gTess("MyTess");
@@ -53,7 +53,7 @@ int main(int argc, char** argv) {
     gTess.SetMesh(mesh);
     gTess.Update();
 
-    Vtk::vtkTessellatedSolid vtkTess(&gTess);
+    Vtk::TessellatedSolid vtkTess(&gTess);
 
     // 3. Visualization setup
     Vtk::Viewer viewer;
@@ -61,8 +61,8 @@ int main(int argc, char** argv) {
     vtkTess.AddToViewer(viewer);
 
     // Color them differently
-    vtkActor::SafeDownCast(vtkBox.GetProp())->GetProperty()->SetColor(0.8, 0.2, 0.2); // Redish box
-    vtkActor::SafeDownCast(vtkTess.GetProp())->GetProperty()->SetColor(0.2, 0.8, 0.2); // Greenish tess
+    vtkBox.SetColor(0.8, 0.2, 0.2);  // Redish box
+    vtkTess.SetColor(0.2, 0.8, 0.2); // Greenish tess
     
     // Position tessellated solid away from box
     Matrix4f trans = Matrix4f::Identity();

src/Vtk/HEP/Geant/vtkBoxSolid.cpp

@@ -10,47 +10,74 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "vtkBoxSolid.h"
+#include "Core/Monitor.h"
 #include <vtkCubeSource.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkActor.h>
+#include <vtkProperty.h>
+#include <vtkAssembly.h>
+#include <vtkTransform.h>
+#include <vtkMatrix4x4.h>
+#include <Geant4/G4VPhysicalVolume.hh>
+#include "Vtk/Math/vtkDense.h"
 
 namespace uLib {
 namespace Vtk {
 
-vtkBoxSolid::vtkBoxSolid(Geant::BoxSolid *content)
-    : vtkGeantSolid(content), m_BoxContent(content) {
-  // Re-run Update for box-specific pipe
+BoxSolid::BoxSolid(Geant::BoxSolid *content)
+    : GeantSolid(content), m_BoxContent(content) {
+  this->InstallPipe();
+ 
+  // Connect the model's Updated event to updateTransform to ensure VTK sync
+  m_UpdateConnection = Object::connect(m_BoxContent, &uLib::Object::Updated, this, &BoxSolid::Update);
+
+  // Initial sync
   this->Update();
 }
 
-vtkBoxSolid::~vtkBoxSolid() {}
+BoxSolid::~BoxSolid() {
+}
 
-void vtkBoxSolid::Update() {
+void BoxSolid::Update() {
+  ConnectionBlock blocker(m_UpdateConnection);
   this->UpdateGeometry();
-  this->UpdateTransform();
+  // Ensure base Prop3D properties (color, opacity, etc) and transform are applied
+  this->Prop3D::Update();
 }
 
-void vtkBoxSolid::UpdateGeometry() {
-  if (!m_BoxContent || !m_BoxContent->GetObject()) {
-    // Fallback to base tessellation if no model object
-    vtkGeantSolid::UpdateGeometry();
-    return;
+void BoxSolid::SyncFromVtk() {
+  this->Prop3D::SyncFromVtk();
+  if (auto* proxy = vtkProp3D::SafeDownCast(this->GetProxyProp())) {
+      if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
+          m_BoxContent->SetTransform(VtkToMatrix4f(mat));
+      }
+  }
 }
 
-  // Use the underlying ContainerBox for precise geometry
-  Vector3f size = m_BoxContent->GetObject()->GetSize();
-  
-  vtkNew<vtkCubeSource> cube;
-  cube->SetXLength(size(0));
-  cube->SetYLength(size(1));
-  cube->SetZLength(size(2));
-  cube->Update();
-
-  vtkPolyData *poly = GetPolyData();
-  if (poly) {
-      poly->ShallowCopy(cube->GetOutput());
-      poly->Modified();
+void BoxSolid::UpdateGeometry() {
+  // Sync geometry from G4VSolid provided by GeantSolid (tessellation)
+  GeantSolid::UpdateGeometry();
 }
+
+void BoxSolid::UpdateTransform() {
+  // Take transform from Prop3D base (which uses GetContent() -> ContainerBox TRS)
+  this->Prop3D::Update();
+}
+
+void BoxSolid::serialize_display(uLib::Archive::display_properties_archive &ar,
+                                    const unsigned int version) {
+  // Expose Geant solid properties and underlying Box/TRS properties
+  this->Prop3D::serialize_display(ar, version);
+  if (m_BoxContent) {
+    ar & NVP("Box", *m_BoxContent);
+    if (m_BoxContent->GetObject()) {
+      ar & NVP("Container", *m_BoxContent->GetObject());
+    }
+  }
+}
+
+void BoxSolid::InstallPipe() {
+  GeantSolid::InstallPipe();
 }
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkBoxSolid.h

@@ -26,24 +26,52 @@
 #ifndef U_VTKBOXSOLID_H
 #define U_VTKBOXSOLID_H
 
+#include "Core/Types.h"
+#include "Core/Property.h"
+#include "Core/Serializable.h"
+
 #include "vtkGeantSolid.h"
 
+class vtkCubeSource;
+class vtkActor;
+
 namespace uLib {
 namespace Vtk {
 
 /**
- * @brief VTK Puppet for visualizing a Geant::BoxSolid.
+ * @brief VTK Prop3D for visualizing a Geant::BoxSolid.
  */
-class vtkBoxSolid : public vtkGeantSolid {
+class BoxSolid : public GeantSolid {
+  uLibTypeMacro(BoxSolid, uLib::Vtk::GeantSolid)
+
 public:
-  vtkBoxSolid(Geant::BoxSolid *content);
-  virtual ~vtkBoxSolid();
+  BoxSolid(Geant::BoxSolid *content);
+  virtual ~BoxSolid();
 
   virtual void Update() override;
   virtual void UpdateGeometry() override;
+  virtual void UpdateTransform() override;
+  virtual void SyncFromVtk() override;
+
+  virtual uLib::Object *GetContent() const override { 
+    return m_BoxContent ? (::uLib::Object*)m_BoxContent->GetObject() : nullptr; 
+  }
+
+  virtual void serialize_display(uLib::Archive::display_properties_archive &ar,
+                                 const unsigned int version = 0) override;
+
+  template <typename Ar>
+  void serialize(Ar &ar, const unsigned int version) {
+    ar & NVP("BoxSolid", *m_BoxContent);
+  }
 
 protected:
+  virtual void InstallPipe() override;
+
   Geant::BoxSolid *m_BoxContent;
+  uLib::Connection m_UpdateConnection;
+
+  ULIB_DECLARE_PROPERTIES(BoxSolid)
 };
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkEmitterPrimary.cpp

@@ -11,12 +11,12 @@
 #include <vtkPolyData.h>
 #include <vtkProperty.h>
 #include <vtkCylinderSource.h>
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 
 namespace uLib {
 namespace Vtk {
 
-vtkEmitterPrimary::vtkEmitterPrimary(Geant::EmitterPrimary &emitter)
+EmitterPrimary::EmitterPrimary(Geant::EmitterPrimary &emitter)
     : m_emitter(emitter), m_Actor(vtkActor::New()) {
     
     vtkNew<vtkArrowSource> arrow;
@@ -43,16 +43,16 @@ vtkEmitterPrimary::vtkEmitterPrimary(Geant::EmitterPrimary &emitter)
 
     this->SetProp(m_Actor);
     
-    Object::connect(&m_emitter, &Object::Updated, this, &vtkEmitterPrimary::contentUpdate);
+    Object::connect(&m_emitter, &Object::Updated, this, &EmitterPrimary::contentUpdate);
     this->contentUpdate();
 }
 
-vtkEmitterPrimary::~vtkEmitterPrimary() {
-    Object::disconnect(&m_emitter, &Object::Updated, this, &vtkEmitterPrimary::contentUpdate);
+EmitterPrimary::~EmitterPrimary() {
+    Object::disconnect(&m_emitter, &Object::Updated, this, &EmitterPrimary::contentUpdate);
     m_Actor->Delete();
 }
 
-void vtkEmitterPrimary::contentUpdate() {
+void EmitterPrimary::contentUpdate() {
     vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
     if (!vmat) {
         vtkNew<vtkMatrix4x4> mat;
@@ -63,10 +63,10 @@ void vtkEmitterPrimary::contentUpdate() {
     Matrix4f transform = m_emitter.GetWorldMatrix();
     Matrix4fToVtk(transform, vmat);
 
-    Puppet::Update();
+    Prop3D::Update();
 }
 
-void vtkEmitterPrimary::Update() {
+void EmitterPrimary::Update() {
     vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
     if (!vmat) return;
 
@@ -79,7 +79,7 @@ void vtkEmitterPrimary::Update() {
 // vtkSkyPlaneEmitterPrimary
 
 vtkSkyPlaneEmitterPrimary::vtkSkyPlaneEmitterPrimary(Geant::SkyPlaneEmitterPrimary &emitter)
-    : vtkEmitterPrimary(emitter), m_skyEmitter(emitter), m_PlaneSource(vtkPlaneSource::New()) {
+    : EmitterPrimary(emitter), m_skyEmitter(emitter), m_PlaneSource(vtkPlaneSource::New()) {
     
     vtkNew<vtkAppendPolyData> append;
     // Base class constructor already set an arrow. We keep it as a directional indicator.
@@ -107,27 +107,27 @@ void vtkSkyPlaneEmitterPrimary::contentUpdate() {
     m_PlaneSource->SetPoint2(-size(0)/2.0,  size(1)/2.0, 0.0);
     m_PlaneSource->Update();
 
-    vtkEmitterPrimary::contentUpdate();
+    EmitterPrimary::contentUpdate();
 }
 
 // -------------------------------------------------------------------------- //
 // vtkQuadMeshEmitterPrimary
 
 vtkQuadMeshEmitterPrimary::vtkQuadMeshEmitterPrimary(Geant::QuadMeshEmitterPrimary &emitter)
-    : vtkEmitterPrimary(emitter), m_meshEmitter(emitter) {
+    : EmitterPrimary(emitter), m_meshEmitter(emitter) {
     this->contentUpdate();
 }
 
 void vtkQuadMeshEmitterPrimary::contentUpdate() {
     // For now stick with the arrow. In the future visualize the mesh if useful.
-    vtkEmitterPrimary::contentUpdate();
+    EmitterPrimary::contentUpdate();
 }
  
 // -------------------------------------------------------------------------- //
 // vtkCylinderEmitterPrimary
 
 vtkCylinderEmitterPrimary::vtkCylinderEmitterPrimary(Geant::CylinderEmitterPrimary &emitter)
-    : vtkEmitterPrimary(emitter), m_cylinderEmitter(emitter), m_CylinderSource(vtkCylinderSource::New()) {
+    : EmitterPrimary(emitter), m_cylinderEmitter(emitter), m_CylinderSource(vtkCylinderSource::New()) {
     
     // vtkCylinderSource is along Y by default.
     // We will update its actual dimensions in contentUpdate().
@@ -170,7 +170,7 @@ void vtkCylinderEmitterPrimary::contentUpdate() {
     m_CylinderSource->SetCenter(0, h/2.0, 0);
     m_CylinderSource->Update();
 
-    vtkEmitterPrimary::contentUpdate();
+    EmitterPrimary::contentUpdate();
 }
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkEmitterPrimary.h

@@ -14,10 +14,10 @@ class vtkCylinderSource;
 namespace uLib {
 namespace Vtk {
 
-class vtkEmitterPrimary : public Puppet {
+class EmitterPrimary : public Prop3D {
 public:
-    vtkEmitterPrimary(Geant::EmitterPrimary &emitter);
-    virtual ~vtkEmitterPrimary();
+    EmitterPrimary(Geant::EmitterPrimary &emitter);
+    virtual ~EmitterPrimary();
 
     virtual void contentUpdate();
     virtual void Update();
@@ -27,7 +27,7 @@ protected:
     vtkActor *m_Actor;
 };
 
-class vtkSkyPlaneEmitterPrimary : public vtkEmitterPrimary {
+class vtkSkyPlaneEmitterPrimary : public EmitterPrimary {
 public:
     vtkSkyPlaneEmitterPrimary(Geant::SkyPlaneEmitterPrimary &emitter);
     virtual ~vtkSkyPlaneEmitterPrimary();
@@ -41,7 +41,7 @@ private:
 
 
 
-class vtkQuadMeshEmitterPrimary : public vtkEmitterPrimary {
+class vtkQuadMeshEmitterPrimary : public EmitterPrimary {
 public:
     vtkQuadMeshEmitterPrimary(Geant::QuadMeshEmitterPrimary &emitter);
     virtual void contentUpdate();
@@ -50,7 +50,7 @@ private:
     Geant::QuadMeshEmitterPrimary &m_meshEmitter;
 };
 
-class vtkCylinderEmitterPrimary : public vtkEmitterPrimary {
+class vtkCylinderEmitterPrimary : public EmitterPrimary {
 public:
     vtkCylinderEmitterPrimary(Geant::CylinderEmitterPrimary &emitter);
     virtual ~vtkCylinderEmitterPrimary();

src/Vtk/HEP/Geant/vtkGeantEvent.cpp

@@ -35,23 +35,23 @@
 namespace uLib {
 namespace Vtk {
 
-vtkGeantEvent::vtkGeantEvent(Content *content)
+GeantEvent::GeantEvent(Content *content)
     : m_MuonPath(vtkActor::New()), m_Content(content) {
   this->InstallPipe();
   this->Update();
 }
 
-vtkGeantEvent::~vtkGeantEvent() {
+GeantEvent::~GeantEvent() {
   m_MuonPath->Delete();
 }
 
-vtkPolyData *vtkGeantEvent::GetPolyData() const {
+vtkPolyData *GeantEvent::GetPolyData() const {
   if (!m_MuonPath || !m_MuonPath->GetMapper())
     return NULL;
   return vtkPolyData::SafeDownCast(m_MuonPath->GetMapper()->GetInput());
 }
 
-void vtkGeantEvent::Update() {
+void GeantEvent::Update() {
   if (!m_Content)
     return;
 
@@ -88,7 +88,7 @@ void vtkGeantEvent::Update() {
   }
 }
 
-void vtkGeantEvent::InstallPipe() {
+void GeantEvent::InstallPipe() {
   vtkSmartPointer<vtkPolyData> polyData = vtkSmartPointer<vtkPolyData>::New();
   vtkSmartPointer<vtkPolyDataMapper> mapper =
       vtkSmartPointer<vtkPolyDataMapper>::New();

src/Vtk/HEP/Geant/vtkGeantEvent.h

@@ -34,16 +34,16 @@
 namespace uLib {
 namespace Vtk {
 
-class vtkGeantEvent : public Puppet, public Polydata {
+class GeantEvent : public Prop3D, public Polydata {
   typedef Geant::GeantEvent Content;
 
 public:
-  vtkGeantEvent(Content *content);
-  ~vtkGeantEvent();
+  GeantEvent(Content *content);
+  ~GeantEvent();
 
   virtual class vtkPolyData *GetPolyData() const override;
 
-  virtual void Update();
+  virtual void Update() override;
 
 protected:
   virtual void InstallPipe();

src/Vtk/HEP/Geant/vtkGeantScene.cpp

@@ -32,20 +32,20 @@
 namespace uLib {
 namespace Vtk {
 
-vtkGeantScene::vtkGeantScene(Geant::Scene *scene)
-    : m_Scene(scene), m_WorldPuppet(nullptr) {
+GeantScene::GeantScene(Geant::Scene *scene)
+    : m_Scene(scene), m_WorldProp3D(nullptr) {
   if (!m_Scene)
     return;
 
-  // 1. Create the world box wireframe puppet
-  ContainerBox *worldBox = m_Scene->GetWorldBox();
+  // 1. Create the world box wireframe prop3d
+  uLib::ContainerBox *worldBox = m_Scene->GetWorldBox();
   if (worldBox) {
-    m_WorldPuppet = new vtkContainerBox(worldBox);
-    m_WorldPuppet->SetRepresentation(Puppet::Wireframe);
-    m_WorldPuppet->ShowScaleMeasures(true);
+    m_WorldProp3D = new ContainerBox(worldBox);
+    m_WorldProp3D->SetRepresentation(Prop3D::Wireframe);
+    m_WorldProp3D->ShowScaleMeasures(true);
   }
 
-  // 2. Create puppets for each non-world solid
+  // 2. Create prop3ds for each non-world solid
   const Geant::Solid *world = m_Scene->GetWorld();
   const Vector<Geant::Solid *> &solids = m_Scene->GetSolids();
 
@@ -54,47 +54,47 @@ vtkGeantScene::vtkGeantScene(Geant::Scene *scene)
     if (solid == world)
       continue;
 
-    // Only create a puppet if the solid has a valid G4VSolid
+    // Only create a prop3d if the solid has a valid G4VSolid
     if (solid->GetG4Solid()) {
-      vtkGeantSolid *vtkSolid = nullptr;
+      GeantSolid *vtkSolid = nullptr;
       if (auto *box = dynamic_cast<Geant::BoxSolid *>(solid)) {
-        vtkSolid = new vtkBoxSolid(box);
+        vtkSolid = new BoxSolid(box);
       } else if (auto *tess = dynamic_cast<Geant::TessellatedSolid *>(solid)) {
-        vtkSolid = new vtkTessellatedSolid(tess);
+        vtkSolid = new TessellatedSolid(tess);
       } else {
-        vtkSolid = new vtkGeantSolid(solid);
+        vtkSolid = new GeantSolid(solid);
         vtkSolid->Update();
       }
       
       if (vtkSolid) {
-        m_SolidPuppets.push_back(vtkSolid);
+        m_SolidProp3Ds.push_back(vtkSolid);
       }
     }
   }
 }
 
-vtkGeantScene::~vtkGeantScene() {
-  delete m_WorldPuppet;
-  for (auto *p : m_SolidPuppets) {
+GeantScene::~GeantScene() {
+  delete m_WorldProp3D;
+  for (auto *p : m_SolidProp3Ds) {
     delete p;
   }
 }
 
-void vtkGeantScene::AddToViewer(Viewport &viewer) {
-  if (m_WorldPuppet) {
-    viewer.AddPuppet(*m_WorldPuppet);
+void GeantScene::AddToViewer(Viewport &viewer) {
+  if (m_WorldProp3D) {
+    viewer.AddProp3D(*m_WorldProp3D);
   }
-  for (auto *p : m_SolidPuppets) {
-    viewer.AddPuppet(*p);
+  for (auto *p : m_SolidProp3Ds) {
+    viewer.AddProp3D(*p);
   }
 }
 
-void vtkGeantScene::RemoveFromViewer(Viewport &viewer) {
-  if (m_WorldPuppet) {
-    viewer.RemovePuppet(*m_WorldPuppet);
+void GeantScene::RemoveFromViewer(Viewport &viewer) {
+  if (m_WorldProp3D) {
+    viewer.RemoveProp3D(*m_WorldProp3D);
   }
-  for (auto *p : m_SolidPuppets) {
-    viewer.RemovePuppet(*p);
+  for (auto *p : m_SolidProp3Ds) {
+    viewer.RemoveProp3D(*p);
   }
 }
 

src/Vtk/HEP/Geant/vtkGeantScene.h

@@ -36,14 +36,14 @@
 namespace uLib {
 namespace Vtk {
 
-class vtkGeantSolid;
+class GeantSolid;
 
 /**
- * @brief VTK Puppet representing the entire Geant::Scene.
+ * @brief VTK Prop3D representing the entire Geant::Scene.
  *
- * When constructed, it creates child puppets for the world box (as a
- * vtkContainerBox wireframe) and for each non-world Solid in the scene
- * (as vtkGeantSolid surfaces).
+ * When constructed, it creates child prop3ds for the world box (as a
+ * ContainerBox wireframe) and for each non-world Solid in the scene
+ * (as GeantSolid surfaces).
  *
  * Usage:
  * @code
@@ -53,32 +53,32 @@ class vtkGeantSolid;
  *   scene.Initialize();
  *
  *   Vtk::Viewer viewer;
- *   Vtk::vtkGeantScene vtkScene(&scene);
+ *   Vtk::GeantScene vtkScene(&scene);
  *   vtkScene.AddToViewer(viewer);
  *   viewer.Start();
  * @endcode
  */
-class vtkGeantScene : public Object {
+class GeantScene : public Object {
 public:
-  vtkGeantScene(Geant::Scene *scene);
-  ~vtkGeantScene();
+  GeantScene(Geant::Scene *scene);
+  ~GeantScene();
 
-  /// Add all puppets (world box + solids) to a viewer.
+  /// Add all prop3ds (world box + solids) to a viewer.
   void AddToViewer(class Viewport &viewer);
 
-  /// Remove all puppets from viewport.
+  /// Remove all prop3ds from viewport.
   void RemoveFromViewer(class Viewport &viewer);
 
-  /// Get the world box puppet 
-  vtkContainerBox* GetWorldPuppet() const { return m_WorldPuppet; }
+  /// Get the world box prop3d 
+  ContainerBox* GetWorldProp3D() const { return m_WorldProp3D; }
 
-  /// Get the solid puppets
-  const std::vector<vtkGeantSolid*>& GetSolidPuppets() const { return m_SolidPuppets; }
+  /// Get the solid prop3ds
+  const std::vector<GeantSolid*>& GetSolidProp3Ds() const { return m_SolidProp3Ds; }
 
 private:
   Geant::Scene             *m_Scene;
-  vtkContainerBox          *m_WorldPuppet;
-  std::vector<vtkGeantSolid*> m_SolidPuppets;
+  ContainerBox          *m_WorldProp3D;
+  std::vector<GeantSolid*> m_SolidProp3Ds;
 };
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkGeantSolid.cpp

@@ -42,27 +42,27 @@
 namespace uLib {
 namespace Vtk {
 
-vtkGeantSolid::vtkGeantSolid(Content *content)
+GeantSolid::GeantSolid(Content *content)
     : m_SolidActor(vtkActor::New()), m_Content(content) {
   this->InstallPipe();
 }
 
-vtkGeantSolid::~vtkGeantSolid() {
+GeantSolid::~GeantSolid() {
   m_SolidActor->Delete();
 }
 
-vtkPolyData *vtkGeantSolid::GetPolyData() const {
+vtkPolyData *GeantSolid::GetPolyData() const {
   if (!m_SolidActor || !m_SolidActor->GetMapper())
     return NULL;
   return vtkPolyData::SafeDownCast(m_SolidActor->GetMapper()->GetInput());
 }
 
-void vtkGeantSolid::Update() {
+void GeantSolid::Update() {
   this->UpdateGeometry();
   this->UpdateTransform();
 }
 
-void vtkGeantSolid::UpdateGeometry() {
+void GeantSolid::UpdateGeometry() {
   if (!m_Content)
     return;
 
@@ -82,6 +82,7 @@ void vtkGeantSolid::UpdateGeometry() {
   int nVertices = polyhedron->GetNoVertices();
   for (int i = 1; i <= nVertices; ++i) {
     G4Point3D vtx = polyhedron->GetVertex(i);
+    
     points->InsertNextPoint(vtx.x(), vtx.y(), vtx.z());
   }
 
@@ -109,7 +110,7 @@ void vtkGeantSolid::UpdateGeometry() {
   }
 }
 
-void vtkGeantSolid::UpdateTransform() {
+void GeantSolid::UpdateTransform() {
   if (!m_Content || !m_SolidActor)
     return;
 
@@ -141,7 +142,7 @@ void vtkGeantSolid::UpdateTransform() {
   }
 }
 
-void vtkGeantSolid::InstallPipe() {
+void GeantSolid::InstallPipe() {
   vtkSmartPointer<vtkPolyData> polyData = vtkSmartPointer<vtkPolyData>::New();
   vtkSmartPointer<vtkPolyDataMapper> mapper =
       vtkSmartPointer<vtkPolyDataMapper>::New();

src/Vtk/HEP/Geant/vtkGeantSolid.h

@@ -36,18 +36,18 @@ namespace uLib {
 namespace Vtk {
 
 /**
- * @brief VTK Puppet for visualizing a Geant::Solid.
+ * @brief VTK Prop3D for visualizing a Geant::Solid.
  *
  * Renders the G4VSolid geometry as a tessellated polydata surface.
  * Works with BoxSolid, TessellatedSolid, or any Solid that provides
  * a valid G4VSolid via GetG4Solid().
  */
-class vtkGeantSolid : public Puppet, public Polydata {
+class GeantSolid : public Prop3D, public Polydata {
   typedef Geant::Solid Content;
 
 public:
-  vtkGeantSolid(Content *content);
-  ~vtkGeantSolid();
+  GeantSolid(Content *content);
+  ~GeantSolid();
 
   virtual class vtkPolyData *GetPolyData() const override;
 

src/Vtk/HEP/Geant/vtkTessellatedSolid.cpp

@@ -18,22 +18,22 @@
 namespace uLib {
 namespace Vtk {
 
-vtkTessellatedSolid::vtkTessellatedSolid(Geant::TessellatedSolid *content)
-    : vtkGeantSolid(content), m_TessContent(content) {
+TessellatedSolid::TessellatedSolid(Geant::TessellatedSolid *content)
+    : GeantSolid(content), m_TessContent(content) {
   this->Update();
 }
 
-vtkTessellatedSolid::~vtkTessellatedSolid() {}
+TessellatedSolid::~TessellatedSolid() {}
 
-void vtkTessellatedSolid::Update() {
+void TessellatedSolid::Update() {
   this->UpdateGeometry();
   this->UpdateTransform();
 }
 
-void vtkTessellatedSolid::UpdateGeometry() {
+void TessellatedSolid::UpdateGeometry() {
   if (!m_TessContent || m_TessContent->GetMesh().Points().empty()) {
     // Fallback to base tessellation if no model mesh
-    vtkGeantSolid::UpdateGeometry();
+    GeantSolid::UpdateGeometry();
     return;
   }
 

src/Vtk/HEP/Geant/vtkTessellatedSolid.h

@@ -18,12 +18,12 @@ namespace uLib {
 namespace Vtk {
 
 /**
- * @brief VTK Puppet for visualizing a Geant::TessellatedSolid.
+ * @brief VTK Prop3D for visualizing a Geant::TessellatedSolid.
  */
-class vtkTessellatedSolid : public vtkGeantSolid {
+class TessellatedSolid : public GeantSolid {
 public:
-  vtkTessellatedSolid(Geant::TessellatedSolid *content);
-  virtual ~vtkTessellatedSolid();
+  TessellatedSolid(Geant::TessellatedSolid *content);
+  virtual ~TessellatedSolid();
 
   virtual void Update() override;
   virtual void UpdateGeometry() override;

src/Vtk/HEP/MuonTomography/testing/vtkVoxRaytracerTest.cpp

@@ -46,7 +46,7 @@ class vtkWidgetCallback : public vtkCommand {
 public:
   static vtkWidgetCallback *New() { return new vtkWidgetCallback; }
 
-  void SetTracer(Vtk::vtkVoxRaytracerRepresentation *parent) {
+  void SetTracer(Vtk::VoxRaytracerRepresentation *parent) {
     this->vtk_raytr = parent;
   }
 
@@ -74,7 +74,7 @@ private:
   vtkWidgetCallback() : vtk_raytr(NULL), muon(NULL), annotation(NULL) {}
 
   uLib::VoxRaytracer *raytracer;
-  Vtk::vtkVoxRaytracerRepresentation *vtk_raytr;
+  Vtk::VoxRaytracerRepresentation *vtk_raytr;
   uLib::MuonScatter *muon;
   vtkCornerAnnotation *annotation;
 };
@@ -87,14 +87,14 @@ BOOST_AUTO_TEST_CASE(vtkVoxRaytracerRepresentationTest) {
   muon.LineOut().origin << 6, -4, 6, 1;
   muon.LineOut().direction << 1, -1, 1, 0;
 
-  Vtk::vtkMuonScatter v_muon(muon);
+  Vtk::MuonScatter v_muon(muon);
 
   // structured grid //
   StructuredGrid grid(Vector3i(12, 10, 12));
   grid.SetSpacing(Vector3f(1, 1, 1));
   grid.SetPosition(Vector3f(0, 0, 0));
 
-  Vtk::vtkStructuredGrid v_grid(grid);
+  Vtk::StructuredGrid v_grid(&grid);
 
   // voxraytracer //
   VoxRaytracer rt(grid);
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(vtkVoxRaytracerRepresentationTest) {
   rt.GetEntryPoint(muon.LineIn(), pt);
   std::cout << pt.transpose() << "\n";
 
-  Vtk::vtkVoxRaytracerRepresentation v_rt(rt);
+  Vtk::VoxRaytracerRepresentation v_rt(rt);
   v_rt.SetMuon(muon);
   v_rt.SetRayColor(Vector4f(1, 0, 0, 1));
 
@@ -110,12 +110,12 @@ BOOST_AUTO_TEST_CASE(vtkVoxRaytracerRepresentationTest) {
     // renderer //
     Vtk::Viewer viewer;
 
-    viewer.AddPuppet(v_grid);
-    viewer.AddPuppet(v_rt);
-    viewer.AddPuppet(v_muon);
+    viewer.AddProp3D(v_grid);
+    viewer.AddProp3D(v_rt);
+    viewer.AddProp3D(v_muon);
     
     // Select grid to show handler widget
-    viewer.SelectPuppet(&v_grid);
+    viewer.SelectProp3D(&v_grid);
     
     viewer.Start();
   }

src/Vtk/HEP/MuonTomography/vtkMuonContainerScattering.h

@@ -30,7 +30,7 @@
 
 
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 
 #include "uLibVtkInterface.h"
 #include "Detectors/MuonScatter.h"
@@ -39,11 +39,11 @@ class vtkRenderWindowInteractor;
 
 namespace uLib {
 
-class vtkMuonContainerScattering : public Abstract::uLibVtkPolydata {
-    typedef MuonScatter Content;
+class MuonContainerScattering : public Abstract::uLibVtkPolydata {
+    typedef uLib::MuonScatter Content;
 public:
-    vtkMuonContainerScattering(const MuonScatter &content);
-    ~vtkMuonScatter();
+    MuonContainerScattering(const MuonScatter &content);
+    ~MuonScatter();
 
     Content& GetContent();
 

src/Vtk/HEP/MuonTomography/vtkVoxRaytracerRepresentation.cpp

@@ -41,7 +41,7 @@ namespace Vtk {
 ////// VOX RAYTRACER REPRESENTATION  ///////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-vtkVoxRaytracerRepresentation::vtkVoxRaytracerRepresentation(Content &content)
+VoxRaytracerRepresentation::VoxRaytracerRepresentation(Content &content)
     : m_Content(&content),
       m_Sphere1(vtkSphereSource::New()), m_Sphere2(vtkSphereSource::New()),
       m_Line1(vtkLineSource::New()), m_Line2(vtkLineSource::New()),
@@ -51,6 +51,7 @@ vtkVoxRaytracerRepresentation::vtkVoxRaytracerRepresentation(Content &content)
       m_RayRepresentationActor(vtkActor::New()),
       m_Transform(vtkTransform::New()),
       m_Asm(vtkAssembly::New()),
+      m_Muon(nullptr),
       m_HasMuon(false), m_HasPoca(false) {
   default_radius = content.GetImage()->GetSpacing()(0) / 4;
   m_Sphere1->SetRadius(default_radius);
@@ -61,48 +62,49 @@ vtkVoxRaytracerRepresentation::vtkVoxRaytracerRepresentation(Content &content)
   InstallPipe();
   
   if (m_Content && m_Content->GetImage()) {
-      Object::connect(m_Content->GetImage(), &StructuredGrid::Updated, this, &vtkVoxRaytracerRepresentation::imageUpdate);
+      Object::connect(m_Content->GetImage(), &StructuredGrid::Updated, this, &VoxRaytracerRepresentation::imageUpdate);
   }
 }
 
-vtkVoxRaytracerRepresentation::~vtkVoxRaytracerRepresentation() {
+VoxRaytracerRepresentation::~VoxRaytracerRepresentation() {
   m_RayLine->Delete();
   m_RayLineActor->Delete();
   m_RayRepresentationActor->Delete();
   m_Transform->Delete();
+  if (m_Muon) delete m_Muon;
 }
 
-uLib::VoxRaytracer *vtkVoxRaytracerRepresentation::GetRaytracerAlgorithm() {
+uLib::VoxRaytracer *VoxRaytracerRepresentation::GetRaytracerAlgorithm() {
   return m_Content;
 }
 
-void vtkVoxRaytracerRepresentation::Update() {
+void VoxRaytracerRepresentation::Update() {
    this->imageUpdate();
 }
 
-void vtkVoxRaytracerRepresentation::imageUpdate() {
-   if (m_HasMuon) {
+void VoxRaytracerRepresentation::imageUpdate() {
+   if (m_HasMuon && m_Muon) {
        if (m_HasPoca) {
-           this->SetMuon(m_Muon, m_Poca);
+           this->SetMuon(m_Muon->GetModel(), m_Poca);
        } else {
-           this->SetMuon(m_Muon);
+           this->SetMuon(*m_Muon);
        }
    }
 }
 
-vtkPolyData *vtkVoxRaytracerRepresentation::GetPolyData() const {
+vtkPolyData *VoxRaytracerRepresentation::GetPolyData() const {
   std::cout << "get Raytracer polydata\n";
   m_SelectedElement->Update();
   return m_SelectedElement->GetOutput();
 }
 
-void vtkVoxRaytracerRepresentation::SetRepresentationElements(
-    vtkVoxRaytracerRepresentation::RepresentationElements el) {
+void VoxRaytracerRepresentation::SetRepresentationElements(
+    VoxRaytracerRepresentation::RepresentationElements el) {
   switch (el) {
-  case Vtk::vtkVoxRaytracerRepresentation::RayElements:
+  case Vtk::VoxRaytracerRepresentation::RayElements:
     m_SelectedElement = m_RayLine;
     break;
-  case Vtk::vtkVoxRaytracerRepresentation::VoxelsElements:
+  case Vtk::VoxRaytracerRepresentation::VoxelsElements:
     m_SelectedElement = m_RayRepresentation;
     break;
   default:
@@ -111,8 +113,9 @@ void vtkVoxRaytracerRepresentation::SetRepresentationElements(
   }
 }
 
-void vtkVoxRaytracerRepresentation::SetMuon(MuonScatter &muon) {
-  m_Muon = muon;
+void VoxRaytracerRepresentation::SetMuon(uLib::MuonScatter &muon) {
+  if (m_Muon) delete m_Muon;
+  m_Muon = new MuonScatter(muon);
   m_HasMuon = true;
   m_HasPoca = false;
 
@@ -173,8 +176,9 @@ void vtkVoxRaytracerRepresentation::SetMuon(MuonScatter &muon) {
   this->SetRay(pt1, pt2);
 }
 
-void vtkVoxRaytracerRepresentation::SetMuon(MuonScatter &muon, HPoint3f poca) {
-  m_Muon = muon;
+void VoxRaytracerRepresentation::SetMuon(uLib::MuonScatter &muon, HPoint3f poca) {
+  if (m_Muon) delete m_Muon;
+  m_Muon = new MuonScatter(muon);
   m_Poca = poca;
   m_HasMuon = true;
   m_HasPoca = true;
@@ -247,27 +251,27 @@ void vtkVoxRaytracerRepresentation::SetMuon(MuonScatter &muon, HPoint3f poca) {
     this->SetRay(pt1, pt2);
 }
 
-void vtkVoxRaytracerRepresentation::SetMuon(vtkMuonScatter &muon) {
+void VoxRaytracerRepresentation::SetMuon(MuonScatter &muon) {
   HPoint3f poca = muon.GetPocaPoint();
-  MuonScatter &mu = muon.GetContent();
+  uLib::MuonScatter &mu = muon.GetModel();
   this->SetMuon(mu, poca);
 }
 
-VoxRaytracer::RayData vtkVoxRaytracerRepresentation::GetRay() { return m_Ray; }
+VoxRaytracer::RayData VoxRaytracerRepresentation::GetRay() { return m_Ray; }
 
-void vtkVoxRaytracerRepresentation::SetRay(HPoint3f in, HPoint3f out) {
+void VoxRaytracerRepresentation::SetRay(HPoint3f in, HPoint3f out) {
   m_Ray = m_Content->TraceBetweenPoints(in, out);
   this->SetRay(&m_Ray);
 }
 
-void vtkVoxRaytracerRepresentation::SetRay(HPoint3f in, HPoint3f mid,
+void VoxRaytracerRepresentation::SetRay(HPoint3f in, HPoint3f mid,
                                            HPoint3f out) {
   m_Ray = m_Content->TraceBetweenPoints(in, mid);
   m_Ray.AppendRay(m_Content->TraceBetweenPoints(mid, out));
   this->SetRay(&m_Ray);
 }
 
-void vtkVoxRaytracerRepresentation::SetRay(VoxRaytracer::RayData *ray) {
+void VoxRaytracerRepresentation::SetRay(VoxRaytracer::RayData *ray) {
   vtkAppendPolyData *appender = m_RayRepresentation;
   appender->RemoveAllInputs();
 
@@ -286,15 +290,15 @@ void vtkVoxRaytracerRepresentation::SetRay(VoxRaytracer::RayData *ray) {
   appender->Modified();
 }
 
-void vtkVoxRaytracerRepresentation::SetVoxelsColor(Vector4f rgba) {
+void VoxRaytracerRepresentation::SetVoxelsColor(Vector4f rgba) {
   this->SetColor(m_RayRepresentationActor, rgba);
 }
 
-void vtkVoxRaytracerRepresentation::SetRayColor(Vector4f rgba) {
+void VoxRaytracerRepresentation::SetRayColor(Vector4f rgba) {
   this->SetColor(m_RayLineActor, rgba);
 }
 
-void vtkVoxRaytracerRepresentation::SetColor(vtkActor *actor, Vector4f rgba) {
+void VoxRaytracerRepresentation::SetColor(vtkActor *actor, Vector4f rgba) {
   if (!actor)
     return;
   vtkProperty *pr = actor->GetProperty();
@@ -303,7 +307,7 @@ void vtkVoxRaytracerRepresentation::SetColor(vtkActor *actor, Vector4f rgba) {
   pr->SetDiffuse(1);
 }
 
-void vtkVoxRaytracerRepresentation::InstallPipe() {
+void VoxRaytracerRepresentation::InstallPipe() {
 
   vtkSmartPointer<vtkAppendPolyData> append =
       vtkSmartPointer<vtkAppendPolyData>::New();

src/Vtk/HEP/MuonTomography/vtkVoxRaytracerRepresentation.h

@@ -44,13 +44,13 @@
 #include <vtkTransform.h>
 #include <vtkTransformPolyDataFilter.h>
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 
 #include "Vtk/uLibVtkInterface.h"
 
-#include "HEP/Detectors/MuonScatter.h"
+#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
 
-#include "Math/StructuredGrid.h"
+#include "Vtk/Math/vtkStructuredGrid.h"
 #include "Math/VoxRaytracer.h"
 
 class vtkActor;
@@ -58,12 +58,12 @@ class vtkActor;
 namespace uLib {
 namespace Vtk {
 
-class vtkVoxRaytracerRepresentation : public Puppet {
+class VoxRaytracerRepresentation : public Prop3D {
   typedef VoxRaytracer Content;
 
 public:
-  vtkVoxRaytracerRepresentation(Content &content);
-  ~vtkVoxRaytracerRepresentation();
+  VoxRaytracerRepresentation(Content &content);
+  ~VoxRaytracerRepresentation();
 
   uLib::VoxRaytracer *GetRaytracerAlgorithm();
 
@@ -76,13 +76,13 @@ public:
   enum RepresentationElements { RayElements, VoxelsElements };
   void SetRepresentationElements(enum RepresentationElements el);
 
-  void SetMuon(MuonScatter &muon);
+  void SetMuon(uLib::MuonScatter &muon);
 
-  void SetMuon(MuonScatter &muon, HPoint3f poca);
+  void SetMuon(uLib::MuonScatter &muon, HPoint3f poca);
 
-  void SetMuon(class vtkMuonEvent &muon);
+  void SetMuon(class MuonEvent &muon);
 
-  void SetMuon(class vtkMuonScatter &muon);
+  void SetMuon(class MuonScatter &muon);
 
   VoxRaytracer::RayData GetRay();
 
@@ -101,7 +101,7 @@ private:
   void SetColor(vtkActor *actor, Vector4f rgba);
 
   VoxRaytracer *m_Content;
-  MuonScatter m_Muon;
+  MuonScatter *m_Muon;
   HPoint3f m_Poca;
   bool m_HasMuon;
   bool m_HasPoca;

src/Vtk/Math/testing/vtkAssemblyTest.cpp

@@ -9,9 +9,9 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-#include "Math/Assembly.h"
-#include "Math/ContainerBox.h"
-#include "Math/Cylinder.h"
+#include "Vtk/Math/vtkAssembly.h"
+#include "Vtk/Math/vtkContainerBox.h"
+#include "Vtk/Math/vtkCylinder.h"
 #include "Vtk/Math/vtkAssembly.h"
 #include "Vtk/vtkObjectsContext.h"
 #include "Vtk/uLibVtkViewer.h"
@@ -50,18 +50,18 @@ int main(int argc, char **argv) {
     // ---- 3. Apply a group transform ----
     assembly.SetPosition(Vector3f(1_m, 1_m, 0));
 
-    // ---- 5. Visualize (create puppets to set properties) ----
+    // ---- 5. Visualize (create prop3ds to set properties) ----
     Vtk::Assembly vtkAsm(&assembly);
 
     Vtk::Viewer viewer;
-    vtkAsm.AddToViewer(viewer); // This triggers puppet creation via ConnectRenderer which eventually calls Puppet::GetProp
+    vtkAsm.AddToViewer(viewer); // This triggers prop3d creation via ConnectRenderer which eventually calls Prop3D::GetProp
     
-    // Explicitly update to ensure puppets exist and are added to assemblies
+    // Explicitly update to ensure prop3ds exist and are added to assemblies
     vtkAsm.Update();
 
-    // Use the child context to find child puppets and set colors
+    // Use the child context to find child prop3ds and set colors
     if (auto* childCtx = vtkAsm.GetChildrenContext()) {
-        auto setProps = [](Vtk::Puppet* p, float r, float g, float b) {
+        auto setProps = [](Vtk::Prop3D* p, float r, float g, float b) {
             if (!p) return;
             vtkPropCollection* props = p->GetProps();
             props->InitTraversal();
@@ -74,12 +74,12 @@ int main(int argc, char **argv) {
             }
         };
 
-        setProps(childCtx->GetPuppet(&box1), 1.0, 0.0, 0.0); // Red
-        setProps(childCtx->GetPuppet(&box2), 0.0, 1.0, 0.0); // Green
-        setProps(childCtx->GetPuppet(&cyl),  0.0, 0.0, 1.0); // Blue
+        setProps(childCtx->GetProp3D(&box1), 1.0, 0.0, 0.0); // Red
+        setProps(childCtx->GetProp3D(&box2), 0.0, 1.0, 0.0); // Green
+        setProps(childCtx->GetProp3D(&cyl),  0.0, 0.0, 1.0); // Blue
     }
 
-    std::cout << "Puppets in viewport: " << viewer.getPuppets().size() << " (Expected 4: 1 assembly + 3 children)" << std::endl;
+    std::cout << "Prop3Ds in viewport: " << viewer.getProp3Ds().size() << " (Expected 4: 1 assembly + 3 children)" << std::endl;
 
     // ---- 4. Query the bounding box for terminal output ----
     Vector3f bbMin, bbMax;

src/Vtk/Math/testing/vtkContainerBoxTest.cpp

@@ -25,7 +25,7 @@
 
 #include "Vtk/uLibVtkViewer.h"
 
-#include "Math/ContainerBox.h"
+#include "Vtk/Math/vtkContainerBox.h"
 #include "Math/Units.h"
 #include "Vtk/Math/vtkContainerBox.h"
 
@@ -37,20 +37,23 @@ int main() {
   BEGIN_TESTING(vtk ContainerBox Test);
 
   ContainerBox box;
-  box.Scale(Vector3f(1_m,5_m,1_m));
-  box.SetPosition(Vector3f(0,1_m,0));
-  Vtk::vtkContainerBox v_box(&box);
-  v_box.SetRepresentation(Vtk::Puppet::Surface);
-  v_box.SetOpacity(0.5);
-  v_box.SetSelectable(true);
+  box.Scale(Vector3f(1_m,2_m,1_m));
+  box.SetPosition(Vector3f(0,0,0));
   
-  box.findOrAddSignal(&ContainerBox::Updated)->connect([&box](){
+  Vtk::ContainerBox v_box(&box);
+  v_box.Update();
+  
+  // v_box.SetRepresentation(Vtk::Prop3D::Surface);
+  // v_box.SetOpacity(0.5);
+  // v_box.SetSelectable(true);
+  
+  box.findOrAddSignal(&Object::Updated)->connect([&box](){
     std::cout << "box updated: " << box.GetWorldPoint(HPoint3f(1,1,1)) << std::endl;
   });
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer v_viewer;
-    v_viewer.AddPuppet(v_box);
+    v_viewer.AddProp3D(v_box);
     v_viewer.Start();
   }
 

src/Vtk/Math/testing/vtkContainerBoxTest2.cpp

@@ -6,7 +6,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/uLibVtkViewer.h"
-#include "Math/ContainerBox.h"
+#include "Vtk/Math/vtkContainerBox.h"
 #include "Math/Units.h"
 #include "Vtk/Math/vtkContainerBox.h"
 #include <iostream>
@@ -19,8 +19,8 @@ int main() {
     box.SetInstanceName("MyTestBox");
 
     std::cout << "Creating VTK representation..." << std::endl;
-    Vtk::vtkContainerBox v_box(&box);
-    v_box.SetRepresentation(Vtk::Puppet::Wireframe);
+    Vtk::ContainerBox v_box(&box);
+    v_box.SetRepresentation(Vtk::Prop3D::Wireframe);
     v_box.SetColor(1.0, 0.0, 0.0); // Red
 
     // // 1. Initial Visualization setup (handled by Viewer)
@@ -38,7 +38,7 @@ int main() {
 
     std::cout << "Starting viewer (close window to exit)..." << std::endl;
     Vtk::Viewer viewer;
-    viewer.AddPuppet(v_box);
+    viewer.AddProp3D(v_box);
     viewer.Start();
 
     return 0;

src/Vtk/Math/testing/vtkQuadMeshTest.cpp

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkQuadMesh.h"
-#include "Math/QuadMesh.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkQuadMeshTest
@@ -42,7 +41,7 @@ BOOST_AUTO_TEST_CASE(vtkQuadMeshConstruction) {
 
   mesh.AddQuad(Vector4i(0, 1, 2, 3));
 
-  Vtk::vtkQuadMesh v_mesh(mesh);
+  Vtk::QuadMesh v_mesh(&mesh);
 
   Object::connect(&mesh, &QuadMesh::Updated, [&mesh]() {
     Vector3f points[4];
@@ -50,15 +49,15 @@ BOOST_AUTO_TEST_CASE(vtkQuadMeshConstruction) {
     points[1] = mesh.GetPoint(1);
     points[2] = mesh.GetPoint(2);
     points[3] = mesh.GetPoint(3);
-    std::cout << "mesh updated: " << points[0] << " " << points[1] 
-              << " " << points[2] << " " << points[3] << std::endl;
+    std::cout << "mesh updated: " << points[0] << " " << points[1] << " "
+              << points[2] << " " << points[3] << std::endl;
   });
 
   v_mesh.Update();
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddPuppet(v_mesh);
+    viewer.AddProp3D(v_mesh);
     viewer.Start();
   }
 

src/Vtk/Math/testing/vtkStructuredGridTest.cpp

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkStructuredGrid.h"
-#include "Math/StructuredGrid.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkStructuredGridTest
@@ -36,11 +35,11 @@ BOOST_AUTO_TEST_CASE(vtkStructuredGridTest) {
   StructuredGrid grid(Vector3i(10, 10, 100));
   grid.SetSpacing(Vector3f(3, 1, 1));
 
-  Vtk::vtkStructuredGrid grid_viewer(grid);
+  Vtk::StructuredGrid grid_viewer(&grid);
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddPuppet(grid_viewer);
+    viewer.AddProp3D(grid_viewer);
     viewer.Start();
   }
 

src/Vtk/Math/testing/vtkTriangleMeshTest.cpp

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkTriangleMesh.h"
-#include "Math/TriangleMesh.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkTriangleMeshTest
@@ -40,22 +39,23 @@ BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction) {
   mesh.AddPoint(Vector3f(1, 0, 0));
   mesh.AddTriangle(Vector3i(0, 1, 2));
 
-  Vtk::vtkTriangleMesh v_mesh(mesh);
+  Vtk::TriangleMesh v_mesh(&mesh);
 
   Object::connect(&mesh, &TriangleMesh::Updated, [&mesh]() {
     Vector3f points[3];
     points[0] = mesh.GetPoint(0);
     points[1] = mesh.GetPoint(1);
     points[2] = mesh.GetPoint(2);
-    std::cout << "mesh updated: " << points[0].transpose() << " " << points[1].transpose() 
-              << " " << points[2].transpose() << std::endl;
+    std::cout << "mesh updated: " << points[0].transpose() << " "
+              << points[1].transpose() << " " << points[2].transpose()
+              << std::endl;
   });
 
   v_mesh.Update();
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddPuppet(v_mesh);
+    viewer.AddProp3D(v_mesh);
     viewer.Start();
   }
 
@@ -66,13 +66,13 @@ BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction) {
 BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction2) {
   TriangleMesh mesh;
 
-  Vtk::vtkTriangleMesh v_mesh(mesh);
+  Vtk::TriangleMesh v_mesh(&mesh);
   v_mesh.ReadFromStlFile("capelluzzo.stl");
   v_mesh.Update();
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddPuppet(v_mesh);
+    viewer.AddProp3D(v_mesh);
     viewer.Start();
   }
 

src/Vtk/Math/testing/vtkVoxImageInteractiveTest.cpp

@@ -10,43 +10,46 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkVoxImage.h"
-#include "Math/VoxImage.h"
 #include "Vtk/uLibVtkViewer.h"
-#include <vtkSmartPointer.h>
-#include <vtkCallbackCommand.h>
-#include <vtkRenderWindowInteractor.h>
-#include <vtkProperty.h>
-#include <vtkRenderer.h>
-#include <vtkRenderWindow.h>
-#include <iostream>
 #include <cmath>
+#include <iostream>
+#include <vtkCallbackCommand.h>
+#include <vtkProperty.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkRenderer.h>
+#include <vtkSmartPointer.h>
 
 using namespace uLib;
 
 struct AppState {
-    std::vector<Vtk::vtkVoxImage*> images;
+  std::vector<Vtk::VoxImage *> images;
   Vtk::Viewer *viewer;
 };
 
-void KeyPressCallbackFunction(vtkObject* caller, long unsigned int eventId, void* clientData, void* callData) {
+void KeyPressCallbackFunction(vtkObject *caller, long unsigned int eventId,
+                              void *clientData, void *callData) {
   auto *interactor = static_cast<vtkRenderWindowInteractor *>(caller);
   auto *state = static_cast<AppState *>(clientData);
 
   std::string key = interactor->GetKeySym();
   if (key == "w") {
     std::cout << "--> Switching all images to Wireframe Box" << std::endl;
-        for (auto* img : state->images) img->SetRepresentation(Vtk::Puppet::Wireframe);
+    for (auto *img : state->images)
+      img->SetRepresentation(Vtk::Prop3D::Wireframe);
     state->viewer->GetRenderWindow()->Render();
-    }
-    else if (key == "s") {
-        std::cout << "--> Switching all images to Surface (Volume Rendering)" << std::endl;
-        for (auto* img : state->images) img->SetRepresentation(Vtk::Puppet::Surface);
+  } else if (key == "s") {
+    std::cout << "--> Switching all images to Surface (Volume Rendering)"
+              << std::endl;
+    for (auto *img : state->images)
+      img->SetRepresentation(Vtk::Prop3D::Surface);
     state->viewer->GetRenderWindow()->Render();
-    }
-    else if (key >= "0" && key <= "5") {
+  } else if (key >= "0" && key <= "5") {
     int preset = key[0] - '0';
-        std::cout << "--> Switching all images to Rendering Preset " << preset << std::endl;
-        for (auto* img : state->images) img->setShadingPreset(preset);
+    std::cout << "--> Switching all images to Rendering Preset " << preset
+              << std::endl;
+    for (auto *img : state->images)
+      img->setShadingPreset(preset);
     state->viewer->GetRenderWindow()->Render();
   }
 }
@@ -89,23 +92,25 @@ int main(int argc, char** argv) {
       for (int x = 0; x < dims2(0); ++x) {
         Voxel v;
         // Linear gradient along X, Y, Z
-                float val = (float(x)/dims2(0) + float(y)/dims2(1) + float(z)/dims2(2)) / 3.0f;
+        float val =
+            (float(x) / dims2(0) + float(y) / dims2(1) + float(z) / dims2(2)) /
+            3.0f;
         v.Value = (40.0f * val) / factor;
         img2[Vector3i(x, y, z)] = v;
       }
     }
   }
 
-    Vtk::vtkVoxImage vtk_img1(img1);
+  Vtk::VoxImage vtk_img1(&img1);
   vtk_img1.setShadingPreset(0);
 
-    Vtk::vtkVoxImage vtk_img2(img2);
+  Vtk::VoxImage vtk_img2(&img2);
   vtk_img2.setShadingPreset(1); // Use Composite without MIP for variety
 
   Vtk::Viewer viewer;
   viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
-    viewer.AddPuppet(vtk_img1);
-    viewer.AddPuppet(vtk_img2);
+  viewer.AddProp3D(vtk_img1);
+  viewer.AddProp3D(vtk_img2);
 
   // Setup KeyPress Callback
   AppState state;
@@ -113,13 +118,14 @@ int main(int argc, char** argv) {
   state.images.push_back(&vtk_img2);
   state.viewer = &viewer;
 
-    vtkSmartPointer<vtkCallbackCommand> keyCallback = vtkSmartPointer<vtkCallbackCommand>::New();
+  vtkSmartPointer<vtkCallbackCommand> keyCallback =
+      vtkSmartPointer<vtkCallbackCommand>::New();
   keyCallback->SetCallback(KeyPressCallbackFunction);
   keyCallback->SetClientData(&state);
   viewer.GetInteractor()->AddObserver(vtkCommand::KeyPressEvent, keyCallback);
 
   std::cout << "=========================================" << std::endl;
-    std::cout << " vtkVoxImage Interactive Viewer Test" << std::endl;
+  std::cout << " VoxImage Interactive Viewer Test" << std::endl;
   std::cout << " [LEFT] Spherical Shell (MIP)" << std::endl;
   std::cout << " [RIGHT] Axes Gradient (Composite)" << std::endl;
   std::cout << "-----------------------------------------" << std::endl;

src/Vtk/Math/testing/vtkVoxImageTest.cpp

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkVoxImage.h"
-#include "Math/VoxImage.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkVoxImageTest
@@ -46,12 +45,12 @@ BOOST_AUTO_TEST_CASE(vtkVoxImageConstruction) {
   img.InitVoxels(zero);
   img[Vector3i(3, 3, 3)] = nonzero;
 
-  Vtk::vtkVoxImage vtk_img(img);
+  Vtk::VoxImage vtk_img(&img);
   vtk_img.SaveToXMLFile("test_vtkvoximage.vti");
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddPuppet(vtk_img);
+    viewer.AddProp3D(vtk_img);
     viewer.Start();
   }
 

src/Vtk/Math/vtkAssembly.cpp

@@ -11,7 +11,7 @@
 
 #include "vtkAssembly.h"       // uLib::Vtk::Assembly
 #include "Vtk/vtkObjectsContext.h"
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 
 #include <vtkAssembly.h>       // VTK library ::vtkAssembly
 #include <vtkActor.h>
@@ -31,14 +31,14 @@ namespace Vtk {
 
 // ------------------------------------------------------------------ //
 Assembly::Assembly(uLib::Assembly *content)
-    : m_Content(content),
+    : ObjectWrapper(content),
       m_ChildContext(nullptr),
       m_BBoxActor(nullptr),
       m_VtkAsm(nullptr),
       m_InUpdate(false) {
     this->InstallPipe();
-    if (m_Content) {
-        Object::connect(m_Content, &uLib::Assembly::Updated,
+    if (this->m_model) {
+        Object::connect(this->m_model.get(), &uLib::Assembly::Updated,
                         this, &Assembly::Update);
     }
 }
@@ -71,13 +71,13 @@ void Assembly::InstallPipe() {
     m_BBoxActor->GetProperty()->SetLineWidth(1.5);
     m_BBoxActor->GetProperty()->SetOpacity(0.6);
     m_BBoxActor->PickableOff();
-    m_BBoxActor->SetVisibility(m_Content ? m_Content->GetShowBoundingBox() : false);
+    m_BBoxActor->SetVisibility(this->m_model ? this->m_model->GetShowBoundingBox() : false);
 
     m_VtkAsm->AddPart(m_BBoxActor);
 
-    // 3. Build a child-objects context (auto-creates puppets for each child)
-    if (m_Content) {
-        m_ChildContext = new vtkObjectsContext(m_Content);
+    // 3. Build a child-objects context (auto-creates prop3ds for each child)
+    if (this->m_model) {
+        m_ChildContext = new ObjectsContext(this->m_model);
         // Link the children context's assembly into our group assembly
         if (auto* childProp = vtkProp3D::SafeDownCast(m_ChildContext->GetProp())) {
             m_VtkAsm->AddPart(childProp);
@@ -93,15 +93,15 @@ void Assembly::Update() {
     if (m_InUpdate) return;
     m_InUpdate = true;
     
-    if (m_Content && m_VtkAsm) {
+    if (this->m_model && m_VtkAsm) {
         // Apply world matrix from the assembly content
         vtkNew<vtkMatrix4x4> m;
-        Matrix4fToVtk(m_Content->GetMatrix(), m);
+        Matrix4fToVtk(this->m_model->GetMatrix(), m);
         m_VtkAsm->SetUserMatrix(m);
         m_VtkAsm->Modified();
     }
 
-    this->Puppet::Update();
+    this->Prop3D::Update();
     this->UpdateBoundingBox();
     if (m_ChildContext)
         m_ChildContext->Update();
@@ -110,33 +110,33 @@ void Assembly::Update() {
 
 void Assembly::SyncFromVtk() {
     if (m_InUpdate) return;
-    if (!m_Content || !m_VtkAsm) return;
+    if (!this->m_model || !m_VtkAsm) return;
 
     m_InUpdate = true;
 
     // VTK -> Model: Update world matrix (accounting for model parents)
     if (vtkProp3D* proxy = this->GetProxyProp()) {
-        m_Content->SetWorldMatrix(VtkToMatrix4f(proxy->GetUserMatrix()));
-        m_Content->FromMatrix(m_Content->GetMatrix());
+        this->m_model->SetWorldMatrix(VtkToMatrix4f(proxy->GetUserMatrix()));
+        this->m_model->FromMatrix(this->m_model->GetMatrix());
     }
 
     this->UpdateBoundingBox();
     if (m_ChildContext)
         m_ChildContext->SyncFromVtk();
 
-    m_Content->Updated(); // Notify change in model
+    this->m_model->Updated(); // Notify change in model
 
     m_InUpdate = false;
 }
 
 // ------------------------------------------------------------------ //
 void Assembly::UpdateBoundingBox() {
-    if (!m_Content || !m_BBoxActor) return;
+    if (!this->m_model || !m_BBoxActor) return;
 
-    m_BBoxActor->SetVisibility(m_Content->GetShowBoundingBox());
+    m_BBoxActor->SetVisibility(this->m_model->GetShowBoundingBox());
 
     Vector3f bbMin, bbMax;
-    m_Content->GetBoundingBox(bbMin, bbMax);
+    this->m_model->GetBoundingBox(bbMin, bbMax);
 
     // Avoid degenerate boxes
     Vector3f size = bbMax - bbMin;
@@ -189,7 +189,7 @@ void Assembly::UpdateBoundingBox() {
 }
 
 // ------------------------------------------------------------------ //
-vtkObjectsContext *Assembly::GetChildrenContext() const {
+ObjectsContext *Assembly::GetChildrenContext() const {
     return m_ChildContext;
 }
 

src/Vtk/Math/vtkAssembly.h

@@ -12,8 +12,9 @@
 #ifndef U_VTK_ASSEMBLY_H
 #define U_VTK_ASSEMBLY_H
 
+#include "Core/ObjectFactory.h"
 #include "Math/Assembly.h"
-#include "uLibVtkInterface.h"
+#include "Vtk/uLibVtkInterface.h"
 
 class vtkActor;
 class vtkAssembly;  // VTK library forward declaration (must be before namespace)
@@ -21,22 +22,22 @@ class vtkAssembly;  // VTK library forward declaration (must be before namespace
 namespace uLib {
 namespace Vtk {
 
-class vtkObjectsContext; // forward
+class ObjectsContext; // forward
 
 /**
- * @brief VTK Puppet for visualizing uLib::Assembly.
+ * @brief VTK Prop3D for visualizing uLib::Assembly.
  *
  * Manages a VTK assembly (vtkAssembly from the VTK library) that groups
- * all child puppets and applies the Assembly's AffineTransform. It also
+ * all child prop3ds and applies the Assembly's AffineTransform. It also
  * renders an optional bounding box wireframe computed from the Assembly's AABB.
  *
  * @note This class is uLib::Vtk::Assembly. It internally uses
  *       the VTK library class vtkAssembly for grouping, but the two
  *       are distinct.
  */
-class Assembly : public Puppet {
+class Assembly : public Prop3D, public uLib::ObjectWrapper<uLib::Assembly> {
 public:
-    uLibTypeMacro(Assembly, Puppet)
+    uLibTypeMacro(Assembly, Prop3D)
 
     Assembly(uLib::Assembly *content);
     virtual ~Assembly();
@@ -47,22 +48,21 @@ public:
     /** @brief Synchronizes the model from the VTK representation (VTK→model). */
     virtual void SyncFromVtk() override;
 
-    virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
-    virtual uLib::ObjectsContext* GetChildren() override { return (uLib::ObjectsContext*)m_Content; }
+    virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_model.get(); }
+    virtual uLib::ObjectsContext* GetChildren() override { return (uLib::ObjectsContext*)m_model.get(); }
 
     /**
-     * @brief Returns the puppet managing child objects.
+     * @brief Returns the prop3d managing child objects.
      */
 
-    /** @brief Returns the puppet managing child objects. */
-    vtkObjectsContext *GetChildrenContext() const;
+    /** @brief Returns the prop3d managing child objects. */
+    ObjectsContext *GetChildrenContext() const;
 
 private:
     void UpdateBoundingBox();
     void InstallPipe();
 
-    uLib::Assembly     *m_Content;
-    vtkObjectsContext  *m_ChildContext;
+    ObjectsContext  *m_ChildContext;
     vtkActor           *m_BBoxActor;
     ::vtkAssembly      *m_VtkAsm; // VTK library assembly — NOT this class
     bool                m_InUpdate;    // re-entrancy guard

src/Vtk/Math/vtkContainerBox.cpp

@@ -41,7 +41,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
 
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 
 
 namespace uLib {
@@ -51,13 +51,12 @@ struct ContainerBoxData {
   vtkSmartPointer<vtkActor>     m_Cube;
   vtkSmartPointer<vtkActor>     m_Axes;
   vtkSmartPointer<vtkAssembly>  m_VtkAsm;
-  vtkSmartPointer<vtkMatrix4x4> m_Affine;
   uLib::Connection              m_UpdateSignal;
 
+
   ContainerBoxData() : m_Cube(vtkSmartPointer<vtkActor>::New()), 
                        m_Axes(vtkSmartPointer<vtkActor>::New()), 
-                       m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()),
-                       m_Affine(vtkSmartPointer<vtkMatrix4x4>::New()) {}
+                       m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()) {}
   ~ContainerBoxData() {
   }
 };
@@ -66,76 +65,71 @@ struct ContainerBoxData {
 
 
 
-vtkContainerBox::vtkContainerBox(vtkContainerBox::Content *content)
-    : d(new ContainerBoxData()), m_Content(content) {
+ContainerBox::ContainerBox(ContainerBox::Content *content)
+    : d(new ContainerBoxData()), ObjectWrapper(content) {
   this->InstallPipe();
-  d->m_UpdateSignal = Object::connect(m_Content, &uLib::Object::Updated, this, &vtkContainerBox::Update);
+  d->m_UpdateSignal =
+      Object::connect(this->m_model.get(), &uLib::Object::Updated, this, &ContainerBox::Update);
 }
 
-vtkContainerBox::~vtkContainerBox() {
+ContainerBox::~ContainerBox() {
   delete d;
 }
 
-vtkPolyData *vtkContainerBox::GetPolyData() const {
+vtkPolyData *ContainerBox::GetPolyData() const {
   // TODO
   return NULL;
 }
 
 
-void vtkContainerBox::Update() {
+void ContainerBox::Update() {
   RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
-  if (!m_Content) return;
+  if (!this->m_model) return;
 
-  vtkProp3D* root = vtkProp3D::SafeDownCast(this->GetProp());
-  if (root) {
-      // Apply local full matrix (TRS * LocalBox) so that nested assemblies work correctly
-      Matrix4f fullLocal = m_Content->GetMatrix() * m_Content->GetLocalMatrix();
+  vtkProp3D* prop = vtkProp3D::SafeDownCast(this->GetProp());
+  if (prop) {
+    // Apply the full volume matrix (TRS * m_LocalT)
     vtkNew<vtkMatrix4x4> m;
-      Matrix4fToVtk(fullLocal, m);
-      root->SetUserMatrix(m);
-      root->Modified();
+    Matrix4fToVtk(this->m_model->GetMatrix(), m);
+    prop->SetUserMatrix(m);
+    prop->Modified();
   }
 
   // Delegate rest of update (appearance, render, etc)
   ConnectionBlock blocker(d->m_UpdateSignal);
-  this->Puppet::Update();
+  this->Prop3D::Update();
 }
 
 
-void vtkContainerBox::SyncFromVtk() {
+
+
+void ContainerBox::SyncFromVtk() {
   RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
-  if (!m_Content) return;
+  if (!this->m_model) return;
 
   vtkProp3D* root = this->GetProxyProp();
   if (!root) return;
 
   // VTK -> Model: Extract new world TRS from proxy, which matches the model's TRS center
   vtkMatrix4x4* rootMat = root->GetUserMatrix();
-  // if (rootMat) {
-  //     std::cout << "[vtkContainerBox::SyncFromVtk] Read Proxy UserMatrix:" << std::endl;
-  //     rootMat->Print(std::cout);
-  // }
-  
   Matrix4f vtkWorld = VtkToMatrix4f(rootMat);
   
   // Synchronize TRS property members from the updated local matrix
-  m_Content->FromMatrix(vtkWorld);
-
-  // std::cout << "[vtkContainerBox::SyncFromVtk] New Model WorldMatrix:" << std::endl << m_Content->GetWorldMatrix() << std::endl;
+  this->m_model->FromMatrix(vtkWorld);
 
   // Since we modified the model, notify observers, but block the loop back to VTK
   // ConnectionBlock blocker(d->m_UpdateSignal);
-  m_Content->Updated();
+  this->m_model->Updated();
 }
 
 
 
 
 
-void vtkContainerBox::InstallPipe() {
-  if (!m_Content)
+void ContainerBox::InstallPipe() {
+  if (!this->m_model)
     return;
-  Content *c = m_Content;
+  Content *c = this->m_model;
 
   // CUBE
   vtkSmartPointer<vtkCubeSource> cube = vtkSmartPointer<vtkCubeSource>::New();
@@ -171,11 +165,10 @@ void vtkContainerBox::InstallPipe() {
   d->m_VtkAsm->AddPart(d->m_Axes);
   this->SetProp(d->m_VtkAsm);
   
-  vtkProp3D* root = d->m_VtkAsm;
-  if (root) {
-      d->m_Affine = Matrix4fToVtk(m_Content->GetMatrix());
-      root->SetUserMatrix(d->m_Affine);
-  }
+  // vtkProp3D* root = d->m_VtkAsm;
+  // if (root) {
+  //     this->ApplyProp3DTransform(root);
+  // }
   this->Update();
 }
 

src/Vtk/Math/vtkContainerBox.h

@@ -26,6 +26,7 @@
 #ifndef U_VTKCONTAINERBOX_H
 #define U_VTKCONTAINERBOX_H
 
+#include "Core/ObjectFactory.h"
 #include "Math/ContainerBox.h"
 #include "uLibVtkInterface.h"
 #include "vtkPolydata.h"
@@ -37,14 +38,18 @@ namespace Vtk {
 
 struct ContainerBoxData;
 
-class vtkContainerBox : public Puppet, public Polydata {
-  typedef ContainerBox Content;
+class ContainerBox : public Prop3D,
+                     public Polydata,
+                     public uLib::ObjectWrapper<uLib::ContainerBox> {
+
+  uLibTypeMacro(ContainerBox, Prop3D, Polydata)
+  typedef uLib::ContainerBox Content;
 
 public:
-  vtkContainerBox(Content *content);
-  ~vtkContainerBox();
+  ContainerBox(Content *content);
+  ~ContainerBox();
 
-  virtual class vtkPolyData *GetPolyData() const;
+  virtual class vtkPolyData *GetPolyData() const override;
 
   /**
    * @brief Updates the VTK representation from the internal state.
@@ -56,15 +61,16 @@ public:
    */
   virtual void SyncFromVtk() override;
 
-  virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
+  virtual uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
 protected:
   virtual void InstallPipe();
 
   struct ContainerBoxData *d;
-  Content                 *m_Content;
-  bool                     m_BlockUpdate = false;
 
+  ULIB_DECLARE_PROPERTIES(ContainerBox)
 };
 
 } // namespace Vtk

src/Vtk/Math/vtkCylinder.cpp

@@ -32,31 +32,31 @@
 #include <vtkProperty.h>
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 
 namespace uLib {
 namespace Vtk {
 
-vtkCylinder::vtkCylinder(vtkCylinder::Content *content)
-    : m_Content(content), m_Actor(nullptr), m_VtkAsm(nullptr) {
+Cylinder::Cylinder(Cylinder::Content *content)
+    : ObjectWrapper(content), m_Actor(nullptr), m_VtkAsm(nullptr) {
   this->InstallPipe();
-  m_UpdateSignal = Object::connect(m_Content, &uLib::Object::Updated, this, &vtkCylinder::Update);
+  m_UpdateSignal = Object::connect(this->m_model.get(), &uLib::Object::Updated, this, &Cylinder::Update);
 }
 
-vtkCylinder::~vtkCylinder() {
+Cylinder::~Cylinder() {
   if (m_Actor) m_Actor->Delete();
   if (m_VtkAsm) m_VtkAsm->Delete();
 }
 
-void vtkCylinder::Update() {
-  if (!m_Content)
+void Cylinder::Update() {
+  if (!this->m_model)
     return;
 
   vtkProp3D* root = vtkProp3D::SafeDownCast(this->GetProp());
   if (root) {
       // 1. Placement handled specifically from content (use TRS GetMatrix, not World)
       vtkNew<vtkMatrix4x4> m;
-      Matrix4fToVtk(m_Content->GetMatrix(), m);
+      Matrix4fToVtk(this->m_model->GetMatrix(), m);
       root->SetUserMatrix(m);
 
       // 2. Shape-local properties (Radius, Height, Axis alignment) go to the internal actor
@@ -68,10 +68,10 @@ void vtkCylinder::Update() {
           
           // Initial source is centered Y-cylinder (Radial XZ [-1,1], Height Y [-0.5, 0.5])
           // Apply Radius and Height scaling
-          alignment->Scale(m_Content->GetRadius(), m_Content->GetHeight(), m_Content->GetRadius());
+          alignment->Scale(this->m_model->GetRadius(), this->m_model->GetHeight(), this->m_model->GetRadius());
 
           // Apply Axis alignment
-          int axis = m_Content->GetAxis();
+          int axis = this->m_model->GetAxis();
           if (axis == 0) alignment->RotateZ(-90);      // Y -> X
           else if (axis == 1) ;                        // Y -> Y (identity)
           else if (axis == 2) alignment->RotateX(90);  // Y -> Z
@@ -82,34 +82,26 @@ void vtkCylinder::Update() {
 
   // Delegate rest of update (appearance, render, etc)
   ConnectionBlock blocker(m_UpdateSignal);
-  this->Puppet::Update();
+  this->Prop3D::Update();
 }
 
-void vtkCylinder::SyncFromVtk() {
-  if (!m_Content) return;
+void Cylinder::SyncFromVtk() {
+  if (!this->m_model) return;
   
   vtkProp3D* root = this->GetProxyProp();
   if (!root) return;
 
   // VTK -> Model: Extract new world TRS from proxy
   vtkMatrix4x4* rootMat = root->GetUserMatrix();  
-  if (rootMat) {
-      std::cout << "[vtkCylinder::SyncFromVtk] Read Proxy UserMatrix:" << std::endl;
-      rootMat->Print(std::cout);
-  }
-  
   Matrix4f vtkWorld = VtkToMatrix4f(rootMat);
   
   // Directly sync model from the world matrix
-  m_Content->FromMatrix(vtkWorld);
-
-  std::cout << "[vtkCylinder::SyncFromVtk] New Model WorldMatrix:" << std::endl << m_Content->GetWorldMatrix() << std::endl;
-
-  m_Content->Updated(); 
+  this->m_model->FromMatrix(vtkWorld);
+  this->m_model->Updated(); 
 }
 
-void vtkCylinder::InstallPipe() {
-  if (!m_Content)
+void Cylinder::InstallPipe() {
+  if (!this->m_model)
     return;
 
   m_VtkAsm = ::vtkAssembly::New();

src/Vtk/Math/vtkCylinder.h

@@ -26,6 +26,7 @@
 #ifndef U_VTKCYLINDER_H
 #define U_VTKCYLINDER_H
 
+#include "Core/ObjectFactory.h"
 #include "Math/Cylinder.h"
 #include "Vtk/uLibVtkInterface.h"
 #include <vtkActor.h>
@@ -41,12 +42,12 @@ namespace Vtk {
  * mathematical state of a Cylinder object. It manages the alignment
  * between VTK's Y-centered cylinder and uLib's Z-based coordinate system.
  */
-class vtkCylinder : public Puppet {
-  typedef Cylinder Content;
+class Cylinder : public Prop3D, public uLib::ObjectWrapper<uLib::Cylinder> {
+  typedef uLib::Cylinder Content;
 
 public:
-  vtkCylinder(Content *content);
-  virtual ~vtkCylinder();
+  Cylinder(Content *content);
+  virtual ~Cylinder();
 
   /** Synchronizes the VTK actor with the uLib model matrix and vice-versa */
   virtual void Update() override;
@@ -54,7 +55,9 @@ public:
   /** Synchronizes the uLib model matrix with the VTK actor specifically for gizmo interactions */
   virtual void SyncFromVtk() override;
 
-  virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
+  virtual uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
 protected:
   /** Sets up the VTK visualization pipeline */
@@ -62,7 +65,6 @@ protected:
 
   vtkActor *m_Actor;
   ::vtkAssembly *m_VtkAsm;
-  Content *m_Content;
   uLib::Connection m_UpdateSignal;
 };
 

src/Vtk/Math/vtkHLineRepresentation.h

@@ -31,10 +31,10 @@ class vtkPolyData;
 
 namespace uLib {
 
-class vtkHLineRepresentationDefault {
+class HLineRepresentationDefault {
 
 public:
-  vtkHLineRepresentationDefault();
+  HLineRepresentationDefault();
 };
 
 } // namespace uLib

src/Vtk/Math/vtkQuadMesh.cpp

@@ -42,14 +42,14 @@
 
 #include <vtkMatrix4x4.h>
 #include <vtkNew.h>
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/Math/vtkQuadMesh.h"
 #include <iostream>
 
 namespace uLib {
 namespace Vtk {
 
-void vtkQuadMesh::vtk2uLib_update() {
+void QuadMesh::vtk2uLib_update() {
   vtkIdType number_of_points = m_Poly->GetNumberOfPoints();
   vtkIdType number_of_quads = m_Poly->GetNumberOfPolys();
 
@@ -58,46 +58,46 @@ void vtkQuadMesh::vtk2uLib_update() {
             << "number of quads  = " << number_of_quads << "\n"
             << "//////\n";
 
-  m_content.Points().clear();
+  this->m_model->Points().clear();
   for (int i = 0; i < number_of_points; ++i) {
     double *point = m_Poly->GetPoint(i);
-    m_content.Points().push_back(Vector3f(point[0], point[1], point[2]));
+    this->m_model->Points().push_back(Vector3f(point[0], point[1], point[2]));
   }
 
-  m_content.Quads().resize(number_of_quads);
+  this->m_model->Quads().resize(number_of_quads);
   m_Poly->GetPolys()->InitTraversal();
   vtkSmartPointer<vtkIdList> idList = vtkSmartPointer<vtkIdList>::New();
   for (int i = 0; i < number_of_quads; ++i) {
     m_Poly->GetPolys()->GetNextCell(idList);
     if (idList->GetNumberOfIds() == 4) {
-      m_content.Quads()[i](0) = idList->GetId(0);
-      m_content.Quads()[i](1) = idList->GetId(1);
-      m_content.Quads()[i](2) = idList->GetId(2);
-      m_content.Quads()[i](3) = idList->GetId(3);
+      this->m_model->Quads()[i](0) = idList->GetId(0);
+      this->m_model->Quads()[i](1) = idList->GetId(1);
+      this->m_model->Quads()[i](2) = idList->GetId(2);
+      this->m_model->Quads()[i](3) = idList->GetId(3);
     }
   }
   m_Poly->Modified();
   m_Actor->GetMapper()->Update();
 }
 
-void vtkQuadMesh::uLib2vtk_update() {
-  vtkIdType number_of_points = m_content.Points().size();
-  vtkIdType number_of_quads = m_content.Quads().size();
+void QuadMesh::uLib2vtk_update() {
+  vtkIdType number_of_points = this->m_model->Points().size();
+  vtkIdType number_of_quads = this->m_model->Quads().size();
 
   vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
   points->SetNumberOfPoints(number_of_points);
   for (vtkIdType i = 0; i < number_of_points; i++) {
-    Vector3f p = m_content.Points().at(i);
+    Vector3f p = this->m_model->Points().at(i);
     points->SetPoint(i, p(0), p(1), p(2));
   }
 
   vtkSmartPointer<vtkCellArray> polys = vtkSmartPointer<vtkCellArray>::New();
   for (vtkIdType i = 0; i < number_of_quads; i++) {
     vtkIdType a, b, c, d;
-    a = m_content.Quads().at(i)(0);
-    b = m_content.Quads().at(i)(1);
-    c = m_content.Quads().at(i)(2);
-    d = m_content.Quads().at(i)(3);
+    a = this->m_model->Quads().at(i)(0);
+    b = this->m_model->Quads().at(i)(1);
+    c = this->m_model->Quads().at(i)(2);
+    d = this->m_model->Quads().at(i)(3);
     polys->InsertNextCell(4);
     polys->InsertCellPoint(a);
     polys->InsertCellPoint(b);
@@ -110,7 +110,7 @@ void vtkQuadMesh::uLib2vtk_update() {
   m_Poly->Modified();
 }
 
-void vtkQuadMesh::contentUpdate() {
+void QuadMesh::contentUpdate() {
   vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
   if (!vmat) {
     vtkNew<vtkMatrix4x4> mat;
@@ -118,50 +118,50 @@ void vtkQuadMesh::contentUpdate() {
     vmat = mat;
   }
 
-  Matrix4f transform = m_content.GetWorldMatrix();
+  Matrix4f transform = this->m_model->GetWorldMatrix();
   Matrix4fToVtk(transform, vmat);
 
   uLib2vtk_update();
 
   m_Poly->Modified();
   m_Actor->GetMapper()->Update();
-  Puppet::Update();
+  Prop3D::Update();
 }
 
-void vtkQuadMesh::Update() {
+void QuadMesh::Update() {
   vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
   if (!vmat) return;
 
   Matrix4f transform = VtkToMatrix4f(vmat);
-  m_content.SetMatrix(transform);
-  m_content.Updated();
+  this->m_model->SetMatrix(transform);
+  this->m_model->Updated();
 }
 
 // -------------------------------------------------------------------------- //
 
-vtkQuadMesh::vtkQuadMesh(vtkQuadMesh::Content &content)
-    : m_content(content), m_Poly(vtkPolyData::New()), m_Actor(vtkActor::New()) {
+QuadMesh::QuadMesh(QuadMesh::Content *content)
+    : ObjectWrapper(content), m_Poly(vtkPolyData::New()), m_Actor(vtkActor::New()) {
   vtkSmartPointer<vtkPolyDataMapper> mapper =
       vtkSmartPointer<vtkPolyDataMapper>::New();
   mapper->SetInputData(m_Poly);
   m_Actor->SetMapper(mapper);
 
   vtkNew<vtkMatrix4x4> vmat;
-  Matrix4fToVtk(m_content.GetWorldMatrix(), vmat);
+  Matrix4fToVtk(this->m_model->GetWorldMatrix(), vmat);
   m_Actor->SetUserMatrix(vmat);
 
   this->SetProp(m_Actor);
-  Object::connect(&m_content, &Content::Updated, this, &vtkQuadMesh::contentUpdate);
+  Object::connect(this->m_model.get(), &Content::Updated, this, &QuadMesh::contentUpdate);
   this->contentUpdate();
 }
 
-vtkQuadMesh::~vtkQuadMesh() {
-  Object::disconnect(&m_content, &Content::Updated, this, &vtkQuadMesh::contentUpdate);
+QuadMesh::~QuadMesh() {
+  Object::disconnect(this->m_model.get(), &Content::Updated, this, &QuadMesh::contentUpdate);
   m_Poly->Delete();
   m_Actor->Delete();
 }
 
-void vtkQuadMesh::ReadFromFile(const char *filename) {
+void QuadMesh::ReadFromFile(const char *filename) {
   vtkSmartPointer<vtkPolyDataReader> reader =
       vtkSmartPointer<vtkPolyDataReader>::New();
   reader->SetFileName(filename);
@@ -170,7 +170,7 @@ void vtkQuadMesh::ReadFromFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkQuadMesh::ReadFromXMLFile(const char *filename) {
+void QuadMesh::ReadFromXMLFile(const char *filename) {
   vtkSmartPointer<vtkXMLPolyDataReader> reader =
       vtkSmartPointer<vtkXMLPolyDataReader>::New();
   reader->SetFileName(filename);
@@ -179,7 +179,7 @@ void vtkQuadMesh::ReadFromXMLFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkQuadMesh::ReadFromObjFile(const char *filename) {
+void QuadMesh::ReadFromObjFile(const char *filename) {
   vtkSmartPointer<vtkOBJReader> reader = vtkSmartPointer<vtkOBJReader>::New();
   reader->SetFileName(filename);
   reader->Update();
@@ -187,7 +187,7 @@ void vtkQuadMesh::ReadFromObjFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkQuadMesh::ReadFromStlFile(const char *filename) {
+void QuadMesh::ReadFromStlFile(const char *filename) {
   vtkSmartPointer<vtkSTLReader> reader = vtkSmartPointer<vtkSTLReader>::New();
   reader->SetFileName(filename);
   reader->Update();
@@ -195,7 +195,7 @@ void vtkQuadMesh::ReadFromStlFile(const char *filename) {
   vtk2uLib_update();
 }
 
-vtkPolyData *vtkQuadMesh::GetPolyData() const { return m_Poly; }
+vtkPolyData *QuadMesh::GetPolyData() const { return m_Poly; }
 
 } // namespace Vtk
 } // namespace uLib

src/Vtk/Math/vtkQuadMesh.h

@@ -26,9 +26,10 @@
 #ifndef VTKQUADMESH_H
 #define VTKQUADMESH_H
 
+#include "Core/ObjectFactory.h"
 #include "Math/QuadMesh.h"
-#include "Vtk/uLibVtkInterface.h"
 #include "Vtk/Math/vtkPolydata.h"
+#include "Vtk/uLibVtkInterface.h"
 
 class vtkPolyData;
 class vtkActor;
@@ -36,12 +37,14 @@ class vtkActor;
 namespace uLib {
 namespace Vtk {
 
-class vtkQuadMesh : public Puppet, public Polydata {
-  typedef QuadMesh Content;
+class QuadMesh : public Prop3D,
+                 public Polydata,
+                 public uLib::ObjectWrapper<uLib::QuadMesh> {
+  typedef uLib::QuadMesh Content;
 
 public:
-  vtkQuadMesh(Content &content);
-  ~vtkQuadMesh();
+  QuadMesh(Content *content);
+  ~QuadMesh();
 
   void ReadFromFile(const char *filename);
 
@@ -56,12 +59,15 @@ public:
   virtual void contentUpdate();
 
   virtual void Update();
+  uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
 private:
   void vtk2uLib_update();
   void uLib2vtk_update();
 
-  QuadMesh &m_content;
+  // ObjectWrapper provides m_model
   vtkPolyData *m_Poly;
   vtkActor *m_Actor;
 };

src/Vtk/Math/vtkStructuredGrid.cpp

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "Math/StructuredGrid.h"
+#include "Vtk/Math/vtkStructuredGrid.h"
 #include "Vtk/Math/vtkStructuredGrid.h"
 
 #include "Vtk/Math/vtkDense.h"
@@ -39,33 +39,33 @@ namespace Vtk {
 ////// VTK STRUCTURED GRID /////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-vtkStructuredGrid::vtkStructuredGrid(Content &content)
-    : m_Content(&content), m_Actor(vtkActor::New()),
+StructuredGrid::StructuredGrid(Content *content)
+    : ObjectWrapper(content), m_Actor(vtkActor::New()),
       m_Transform(vtkTransform::New()) {
 
   this->InstallPipe();
 }
 
-vtkStructuredGrid::~vtkStructuredGrid() {
+StructuredGrid::~StructuredGrid() {
   m_Actor->Delete();
   m_Transform->Delete();
 }
 
-void vtkStructuredGrid::SetTransform(vtkTransform *t) {
+void StructuredGrid::SetTransform(vtkTransform *t) {
   vtkMatrix4x4 *vmat = t->GetMatrix();
   Matrix4f mat = VtkToMatrix4f(vmat);
-  m_Content->SetMatrix(mat);
+  this->m_model->SetMatrix(mat);
 
   vtkSmartPointer<vtkMatrix4x4> vmat2 = vtkSmartPointer<vtkMatrix4x4>::New();
-  mat = m_Content->GetWorldMatrix();
+  mat = this->m_model->GetWorldMatrix();
   Matrix4fToVtk(mat, vmat2);
   m_Transform->SetMatrix(vmat2);
   m_Transform->Update();
   this->Update();
 }
 
-void vtkStructuredGrid::Update() {
-  if (!m_Content) return;
+void StructuredGrid::Update() {
+  if (!this->m_model) return;
 
   vtkProp3D* actor = vtkProp3D::SafeDownCast(this->GetProp());
   if (!actor) return;
@@ -76,20 +76,20 @@ void vtkStructuredGrid::Update() {
   Matrix4f transform = VtkToMatrix4f(vmat);
 
   // Update uLib model's affine transform
-  if (m_Content->GetParent()) {
-    Matrix4f localT = m_Content->GetParent()->GetWorldMatrix().inverse() * transform;
-    m_Content->SetMatrix(localT);
+  if (this->m_model->GetParent()) {
+    Matrix4f localT = this->m_model->GetParent()->GetWorldMatrix().inverse() * transform;
+    this->m_model->SetMatrix(localT);
   } else {
-    m_Content->SetMatrix(transform);
+    this->m_model->SetMatrix(transform);
   }
 
-  m_Content->Updated(); // Notify others (like raytracer)
+  this->m_model->Updated(); // Notify others (like raytracer)
 }
 
-void vtkStructuredGrid::InstallPipe() {
+void StructuredGrid::InstallPipe() {
   vtkSmartPointer<vtkCubeSource> cube = vtkSmartPointer<vtkCubeSource>::New();
  
-  Vector3i dims = m_Content->GetDims();
+  Vector3i dims = this->m_model->GetDims();
   cube->SetBounds(0, dims(0), 0, dims(1), 0, dims(2));
   cube->Update();
 
@@ -104,7 +104,7 @@ void vtkStructuredGrid::InstallPipe() {
   m_Actor->GetProperty()->SetAmbient(0.7);
 
   vtkNew<vtkMatrix4x4> vmat;
-  Matrix4fToVtk(m_Content->GetWorldMatrix(), vmat);
+  Matrix4fToVtk(this->m_model->GetWorldMatrix(), vmat);
   m_Actor->SetUserMatrix(vmat);
 
   this->SetProp(m_Actor);

src/Vtk/Math/vtkStructuredGrid.h

@@ -39,30 +39,34 @@
 #include <vtkTransform.h>
 #include <vtkTransformPolyDataFilter.h>
 
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 
+#include "Core/ObjectFactory.h"
 #include "Math/StructuredGrid.h"
 #include "Vtk/uLibVtkInterface.h"
 
 namespace uLib {
 namespace Vtk {
 
-class vtkStructuredGrid : public Puppet {
-  typedef StructuredGrid Content;
+class StructuredGrid : public Prop3D,
+                       public uLib::ObjectWrapper<uLib::StructuredGrid> {
+  typedef uLib::StructuredGrid Content;
 
 public:
-  vtkStructuredGrid(Content &content);
-  ~vtkStructuredGrid();
+  StructuredGrid(Content *content);
+  ~StructuredGrid();
 
   void SetTransform(class vtkTransform *t);
 
   virtual void Update() override;
+  uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
 private:
   void InstallPipe();
 
   vtkActor *m_Actor;
-  StructuredGrid *m_Content;
   vtkTransform *m_Transform;
 };
 

src/Vtk/Math/vtkTriangleMesh.cpp

@@ -42,14 +42,14 @@
 
 #include <vtkMatrix4x4.h>
 #include <vtkNew.h>
-#include "Math/vtkDense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/Math/vtkTriangleMesh.h"
 #include <iostream>
 
 namespace uLib {
 namespace Vtk {
 
-void vtkTriangleMesh::vtk2uLib_update() {
+void TriangleMesh::vtk2uLib_update() {
   vtkIdType number_of_points = m_Poly->GetNumberOfPoints();
   vtkIdType number_of_triangles = m_Poly->GetNumberOfPolys();
 
@@ -58,42 +58,42 @@ void vtkTriangleMesh::vtk2uLib_update() {
             << "number of polys  = " << number_of_triangles << "\n"
             << "//////\n";
 
-  m_content.Points().clear();
+  this->m_model->Points().clear();
   for (int i = 0; i < number_of_points; ++i) {
     double *point = m_Poly->GetPoint(i);
-    m_content.Points().push_back(Vector3f(point[0], point[1], point[2]));
+    this->m_model->Points().push_back(Vector3f(point[0], point[1], point[2]));
   }
 
-  m_content.Triangles().resize(number_of_triangles);
+  this->m_model->Triangles().resize(number_of_triangles);
   m_Poly->GetPolys()->InitTraversal();
   vtkSmartPointer<vtkIdList> idList = vtkSmartPointer<vtkIdList>::New();
   for (int i = 0; i < number_of_triangles; ++i) {
     m_Poly->GetPolys()->GetNextCell(idList);
-    m_content.Triangles()[i](0) = idList->GetId(0);
-    m_content.Triangles()[i](1) = idList->GetId(1);
-    m_content.Triangles()[i](2) = idList->GetId(2);
+    this->m_model->Triangles()[i](0) = idList->GetId(0);
+    this->m_model->Triangles()[i](1) = idList->GetId(1);
+    this->m_model->Triangles()[i](2) = idList->GetId(2);
   }
   m_Poly->Modified();
   m_Actor->GetMapper()->Update();
 }
 
-void vtkTriangleMesh::uLib2vtk_update() {
-  vtkIdType number_of_points = m_content.Points().size();
-  vtkIdType number_of_triangles = m_content.Triangles().size();
+void TriangleMesh::uLib2vtk_update() {
+  vtkIdType number_of_points = this->m_model->Points().size();
+  vtkIdType number_of_triangles = this->m_model->Triangles().size();
 
   vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
   points->SetNumberOfPoints(number_of_points);
   for (vtkIdType i = 0; i < number_of_points; i++) {
-    Vector3f p = m_content.Points().at(i);
+    Vector3f p = this->m_model->Points().at(i);
     points->SetPoint(i, p(0), p(1), p(2));
   }
 
   vtkSmartPointer<vtkCellArray> polys = vtkSmartPointer<vtkCellArray>::New();
   for (vtkIdType i = 0; i < number_of_triangles; i++) {
     vtkIdType a, b, c;
-    a = m_content.Triangles().at(i)(0);
-    b = m_content.Triangles().at(i)(1);
-    c = m_content.Triangles().at(i)(2);
+    a = this->m_model->Triangles().at(i)(0);
+    b = this->m_model->Triangles().at(i)(1);
+    c = this->m_model->Triangles().at(i)(2);
     polys->InsertNextCell(3);
     polys->InsertCellPoint(a);
     polys->InsertCellPoint(b);
@@ -105,7 +105,7 @@ void vtkTriangleMesh::uLib2vtk_update() {
   m_Poly->Modified();
 }
 
-void vtkTriangleMesh::contentUpdate() {
+void TriangleMesh::contentUpdate() {
   vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
   if (!vmat) {
     vtkNew<vtkMatrix4x4> mat;
@@ -113,50 +113,50 @@ void vtkTriangleMesh::contentUpdate() {
     vmat = mat;
   }
 
-  Matrix4f transform = m_content.GetWorldMatrix();
+  Matrix4f transform = this->m_model->GetWorldMatrix();
   Matrix4fToVtk(transform, vmat);
 
   uLib2vtk_update();
 
   m_Poly->Modified();
   m_Actor->GetMapper()->Update();
-  Puppet::Update();
+  Prop3D::Update();
 }
 
-void vtkTriangleMesh::Update() {
+void TriangleMesh::Update() {
   vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
   if (!vmat) return;
 
   Matrix4f transform = VtkToMatrix4f(vmat);
-  m_content.SetMatrix(transform);
-  m_content.Updated();
+  this->m_model->SetMatrix(transform);
+  this->m_model->Updated();
 }
 
 // -------------------------------------------------------------------------- //
 
-vtkTriangleMesh::vtkTriangleMesh(vtkTriangleMesh::Content &content)
-    : m_content(content), m_Poly(vtkPolyData::New()), m_Actor(vtkActor::New()) {
+TriangleMesh::TriangleMesh(TriangleMesh::Content *content)
+    : ObjectWrapper(content), m_Poly(vtkPolyData::New()), m_Actor(vtkActor::New()) {
   vtkSmartPointer<vtkPolyDataMapper> mapper =
       vtkSmartPointer<vtkPolyDataMapper>::New();
   mapper->SetInputData(m_Poly);
   m_Actor->SetMapper(mapper);
 
   vtkNew<vtkMatrix4x4> vmat;
-  Matrix4fToVtk(m_content.GetWorldMatrix(), vmat);
+  Matrix4fToVtk(this->m_model->GetWorldMatrix(), vmat);
   m_Actor->SetUserMatrix(vmat);
 
   this->SetProp(m_Actor);
-  Object::connect(&m_content, &Content::Updated, this, &vtkTriangleMesh::contentUpdate);
+  Object::connect(this->m_model.get(), &Content::Updated, this, &TriangleMesh::contentUpdate);
   this->contentUpdate();
 }
 
-vtkTriangleMesh::~vtkTriangleMesh() {
-  Object::disconnect(&m_content, &Content::Updated, this, &vtkTriangleMesh::contentUpdate);
+TriangleMesh::~TriangleMesh() {
+  Object::disconnect(this->m_model.get(), &Content::Updated, this, &TriangleMesh::contentUpdate);
   m_Poly->Delete();
   m_Actor->Delete();
 }
 
-void vtkTriangleMesh::ReadFromFile(const char *filename) {
+void TriangleMesh::ReadFromFile(const char *filename) {
   vtkSmartPointer<vtkPolyDataReader> reader =
       vtkSmartPointer<vtkPolyDataReader>::New();
   reader->SetFileName(filename);
@@ -165,7 +165,7 @@ void vtkTriangleMesh::ReadFromFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkTriangleMesh::ReadFromXMLFile(const char *filename) {
+void TriangleMesh::ReadFromXMLFile(const char *filename) {
   vtkSmartPointer<vtkXMLPolyDataReader> reader =
       vtkSmartPointer<vtkXMLPolyDataReader>::New();
   reader->SetFileName(filename);
@@ -174,7 +174,7 @@ void vtkTriangleMesh::ReadFromXMLFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkTriangleMesh::ReadFromObjFile(const char *filename) {
+void TriangleMesh::ReadFromObjFile(const char *filename) {
   vtkSmartPointer<vtkOBJReader> reader = vtkSmartPointer<vtkOBJReader>::New();
   reader->SetFileName(filename);
   reader->Update();
@@ -182,7 +182,7 @@ void vtkTriangleMesh::ReadFromObjFile(const char *filename) {
   vtk2uLib_update();
 }
 
-void vtkTriangleMesh::ReadFromStlFile(const char *filename) {
+void TriangleMesh::ReadFromStlFile(const char *filename) {
   vtkSmartPointer<vtkSTLReader> reader = vtkSmartPointer<vtkSTLReader>::New();
   reader->SetFileName(filename);
   reader->Update();
@@ -190,7 +190,7 @@ void vtkTriangleMesh::ReadFromStlFile(const char *filename) {
   vtk2uLib_update();
 }
 
-vtkPolyData *vtkTriangleMesh::GetPolyData() const { return m_Poly; }
+vtkPolyData *TriangleMesh::GetPolyData() const { return m_Poly; }
 
 } // namespace Vtk
 } // namespace uLib

src/Vtk/Math/vtkTriangleMesh.h

@@ -26,9 +26,10 @@
 #ifndef VTKTRIANGLEMESH_H
 #define VTKTRIANGLEMESH_H
 
+#include "Core/ObjectFactory.h"
 #include "Math/TriangleMesh.h"
-#include "Vtk/uLibVtkInterface.h"
 #include "Vtk/Math/vtkPolydata.h"
+#include "Vtk/uLibVtkInterface.h"
 
 class vtkPolyData;
 class vtkActor;
@@ -36,12 +37,14 @@ class vtkActor;
 namespace uLib {
 namespace Vtk {
 
-class vtkTriangleMesh : public Puppet, public Polydata {
-  typedef TriangleMesh Content;
+class TriangleMesh : public Prop3D,
+                     public Polydata,
+                     public uLib::ObjectWrapper<uLib::TriangleMesh> {
+  typedef uLib::TriangleMesh Content;
 
 public:
-  vtkTriangleMesh(Content &content);
-  ~vtkTriangleMesh();
+  TriangleMesh(Content *content);
+  ~TriangleMesh();
 
   void ReadFromFile(const char *filename);
 
@@ -56,12 +59,15 @@ public:
   virtual void contentUpdate();
 
   virtual void Update();
+  uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
 private:
   void vtk2uLib_update();
   void uLib2vtk_update();
 
-  TriangleMesh &m_content;
+  // ObjectWrapper provides m_model
   vtkPolyData *m_Poly;
   vtkActor *m_Actor;
 };

src/Vtk/Math/vtkVoxImage.cpp

@@ -60,14 +60,14 @@ VTK_MODULE_INIT(vtkInteractionStyle);
 namespace uLib {
 namespace Vtk {
 
-void vtkVoxImage::GetContent() {
-  Vector3i ev_dims = m_Content.GetDims();
+void VoxImage::UpdateFromContent() {
+  Vector3i ev_dims = this->m_model->GetDims();
   m_Image->SetDimensions(ev_dims.data());
 
-  Vector3f ev_spacing = m_Content.GetSpacing();
+  Vector3f ev_spacing = this->m_model->GetSpacing();
   m_Image->SetSpacing(ev_spacing(0), ev_spacing(1), ev_spacing(2));
 
-  Vector3f ev_pos = m_Content.GetPosition();
+  Vector3f ev_pos = this->m_model->GetPosition();
   m_Image->SetOrigin(ev_pos(0), ev_pos(1), ev_pos(2));
 
   vtkFloatArray *array =
@@ -78,29 +78,29 @@ void vtkVoxImage::GetContent() {
     array->Delete();
   }
 
-  array->SetNumberOfTuples(m_Content.GetDims().prod());
+  array->SetNumberOfTuples(this->m_model->GetDims().prod());
   Vector3i index(0, 0, 0);
   int i = 0;
   for (int zv = 0; zv < ev_dims(2); ++zv) {
     for (int yv = 0; yv < ev_dims(1); ++yv) {
       for (int xv = 0; xv < ev_dims(0); ++xv) {
         index << xv, yv, zv;
-        array->SetValue(i++, m_Content.GetValue(index));
+        array->SetValue(i++, this->m_model->GetValue(index));
       }
     }
   }
 }
 
-void vtkVoxImage::SetContent() {
+void VoxImage::UpdateToContent() {
   int *ext = m_Image->GetExtent();
   int dims[3] = {ext[1] - ext[0] + 1, ext[3] - ext[2] + 1, ext[5] - ext[4] + 1};
-  m_Content.SetDims(Vector3i(dims[0], dims[1], dims[2]));
+  this->m_model->SetDims(Vector3i(dims[0], dims[1], dims[2]));
 
   double *spacing = m_Image->GetSpacing();
-  m_Content.SetSpacing(Vector3f(spacing[0], spacing[1], spacing[2]));
+  this->m_model->SetSpacing(Vector3f(spacing[0], spacing[1], spacing[2]));
 
   double *pos = m_Image->GetOrigin();
-  m_Content.SetPosition(Vector3f(pos[0], pos[1], pos[2]));
+  this->m_model->SetPosition(Vector3f(pos[0], pos[1], pos[2]));
 
   vtkFloatArray *array =
       vtkFloatArray::SafeDownCast(m_Image->GetPointData()->GetScalars());
@@ -111,7 +111,7 @@ void vtkVoxImage::SetContent() {
       for (int yv = 0; yv < dims[1]; ++yv) {
         for (int xv = 0; xv < dims[0]; ++xv) {
           index << xv, yv, zv;
-          m_Content.SetValue(index, array->GetValue(i++));
+          this->m_model->SetValue(index, array->GetValue(i++));
         }
       }
     }
@@ -124,8 +124,8 @@ void vtkVoxImage::SetContent() {
 ////////////////////////////////////////////////////////////////////////////////
 // VTK VOXIMAGE
 
-vtkVoxImage::vtkVoxImage(Content &content)
-    : m_Content(content), m_Actor(vtkVolume::New()),
+VoxImage::VoxImage(Content *content)
+    : ObjectWrapper(content), m_Actor(vtkVolume::New()),
       m_Asm(vtkAssembly::New()),
       m_Image(vtkImageData::New()), m_Outline(vtkCubeSource::New()),
       m_OutlineActor(vtkActor::New()),
@@ -134,15 +134,15 @@ vtkVoxImage::vtkVoxImage(Content &content)
   // Transfer functions
   m_ColorFun = vtkColorTransferFunction::New();
   m_OpacityFun = vtkPiecewiseFunction::New();
-  m_UpdateConnection = Object::connect(&m_Content, &uLib::Object::Updated, this, &vtkVoxImage::Update);
+  m_UpdateConnection = Object::connect(this->m_model.get(), &uLib::Object::Updated, this, &VoxImage::Update);
   
-  GetContent();
+  UpdateFromContent();
   InstallPipe();
   RescaleShaderRange();
   ULIB_ACTIVATE_DISPLAY_PROPERTIES;
 }
 
-vtkVoxImage::~vtkVoxImage() {
+VoxImage::~VoxImage() {
   m_Image->Delete();
   m_Actor->Delete();
   m_Asm->Delete();
@@ -152,16 +152,16 @@ vtkVoxImage::~vtkVoxImage() {
   m_OpacityFun->Delete();
 }
 
-vtkImageData *vtkVoxImage::GetImageData() {
-  GetContent();
+vtkImageData *VoxImage::GetImageData() {
+  UpdateFromContent();
   return m_Image;
 }
 
-void vtkVoxImage::SaveToXMLFile(const char *fname) {
+void VoxImage::SaveToXMLFile(const char *fname) {
   vtkSmartPointer<vtkXMLImageDataWriter> writer =
       vtkSmartPointer<vtkXMLImageDataWriter>::New();
   writer->SetFileName(fname);
-  GetContent();
+  UpdateFromContent();
   vtkSmartPointer<vtkImageShiftScale> vtkscale =
       vtkSmartPointer<vtkImageShiftScale>::New();
 
@@ -177,7 +177,7 @@ void vtkVoxImage::SaveToXMLFile(const char *fname) {
   writer->Write();
 }
 
-void vtkVoxImage::ReadFromVKTFile(const char *fname) {
+void VoxImage::ReadFromVKTFile(const char *fname) {
   vtkSmartPointer<vtkGenericDataObjectReader> reader =
       vtkSmartPointer<vtkGenericDataObjectReader>::New();
   reader->SetFileName(fname);
@@ -190,7 +190,7 @@ void vtkVoxImage::ReadFromVKTFile(const char *fname) {
     vtkscale->Update();
 
     m_Image->DeepCopy(vtkscale->GetOutput());
-    SetContent();
+    UpdateToContent();
     RescaleShaderRange();
   } else {
     std::cerr << "Error: file does not contain structured points\n";
@@ -198,7 +198,7 @@ void vtkVoxImage::ReadFromVKTFile(const char *fname) {
   m_Actor->Update();
 }
 
-void vtkVoxImage::ReadFromXMLFile(const char *fname) {
+void VoxImage::ReadFromXMLFile(const char *fname) {
   vtkSmartPointer<vtkXMLImageDataReader> reader =
       vtkSmartPointer<vtkXMLImageDataReader>::New();
   reader->SetFileName(fname);
@@ -210,11 +210,11 @@ void vtkVoxImage::ReadFromXMLFile(const char *fname) {
   vtkscale->Update();
 
   m_Image->DeepCopy(vtkscale->GetOutput());
-  SetContent();
+  UpdateToContent();
   RescaleShaderRange();
 }
 
-void vtkVoxImage::setShadingPreset(int blendType) {
+void VoxImage::setShadingPreset(int blendType) {
   m_ShadingPreset = blendType;
   vtkSmartVolumeMapper *mapper = (vtkSmartVolumeMapper *)m_Actor->GetMapper();
   if (!mapper) return;
@@ -270,7 +270,7 @@ void vtkVoxImage::setShadingPreset(int blendType) {
   }
 }
 
-void vtkVoxImage::RescaleShaderRange() {
+void VoxImage::RescaleShaderRange() {
   double range[2];
   m_Image->GetScalarRange(range);
   m_Level = (range[0] + range[1]) / 2.0;
@@ -280,8 +280,8 @@ void vtkVoxImage::RescaleShaderRange() {
   setShadingPreset(m_ShadingPreset);
 }
 
-void vtkVoxImage::SetRepresentation(Representation mode) {
-  Puppet::SetRepresentation(mode); // Ensure base class data state is updated
+void VoxImage::SetRepresentation(Representation mode) {
+  Prop3D::SetRepresentation(mode); // Ensure base class data state is updated
 
   if (mode == Wireframe) {
     m_Actor->SetVisibility(0);
@@ -292,14 +292,14 @@ void vtkVoxImage::SetRepresentation(Representation mode) {
     m_OutlineActor->SetVisibility(1);
     m_OutlineActor->GetProperty()->SetRepresentationToWireframe();
   } else {
-    // Other representations (Points, Surface, etc) are handled by basic Puppet
+    // Other representations (Points, Surface, etc) are handled by basic Prop3D
     // behavior which affects the m_Asm parts.
   }
 }
 
-void vtkVoxImage::serialize_display(uLib::Archive::display_properties_archive & ar, const unsigned int version) {
+void VoxImage::serialize_display(uLib::Archive::display_properties_archive & ar, const unsigned int version) {
     // Call base class to show Transform and Appearance properties
-    // Puppet::serialize_display(ar, version);
+    // Prop3D::serialize_display(ar, version);
     
     // Use the member variables for volume rendering parameters
     ar & boost::serialization::make_hrp("Window", m_Window);
@@ -308,26 +308,26 @@ void vtkVoxImage::serialize_display(uLib::Archive::display_properties_archive &
       {"MIP", "Composite", "Composite Shaded", "MIP Bone", "MIP Hot", "Additive"});
 }
 
-void vtkVoxImage::SyncFromVtk() {
+void VoxImage::SyncFromVtk() {
   if (auto *root = this->GetProxyProp()) {
     vtkMatrix4x4 *rootMat = root->GetUserMatrix();
     if (rootMat) {
       Matrix4f vtkLocal = VtkToMatrix4f(rootMat);
       // Synchronize TRS from VTK, compensating for local volume offset
-      m_Content.FromMatrix(vtkLocal); // * m_Content.GetLocalMatrix().inverse());
-      m_Content.Updated();
+      this->m_model->FromMatrix(vtkLocal); // * this->m_model->GetLocalMatrix().inverse());
+      this->m_model->Updated();
     }
   }
 }
 
-void vtkVoxImage::Update() {
+void VoxImage::Update() {
   if (auto *root = vtkProp3D::SafeDownCast(this->GetProp())) {
     vtkNew<vtkMatrix4x4> m;
-    Matrix4fToVtk(m_Content.GetMatrix(), m); // * m_Content.GetLocalMatrix(), m);
+    Matrix4fToVtk(this->m_model->GetMatrix(), m); // * this->m_model->GetLocalMatrix(), m);
     root->SetUserMatrix(m);
     root->Modified();
-    // std::cout << "[vtkVoxImage::Update] Set Proxy UserMatrix:" << std::endl;
-    // std::cout << m_Content.GetMatrix() << std::endl;
+    // std::cout << "[VoxImage::Update] Set Proxy UserMatrix:" << std::endl;
+    // std::cout << this->m_model->GetMatrix() << std::endl;
   }
   setShadingPreset(m_ShadingPreset);
   m_Actor->Update();
@@ -335,11 +335,11 @@ void vtkVoxImage::Update() {
   m_Outline->Update();
 
   ConnectionBlock blocker(m_UpdateConnection);
-  this->Puppet::Update();
+  this->Prop3D::Update();
 }
 
 
-void vtkVoxImage::InstallPipe() {
+void VoxImage::InstallPipe() {
   vtkSmartPointer<vtkSmartVolumeMapper> mapper =
       vtkSmartPointer<vtkSmartVolumeMapper>::New();
 #if VTK_MAJOR_VERSION <= 5

src/Vtk/Math/vtkVoxImage.h

@@ -26,15 +26,16 @@
 #ifndef U_VTKVOXIMAGE_H
 #define U_VTKVOXIMAGE_H
 
+#include <vtkAssembly.h>
 #include <vtkCubeSource.h>
 #include <vtkImageData.h>
 #include <vtkVolume.h>
 #include <vtkXMLImageDataReader.h>
 #include <vtkXMLImageDataWriter.h>
-#include <vtkAssembly.h>
 
 #include <Math/VoxImage.h>
 
+#include "Core/ObjectFactory.h"
 #include "Vtk/uLibVtkInterface.h"
 
 class vtkImageData;
@@ -45,17 +46,21 @@ class vtkPiecewiseFunction;
 namespace uLib {
 namespace Vtk {
 
-class vtkVoxImage : public Puppet {
+class VoxImage : public Prop3D,
+                 public uLib::ObjectWrapper<uLib::Abstract::VoxImage> {
 public:
   typedef Abstract::VoxImage Content;
 
-  vtkVoxImage(Content &content);
+  VoxImage(Content *content);
 
-  ~vtkVoxImage();
+  ~VoxImage();
 
-  void GetContent();
+  void UpdateFromContent();
 
-  void SetContent();
+  void UpdateToContent();
+  uLib::Object *GetContent() const override {
+    return (uLib::Object *)m_model.get();
+  }
 
   vtkProp3D *GetProp() override { return m_Asm; }
 
@@ -73,7 +78,8 @@ public:
 
   void Update() override;
   void SyncFromVtk() override;
-  void serialize_display(uLib::Archive::display_properties_archive & ar, const unsigned int version = 0) override;
+  void serialize_display(uLib::Archive::display_properties_archive &ar,
+                         const unsigned int version = 0) override;
 
 protected:
   void InstallPipe();
@@ -89,7 +95,7 @@ private:
   vtkXMLImageDataReader *m_Reader;
   vtkXMLImageDataWriter *m_Writer;
 
-  vtkVoxImage::Content &m_Content;
+  // ObjectWrapper provides m_model
 
   float m_Window;
   float m_Level;

src/Vtk/testing/CMakeLists.txt

@@ -2,8 +2,8 @@
 set(TESTS
         vtkViewerTest
         vtkHandlerWidget
-        PuppetPropertyTest
-        PuppetParentingTest
+        Prop3DPropertyTest
+        Prop3DParentingTest
         vtkQViewportTest
         # vtkVoxImageTest
 #	vtkTriangleMeshTest

src/Vtk/testing/Prop3DParentingTest.cpp

@@ -26,14 +26,14 @@
 using namespace uLib;
 
 int main() {
-    BEGIN_TESTING(Puppet Parenting Test);
+    BEGIN_TESTING(Prop3D Parenting Test);
 
     ObjectsContext globalContext;
     Vtk::Viewer viewer;
     
     // Create the display context, linked to the model context.
-    // It will automatically create visual puppets for each model object.
-    Vtk::vtkObjectsContext viewerContext(&globalContext);
+    // It will automatically create visual prop3ds for each model object.
+    Vtk::ObjectsContext viewerContext(&globalContext);
     viewerContext.ConnectRenderer(viewer.GetRenderer());
 
     // 1. Create a model Assembly
@@ -41,12 +41,12 @@ int main() {
     assembly->SetInstanceName("ParentAssembly");
     globalContext.AddObject(assembly);
 
-    // Verify assembly puppet exists in the viewer context
-    Vtk::Puppet* assemblyPuppet = viewerContext.GetPuppet(assembly);
-    ASSERT_NOT_NULL(assemblyPuppet);
+    // Verify assembly prop3d exists in the viewer context
+    Vtk::Prop3D* assemblyProp3D = viewerContext.GetProp3D(assembly);
+    ASSERT_NOT_NULL(assemblyProp3D);
     
     // cast to Vtk::Assembly to access child context
-    auto* vtkAss = dynamic_cast<Vtk::Assembly*>(assemblyPuppet);
+    auto* vtkAss = dynamic_cast<Vtk::Assembly*>(assemblyProp3D);
     ASSERT_NOT_NULL(vtkAss);
 
     // 2. Create a child Box and add it to the Assembly
@@ -55,25 +55,25 @@ int main() {
     box1->SetPosition(Vector3f(20, 0, 0));
     assembly->AddObject(box1);
 
-    // Verify child puppet was created in the assembly's child context
-    Vtk::vtkObjectsContext* childVtkCtx = vtkAss->GetChildrenContext();
+    // Verify child prop3d was created in the assembly's child context
+    Vtk::ObjectsContext* childVtkCtx = vtkAss->GetChildrenContext();
     ASSERT_NOT_NULL(childVtkCtx);
     
-    Vtk::Puppet* box1Puppet = childVtkCtx->GetPuppet(box1);
-    ASSERT_NOT_NULL(box1Puppet);
+    Vtk::Prop3D* box1Prop3D = childVtkCtx->GetProp3D(box1);
+    ASSERT_NOT_NULL(box1Prop3D);
     
     // 3. Move the parent and verify the child follows
     assembly->SetPosition(Vector3f(100, 0, 0));
     assembly->Updated();
     
     // In VTK assemblies, the child's absolute matrix should reflect the parent's transform
-    vtkProp3D* box1Prop = vtkProp3D::SafeDownCast(box1Puppet->GetProp());
+    vtkProp3D* box1Prop = vtkProp3D::SafeDownCast(box1Prop3D->GetProp());
     ASSERT_NOT_NULL(box1Prop);
     
     vtkMatrix4x4* boxMatrix = box1Prop->GetMatrix();
     // Origin (0,0,0) + local(20,0,0) + assembly(100,0,0) = world(120,0,0) ?
     // Actually, box1->GetPosition() is (20,0,0).
-    // The puppet ApplyTransform sets the prop orientation and position.
+    // The prop3d ApplyTransform sets the prop orientation and position.
     
     std::cout << "Checking transformation chain..." << std::endl;
     // std::cout << *boxMatrix << std::endl;
@@ -93,8 +93,8 @@ int main() {
     box2->SetPosition(Vector3f(-20, 0, 0));
     assembly->AddObject(box2);
     
-    Vtk::Puppet* box2Puppet = childVtkCtx->GetPuppet(box2);
-    ASSERT_NOT_NULL(box2Puppet);
+    Vtk::Prop3D* box2Prop3D = childVtkCtx->GetProp3D(box2);
+    ASSERT_NOT_NULL(box2Prop3D);
 
     // Render if not in batch environment
     if (!std::getenv("CTEST_PROJECT_NAME")) {

src/Vtk/testing/Prop3DPropertyTest.cpp

@@ -19,13 +19,13 @@ using namespace uLib;
 using namespace Vtk;
 
 int main() {
-    BEGIN_TESTING(Puppet Property Registration Test);
+    BEGIN_TESTING(Prop3D Property Registration Test);
 
-    std::cout << "Creating Puppet object..." << std::endl;
-    Puppet p;
+    std::cout << "Creating Prop3D object..." << std::endl;
+    Prop3D p;
     
-    // At this point, the Puppet constructor has called ULIB_ACTIVATE_PROPERTIES.
-    // This should have discovered the members used in Puppet::serialize() 
+    // At this point, the Prop3D constructor has called ULIB_ACTIVATE_PROPERTIES.
+    // This should have discovered the members used in Prop3D::serialize() 
     // and registered them as uLib properties.
     
     const auto& props = p.GetProperties();
@@ -62,7 +62,7 @@ int main() {
     *colorRProp = 0.9;
     assert(colorRProp->Get() == 0.9);
 
-    std::cout << "All Puppet Property Registration Tests PASSED!" << std::endl;
+    std::cout << "All Prop3D Property Registration Tests PASSED!" << std::endl;
 
     END_TESTING;
 }

src/Vtk/testing/vtkHandlerWidget.cpp

@@ -23,7 +23,7 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-#include "Math/ContainerBox.h"
+#include "Vtk/Math/vtkContainerBox.h"
 #include "Vtk/uLibVtkViewer.h"
 #include "Vtk/Math/vtkContainerBox.h"
 #include "Vtk/vtkHandlerWidget.h"
@@ -39,7 +39,7 @@
 using namespace uLib;
 
 int main() {
-  BEGIN_TESTING(vtkHandlerWidget with ContainerBox);
+  BEGIN_TESTING(HandlerWidget with ContainerBox);
 
   // 1. Create a ContainerBox (Math object)
   ContainerBox box;
@@ -49,20 +49,20 @@ int main() {
   // 3. Setup the Viewer
   Vtk::Viewer viewer;
 
-  // 2. Wrap it in a Vtk::vtkContainerBox (Vtk Puppet)
-  Vtk::vtkContainerBox v_box(&box);
-  v_box.SetRepresentation(Vtk::Puppet::Surface);
+  // 2. Wrap it in a Vtk::ContainerBox (Vtk Prop3D)
+  Vtk::ContainerBox v_box(&box);
+  v_box.SetRepresentation(Vtk::Prop3D::Surface);
   v_box.SetOpacity(0.5);
 
-  viewer.AddPuppet(v_box);
+  viewer.AddProp3D(v_box);
 
-  // 4. Create and setup the vtkHandlerWidget
-  vtkSmartPointer<Vtk::vtkHandlerWidget> handler =
-      vtkSmartPointer<Vtk::vtkHandlerWidget>::New();
+  // 4. Create and setup the HandlerWidget
+  vtkSmartPointer<Vtk::HandlerWidget> handler =
+      vtkSmartPointer<Vtk::HandlerWidget>::New();
 
   handler->SetInteractor(viewer.GetInteractor());
 
-  // Get the prop from the puppet and cast it to vtkProp3D
+  // Get the prop from the prop3d and cast it to vtkProp3D
   vtkProp *v_prop = v_box.GetProp();
   vtkProp3D *prop = vtkProp3D::SafeDownCast(v_prop);
   if (!prop) {
@@ -83,20 +83,20 @@ int main() {
   auto key_callback = vtkSmartPointer<vtkCallbackCommand>::New();
   key_callback->SetCallback([](vtkObject *caller, unsigned long, void *clientData, void *) {
       auto interactor = static_cast<vtkRenderWindowInteractor *>(caller);
-      auto h = static_cast<Vtk::vtkHandlerWidget *>(clientData);
+      auto h = static_cast<Vtk::HandlerWidget *>(clientData);
       std::string key = interactor->GetKeySym();
       if (key == "g") {
           std::cout << "Switching to GLOBAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::vtkHandlerWidget::GLOBAL);
+          h->SetReferenceFrame(Vtk::HandlerWidget::GLOBAL);
       } else if (key == "l") {
           std::cout << "Switching to LOCAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::vtkHandlerWidget::LOCAL);
+          h->SetReferenceFrame(Vtk::HandlerWidget::LOCAL);
       } else if (key == "c") {
           std::cout << "Switching to CENTER frame" << std::endl;
-          h->SetReferenceFrame(Vtk::vtkHandlerWidget::CENTER);
+          h->SetReferenceFrame(Vtk::HandlerWidget::CENTER);
       } else if (key == "k") {
           std::cout << "Switching to CENTER_LOCAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::vtkHandlerWidget::CENTER_LOCAL);
+          h->SetReferenceFrame(Vtk::HandlerWidget::CENTER_LOCAL);
       }
   });
   key_callback->SetClientData(handler.GetPointer());

src/Vtk/uLibVtkInterface.cxx

@@ -63,7 +63,7 @@
 
 #include "uLibVtkInterface.h"
 #include "vtkHandlerWidget.h"
-#include "Math/Dense.h"
+#include "Vtk/Math/vtkDense.h"
 #include "Vtk/Math/vtkDense.h"
 #include "Core/Property.h"
 #include "Math/Transform.h"
@@ -80,15 +80,15 @@ namespace Vtk {
 
 // PIMPL -------------------------------------------------------------------- //
 
-class PuppetData {
+class Prop3DData {
 public:
-    PuppetData(Puppet* owner) :
-        m_Puppet(owner),
+    Prop3DData(Prop3D* owner) :
+        m_Prop3D(owner),
         m_Renderers(vtkSmartPointer<vtkRendererCollection>::New()),
         m_Prop(nullptr),
         m_ShowBoundingBox(false),
         m_ShowScaleMeasures(false),
-        m_Representation(Puppet::Surface),
+        m_Representation(Prop3D::Surface),
         m_Opacity(1.0),
         m_Selectable(true),
         m_Selected(false),
@@ -98,11 +98,12 @@ public:
         m_Color = Vector3d(-1, -1, -1);
     }
 
-    ~PuppetData() {
+    ~Prop3DData() {
         // No manual Delete needed for smart pointers
+
     }
 
-    Puppet *m_Puppet;
+    Prop3D *m_Prop3D;
     // members //
     vtkSmartPointer<vtkRendererCollection> m_Renderers;
     vtkSmartPointer<vtkProp3D>             m_Prop;
@@ -112,9 +113,10 @@ public:
     vtkSmartPointer<vtkCubeAxesActor>      m_CubeAxesActor;
     vtkSmartPointer<vtkActor>              m_HighlightActor;
 
+    // Display properties
     bool m_ShowBoundingBox;
     bool m_ShowScaleMeasures;
-    int m_Representation;
+    int  m_Representation; // 0: Points, 1: Wireframe, 2: Surface, 3: SurfaceWithEdges, 4: Volume, 5: Outline, 6: Slice
     Vector3d m_Color;
     double m_Opacity;
 
@@ -134,11 +136,11 @@ public:
 
         vtkActor *actor = vtkActor::SafeDownCast(p);
         if (actor) {
-            if (m_Representation != -1 && m_Representation != Puppet::Volume) {
-                if (m_Representation == Puppet::SurfaceWithEdges) {
+            if (m_Representation != -1 && m_Representation != Prop3D::Volume) {
+                if (m_Representation == Prop3D::SurfaceWithEdges) {
                     actor->GetProperty()->SetRepresentation(VTK_SURFACE);
                     actor->GetProperty()->SetEdgeVisibility(1);
-                } else if (m_Representation != Puppet::Outline && m_Representation != Puppet::Slice) {
+                } else if (m_Representation != Prop3D::Outline && m_Representation != Prop3D::Slice) {
                     actor->GetProperty()->SetRepresentation(m_Representation);
                     actor->GetProperty()->SetEdgeVisibility(0);
                 }
@@ -179,11 +181,10 @@ public:
 
     void UpdateHighlight() {
         if (m_Selected) {
-            // Find first polydata in assembly to highlight
             vtkPolyData* polydata = nullptr;
             if (vtkActor *actor = vtkActor::SafeDownCast(m_Prop)) {
                 if (actor->GetMapper()) {
-                    polydata = vtkPolyData::SafeDownCast(actor->GetMapper()->GetDataSetInput());
+                    polydata = vtkPolyData::SafeDownCast(actor->GetMapper()->GetInput());
                 }
             } else if (vtkAssembly *asm_p = vtkAssembly::SafeDownCast(m_Prop)) {
                 vtkPropCollection *parts = asm_p->GetParts();
@@ -192,7 +193,7 @@ public:
                     for (int i = 0; i < parts->GetNumberOfItems(); ++i) {
                         vtkActor *a = vtkActor::SafeDownCast(parts->GetNextProp());
                         if (a && a->GetMapper()) {
-                            polydata = vtkPolyData::SafeDownCast(a->GetMapper()->GetDataSetInput());
+                            polydata = vtkPolyData::SafeDownCast(a->GetMapper()->GetInput());
                             if (polydata) break;
                         }
                     }
@@ -247,8 +248,8 @@ public:
             }
 
             // Update highlight matrix from the model world matrix
-            if (m_Puppet) {
-                if (auto* content = m_Puppet->GetContent()) {
+            if (m_Prop3D) {
+                if (auto* content = m_Prop3D->GetContent()) {
                     if (auto* tr = dynamic_cast<uLib::TRS*>(content)) {
                         vtkNew<vtkMatrix4x4> vwm;
                         Matrix4fToVtk(tr->GetWorldMatrix(), vwm);
@@ -287,24 +288,24 @@ public:
 
 
 
-Puppet::Puppet() : Object(), pd(new PuppetData(this)) { 
+Prop3D::Prop3D() : Object(), pd(new Prop3DData(this)) { 
     ULIB_ACTIVATE_DISPLAY_PROPERTIES;
     for (auto* p : this->GetDisplayProperties()) {
-        uLib::Object::connect(p, &uLib::PropertyBase::Updated, this, &Puppet::Update);
+        uLib::Object::connect(p, &uLib::PropertyBase::Updated, this, &Prop3D::Update);
     }
 }
 
-Puppet::~Puppet()
+Prop3D::~Prop3D()
 {
     delete pd;
 }
 
-vtkProp *Puppet::GetProp()
+vtkProp *Prop3D::GetProp()
 {
     return pd->m_Prop;
 }
 
-vtkProp3D *Puppet::GetProxyProp()
+vtkProp3D *Prop3D::GetProxyProp()
 {
     // The handler should manipulate the highlight actor if it exists
     if (pd->m_HighlightActor) {
@@ -313,7 +314,7 @@ vtkProp3D *Puppet::GetProxyProp()
     return vtkProp3D::SafeDownCast(this->GetProp());
 }
 
-void Puppet::SetProp(vtkProp *prop)
+void Prop3D::SetProp(vtkProp *prop)
 {
     if(prop) {
         prop->SetPickable(pd->m_Selectable);
@@ -338,23 +339,23 @@ void Puppet::SetProp(vtkProp *prop)
     }
 }
 
-void Puppet::RemoveProp(vtkProp *prop)
+void Prop3D::RemoveProp(vtkProp *prop)
 {
     // TODO
 }
 
-void Puppet::ApplyAppearance(vtkProp* prop)
+void Prop3D::ApplyAppearance(vtkProp* prop)
 {
     pd->ApplyAppearance(prop);
 }
 
-void Puppet::ApplyTransform(vtkProp3D* p3d)
+void Prop3D::ApplyTransform(vtkProp3D* p3d)
 {
     pd->ApplyTransform(p3d);
 }
 
 
-vtkPropCollection *Puppet::GetParts()
+vtkPropCollection *Prop3D::GetParts()
 {
     if (auto* asm_p = vtkAssembly::SafeDownCast(pd->m_Prop)) {
         return asm_p->GetParts();
@@ -362,7 +363,7 @@ vtkPropCollection *Puppet::GetParts()
     return nullptr;
 }
 
-vtkPropCollection *Puppet::GetProps()
+vtkPropCollection *Prop3D::GetProps()
 {
     if (auto* asm_p = vtkAssembly::SafeDownCast(pd->m_Prop)) {
         return asm_p->GetParts();
@@ -370,7 +371,7 @@ vtkPropCollection *Puppet::GetProps()
     return nullptr;
 }
 
-void Puppet::ConnectRenderer(vtkRenderer *renderer)
+void Prop3D::ConnectRenderer(vtkRenderer *renderer)
 {
     if(renderer) {
         this->GetRenderers()->AddItem(renderer);
@@ -390,7 +391,7 @@ void Puppet::ConnectRenderer(vtkRenderer *renderer)
     }
 }
 
-void Puppet::DisconnectRenderer(vtkRenderer *renderer)
+void Prop3D::DisconnectRenderer(vtkRenderer *renderer)
 {
     if(renderer) {
         if(vtkProp* prop = this->GetProp())
@@ -403,22 +404,22 @@ void Puppet::DisconnectRenderer(vtkRenderer *renderer)
     }
 }
 
-void Puppet::AddToViewer(Viewport &viewer)
+void Prop3D::AddToViewer(Viewport &viewer)
 {
-    viewer.AddPuppet(*this);
+    viewer.AddProp3D(*this);
 }
 
-void Puppet::RemoveFromViewer(Viewport &viewer)
+void Prop3D::RemoveFromViewer(Viewport &viewer)
 {
-    viewer.RemovePuppet(*this);
+    viewer.RemoveProp3D(*this);
 }
 
-vtkRendererCollection *Puppet::GetRenderers() const
+vtkRendererCollection *Prop3D::GetRenderers() const
 {
     return pd->m_Renderers;
 }
 
-void Puppet::PrintSelf(std::ostream &o) const
+void Prop3D::PrintSelf(std::ostream &o) const
 {
     o << "Props Assembly: \n";
     if (pd->m_Prop)
@@ -428,7 +429,7 @@ void Puppet::PrintSelf(std::ostream &o) const
     pd->m_Renderers->PrintSelf(o,vtkIndent(1));
 }
 
-void Puppet::ShowBoundingBox(bool show)
+void Prop3D::ShowBoundingBox(bool show)
 {
     if (pd->m_ShowBoundingBox == show) return;
     pd->m_ShowBoundingBox = show;
@@ -464,7 +465,7 @@ void Puppet::ShowBoundingBox(bool show)
     }
 }
 
-void Puppet::ShowScaleMeasures(bool show)
+void Prop3D::ShowScaleMeasures(bool show)
 {
     if (pd->m_ShowScaleMeasures == show) return;
     pd->m_ShowScaleMeasures = show;
@@ -498,13 +499,13 @@ void Puppet::ShowScaleMeasures(bool show)
     }
 }
 
-void Puppet::SetRepresentation(Representation mode)
+void Prop3D::SetRepresentation(Representation mode)
 {
     pd->m_Representation = static_cast<int>(mode);
     pd->ApplyAppearance(pd->m_Prop);
 }
 
-void Puppet::SetRepresentation(const char *mode)
+void Prop3D::SetRepresentation(const char *mode)
 {
     std::string s(mode);
     if (s == "points") SetRepresentation(Points);
@@ -516,7 +517,7 @@ void Puppet::SetRepresentation(const char *mode)
     else if (s == "slice") SetRepresentation(Slice);
 }
 
-void Puppet::SetColor(double r, double g, double b)
+void Prop3D::SetColor(double r, double g, double b)
 {
     pd->m_Color[0] = r;
     pd->m_Color[1] = g;
@@ -524,7 +525,7 @@ void Puppet::SetColor(double r, double g, double b)
     pd->ApplyAppearance(pd->m_Prop);
 }
 
-void Puppet::SetOpacity(double alpha)
+void Prop3D::SetOpacity(double alpha)
 {
     pd->m_Opacity = alpha;
     pd->ApplyAppearance(pd->m_Prop);
@@ -536,18 +537,18 @@ void Puppet::SetOpacity(double alpha)
 
 
 
-void Puppet::SetSelectable(bool selectable)
+void Prop3D::SetSelectable(bool selectable)
 {
     pd->m_Selectable = selectable;
     pd->ApplyAppearance(pd->m_Prop);
 }
 
-bool Puppet::IsSelectable() const
+bool Prop3D::IsSelectable() const
 {
     return pd->m_Selectable;
 }
 
-void Puppet::SetSelected(bool selected)
+void Prop3D::SetSelected(bool selected)
 {
     if (!pd->m_Selectable) return;
     if (pd->m_Selected == selected) return;
@@ -555,33 +556,60 @@ void Puppet::SetSelected(bool selected)
     pd->UpdateHighlight();
 }
 
-bool Puppet::IsSelected() const
+bool Prop3D::IsSelected() const
 {
     return pd->m_Selected;
 }
 
-void Puppet::Update()
+void Prop3D::ApplyProp3DTransform(vtkProp3D* prop)
 {
-    // Derived classes should have updated the transform if they override Update()
-    // or we can apply base transform if it's default:
-    // pd->ApplyTransform(pd->m_Prop);
+    if (!prop) return;
+    if (auto* content = this->GetContent()) {
+        if (auto* tr = dynamic_cast<uLib::TRS*>(content)) {
+            vtkNew<vtkMatrix4x4> m;
+            Matrix4fToVtk(tr->GetMatrix(), m);
+            prop->SetUserMatrix(m);
+            prop->Modified();
+        }
+    }
+}
 
-    pd->ApplyAppearance(pd->m_Prop);
+void Prop3D::SyncFromVtk()
+{
+    if (auto* content = this->GetContent()) {
+        if (auto* tr = dynamic_cast<uLib::TRS*>(content)) {
+            if (auto* proxy = this->GetProxyProp()) {
+                if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
+                    tr->FromMatrix(VtkToMatrix4f(mat));
+                    content->Updated();
+                }
+            }
+        }
+    }
+}
+
+void Prop3D::Update()
+{
+    // Apply content transform via virtual GetProp() / ApplyProp3DTransform(),
+    // so all derived classes benefit without duplicating the matrix code.
+    this->ApplyProp3DTransform(vtkProp3D::SafeDownCast(this->GetProp()));
+
+    // Use virtual GetProp() for appearance so overriders (e.g. VoxImage)
+    // that never call SetProp() are handled correctly.
+    pd->ApplyAppearance(this->GetProp());
 
     if (pd->m_Selected) {
         pd->UpdateHighlight();
     }
 
-    if (pd->m_Prop) {
-        if (pd->m_ShowBoundingBox) {
-            double* bounds = pd->m_Prop->GetBounds();
+    if (auto* prop = this->GetProp()) {
+        if (pd->m_ShowBoundingBox && pd->m_OutlineSource) {
+            double* bounds = prop->GetBounds();
             pd->m_OutlineSource->SetBounds(bounds);
             pd->m_OutlineSource->Update();
         }
-        
-        if (pd->m_ShowScaleMeasures) {
-            double* bounds = pd->m_Prop->GetBounds();
-            pd->m_CubeAxesActor->SetBounds(bounds);
+        if (pd->m_ShowScaleMeasures && pd->m_CubeAxesActor) {
+            pd->m_CubeAxesActor->SetBounds(prop->GetBounds());
         }
     }
 
@@ -598,7 +626,7 @@ void Puppet::Update()
 }
 
 
-void Puppet::ConnectInteractor(vtkRenderWindowInteractor *interactor)
+void Prop3D::ConnectInteractor(vtkRenderWindowInteractor *interactor)
 {
 }
 
@@ -610,7 +638,7 @@ void Puppet::ConnectInteractor(vtkRenderWindowInteractor *interactor)
 
 
 struct TransformProxy {
-    PuppetData* pd;
+    Prop3DData* pd;
     template<class Archive>
     void serialize(Archive & ar, const unsigned int version) {
         ar & boost::serialization::make_nvp("Transform", pd->m_Transform);
@@ -618,7 +646,7 @@ struct TransformProxy {
 };
 
 struct AppearanceProxy {
-    PuppetData* pd;
+    Prop3DData* pd;
     template<class Archive>
     void serialize(Archive & ar, const unsigned int version) {
         ar & boost::serialization::make_hrp("Color", pd->m_Color, "color");
@@ -633,7 +661,7 @@ struct AppearanceProxy {
     }
 };
 
-void Puppet::serialize_display(Archive::display_properties_archive & ar, const unsigned int version) {
+void Prop3D::serialize_display(Archive::display_properties_archive & ar, const unsigned int version) {
     AppearanceProxy appearance{pd};
     ar & boost::serialization::make_nvp("Appearance", appearance);
     

src/Vtk/uLibVtkInterface.h

@@ -35,6 +35,8 @@
 #include <iomanip>
 #include <ostream>
 #include <vector>
+#include <set>
+#include <boost/type_traits/is_base_of.hpp>
 
 // vtk classes forward declaration //
 class vtkProp;
@@ -50,7 +52,7 @@ namespace Archive {
 class display_properties_archive;
 }
 namespace Vtk {
-class Puppet;
+class Prop3D;
 class Viewer;
 } // namespace Vtk
 } // namespace uLib
@@ -58,12 +60,13 @@ class Viewer;
 namespace uLib {
 namespace Vtk {
 
-class Puppet : public uLib::Object {
+class Prop3D : public uLib::Object {
 
-uLibTypeMacro(Puppet, uLib::Object)
+uLibTypeMacro(Prop3D, uLib::Object)
 
-    public : Puppet();
-  virtual ~Puppet();
+public:
+  Prop3D();
+  virtual ~Prop3D();
 
   virtual vtkProp *GetProp();
   virtual vtkProp3D *GetProxyProp();
@@ -106,7 +109,7 @@ uLibTypeMacro(Puppet, uLib::Object)
    * This method should be called when the VTK representation has been modified
    * (e.g., via a gizmo) and the changes need to be pushed back to the model.
    */
-  virtual void SyncFromVtk() {}
+  virtual void SyncFromVtk();
 
   enum Representation {
     Points = 0,
@@ -127,10 +130,10 @@ uLibTypeMacro(Puppet, uLib::Object)
 
   vtkRendererCollection *GetRenderers() const;
 
-  const std::vector<uLib::PropertyBase *> &GetDisplayProperties() const {
+  const std::vector<uLib::PropertyBase *> &GetDisplayProperties() const override {
     return m_DisplayProperties;
   }
-  void RegisterDisplayProperty(uLib::PropertyBase *prop) {
+  void RegisterDisplayProperty(uLib::PropertyBase *prop) override {
     m_DisplayProperties.push_back(prop);
   }
 
@@ -147,23 +150,28 @@ protected:
 
   void RemoveProp(vtkProp *prop);
 
-  void ApplyAppearance(vtkProp *prop);
-  void ApplyTransform(vtkProp3D *p3d);
+  virtual void ApplyAppearance(vtkProp *prop);
+  virtual void ApplyTransform(vtkProp3D *p3d);
+  virtual void ApplyProp3DTransform(vtkProp3D *p3d);
 
   std::vector<uLib::PropertyBase *> m_DisplayProperties;
   mutable uLib::RecursiveMutex m_UpdateMutex;
 
 private:
-  Puppet(const Puppet &) = delete;
-  Puppet &operator=(const Puppet &) = delete;
+  Prop3D(const Prop3D &) = delete;
+  Prop3D &operator=(const Prop3D &) = delete;
 
-  friend class PuppetData;
-  class PuppetData *pd;
+  friend class Prop3DData;
+  class Prop3DData *pd;
 };
 
 } // namespace Vtk
 } // namespace uLib
 
+
+
+
+
 // -------------------------------------------------------------------------- //
 // DISPLAY PROPERTIES SERIALIZE
 // -------------------------------------------------------------------------- //
@@ -173,16 +181,23 @@ namespace Archive {
 
 /**
  * @brief Specialized archive for registering display-only properties in
- * Puppets.
+ * Prop3Ds.
  */
 class display_properties_archive
     : public boost::archive::detail::common_oarchive<
           display_properties_archive> {
 public:
-  display_properties_archive(Vtk::Puppet *puppet)
+  friend class boost::archive::detail::interface_oarchive<display_properties_archive>;
+  friend class boost::archive::save_access;
+
+  using boost::archive::detail::common_oarchive<display_properties_archive>::save_override;
+  display_properties_archive(Vtk::Prop3D *p)
       : boost::archive::detail::common_oarchive<display_properties_archive>(
             boost::archive::no_header),
-        m_Puppet(puppet) {}
+        m_Prop3D(p) {
+    if (p)
+      m_Visited.insert(dynamic_cast<const void *>(p));
+  }
 
   std::string GetCurrentGroup() const {
     std::string group;
@@ -195,9 +210,9 @@ public:
   }
 
   template <class T> void save_override(const boost::serialization::hrp<T> &t) {
-    if (m_Puppet) {
+    if (m_Prop3D) {
       uLib::Property<T> *p = new uLib::Property<T>(
-          m_Puppet, t.name(),
+          m_Prop3D, t.name(),
           &const_cast<boost::serialization::hrp<T> &>(t).value(),
           t.units() ? t.units() : "", GetCurrentGroup());
       if (t.has_range())
@@ -205,24 +220,24 @@ public:
       if (t.has_default())
         p->SetDefault(t.default_val());
 
-      m_Puppet->RegisterDisplayProperty(p);
-      Vtk::Puppet *puppet = m_Puppet;
+      m_Prop3D->RegisterDisplayProperty(p);
+      Vtk::Prop3D *prop3d = m_Prop3D;
       uLib::Object::connect(p, &uLib::PropertyBase::Updated,
-                            [puppet]() { puppet->Update(); });
+                            [prop3d]() { prop3d->Update(); });
     }
   }
 
   template <class T>
   void save_override(const boost::serialization::hrp_enum<T> &t) {
-    if (m_Puppet) {
+    if (m_Prop3D) {
       uLib::EnumProperty *p = new uLib::EnumProperty(
-          m_Puppet, t.name(),
+          m_Prop3D, t.name(),
           (int *)&const_cast<boost::serialization::hrp_enum<T> &>(t).value(),
           t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
-      m_Puppet->RegisterDisplayProperty(p);
-      Vtk::Puppet *puppet = m_Puppet;
+      m_Prop3D->RegisterDisplayProperty(p);
+      Vtk::Prop3D *prop3d = m_Prop3D;
       uLib::Object::connect(p, &uLib::PropertyBase::Updated,
-                            [puppet]() { puppet->Update(); });
+                            [prop3d]() { prop3d->Update(); });
     }
   }
 
@@ -234,6 +249,24 @@ public:
       m_GroupStack.pop_back();
   }
 
+  // Follow pointers to discover properties in child objects
+  template<class T>
+  void save_override(T * const & t) {
+      if (!t) return;
+      this->save_pointer_helper(t, typename boost::is_base_of<uLib::Object, T>::type());
+  }
+
+  template<class T>
+  void save_pointer_helper(T* t, boost::mpl::true_) {
+      const void* ptr = dynamic_cast<const void*>(t);
+      if (m_Visited.find(ptr) != m_Visited.end()) return;
+      m_Visited.insert(ptr);
+      this->save_override(*t);
+  }
+
+  template<class T>
+  void save_pointer_helper(T* t, boost::mpl::false_) {}
+
   // Recursion for nested classes, ignore primitives
   template <class T> void save_override(const T &t) {
     this->save_helper(t, typename boost::is_class<T>::type());
@@ -243,6 +276,8 @@ public:
     boost::serialization::serialize_adl(*this, const_cast<T &>(t), 0);
   }
 
+  void save_helper(const std::string &t, boost::mpl::true_) {}
+
   template <class T> void save_helper(const T &t, boost::mpl::false_) {}
 
   void save_override(const boost::archive::object_id_type &t) {}
@@ -254,14 +289,30 @@ public:
   void save_override(const boost::archive::class_name_type &t) {}
   void save_override(const boost::archive::tracking_type &t) {}
 
+  // Called by Property<T>::serialize() and EnumProperty::serialize() to
+  // directly register an existing property object as a display property.
+  void register_property(uLib::PropertyBase &p) {
+    if (m_Prop3D) {
+      m_Prop3D->RegisterDisplayProperty(&p);
+      Vtk::Prop3D *prop3d = m_Prop3D;
+      uLib::Object::connect(&p, &uLib::PropertyBase::Updated,
+                            [prop3d]() { prop3d->Update(); });
+    }
+  }
+
+  void register_enum_property(uLib::EnumProperty &p) {
+    register_property(p);
+  }
+
 private:
-  Vtk::Puppet *m_Puppet;
+  Vtk::Prop3D *m_Prop3D;
   std::vector<std::string> m_GroupStack;
+  std::set<const void *> m_Visited;
 };
 
 } // namespace Archive
 
-// This macro MUST be defined after both Puppet and display_properties_archive
+// This macro MUST be defined after both Prop3D and display_properties_archive
 // are fully defined.
 #define ULIB_ACTIVATE_DISPLAY_PROPERTIES                                       \
   {                                                                            \

src/Vtk/vtkHandlerWidget.cpp

@@ -85,12 +85,12 @@ struct HandlerWidgetData {
   }
 };
 
-vtkStandardNewMacro(vtkHandlerWidget);
+vtkStandardNewMacro(HandlerWidget);
 
-vtkHandlerWidget::vtkHandlerWidget() : d(new HandlerWidgetData()) {
+HandlerWidget::HandlerWidget() : d(new HandlerWidgetData()) {
   this->Interaction = IDLE;
   d->m_Picker->SetTolerance(0.01); // Increased tolerance for thin gizmos
-  this->EventCallbackCommand->SetCallback(vtkHandlerWidget::ProcessEvents);
+  this->EventCallbackCommand->SetCallback(HandlerWidget::ProcessEvents);
   this->EventCallbackCommand->SetClientData(this);
   this->m_Frame = LOCAL;
   d->m_OverlayRenderer->SetLayer(1);
@@ -103,17 +103,17 @@ vtkHandlerWidget::vtkHandlerWidget() : d(new HandlerWidgetData()) {
   this->CreateGizmos();
 }
 
-vtkHandlerWidget::~vtkHandlerWidget() {
+HandlerWidget::~HandlerWidget() {
   this->SetEnabled(0);
   delete d;
 }
 
-::vtkRenderer *vtkHandlerWidget::GetOverlayRenderer() {
+::vtkRenderer *HandlerWidget::GetOverlayRenderer() {
   return d->m_OverlayRenderer;
 }
 
 
-void vtkHandlerWidget::SetProp3D(::vtkProp3D *prop) {
+void HandlerWidget::SetProp3D(::vtkProp3D *prop) {
   if (this->Prop3D == prop) {
     return;
   }
@@ -125,7 +125,7 @@ void vtkHandlerWidget::SetProp3D(::vtkProp3D *prop) {
   this->Modified();
 }
 
-void vtkHandlerWidget::SetEnabled(int enabling) {
+void HandlerWidget::SetEnabled(int enabling) {
   if (enabling) {
     if (this->Enabled)
       return;
@@ -210,15 +210,15 @@ void vtkHandlerWidget::SetEnabled(int enabling) {
   }
 }
 
-void vtkHandlerWidget::ProcessEvents(::vtkObject *caller, unsigned long event,
+void HandlerWidget::ProcessEvents(::vtkObject *caller, unsigned long event,
                                      void *clientdata, void *calldata) {
   (void)caller;
   (void)calldata;
-  vtkHandlerWidget *self = reinterpret_cast<vtkHandlerWidget *>(clientdata);
+  HandlerWidget *self = reinterpret_cast<HandlerWidget *>(clientdata);
   switch (event) {
   case ::vtkCommand::LeftButtonPressEvent:
     self->OnLeftButtonDown();
-    if (self->Interaction != ::uLib::Vtk::vtkHandlerWidget::IDLE)
+    if (self->Interaction != ::uLib::Vtk::HandlerWidget::IDLE)
       self->EventCallbackCommand->SetAbortFlag(1);
     break;
   case ::vtkCommand::LeftButtonReleaseEvent:
@@ -229,7 +229,7 @@ void vtkHandlerWidget::ProcessEvents(::vtkObject *caller, unsigned long event,
     break;
   case ::vtkCommand::MouseMoveEvent:
     self->OnMouseMove();
-    if (self->Interaction != ::uLib::Vtk::vtkHandlerWidget::IDLE)
+    if (self->Interaction != ::uLib::Vtk::HandlerWidget::IDLE)
       self->EventCallbackCommand->SetAbortFlag(1);
     break;
   case ::vtkCommand::RenderEvent:
@@ -241,7 +241,7 @@ void vtkHandlerWidget::ProcessEvents(::vtkObject *caller, unsigned long event,
   }
 }
 
-void vtkHandlerWidget::OnKeyPress() {
+void HandlerWidget::OnKeyPress() {
   std::string key = this->Interactor->GetKeySym();
   bool ctrl = (this->Interactor->GetControlKey() != 0);
   
@@ -268,7 +268,7 @@ void vtkHandlerWidget::OnKeyPress() {
   }
 }
 
-void vtkHandlerWidget::OnLeftButtonDown() {
+void HandlerWidget::OnLeftButtonDown() {
   int X = this->Interactor->GetEventPosition()[0];
   int Y = this->Interactor->GetEventPosition()[1];
 
@@ -322,7 +322,7 @@ void vtkHandlerWidget::OnLeftButtonDown() {
   }
 }
 
-void vtkHandlerWidget::OnLeftButtonUp() {
+void HandlerWidget::OnLeftButtonUp() {
   if (this->Interaction == IDLE)
     return;
 
@@ -332,7 +332,7 @@ void vtkHandlerWidget::OnLeftButtonUp() {
   this->Interactor->Render();
 }
 
-void vtkHandlerWidget::OnMouseMove() {
+void HandlerWidget::OnMouseMove() {
   if (!this->Prop3D || !this->CurrentRenderer)
     return;
 
@@ -564,37 +564,37 @@ void vtkHandlerWidget::OnMouseMove() {
   this->Interactor->Render();
 }
 
-void vtkHandlerWidget::SetReferenceFrame(ReferenceFrame frame) {
+void HandlerWidget::SetReferenceFrame(ReferenceFrame frame) {
   this->m_Frame = frame;
   this->UpdateGizmoPosition();
   if (this->Interactor)
     this->Interactor->Render();
 }
 
-void vtkHandlerWidget::PlaceWidget(double bounds[6]) {
+void HandlerWidget::PlaceWidget(double bounds[6]) {
   (void)bounds;
   this->UpdateGizmoPosition();
 }
 
-void vtkHandlerWidget::SetTranslationEnabled(bool enabled) {
+void HandlerWidget::SetTranslationEnabled(bool enabled) {
   this->m_TranslationEnabled = enabled;
   this->UpdateVisibility();
   if (this->Interactor) this->Interactor->Render();
 }
 
-void vtkHandlerWidget::SetRotationEnabled(bool enabled) {
+void HandlerWidget::SetRotationEnabled(bool enabled) {
   this->m_RotationEnabled = enabled;
   this->UpdateVisibility();
   if (this->Interactor) this->Interactor->Render();
 }
 
-void vtkHandlerWidget::SetScalingEnabled(bool enabled) {
+void HandlerWidget::SetScalingEnabled(bool enabled) {
   this->m_ScalingEnabled = enabled;
   this->UpdateVisibility();
   if (this->Interactor) this->Interactor->Render();
 }
 
-void vtkHandlerWidget::UpdateVisibility() {
+void HandlerWidget::UpdateVisibility() {
     if (!d->m_AxesX) return;
     
     d->m_AxesX->SetVisibility(m_TranslationEnabled);
@@ -633,22 +633,22 @@ void vtkHandlerWidget::UpdateVisibility() {
     }
 }
 
-void vtkHandlerWidget::PlaceWidget() { this->UpdateGizmoPosition(); }
+void HandlerWidget::PlaceWidget() { this->UpdateGizmoPosition(); }
 
-void vtkHandlerWidget::SetTransform(::vtkTransform *t) {
+void HandlerWidget::SetTransform(::vtkTransform *t) {
   if (!t || !this->Prop3D)
     return;
   this->Prop3D->SetUserMatrix(t->GetMatrix());
   this->UpdateGizmoPosition();
 }
 
-void vtkHandlerWidget::GetTransform(::vtkTransform *t) {
+void HandlerWidget::GetTransform(::vtkTransform *t) {
   if (!t || !this->Prop3D)
     return;
   t->SetMatrix(this->Prop3D->GetMatrix());
 }
 
-void vtkHandlerWidget::CreateGizmos() {
+void HandlerWidget::CreateGizmos() {
   auto create_arrow = [](double dir[3], double color[3]) {
     auto arrow = vtkSmartPointer<::vtkArrowSource>::New();
     arrow->SetTipLength(0.2);
@@ -756,7 +756,7 @@ void vtkHandlerWidget::CreateGizmos() {
   d->m_Picker->PickFromListOn();
 }
 
-void vtkHandlerWidget::UpdateGizmoPosition() {
+void HandlerWidget::UpdateGizmoPosition() {
   if (!this->Prop3D)
     return;
 
@@ -909,7 +909,7 @@ void vtkHandlerWidget::UpdateGizmoPosition() {
   }
 }
 
-void vtkHandlerWidget::Highlight(::vtkProp *prop) {
+void HandlerWidget::Highlight(::vtkProp *prop) {
   if (this->d->m_HighlightedProp == prop)
     return;