Cleanup getters in AnariSceneRenderPass

Author: tarcila

tsd/src/tsd/rendering/pipeline/passes/AnariSceneRenderPass.cpp

@@ -275,31 +275,16 @@ void AnariSceneRenderPass::setEnableNormals(bool on)
   }
 }
 
-anari::DataType AnariSceneRenderPass::getColorFormat() const
-{
-  return m_format;
-}
-
 void AnariSceneRenderPass::setRunAsync(bool on)
 {
   m_runAsync = on;
 }
 
-anari::Device AnariSceneRenderPass::getDevice() const
-{
-  return m_device;
-}
-
 anari::Frame AnariSceneRenderPass::getFrame() const
 {
   return m_frame;
 }
 
-anari::Camera AnariSceneRenderPass::getCamera() const
-{
-  return m_camera;
-}
-
 void AnariSceneRenderPass::updateSize()
 {
   cleanup();

tsd/src/tsd/rendering/pipeline/passes/AnariSceneRenderPass.h

@@ -27,11 +27,7 @@ struct AnariSceneRenderPass : public RenderPass
   // default' true', if 'false', then anari::wait() on each pass
   void setRunAsync(bool on);
 
-  anari::DataType getColorFormat() const;
-  // NOTE(jda): these do not increase ref count, no need to release
-  anari::Device getDevice() const;
   anari::Frame getFrame() const;
-  anari::Camera getCamera() const;
 
  private:
   void updateSize() override;

tsd/src/tsd/ui/imgui/windows/Viewport.cpp

@@ -88,8 +88,7 @@ void Viewport::buildUI()
   if (m_rIdx) {
     auto kind = appCore()->anari.renderIndexKind();
     if (kind != m_lastIndexKind) {
-      tsd::core::logWarning(
-          "render index setting changed: resetting viewport");
+      tsd::core::logWarning("render index setting changed: resetting viewport");
       m_lastIndexKind = kind;
       auto lib = m_libName;
       setLibrary("");
@@ -206,10 +205,9 @@ void Viewport::setCustomFrameParameter(
     return;
   }
 
-  auto d = m_anariPass->getDevice();
   auto f = m_anariPass->getFrame();
-  anari::setParameter(d, f, name, value.type(), value.data());
-  anari::commitParameters(d, f);
+  anari::setParameter(m_device, f, name, value.type(), value.data());
+  anari::commitParameters(m_device, f);
 }
 
 void Viewport::saveSettings(tsd::core::DataNode &root)
@@ -612,7 +610,7 @@ void Viewport::ui_menubar_Viewport()
     {
       ImGui::Text("Format:");
       ImGui::Indent(INDENT_AMOUNT);
-      anari::DataType format = m_anariPass->getColorFormat();
+      anari::DataType format = m_colorFormat;
       if (ImGui::RadioButton(
               "UFIXED8_RGBA_SRGB", format == ANARI_UFIXED8_RGBA_SRGB))
         format = ANARI_UFIXED8_RGBA_SRGB;
@@ -621,8 +619,10 @@ void Viewport::ui_menubar_Viewport()
       if (ImGui::RadioButton("FLOAT32_VEC4", format == ANARI_FLOAT32_VEC4))
         format = ANARI_FLOAT32_VEC4;
 
-      if (format != m_anariPass->getColorFormat())
+      if (format != m_colorFormat) {
         m_anariPass->setColorFormat(format);
+        m_colorFormat = format;
+      }
       ImGui::Unindent(INDENT_AMOUNT);
     }
 

tsd/src/tsd/ui/imgui/windows/Viewport.h

@@ -5,24 +5,19 @@
 
 #include "BaseViewport.h"
 
-#include "tsd/ui/imgui/tsd_ui_imgui.h"
 // tsd_core
-#include "tsd/core/scene/Object.hpp"
-#include "tsd/core/scene/UpdateDelegate.hpp"
 #include "tsd/core/scene/objects/Camera.hpp"
 // tsd_rendering
 #include "tsd/rendering/index/RenderIndex.hpp"
 #include "tsd/rendering/pipeline/RenderPipeline.h"
-#include "tsd/rendering/view/CameraUpdateDelegate.hpp"
 #include "tsd/rendering/view/Manipulator.hpp"
+// anari
+#include <anari/frontend/anari_enums.h>
 // std
-#include <array>
 #include <functional>
 #include <future>
 #include <limits>
-#include <memory>
 #include <string>
-#include <vector>
 
 namespace tsd::ui::imgui {
 
@@ -92,6 +87,7 @@ struct Viewport : public BaseViewport
   float m_depthVisualMaximum{1.f};
   float m_edgeThreshold{0.5f};
   bool m_edgeInvert{false};
+  anari::DataType m_colorFormat = ANARI_UNKNOWN;
 
   // Picking state //