refactor: add override specifier to type_name method in Core/Types.h

Merges all work from andrea-geo branch:
- Geant material management classes
- Serialization enhancements (read-only, NVP/HRP macros)
- Transform/assembly system improvements
- VTK puppet/viewport updates (orthographic toggle, voxel rendering)
- Property grouping, dynamic properties, NotifyPropertiesUpdated
- Object type identification via uLibTypeMacro
- New tests (PropertyGrouping, ReadOnly, vtkQViewport, PuppetParenting)
- Various gcompose UI fixes

Conflict resolved in CMakePresets.json: kept both 'fast' (clang/lld)
and 'mutom' (stub) presets.

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

.agents/rules/context_exclude_vtk.md

@@ -1,9 +0,0 @@
----
-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

@@ -1,9 +0,0 @@
----
-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

@@ -1,9 +0,0 @@
----
-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

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

.agents/skills/micromamba_build.md

@@ -1,39 +0,0 @@
-# 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

@@ -18,5 +18,3 @@ test_props.xml
 test_props2.xml
 test_boost.cpp
 .claude/settings.json
-build_output.log
-configure_output.log

.vscode/gdb_wrapper.sh

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

.vscode/launch.json

@@ -1,31 +0,0 @@
-{
-    // 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

@@ -1,17 +0,0 @@
-{
-    "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,7 +10,7 @@ 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 uLib
+micromamba activate mutom
 
 # Configure (from repo root, using Conan preset — uses Ninja + ccache)
 cmake --preset conan-release
@@ -71,32 +71,32 @@ mutomCore  →  mutomMath  →  mutomDetectors  →  mutomGeant
 - `ObjectsContext` is a container owning a list of `Object*` pointers; signals `ObjectAdded`/`ObjectRemoved`
 
 ### VTK Layer (`src/Vtk/`)
-- `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.
+- `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.
 
 ### 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 `Prop3D::GetDisplayProperties()` (display-only mode).
+- `PropertyEditor`: populates widgets from `Object::GetProperties()` (all) or `Puppet::GetDisplayProperties()` (display-only mode).
 
 ### Selection Sync Flow
 ```
-Viewport click  →  Viewport::SelectProp3D()  →  QViewport::OnSelectionChanged()
-                →  emit prop3dSelected(p)
+Viewport click  →  Viewport::SelectPuppet()  →  QViewport::OnSelectionChanged()
+                →  emit puppetSelected(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->SelectProp3D(prop3d)  [visual selection in VTK]
-                →  MainPanel: firstPane->setObject(prop3d)  [updates Display Properties panel]
+                →  MainPanel: viewport->SelectPuppet(puppet)  [visual selection in VTK]
+                →  MainPanel: firstPane->setObject(puppet)  [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: `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.
+- **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.

CMakeLists.txt

@@ -15,32 +15,11 @@ if(POLICY CMP0167)
     cmake_policy(SET CMP0167 NEW)
 endif()
 
+
 ## -------------------------------------------------------------------------- ##
 
 project(uLib)
 
-option(ULIB_USE_CCACHE "Use ccache for build acceleration" ON)
-if(ULIB_USE_CCACHE)
-    find_program(CCACHE_PROGRAM ccache)
-    if(CCACHE_PROGRAM)
-        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
-        set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
-    endif()
-else()
-    set(CMAKE_CXX_COMPILER_LAUNCHER "")
-    set(CMAKE_C_COMPILER_LAUNCHER "")
-endif()
-
-# 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)
@@ -142,13 +121,8 @@ find_package(Boost 1.45.0 COMPONENTS program_options serialization unit_test_fra
 include_directories(${Boost_INCLUDE_DIRS})
 
 find_package(Eigen3 CONFIG REQUIRED)
-# if(NOT EIGEN3_INCLUDE_DIRS)
-#     get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
-# else()
-#     include_directories(${EIGEN3_INCLUDE_DIRS})
-# endif()
-
-find_package(OpenMP)
+get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
+include_directories(${EIGEN3_INCLUDE_DIRS})
 
 find_package(ROOT CONFIG REQUIRED)
 include(${ROOT_USE_FILE})
@@ -171,8 +145,6 @@ else()
                                 IOXML
                                 IOXMLParser
                                 ImagingCore
-                                ImagingHybrid
-                                ImagingSources
                                 InteractionStyle
                                 InteractionWidgets
                                 RenderingAnnotation

README.md

@@ -30,13 +30,13 @@ You can create and activate the environment using either `micromamba` or `conda`
 **Using Micromamba:**
 ```bash
 micromamba env create -f condaenv.yml
-micromamba activate uLib
+micromamba activate mutom
 ```
 
 **Using Conda:**
 ```bash
 conda env create -f condaenv.yml
-conda activate uLib
+conda activate mutom
 ```
 
 ### Configure and Build
@@ -65,24 +65,12 @@ cmake --preset conan-release
 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
+micromamba install -n mutom -y clang clangxx lld -c conda-forge
 ```
 
 Then build using the `fast` profile:
@@ -103,6 +91,6 @@ The `fast` profile is defined at `~/.conan2/profiles/fast` and sets:
 ### Make python package
 
 ```bash
-micromamba run -n uLib env USE_CUDA=ON poetry install
+micromamba run -n mutom 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::Prop3D* prop3d = nullptr;
+            uLib::Vtk::Puppet* puppet = nullptr;
             if (m_mainVtkContext) {
-                prop3d = m_mainVtkContext->GetProp3D(obj);
+                puppet = m_mainVtkContext->GetPuppet(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);
+            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);
         } 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->RemoveProp3D(*m_mainVtkContext);
+            viewport->RemovePuppet(*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::ObjectsContext(context);
-            // viewport->AddProp3D(*m_mainVtkContext); // redundant
+            m_mainVtkContext = new uLib::Vtk::vtkObjectsContext(context);
+            // viewport->AddPuppet(*m_mainVtkContext); // redundant
 
-            auto syncSelection = [this](uLib::Vtk::Prop3D* p) {
+            auto syncSelection = [this](uLib::Vtk::Puppet* 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::prop3dSelected, syncSelection);
+            connect(viewport, &uLib::Vtk::QViewport::puppetSelected, syncSelection);
 
-            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DAdded, [this](uLib::Vtk::Prop3D* p) {
+            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::vtkObjectsContext::PuppetAdded, [this](uLib::Vtk::Puppet* p) {
                 if (p) {
                     auto panes = this->findChildren<ViewportPane*>();
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->AddProp3D(*p);
+                            vp->AddPuppet(*p);
                             vp->ZoomAuto();
                             vp->Render();
                         }
@@ -151,25 +151,25 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
                 }
             });
 
-            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DRemoved, [this](uLib::Vtk::Prop3D* p) {
+            uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::vtkObjectsContext::PuppetRemoved, [this](uLib::Vtk::Puppet* p) {
                 if (p) {
                     auto panes = this->findChildren<ViewportPane*>();
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->RemoveProp3D(*p);
+                            vp->RemovePuppet(*p);
                             vp->Render();
                         }
                     }
                 }
             });
 
-            // Add any prop3ds that were created during m_mainVtkContext's construction to all panes
+            // Add any puppets 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->GetProp3D(obj)) {
+                if (auto* p = m_mainVtkContext->GetPuppet(obj)) {
                     for (auto* pane : panes) {
                         if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
-                            vp->AddProp3D(*p);
+                            vp->AddPuppet(*p);
                         }
                     }
                 }

app/gcompose/src/MainPanel.h

@@ -11,7 +11,7 @@ class PropertiesPanel;
 namespace uLib {
     class ObjectsContext;
     namespace Vtk {
-        class ObjectsContext;
+        class vtkObjectsContext;
     }
 }
 
@@ -40,7 +40,7 @@ private:
     ViewportPane* m_firstPane;
     ContextPanel* m_contextPanel;
     uLib::ObjectsContext* m_context;
-    uLib::Vtk::ObjectsContext* m_mainVtkContext;
+    uLib::Vtk::vtkObjectsContext* 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* prop3d = dynamic_cast<::uLib::Vtk::Prop3D*>(obj)) {
-            props = &prop3d->GetDisplayProperties();
+        if (auto* puppet = dynamic_cast<::uLib::Vtk::Puppet*>(obj)) {
+            props = &puppet->GetDisplayProperties();
         } else {
-            // If it's not a prop3d but displayOnly is requested, showing nothing or fallback?
+            // If it's not a puppet 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 prop3d and we want to highlight this feature?
+    // Auto-show panel if it's a puppet 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 prop3ds
-            for (auto* prop3d : currentVtk->getProp3Ds()) {
-                newVtk->AddProp3D(*prop3d);
+            // Copy puppets
+            for (auto* puppet : currentVtk->getPuppets()) {
+                newVtk->AddPuppet(*puppet);
             }
             // 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 Prop3D (meaning it has display properties)
-    bool isProp3D = (dynamic_cast<::uLib::Vtk::Prop3D*>(obj) != nullptr);
+    // Check if the object is a Puppet (meaning it has display properties)
+    bool isPuppet = (dynamic_cast<::uLib::Vtk::Puppet*>(obj) != nullptr);
     
-    // Only show the "Display" toggle button if it's a prop3d
-    m_toggleBtn->setVisible(isProp3D);
+    // Only show the "Display" toggle button if it's a puppet
+    m_toggleBtn->setVisible(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) {
+    // 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) {
         m_toggleBtn->setChecked(false);
         m_displayPanel->hide();
     }

conanfile.txt

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

condaenv.yml

@@ -1,4 +1,4 @@
-name: uLib
+name: mutom
 channels:
   - conda-forge
 dependencies:
@@ -7,15 +7,4 @@ dependencies:
   - cmake
   - conan
   - root
-  - 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
+  - vtk

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 Prop3D Transformation.
+This is the rationale behind the connection between TRS properties and Puppet 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 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.
+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.
 
-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.
+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.
 
 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 Prop3D
+## The Puppet
 
-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 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 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. 
+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. 
 
 
 

src/Core/Archives.h

@@ -80,9 +80,6 @@ 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
 
@@ -180,24 +177,6 @@ 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; }
 
@@ -211,21 +190,6 @@ 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); }
 
@@ -266,61 +230,11 @@ 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); }
 

src/Core/CMakeLists.txt

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

src/Core/Object.cpp

@@ -60,40 +60,17 @@ public:
     std::string slostr;
   };
   
-  ~ObjectPrivate() {
-    for (auto& s : sigv) delete s.signal;
-  }
-  
   std::string m_InstanceName;
   std::vector<Signal> sigv;
   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) {
-        for (auto* existing : d->m_DisplayProperties) {
-            if (existing == prop) return;
-            if (existing->GetName() == prop->GetName()) return;
-        }
-        d->m_DisplayProperties.push_back(prop);
-    }
-}
-
-const std::vector<PropertyBase*>& Object::GetDisplayProperties() const {
-    return d->m_DisplayProperties;
-}
-
 void Object::RegisterProperty(PropertyBase* prop) {
     if (prop) {
-        for (auto* existing : d->m_Properties) {
-            if (existing == prop) return;
-            if (existing->GetName() == prop->GetName()) return;
-        }
         d->m_Properties.push_back(prop);
     }
 }
@@ -119,19 +96,31 @@ PropertyBase* Object::GetProperty(const std::string& name) const {
     for (auto* p : d->m_DynamicProperties) {
         if (p->GetName() == name || p->GetQualifiedName() == name) return p;
     }
-    for (auto* p : d->m_DisplayProperties) {
-        if (p->GetName() == name || p->GetQualifiedName() == name) return p;
-    }
     return nullptr;
 }
 
 void Object::NotifyPropertiesUpdated() {
-    // Only notify properties in the primary list to avoid duplicates, 
-    // as all registered properties should be there.
     for (auto* p : d->m_Properties) p->Updated();
+    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) {}
+
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -164,9 +153,6 @@ Object::~Object() {
     for (auto* p : d->m_DynamicProperties) {
         delete p;
     }
-    for (auto* p : d->m_DisplayProperties) {
-        delete p;
-    }
     delete d;
 }
 

src/Core/Object.h

@@ -78,14 +78,13 @@ public:
   Object(const Object &copy);
   virtual ~Object();
 
-  virtual const char *GetClassName() const { return type_name(); }
-  virtual const char *type_name() const { return "Object"; }
+  virtual const char * GetClassName() const { return type_name(); }
+  virtual const char * type_name() const { return "Object"; }
 
-  const std::string &GetInstanceName() const;
-  void SetInstanceName(const std::string &name);
+  const std::string& GetInstanceName() const;
+  void SetInstanceName(const std::string& name);
   
-  /** @brief Temporarily blocks all signal emissions from this object. Returns
-   * previous state. */
+  /** @brief Temporarily blocks all signal emissions from this object. Returns previous state. */
   bool blockSignals(bool block);
   
   /** @brief Checks if signals are currently blocked. */
@@ -93,15 +92,12 @@ public:
 
   ////////////////////////////////////////////////////////////////////////////
   // PROPERTIES //
-  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;
+  void RegisterProperty(PropertyBase* prop);
+  void RegisterDynamicProperty(PropertyBase* prop);
+  const std::vector<PropertyBase*>& GetProperties() 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. */
+  /** @brief Sends an Updated signal for all properties of this object. useful for real-time UI refresh. */
   void NotifyPropertiesUpdated();
 
   ////////////////////////////////////////////////////////////////////////////
@@ -111,7 +107,7 @@ public:
   virtual void DeepCopy(const Object &copy);
 
   /** @brief Returns a nested context for children objects, if any. */
-  virtual ObjectsContext *GetChildren() { return nullptr; }
+  virtual ObjectsContext* GetChildren() { return nullptr; }
 
   ////////////////////////////////////////////////////////////////////////////
   // SERIALIZATION //
@@ -119,23 +115,16 @@ public:
   template <class ArchiveT>
   void serialize(ArchiveT &ar, const unsigned int version);
 
-  virtual void serialize(Archive::xml_oarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::xml_iarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::text_oarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::text_iarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::hrt_oarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::hrt_iarchive &ar,
-                         const unsigned int version) {}
-  virtual void serialize(Archive::log_archive &ar, const unsigned int version) {
-  }
+  virtual void serialize(Archive::xml_oarchive & ar, const unsigned int version) {}
+  virtual void serialize(Archive::xml_iarchive & ar, const unsigned int version) {}
+  virtual void serialize(Archive::text_oarchive & ar, const unsigned int version) {}
+  virtual void serialize(Archive::text_iarchive & ar, const unsigned int version) {}
+  virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int version) {}
+  virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int version) {}
+  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);
@@ -146,8 +135,9 @@ public:
   ////////////////////////////////////////////////////////////////////////////
   // SIGNALS //
 
-signals:
+  signals:
   virtual void Updated();
+  virtual void PropertyUpdated();
 
   // Qt4 style connector //
   static bool connect(const Object *ob1, const char *signal_name,
@@ -168,8 +158,8 @@ signals:
   connect(typename FunctionPointer<Func1>::Object *sender, Func1 sigf,
           typename FunctionPointer<Func2>::Object *receiver, Func2 slof) {
     SignalBase *sigb = sender->findOrAddSignal(sigf);
-    return ConnectSignal<typename FunctionPointer<Func1>::SignalSignature>(
-        sigb, slof, receiver);
+    return ConnectSignal<typename FunctionPointer<Func1>::SignalSignature>(sigb, slof,
+                                                                    receiver);
   }
 
   // Lambda/Function object connector //
@@ -191,10 +181,9 @@ signals:
   }
 
   template <typename FuncT>
-  static inline Connection connect(SignalBase *sigb, FuncT slof,
-                                   Object *receiver) {
-    return ConnectSignal<typename FunctionPointer<FuncT>::SignalSignature>(
-        sigb, slof, receiver);
+  static inline Connection connect(SignalBase *sigb, FuncT slof, Object *receiver) {
+    return ConnectSignal<typename FunctionPointer<FuncT>::SignalSignature>(sigb, slof,
+                                                                    receiver);
   }
 
   template <typename FuncT>

src/Core/ObjectFactory.h

@@ -1,31 +1,29 @@
 #ifndef U_CORE_OBJECTFACTORY_H
 #define U_CORE_OBJECTFACTORY_H
 
-#include "Core/Object.h"
-#include <functional>
-#include <map>
 #include <string>
-#include <type_traits>
+#include <map>
 #include <vector>
+#include <functional>
+#include "Core/Object.h"
 
 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:
-  typedef std::function<Object *()> FactoryFunction;
+    typedef std::function<Object*()> FactoryFunction;
 
     /** @brief Get the singleton instance. */
-  static ObjectFactory &Instance();
+    static ObjectFactory& Instance();
 
     /** @brief Register a factory function for a given class name. */
-  void Register(const std::string &className, FactoryFunction func);
+    void Register(const std::string& className, FactoryFunction func);
 
     /** @brief Create a new instance of the specified class. */
-  Object *Create(const std::string &className);
+    Object* Create(const std::string& className);
 
     /** @brief Get the names of all registered classes. */
     std::vector<std::string> GetRegisteredClasses() const;
@@ -35,8 +33,8 @@ private:
     ~ObjectFactory() = default;
 
     // Prevent copy and assignment
-  ObjectFactory(const ObjectFactory &) = delete;
-  ObjectFactory &operator=(const ObjectFactory &) = delete;
+    ObjectFactory(const ObjectFactory&) = delete;
+    ObjectFactory& operator=(const ObjectFactory&) = delete;
 
     std::map<std::string, FactoryFunction> m_factoryMap;
 };
@@ -44,11 +42,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(); });
+    ObjectRegistrar(const std::string& className) {
+        ObjectFactory::Instance().Register(className, []() -> Object* { return new T(); });
     }
 };
 
@@ -60,62 +58,10 @@ 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);
-
-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;
-};
+    static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(g_ObjectRegistrar_, __LINE__)(registeredName);
 
 } // namespace uLib
 

src/Core/Property.h

@@ -5,23 +5,19 @@
 #include <vector>
 #include <sstream>
 #include <typeinfo>
-#include <typeindex>
+#include <typeindex> // Added
 #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 <set>
-#include <boost/type_traits/is_base_of.hpp>
+#include <boost/serialization/serialization.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.
  */
@@ -31,7 +27,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;
+  virtual std::type_index GetTypeIndex() const = 0; // Added
   virtual const std::string& GetUnits() const = 0;
   virtual void SetUnits(const std::string& units) = 0;
   virtual const std::vector<std::string>& GetEnumLabels() const {
@@ -53,6 +49,9 @@ public:
       return GetGroup() + "." + GetName();
   }
 
+  // Signal support
+  signals:
+  virtual void Updated() override { ULIB_SIGNAL_EMIT(PropertyBase::Updated); }
 
   // Serialization support for different uLib archives
   virtual void serialize(Archive::xml_oarchive & ar, const unsigned int version) override = 0;
@@ -62,29 +61,42 @@ 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; }
@@ -95,19 +107,36 @@ 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 (...) { std::stringstream ss; ss << *m_value; return ss.str(); }
+      try {
+          return boost::lexical_cast<std::string>(*m_value);
+      } catch (const boost::bad_lexical_cast&) {
+          std::stringstream ss;
+          ss << *m_value;
+          return ss.str();
+      }
   }
 
   // Accessors
   const T& Get() const { return *m_value; }
-  void Set(const T& value) {
-    if (!m_value) return;
-    T val = value;
-    if constexpr (std::is_arithmetic<T>::value) {
-      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) {
+    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 (*m_value != val) {
       *m_value = val;
       ULIB_SIGNAL_EMIT(Property<T>::PropertyChanged);
@@ -121,54 +150,65 @@ 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; }
 
-  const T& GetMinTyped() const { return m_Min; }
-  const T& GetMaxTyped() const { return m_Max; }
+  virtual bool HasRange() const override { return m_HasRange; }
+
+  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>(); }
 
   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
+  // Operators for seamless usage
   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_helper(ArchiveT & ar, const unsigned int version) {
-    ar & boost::serialization::make_hrp(m_name.c_str(), *m_value, m_units.c_str());
+  void serialize_impl(ArchiveT & ar, const unsigned int version) {
+    ar & boost::serialization::make_nvp(m_name.c_str(), *m_value);
   }
 
-  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); }
+  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::property_register_archive & ar, const unsigned int v) override;
+  virtual void Updated() override {
+      PropertyBase::Updated();
+      this->PropertyChanged();
+  }
 
-
-protected:
+private:
   std::string m_name;
   std::string m_units;
   std::string m_group;
@@ -184,7 +224,20 @@ protected:
 };
 
 /**
- * @brief Property specialized for enumerations.
+ * @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.
  */
 class EnumProperty : public Property<int> {
 public:
@@ -195,49 +248,68 @@ 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
 
-class property_register_archive
-    : public boost::archive::detail::common_oarchive<property_register_archive> {
-protected:
+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>
+{
     Object* m_Object;
-    bool m_DisplayOnly;
 public:
     friend class boost::archive::detail::interface_oarchive<property_register_archive>;
     friend class boost::archive::save_access;
 
-    using boost::archive::detail::common_oarchive<property_register_archive>::save_override;
+    typedef boost::archive::detail::common_oarchive<property_register_archive> detail_common_oarchive;
 
-    property_register_archive(Object* obj, bool displayOnly = false) : 
+    property_register_archive(Object* obj) : 
         boost::archive::detail::common_oarchive<property_register_archive>(boost::archive::no_header),
-        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; }
+        m_Object(obj) {}
     
     std::string GetCurrentGroup() const {
         std::string group;
@@ -248,91 +320,77 @@ public:
         return group;
     }
 
-    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, &Object::Updated, [obj]() { obj->Updated(); });
-        } else {
-            m_Object->RegisterDynamicProperty(newP);
-        }
-    }
-
-    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) {
+    // 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, 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, &Object::Updated, [obj]() { obj->Updated(); });
-            } else {
+            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 save_override(const boost::serialization::hrp_val<T> &t) {
+        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());
+            m_Object->RegisterDynamicProperty(p);
+        }
     }
 
-    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) {
+    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());
-            if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &Object::Updated, [obj]() { obj->Updated(); }); }
-            else { m_Object->RegisterDynamicProperty(p); }
-        }
-    }
-    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());
-            if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &Object::Updated, [obj]() { obj->Updated(); }); }
-            else { m_Object->RegisterDynamicProperty(p); }
+            m_Object->RegisterDynamicProperty(p);
         }
     }
 
-    template<class T> void save_override(const boost::serialization::nvp<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);
+        }
+    }
+
+    // Handle standard NVPs by recursing (important for base classes)
+    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();
     }
 
-    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());
+    // 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());
     }
-    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::true_) {
+        boost::serialization::serialize_adl(*this, const_cast<T&>(t), 0);
+    }
+
+    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) {}
@@ -342,30 +400,30 @@ public:
     void save_override(const boost::archive::class_name_type & t) {}
     void save_override(const boost::archive::tracking_type & t) {}
 
-protected:
+private:
     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 { \
@@ -376,31 +434,6 @@ 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,249 +23,89 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
+
+
 #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;
 
-    /**
-     * @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(); 
-            }
-        }
+    explicit
+    SmartPointer(T* ptr = NULL) : m_counter(0) {
+        if(!ptr) ptr = new T;
         if (ptr) m_counter = new ReferenceCounter(ptr);
     }
 
-    /**
-     * @brief Constructor with custom deleter.
-     */
-    template <typename D>
-    SmartPointer(T* ptr, D deleter) : m_counter(nullptr) {
-        if (ptr) m_counter = new ReferenceCounter(ptr, deleter);
+    // TakeReference //
+    SmartPointer(T &ref) : m_counter(new ReferenceCounter(&ref,0)) { }
+
+    SmartPointer(const 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);
+    SmartPointer(SmartPointer * copy) throw () {
+        acquire(copy->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();  }
 
-    /**
-     * @brief Copy assignment.
-     */
-    SmartPointer& operator=(const SmartPointer& other) noexcept {
-        if (this != &other) {
+    SmartPointer & operator=(const SmartPointer& copy) {
+        if (this != &copy)
+        {
             release();
-            acquire(other.m_counter);
+            acquire(copy.m_counter);
         }
         return *this;
     }
 
-    /**
-     * @brief Move assignment.
-     */
-    SmartPointer& operator=(SmartPointer&& other) noexcept {
-        if (this != &other) {
-            release();
-            m_counter = other.m_counter;
-            other.m_counter = nullptr;
-        }
-        return *this;
-    }
+    T & operator*() const throw () {  return *m_counter->ptr; }
+    T * operator->() const throw () {  return m_counter->ptr; }
 
-    /**
-     * @brief Resets the smart pointer to hold a new raw pointer.
-     */
-    void reset(T* ptr = nullptr) {
-        release();
-        if (ptr) m_counter = new ReferenceCounter(ptr);
-    }
+    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 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);
-    }
+  private:
 
-    /**
-     * @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 {
+    struct ReferenceCounter
+    {
+      ReferenceCounter(T* ptr = 0, unsigned c = 1) : ptr(ptr), count(c) { }
       T*       ptr;
-        std::atomic<uint32_t> count;
-        std::function<void(T*)> deleter;
+      unsigned count;
+    } * m_counter;
 
-        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 {
+    // increment the count
+    void acquire(ReferenceCounter* c) throw ()
+    {
         m_counter = c;
-        if (c) {
-            c->count.fetch_add(1, std::memory_order_relaxed);
+        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;
+            }
         }
     }
 
-    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
+#endif // SMARTPOINTER_H

src/Core/Types.h

@@ -139,6 +139,7 @@ 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))

src/Core/testing/CMakeLists.txt

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

src/Core/testing/ObjectWrapperTest.cpp

@@ -1,28 +0,0 @@
-#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 != end;) {
+  for (it; 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 prop3d accordingly)
+  // Default orientation is identity (pointing along -Z if we rotate the puppet 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*) override;
+    virtual void GeneratePrimaries(G4Event*);         
 
     virtual void Updated() override { ULIB_SIGNAL_EMIT(EmitterPrimary::Updated); }
     
@@ -51,7 +51,7 @@ class SkyPlaneEmitterPrimary : public EmitterPrimary
     SkyPlaneEmitterPrimary();
     virtual ~SkyPlaneEmitterPrimary();
 
-    virtual void GeneratePrimaries(G4Event*) override;
+    virtual void GeneratePrimaries(G4Event*);
 
     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*) override;
+    virtual void GeneratePrimaries(G4Event*);
 
     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*) override;
+    virtual void GeneratePrimaries(G4Event*);
 
     void SetMesh(uLib::QuadMesh* mesh);
     

src/HEP/Geant/Solid.cpp

@@ -105,8 +105,6 @@ 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 prop3d.
+ * can be queried or shown/hidden through the VTK puppet.
  */
 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 prop3d).
+     * in the viewer (used by the VTK puppet).
      */
     void SetShowBoundingBox(bool show);
     bool GetShowBoundingBox() const;

src/Math/Dense.h

@@ -50,9 +50,9 @@
 // #include <Eigen/src/Core/Matrix.h>
 #include <stdlib.h>
 
-#include "Core/Property.h"
-#include "Core/Types.h"
 #include <Eigen/Dense>
+#include "Core/Types.h"
+#include "Core/Property.h"
 
 //// BOOST SERIALIZATION ///////////////////////////////////////////////////////
 
@@ -150,6 +150,7 @@ typedef Eigen::MatrixXi MatrixXi;
 typedef Eigen::MatrixXf MatrixXf;
 typedef Eigen::MatrixXd MatrixXd;
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // Vector String interaction ///////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -191,7 +192,7 @@ std::string VectorxT_ToString(const Eigen::Matrix<T, size, 1> &vec) {
 // }
 
 template <typename T, int size>
-void operator>>(std::string &str, Eigen::Matrix<T, size, 1> &vec) {
+void operator >> (std::string &str, Eigen::Matrix<T, size, 1> &vec) {
   VectorxT_StringTo(vec, str);
 }
 
@@ -204,7 +205,9 @@ public:
   typedef Eigen::Matrix<Scalarf, 4, 1> BaseClass;
 
   _HPoint3f() : BaseClass(0, 0, 0, p) {}
-  _HPoint3f(int rows, int cols) : BaseClass() { this->operator()(3) = p; }
+  _HPoint3f(int rows, int cols) : BaseClass() {
+    this->operator()(3) = p;
+  }
   _HPoint3f(float x, float y, float z) : BaseClass(x, y, z, p) {}
   _HPoint3f(Vector3f &in) : BaseClass(in.homogeneous()) {
     this->operator()(3) = p;
@@ -247,13 +250,13 @@ struct _HError3f {
   HVector3f position_error;
   HVector3f direction_error;
 };
-typedef struct _HError3f HError3f;
+  typedef struct _HError3f HError3f;
  
-inline std::ostream &operator<<(std::ostream &stream, const HError3f &err) {
+ inline std::ostream &operator<<(std::ostream &stream, const HError3f &err) {
    stream << "HError3f(" << "ept[" << err.position_error.transpose()
           << "] , edr[" << err.direction_error.transpose() << "]) ";
    return stream;
-}
+ }
  
 typedef Property<Scalari>   ScalariProperty;
 typedef Property<Scalarui>  ScalaruiProperty;
@@ -293,7 +296,7 @@ typedef Property<Matrix4d> Matrix4dProperty;
 typedef Property<HVector3f> HVector3fProperty;
 typedef Property<HPoint3f>  HPoint3fProperty;
 
-} // namespace uLib
+ } // namespace uLib
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

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/QuadMesh.h"
-#include "Math/StructuredData.h"
 #include "Math/TriangleMesh.h"
+#include "Math/QuadMesh.h"
 #include "Math/VoxImage.h"
+#include "Math/Assembly.h"
+#include "Math/StructuredData.h"
 
 namespace uLib {
 
@@ -14,6 +14,8 @@ 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/Math/Transform.h

@@ -23,6 +23,8 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
+
+
 /*
  * Copyright (C) 2012  Andrea Rigoni Garola <andrea.rigoni@pd.infn.it>
  *
@@ -43,66 +45,84 @@
  *
  */
 
+
 #ifndef U_TRANSFORM_H
 #define U_TRANSFORM_H
 
-#include "Math/Dense.h"
-#include "Math/Units.h"
 #include <Eigen/Geometry>
+#include "Math/Units.h"
+#include "Math/Dense.h"
+
 
 namespace uLib {
 
-using Eigen::Isometry3d;
+
+
 using Eigen::Isometry3f;
+using Eigen::Isometry3d;
 
-using Eigen::Affine3d;
 using Eigen::Affine3f;
+using Eigen::Affine3d;
 
-using Eigen::Projective3d;
 using Eigen::Projective3f;
+using Eigen::Projective3d;
+
+
+
+
+
+
 
 ////////////////////////////////////////////////////////////////////////////////
 /////////  AFFINE TRANSFORM  WRAPPER  //////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
+
+
 class AffineTransform : virtual public Object {
 public:
-uLibTypeMacro(AffineTransform, Object) protected :
+    uLibTypeMacro(AffineTransform, Object)
+protected:
 
     Affine3f  m_T;
     AffineTransform *m_Parent;
 
 public:
-  AffineTransform() : m_T(Matrix4f::Identity()), m_Parent(NULL) {}
+    AffineTransform() :
+        m_T(Matrix4f::Identity()),
+        m_Parent(NULL)
+    {}
 
-  AffineTransform(AffineTransform *parent)
-      : m_T(Matrix4f::Identity()), m_Parent(parent) {}
+    AffineTransform(AffineTransform *parent) :
+        m_T(Matrix4f::Identity()),
+        m_Parent(parent)
+    {}
 
-  AffineTransform(const AffineTransform &copy)
-      : m_T(copy.m_T), m_Parent(copy.m_Parent) {}
+    AffineTransform(const AffineTransform &copy) :
+        m_T(copy.m_T),
+        m_Parent(copy.m_Parent)
+    {}
 
-  Affine3f &GetTransform() { return m_T; }
+    Affine3f& GetTransform() { return m_T; }
 
     AffineTransform *GetParent() const { return this->m_Parent; }
 
     void SetParent(AffineTransform *name) { this->m_Parent = name; }
 
-  void SetMatrix(const Matrix4f &mat) { m_T.matrix() = mat; }
-  Matrix4f &GetMatrix() { return m_T.matrix(); }
-  const Matrix4f &GetMatrix() const { return m_T.matrix(); }
+    void SetMatrix (const Matrix4f &mat) { m_T.matrix() = mat; }
+    Matrix4f& GetMatrix () { return m_T.matrix(); }
+    const Matrix4f& GetMatrix () const { return m_T.matrix(); }
 
-  Matrix4f GetWorldMatrix() const {
-    if (!m_Parent)
-      return m_T.matrix();
-    else
-      return m_Parent->GetWorldMatrix() * m_T.matrix(); // T = B * A //
+    Matrix4f GetWorldMatrix() const
+    {
+        if(!m_Parent) return m_T.matrix();
+        else return  m_Parent->GetWorldMatrix() * m_T.matrix(); // T = B * A //
     }
 
-  void SetWorldMatrix(const Matrix4f &mat) {
-    if (!m_Parent)
-      m_T.matrix() = mat;
-    else
-      m_T.matrix() = m_Parent->GetWorldMatrix().inverse() * mat;
+    void SetWorldMatrix(const Matrix4f &mat)
+    {
+        if(!m_Parent) m_T.matrix() = mat;
+        else m_T.matrix() = m_Parent->GetWorldMatrix().inverse() * mat;
     }
 
     void SetPosition(const Vector3f &v) { this->m_T.translation() = v; }
@@ -123,40 +143,44 @@ public:
                         this->m_T.linear().col(2).norm());
     }
 
+
     void Rotate(const Matrix3f &m) { this->m_T.rotate(m); }
 
-  void Rotate(const float angle, Vector3f axis) {
+    void Rotate(const float angle, Vector3f axis)
+    {
         axis.normalize(); // prehaps not necessary ( see eigens )
-    Eigen::AngleAxisf ax(angle, axis);
+        Eigen::AngleAxisf ax(angle,axis);
         this->m_T.rotate(Eigen::Quaternion<float>(ax));
     }
 
     void Rotate(const Vector3f euler_axis) {
         float angle = euler_axis.norm();
-    Rotate(angle, euler_axis);
+        Rotate(angle,euler_axis);
     }
 
     void PreRotate(const Matrix3f &m) { this->m_T.prerotate(m); }
 
-  void QuaternionRotate(const Vector4f &q) {
-    this->m_T.rotate(Eigen::Quaternion<float>(q));
-  }
+    void QuaternionRotate(const Vector4f &q)
+    { this->m_T.rotate(Eigen::Quaternion<float>(q)); }
 
     void EulerYZYRotate(const Vector3f &e) {
         Matrix3f mat;
-    mat = Eigen::AngleAxisf(e.x(), Vector3f::UnitY()) *
-          Eigen::AngleAxisf(e.y(), Vector3f::UnitZ()) *
-          Eigen::AngleAxisf(e.z(), Vector3f::UnitY());
+        mat =     Eigen::AngleAxisf(e.x(), Vector3f::UnitY())
+                * Eigen::AngleAxisf(e.y(), Vector3f::UnitZ())
+                * Eigen::AngleAxisf(e.z(), Vector3f::UnitY());
         m_T.rotate(mat);
     }
 
-  void FlipAxes(int first, int second) {
+    void FlipAxes(int first, int second)
+    {
         Matrix3f mat = Matrix3f::Identity();
         mat.col(first).swap(mat.col(second));
         m_T.rotate(mat);
     }
 };
 
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /////////  TRS PARAMETERS  /////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -165,10 +189,11 @@ typedef Eigen::Affine3f AffineMatrix;
 
 class TRS : public AffineTransform {
 
-uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
+    uLibTypeMacro(TRS, AffineTransform)
+    ULIB_SERIALIZE_ACCESS
     // ULIB_DECLARE_PROPERTIES(TRS)
 
-    public :
+public:
 
     Vector3f position = Vector3f::Zero();
     Vector3f rotation = Vector3f::Zero();
@@ -176,27 +201,28 @@ uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
 
     TRS() = default;
 
-  TRS(const class AffineTransform &at) { this->FromMatrix(at.GetMatrix()); }
+    TRS(const class AffineTransform& at) {
+        this->FromMatrix(at.GetMatrix());
+    }
 
-  TRS(const Matrix4f &mat) { this->FromMatrix(mat); }
+    TRS(const Matrix4f& mat) {
+        this->FromMatrix(mat);
+    }
 
-  void FromMatrix(const Matrix4f &mat) {
-    this->position = mat.block<3, 1>(0, 3);
+    void FromMatrix(const Matrix4f& mat) {
+        this->position = mat.block<3,1>(0,3);
         
-    Matrix3f linear = mat.block<3, 3>(0, 0);
+        Matrix3f linear = mat.block<3,3>(0,0);
         this->scaling(0) = linear.col(0).norm();
         this->scaling(1) = linear.col(1).norm();
         this->scaling(2) = linear.col(2).norm();
         
         Matrix3f rot = linear;
-    if (this->scaling(0) > 1e-6)
-      rot.col(0) /= this->scaling(0);
-    if (this->scaling(1) > 1e-6)
-      rot.col(1) /= this->scaling(1);
-    if (this->scaling(2) > 1e-6)
-      rot.col(2) /= this->scaling(2);
+        if (this->scaling(0) > 1e-6) rot.col(0) /= this->scaling(0);
+        if (this->scaling(1) > 1e-6) rot.col(1) /= this->scaling(1);
+        if (this->scaling(2) > 1e-6) rot.col(2) /= this->scaling(2);
         
-    Vector3f euler = rot.canonicalEulerAngles(2, 1, 0);
+        Vector3f euler = rot.eulerAngles(2, 1, 0); 
         this->rotation = Vector3f(euler(2), euler(1), euler(0));
         
         this->SetMatrix(mat);
@@ -220,7 +246,9 @@ uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
         this->SyncMatrix(); 
     }
 
-  void SyncMatrix() { this->GetTransform() = GetAffineMatrix(); }
+    void SyncMatrix() {
+        this->GetTransform() = GetAffineMatrix();
+    }
 
     void Updated() override {
         this->SyncMatrix();
@@ -229,12 +257,13 @@ uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
     }
 
     template <class ArchiveT>
-  void serialize(ArchiveT &ar, const unsigned int version) {
-    ar &HRPU(position, "mm");
-    ar &HRPU(rotation, "rad");
-    ar &HRP(scaling);
+    void serialize(ArchiveT & ar, const unsigned int version) {
+        ar & HRPU(position, "mm");
+        ar & HRPU(rotation, "rad"); 
+        ar & HRP(scaling);
     }
     
+
     AffineMatrix GetAffineMatrix() const {
         AffineMatrix m = AffineMatrix::Identity();
         m.translate(position);
@@ -245,19 +274,31 @@ uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
         return m;
     }
 
-  Matrix4f GetMatrix() const { return this->GetAffineMatrix().matrix(); }
+    Matrix4f GetMatrix() const {
+        return this->GetAffineMatrix().matrix();
+    }
+
+
+    
+    
 };
 
-inline std::ostream &operator<<(std::ostream &os, const TRS &trs) {
+
+
+
+
+inline std::ostream& operator<<(std::ostream& os, const TRS& trs) {
     os << trs.position << " " << trs.rotation << " " << trs.scaling;
     return os;
 }
 
-inline std::istream &operator>>(std::istream &is, TRS &trs) {
+inline std::istream& operator>>(std::istream& is, TRS& trs) {
     is >> trs.position >> trs.rotation >> trs.scaling;
     return is;
 }
 
-} // namespace uLib
+} // uLib
 
-#endif // U_TRANSFORM_H
+
+
+#endif//U_TRANSFORM_H

src/Math/Units.h

@@ -13,41 +13,41 @@ namespace uLib {
   using namespace CLHEP;
 
   inline namespace literals {
-    constexpr double operator""_m(long double v) { return static_cast<double>(v) * CLHEP::meter; }
-    constexpr double operator""_cm(long double v) { return static_cast<double>(v) * CLHEP::centimeter; }
-    constexpr double operator""_mm(long double v) { return static_cast<double>(v) * CLHEP::millimeter; }
-    constexpr double operator""_um(long double v) { return static_cast<double>(v) * CLHEP::micrometer; }
-    constexpr double operator""_nm(long double v) { return static_cast<double>(v) * CLHEP::nanometer; }
-    constexpr double operator""_km(long double v) { return static_cast<double>(v) * CLHEP::kilometer; }
+    constexpr double operator"" _m(long double v) { return static_cast<double>(v) * CLHEP::meter; }
+    constexpr double operator"" _cm(long double v) { return static_cast<double>(v) * CLHEP::centimeter; }
+    constexpr double operator"" _mm(long double v) { return static_cast<double>(v) * CLHEP::millimeter; }
+    constexpr double operator"" _um(long double v) { return static_cast<double>(v) * CLHEP::micrometer; }
+    constexpr double operator"" _nm(long double v) { return static_cast<double>(v) * CLHEP::nanometer; }
+    constexpr double operator"" _km(long double v) { return static_cast<double>(v) * CLHEP::kilometer; }
 
-    constexpr double operator""_m(unsigned long long v) { return static_cast<double>(v) * CLHEP::meter; }
-    constexpr double operator""_cm(unsigned long long v) { return static_cast<double>(v) * CLHEP::centimeter; }
-    constexpr double operator""_mm(unsigned long long v) { return static_cast<double>(v) * CLHEP::millimeter; }
-    constexpr double operator""_um(unsigned long long v) { return static_cast<double>(v) * CLHEP::micrometer; }
-    constexpr double operator""_nm(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanometer; }
-    constexpr double operator""_km(unsigned long long v) { return static_cast<double>(v) * CLHEP::kilometer; }
+    constexpr double operator"" _m(unsigned long long v) { return static_cast<double>(v) * CLHEP::meter; }
+    constexpr double operator"" _cm(unsigned long long v) { return static_cast<double>(v) * CLHEP::centimeter; }
+    constexpr double operator"" _mm(unsigned long long v) { return static_cast<double>(v) * CLHEP::millimeter; }
+    constexpr double operator"" _um(unsigned long long v) { return static_cast<double>(v) * CLHEP::micrometer; }
+    constexpr double operator"" _nm(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanometer; }
+    constexpr double operator"" _km(unsigned long long v) { return static_cast<double>(v) * CLHEP::kilometer; }
 
-    constexpr double operator""_deg(long double v) { return static_cast<double>(v) * CLHEP::degree; }
-    constexpr double operator""_rad(long double v) { return static_cast<double>(v) * CLHEP::radian; }
-    constexpr double operator""_deg(unsigned long long v) { return static_cast<double>(v) * CLHEP::degree; }
-    constexpr double operator""_rad(unsigned long long v) { return static_cast<double>(v) * CLHEP::radian; }
+    constexpr double operator"" _deg(long double v) { return static_cast<double>(v) * CLHEP::degree; }
+    constexpr double operator"" _rad(long double v) { return static_cast<double>(v) * CLHEP::radian; }
+    constexpr double operator"" _deg(unsigned long long v) { return static_cast<double>(v) * CLHEP::degree; }
+    constexpr double operator"" _rad(unsigned long long v) { return static_cast<double>(v) * CLHEP::radian; }
 
-    constexpr double operator""_ns(long double v) { return static_cast<double>(v) * CLHEP::nanosecond; }
-    constexpr double operator""_s(long double v) { return static_cast<double>(v) * CLHEP::second; }
-    constexpr double operator""_ms(long double v) { return static_cast<double>(v) * CLHEP::millisecond; }
-    constexpr double operator""_ns(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanosecond; }
-    constexpr double operator""_s(unsigned long long v) { return static_cast<double>(v) * CLHEP::second; }
-    constexpr double operator""_ms(unsigned long long v) { return static_cast<double>(v) * CLHEP::millisecond; }
+    constexpr double operator"" _ns(long double v) { return static_cast<double>(v) * CLHEP::nanosecond; }
+    constexpr double operator"" _s(long double v) { return static_cast<double>(v) * CLHEP::second; }
+    constexpr double operator"" _ms(long double v) { return static_cast<double>(v) * CLHEP::millisecond; }
+    constexpr double operator"" _ns(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanosecond; }
+    constexpr double operator"" _s(unsigned long long v) { return static_cast<double>(v) * CLHEP::second; }
+    constexpr double operator"" _ms(unsigned long long v) { return static_cast<double>(v) * CLHEP::millisecond; }
 
-    constexpr double operator""_MeV(long double v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
-    constexpr double operator""_eV(long double v) { return static_cast<double>(v) * CLHEP::electronvolt; }
-    constexpr double operator""_keV(long double v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
-    constexpr double operator""_GeV(long double v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
-    constexpr double operator""_TeV(long double v) { return static_cast<double>(v) * CLHEP::teraelectronvolt; }
-    constexpr double operator""_MeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
-    constexpr double operator""_eV(unsigned long long v) { return static_cast<double>(v) * CLHEP::electronvolt; }
-    constexpr double operator""_keV(unsigned long long v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
-    constexpr double operator""_GeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
+    constexpr double operator"" _MeV(long double v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
+    constexpr double operator"" _eV(long double v) { return static_cast<double>(v) * CLHEP::electronvolt; }
+    constexpr double operator"" _keV(long double v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
+    constexpr double operator"" _GeV(long double v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
+    constexpr double operator"" _TeV(long double v) { return static_cast<double>(v) * CLHEP::teraelectronvolt; }
+    constexpr double operator"" _MeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
+    constexpr double operator"" _eV(unsigned long long v) { return static_cast<double>(v) * CLHEP::electronvolt; }
+    constexpr double operator"" _keV(unsigned long long v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
+    constexpr double operator"" _GeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
   }
 }
 

src/Root/CMakeLists.txt

@@ -33,11 +33,7 @@ set(DICTIONARY_HEADERS muCastorMCTrack.h
                        SkinDetectorWriter.h)
 
 set(LIBRARIES ${ROOT_LIBRARIES}
-              ${PACKAGE_LIBPREFIX}Math
-              Eigen3::Eigen)
-
-get_target_property(EIGEN3_INC Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
-include_directories(${EIGEN3_INC})
+              ${PACKAGE_LIBPREFIX}Math)
 
 set(rDictName ${PACKAGE_LIBPREFIX}RootDict)
 root_generate_dictionary(${rDictName} ${DICTIONARY_HEADERS}

src/Root/muCastorMCTrack.h

@@ -1,38 +1,41 @@
 #ifndef muCastor_MCTRACK_H
 #define muCastor_MCTRACK_H
 
-// ########################################
+//########################################
 // muCastorMCTrack class
 // Created at the University of Brescia, Italy
 // Date: December 2011
 // Autors: Germano Bonomi   germano.bonomi@ing.unibs.it 
 //         Martin Subieta   martin.subieta@ing.unibs.it
-// ########################################
+//########################################
 
-#include "Detectors/MuonScatter.h"
+#include <iostream>
+#include "vector"
 #include "TObject.h"
 #include "TParticle.h"
-#include "vector"
-#include <iostream>
+#include "Detectors/MuonScatter.h"
 
 class TClonesArray;
 
-class muCastorMCTrack : public TObject {
+class muCastorMCTrack : public TObject
+{
+
+ public:
 
-public:
   /**  Default constructor  **/
   muCastorMCTrack();
 
   /**  Constructor from TParticle  **/
-  muCastorMCTrack(TParticle *particle);
+  muCastorMCTrack(TParticle* particle);
 
   /**  Destructor  **/
   virtual ~muCastorMCTrack();
   void Reset();   
 
+
   /**  Accessors  **/
-  Int_t GetFirstDaughter() const { return fDaughter[0]; }
-  Int_t GetMother() const { return fMother[0]; }
+   Int_t          GetFirstDaughter()  const { return fDaughter[0];}
+   Int_t          GetMother()  const { return fMother[0];}
 
   /**  Modifiers  **/
    virtual void        AddPoint(TLorentzVector pos, TLorentzVector mom);
@@ -49,7 +52,8 @@ public:
    }
 
 public:
-  /* Private variables - copying private variables of TParticle */
+
+/* Private variables - copying private variables of TParticle */
 
   Int_t          fPdgCode;              // PDG code of the particle
   Int_t          fMother[2];            // Indices of the mother particles
@@ -76,9 +80,9 @@ public:
   Double_t      *fPntMomZ;     //[fNpoints] array of points (pz) belonging to this track
   Double_t      *fPntE;        //[fNpoints] array of points (E) belonging to this track
 
-  ClassDef(muCastorMCTrack, 1);
+  ClassDef(muCastorMCTrack,1);
+
 };
 
-uLib::MuonScatter &operator<<(uLib::MuonScatter &mu,
-                              const muCastorMCTrack &bsmu);
-#endif // muCastor_MCTRACK_H
+uLib::MuonScatter &operator << (uLib::MuonScatter &mu, const muCastorMCTrack &bsmu);
+#endif //muCastor_MCTRACK_H   

src/Vtk/CMakeLists.txt

@@ -37,8 +37,6 @@ 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)
@@ -58,7 +56,7 @@ set_target_properties(${libname} PROPERTIES
                        AUTOMOC ON
                        AUTOUIC ON
                        AUTORCC ON)
-target_link_libraries(${libname} PUBLIC ${LIBRARIES} Qt6::Widgets)
+target_link_libraries(${libname} ${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 "Vtk/HEP/Detectors/vtkDetectorChamber.h"
+#include "HEP/Detectors/DetectorChamber.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::DetectorChamber v_d1(&d1);
-  Vtk::DetectorChamber v_d2(&d2);
-  v_d1.SetRepresentation(Vtk::Prop3D::Surface);
-  v_d2.SetRepresentation(Vtk::Prop3D::Surface);
+  Vtk::vtkDetectorChamber v_d1(&d1);
+  Vtk::vtkDetectorChamber v_d2(&d2);
+  v_d1.SetRepresentation(Vtk::Puppet::Surface);
+  v_d2.SetRepresentation(Vtk::Puppet::Surface);
 
   if (!v_d1.GetProp()) {
-    BOOST_FAIL("DetectorChamber::GetProp() returned NULL");
+    BOOST_FAIL("vtkDetectorChamber::GetProp() returned NULL");
   }
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
     viewer.SetGridAxis(Vtk::Viewport::Y);
-    viewer.AddProp3D(v_d1);
-    viewer.AddProp3D(v_d2);
+    viewer.AddPuppet(v_d1);
+    viewer.AddPuppet(v_d2);
     viewer.Start();
   }
 

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

@@ -23,8 +23,8 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-#include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
-#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
+#include "HEP/Detectors/DetectorChamber.h"
+#include "HEP/Detectors/MuonScatter.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 prop3d class to represent an arrow indicative of a projected muon hit
-class vtkArrowProp3D : public Vtk::Prop3D {
+// A simple puppet class to represent an arrow indicative of a projected muon hit
+class vtkArrowPuppet : public Vtk::Puppet {
 public:
-  vtkArrowProp3D() : m_Actor(vtkActor::New()) {
+  vtkArrowPuppet() : 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 ~vtkArrowProp3D() { m_Actor->Delete(); }
+  virtual ~vtkArrowPuppet() { 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::DetectorChamber v_d1(&d1);
-  Vtk::DetectorChamber v_d2(&d2);
-  Vtk::MuonScatter v_event(event);
+  Vtk::vtkDetectorChamber v_d1(&d1);
+  Vtk::vtkDetectorChamber v_d2(&d2);
+  Vtk::vtkMuonScatter v_event(event);
   v_event.AddPocaPoint(HPoint3f(0, 0, 0));
   v_event.SetColor(1, 0, 0); // Red muon event
 
-  v_d1.SetRepresentation(Vtk::Prop3D::Surface);
+  v_d1.SetRepresentation(Vtk::Puppet::Surface);
   v_d1.SetOpacity(0.3);
-  v_d2.SetRepresentation(Vtk::Prop3D::Surface);
+  v_d2.SetRepresentation(Vtk::Puppet::Surface);
   v_d2.SetOpacity(0.3);
 
   // 5. Add two arrows to mark where the projection is located on the chambers
-  vtkArrowProp3D v_p1, v_p2;
+  vtkArrowPuppet 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.AddProp3D(v_d1);
-    viewer.AddProp3D(v_d2);
-    viewer.AddProp3D(v_event);
-    viewer.AddProp3D(v_p1);
-    viewer.AddProp3D(v_p2);
+    viewer.AddPuppet(v_d1);
+    viewer.AddPuppet(v_d2);
+    viewer.AddPuppet(v_event);
+    viewer.AddPuppet(v_p1);
+    viewer.AddPuppet(v_p2);
     viewer.Start();
   }
 

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

@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/HEP/Detectors/vtkMuonScatter.h"
-#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
+#include "HEP/Detectors/MuonScatter.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::MuonScatter v_event(event);
+  Vtk::vtkMuonScatter 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::MuonScatter> tms;
+    //    Vtk::Tie<Vtk::vtkMuonScatter> tms;
     //    tms.DoAction();
     //    Vtk::Tie<Vtk::Viewer> vms;
     //    vms.DoAction();
 
-    viewer.AddProp3D(v_event);
+    viewer.AddPuppet(v_event);
     viewer.Start();
   }
 

src/Vtk/HEP/Detectors/vtkDetectorChamber.cxx

@@ -48,8 +48,8 @@
 namespace uLib {
 namespace Vtk {
 
-DetectorChamber::DetectorChamber(uLib::DetectorChamber *content)
-    : ContainerBox(content) {
+vtkDetectorChamber::vtkDetectorChamber(DetectorChamber *content)
+    : vtkContainerBox(content) {
   m_PlaneSource = vtkPlaneSource::New();
   
   vtkNew<vtkPolyDataMapper> mapper;
@@ -67,20 +67,20 @@ DetectorChamber::DetectorChamber(uLib::DetectorChamber *content)
   this->Update();
 }
 
-DetectorChamber::~DetectorChamber() {
+vtkDetectorChamber::~vtkDetectorChamber() {
   m_PlaneSource->Delete();
   m_PlaneActor->Delete();
 }
 
-DetectorChamber::Content *DetectorChamber::GetContent() const {
-  return static_cast<Content *>(this->m_model.get());
+DetectorChamber *vtkDetectorChamber::GetContent() {
+  return static_cast<DetectorChamber *>(m_Content);
 }
 
-void DetectorChamber::Update() {
+void vtkDetectorChamber::Update() {
   this->BaseClass::Update();
 
-  if (!this->m_model) return;
-  Content *c = this->GetContent();
+  if (!m_Content) return;
+  DetectorChamber *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 "Vtk/Math/vtkDense.h"
+#include "Math/Dense.h"
 #include "Vtk/uLibVtkInterface.h"
 #include "Vtk/Math/vtkContainerBox.h"
 #include <vtkActor.h>
@@ -44,17 +44,17 @@ class vtkPlaneSource;
 namespace uLib {
 namespace Vtk {
 
-// class HandlerWidget; // Removed as we use vtkBoxWidget now
+// class vtkHandlerWidget; // Removed as we use vtkBoxWidget now
 
-class DetectorChamber : public ContainerBox {
-  typedef uLib::DetectorChamber Content;
-  typedef ContainerBox BaseClass;
+class vtkDetectorChamber : public vtkContainerBox {
+  typedef DetectorChamber Content;
+  typedef vtkContainerBox BaseClass;
 
 public:
-  DetectorChamber(uLib::DetectorChamber *content);
-  virtual ~DetectorChamber();
+  vtkDetectorChamber(DetectorChamber *content);
+  virtual ~vtkDetectorChamber();
 
-  Content *GetContent() const override;
+  Content *GetContent();
 
   virtual void Update() override;
 

src/Vtk/HEP/Detectors/vtkMuonEvent.cxx

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "Vtk/Math/vtkDense.h"
+#include "Math/Dense.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::MuonEvent *parent) { this->parent = parent; }
+  void SetParent(uLib::Vtk::vtkMuonEvent *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::MuonEvent *parent;
+  uLib::Vtk::vtkMuonEvent *parent;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 /////  VTK MUON EVENT  /////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-MuonEvent::MuonEvent(MuonEventData &content)
+vtkMuonEvent::vtkMuonEvent(MuonEventData &content)
     : m_PolyData(NULL), m_Appender(vtkAppendPolyData::New()),
       content(&content) {
   InstallPipe();
 }
 
-MuonEvent::MuonEvent(const MuonEventData &content)
+vtkMuonEvent::vtkMuonEvent(const MuonEventData &content)
     : m_PolyData(NULL), m_Appender(vtkAppendPolyData::New()),
       content(const_cast<MuonEventData *>(&content)) {
   InstallPipe();
 }
 
-MuonEvent::~MuonEvent() {}
+vtkMuonEvent::~vtkMuonEvent() {}
 
-MuonEventData &MuonEvent::GetModel() { return *content; }
+vtkMuonEvent::Content &vtkMuonEvent::GetContent() { return *content; }
 
-void MuonEvent::PrintSelf(std::ostream &o) const {
+void vtkMuonEvent::PrintSelf(std::ostream &o) const {
   o << "..:: MuonEvent ::..\n"
        "\t[in]  Origin    > "
     << content->LineIn().origin.transpose() << "\n"
@@ -83,7 +83,7 @@ void MuonEvent::PrintSelf(std::ostream &o) const {
     << "...................\n";
 }
 
-void MuonEvent::InstallPipe() {
+void vtkMuonEvent::InstallPipe() {
 
   vtkAppendPolyData *appender = m_Appender;
   vtkSmartPointer<vtkPolyDataMapper> mapper =
@@ -121,11 +121,11 @@ void MuonEvent::InstallPipe() {
   this->SetProp(actor);
 }
 
-vtkPolyData *MuonEvent::GetPolyData() const {
+vtkPolyData *vtkMuonEvent::GetPolyData() const {
   return m_Appender->GetOutput();
 }
 
-void MuonEvent::AddPocaPoint(HPoint3f poca) {
+void vtkMuonEvent::AddPocaPoint(HPoint3f poca) {
   m_Poca = poca;
   vtkSmartPointer<vtkSphereSource> sphere =
       vtkSmartPointer<vtkSphereSource>::New();
@@ -139,8 +139,7 @@ void MuonEvent::AddPocaPoint(HPoint3f poca) {
   m_Appender->Update();
 }
 
-HPoint3f MuonEvent::GetPocaPoint() { return m_Poca; }
+HPoint3f vtkMuonEvent::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 "Vtk/Math/vtkDense.h"
+#include "Math/Dense.h"
 
 #include "HEP/Detectors/MuonEvent.h"
 #include "Vtk/uLibVtkInterface.h"
@@ -50,20 +50,19 @@
 namespace uLib {
 namespace Vtk {
 
-class MuonEvent : public Prop3D, public Polydata {
+class vtkMuonEvent : public Puppet, public Polydata {
   typedef MuonEventData Content;
 
 public:
-  MuonEvent(const MuonEventData &content);
-  MuonEvent(MuonEventData &content);
-  ~MuonEvent();
+  vtkMuonEvent(const MuonEventData &content);
+  vtkMuonEvent(MuonEventData &content);
+  ~vtkMuonEvent();
 
-  Content &GetModel();
-  uLib::Object* GetContent() const override;
+  Content &GetContent();
 
-  void PrintSelf(std::ostream &o) const override;
+  void PrintSelf(std::ostream &o) const;
 
-  vtkPolyData *GetPolyData() const override;
+  virtual vtkPolyData *GetPolyData() const;
 
   void AddPocaPoint(HPoint3f poca);
 
@@ -74,7 +73,7 @@ public:
 private:
   void InstallPipe();
 
-  MuonEvent::Content *content;
+  vtkMuonEvent::Content *content;
   vtkPolyData *m_PolyData;
 
   vtkAppendPolyData *m_Appender;

src/Vtk/HEP/Detectors/vtkMuonScatter.cxx

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

src/Vtk/HEP/Detectors/vtkMuonScatter.h

@@ -43,7 +43,7 @@
 #include <vtkCommand.h>
 #include <vtkTransform.h>
 
-#include "Vtk/Math/vtkDense.h"
+#include "Math/Dense.h"
 
 #include "HEP/Detectors/MuonScatter.h"
 #include "Vtk/uLibVtkInterface.h"
@@ -54,21 +54,20 @@ class vtkRenderWindowInteractor;
 namespace uLib {
 namespace Vtk {
 
-class MuonScatter : public Prop3D, public Polydata {
-  typedef uLib::MuonScatter Content;
+class vtkMuonScatter : public Puppet, public Polydata {
+  typedef MuonScatter Content;
 
 public:
-  MuonScatter(const MuonScatter &content);
-  MuonScatter(uLib::MuonScatter &content);
+  vtkMuonScatter(const MuonScatter &content);
+  vtkMuonScatter(MuonScatter &content);
 
-  ~MuonScatter();
+  ~vtkMuonScatter();
 
-  Content &GetModel();
-  uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
+  Content &GetContent();
 
-  void PrintSelf(std::ostream &o) const override;
+  void PrintSelf(std::ostream &o) const;
 
-  virtual vtkPolyData *GetPolyData() const override;
+  virtual vtkPolyData *GetPolyData() const;
 
   void AddPocaPoint(HPoint3f poca);
 
@@ -77,12 +76,12 @@ public:
   void vtkStartInteractive();
 
 protected:
-  void ConnectInteractor(vtkRenderWindowInteractor *interactor) override;
+  void ConnectInteractor(vtkRenderWindowInteractor *interactor);
 
 private:
   void InstallPipe();
 
-  MuonScatter::Content *m_Content;
+  vtkMuonScatter::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 "Vtk/HEP/Geant/vtkGeantEvent.h"
+#include "HEP/Geant/GeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Vtk/Math/vtkCylinder.h"
-#include "Vtk/Math/vtkDense.h"
+#include "Math/Cylinder.h"
+#include "Math/Dense.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::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
-            state->viewer->AddProp3D(*vtkEvent);
+            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
+            state->viewer->AddPuppet(*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::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
+    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddProp3D(*vtkWorld);
+    viewer.AddPuppet(*vtkWorld);
     
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
+    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkIron);
 
     // Use vtkCylinderEmitterPrimary
     Vtk::vtkCylinderEmitterPrimary* vtkEmitter = new Vtk::vtkCylinderEmitterPrimary(*emitter);
     vtkEmitter->SetSelectable(false);
-    viewer.AddProp3D(*vtkEmitter);
+    viewer.AddPuppet(*vtkEmitter);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

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

@@ -1,15 +1,15 @@
 #include "Geant/Solid.h"
-#include "Vtk/HEP/Geant/vtkGeantEvent.h"
+#include "HEP/Geant/GeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkDense.h"
+#include "Math/ContainerBox.h"
+#include "Math/Dense.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 "Vtk/HEP/Detectors/vtkDetectorChamber.h"
+#include "HEP/Detectors/DetectorChamber.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::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
-            state->viewer->AddProp3D(*vtkEvent);
+            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
+            state->viewer->AddPuppet(*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::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
+    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddProp3D(*vtkWorld);
+    viewer.AddPuppet(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
+    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
+    Vtk::vtkDetectorChamber* vtkTop = new Vtk::vtkDetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
-    vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkTop);
+    vtkTop->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
+    Vtk::vtkDetectorChamber* vtkBottom = new Vtk::vtkDetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
-    vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkBottom);
+    vtkBottom->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkBottom);
 
     // Visualize Emitter
-    Vtk::EmitterPrimary* vtkEmitter = new Vtk::EmitterPrimary(*emitter);
-    viewer.AddProp3D(*vtkEmitter);
+    Vtk::vtkEmitterPrimary* vtkEmitter = new Vtk::vtkEmitterPrimary(*emitter);
+    viewer.AddPuppet(*vtkEmitter);
     
     // 3. Event Handling
     AppState state = { &scene, &viewer, {} };

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

@@ -10,11 +10,11 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Geant/Solid.h"
-#include "Vtk/HEP/Geant/vtkGeantEvent.h"
+#include "HEP/Geant/GeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkDense.h"
+#include "Math/ContainerBox.h"
+#include "Math/Dense.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::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
-            state->viewer->AddProp3D(*vtkEvent);
+            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
+            state->viewer->AddPuppet(*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::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
+    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
     // vtkWorld->ShowBoundingBox(true);
     vtkWorld->ShowScaleMeasures(true);
-    viewer.AddProp3D(*vtkWorld);
+    viewer.AddPuppet(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
+    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*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 "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkDense.h"
+#include "Math/ContainerBox.h"
+#include "Math/Dense.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::GeantScene vtkScene(&scene);
+    Vtk::vtkGeantScene vtkScene(&scene);
     vtkScene.AddToViewer(viewer);
 
     std::cout << "==================================================" << std::endl;
-    std::cout << " GeantScene Test" << std::endl;
+    std::cout << " vtkGeantScene 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 "Vtk/HEP/Geant/vtkGeantEvent.h"
+#include "HEP/Geant/GeantEvent.h"
 #include "HEP/Geant/Scene.h"
 #include "HEP/Geant/EmitterPrimary.hh"
-#include "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkDense.h"
+#include "Math/ContainerBox.h"
+#include "Math/Dense.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 "Vtk/HEP/Detectors/vtkDetectorChamber.h"
+#include "HEP/Detectors/DetectorChamber.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::GeantEvent* vtkEvent = new Vtk::GeantEvent(lastEvent);
-            state->viewer->AddProp3D(*vtkEvent);
+            Vtk::vtkGeantEvent* vtkEvent = new Vtk::vtkGeantEvent(lastEvent);
+            state->viewer->AddPuppet(*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::ContainerBox* vtkWorld = new Vtk::ContainerBox(scene.GetWorldBox());
+    Vtk::vtkContainerBox* vtkWorld = new Vtk::vtkContainerBox(scene.GetWorldBox());
     vtkWorld->ShowScaleMeasures(true);
-    vtkWorld->SetRepresentation(Vtk::Prop3D::Wireframe);
+    vtkWorld->SetRepresentation(Vtk::Puppet::Wireframe);
     vtkWorld->SetSelectable(false);
-    viewer.AddProp3D(*vtkWorld);
+    viewer.AddPuppet(*vtkWorld);
     
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
+    Vtk::vtkContainerBox* vtkIron = new Vtk::vtkContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
-    vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkIron);
+    vtkIron->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
+    Vtk::vtkDetectorChamber* vtkTop = new Vtk::vtkDetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
-    vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkTop);
+    vtkTop->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
+    Vtk::vtkDetectorChamber* vtkBottom = new Vtk::vtkDetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
-    vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);
-    viewer.AddProp3D(*vtkBottom);
+    vtkBottom->SetRepresentation(Vtk::Puppet::Surface);
+    viewer.AddPuppet(*vtkBottom);
 
-    // Use vtkSkyPlaneEmitterPrimary instead of EmitterPrimary
+    // Use vtkSkyPlaneEmitterPrimary instead of vtkEmitterPrimary
     Vtk::vtkSkyPlaneEmitterPrimary* vtkEmitter = new Vtk::vtkSkyPlaneEmitterPrimary(*emitter);
     vtkEmitter->SetSelectable(false);
-    viewer.AddProp3D(*vtkEmitter);
+    viewer.AddPuppet(*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 "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkTriangleMesh.h"
+#include "Math/ContainerBox.h"
+#include "Math/TriangleMesh.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::BoxSolid vtkBox(&gBox);
+    Vtk::vtkBoxSolid 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::TessellatedSolid vtkTess(&gTess);
+    Vtk::vtkTessellatedSolid vtkTess(&gTess);
 
     // 3. Visualization setup
     Vtk::Viewer viewer;
@@ -61,8 +61,8 @@ int main(int argc, char** argv) {
     vtkTess.AddToViewer(viewer);
 
     // Color them differently
-    vtkBox.SetColor(0.8, 0.2, 0.2);  // Redish box
-    vtkTess.SetColor(0.2, 0.8, 0.2); // Greenish tess
+    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
     
     // Position tessellated solid away from box
     Matrix4f trans = Matrix4f::Identity();

src/Vtk/HEP/Geant/vtkBoxSolid.cpp

@@ -10,75 +10,48 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #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 {
 
-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
+vtkBoxSolid::vtkBoxSolid(Geant::BoxSolid *content)
+    : vtkGeantSolid(content), m_BoxContent(content) {
+  // Re-run Update for box-specific pipe
   this->Update();
 }
 
-BoxSolid::~BoxSolid() {
-}
+vtkBoxSolid::~vtkBoxSolid() {}
 
-void BoxSolid::Update() {
-  ConnectionBlock blocker(m_UpdateConnection);
+void vtkBoxSolid::Update() {
   this->UpdateGeometry();
-  // Ensure base Prop3D properties (color, opacity, etc) and transform are applied
-  this->Prop3D::Update();
+  this->UpdateTransform();
 }
 
-void BoxSolid::SyncFromVtk() {
-  this->Prop3D::SyncFromVtk();
-  if (auto* proxy = vtkProp3D::SafeDownCast(this->GetProxyProp())) {
-      if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
-          m_BoxContent->SetTransform(VtkToMatrix4f(mat));
+void vtkBoxSolid::UpdateGeometry() {
+  if (!m_BoxContent || !m_BoxContent->GetObject()) {
+    // Fallback to base tessellation if no model object
+    vtkGeantSolid::UpdateGeometry();
+    return;
   }
+
+  // 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
 } // namespace uLib

src/Vtk/HEP/Geant/vtkBoxSolid.h

@@ -26,52 +26,24 @@
 #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 Prop3D for visualizing a Geant::BoxSolid.
+ * @brief VTK Puppet for visualizing a Geant::BoxSolid.
  */
-class BoxSolid : public GeantSolid {
-  uLibTypeMacro(BoxSolid, uLib::Vtk::GeantSolid)
-
+class vtkBoxSolid : public vtkGeantSolid {
 public:
-  BoxSolid(Geant::BoxSolid *content);
-  virtual ~BoxSolid();
+  vtkBoxSolid(Geant::BoxSolid *content);
+  virtual ~vtkBoxSolid();
 
   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 "Vtk/Math/vtkDense.h"
+#include "Math/vtkDense.h"
 
 namespace uLib {
 namespace Vtk {
 
-EmitterPrimary::EmitterPrimary(Geant::EmitterPrimary &emitter)
+vtkEmitterPrimary::vtkEmitterPrimary(Geant::EmitterPrimary &emitter)
     : m_emitter(emitter), m_Actor(vtkActor::New()) {
     
     vtkNew<vtkArrowSource> arrow;
@@ -43,16 +43,16 @@ EmitterPrimary::EmitterPrimary(Geant::EmitterPrimary &emitter)
 
     this->SetProp(m_Actor);
     
-    Object::connect(&m_emitter, &Object::Updated, this, &EmitterPrimary::contentUpdate);
+    Object::connect(&m_emitter, &Object::Updated, this, &vtkEmitterPrimary::contentUpdate);
     this->contentUpdate();
 }
 
-EmitterPrimary::~EmitterPrimary() {
-    Object::disconnect(&m_emitter, &Object::Updated, this, &EmitterPrimary::contentUpdate);
+vtkEmitterPrimary::~vtkEmitterPrimary() {
+    Object::disconnect(&m_emitter, &Object::Updated, this, &vtkEmitterPrimary::contentUpdate);
     m_Actor->Delete();
 }
 
-void EmitterPrimary::contentUpdate() {
+void vtkEmitterPrimary::contentUpdate() {
     vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
     if (!vmat) {
         vtkNew<vtkMatrix4x4> mat;
@@ -63,10 +63,10 @@ void EmitterPrimary::contentUpdate() {
     Matrix4f transform = m_emitter.GetWorldMatrix();
     Matrix4fToVtk(transform, vmat);
 
-    Prop3D::Update();
+    Puppet::Update();
 }
 
-void EmitterPrimary::Update() {
+void vtkEmitterPrimary::Update() {
     vtkMatrix4x4 *vmat = m_Actor->GetUserMatrix();
     if (!vmat) return;
 
@@ -79,7 +79,7 @@ void EmitterPrimary::Update() {
 // vtkSkyPlaneEmitterPrimary
 
 vtkSkyPlaneEmitterPrimary::vtkSkyPlaneEmitterPrimary(Geant::SkyPlaneEmitterPrimary &emitter)
-    : EmitterPrimary(emitter), m_skyEmitter(emitter), m_PlaneSource(vtkPlaneSource::New()) {
+    : vtkEmitterPrimary(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();
 
-    EmitterPrimary::contentUpdate();
+    vtkEmitterPrimary::contentUpdate();
 }
 
 // -------------------------------------------------------------------------- //
 // vtkQuadMeshEmitterPrimary
 
 vtkQuadMeshEmitterPrimary::vtkQuadMeshEmitterPrimary(Geant::QuadMeshEmitterPrimary &emitter)
-    : EmitterPrimary(emitter), m_meshEmitter(emitter) {
+    : vtkEmitterPrimary(emitter), m_meshEmitter(emitter) {
     this->contentUpdate();
 }
 
 void vtkQuadMeshEmitterPrimary::contentUpdate() {
     // For now stick with the arrow. In the future visualize the mesh if useful.
-    EmitterPrimary::contentUpdate();
+    vtkEmitterPrimary::contentUpdate();
 }
  
 // -------------------------------------------------------------------------- //
 // vtkCylinderEmitterPrimary
 
 vtkCylinderEmitterPrimary::vtkCylinderEmitterPrimary(Geant::CylinderEmitterPrimary &emitter)
-    : EmitterPrimary(emitter), m_cylinderEmitter(emitter), m_CylinderSource(vtkCylinderSource::New()) {
+    : vtkEmitterPrimary(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();
 
-    EmitterPrimary::contentUpdate();
+    vtkEmitterPrimary::contentUpdate();
 }
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkEmitterPrimary.h

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

src/Vtk/HEP/Geant/vtkGeantEvent.cpp

@@ -35,23 +35,23 @@
 namespace uLib {
 namespace Vtk {
 
-GeantEvent::GeantEvent(Content *content)
+vtkGeantEvent::vtkGeantEvent(Content *content)
     : m_MuonPath(vtkActor::New()), m_Content(content) {
   this->InstallPipe();
   this->Update();
 }
 
-GeantEvent::~GeantEvent() {
+vtkGeantEvent::~vtkGeantEvent() {
   m_MuonPath->Delete();
 }
 
-vtkPolyData *GeantEvent::GetPolyData() const {
+vtkPolyData *vtkGeantEvent::GetPolyData() const {
   if (!m_MuonPath || !m_MuonPath->GetMapper())
     return NULL;
   return vtkPolyData::SafeDownCast(m_MuonPath->GetMapper()->GetInput());
 }
 
-void GeantEvent::Update() {
+void vtkGeantEvent::Update() {
   if (!m_Content)
     return;
 
@@ -88,7 +88,7 @@ void GeantEvent::Update() {
   }
 }
 
-void GeantEvent::InstallPipe() {
+void vtkGeantEvent::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 GeantEvent : public Prop3D, public Polydata {
+class vtkGeantEvent : public Puppet, public Polydata {
   typedef Geant::GeantEvent Content;
 
 public:
-  GeantEvent(Content *content);
-  ~GeantEvent();
+  vtkGeantEvent(Content *content);
+  ~vtkGeantEvent();
 
   virtual class vtkPolyData *GetPolyData() const override;
 
-  virtual void Update() override;
+  virtual void Update();
 
 protected:
   virtual void InstallPipe();

src/Vtk/HEP/Geant/vtkGeantScene.cpp

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

src/Vtk/HEP/Geant/vtkGeantScene.h

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

src/Vtk/HEP/Geant/vtkGeantSolid.cpp

@@ -42,27 +42,27 @@
 namespace uLib {
 namespace Vtk {
 
-GeantSolid::GeantSolid(Content *content)
+vtkGeantSolid::vtkGeantSolid(Content *content)
     : m_SolidActor(vtkActor::New()), m_Content(content) {
   this->InstallPipe();
 }
 
-GeantSolid::~GeantSolid() {
+vtkGeantSolid::~vtkGeantSolid() {
   m_SolidActor->Delete();
 }
 
-vtkPolyData *GeantSolid::GetPolyData() const {
+vtkPolyData *vtkGeantSolid::GetPolyData() const {
   if (!m_SolidActor || !m_SolidActor->GetMapper())
     return NULL;
   return vtkPolyData::SafeDownCast(m_SolidActor->GetMapper()->GetInput());
 }
 
-void GeantSolid::Update() {
+void vtkGeantSolid::Update() {
   this->UpdateGeometry();
   this->UpdateTransform();
 }
 
-void GeantSolid::UpdateGeometry() {
+void vtkGeantSolid::UpdateGeometry() {
   if (!m_Content)
     return;
 
@@ -82,7 +82,6 @@ void GeantSolid::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());
   }
 
@@ -110,7 +109,7 @@ void GeantSolid::UpdateGeometry() {
   }
 }
 
-void GeantSolid::UpdateTransform() {
+void vtkGeantSolid::UpdateTransform() {
   if (!m_Content || !m_SolidActor)
     return;
 
@@ -142,7 +141,7 @@ void GeantSolid::UpdateTransform() {
   }
 }
 
-void GeantSolid::InstallPipe() {
+void vtkGeantSolid::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 Prop3D for visualizing a Geant::Solid.
+ * @brief VTK Puppet 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 GeantSolid : public Prop3D, public Polydata {
+class vtkGeantSolid : public Puppet, public Polydata {
   typedef Geant::Solid Content;
 
 public:
-  GeantSolid(Content *content);
-  ~GeantSolid();
+  vtkGeantSolid(Content *content);
+  ~vtkGeantSolid();
 
   virtual class vtkPolyData *GetPolyData() const override;
 

src/Vtk/HEP/Geant/vtkTessellatedSolid.cpp

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

src/Vtk/HEP/Geant/vtkTessellatedSolid.h

@@ -18,12 +18,12 @@ namespace uLib {
 namespace Vtk {
 
 /**
- * @brief VTK Prop3D for visualizing a Geant::TessellatedSolid.
+ * @brief VTK Puppet for visualizing a Geant::TessellatedSolid.
  */
-class TessellatedSolid : public GeantSolid {
+class vtkTessellatedSolid : public vtkGeantSolid {
 public:
-  TessellatedSolid(Geant::TessellatedSolid *content);
-  virtual ~TessellatedSolid();
+  vtkTessellatedSolid(Geant::TessellatedSolid *content);
+  virtual ~vtkTessellatedSolid();
 
   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::VoxRaytracerRepresentation *parent) {
+  void SetTracer(Vtk::vtkVoxRaytracerRepresentation *parent) {
     this->vtk_raytr = parent;
   }
 
@@ -74,7 +74,7 @@ private:
   vtkWidgetCallback() : vtk_raytr(NULL), muon(NULL), annotation(NULL) {}
 
   uLib::VoxRaytracer *raytracer;
-  Vtk::VoxRaytracerRepresentation *vtk_raytr;
+  Vtk::vtkVoxRaytracerRepresentation *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::MuonScatter v_muon(muon);
+  Vtk::vtkMuonScatter v_muon(muon);
 
   // structured grid //
   StructuredGrid grid(Vector3i(12, 10, 12));
   grid.SetSpacing(Vector3f(1, 1, 1));
   grid.SetPosition(Vector3f(0, 0, 0));
 
-  Vtk::StructuredGrid v_grid(&grid);
+  Vtk::vtkStructuredGrid 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::VoxRaytracerRepresentation v_rt(rt);
+  Vtk::vtkVoxRaytracerRepresentation 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.AddProp3D(v_grid);
-    viewer.AddProp3D(v_rt);
-    viewer.AddProp3D(v_muon);
+    viewer.AddPuppet(v_grid);
+    viewer.AddPuppet(v_rt);
+    viewer.AddPuppet(v_muon);
     
     // Select grid to show handler widget
-    viewer.SelectProp3D(&v_grid);
+    viewer.SelectPuppet(&v_grid);
     
     viewer.Start();
   }

src/Vtk/HEP/MuonTomography/vtkMuonContainerScattering.h

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

src/Vtk/HEP/MuonTomography/vtkVoxRaytracerRepresentation.cpp

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

src/Vtk/HEP/MuonTomography/vtkVoxRaytracerRepresentation.h

@@ -44,13 +44,13 @@
 #include <vtkTransform.h>
 #include <vtkTransformPolyDataFilter.h>
 
-#include "Vtk/Math/vtkDense.h"
+#include "Math/Dense.h"
 
 #include "Vtk/uLibVtkInterface.h"
 
-#include "Vtk/HEP/Detectors/vtkMuonScatter.h"
+#include "HEP/Detectors/MuonScatter.h"
 
-#include "Vtk/Math/vtkStructuredGrid.h"
+#include "Math/StructuredGrid.h"
 #include "Math/VoxRaytracer.h"
 
 class vtkActor;
@@ -58,12 +58,12 @@ class vtkActor;
 namespace uLib {
 namespace Vtk {
 
-class VoxRaytracerRepresentation : public Prop3D {
+class vtkVoxRaytracerRepresentation : public Puppet {
   typedef VoxRaytracer Content;
 
 public:
-  VoxRaytracerRepresentation(Content &content);
-  ~VoxRaytracerRepresentation();
+  vtkVoxRaytracerRepresentation(Content &content);
+  ~vtkVoxRaytracerRepresentation();
 
   uLib::VoxRaytracer *GetRaytracerAlgorithm();
 
@@ -76,13 +76,13 @@ public:
   enum RepresentationElements { RayElements, VoxelsElements };
   void SetRepresentationElements(enum RepresentationElements el);
 
-  void SetMuon(uLib::MuonScatter &muon);
+  void SetMuon(MuonScatter &muon);
 
-  void SetMuon(uLib::MuonScatter &muon, HPoint3f poca);
+  void SetMuon(MuonScatter &muon, HPoint3f poca);
 
-  void SetMuon(class MuonEvent &muon);
+  void SetMuon(class vtkMuonEvent &muon);
 
-  void SetMuon(class MuonScatter &muon);
+  void SetMuon(class vtkMuonScatter &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 "Vtk/Math/vtkAssembly.h"
-#include "Vtk/Math/vtkContainerBox.h"
-#include "Vtk/Math/vtkCylinder.h"
+#include "Math/Assembly.h"
+#include "Math/ContainerBox.h"
+#include "Math/Cylinder.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 prop3ds to set properties) ----
+    // ---- 5. Visualize (create puppets to set properties) ----
     Vtk::Assembly vtkAsm(&assembly);
 
     Vtk::Viewer viewer;
-    vtkAsm.AddToViewer(viewer); // This triggers prop3d creation via ConnectRenderer which eventually calls Prop3D::GetProp
+    vtkAsm.AddToViewer(viewer); // This triggers puppet creation via ConnectRenderer which eventually calls Puppet::GetProp
     
-    // Explicitly update to ensure prop3ds exist and are added to assemblies
+    // Explicitly update to ensure puppets exist and are added to assemblies
     vtkAsm.Update();
 
-    // Use the child context to find child prop3ds and set colors
+    // Use the child context to find child puppets and set colors
     if (auto* childCtx = vtkAsm.GetChildrenContext()) {
-        auto setProps = [](Vtk::Prop3D* p, float r, float g, float b) {
+        auto setProps = [](Vtk::Puppet* 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->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
+        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
     }
 
-    std::cout << "Prop3Ds in viewport: " << viewer.getProp3Ds().size() << " (Expected 4: 1 assembly + 3 children)" << std::endl;
+    std::cout << "Puppets in viewport: " << viewer.getPuppets().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,6 +25,7 @@
 
 #include "Vtk/uLibVtkViewer.h"
 
+#include "Math/ContainerBox.h"
 #include "Math/Units.h"
 #include "Vtk/Math/vtkContainerBox.h"
 
@@ -35,28 +36,21 @@ using namespace uLib;
 int main() {
   BEGIN_TESTING(vtk ContainerBox Test);
 
-  {
-    ContainerBox* box = new ContainerBox();
-    box->Scale(Vector3f(1_m, 2_m, 1_m));
-    box->SetPosition(Vector3f(0, 0, 0));
-
-    Vtk::ContainerBox v_box(box);
-    v_box.Update();
-
-    v_box.SetRepresentation(Vtk::Prop3D::Surface);
+  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);
-  }
   
-  Vtk::ContainerBox v_box;
-  v_box.findOrAddSignal(&Object::Updated)->connect([&v_box]() {
-    std::cout << "box updated: "
-              << v_box.get()->GetWorldPoint(HPoint3f(1, 1, 1)) << std::endl;
+  box.findOrAddSignal(&ContainerBox::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.AddProp3D(v_box);
+    v_viewer.AddPuppet(v_box);
     v_viewer.Start();
   }
 

src/Vtk/Math/testing/vtkContainerBoxTest2.cpp

@@ -6,7 +6,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/uLibVtkViewer.h"
-#include "Vtk/Math/vtkContainerBox.h"
+#include "Math/ContainerBox.h"
 #include "Math/Units.h"
 #include "Vtk/Math/vtkContainerBox.h"
 #include <iostream>
@@ -15,12 +15,12 @@ using namespace uLib;
 
 int main() {
     std::cout << "Creating ContainerBox..." << std::endl;
-    ContainerBox* box = new ContainerBox(Vector3f(1.0, 1.0, 1.0)); // 1x1x1 unit box
-    box->SetInstanceName("MyTestBox");
+    ContainerBox box(Vector3f(1.0, 1.0, 1.0)); // 1x1x1 unit box
+    box.SetInstanceName("MyTestBox");
 
     std::cout << "Creating VTK representation..." << std::endl;
-    Vtk::ContainerBox v_box(box);
-    v_box.SetRepresentation(Vtk::Prop3D::Wireframe);
+    Vtk::vtkContainerBox v_box(&box);
+    v_box.SetRepresentation(Vtk::Puppet::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.AddProp3D(v_box);
+    viewer.AddPuppet(v_box);
     viewer.Start();
 
     return 0;

src/Vtk/Math/testing/vtkQuadMeshTest.cpp

@@ -24,6 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkQuadMesh.h"
+#include "Math/QuadMesh.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkQuadMeshTest
@@ -41,7 +42,7 @@ BOOST_AUTO_TEST_CASE(vtkQuadMeshConstruction) {
   
   mesh.AddQuad(Vector4i(0, 1, 2, 3));
 
-  Vtk::QuadMesh v_mesh(&mesh);
+  Vtk::vtkQuadMesh v_mesh(mesh);
 
   Object::connect(&mesh, &QuadMesh::Updated, [&mesh]() {
     Vector3f points[4];
@@ -49,15 +50,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.AddProp3D(v_mesh);
+    viewer.AddPuppet(v_mesh);
     viewer.Start();
   }
 

src/Vtk/Math/testing/vtkStructuredGridTest.cpp

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

src/Vtk/Math/testing/vtkTriangleMeshTest.cpp

@@ -24,6 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkTriangleMesh.h"
+#include "Math/TriangleMesh.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkTriangleMeshTest
@@ -39,23 +40,22 @@ BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction) {
   mesh.AddPoint(Vector3f(1, 0, 0));
   mesh.AddTriangle(Vector3i(0, 1, 2));
 
-  Vtk::TriangleMesh v_mesh(&mesh);
+  Vtk::vtkTriangleMesh 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.AddProp3D(v_mesh);
+    viewer.AddPuppet(v_mesh);
     viewer.Start();
   }
 
@@ -66,13 +66,13 @@ BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction) {
 BOOST_AUTO_TEST_CASE(vtkTriangleMeshConstruction2) {
   TriangleMesh mesh;
 
-  Vtk::TriangleMesh v_mesh(&mesh);
+  Vtk::vtkTriangleMesh v_mesh(mesh);
   v_mesh.ReadFromStlFile("capelluzzo.stl");
   v_mesh.Update();
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddProp3D(v_mesh);
+    viewer.AddPuppet(v_mesh);
     viewer.Start();
   }
 

src/Vtk/Math/testing/vtkVoxImageInteractiveTest.cpp

@@ -10,51 +10,48 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkVoxImage.h"
+#include "Math/VoxImage.h"
 #include "Vtk/uLibVtkViewer.h"
-#include <cmath>
-#include <iostream>
-#include <vtkCallbackCommand.h>
-#include <vtkProperty.h>
-#include <vtkRenderWindow.h>
-#include <vtkRenderWindowInteractor.h>
-#include <vtkRenderer.h>
 #include <vtkSmartPointer.h>
+#include <vtkCallbackCommand.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <iostream>
+#include <cmath>
 
 using namespace uLib;
 
 struct AppState {
-  std::vector<Vtk::VoxImage *> images;
-  Vtk::Viewer *viewer;
+    std::vector<Vtk::vtkVoxImage*> images;
+    Vtk::Viewer* viewer;
 };
 
-void KeyPressCallbackFunction(vtkObject *caller, long unsigned int eventId,
-                              void *clientData, void *callData) {
-  auto *interactor = static_cast<vtkRenderWindowInteractor *>(caller);
-  auto *state = static_cast<AppState *>(clientData);
+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::Prop3D::Wireframe);
+        for (auto* img : state->images) img->SetRepresentation(Vtk::Puppet::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::Prop3D::Surface);
+    }
+    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);
         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();
     }
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
     float factor = 1.0e6f;
 
     // --- Image 1: Spherical Shell ---
@@ -69,7 +66,7 @@ int main(int argc, char **argv) {
                 float dx = x - 32.0f;
                 float dy = y - 32.0f;
                 float dz = z - 32.0f;
-        float dist = std::sqrt(dx * dx + dy * dy + dz * dz);
+                float dist = std::sqrt(dx*dx + dy*dy + dz*dz);
                 Voxel v;
                 if (dist < 25.0f && dist > 10.0f) {
                     v.Value = (40.0f * (25.0f - dist) / 15.0f) / factor; 
@@ -92,25 +89,23 @@ 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::VoxImage vtk_img1(&img1);
+    Vtk::vtkVoxImage vtk_img1(img1);
     vtk_img1.setShadingPreset(0);
 
-  Vtk::VoxImage vtk_img2(&img2);
+    Vtk::vtkVoxImage 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.AddProp3D(vtk_img1);
-  viewer.AddProp3D(vtk_img2);
+    viewer.AddPuppet(vtk_img1);
+    viewer.AddPuppet(vtk_img2);
     
     // Setup KeyPress Callback
     AppState state;
@@ -118,14 +113,13 @@ 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 << " VoxImage Interactive Viewer Test" << std::endl;
+    std::cout << " vtkVoxImage 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,6 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "Vtk/Math/vtkVoxImage.h"
+#include "Math/VoxImage.h"
 #include "Vtk/uLibVtkViewer.h"
 
 #define BOOST_TEST_MODULE VtkVoxImageTest
@@ -45,12 +46,12 @@ BOOST_AUTO_TEST_CASE(vtkVoxImageConstruction) {
   img.InitVoxels(zero);
   img[Vector3i(3, 3, 3)] = nonzero;
 
-  Vtk::VoxImage vtk_img(&img);
+  Vtk::vtkVoxImage vtk_img(img);
   vtk_img.SaveToXMLFile("test_vtkvoximage.vti");
 
   if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {
     Vtk::Viewer viewer;
-    viewer.AddProp3D(vtk_img);
+    viewer.AddPuppet(vtk_img);
     viewer.Start();
   }
 

src/Vtk/Math/vtkAssembly.cpp

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

src/Vtk/Math/vtkAssembly.h

@@ -12,9 +12,8 @@
 #ifndef U_VTK_ASSEMBLY_H
 #define U_VTK_ASSEMBLY_H
 
-#include "Core/ObjectFactory.h"
 #include "Math/Assembly.h"
-#include "Vtk/uLibVtkInterface.h"
+#include "uLibVtkInterface.h"
 
 class vtkActor;
 class vtkAssembly;  // VTK library forward declaration (must be before namespace)
@@ -22,22 +21,22 @@ class vtkAssembly;  // VTK library forward declaration (must be before namespace
 namespace uLib {
 namespace Vtk {
 
-class ObjectsContext; // forward
+class vtkObjectsContext; // forward
 
 /**
- * @brief VTK Prop3D for visualizing uLib::Assembly.
+ * @brief VTK Puppet for visualizing uLib::Assembly.
  *
  * Manages a VTK assembly (vtkAssembly from the VTK library) that groups
- * all child prop3ds and applies the Assembly's AffineTransform. It also
+ * all child puppets 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 Prop3D, public uLib::ObjectWrapper<uLib::Assembly> {
+class Assembly : public Puppet {
 public:
-    uLibTypeMacro(Assembly, Prop3D)
+    uLibTypeMacro(Assembly, Puppet)
 
     Assembly(uLib::Assembly *content);
     virtual ~Assembly();
@@ -48,21 +47,22 @@ 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_model.get(); }
-    virtual uLib::ObjectsContext* GetChildren() override { return (uLib::ObjectsContext*)m_model.get(); }
+    virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
+    virtual uLib::ObjectsContext* GetChildren() override { return (uLib::ObjectsContext*)m_Content; }
 
     /**
-     * @brief Returns the prop3d managing child objects.
+     * @brief Returns the puppet managing child objects.
      */
 
-    /** @brief Returns the prop3d managing child objects. */
-    ObjectsContext *GetChildrenContext() const;
+    /** @brief Returns the puppet managing child objects. */
+    vtkObjectsContext *GetChildrenContext() const;
 
 private:
     void UpdateBoundingBox();
     void InstallPipe();
 
-    ObjectsContext  *m_ChildContext;
+    uLib::Assembly     *m_Content;
+    vtkObjectsContext  *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,8 @@
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
 
-#include "Vtk/Math/vtkDense.h"
+#include "Math/vtkDense.h"
+
 
 namespace uLib {
 namespace Vtk {
@@ -50,75 +51,91 @@ 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()),
+  ContainerBoxData() : m_Cube(vtkSmartPointer<vtkActor>::New()), 
                        m_Axes(vtkSmartPointer<vtkActor>::New()), 
-        m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()) {}
-  ~ContainerBoxData() {}
+                       m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()),
+                       m_Affine(vtkSmartPointer<vtkMatrix4x4>::New()) {}
+  ~ContainerBoxData() {
+  }
 };
 
-ContainerBox::ContainerBox(ContainerBox::Content *content)
-    : d(new ContainerBoxData()),
-      ObjectWrapper(content ? content : new Content()) {
+
+
+
+
+vtkContainerBox::vtkContainerBox(vtkContainerBox::Content *content)
+    : d(new ContainerBoxData()), m_Content(content) {
   this->InstallPipe();
-  d->m_UpdateSignal = Object::connect(
-      this->m_model.get(), &uLib::Object::Updated, this, &ContainerBox::Update);
+  d->m_UpdateSignal = Object::connect(m_Content, &uLib::Object::Updated, this, &vtkContainerBox::Update);
 }
 
-ContainerBox::~ContainerBox() { delete d; }
+vtkContainerBox::~vtkContainerBox() {
+  delete d;
+}
 
-vtkPolyData *ContainerBox::GetPolyData() const {
+vtkPolyData *vtkContainerBox::GetPolyData() const {
   // TODO
   return NULL;
 }
 
-void ContainerBox::Update() {
-  RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
-  if (!this->m_model)
-    return;
 
-  vtkProp3D *prop = vtkProp3D::SafeDownCast(this->GetProp());
-  if (prop) {
-    // Apply the full volume matrix (TRS * m_LocalT)
+void vtkContainerBox::Update() {
+  RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
+  if (!m_Content) 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();
       vtkNew<vtkMatrix4x4> m;
-    Matrix4fToVtk(this->m_model->GetMatrix(), m);
-    prop->SetUserMatrix(m);
-    prop->Modified();
+      Matrix4fToVtk(fullLocal, m);
+      root->SetUserMatrix(m);
+      root->Modified();
   }
 
   // Delegate rest of update (appearance, render, etc)
   ConnectionBlock blocker(d->m_UpdateSignal);
-  this->Prop3D::Update();
+  this->Puppet::Update();
 }
 
-void ContainerBox::SyncFromVtk() {
+
+void vtkContainerBox::SyncFromVtk() {
   RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
-  if (!this->m_model)
-    return;
+  if (!m_Content) return;
 
-  vtkProp3D *root = this->GetProxyProp();
-  if (!root)
-    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);
+  // }
   
-  // VTK -> Model: Extract new world TRS from proxy, which matches the model's
-  // TRS center
-  vtkMatrix4x4 *rootMat = root->GetUserMatrix();
   Matrix4f vtkWorld = VtkToMatrix4f(rootMat);
   
   // Synchronize TRS property members from the updated local matrix
-  this->m_model->FromMatrix(vtkWorld);
+  m_Content->FromMatrix(vtkWorld);
 
-  // Since we modified the model, notify observers, but block the loop back to
-  // VTK ConnectionBlock blocker(d->m_UpdateSignal);
-  this->m_model->Updated();
+  // std::cout << "[vtkContainerBox::SyncFromVtk] New Model WorldMatrix:" << std::endl << m_Content->GetWorldMatrix() << std::endl;
+
+  // Since we modified the model, notify observers, but block the loop back to VTK
+  // ConnectionBlock blocker(d->m_UpdateSignal);
+  m_Content->Updated();
 }
 
-void ContainerBox::InstallPipe() {
-  if (!this->m_model)
+
+
+
+
+void vtkContainerBox::InstallPipe() {
+  if (!m_Content)
     return;
-  Content *c = this->m_model;
+  Content *c = m_Content;
 
   // CUBE
   vtkSmartPointer<vtkCubeSource> cube = vtkSmartPointer<vtkCubeSource>::New();
@@ -154,10 +171,11 @@ void ContainerBox::InstallPipe() {
   d->m_VtkAsm->AddPart(d->m_Axes);
   this->SetProp(d->m_VtkAsm);
   
-  // vtkProp3D* root = d->m_VtkAsm;
-  // if (root) {
-  //     this->ApplyProp3DTransform(root);
-  // }
+  vtkProp3D* root = d->m_VtkAsm;
+  if (root) {
+      d->m_Affine = Matrix4fToVtk(m_Content->GetMatrix());
+      root->SetUserMatrix(d->m_Affine);
+  }
   this->Update();
 }
 

src/Vtk/Math/vtkContainerBox.h

@@ -26,7 +26,6 @@
 #ifndef U_VTKCONTAINERBOX_H
 #define U_VTKCONTAINERBOX_H
 
-#include "Core/ObjectFactory.h"
 #include "Math/ContainerBox.h"
 #include "uLibVtkInterface.h"
 #include "vtkPolydata.h"
@@ -38,18 +37,14 @@ namespace Vtk {
 
 struct ContainerBoxData;
 
-class ContainerBox : public Prop3D,
-                     public Polydata,
-                     public uLib::ObjectWrapper<uLib::ContainerBox> {
-
-  uLibTypeMacro(ContainerBox, Prop3D,
-                Polydata) typedef uLib::ContainerBox Content;
+class vtkContainerBox : public Puppet, public Polydata {
+  typedef ContainerBox Content;
 
 public:
-  ContainerBox(Content *content = nullptr);
-  ~ContainerBox();
+  vtkContainerBox(Content *content);
+  ~vtkContainerBox();
 
-  virtual class vtkPolyData *GetPolyData() const override;
+  virtual class vtkPolyData *GetPolyData() const;
 
   /**
    * @brief Updates the VTK representation from the internal state.
@@ -61,16 +56,15 @@ public:
    */
   virtual void SyncFromVtk() override;
 
-  virtual uLib::Object *GetContent() const override {
-    return (uLib::Object *)m_model.get();
-  }
+  virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
 
 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 "Vtk/Math/vtkDense.h"
+#include "Math/vtkDense.h"
 
 namespace uLib {
 namespace Vtk {
 
-Cylinder::Cylinder(Cylinder::Content *content)
-    : ObjectWrapper(content), m_Actor(nullptr), m_VtkAsm(nullptr) {
+vtkCylinder::vtkCylinder(vtkCylinder::Content *content)
+    : m_Content(content), m_Actor(nullptr), m_VtkAsm(nullptr) {
   this->InstallPipe();
-  m_UpdateSignal = Object::connect(this->m_model.get(), &uLib::Object::Updated, this, &Cylinder::Update);
+  m_UpdateSignal = Object::connect(m_Content, &uLib::Object::Updated, this, &vtkCylinder::Update);
 }
 
-Cylinder::~Cylinder() {
+vtkCylinder::~vtkCylinder() {
   if (m_Actor) m_Actor->Delete();
   if (m_VtkAsm) m_VtkAsm->Delete();
 }
 
-void Cylinder::Update() {
-  if (!this->m_model)
+void vtkCylinder::Update() {
+  if (!m_Content)
     return;
 
   vtkProp3D* root = vtkProp3D::SafeDownCast(this->GetProp());
   if (root) {
       // 1. Placement handled specifically from content (use TRS GetMatrix, not World)
       vtkNew<vtkMatrix4x4> m;
-      Matrix4fToVtk(this->m_model->GetMatrix(), m);
+      Matrix4fToVtk(m_Content->GetMatrix(), m);
       root->SetUserMatrix(m);
 
       // 2. Shape-local properties (Radius, Height, Axis alignment) go to the internal actor
@@ -68,10 +68,10 @@ void Cylinder::Update() {
           
           // Initial source is centered Y-cylinder (Radial XZ [-1,1], Height Y [-0.5, 0.5])
           // Apply Radius and Height scaling
-          alignment->Scale(this->m_model->GetRadius(), this->m_model->GetHeight(), this->m_model->GetRadius());
+          alignment->Scale(m_Content->GetRadius(), m_Content->GetHeight(), m_Content->GetRadius());
 
           // Apply Axis alignment
-          int axis = this->m_model->GetAxis();
+          int axis = m_Content->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,26 +82,34 @@ void Cylinder::Update() {
 
   // Delegate rest of update (appearance, render, etc)
   ConnectionBlock blocker(m_UpdateSignal);
-  this->Prop3D::Update();
+  this->Puppet::Update();
 }
 
-void Cylinder::SyncFromVtk() {
-  if (!this->m_model) return;
+void vtkCylinder::SyncFromVtk() {
+  if (!m_Content) 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
-  this->m_model->FromMatrix(vtkWorld);
-  this->m_model->Updated(); 
+  m_Content->FromMatrix(vtkWorld);
+
+  std::cout << "[vtkCylinder::SyncFromVtk] New Model WorldMatrix:" << std::endl << m_Content->GetWorldMatrix() << std::endl;
+
+  m_Content->Updated(); 
 }
 
-void Cylinder::InstallPipe() {
-  if (!this->m_model)
+void vtkCylinder::InstallPipe() {
+  if (!m_Content)
     return;
 
   m_VtkAsm = ::vtkAssembly::New();

src/Vtk/Math/vtkCylinder.h

@@ -26,7 +26,6 @@
 #ifndef U_VTKCYLINDER_H
 #define U_VTKCYLINDER_H
 
-#include "Core/ObjectFactory.h"
 #include "Math/Cylinder.h"
 #include "Vtk/uLibVtkInterface.h"
 #include <vtkActor.h>
@@ -42,12 +41,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 Cylinder : public Prop3D, public uLib::ObjectWrapper<uLib::Cylinder> {
-  typedef uLib::Cylinder Content;
+class vtkCylinder : public Puppet {
+  typedef Cylinder Content;
 
 public:
-  Cylinder(Content *content);
-  virtual ~Cylinder();
+  vtkCylinder(Content *content);
+  virtual ~vtkCylinder();
 
   /** Synchronizes the VTK actor with the uLib model matrix and vice-versa */
   virtual void Update() override;
@@ -55,9 +54,7 @@ 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_model.get();
-  }
+  virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_Content; }
 
 protected:
   /** Sets up the VTK visualization pipeline */
@@ -65,6 +62,7 @@ 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 HLineRepresentationDefault {
+class vtkHLineRepresentationDefault {
 
 public:
-  HLineRepresentationDefault();
+  vtkHLineRepresentationDefault();
 };
 
 } // namespace uLib

src/Vtk/Math/vtkQuadMesh.cpp

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

src/Vtk/Math/vtkQuadMesh.h

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

src/Vtk/Math/vtkStructuredGrid.cpp

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

src/Vtk/Math/vtkStructuredGrid.h

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

src/Vtk/Math/vtkTriangleMesh.h

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

src/Vtk/Math/vtkVoxImage.cpp

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

src/Vtk/Math/vtkVoxImage.h

@@ -26,16 +26,15 @@
 #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;
@@ -46,21 +45,17 @@ class vtkPiecewiseFunction;
 namespace uLib {
 namespace Vtk {
 
-class VoxImage : public Prop3D,
-                 public uLib::ObjectWrapper<uLib::Abstract::VoxImage> {
+class vtkVoxImage : public Puppet {
 public:
   typedef Abstract::VoxImage Content;
 
-  VoxImage(Content *content);
+  vtkVoxImage(Content &content);
 
-  ~VoxImage();
+  ~vtkVoxImage();
 
-  void UpdateFromContent();
+  void GetContent();
 
-  void UpdateToContent();
-  uLib::Object *GetContent() const override {
-    return (uLib::Object *)m_model.get();
-  }
+  void SetContent();
 
   vtkProp3D *GetProp() override { return m_Asm; }
 
@@ -78,8 +73,7 @@ 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();
@@ -95,7 +89,7 @@ private:
   vtkXMLImageDataReader *m_Reader;
   vtkXMLImageDataWriter *m_Writer;
 
-  // ObjectWrapper provides m_model
+  vtkVoxImage::Content &m_Content;
 
   float m_Window;
   float m_Level;

src/Vtk/testing/CMakeLists.txt

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

src/Vtk/testing/PuppetParentingTest.cpp

@@ -26,14 +26,14 @@
 using namespace uLib;
 
 int main() {
-    BEGIN_TESTING(Prop3D Parenting Test);
+    BEGIN_TESTING(Puppet Parenting Test);
 
     ObjectsContext globalContext;
     Vtk::Viewer viewer;
     
     // Create the display context, linked to the model context.
-    // It will automatically create visual prop3ds for each model object.
-    Vtk::ObjectsContext viewerContext(&globalContext);
+    // It will automatically create visual puppets for each model object.
+    Vtk::vtkObjectsContext 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 prop3d exists in the viewer context
-    Vtk::Prop3D* assemblyProp3D = viewerContext.GetProp3D(assembly);
-    ASSERT_NOT_NULL(assemblyProp3D);
+    // Verify assembly puppet exists in the viewer context
+    Vtk::Puppet* assemblyPuppet = viewerContext.GetPuppet(assembly);
+    ASSERT_NOT_NULL(assemblyPuppet);
     
     // cast to Vtk::Assembly to access child context
-    auto* vtkAss = dynamic_cast<Vtk::Assembly*>(assemblyProp3D);
+    auto* vtkAss = dynamic_cast<Vtk::Assembly*>(assemblyPuppet);
     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 prop3d was created in the assembly's child context
-    Vtk::ObjectsContext* childVtkCtx = vtkAss->GetChildrenContext();
+    // Verify child puppet was created in the assembly's child context
+    Vtk::vtkObjectsContext* childVtkCtx = vtkAss->GetChildrenContext();
     ASSERT_NOT_NULL(childVtkCtx);
     
-    Vtk::Prop3D* box1Prop3D = childVtkCtx->GetProp3D(box1);
-    ASSERT_NOT_NULL(box1Prop3D);
+    Vtk::Puppet* box1Puppet = childVtkCtx->GetPuppet(box1);
+    ASSERT_NOT_NULL(box1Puppet);
     
     // 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(box1Prop3D->GetProp());
+    vtkProp3D* box1Prop = vtkProp3D::SafeDownCast(box1Puppet->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 prop3d ApplyTransform sets the prop orientation and position.
+    // The puppet 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::Prop3D* box2Prop3D = childVtkCtx->GetProp3D(box2);
-    ASSERT_NOT_NULL(box2Prop3D);
+    Vtk::Puppet* box2Puppet = childVtkCtx->GetPuppet(box2);
+    ASSERT_NOT_NULL(box2Puppet);
 
     // Render if not in batch environment
     if (!std::getenv("CTEST_PROJECT_NAME")) {

src/Vtk/testing/PuppetPropertyTest.cpp

@@ -11,7 +11,6 @@
 
 #include "Vtk/uLibVtkInterface.h"
 #include "Core/Property.h"
-#include "Math/Dense.h"
 #include <iostream>
 #include <cassert>
 #include "testing-prototype.h"
@@ -20,13 +19,13 @@ using namespace uLib;
 using namespace Vtk;
 
 int main() {
-    BEGIN_TESTING(Prop3D Property Registration Test);
+    BEGIN_TESTING(Puppet Property Registration Test);
 
-    std::cout << "Creating Prop3D object..." << std::endl;
-    Prop3D p;
+    std::cout << "Creating Puppet object..." << std::endl;
+    Puppet p;
     
-    // At this point, the Prop3D constructor has called ULIB_ACTIVATE_PROPERTIES.
-    // This should have discovered the members used in Prop3D::serialize() 
+    // At this point, the Puppet constructor has called ULIB_ACTIVATE_PROPERTIES.
+    // This should have discovered the members used in Puppet::serialize() 
     // and registered them as uLib properties.
     
     const auto& props = p.GetProperties();
@@ -34,7 +33,7 @@ int main() {
     
     // Verify specific properties exist
     Property<double>* opacityProp = nullptr;
-    Property<Vector3d>* colorProp = nullptr;
+    Property<double>* colorRProp = nullptr;
     
     for (auto* prop : props) {
         std::cout << "  - [" << prop->GetTypeName() << "] " << prop->GetName() 
@@ -43,13 +42,13 @@ int main() {
         if (prop->GetName() == "Opacity") {
             opacityProp = dynamic_cast<Property<double>*>(prop);
         }
-        if (prop->GetName() == "Color") {
-            colorProp = dynamic_cast<Property<Vector3d>*>(prop);
+        if (prop->GetName() == "ColorR") {
+            colorRProp = dynamic_cast<Property<double>*>(prop);
         }
     }
     
     assert(opacityProp != nullptr && "Opacity property not registered!");
-    assert(colorProp != nullptr && "Color property not registered!");
+    assert(colorRProp != nullptr && "ColorR property not registered!");
 
     // Test modification via uLib Property interface
     std::cout << "Modifying Opacity via property proxy (0.25)..." << std::endl;
@@ -59,11 +58,11 @@ int main() {
     assert(opacityProp->Get() == 0.25);
     assert(opacityProp->GetValueAsString().find("0.25") != std::string::npos);
 
-    std::cout << "Modifying Color via property proxy (0.9, 0.1, 0.1)..." << std::endl;
-    *colorProp = Vector3d(0.9, 0.1, 0.1);
-    assert(colorProp->Get().x() == 0.9);
+    std::cout << "Modifying ColorR via property proxy (0.9)..." << std::endl;
+    *colorRProp = 0.9;
+    assert(colorRProp->Get() == 0.9);
 
-    std::cout << "All Prop3D Property Registration Tests PASSED!" << std::endl;
+    std::cout << "All Puppet Property Registration Tests PASSED!" << std::endl;
 
     END_TESTING;
 }

src/Vtk/testing/vtkHandlerWidget.cpp

@@ -23,7 +23,7 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-#include "Vtk/Math/vtkContainerBox.h"
+#include "Math/ContainerBox.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(HandlerWidget with ContainerBox);
+  BEGIN_TESTING(vtkHandlerWidget 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::ContainerBox (Vtk Prop3D)
-  Vtk::ContainerBox v_box(&box);
-  v_box.SetRepresentation(Vtk::Prop3D::Surface);
+  // 2. Wrap it in a Vtk::vtkContainerBox (Vtk Puppet)
+  Vtk::vtkContainerBox v_box(&box);
+  v_box.SetRepresentation(Vtk::Puppet::Surface);
   v_box.SetOpacity(0.5);
 
-  viewer.AddProp3D(v_box);
+  viewer.AddPuppet(v_box);
 
-  // 4. Create and setup the HandlerWidget
-  vtkSmartPointer<Vtk::HandlerWidget> handler =
-      vtkSmartPointer<Vtk::HandlerWidget>::New();
+  // 4. Create and setup the vtkHandlerWidget
+  vtkSmartPointer<Vtk::vtkHandlerWidget> handler =
+      vtkSmartPointer<Vtk::vtkHandlerWidget>::New();
 
   handler->SetInteractor(viewer.GetInteractor());
 
-  // Get the prop from the prop3d and cast it to vtkProp3D
+  // Get the prop from the puppet 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::HandlerWidget *>(clientData);
+      auto h = static_cast<Vtk::vtkHandlerWidget *>(clientData);
       std::string key = interactor->GetKeySym();
       if (key == "g") {
           std::cout << "Switching to GLOBAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::HandlerWidget::GLOBAL);
+          h->SetReferenceFrame(Vtk::vtkHandlerWidget::GLOBAL);
       } else if (key == "l") {
           std::cout << "Switching to LOCAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::HandlerWidget::LOCAL);
+          h->SetReferenceFrame(Vtk::vtkHandlerWidget::LOCAL);
       } else if (key == "c") {
           std::cout << "Switching to CENTER frame" << std::endl;
-          h->SetReferenceFrame(Vtk::HandlerWidget::CENTER);
+          h->SetReferenceFrame(Vtk::vtkHandlerWidget::CENTER);
       } else if (key == "k") {
           std::cout << "Switching to CENTER_LOCAL frame" << std::endl;
-          h->SetReferenceFrame(Vtk::HandlerWidget::CENTER_LOCAL);
+          h->SetReferenceFrame(Vtk::vtkHandlerWidget::CENTER_LOCAL);
       }
   });
   key_callback->SetClientData(handler.GetPointer());