forked from bartvdbraak/blender
Brecht Van Lommel
01df756bd1
This is done by adding a Volume Scatter node. In many cases you will want to add together a Volume Absorption and Volume Scatter node with the same color and density to get the expected results. This should work with branched path tracing, mixing closures, overlapping volumes, etc. However there's still various optimizations needed for sampling. The main missing thing from the volume branch is the equiangular sampling for homogeneous volumes. The heterogeneous scattering code was arranged such that we can use a single stratified random number for distance sampling, which gives less noise than pseudo random numbers for each step. For volumes where the color is textured there still seems to be something off, needs to be investigated.
371 lines
13 KiB
C
371 lines
13 KiB
C
/*
|
|
* Copyright 2011-2013 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License
|
|
*/
|
|
|
|
#include "../closure/bsdf_ashikhmin_velvet.h"
|
|
#include "../closure/bsdf_diffuse.h"
|
|
#include "../closure/bsdf_oren_nayar.h"
|
|
#include "../closure/bsdf_phong_ramp.h"
|
|
#include "../closure/bsdf_diffuse_ramp.h"
|
|
#include "../closure/bsdf_microfacet.h"
|
|
#include "../closure/bsdf_reflection.h"
|
|
#include "../closure/bsdf_refraction.h"
|
|
#include "../closure/bsdf_transparent.h"
|
|
#ifdef __ANISOTROPIC__
|
|
#include "../closure/bsdf_ward.h"
|
|
#endif
|
|
#include "../closure/bsdf_westin.h"
|
|
#include "../closure/bsdf_toon.h"
|
|
#include "../closure/bsdf_hair.h"
|
|
#ifdef __SUBSURFACE__
|
|
#include "../closure/bssrdf.h"
|
|
#endif
|
|
#ifdef __VOLUME__
|
|
#include "../closure/volume.h"
|
|
#endif
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
ccl_device int bsdf_sample(KernelGlobals *kg, const ShaderData *sd, const ShaderClosure *sc, float randu, float randv, float3 *eval, float3 *omega_in, differential3 *domega_in, float *pdf)
|
|
{
|
|
int label;
|
|
|
|
#ifdef __OSL__
|
|
if(kg->osl && sc->prim)
|
|
return OSLShader::bsdf_sample(sd, sc, randu, randv, *eval, *omega_in, *domega_in, *pdf);
|
|
#endif
|
|
|
|
switch(sc->type) {
|
|
case CLOSURE_BSDF_DIFFUSE_ID:
|
|
case CLOSURE_BSDF_BSSRDF_ID:
|
|
label = bsdf_diffuse_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
#ifdef __SVM__
|
|
case CLOSURE_BSDF_OREN_NAYAR_ID:
|
|
label = bsdf_oren_nayar_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
/*case CLOSURE_BSDF_PHONG_RAMP_ID:
|
|
label = bsdf_phong_ramp_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_RAMP_ID:
|
|
label = bsdf_diffuse_ramp_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;*/
|
|
case CLOSURE_BSDF_TRANSLUCENT_ID:
|
|
label = bsdf_translucent_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFLECTION_ID:
|
|
label = bsdf_reflection_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFRACTION_ID:
|
|
label = bsdf_refraction_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_TRANSPARENT_ID:
|
|
label = bsdf_transparent_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_GGX_ID:
|
|
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
|
|
label = bsdf_microfacet_ggx_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
|
|
label = bsdf_microfacet_beckmann_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
#ifdef __ANISOTROPIC__
|
|
case CLOSURE_BSDF_WARD_ID:
|
|
label = bsdf_ward_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
#endif
|
|
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
|
|
label = bsdf_ashikhmin_velvet_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
|
|
label = bsdf_diffuse_toon_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_GLOSSY_TOON_ID:
|
|
label = bsdf_glossy_toon_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
|
|
label = bsdf_westin_backscatter_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
|
|
label = bsdf_westin_sheen_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_REFLECTION_ID:
|
|
label = bsdf_hair_reflection_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
|
|
label = bsdf_hair_transmission_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
|
|
eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
#endif
|
|
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
|
|
label = volume_henyey_greenstein_sample(sc, sd->I, sd->dI.dx, sd->dI.dy, randu, randv, eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
|
|
break;
|
|
default:
|
|
label = LABEL_NONE;
|
|
break;
|
|
}
|
|
|
|
return label;
|
|
}
|
|
|
|
ccl_device float3 bsdf_eval(KernelGlobals *kg, const ShaderData *sd, const ShaderClosure *sc, const float3 omega_in, float *pdf)
|
|
{
|
|
float3 eval;
|
|
|
|
#ifdef __OSL__
|
|
if(kg->osl && sc->prim)
|
|
return OSLShader::bsdf_eval(sd, sc, omega_in, *pdf);
|
|
#endif
|
|
|
|
if(dot(sd->Ng, omega_in) >= 0.0f) {
|
|
switch(sc->type) {
|
|
case CLOSURE_BSDF_DIFFUSE_ID:
|
|
case CLOSURE_BSDF_BSSRDF_ID:
|
|
eval = bsdf_diffuse_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#ifdef __SVM__
|
|
case CLOSURE_BSDF_OREN_NAYAR_ID:
|
|
eval = bsdf_oren_nayar_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
/*case CLOSURE_BSDF_PHONG_RAMP_ID:
|
|
eval = bsdf_phong_ramp_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_RAMP_ID:
|
|
eval = bsdf_diffuse_ramp_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;*/
|
|
case CLOSURE_BSDF_TRANSLUCENT_ID:
|
|
eval = bsdf_translucent_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFLECTION_ID:
|
|
eval = bsdf_reflection_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFRACTION_ID:
|
|
eval = bsdf_refraction_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_TRANSPARENT_ID:
|
|
eval = bsdf_transparent_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_GGX_ID:
|
|
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
|
|
eval = bsdf_microfacet_ggx_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
|
|
eval = bsdf_microfacet_beckmann_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#ifdef __ANISOTROPIC__
|
|
case CLOSURE_BSDF_WARD_ID:
|
|
eval = bsdf_ward_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
|
|
eval = bsdf_ashikhmin_velvet_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
|
|
eval = bsdf_diffuse_toon_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_GLOSSY_TOON_ID:
|
|
eval = bsdf_glossy_toon_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
|
|
eval = bsdf_westin_backscatter_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
|
|
eval = bsdf_westin_sheen_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_REFLECTION_ID:
|
|
eval = bsdf_hair_reflection_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
|
|
eval = bsdf_hair_transmission_eval_reflect(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
#ifdef __VOLUME__
|
|
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
|
|
eval = volume_henyey_greenstein_eval_phase(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
default:
|
|
eval = make_float3(0.0f, 0.0f, 0.0f);
|
|
break;
|
|
}
|
|
}
|
|
else {
|
|
switch(sc->type) {
|
|
case CLOSURE_BSDF_DIFFUSE_ID:
|
|
case CLOSURE_BSDF_BSSRDF_ID:
|
|
eval = bsdf_diffuse_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#ifdef __SVM__
|
|
case CLOSURE_BSDF_OREN_NAYAR_ID:
|
|
eval = bsdf_oren_nayar_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_TRANSLUCENT_ID:
|
|
eval = bsdf_translucent_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFLECTION_ID:
|
|
eval = bsdf_reflection_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_REFRACTION_ID:
|
|
eval = bsdf_refraction_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_TRANSPARENT_ID:
|
|
eval = bsdf_transparent_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_GGX_ID:
|
|
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
|
|
eval = bsdf_microfacet_ggx_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
|
|
eval = bsdf_microfacet_beckmann_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#ifdef __ANISOTROPIC__
|
|
case CLOSURE_BSDF_WARD_ID:
|
|
eval = bsdf_ward_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
|
|
eval = bsdf_ashikhmin_velvet_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
|
|
eval = bsdf_diffuse_toon_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_GLOSSY_TOON_ID:
|
|
eval = bsdf_glossy_toon_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
|
|
eval = bsdf_westin_backscatter_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
|
|
eval = bsdf_westin_sheen_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_REFLECTION_ID:
|
|
eval = bsdf_hair_reflection_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
|
|
eval = bsdf_hair_transmission_eval_transmit(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
#ifdef __VOLUME__
|
|
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
|
|
eval = volume_henyey_greenstein_eval_phase(sc, sd->I, omega_in, pdf);
|
|
break;
|
|
#endif
|
|
default:
|
|
eval = make_float3(0.0f, 0.0f, 0.0f);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return eval;
|
|
}
|
|
|
|
ccl_device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness)
|
|
{
|
|
#ifdef __OSL__
|
|
if(kg->osl && sc->prim) {
|
|
OSLShader::bsdf_blur(sc, roughness);
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
switch(sc->type) {
|
|
case CLOSURE_BSDF_DIFFUSE_ID:
|
|
case CLOSURE_BSDF_BSSRDF_ID:
|
|
bsdf_diffuse_blur(sc, roughness);
|
|
break;
|
|
#ifdef __SVM__
|
|
case CLOSURE_BSDF_OREN_NAYAR_ID:
|
|
bsdf_oren_nayar_blur(sc, roughness);
|
|
break;
|
|
/*case CLOSURE_BSDF_PHONG_RAMP_ID:
|
|
bsdf_phong_ramp_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_RAMP_ID:
|
|
bsdf_diffuse_ramp_blur(sc, roughness);
|
|
break;*/
|
|
case CLOSURE_BSDF_TRANSLUCENT_ID:
|
|
bsdf_translucent_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_REFLECTION_ID:
|
|
bsdf_reflection_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_REFRACTION_ID:
|
|
bsdf_refraction_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_TRANSPARENT_ID:
|
|
bsdf_transparent_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_GGX_ID:
|
|
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
|
|
bsdf_microfacet_ggx_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
|
|
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
|
|
bsdf_microfacet_beckmann_blur(sc, roughness);
|
|
break;
|
|
#ifdef __ANISOTROPIC__
|
|
case CLOSURE_BSDF_WARD_ID:
|
|
bsdf_ward_blur(sc, roughness);
|
|
break;
|
|
#endif
|
|
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
|
|
bsdf_ashikhmin_velvet_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
|
|
bsdf_diffuse_toon_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_GLOSSY_TOON_ID:
|
|
bsdf_glossy_toon_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
|
|
bsdf_westin_backscatter_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
|
|
bsdf_westin_sheen_blur(sc, roughness);
|
|
break;
|
|
case CLOSURE_BSDF_HAIR_REFLECTION_ID:
|
|
case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
|
|
bsdf_hair_reflection_blur(sc, roughness);
|
|
break;
|
|
#endif
|
|
/* todo: do we want to blur volume closures? */
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|