Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit b74b129b authored by Laurent Belcour's avatar Laurent Belcour

Adding a cosine correction to the data objects. This can be added using a parameter

to the loading. add --data-correct-cosine in the command line
parent 0b763829
......@@ -97,8 +97,22 @@ void vertical_segment::load(const std::string& filename, const arguments& args)
for(int i=0; i<dimX(); ++i)
linestream >> v[i] ;
// Correction of the data by 1/cosine(theta_L)
double factor = 1.0;
if(args.is_defined("data-correct-cosine"))
{
double cart[6];
params::convert(&v[0], input_parametrization(), params::CARTESIAN, cart);
factor = 1.0/cart[5];
}
// End of correction
for(int i=0; i<dimY(); ++i)
linestream >> v[dimX() + i] ;
{
linestream >> v[dimX() + i];
v[dimX() + i] /= factor;
}
// Check if the data containt a vertical segment around the mean
// value.
......
......@@ -20,11 +20,40 @@
<!-- Define the function to use -->
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_blinn" />
<function name="nonlinear_function_retroblinn" />
<function name="nonlinear_function_blinn">
<!--<parameter name="fresnel" value="./build/libnonlinear_fresnel_schlick.so" />-->
</function>
<function name="nonlinear_function_retroblinn">
<!-- <parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />-->
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<action name="data2brdf">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/3M_jaune_isotropic_brdfcc_rescaled_alta.dat" />
<output name="./results/3d/retro/3M_jaune_blinn.brdf" />
<!-- Define the function to use -->
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_blinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_schlick.so" />
</function>
<function name="nonlinear_function_retroblinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
<parameter name="bootstrap" value="./results/3d/retro/3M_jaune_blinn.brdf" />
</action>
<!-- Export the fit -->
......@@ -51,11 +80,15 @@
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_spherical_gaussian" />
<function name="nonlinear_function_spherical_gaussian">
<!--<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />-->
<parameter name="sg-type" value="back" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<!-- Export the fit -->
......
......@@ -20,11 +20,18 @@
<!-- Define the function to use -->
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_blinn" />
<function name="nonlinear_function_retroblinn" />
<function name="nonlinear_function_blinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_schlick.so" />
</function>
<function name="nonlinear_function_retroblinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<!-- Export the fit -->
......@@ -48,11 +55,15 @@
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_spherical_gaussian" />
<function name="nonlinear_function_spherical_gaussian">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />
<parameter name="sg-type" value="back" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<!-- Export the fit -->
......
......@@ -20,11 +20,18 @@
<!-- Define the function to use -->
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_blinn" />
<function name="nonlinear_function_retroblinn" />
<function name="nonlinear_function_blinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_schlick.so" />
</function>
<function name="nonlinear_function_retroblinn">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<!-- Export the fit -->
......@@ -52,11 +59,15 @@
<function name="nonlinear_function_diffuse" />
<function name="nonlinear_function_spherical_gaussian" />
<function name="nonlinear_function_spherical_gaussian">
<parameter name="fresnel" value="./build/libnonlinear_fresnel_retroschlick.so" />
<parameter name="sg-type" value="back" />
</function>
<!-- Define the ftting procedure to use -->
<plugin type="fitter" name="nonlinear_fitter_ceres" />
<!-- Parameters -->
<parameter name="data-correct-cosine" value="" />
</action>
<!-- Export the fit -->
......
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