diff options
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/buffers.cpp | 36 | ||||
| -rw-r--r-- | intern/cycles/render/film.cpp | 14 | ||||
| -rw-r--r-- | intern/cycles/render/film.h | 1 |
3 files changed, 45 insertions, 6 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index da0453e5822..62a322b3a0f 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -173,13 +173,37 @@ bool RenderBuffers::get_pass(PassType type, float exposure, int sample, int comp else if(components == 3) { assert(pass.components == 4); - /* RGB/vector */ - for(int i = 0; i < size; i++, in += pass_stride, pixels += 3) { - float3 f = make_float3(in[0], in[1], in[2]); + if(pass.divide_type != PASS_NONE) { + /* RGB lighting passes that need to divide out color */ + pass_offset = 0; + foreach(Pass& color_pass, params.passes) { + if(color_pass.type == pass.divide_type) + break; + pass_offset += color_pass.components; + } + + float *in_divide = (float*)buffer.data_pointer + pass_offset; + + for(int i = 0; i < size; i++, in += pass_stride, in_divide += pass_stride, pixels += 3) { + float3 f = make_float3(in[0], in[1], in[2]); + float3 f_divide = make_float3(in_divide[0], in_divide[1], in_divide[2]); + + f = safe_divide_color(f*exposure, f_divide); + + pixels[0] = f.x; + pixels[1] = f.y; + pixels[2] = f.z; + } + } + else { + /* RGB/vector */ + for(int i = 0; i < size; i++, in += pass_stride, pixels += 3) { + float3 f = make_float3(in[0], in[1], in[2]); - pixels[0] = f.x*scale_exposure; - pixels[1] = f.y*scale_exposure; - pixels[2] = f.z*scale_exposure; + pixels[0] = f.x*scale_exposure; + pixels[1] = f.y*scale_exposure; + pixels[2] = f.z*scale_exposure; + } } } else if(components == 4) { diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 5fd98e20240..ed4d0b2dcde 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -38,11 +38,16 @@ static bool compare_pass_order(const Pass& a, const Pass& b) void Pass::add(PassType type, vector<Pass>& passes) { + foreach(Pass& existing_pass, passes) + if(existing_pass.type == type) + return; + Pass pass; pass.type = type; pass.filter = true; pass.exposure = false; + pass.divide_type = PASS_NONE; switch(type) { case PASS_NONE: @@ -82,26 +87,32 @@ void Pass::add(PassType type, vector<Pass>& passes) case PASS_DIFFUSE_INDIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_DIFFUSE_COLOR; break; case PASS_GLOSSY_INDIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_GLOSSY_COLOR; break; case PASS_TRANSMISSION_INDIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_TRANSMISSION_COLOR; break; case PASS_DIFFUSE_DIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_DIFFUSE_COLOR; break; case PASS_GLOSSY_DIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_GLOSSY_COLOR; break; case PASS_TRANSMISSION_DIRECT: pass.components = 4; pass.exposure = true; + pass.divide_type = PASS_TRANSMISSION_COLOR; break; case PASS_EMISSION: @@ -127,6 +138,9 @@ void Pass::add(PassType type, vector<Pass>& passes) /* order from by components, to ensure alignment so passes with size 4 come first and then passes with size 1 */ sort(passes.begin(), passes.end(), compare_pass_order); + + if(pass.divide_type != PASS_NONE) + Pass::add(pass.divide_type, passes); } bool Pass::equals(const vector<Pass>& A, const vector<Pass>& B) diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h index 511ad316460..8a3dbbf1b08 100644 --- a/intern/cycles/render/film.h +++ b/intern/cycles/render/film.h @@ -36,6 +36,7 @@ public: int components; bool filter; bool exposure; + PassType divide_type; static void add(PassType type, vector<Pass>& passes); static bool equals(const vector<Pass>& A, const vector<Pass>& B); |