Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
alta
alta
Commits
4677a2ad
Commit
4677a2ad
authored
Mar 18, 2014
by
Laurent Belcour
Browse files
Updating document and generation scripts
parent
029c38b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
sources/core/vertical_segment.cpp
View file @
4677a2ad
...
...
@@ -176,7 +176,7 @@ void vertical_segment::load(const std::string& filename, const arguments& args)
// You can enforce the vertical segment to stay in the positive
// region using the --data-positive command line argument. Note
// that the data point is also clamped to zero if negative.
if
(
args
.
is_defined
(
"d
ata
-positive"
))
if
(
args
.
is_defined
(
"d
t
-positive"
))
{
v
[
dimX
()
+
i
]
=
std
::
max
(
v
[
dimX
()
+
i
],
0.0
);
v
[
dimX
()
+
dimY
()
+
i
]
=
std
::
max
(
v
[
dimX
()
+
dimY
()
+
i
],
0.0
);
...
...
sources/xml/3d/retro/half/3M_jaune_rat.xml
View file @
4677a2ad
...
...
@@ -36,7 +36,7 @@
<parameter
name=
'np-step'
value=
'5'
/>
<parameter
name=
"dt"
value=
"0.1"
/>
<parameter
name=
"d
ata
-positive"
value=
""
/>
<parameter
name=
"d
t
-positive"
value=
""
/>
<!--<parameter name="dt-relative" value="" />-->
<parameter
name=
"nb-starting-points"
value=
"1000"
/>
...
...
sources/xml/3d/retro/half/Bande_orange_rat.xml
View file @
4677a2ad
...
...
@@ -10,10 +10,108 @@
<configuration>
<parameter
name=
"lib-dir"
value=
"./build"
/>
</configuration>
<!-- Rational interpolation of the Orange data in the classical parametrization.
This will only interpolate vertical segments of the retro part of the
BRDF.
-->
<action
name=
"data2brdf"
>
<!-- Input arguments of the action -->
<input
name=
"../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta"
/>
<parameter
name=
"min"
value=
"[0, 0,-2]"
/>
<parameter
name=
"max"
value=
"[2, 2, 2]"
/>
<parameter
name=
"dt"
value=
"0.5"
/>
<!--<parameter name="dt-relative" value="" />-->
<parameter
name=
"dt-positive"
value=
""
/>
<!-- Output arguments of the action -->
<output
name=
"./results/3d/retro/half/Bande_orange_half_cparam_rat.brdf"
/>
<!-- Define the function to use -->
<!--<function name="rational_function_cosine" />-->
<function
name=
"rational_function_chebychev"
/>
<!-- Define the ftting procedure to use -->
<plugin
type=
"fitter"
name=
"rational_fitter_parallel"
/>
<parameter
name=
"min-np"
value=
"45"
/>
<parameter
name=
"np"
value=
"100"
/>
<parameter
name=
"np-step"
value=
"5"
/>
<parameter
name=
"nb-starting-points"
value=
"1000"
/>
</action>
<!-- Export the fit -->
<action
name=
"brdf2gnuplot"
>
<!-- Input and output arguments of the action -->
<input
name=
"./results/3d/retro/half/Bande_orange_half_cparam_rat.brdf"
/>
<output
name=
"./results/3d/retro/half/Bande_orange_half_cparam_rat.dat"
/>
<parameter
name=
"data"
value=
"../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta"
/>
<parameter
name=
"min"
value=
"[0, 0,-2]"
/>
<parameter
name=
"max"
value=
"[2, 2, 2]"
/>
</action>
<!-- Conversion of data to the Back parametrization.
This will only export the retro reflective part of the data.
-->
<action
name=
"data2data"
>
<!--- Input data file -->
<input
name=
"../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_81.alta"
/>
<parameter
name=
"min"
value=
"[0, 0,-2]"
/>
<parameter
name=
"max"
value=
"[2, 2, 2]"
/>
<!-- Output data file -->
<output
name=
"/temp/Bande_orange_back.dat"
/>
<!-- Parameters -->
<parameter
name=
"param"
value=
"SCHLICK_TL_TK_PROJ_DPHI"
/>
</action>
<action
name=
"data2brdf"
>
<!-- Input arguments of the action -->
<input
name=
"/temp/Bande_orange_back.dat"
/>
<parameter
name=
"dt"
value=
"0.5"
/>
<!--<parameter name="dt-relative" value="" />-->
<parameter
name=
"dt-positive"
value=
""
/>
<!-- Output arguments of the action -->
<output
name=
"./results/3d/retro/half/Bande_orange_half_bparam_rat.brdf"
/>
<!-- Define the function to use -->
<!--<function name="rational_function_cosine" />-->
<function
name=
"rational_function_chebychev"
/>
<!-- Define the ftting procedure to use -->
<plugin
type=
"fitter"
name=
"rational_fitter_parallel"
/>
<parameter
name=
"min-np"
value=
"45"
/>
<parameter
name=
"np"
value=
"100"
/>
<parameter
name=
"np-step"
value=
"5"
/>
<parameter
name=
"nb-starting-points"
value=
"1000"
/>
</action>
<!-- Export the fit -->
<action
name=
"brdf2gnuplot"
>
<!-- Input and output arguments of the action -->
<input
name=
"./results/3d/retro/half/Bande_orange_half_bparam_rat.brdf"
/>
<output
name=
"./results/3d/retro/half/Bande_orange_half_bparam_rat.dat"
/>
<parameter
name=
"data"
value=
"../papers/retro/mesures/original/Bande_orange/3d/633nm/Fichiers_definitifs/densify_helmholtz/Bande_orange_3D_dense__nbsgrid_162.alta"
/>
<parameter
name=
"min"
value=
"[0, 0,-2]"
/>
<parameter
name=
"max"
value=
"[2, 2, 2]"
/>
</action>
<!-- Fitting the lobe using a back parametrization:
The ABC model uses the dot product between the back and the
normal vectors.
<!-- Full rational interpolation of the Orange cloth sample.
-->
<action
name=
"data2brdf"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment