Commit 68c519ef authored by Laurent Belcour's avatar Laurent Belcour

Merge

parents 078e664f 86236ccf
......@@ -39,7 +39,7 @@ you will need the following command:
\a brdf2brdf converts an ALTA brdf file into another format such as
Matlab m file, C++ code, or BRDF Explorer shader. Note that this tool cannot
convert to another ALTA file (e.g. converting a Blinn lobe to a Beckmann
convert to another ALTA file (e.g., converting a Blinn lobe to a Beckmann
distribution).
<br />
......
......@@ -19,6 +19,10 @@ SConscript('nonlinear_function_isotropic_lafortune/SConscript')
# Building nonlinear masking functions
SConscript('nonlinear_shadowing_smith/SConscript')
# Building nonlinear Fresnel functions
SConscript('nonlinear_fresnel_schlick/SConscript')
SConscript('nonlinear_fresnel_normalized_schlick/SConscript')
# # Building rational fitters
SConscript('rational_fitter_eigen/SConscript')
SConscript('rational_fitter_leastsquare/SConscript')
......
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['function.cpp']
env.SharedLibrary('../../build/nonlinear_fresnel_normalized_schlick', sources)
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['function.cpp']
env.SharedLibrary('../../build/nonlinear_fresnel_schlick', sources)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment