Scene graph + material editor

Script sync from SHA: 2939e21ec138fbba8753d8a355a4c40bdb7962e4
nvpro-samples · Oct 2, 2024 · 96492c5 · 96492c5
1 parent 6f201fb
commit 96492c5
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 161 deletions.
diff --git a/src/alloc_dma.h b/src/alloc_dma.h
diff --git a/src/main.cpp b/src/main.cpp
@@ -225,7 +225,8 @@ class GltfRendererElement : public nvvkhl::IAppElement
         m_tonemapper->onUI();
       }
 
-      m_scene.onUI(m_resources, m_settings, m_app->getWindowHandle());
+      if(!m_busy.isBusy())
+        m_scene.onUI(m_resources, m_settings, m_app->getWindowHandle());
     }
     ImGui::End();  // Settings
 

diff --git a/src/resources.cpp b/src/resources.cpp
@@ -71,7 +71,7 @@ void gltfr::Resources::init(VulkanInfo& _ctx)
 {
   ctx = _ctx;
 
-  m_allocator       = std::make_unique<AllocDma>(ctx.device, ctx.physicalDevice);
+  m_allocator       = std::make_unique<nvvk::ResourceAllocatorDma>(ctx.device, ctx.physicalDevice);
   m_finalImage      = std::make_unique<nvvkhl::GBuffer>(ctx.device, m_allocator.get());
   m_tempCommandPool = std::make_unique<nvvk::CommandPool>(ctx.device, ctx.GCT0.familyIndex,
                                                           VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, ctx.GCT0.queue);

diff --git a/src/resources.hpp b/src/resources.hpp
@@ -36,12 +36,13 @@ It holds the Vulkan resources, such as
 */
 
 // nvpro-core
+#include "nvvk/resourceallocator_vk.hpp"
+#include "nvvk/context_vk.hpp"
 #include "nvvk/commands_vk.hpp"
 #include "nvvkhl/gbuffer.hpp"
 #include "nvvkhl/glsl_compiler.hpp"
 
 // Local to application
-#include "alloc_dma.h"
 #include "slang_compiler.hpp"
 
 namespace gltfr {
@@ -88,11 +89,11 @@ class Resources
   // Vulkan context resources
   VulkanInfo ctx{};
 
-  std::unique_ptr<AllocDma>             m_allocator{};
-  std::unique_ptr<nvvkhl::GBuffer>      m_finalImage{};  // G-Buffers: color
-  std::unique_ptr<nvvk::CommandPool>    m_tempCommandPool{};
-  std::unique_ptr<nvvkhl::GlslCompiler> m_glslC{};
-  std::unique_ptr<SlangCompiler>        m_slangC{};
+  std::unique_ptr<nvvk::ResourceAllocatorDma> m_allocator{};
+  std::unique_ptr<nvvkhl::GBuffer>            m_finalImage{};  // G-Buffers: color
+  std::unique_ptr<nvvk::CommandPool>          m_tempCommandPool{};
+  std::unique_ptr<nvvkhl::GlslCompiler>       m_glslC{};
+  std::unique_ptr<SlangCompiler>              m_slangC{};
 
 private:
   bool m_hasGBufferChanged{false};