From c69750a006bd0d2d34b7d0d5d1eb1109c55882de Mon Sep 17 00:00:00 2001 From: Kevin Masson Date: Wed, 7 Mar 2018 17:06:55 +0100 Subject: [PATCH] Fix alignement --- .../rendering/final/adaptivepixelrenderer.cpp | 30 +++++++++---------- .../rendering/final/uniformpixelrenderer.cpp | 12 ++++---- .../kernel/rendering/pixelrendererbase.cpp | 12 ++++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/appleseed/renderer/kernel/rendering/final/adaptivepixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/adaptivepixelrenderer.cpp index 02dfbf99b0..09f1a30b0f 100644 --- a/src/appleseed/renderer/kernel/rendering/final/adaptivepixelrenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/final/adaptivepixelrenderer.cpp @@ -126,9 +126,9 @@ namespace } void on_tile_begin( - const Frame& frame, - Tile& tile, - TileStack& aov_tiles) override + const Frame& frame, + Tile& tile, + TileStack& aov_tiles) override { PixelRendererBase::on_tile_begin(frame, tile, aov_tiles); @@ -148,9 +148,9 @@ namespace } void on_tile_end( - const Frame& frame, - Tile& tile, - TileStack& aov_tiles) override + const Frame& frame, + Tile& tile, + TileStack& aov_tiles) override { PixelRendererBase::on_tile_end(frame, tile, aov_tiles); @@ -331,7 +331,7 @@ namespace private: struct Parameters { - const SamplingContext::Modei m_sampling_mode; + const SamplingContext::Mode m_sampling_mode; const size_t m_min_samples; const size_t m_max_samples; const float m_max_variation; @@ -345,14 +345,14 @@ namespace } }; - const Parameters m_params; - auto_release_ptr m_sample_renderer; - size_t m_variation_aov_index; - size_t m_samples_aov_index; - int m_scratch_fb_half_width; - int m_scratch_fb_half_height; - unique_ptr m_scratch_fb; - unique_ptr m_diagnostics; + const Parameters m_params; + auto_release_ptr m_sample_renderer; + size_t m_variation_aov_index; + size_t m_samples_aov_index; + int m_scratch_fb_half_width; + int m_scratch_fb_half_height; + unique_ptr m_scratch_fb; + unique_ptr m_diagnostics; static Color4f scalar_to_color(const float value) { diff --git a/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp index 5aaefa8db0..6727b58e7d 100644 --- a/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp @@ -287,12 +287,12 @@ namespace } }; - const Parameters m_params; - auto_release_ptr m_sample_renderer; - const size_t m_sample_count; - const int m_sqrt_sample_count; - PixelSampler m_pixel_sampler; - Population m_total_sampling_dim; + const Parameters m_params; + auto_release_ptr m_sample_renderer; + const size_t m_sample_count; + const int m_sqrt_sample_count; + PixelSampler m_pixel_sampler; + Population m_total_sampling_dim; }; } diff --git a/src/appleseed/renderer/kernel/rendering/pixelrendererbase.cpp b/src/appleseed/renderer/kernel/rendering/pixelrendererbase.cpp index a51bd5577e..807fadf77b 100644 --- a/src/appleseed/renderer/kernel/rendering/pixelrendererbase.cpp +++ b/src/appleseed/renderer/kernel/rendering/pixelrendererbase.cpp @@ -76,9 +76,9 @@ PixelRendererBase::PixelRendererBase( } void PixelRendererBase::on_tile_begin( - const Frame& frame, - Tile& tile, - TileStack& aov_tiles) + const Frame& frame, + Tile& tile, + TileStack& aov_tiles) { if (m_invalid_sample_aov_index != size_t(~0)) { @@ -88,9 +88,9 @@ void PixelRendererBase::on_tile_begin( } void PixelRendererBase::on_tile_end( - const Frame& frame, - Tile& tile, - TileStack& aov_tiles) + const Frame& frame, + Tile& tile, + TileStack& aov_tiles) { if (m_invalid_sample_aov_index != size_t(~0)) {