Fix api change of vsg::FrameStamp::create()

Fix geefr#53
rhabacker · Mar 21, 2024 · 340faa0 · 340faa0
1 parent 20d5349
commit 340faa0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/vsgvr/include/vsgvr/app/Viewer.h b/vsgvr/include/vsgvr/app/Viewer.h
@@ -106,8 +106,15 @@ namespace vsgvr {
             /// **must** call releaseFrame() once after rendering, even if this method returns false.
             ///
             /// @return Whether the application should render.
-            bool advanceToNextFrame();
 
+#if VSG_VERSION_MAJOR >= 1 && VSG_VERSION_MINOR >= 1
+            /// hint for setting the FrameStamp::simulationTime to time since start_point()
+            static constexpr double UseTimeSinceStartPoint = std::numeric_limits<double>::max();
+
+            bool advanceToNextFrame(double simulationTime = UseTimeSinceStartPoint);
+#else
+            bool advanceToNextFrame();
+#endif
             /// Submit rendering tasks to Vulkan
             void recordAndSubmit();
 
@@ -167,6 +174,7 @@ namespace vsgvr {
             XrFrameState _frameState;
             vsg::ref_ptr<vsg::FrameStamp> _frameStamp;
             std::vector<XrCompositionLayerBaseHeader*> _layers;
+            vsg::clock::time_point _start_time_point;
     };
 }
 

diff --git a/vsgvr/src/vsgvr/app/Viewer.cpp b/vsgvr/src/vsgvr/app/Viewer.cpp
@@ -107,7 +107,11 @@ namespace vsgvr
     return PollEventsResult::RunningDontRender;
   }
 
+#if VSG_VERSION_MAJOR >= 1 && VSG_VERSION_MINOR >= 1
+  bool Viewer::advanceToNextFrame(double simulationTime)
+#else
   bool Viewer::advanceToNextFrame()
+#endif
   {
     // Viewer::acquireNextFrame
     _frameState = XrFrameState();
@@ -128,12 +132,28 @@ namespace vsgvr
     if (!_frameStamp)
     {
       // first frame, initialize to frame count and indices to 0
+#if VSG_VERSION_MAJOR >= 1 && VSG_VERSION_MINOR >= 1
+
+      _start_time_point = t;
+
+      if (simulationTime == UseTimeSinceStartPoint) simulationTime = 0.0;
+      _frameStamp = vsg::FrameStamp::create(t, 0, simulationTime);
+#else
       _frameStamp = vsg::FrameStamp::create(t, 0);
+#endif
     }
     else
     {
       // after first frame so increment frame count and indices
+#if VSG_VERSION_MAJOR >= 1 && VSG_VERSION_MINOR >= 1
+      if (simulationTime == UseTimeSinceStartPoint)
+      {
+          simulationTime = std::chrono::duration<double, std::chrono::seconds::period>(t - _start_time_point).count();
+      }
+      _frameStamp = vsg::FrameStamp::create(t, _frameStamp->frameCount + 1, simulationTime);
+#else
       _frameStamp = vsg::FrameStamp::create(t, _frameStamp->frameCount + 1);
+#endif
     }
 
     for (auto& layer : compositionLayers)