Refactor tracker creation pattern

Author: nvddr

src/core/deviceio/cpp/CMakeLists.txt

@@ -27,12 +27,20 @@ add_library(deviceio_core STATIC
     full_body_tracker_pico.cpp
     deviceio_session.cpp
     inc/deviceio/tracker.hpp
-    inc/deviceio/hand_tracker.hpp
+    inc/deviceio/tracker_factory.hpp
     inc/deviceio/head_tracker.hpp
+    inc/deviceio/hand_tracker.hpp
     inc/deviceio/controller_tracker.hpp
+    inc/deviceio/full_body_tracker_pico.hpp
     inc/deviceio/schema_tracker.hpp
     inc/deviceio/generic_3axis_pedal_tracker.hpp
     inc/deviceio/frame_metadata_tracker_oak.hpp
+    inc/deviceio/live_head_tracker_impl.hpp
+    inc/deviceio/live_hand_tracker_impl.hpp
+    inc/deviceio/live_controller_tracker_impl.hpp
+    inc/deviceio/live_full_body_tracker_pico_impl.hpp
+    inc/deviceio/live_generic_3axis_pedal_tracker_impl.hpp
+    inc/deviceio/live_frame_metadata_tracker_oak_impl.hpp
     inc/deviceio/deviceio_session.hpp
 )
 target_include_directories(deviceio_core

src/core/deviceio/cpp/controller_tracker.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "inc/deviceio/controller_tracker.hpp"
-
 #include "inc/deviceio/deviceio_session.hpp"
+#include "inc/deviceio/live_controller_tracker_impl.hpp"
+#include "inc/deviceio/tracker_factory.hpp"
 
 #include <oxr_utils/oxr_funcs.hpp>
 #include <oxr_utils/oxr_time.hpp>
@@ -146,60 +146,10 @@ XrAction create_action(const OpenXRCoreFunctions& funcs,
 } // anonymous namespace
 
 // ============================================================================
-// ControllerTracker::Impl
+// LiveControllerTrackerImpl
 // ============================================================================
 
-class ControllerTracker::Impl : public ITrackerImpl
-{
-public:
-    explicit Impl(const OpenXRSessionHandles& handles);
-    ~Impl() = default;
-
-    Impl(const Impl&) = delete;
-    Impl& operator=(const Impl&) = delete;
-
-    bool update(XrTime time) override;
-    void serialize_all(size_t channel_index, const RecordCallback& callback) const override;
-
-    const ControllerSnapshotTrackedT& get_left_controller() const;
-    const ControllerSnapshotTrackedT& get_right_controller() const;
-
-private:
-    const OpenXRCoreFunctions core_funcs_;
-    XrTimeConverter time_converter_;
-
-    XrSession session_;
-    XrSpace base_space_;
-
-    XrPath left_hand_path_;
-    XrPath right_hand_path_;
-
-    // Action context — declared before action_set_ so it outlives it.
-    ActionContextFunctions action_ctx_funcs_;
-    XrInstanceActionContextPtr instance_action_context_;
-    XrSessionActionContextPtr session_action_context_;
-
-    XrActionSetPtr action_set_;
-    XrAction grip_pose_action_;
-    XrAction aim_pose_action_;
-    XrAction primary_click_action_;
-    XrAction secondary_click_action_;
-    XrAction thumbstick_action_;
-    XrAction thumbstick_click_action_;
-    XrAction squeeze_value_action_;
-    XrAction trigger_value_action_;
-
-    XrSpacePtr left_grip_space_;
-    XrSpacePtr right_grip_space_;
-    XrSpacePtr left_aim_space_;
-    XrSpacePtr right_aim_space_;
-
-    ControllerSnapshotTrackedT left_tracked_;
-    ControllerSnapshotTrackedT right_tracked_;
-    XrTime last_update_time_ = 0;
-};
-
-ControllerTracker::Impl::Impl(const OpenXRSessionHandles& handles)
+LiveControllerTrackerImpl::LiveControllerTrackerImpl(const OpenXRSessionHandles& handles)
     : core_funcs_(OpenXRCoreFunctions::load(handles.instance, handles.xrGetInstanceProcAddr)),
       time_converter_(handles),
       session_(handles.session),
@@ -333,7 +283,7 @@ ControllerTracker::Impl::Impl(const OpenXRSessionHandles& handles)
     std::cout << "ControllerTracker initialized (left + right) with action context" << std::endl;
 }
 
-bool ControllerTracker::Impl::update(XrTime time)
+bool LiveControllerTrackerImpl::update(XrTime time)
 {
     last_update_time_ = time;
 
@@ -430,17 +380,17 @@ bool ControllerTracker::Impl::update(XrTime time)
     return left_tracked_.data || right_tracked_.data;
 }
 
-const ControllerSnapshotTrackedT& ControllerTracker::Impl::get_left_controller() const
+const ControllerSnapshotTrackedT& LiveControllerTrackerImpl::get_left_controller() const
 {
     return left_tracked_;
 }
 
-const ControllerSnapshotTrackedT& ControllerTracker::Impl::get_right_controller() const
+const ControllerSnapshotTrackedT& LiveControllerTrackerImpl::get_right_controller() const
 {
     return right_tracked_;
 }
 
-void ControllerTracker::Impl::serialize_all(size_t channel_index, const RecordCallback& callback) const
+void LiveControllerTrackerImpl::serialize_all(size_t channel_index, const RecordCallback& callback) const
 {
     if (channel_index > 1)
     {
@@ -482,17 +432,17 @@ std::string_view ControllerTracker::get_schema_text() const
 
 const ControllerSnapshotTrackedT& ControllerTracker::get_left_controller(const DeviceIOSession& session) const
 {
-    return static_cast<const Impl&>(session.get_tracker_impl(*this)).get_left_controller();
+    return static_cast<const ControllerTrackerImpl&>(session.get_tracker_impl(*this)).get_left_controller();
 }
 
 const ControllerSnapshotTrackedT& ControllerTracker::get_right_controller(const DeviceIOSession& session) const
 {
-    return static_cast<const Impl&>(session.get_tracker_impl(*this)).get_right_controller();
+    return static_cast<const ControllerTrackerImpl&>(session.get_tracker_impl(*this)).get_right_controller();
 }
 
-std::shared_ptr<ITrackerImpl> ControllerTracker::create_tracker(const OpenXRSessionHandles& handles) const
+std::unique_ptr<ITrackerImpl> ControllerTracker::create_tracker_impl(TrackerFactory& factory) const
 {
-    return std::make_shared<Impl>(handles);
+    return factory.create_controller_tracker_impl();
 }
 
 } // namespace core

src/core/deviceio/cpp/deviceio_session.cpp

@@ -3,6 +3,14 @@
 
 #include "inc/deviceio/deviceio_session.hpp"
 
+#include "inc/deviceio/live_controller_tracker_impl.hpp"
+#include "inc/deviceio/live_frame_metadata_tracker_oak_impl.hpp"
+#include "inc/deviceio/live_full_body_tracker_pico_impl.hpp"
+#include "inc/deviceio/live_generic_3axis_pedal_tracker_impl.hpp"
+#include "inc/deviceio/live_hand_tracker_impl.hpp"
+#include "inc/deviceio/live_head_tracker_impl.hpp"
+#include "inc/deviceio/tracker_factory.hpp"
+
 #include <cassert>
 #include <iostream>
 #include <set>
@@ -11,6 +19,53 @@
 namespace core
 {
 
+// ============================================================================
+// LiveDeviceIOFactory -- TrackerFactory implementation for live OpenXR sessions
+// ============================================================================
+
+class LiveDeviceIOFactory : public TrackerFactory
+{
+public:
+    explicit LiveDeviceIOFactory(const OpenXRSessionHandles& handles) : handles_(handles)
+    {
+    }
+
+    std::unique_ptr<HeadTrackerImpl> create_head_tracker_impl() override
+    {
+        return std::make_unique<LiveHeadTrackerImpl>(handles_);
+    }
+
+    std::unique_ptr<HandTrackerImpl> create_hand_tracker_impl() override
+    {
+        return std::make_unique<LiveHandTrackerImpl>(handles_);
+    }
+
+    std::unique_ptr<ControllerTrackerImpl> create_controller_tracker_impl() override
+    {
+        return std::make_unique<LiveControllerTrackerImpl>(handles_);
+    }
+
+    std::unique_ptr<FullBodyTrackerPicoImpl> create_full_body_tracker_pico_impl() override
+    {
+        return std::make_unique<LiveFullBodyTrackerPicoImpl>(handles_);
+    }
+
+    std::unique_ptr<Generic3AxisPedalTrackerImpl> create_generic_3axis_pedal_tracker_impl(
+        const SchemaTrackerConfig& config) override
+    {
+        return std::make_unique<LiveGeneric3AxisPedalTrackerImpl>(handles_, config);
+    }
+
+    std::unique_ptr<FrameMetadataTrackerOakImpl> create_frame_metadata_tracker_oak_impl(
+        std::vector<SchemaTrackerConfig> configs) override
+    {
+        return std::make_unique<LiveFrameMetadataTrackerOakImpl>(handles_, std::move(configs));
+    }
+
+private:
+    const OpenXRSessionHandles& handles_;
+};
+
 // ============================================================================
 // DeviceIOSession Implementation
 // ============================================================================
@@ -19,10 +74,26 @@ DeviceIOSession::DeviceIOSession(const std::vector<std::shared_ptr<ITracker>>& t
                                  const OpenXRSessionHandles& handles)
     : handles_(handles), time_converter_(handles)
 {
-    // Initialize all trackers and collect their implementations
+    LiveDeviceIOFactory factory(handles_);
+
     for (const auto& tracker : trackers)
     {
-        tracker_impls_.emplace(tracker.get(), tracker->create_tracker(handles_));
+        if (!tracker)
+        {
+            throw std::invalid_argument("DeviceIOSession: null tracker in trackers list");
+        }
+        auto impl = tracker->create_tracker_impl(factory);
+        if (!impl)
+        {
+            std::cerr << "DeviceIOSession: tracker '" << tracker->get_name() << "' returned null impl, skipping"
+                      << std::endl;
+            continue;
+        }
+        tracker_impls_.emplace(tracker.get(), std::move(impl));
+    }
+    if (!trackers.empty() && tracker_impls_.empty())
+    {
+        throw std::runtime_error("DeviceIOSession: failed to initialize any requested trackers");
     }
 }
 

src/core/deviceio/cpp/frame_metadata_tracker_oak.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "inc/deviceio/frame_metadata_tracker_oak.hpp"
-
 #include "inc/deviceio/deviceio_session.hpp"
+#include "inc/deviceio/live_frame_metadata_tracker_oak_impl.hpp"
+#include "inc/deviceio/tracker_factory.hpp"
 
 #include <flatbuffers/flatbuffers.h>
 #include <oxr_utils/oxr_time.hpp>
@@ -16,34 +16,11 @@ namespace core
 {
 
 // ============================================================================
-// FrameMetadataTrackerOak::Impl
+// LiveFrameMetadataTrackerOakImpl
 // ============================================================================
 
-class FrameMetadataTrackerOak::Impl : public ITrackerImpl
-{
-public:
-    Impl(const OpenXRSessionHandles& handles, std::vector<SchemaTrackerConfig> configs);
-
-    bool update(XrTime time) override;
-    void serialize_all(size_t channel_index, const RecordCallback& callback) const override;
-
-    const FrameMetadataOakTrackedT& get_stream_data(size_t stream_index) const;
-
-private:
-    struct StreamState
-    {
-        std::unique_ptr<SchemaTracker> reader;
-        FrameMetadataOakTrackedT tracked;
-        bool collection_present = false;
-        std::vector<SchemaTracker::SampleResult> pending_records;
-    };
-
-    XrTimeConverter m_time_converter_;
-    XrTime m_last_update_time_ = 0;
-    std::vector<StreamState> m_streams;
-};
-
-FrameMetadataTrackerOak::Impl::Impl(const OpenXRSessionHandles& handles, std::vector<SchemaTrackerConfig> configs)
+LiveFrameMetadataTrackerOakImpl::LiveFrameMetadataTrackerOakImpl(const OpenXRSessionHandles& handles,
+                                                                 std::vector<SchemaTrackerConfig> configs)
     : m_time_converter_(handles)
 {
     for (auto& config : configs)
@@ -54,7 +31,7 @@ FrameMetadataTrackerOak::Impl::Impl(const OpenXRSessionHandles& handles, std::ve
     }
 }
 
-bool FrameMetadataTrackerOak::Impl::update(XrTime time)
+bool LiveFrameMetadataTrackerOakImpl::update(XrTime time)
 {
     m_last_update_time_ = time;
     for (auto& stream : m_streams)
@@ -90,7 +67,7 @@ bool FrameMetadataTrackerOak::Impl::update(XrTime time)
     return true;
 }
 
-void FrameMetadataTrackerOak::Impl::serialize_all(size_t channel_index, const RecordCallback& callback) const
+void LiveFrameMetadataTrackerOakImpl::serialize_all(size_t channel_index, const RecordCallback& callback) const
 {
     if (channel_index >= m_streams.size())
     {
@@ -148,7 +125,7 @@ void FrameMetadataTrackerOak::Impl::serialize_all(size_t channel_index, const Re
     }
 }
 
-const FrameMetadataOakTrackedT& FrameMetadataTrackerOak::Impl::get_stream_data(size_t stream_index) const
+const FrameMetadataOakTrackedT& LiveFrameMetadataTrackerOakImpl::get_stream_data(size_t stream_index) const
 {
     if (stream_index >= m_streams.size())
     {
@@ -197,12 +174,12 @@ std::string_view FrameMetadataTrackerOak::get_schema_text() const
 const FrameMetadataOakTrackedT& FrameMetadataTrackerOak::get_stream_data(const DeviceIOSession& session,
                                                                          size_t stream_index) const
 {
-    return static_cast<const Impl&>(session.get_tracker_impl(*this)).get_stream_data(stream_index);
+    return static_cast<const FrameMetadataTrackerOakImpl&>(session.get_tracker_impl(*this)).get_stream_data(stream_index);
 }
 
-std::shared_ptr<ITrackerImpl> FrameMetadataTrackerOak::create_tracker(const OpenXRSessionHandles& handles) const
+std::unique_ptr<ITrackerImpl> FrameMetadataTrackerOak::create_tracker_impl(TrackerFactory& factory) const
 {
-    return std::make_shared<Impl>(handles, m_configs);
+    return factory.create_frame_metadata_tracker_oak_impl(m_configs);
 }
 
 } // namespace core