refactor frame_asset -> frame_context (#63)

crocdialer · Jun 1, 2024 · 8c21586 · 8c21586
1 parent 351b0bd
commit 8c21586
Show file tree

Hide file tree

Showing 4 changed files with 483 additions and 475 deletions.
diff --git a/include/vierkant/PBRDeferred.hpp b/include/vierkant/PBRDeferred.hpp
@@ -5,13 +5,13 @@
 
 #include <deque>
 
-#include <vierkant/RayBuilder.hpp>
 #include <vierkant/Bloom.hpp>
+#include <vierkant/Compute.hpp>
 #include <vierkant/DrawContext.hpp>
+#include <vierkant/GBuffer.hpp>
 #include <vierkant/PipelineCache.hpp>
+#include <vierkant/RayBuilder.hpp>
 #include <vierkant/SceneRenderer.hpp>
-#include <vierkant/Compute.hpp>
-#include <vierkant/GBuffer.hpp>
 #include <vierkant/ambient_occlusion.hpp>
 #include <vierkant/culling.hpp>
 #include <vierkant/gpu_culling.hpp>
@@ -202,7 +202,7 @@ class PBRDeferred : public vierkant::SceneRenderer
      */
     const std::deque<statistics_t> &statistics() const { return m_statistics; }
 
-    const image_bundle_t& image_bundle() const;
+    const image_bundle_t &image_bundle() const;
 
     //! settings struct
     settings_t settings;
@@ -258,7 +258,7 @@ class PBRDeferred : public vierkant::SceneRenderer
         float weights[61] = {};
     };
 
-    struct frame_asset_t
+    struct frame_context_t
     {
         std::chrono::steady_clock::time_point timestamp;
 
@@ -342,17 +342,17 @@ class PBRDeferred : public vierkant::SceneRenderer
         float motionblur_gain = 1.f;
     };
 
-    static const char* to_string(SemaphoreValue v);
+    static const char *to_string(SemaphoreValue v);
 
     explicit PBRDeferred(const vierkant::DevicePtr &device, const create_info_t &create_info);
 
-    void update_timing(frame_asset_t &frame_asset);
+    void update_timing(frame_context_t &frame_context);
 
-    void update_recycling(const SceneConstPtr &scene, const CameraPtr &cam, frame_asset_t &frame_asset);
+    void update_recycling(const SceneConstPtr &scene, const CameraPtr &cam, frame_context_t &frame_context);
 
-    void update_animation_transforms(frame_asset_t &frame_asset);
+    void update_animation_transforms(frame_context_t &frame_context);
 
-    void resize_storage(frame_asset_t &frame_asset, const glm::uvec2 &resolution, const glm::uvec2 &out_resolution);
+    void resize_storage(frame_context_t &frame_context, const glm::uvec2 &resolution, const glm::uvec2 &out_resolution);
 
     vierkant::Framebuffer &geometry_pass(vierkant::cull_result_t &cull_result);
 
@@ -381,7 +381,7 @@ class PBRDeferred : public vierkant::SceneRenderer
 
     size_t m_sample_index = 0;
 
-    std::vector<frame_asset_t> m_frame_assets;
+    std::vector<frame_context_t> m_frame_contexts;
 
     vierkant::DrawContext m_draw_context;
 

diff --git a/include/vierkant/PBRPathTracer.hpp b/include/vierkant/PBRPathTracer.hpp
@@ -158,7 +158,7 @@ class PBRPathTracer : public vierkant::SceneRenderer
         MAX_VALUE
     };
 
-    struct frame_asset_t
+    struct frame_context_t
     {
         settings_t settings;
 
@@ -240,20 +240,20 @@ class PBRPathTracer : public vierkant::SceneRenderer
 
     PBRPathTracer(const vierkant::DevicePtr &device, const create_info_t &create_info);
 
-    void pre_render(frame_asset_t &frame_asset);
+    void pre_render(frame_context_t &frame_context);
 
-    void update_acceleration_structures(frame_asset_t &frame_asset, const SceneConstPtr &scene,
+    void update_acceleration_structures(frame_context_t &frame_context, const SceneConstPtr &scene,
                                         const std::set<std::string> &tags);
 
-    void update_trace_descriptors(frame_asset_t &frame_asset, const CameraPtr &cam);
+    void update_trace_descriptors(frame_context_t &frame_context, const CameraPtr &cam);
 
-    void path_trace_pass(frame_asset_t &frame_asset, const vierkant::SceneConstPtr &scene, const CameraPtr &cam);
+    void path_trace_pass(frame_context_t &frame_context, const vierkant::SceneConstPtr &scene, const CameraPtr &cam);
 
-    void denoise_pass(frame_asset_t &frame_asset);
+    void denoise_pass(frame_context_t &frame_context);
 
-    void post_fx_pass(frame_asset_t &frame_asset);
+    void post_fx_pass(frame_context_t &frame_context);
 
-    void resize_storage(frame_asset_t &frame_asset, const glm::uvec2 &resolution);
+    void resize_storage(frame_context_t &frame_context, const glm::uvec2 &resolution);
 
     //! device
     vierkant::DevicePtr m_device;
@@ -287,7 +287,7 @@ class PBRPathTracer : public vierkant::SceneRenderer
     //! information for a raytracing pipeline
     raytracing_shader_map_t m_shader_stages = {}, m_shader_stages_env = {};
 
-    std::vector<frame_asset_t> m_frame_assets;
+    std::vector<frame_context_t> m_frame_contexts;
 
     vierkant::DrawContext m_draw_context;