Enhance SDL GUI and CUDA renderer with scene selection controls and performance metrics

pmudry · pmudry · commit 18c8498a814e · 2026-03-12T23:57:23.000+01:00
diff --git a/resources/caustics_chapel.yaml b/resources/caustics_chapel.yaml
@@ -0,0 +1,29 @@
+camera:
+  position: [0.0, 1.0, 5.5]
+  look_at: [0.0, 0.7, 0.0]
+  up: [0.0, 1.0, 0.0]
+  fov: 42.0
+
+settings:
+  background_color: [0.0, 0.0, 0.0]
+  ambient_light: 0.0
+  background_intensity: 0.0
+  use_bvh: true
+
+materials:
+  - { name: wall, type: lambertian, albedo: [0.75, 0.75, 0.75] }
+  - { name: floor, type: lambertian, albedo: [0.65, 0.62, 0.58] }
+  - { name: glass, type: glass, albedo: [1.0, 1.0, 1.0], refractive_index: 1.5, transmission: 1.0 }
+  - { name: bronze, type: rough_mirror, albedo: [0.82, 0.58, 0.30], roughness: 0.06, metallic: 1.0 }
+  - { name: light, type: light, emission: [25.0, 20.0, 16.0], albedo: [1.0, 1.0, 1.0] }
+
+geometry:
+  - { type: rectangle, material: floor, corner: [-2.5, 0.0, -3.0], u: [5.0, 0.0, 0.0], v: [0.0, 0.0, 6.0] }
+  - { type: rectangle, material: wall, corner: [-2.5, 2.8, -3.0], u: [5.0, 0.0, 0.0], v: [0.0, 0.0, 6.0] }
+  - { type: rectangle, material: wall, corner: [-2.5, 0.0, -3.0], u: [5.0, 0.0, 0.0], v: [0.0, 2.8, 0.0] }
+  - { type: rectangle, material: wall, corner: [-2.5, 0.0, -3.0], u: [0.0, 0.0, 6.0], v: [0.0, 2.8, 0.0] }
+  - { type: rectangle, material: wall, corner: [2.5, 0.0, -3.0], u: [0.0, 0.0, 6.0], v: [0.0, 2.8, 0.0] }
+  - { type: rectangle, material: light, corner: [-0.6, 2.79, -0.4], u: [1.2, 0.0, 0.0], v: [0.0, 0.0, 0.8] }
+  - { type: sphere, material: glass, center: [-0.8, 0.6, -0.4], radius: 0.6 }
+  - { type: sphere, material: glass, center: [0.7, 0.45, 0.6], radius: 0.45 }
+  - { type: sphere, material: bronze, center: [0.0, 0.35, -1.4], radius: 0.35 }
diff --git a/resources/displacement_garden.yaml b/resources/displacement_garden.yaml
@@ -0,0 +1,26 @@
+camera:
+  position: [0.0, 1.1, 7.0]
+  look_at: [0.0, 0.5, 0.0]
+  up: [0.0, 1.0, 0.0]
+  fov: 42.0
+
+settings:
+  background_color: [0.08, 0.12, 0.18]
+  ambient_light: 0.05
+  background_intensity: 0.25
+  use_bvh: true
+
+materials:
+  - { name: ground, type: lambertian, albedo: [0.35, 0.38, 0.40] }
+  - { name: matte, type: lambertian, albedo: [0.75, 0.74, 0.72] }
+  - { name: blue_metal, type: rough_mirror, albedo: [0.45, 0.62, 0.95], roughness: 0.15, metallic: 1.0 }
+  - { name: light, type: light, emission: [10.0, 8.0, 6.5], albedo: [1.0, 1.0, 1.0] }
+
+geometry:
+  - { type: sphere, material: ground, center: [0.0, -1000.0, 0.0], radius: 1000.0 }
+  - { type: rectangle, material: light, corner: [-4.0, 4.0, -2.0], u: [8.0, 0.0, 0.0], v: [0.0, 0.0, 3.0], visible: false }
+  - { type: displaced_sphere, material: matte, center: [-3.0, 0.55, -1.0], radius: 0.55, displacement_scale: 0.05, pattern_type: 0 }
+  - { type: displaced_sphere, material: matte, center: [-1.5, 0.55, -0.6], radius: 0.55, displacement_scale: 0.10, pattern_type: 0 }
+  - { type: displaced_sphere, material: blue_metal, center: [0.0, 0.55, -0.2], radius: 0.55, displacement_scale: 0.16, pattern_type: 0 }
+  - { type: displaced_sphere, material: matte, center: [1.5, 0.55, 0.2], radius: 0.55, displacement_scale: 0.24, pattern_type: 0 }
+  - { type: displaced_sphere, material: blue_metal, center: [3.0, 0.55, 0.6], radius: 0.55, displacement_scale: 0.32, pattern_type: 0 }
diff --git a/resources/material_laboratory.yaml b/resources/material_laboratory.yaml
@@ -0,0 +1,56 @@
+camera:
+  position: [0.0, 1.2, 6.5]
+  look_at: [0.0, 0.7, 0.0]
+  up: [0.0, 1.0, 0.0]
+  fov: 45.0
+
+settings:
+  background_color: [0.02, 0.02, 0.03]
+  ambient_light: 0.01
+  background_intensity: 0.0
+  use_bvh: true
+
+materials:
+  - name: ground
+    type: lambertian
+    albedo: [0.45, 0.45, 0.48]
+  - name: light
+    type: light
+    emission: [14.0, 12.0, 10.0]
+    albedo: [1.0, 1.0, 1.0]
+  - name: metal_0
+    type: rough_mirror
+    albedo: [0.90, 0.85, 0.78]
+    roughness: 0.01
+    metallic: 1.0
+  - name: metal_1
+    type: rough_mirror
+    albedo: [0.90, 0.85, 0.78]
+    roughness: 0.08
+    metallic: 1.0
+  - name: metal_2
+    type: rough_mirror
+    albedo: [0.90, 0.85, 0.78]
+    roughness: 0.2
+    metallic: 1.0
+  - name: glass
+    type: glass
+    albedo: [1.0, 1.0, 1.0]
+    refractive_index: 1.52
+    transmission: 1.0
+
+geometry:
+  - type: sphere
+    material: ground
+    center: [0.0, -1000.0, 0.0]
+    radius: 1000.0
+  - type: rectangle
+    material: light
+    corner: [-2.0, 4.0, -1.5]
+    u: [4.0, 0.0, 0.0]
+    v: [0.0, 0.0, 3.0]
+    visible: false
+  - { type: sphere, material: metal_0, center: [-2.2, 0.7, 0.0], radius: 0.7 }
+  - { type: sphere, material: metal_1, center: [0.0, 0.7, 0.0], radius: 0.7 }
+  - { type: sphere, material: metal_2, center: [2.2, 0.7, 0.0], radius: 0.7 }
+  - { type: sphere, material: glass, center: [0.0, 0.7, -2.0], radius: 0.7 }
diff --git a/src/rayon/camera/sdl/sdl_gui_handler.hpp b/src/rayon/camera/sdl/sdl_gui_handler.hpp
@@ -26,6 +26,7 @@
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 #include "external/stb_image_resize2.h"
 
+#include <chrono>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ -66,7 +67,8 @@ class SDLGuiHandler
    SDLGuiHandler(int image_width, int image_height, GuiTheme initial_theme = GuiTheme::NORD)
        : image_width(image_width), image_height(image_height), show_controls(true), collapse_headers(false),
          reset_headers(false), window_collapse_requested(false), window_collapsed(false), current_theme(initial_theme), initialized(false), window(nullptr), renderer(nullptr),
-         texture(nullptr), logo_texture(nullptr)
+         texture(nullptr), logo_texture(nullptr), last_perf_sample_time_ms(0),
+         perf_sample_interval_ms(50), perf_time_window_ms(20000)
    {
    }
 
@@ -217,15 +219,36 @@ class SDLGuiHandler
                   ImGui::Text("Throughput: %.0f S/s", sps);
                ImGui::Text("Time/Pass: %.3f ms", ms_per_sample);
 
-               if (sps > 0.0f)
+               ImGui::Text("Graph dt: %u ms", perf_sample_interval_ms);
+               ImGui::SameLine();
+               if (ImGui::SmallButton("-##graph_dt"))
+               {
+                  perf_sample_interval_ms = (perf_sample_interval_ms > 20) ? perf_sample_interval_ms - 20 : 20;
+                  last_perf_sample_time_ms = 0;
+               }
+               ImGui::SameLine();
+               if (ImGui::SmallButton("+##graph_dt"))
                {
-                  sps_history.push_back(sps);
-                  ms_history.push_back(ms_per_sample);
+                  perf_sample_interval_ms = (perf_sample_interval_ms < 1000) ? perf_sample_interval_ms + 20 : 1000;
+                  last_perf_sample_time_ms = 0;
+               }
 
-                  if (sps_history.size() > 500)
+               if (sps > 0.0f)
+               {
+                  const Uint32 now_ms = SDL_GetTicks();
+                  if (last_perf_sample_time_ms == 0 || now_ms - last_perf_sample_time_ms >= perf_sample_interval_ms)
                   {
-                     sps_history.erase(sps_history.begin());
-                     ms_history.erase(ms_history.begin());
+                     sps_history.push_back(sps);
+                     ms_history.push_back(ms_per_sample);
+                     last_perf_sample_time_ms = now_ms;
+
+                     // Fixed x-axis time range: keep only the last N seconds worth of samples.
+                     const size_t max_points = std::max<size_t>(10, perf_time_window_ms / perf_sample_interval_ms);
+                     if (sps_history.size() > max_points)
+                     {
+                        sps_history.erase(sps_history.begin());
+                        ms_history.erase(ms_history.begin());
+                     }
                   }
                }
 
@@ -250,11 +273,6 @@ class SDLGuiHandler
                   ImGui::PopStyleColor();
                }
 
-               if (auto_accumulate)
-               {
-                  ImGui::Separator();
-                  ImGui::Checkbox("Auto-Accumulate (Space)", auto_accumulate);
-               }
             }
 
             // --- Adaptive Sampling ---
@@ -264,7 +282,13 @@ class SDLGuiHandler
                   ImGui::SetNextItemOpen(!collapse_headers);
                if (ImGui::CollapsingHeader("Adaptive Sampling"))
                {
-                  ImGui::Checkbox("Enable Adaptive Sampling", adaptive_sampling);
+                  if (auto_accumulate)
+                  {
+                     ImGui::Checkbox("Accumulate", auto_accumulate);
+                     ImGui::SameLine();
+                  }
+
+                  ImGui::Checkbox("Adaptive Sampling##adaptive_toggle", adaptive_sampling);
 
                   if (*adaptive_sampling)
                   {
@@ -415,6 +439,7 @@ class SDLGuiHandler
                ImGui::BulletText("SPACE: Toggle Accumulation");
                ImGui::BulletText("A: Toggle Normal Arrows");
                ImGui::BulletText("N: Toggle Show Normals");
+               ImGui::BulletText("Left/Right: Previous/Next Scene");
                ImGui::BulletText("O: Auto-Orbit");
                ImGui::BulletText("Enter: Collapse/Expand Window");
                ImGui::BulletText("H: Hide/Show UI");
@@ -484,6 +509,9 @@ class SDLGuiHandler
    SDL_Rect logo_rect;
    std::vector<float> sps_history;
    std::vector<float> ms_history;
+   Uint32 last_perf_sample_time_ms;
+   Uint32 perf_sample_interval_ms;
+   Uint32 perf_time_window_ms;
 
    static void cleanupSDL() { SDL_Quit(); }
 
diff --git a/src/rayon/gpu_renderers/renderer_cuda_progressive_host.hpp b/src/rayon/gpu_renderers/renderer_cuda_progressive_host.hpp
@@ -136,6 +136,7 @@ class RendererCUDAProgressive : public IRenderer
       // Rendering buffers
       SDL_Event event;
       vector<unsigned char> display_image(image_width * image_height * image_channels);
+      vector<unsigned char> base_display_image(image_width * image_height * image_channels);
       RenderTargetView display_view{&display_image, image_width, image_height, image_channels};
 
       void *d_rand_states = nullptr;
@@ -310,6 +311,52 @@ class RendererCUDAProgressive : public IRenderer
       // Build initial GPU scene
       CudaScene::Scene *gpu_scene = Scene::CudaSceneBuilder::buildGPUScene(active_scene);
 
+      auto applySceneSelectionChange = [&]() {
+         std::cout << "Switching to scene: " << scene_names[current_scene_index] << std::endl;
+         switch (current_scene_index)
+         {
+         case 0:
+            active_scene = Scene::SceneFactory::createDefaultScene();
+            break;
+         case 1:
+            active_scene = Scene::SceneFactory::singleObjectScene();
+            break;
+         case 2:
+            active_scene = Scene::SceneFactory::fromYAML("../resources/cornell_box.yaml");
+            break;
+         case 3:
+            active_scene = Scene::SceneFactory::fromYAML("../resources/simple_scene.yaml");
+            break;
+         case 4:
+            active_scene = Scene::SceneFactory::fromYAML("../resources/bvh_test_scene.yaml");
+            break;
+         }
+
+         // Update original_scene as well, then re-apply visualization mode.
+         original_scene = active_scene;
+         cpu_scene_for_arrows = Scene::CPUSceneBuilder::buildCPUScene(original_scene);
+         applyVisualizationToActiveScene();
+
+         // Apply scene camera
+         look_from = active_scene.camera_position;
+         look_at = active_scene.camera_look_at;
+         camera.vup = active_scene.camera_up;
+         camera.vfov = active_scene.camera_fov;
+         cam_fov_ui = static_cast<float>(camera.vfov);
+         camera_control.initializeCameraControls(look_from, look_at);
+
+         // Apply scene-specific rendering settings
+         background_intensity = active_scene.background_intensity;
+
+         // Rebuild GPU scene
+         Scene::CudaSceneBuilder::freeGPUScene(gpu_scene);
+         gpu_scene = Scene::CudaSceneBuilder::buildGPUScene(active_scene);
+
+         // Reset rendering state
+         camera_changed = true;
+         applySceneSettings();
+      };
+
       // Timing for auto-orbit
       auto last_frame_time = std::chrono::high_resolution_clock::now();
 
@@ -319,6 +366,7 @@ class RendererCUDAProgressive : public IRenderer
       while (running)
       {
          bool visualization_toggled_by_key = false;
+         bool scene_switched_by_key = false;
 
          // Handle events
          while (SDLGuiHandler::pollEvent(event))
@@ -383,6 +431,16 @@ class RendererCUDAProgressive : public IRenderer
                           : static_cast<int>(VisualizationMode::SHOW_NORMALS);
                   visualization_toggled_by_key = true;
                }
+               else if (event.key.keysym.sym == SDLK_LEFT)
+               {
+                  current_scene_index = (current_scene_index - 1 + scene_count) % scene_count;
+                  scene_switched_by_key = true;
+               }
+               else if (event.key.keysym.sym == SDLK_RIGHT)
+               {
+                  current_scene_index = (current_scene_index + 1) % scene_count;
+                  scene_switched_by_key = true;
+               }
                else if (camera_control.handleKeyDown(event, accumulation_enabled, samples_per_batch_float,
                                                       light_intensity, background_intensity, needs_rerender,
                                                       camera_changed))
@@ -417,6 +475,11 @@ class RendererCUDAProgressive : public IRenderer
             }
          }
 
