Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit fd69a732 authored by MURRAY David's avatar MURRAY David
Browse files

adding doc WIP

parent 14426755
Pipeline #258040 failed with stages
in 7 minutes and 56 seconds
......@@ -47,7 +47,7 @@
<a class="current" href="./scene_format.md.html#toc3.2">Analytical BSDF</a>
</li>
<li class="current toctree_l3">
<a class="current" href="./scene_format.md.html#toc3.3">Measured Isotropic BRDF</a>
<a class="current" href="./scene_format.md.html#toc3.3">Measured BRDF</a>
</li>
<li class="current toctree_l3">
<a class="current" href="./scene_format.md.html#toc3.4">Shadow Catcher</a>
......@@ -602,7 +602,16 @@ Note for both sheen and specular tint, the colored response is the achromatic ra
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</script>
## Measured Isotropic Brdf
## Measured BRDF
There are several
Here is the list of measured BSDF present in Malia:
- <a class="current" href="./scene_format.md.html#toc3.3.1">ALTA BRDF (isotropic)</a>
- <a class="current" href="./scene_format.md.html#toc3.3.2">UTIA BRDF</a>
### Isotropic ALTA BRDF
The Measured Isotropic material supports the loading of alta file (.bin) with a
$(\theta_{view},\theta_{light}, \Delta\phi = |\phi_{view} - \phi_{light}| )$ parametrization.
......@@ -611,14 +620,14 @@ To simplify scene authoring, both RGB and spectral data can be specify in the sa
This allows a scene to work both in rgb rendering mode and spectral rendering mode.
The xml attribute file_rgb specify the alta rgb file whereas file_spectral specify the alta spectral file.
!!! WARNING: In some scene you might find a xml attribute "file" to specify the input alta file, it overrides the "file_rgb" or "file_spectral" attribute.
You can, for instance, instantiate a Measured Isotropic material using the following code:
<script type="preformatted">
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ XML
<materials>
<material file="./material_export_assets/brdf_measured_RGB.bin"
<material
file_rgb="./material_export_assets/brdf_measured_RGB.bin"
file_spectral="./material_export_assets/brdf_measured_SPECTRAL.bin" name="a_measured_material"
type="MeasuredIsotropic" />
</material>
......@@ -626,7 +635,9 @@ You can, for instance, instantiate a Measured Isotropic material using the follo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</script>
### Example of supported ALTA file
!!! WARNING: In some scene you might find a xml attribute "file" to specify the input alta file, it overrides the "file_rgb" or "file_spectral" attribute.
#### Example of supported ALTA file
An ALTA file (./material_export_assets/brdf_measured_SPECTRAL.bin in the example above) consists
of a header part that specifies and describes how the data part can be read.
......@@ -679,7 +690,7 @@ where :
### Spectral BRDF as an ALTA FILE
#### Spectral BRDF as an ALTA FILE
In the case of a spectral BRDF, the sampled wavelengths should be specified in the header by the keyword WAVELENGTH (in
nanometers):
......@@ -718,13 +729,13 @@ $number\_of\_wavelength \times number\_of\_theta\_incident$.
Note that it is also possible to specify a perfect MIRROR BRDF for RGB-BRDF (i.e., #PARAM_OUT RGB_COLOR),
the Malia parser will expect 3 values per incident angles instead of number_of_wavelength.
### Selecting Dirac or Scattering part of a measured file
<!-- ### Selecting Dirac or Scattering part of a measured file -->
By default Malia will use all parts (analytical and measured) of an alta file to generate the image.
When a measured material contains a perfect mirror (dirac) pat and a scattering part
it possible to render only the scattering part or the dirac part adding the attributes scatter_only
or dirac_only to the material markup.
<!-- When a measured material contains a perfect mirror (dirac) pat and a scattering part -->
<!-- it possible to render only the scattering part or the dirac part adding the attributes scatter_only -->
<!-- or dirac_only to the material markup. -->
Example to render only the Dirac part of the material:
<script type="preformatted">
......@@ -751,6 +762,30 @@ Example to render only the scattering part of the material:
</materials>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</script>
### UTIA BRDF
Example of UTIA materials, both 2D (isotropic) and 4D (anisotropic):
<script type="preformatted">
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ XML
<materials>
<material name="a_4d_utia_material" type="UTIA" />
<utia_texture file="./path/to/texture" interpolate="1" parametrization="utia_4d">
<utia_parameters theta_i_div="9" theta_v_div="9" phi_i_div="48" phi_v_div="48" />
</utia_texture>
</material>
<material name="a_2d_utia_material" type="UTIA" />
<utia_texture file="./path/to/texture" interpolate="1" parametrization="utia_2d">
<utia_parameters theta_i_div="90" theta_v_div="90"/> #not mandatory for 2d isotropic.
</utia_texture>
</material>
</materials>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</script>
## Shadow Catcher
The shadow catcher is a proxy material to project shadows on the environment. It must be use with a plane geometry.
......
......@@ -2972,7 +2972,8 @@ bool SceneParser::parseUTIATexture(tinyxml2::XMLElement *a_tex_element, mrf::mat
}
else
{
if (utia_mat->getParameterization() == UTIA::RUSINKIEWICZ_2D
if (utia_mat->getParameterization() == UTIA::UTIA_2D
|| utia_mat->getParameterization() == UTIA::RUSINKIEWICZ_2D
|| utia_mat->getParameterization() == UTIA::RUSINKIEWICZ_2D_COS)
{
//If isotropic DH requested, only warn that image dimension are used, do not force the V/I parameterization.
......
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