Fix quest native performance in locomotion example, expose near/far planes on Viewer

Author: geefr

examples/interaction_locomotion/game.cpp

@@ -9,10 +9,11 @@
 #include "interactions/interaction_teleport.h"
 #include "interactions/interaction_slide.h"
 
-Game::Game(vsg::ref_ptr<vsgvr::Instance> xrInstance, vsg::ref_ptr<vsgvr::Viewer> vr, vsg::ref_ptr<vsg::Viewer> desktopViewer)
+Game::Game(vsg::ref_ptr<vsgvr::Instance> xrInstance, vsg::ref_ptr<vsgvr::Viewer> vr, vsg::ref_ptr<vsg::Viewer> desktopViewer, bool displayDesktopWindow)
   : _xrInstance(xrInstance)
   , _vr(vr)
   , _desktopViewer(desktopViewer)
+  , _desktopWindowEnabled(displayDesktopWindow)
 {
   loadScene();
   initVR();
@@ -62,17 +63,20 @@ void Game::initVR()
   // OpenXRViewer can't be a child class of Viewer yet (Think this was due to the assumption that a Window/Viewer has presentation / A Surface)
   _vr->compile();
 
-  // Create a CommandGraph to render the desktop window
-  auto lookAt = vsg::LookAt::create(vsg::dvec3(-4.0, -15.0, 25.0), vsg::dvec3(0.0, 0.0, 0.0), vsg::dvec3(0.0, 0.0, 1.0));
-  auto desktopWindow = _desktopViewer->windows().front();
-  auto perspective = vsg::Perspective::create(30.0,
-    static_cast<double>(desktopWindow->extent2D().width) / static_cast<double>(desktopWindow->extent2D().height)
-    , 0.1, 100.0
-  );
-  _desktopCamera = vsg::Camera::create(perspective, lookAt, vsg::ViewportState::create(desktopWindow->extent2D()));
-  auto desktopCommandGraph = vsg::createCommandGraphForView(desktopWindow, _desktopCamera, _sceneRoot, VK_SUBPASS_CONTENTS_INLINE, false);
-  _desktopViewer->assignRecordAndSubmitTaskAndPresentation({ desktopCommandGraph });
-  _desktopViewer->compile();
+  if(_desktopWindowEnabled)
+  {
+    // Create a CommandGraph to render the desktop window
+    auto lookAt = vsg::LookAt::create(vsg::dvec3(-4.0, -15.0, 25.0), vsg::dvec3(0.0, 0.0, 0.0), vsg::dvec3(0.0, 0.0, 1.0));
+    auto desktopWindow = _desktopViewer->windows().front();
+    auto perspective = vsg::Perspective::create(30.0,
+      static_cast<double>(desktopWindow->extent2D().width) / static_cast<double>(desktopWindow->extent2D().height)
+      , 0.1, 100.0
+    );
+    _desktopCamera = vsg::Camera::create(perspective, lookAt, vsg::ViewportState::create(desktopWindow->extent2D()));
+    auto desktopCommandGraph = vsg::createCommandGraphForView(desktopWindow, _desktopCamera, _sceneRoot, VK_SUBPASS_CONTENTS_INLINE, false);
+    _desktopViewer->assignRecordAndSubmitTaskAndPresentation({ desktopCommandGraph });
+    _desktopViewer->compile();
+  }
 }
 
 void Game::initActions()
@@ -181,29 +185,32 @@ void Game::frame()
     _controllerRight->matrix = _rightHandPose->getTransform();
   }
 
-  // Match the desktop camera to the HMD view
-  _desktopCamera->viewMatrix = _xrCameras.front()->viewMatrix;
-  _desktopCamera->projectionMatrix = _xrCameras.front()->projectionMatrix;
-
   // The session is running in some form, and a frame must be processed
   // The OpenXR frame loop takes priority - Acquire a frame to render into
   auto shouldQuit = false;
 
-  // Desktop render
-  // * The scene graph is updated by the desktop render
-  // * if PollEventsResult::RunningDontRender the desktop render could be skipped
-  if (_desktopViewer->advanceToNextFrame())
+  if(_desktopWindowEnabled)
   {
-    _desktopViewer->handleEvents();
-    _desktopViewer->update();
-    _desktopViewer->recordAndSubmit();
-    _desktopViewer->present();
-  }
-  else
-  {
-    // Desktop window was closed
-    shouldQuit = true;
-    return;
+    // Match the desktop camera to the HMD view
+    _desktopCamera->viewMatrix = _xrCameras.front()->viewMatrix;
+    _desktopCamera->projectionMatrix = _xrCameras.front()->projectionMatrix;
+
+    // Desktop render
+    // * The scene graph is updated by the desktop render
+    // * if PollEventsResult::RunningDontRender the desktop render could be skipped
+    if (_desktopViewer->advanceToNextFrame())
+    {
+      _desktopViewer->handleEvents();
+      _desktopViewer->update();
+      _desktopViewer->recordAndSubmit();
+      _desktopViewer->present();
+    }
+    else
+    {
+      // Desktop window was closed
+      shouldQuit = true;
+      return;
+    }
   }
 
   if (_vr->advanceToNextFrame())

examples/interaction_locomotion/game.h

@@ -14,7 +14,7 @@
 
 class Game {
 public:
-  Game(vsg::ref_ptr<vsgvr::Instance> xrInstance, vsg::ref_ptr<vsgvr::Viewer> vr, vsg::ref_ptr<vsg::Viewer> desktopViewer);
+  Game(vsg::ref_ptr<vsgvr::Instance> xrInstance, vsg::ref_ptr<vsgvr::Viewer> vr, vsg::ref_ptr<vsg::Viewer> desktopViewer, bool displayDesktopWindow);
   ~Game();
 
   bool shouldExit = false;
@@ -31,6 +31,7 @@ class Game {
   vsg::ref_ptr<vsgvr::Instance> _xrInstance;
   vsg::ref_ptr<vsgvr::Viewer> _vr;
   vsg::ref_ptr<vsg::Viewer> _desktopViewer;
+  bool _desktopWindowEnabled = false;
 
   // The user / OpenXR root space - Contains elements such as controllers
   vsg::ref_ptr<vsg::Group> _sceneRoot;

examples/interaction_locomotion/main.cpp

@@ -104,7 +104,7 @@ int main(int argc, char** argv) {
     // Set up a renderer to OpenXR, similar to a vsg::Viewer
     auto vr = vsgvr::Viewer::create(xrInstance, xrTraits, graphicsBinding);
 
-    Game game(xrInstance, vr, desktopViewer);
+    Game game(xrInstance, vr, desktopViewer, true);
 
     while (!game.shouldExit)
     {

examples/quest_interaction_locomotion/app/cpp/main.cpp

@@ -101,7 +101,8 @@ static int vsg_init(struct AppData* appData)
     // cast the window to an android window so we can pass it events
     appData->window = window.cast<vsgAndroid::Android_Window>();
 
-    // attach the window to the viewer
+    // Attach the window to the viewer
+    // Android: The window is present, but will not be rendered by the Game class
     appData->viewer->addWindow(window);
 
     // Ensure the correct physical device is selected
@@ -131,7 +132,7 @@ static int vsg_init(struct AppData* appData)
     // Set up a renderer to OpenXR, similar to a vsg::Viewer
     appData->vr = vsgvr::Viewer::create(xrInstance, xrTraits, graphicsBinding);
 
-    appData->game.reset(new Game(xrInstance, appData->vr, appData->viewer));
+    appData->game.reset(new Game(xrInstance, appData->vr, appData->viewer, false));
 
     return 0;
 }