+         if (scene_switched_by_key)
+         {
+            applySceneSelectionChange();
+         }
+
          if (visualization_toggled_by_key)
          {
             applyVisualizationToActiveScene();
@@ -479,6 +542,9 @@ class RendererCUDAProgressive : public IRenderer
                                          display_view.height, display_view.channels, current_samples);
             }
 
+            // Keep a clean, overlay-free base image for deterministic per-frame compositing.
+            base_display_image = display_image;
+
             if (target.pixels)
                *target.pixels = display_image;
             needs_rerender = false;
@@ -551,6 +617,9 @@ class RendererCUDAProgressive : public IRenderer
                                          image_channels, current_samples);
             }
 
+            // Keep a clean, overlay-free base image for deterministic per-frame compositing.
+            base_display_image = display_image;
+
             if (target.pixels)
                *target.pixels = display_image;
          }
@@ -584,6 +653,8 @@ class RendererCUDAProgressive : public IRenderer
          float cam_pos[3] = {(float)look_from.x(), (float)look_from.y(), (float)look_from.z()};
          float cam_lookat[3] = {(float)look_at.x(), (float)look_at.y(), (float)look_at.z()};
 
+         // Recompose from a stable base every frame so overlays don't stack over time.
+         display_image = base_display_image;
          drawCPUArrowOverlay(display_image);
 
          gui.updateDisplay(display_image, image_channels, current_sps, current_ms_per_sample, current_samples,
@@ -606,49 +677,7 @@ class RendererCUDAProgressive : public IRenderer
          // Handle scene change from UI
          if (current_scene_index != old_scene_index)
          {
-            std::cout << "Switching to scene: " << scene_names[current_scene_index] << std::endl;
-            switch (current_scene_index)
-            {
-            case 0:
-               active_scene = Scene::SceneFactory::createDefaultScene();
-               break;
-            case 1:
-               active_scene = Scene::SceneFactory::singleObjectScene();
-               break;
-            case 2:
-               active_scene = Scene::SceneFactory::fromYAML("../resources/cornell_box.yaml");
-               break;
-            case 3:
-               active_scene = Scene::SceneFactory::fromYAML("../resources/simple_scene.yaml");
-               break;
-            case 4:
-               active_scene = Scene::SceneFactory::fromYAML("../resources/bvh_test_scene.yaml");
-               break;
-            }
-
-            // Update original_scene as well, then re-apply visualization mode.
-            original_scene = active_scene;
-            cpu_scene_for_arrows = Scene::CPUSceneBuilder::buildCPUScene(original_scene);
-            applyVisualizationToActiveScene();
-            
-            // Apply scene camera
-            look_from = active_scene.camera_position;
-            look_at = active_scene.camera_look_at;
-            camera.vup = active_scene.camera_up;
-            camera.vfov = active_scene.camera_fov;
-            cam_fov_ui = static_cast<float>(camera.vfov);
-            camera_control.initializeCameraControls(look_from, look_at);
-
-            // Apply scene-specific rendering settings
-            background_intensity = active_scene.background_intensity;
-
-            // Rebuild GPU scene
-            Scene::CudaSceneBuilder::freeGPUScene(gpu_scene);
-            gpu_scene = Scene::CudaSceneBuilder::buildGPUScene(active_scene);
-
-            // Reset rendering state
-            camera_changed = true;
-            applySceneSettings();
+            applySceneSelectionChange();
          }
 
          // Handle visualization mode change
