Commit 628ad94b authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Adding shadowing functions to the scons

parent d1d244fa
......@@ -10,14 +10,19 @@ SConscript('nonlinear_fitter_eigen/SConscript')
SConscript('rational_fitter_eigen/SConscript')
SConscript('rational_fitter_quadprog/SConscript')
# Building functions
# Building nonlinear functions
SConscript('nonlinear_function_diffuse/SConscript')
SConscript('nonlinear_function_beckmann/SConscript')
SConscript('nonlinear_function_abc/SConscript')
SConscript('nonlinear_function_blinn/SConscript')
SConscript('nonlinear_function_isotropic_lafortune/SConscript')
# Building nonlinear masking functions
SConscript('nonlinear_shadowing_smith/SConscript')
# Building rational functions
SConscript('rational_function_legendre/SConscript')
SConscript('rational_function_chebychev/SConscript')
SConscript('nonlinear_function_isotropic_lafortune/SConscript')
# Building retro functions
SConscript('nonlinear_function_retroblinn/SConscript')
......
env = Environment()
env.Append(CPPPATH = ['../../../external/build/include', '../../'])
env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
sources = ['function.cpp']
libs = ['core']
env.SharedLibrary('../../build/nonlinear_shadowing_smith', sources, LIBS=libs)
......@@ -25,7 +25,7 @@
<!-- Define the function to use -->
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_retrobeckmann">
<fresnel name="nonlinear_shadowing_smith"/>
<!--<fresnel name="nonlinear_shadowing_smith"/>-->
</function>
<!-- Define the ftting procedure to use -->
......@@ -34,7 +34,7 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[0.3, 2, 2]" />
<parameter name="cos-fit" value="" />
<!--<parameter name="cos-fit" value="" />-->
</action>
<action name="data2brdf">
......@@ -55,7 +55,7 @@
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="bootstrap" value="./results/3d/retro/half/Bande_orange_beck_back.brdf" />
<parameter name="cos-fit" value="" />
<!--<parameter name="cos-fit" value="" />-->
</action>
<!-- Export the fit -->
......@@ -69,7 +69,7 @@
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="cos-plot" value="" />
<!--<parameter name="cos-plot" value="" />-->
</action>
......@@ -96,7 +96,7 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="max" value="[0.3, 2, 2]" />
</action>
<action name="data2brdf">
......@@ -117,8 +117,8 @@
<!-- Parameters -->
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<!--<parameter name="bootstrap" value="./results/3d/retro/half/Bande_orange_beck_retro.brdf" />-->
<parameter name="cos-fit" value="" />
<parameter name="bootstrap" value="./results/3d/retro/half/Bande_orange_beck_retro.brdf" />
<!--<parameter name="cos-fit" value="" />-->
</action>
<!-- Export the fit -->
......@@ -132,6 +132,6 @@
<parameter name="min" value="[0.1, -2, -2]" />
<parameter name="max" value="[1.7, 2, 2]" />
<parameter name="cos-plot" value="" />
<!--<parameter name="cos-plot" value="" />-->
</action>
</alta>
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