Remove no-longer-needed PointCtrlSource openxr constructor args

refs #20
fredemmott · Jan 7, 2023 · e6a0e0f · e6a0e0f
1 parent a4820a8
commit e6a0e0f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/src/APILayer/APILayer.cpp b/src/APILayer/APILayer.cpp
@@ -75,8 +75,7 @@ APILayer::APILayer(
     mHandTracking = std::make_unique<HandTrackingSource>(
       next, instance, session, mViewSpace, mLocalSpace);
   }
-  mPointCtrl = std::make_unique<PointCtrlSource>(
-    next, instance, session, mViewSpace, mLocalSpace);
+  mPointCtrl = std::make_unique<PointCtrlSource>();
 
   if (
     VirtualControllerSink::IsActionSink()

diff --git a/src/PointCtrlCalibration/PointCtrlCalibration.cpp b/src/PointCtrlCalibration/PointCtrlCalibration.cpp
@@ -374,7 +374,7 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int) {
   }
   const auto openXR
     = std::make_shared<OpenXRNext>(instance, &xrGetInstanceProcAddr);
-  PointCtrlSource pointCtrl(openXR, instance, session, viewSpace, localSpace);
+  PointCtrlSource pointCtrl;
   while (!pointCtrl.IsConnected()) {
     const auto result = MessageBoxW(
       NULL,

diff --git a/src/lib/PointCtrlSource.cpp b/src/lib/PointCtrlSource.cpp
@@ -48,17 +48,7 @@ static bool IsPointerSource() {
     || Environment::IsPointCtrlCalibration;
 }
 
-PointCtrlSource::PointCtrlSource(
-  const std::shared_ptr<OpenXRNext>& next,
-  XrInstance instance,
-  XrSession session,
-  XrSpace viewSpace,
-  XrSpace localSpace)
-  : mInstance(instance),
-    mSession(session),
-    mViewSpace(viewSpace),
-    mLocalSpace(localSpace),
-    mOpenXR(next) {
+PointCtrlSource::PointCtrlSource() {
   DebugPrint(
     "Initializing PointCtrlSource with calibration ({}, {}) delta ({}, {})",
     Config::PointCtrlCenterX,

diff --git a/src/lib/PointCtrlSource.h b/src/lib/PointCtrlSource.h
@@ -38,12 +38,7 @@ namespace HandTrackedCockpitClicking {
 // firmware.
 class PointCtrlSource final : public InputSource {
  public:
-  PointCtrlSource(
-    const std::shared_ptr<OpenXRNext>& next,
-    XrInstance instance,
-    XrSession session,
-    XrSpace viewSpace,
-    XrSpace localSpace);
+  PointCtrlSource();
 
   bool IsConnected() const;
 
@@ -118,12 +113,6 @@ class PointCtrlSource final : public InputSource {
   RawValues mRaw {};
   XrTime mLastMovedAt {};
 
-  XrInstance mInstance {};
-  XrSession mSession {};
-  XrSpace mViewSpace {};
-  XrSpace mLocalSpace {};
-  std::shared_ptr<OpenXRNext> mOpenXR;
-
   void UpdatePose(const FrameInfo&, InputState* hand);
   void UpdateWakeState(bool hasButtons, XrTime now, Hand* hand);
   void MapActionsClassic(