Skip to content

Commit

Permalink
Merge pull request #134 from luisbarrancos/docs_wip12
Browse files Browse the repository at this point in the history
Finish noise2d, 3d docs, gallery
  • Loading branch information
luisbarrancos committed Jan 27, 2018
2 parents 7e93abe + 7960e54 commit fd1269f
Show file tree
Hide file tree
Showing 33 changed files with 3,613 additions and 2,902 deletions.
1 change: 1 addition & 0 deletions docs/source/_images/icons/asNoise2D.png
1 change: 1 addition & 0 deletions docs/source/_images/icons/asNoise3D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 82 additions & 0 deletions docs/source/bibtex/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -535,3 +535,85 @@ @inproceedings{Donner:2005:LDM:1186822.1073308
keywords = {BSSRDF, diffusion theory, global illumination, layered materials, light transport, realistic image synthesis, reflection models, subsurface scattering},
}

@article{Galerne:2012:GNE:2185520.2185569,
author = {Galerne, Bruno and Lagae, Ares and Lefebvre, Sylvain and Drettakis, George},
title = {Gabor Noise by Example},
journal = {ACM Trans. Graph.},
issue_date = {July 2012},
volume = {31},
number = {4},
month = jul,
year = {2012},
issn = {0730-0301},
pages = {73:1--73:9},
articleno = {73},
numpages = {9},
url = {http://doi.acm.org/10.1145/2185520.2185569},
doi = {10.1145/2185520.2185569},
acmid = {2185569},
publisher = {ACM},
address = {New York, NY, USA},
keywords = {Gaussian random field, Gaussian texture, decorrelated color space, non-negative basis pursuit denoising, power spectrum estimation, procedural noise},
}

@article{Lagae:2009:PNU:1531326.1531360,
author = {Lagae, Ares and Lefebvre, Sylvain and Drettakis, George and Dutr{\'e}, Philip},
title = {Procedural Noise Using Sparse Gabor Convolution},
journal = {ACM Trans. Graph.},
issue_date = {August 2009},
volume = {28},
number = {3},
month = {jul},
year = {2009},
issn = {0730-0301},
pages = {54:1--54:10},
articleno = {54},
numpages = {10},
url = {http://doi.acm.org/10.1145/1531326.1531360},
doi = {10.1145/1531326.1531360},
acmid = {1531360},
publisher = {ACM},
address = {New York, NY, USA},
keywords = {noise, procedural texture, rendering, shading},
}

@article{Perlin:2002:IN:566654.566636,
author = {Perlin, Ken},
title = {Improving Noise},
journal = {ACM Trans. Graph.},
issue_date = {July 2002},
volume = {21},
number = {3},
month = {jul},
year = {2002},
issn = {0730-0301},
pages = {681--682},
numpages = {2},
url = {http://doi.acm.org/10.1145/566654.566636},
doi = {10.1145/566654.566636},
acmid = {566636},
publisher = {ACM},
address = {New York, NY, USA},
keywords = {procedural texture},
}

@article{Perlin:1985:IS:325165.325247,
author = {Perlin, Ken},
title = {An Image Synthesizer},
journal = {SIGGRAPH Comput. Graph.},
issue_date = {Jul. 1985},
volume = {19},
number = {3},
month = {jul},
year = {1985},
issn = {0097-8930},
pages = {287--296},
numpages = {10},
url = {http://doi.acm.org/10.1145/325165.325247},
doi = {10.1145/325165.325247},
acmid = {325247},
publisher = {ACM},
address = {New York, NY, USA},
keywords = {algorithm development, fire, functional composition, interactive, pixel stream editor, solid texture, space function, stochastic modelling, turbulence, waves},
}

4 changes: 3 additions & 1 deletion docs/source/shaders/material/as_plastic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ Bump Parameters
*Bump Normal*
The unit length world space normal of the bumped surface.

-----

Matte Opacity Parameters
^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -170,7 +172,7 @@ Screenshots

Painted concrete, with flaking stucco.

.. thumbnail:: /_images/screenshots/plastic/as_plastic_ball2.png
.. thumbnail:: /_images/screenshots/plastic/as_plastic_ball.png
:group: shots_as_plastic_group_A
:width: 10%
:title:
Expand Down
Loading

0 comments on commit fd1269f

Please sign in to comment.