change tsdRender to render all saved camera poses as individual frames

Author: jeffamstutz

tsd/apps/interactive/common/AppCore.cpp

@@ -371,8 +371,9 @@ void AppCore::addTurntableCameraPoses(const tsd::float3 &azs,
   if (baseName.empty())
     baseName = "turntable_view";
 
-  int i = 0, j = 0;
+  int j = 0;
   for (float el = els.x; el <= els.y; el += els.z, j++) {
+    int i = 0;
     for (float az = azs.x; az <= azs.y; az += azs.z, i++) {
       CameraPose pose;
       pose.name = baseName + "_" + std::to_string(i) + "_" + std::to_string(j);
@@ -405,8 +406,7 @@ void AppCore::setCameraPose(const CameraPose &pose)
 {
   view.manipulator.setConfig(
       pose.lookat, pose.azeldist.z, {pose.azeldist.x, pose.azeldist.y});
-  view.manipulator.setAxis(
-      static_cast<tsd::manipulators::OrbitAxis>(pose.upAxis));
+  view.manipulator.setAxis(static_cast<tsd::manipulators::UpAxis>(pose.upAxis));
 }
 
 void AppCore::removeAllPoses()

tsd/apps/interactive/common/AppCore.h

@@ -87,9 +87,20 @@ struct AppCore
   struct CameraState
   {
     std::vector<CameraPose> poses;
-    tsd::manipulators::Orbit manipulator;
+    tsd::manipulators::Manipulator manipulator;
   } view;
 
+  struct OfflineRenderSequenceConfig
+  {
+    struct FrameSettings
+    {
+      uint32_t width{1024};
+      uint32_t height{768};
+      anari::DataType colorFormat{ANARI_UFIXED8_RGBA_SRGB};
+      uint32_t samples{128};
+    } frame;
+  } offline;
+
   struct Windows
   {
     BlockingTaskModal *taskModal{nullptr};

tsd/apps/interactive/common/windows/CameraPoses.cpp

@@ -87,9 +87,21 @@ void CameraPoses::buildUI_turntablePopupMenu()
 {
   if (ImGui::BeginPopup("CameraPoses_turntablePopupMenu")) {
     ImGui::InputFloat3("azimuths", &m_turntableAzimuths.x, "%.3f");
+    if (ImGui::IsItemHovered())
+      ImGui::SetTooltip("{min, max, step size}");
+
     ImGui::InputFloat3("elevations", &m_turntableElevations.x, "%.3f");
+    if (ImGui::IsItemHovered())
+      ImGui::SetTooltip("{min, max, step size}");
+
     ImGui::InputFloat3("center", &m_turntableCenter.x, "%.3f");
+    if (ImGui::IsItemHovered())
+      ImGui::SetTooltip("view center");
+
     ImGui::InputFloat("distance", &m_turntableDistance, 0.01f, 0.1f, "%.3f");
+    if (ImGui::IsItemHovered())
+      ImGui::SetTooltip("view distance from center");
+
     if (ImGui::Button("ok")) {
       m_core->addTurntableCameraPoses(m_turntableAzimuths,
           m_turntableElevations,
@@ -108,7 +120,7 @@ void CameraPoses::buildUI_confirmPopupMenu()
 {
   if (ImGui::BeginPopup("CameraPoses_confirmPopupMenu")) {
     ImGui::Text("are you sure?");
-    if (ImGui::Button("ok")) {
+    if (ImGui::Button("yes")) {
       m_core->removeAllPoses();
       ImGui::CloseCurrentPopup();
     }

tsd/apps/interactive/common/windows/Viewport.cpp

@@ -10,10 +10,12 @@
 #include <limits>
 // tsd
 #include "../tsd_ui.h"
+#include "tsd/view/ManipulatorToAnari.hpp"
 
 namespace tsd_viewer {
 
-Viewport::Viewport(AppCore *core, tsd::manipulators::Orbit *m, const char *name)
+Viewport::Viewport(
+    AppCore *core, tsd::manipulators::Manipulator *m, const char *name)
     : Window(core, name)
 {
   setManipulator(m);
@@ -69,7 +71,7 @@ void Viewport::buildUI()
     m_anariPass->setEnableIDs(m_core->objectIsSelected());
 }
 
-void Viewport::setManipulator(tsd::manipulators::Orbit *m)
+void Viewport::setManipulator(tsd::manipulators::Manipulator *m)
 {
   m_arcball = m ? m : &m_localArcball;
 }
@@ -276,7 +278,7 @@ void Viewport::loadSettings(tsd::serialization::DataNode &root)
     camera["azel"].getValue(ANARI_FLOAT32_VEC2, &azel);
     camera["up"].getValue(ANARI_INT32, &axis);
 
-    m_arcball->setAxis(tsd::manipulators::OrbitAxis(axis));
+    m_arcball->setAxis(tsd::manipulators::UpAxis(axis));
     m_arcball->setConfig(at, distance, azel);
   }
 
@@ -524,9 +526,8 @@ void Viewport::updateCamera(bool force)
 
   // perspective camera //
 
-  anari::setParameter(m_device, m_perspCamera, "position", m_arcball->eye());
-  anari::setParameter(m_device, m_perspCamera, "direction", m_arcball->dir());
-  anari::setParameter(m_device, m_perspCamera, "up", m_arcball->up());
+  tsd::manipulators::updateCameraParametersPerspective(
+      m_device, m_perspCamera, *m_arcball);
   anari::setParameter(m_device,
       m_perspCamera,
       "aspect",
@@ -542,12 +543,8 @@ void Viewport::updateCamera(bool force)
   // orthographic camera //
 
   if (m_orthoCamera) {
-    anari::setParameter(
-        m_device, m_orthoCamera, "position", m_arcball->eye_FixedDistance());
-    anari::setParameter(m_device, m_orthoCamera, "direction", m_arcball->dir());
-    anari::setParameter(m_device, m_orthoCamera, "up", m_arcball->up());
-    anari::setParameter(
-        m_device, m_orthoCamera, "height", m_arcball->distance() * 0.75f);
+    tsd::manipulators::updateCameraParametersOrthographic(
+        m_device, m_orthoCamera, *m_arcball);
     anari::setParameter(m_device,
         m_orthoCamera,
         "aspect",
@@ -558,9 +555,10 @@ void Viewport::updateCamera(bool force)
   // omnidirectional camera //
 
   if (m_omniCamera) {
-    anari::setParameter(m_device, m_omniCamera, "position", m_arcball->eye());
-    anari::setParameter(m_device, m_omniCamera, "direction", m_arcball->dir());
-    anari::setParameter(m_device, m_omniCamera, "up", m_arcball->up());
+    tsd::manipulators::updateCameraParametersPerspective( // also works for omni
+        m_device,
+        m_omniCamera,
+        *m_arcball);
     anari::commitParameters(m_device, m_omniCamera);
   }
 
@@ -713,8 +711,7 @@ void Viewport::ui_menubar()
       }
 
       if (ImGui::Combo("up", &m_arcballUp, "+x\0+y\0+z\0-x\0-y\0-z\0\0")) {
-        m_arcball->setAxis(
-            static_cast<tsd::manipulators::OrbitAxis>(m_arcballUp));
+        m_arcball->setAxis(static_cast<tsd::manipulators::UpAxis>(m_arcballUp));
         resetView();
       }
 

tsd/apps/interactive/common/windows/Viewport.h

@@ -23,12 +23,12 @@ namespace tsd_viewer {
 struct Viewport : public Window
 {
   Viewport(AppCore *state,
-      tsd::manipulators::Orbit *m,
+      tsd::manipulators::Manipulator *m,
       const char *name = "Viewport");
   ~Viewport();
 
   void buildUI() override;
-  void setManipulator(tsd::manipulators::Orbit *m);
+  void setManipulator(tsd::manipulators::Manipulator *m);
   void resetView(bool resetAzEl = true);
   void centerView();
   void setLibrary(const std::string &libName, bool doAsync = true);
@@ -117,8 +117,8 @@ struct Viewport : public Window
   // camera manipulator
 
   int m_arcballUp{1};
-  tsd::manipulators::Orbit m_localArcball;
-  tsd::manipulators::Orbit *m_arcball{nullptr};
+  tsd::manipulators::Manipulator m_localArcball;
+  tsd::manipulators::Manipulator *m_arcball{nullptr};
   tsd::manipulators::UpdateToken m_cameraToken{0};
   float m_apertureRadius{0.f};
   float m_focusDistance{1.f};

tsd/apps/interactive/ptc_viewer/DistributedViewport.cpp

@@ -65,7 +65,7 @@ void DistributedViewport::buildUI()
     ui_handleInput();
 }
 
-void DistributedViewport::setManipulator(tsd::manipulators::Orbit *m)
+void DistributedViewport::setManipulator(tsd::manipulators::Manipulator *m)
 {
   m_arcball = m ? m : &m_localArcball;
 }
@@ -367,7 +367,7 @@ void DistributedViewport::ui_contextMenu()
 
     if (ImGui::Combo("up", &m_arcballUp, "+x\0+y\0+z\0-x\0-y\0-z\0\0")) {
       m_arcball->setAxis(
-          static_cast<tsd::manipulators::OrbitAxis>(m_arcballUp));
+          static_cast<tsd::manipulators::UpAxis>(m_arcballUp));
       resetView();
     }
 

tsd/apps/interactive/ptc_viewer/DistributedViewport.h

@@ -34,7 +34,7 @@ struct DistributedViewport : public Window
   void buildUI() override;
 
   void setWorld(anari::World world = nullptr, bool resetCameraView = true);
-  void setManipulator(tsd::manipulators::Orbit *m);
+  void setManipulator(tsd::manipulators::Manipulator *m);
   void resetView(bool resetAzEl = true);
   void setDevice(anari::Device d);
 
@@ -93,8 +93,8 @@ struct DistributedViewport : public Window
   // camera manipulator
 
   int m_arcballUp{1};
-  tsd::manipulators::Orbit m_localArcball;
-  tsd::manipulators::Orbit *m_arcball{nullptr};
+  tsd::manipulators::Manipulator m_localArcball;
+  tsd::manipulators::Manipulator *m_arcball{nullptr};
   tsd::manipulators::UpdateToken m_cameraToken{0};
   float m_apertureRadius{0.f};
   float m_focusDistance{1.f};

tsd/apps/interactive/ptc_viewer/ptcViewer.cpp

@@ -234,7 +234,7 @@ class Application : public anari_viewer::Application
   }
 
  private:
-  tsd::manipulators::Orbit m_manipulator;
+  tsd::manipulators::Manipulator m_manipulator;
 };
 
 ///////////////////////////////////////////////////////////////////////////////