Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-07 20:06:22 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-07 20:06:22 +0400
commitb20a7e01d046b95a79663da1a8072358709a5a8b (patch)
tree7772c50756a7d5a3352fd25eadbe8d41aa776615 /intern/cycles/render/integrator.h
parentd835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (diff)
Cycles: experimental correlated multi-jittered sampling pattern that can be used
instead of sobol. So far one doesn't seem to be consistently better or worse than the other for the same number of samples but more testing is needed. The random number generator itself is slower than sobol for most number of samples, except 16, 64, 256, .. because they can be computed faster. This can probably be optimized, but we can do that when/if this actually turns out to be useful. Paper this implementation is based on: http://graphics.pixar.com/library/MultiJitteredSampling/ Also includes some refactoring of RNG code, fixing a Sobol correlation issue with the first BSDF and < 16 samples, skipping some unneeded RNG calls and using a simpler unit square to unit disk function.
Diffstat (limited to 'intern/cycles/render/integrator.h')
-rw-r--r--intern/cycles/render/integrator.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h
index 9867e310d4d..fff24b506fb 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -19,6 +19,8 @@
#ifndef __INTEGRATOR_H__
#define __INTEGRATOR_H__
+#include "kernel_types.h"
+
CCL_NAMESPACE_BEGIN
class Device;
@@ -49,6 +51,7 @@ public:
float sample_clamp;
bool motion_blur;
+ int aa_samples;
int diffuse_samples;
int glossy_samples;
int transmission_samples;
@@ -58,6 +61,8 @@ public:
bool progressive;
+ SamplingPattern sampling_pattern;
+
bool need_update;
Integrator();