hdGatling: steer progressive rendering using render settings

pablode · Nov 2, 2024 · d3492e9 · d3492e9
1 parent 27c2ac6
commit d3492e9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/src/gatling/main.cpp b/src/gatling/main.cpp
@@ -28,6 +28,7 @@
 #include <pxr/imaging/hd/renderPassState.h>
 #include <pxr/imaging/hd/renderBuffer.h>
 #include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/tokens.h>
 #include <pxr/imaging/hf/pluginDesc.h>
 #include <pxr/imaging/hgi/hgi.h>
 #include <pxr/imaging/hgi/tokens.h>
@@ -111,6 +112,8 @@ int main(int argc, const char* argv[])
   HdRenderDelegate* renderDelegate = plugin->CreateRenderDelegate();
   TF_AXIOM(renderDelegate);
 
+  renderDelegate->SetRenderSetting(HdRenderSettingsTokens->enableInteractive, VtValue(false));
+
   // Handle cmdline args.
   AppSettings settings;
   if (!ParseArgs(argc, argv, *renderDelegate, settings))

diff --git a/src/hdGatling/renderDelegate.cpp b/src/hdGatling/renderDelegate.cpp
@@ -142,7 +142,7 @@ HdRenderSettingDescriptorList HdGatlingRenderDelegate::GetRenderSettingDescripto
   return _settingDescriptors;
 }
 
-void HdGatlingRenderDelegate::SetRenderSetting(TfToken const& key, VtValue const& value)
+void HdGatlingRenderDelegate::SetRenderSetting(const TfToken& key, const VtValue& value)
 {
 #ifdef NDEBUG
   // Disallow changing debug render settings in release config.

diff --git a/src/hdGatling/renderDelegate.h b/src/hdGatling/renderDelegate.h
@@ -42,7 +42,7 @@ class HdGatlingRenderDelegate final : public HdRenderDelegate
 public:
   HdRenderSettingDescriptorList GetRenderSettingDescriptors() const override;
 
-  void SetRenderSetting(TfToken const& key, VtValue const& value) override;
+  void SetRenderSetting(const TfToken& key, const VtValue& value) override;
 
   HdCommandDescriptors GetCommandDescriptors() const override;
 

diff --git a/src/hdGatling/renderPass.cpp b/src/hdGatling/renderPass.cpp
@@ -29,6 +29,7 @@
 #include <pxr/base/gf/matrix3d.h>
 #include <pxr/base/gf/camera.h>
 
+#include <gtl/gb/Log.h>
 #include <gtl/gi/Gi.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -88,6 +89,44 @@ namespace
 
     return id;
   }
+
+  bool _IsInteractive(const HdRenderSettingsMap& settings)
+  {
+    auto settingIt = settings.find(HdRenderSettingsTokens->enableInteractive);
+    if (settingIt != settings.end())
+    {
+      return settingIt->second.Get<bool>();
+    }
+
+    // https://www.sidefx.com/docs/hdk/_h_d_k__u_s_d_hydra.html#HDK_USDHydraCustomSettingsInteractive
+    const static TfToken houdiniInteractive("houdini:interactive", TfToken::Immortal);
+    settingIt = settings.find(houdiniInteractive);
+
+    if (settingIt != settings.end())
+    {
+      const VtValue& val = settingIt->second;
+
+      const char* str = nullptr;
+      if (val.IsHolding<std::string>())
+      {
+        str = val.UncheckedGet<std::string>().c_str();
+      }
+      else if (val.IsHolding<TfToken>())
+      {
+        str = val.UncheckedGet<TfToken>().GetText();
+      }
+      else
+      {
+        // FIXME: might need to build against Houdini SDK and extract UT_StringHolder in this case
+        GB_ERROR("failed to get string from houdini:interactive setting");
+        return false;
+      }
+
+      return strcmp(str, "normal") != 0;
+    }
+
+    return false;
+  }
 }
 
 HdGatlingRenderPass::HdGatlingRenderPass(HdRenderIndex* index,
@@ -231,7 +270,7 @@ void HdGatlingRenderPass::_Execute(const HdRenderPassStateSharedPtr& renderPassS
 
   renderBuffer->Unmap();
 
-  _isConverged = true;
+  _isConverged = !_IsInteractive(_settings);
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE