updating

8 years ago · 3fb6ed8540
parent 5b829266c7
commit 3fb6ed8540
45 changed files with 12 additions and 10 deletions
--- a/03/time.png
+++ b/03/time.png
--- a/06/easing.png
+++ b/06/easing.png
--- a/07/batman.png
+++ b/07/batman.png
--- a/07/triangle-making.png
+++ b/07/triangle-making.png
--- a/08/cross-animated.png
+++ b/08/cross-animated.png
--- a/08/cross-scale.png
+++ b/08/cross-scale.png
--- a/08/cross-translate.png
+++ b/08/cross-translate.png
--- a/08/matrix.png
+++ b/08/matrix.png
--- a/09/dots5.png
+++ b/09/dots5.png
--- a/09/marching_dots.png
+++ b/09/marching_dots.png
--- a/09/nuts.png
+++ b/09/nuts.png
--- a/09/rotatedtiles.png
+++ b/09/rotatedtiles.png
--- a/10/1d-random.png
+++ b/10/1d-random.png
--- a/10/ikeda-00.png
+++ b/10/ikeda-00.png
--- a/10/ikeda-03.png
+++ b/10/ikeda-03.png
--- a/10/ikeda-numered-grid.png
+++ b/10/ikeda-numered-grid.png
--- a/10/ikeda-simple-grid.png
+++ b/10/ikeda-simple-grid.png
--- a/11/1d-noise.png
+++ b/11/1d-noise.png
--- a/11/3d-noise.png
+++ b/11/3d-noise.png
--- a/11/3d-pnoise.png
+++ b/11/3d-pnoise.png
--- a/11/circleWave-noise.png
+++ b/11/circleWave-noise.png
--- a/11/iching-03.png
+++ b/11/iching-03.png
--- a/11/lava-lamp.png
+++ b/11/lava-lamp.png
--- a/12/2d-cnoise-2x2.png
+++ b/12/2d-cnoise-2x2.png
--- a/12/2d-cnoise.png
+++ b/12/2d-cnoise.png
--- a/12/2d-voronoi-long.png
+++ b/12/2d-voronoi-long.png
--- a/12/2d-voronoi.png
+++ b/12/2d-voronoi.png
--- a/12/3d-cnoise.png
+++ b/12/3d-cnoise.png
--- a/12/README.md
+++ b/12/README.md
@ -116,10 +116,6 @@ Explore by:
 - What if we want to compute an extra point with the mouse position?
 - What other ways of constructing this distance field beside ```m_dist = min(m_dist, dist);```, can you imagine?
 - What interesting patterns you can make with this distance field?
- Try to replicate this:
-
-<a href="../edit.html#12/metaballs.frag"><img src="metaballs.gif"  width="520px" height="200px"></img></a>
-![](bubbles.jpg)

 This algorithm can also be interpreted from the perspective of the points and not the pixels. In that case it can be describe as: each point grows until it finds the area of another point. Which mirrors some of the grow rules on nature. Living forms are shaped by this tension between an inner force to expand and grow limited by the forces 
 on their medium. The classic algorithm that simulate this behavior is named after [Georgy Voronoi](https://en.wikipedia.org/wiki/Georgy_Voronoy).
@ -149,15 +145,23 @@ Like we did before now is time to scale this up, switching to [Steven Worley's p

 <a href="../edit.html#12/vorono-01.frag"><canvas id="custom" class="canvas" data-fragment-url="vorono-01.frag"  width="520px" height="200px"></canvas></a>

-Once you figurate out this algorithm think interesting and creative uses for it
+Once you figurate out this algorithm think interesting and creative uses for it.
+
+![Extended Voronoi - Leo Solaas (2011)](solas.png)
+
+![Cloud Cities - Tomás Saraceno (2011)](saraceno.jpg)

 ![Accretion Disc Series - Clint Fulkerson](accretion.jpg)

+![Vonoroi Puzzle - Reza Ali (2015)](reza.png)
+
+<iframe src="https://player.vimeo.com/video/82989945?title=0&byline=0&portrait=0" width="800" height="450" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+
 ### Improving Voronoi

 In 2011, [Stefan Gustavson optimized Steven Worley's algorithm to GPU](http://webstaff.itn.liu.se/~stegu/GLSL-cellular/GLSL-cellular-notes.pdf) by only iterating trough a 2x2 matrix instead of 3x3. This reduce the work significantly but can create artifacts in form of discontinuities. Take a look to the following examples.

-<div class="glslGallery" data="12/2d-cnoise-2x2,12/2d-cnoise-2x2x2,12/2d-cnoise,12/3d-cnoise"></div>
+<div class="glslGallery" data="12/2d-cnoise-2x2,12/2d-cnoise-2x2x2,12/2d-cnoise,12/3d-cnoise" data-properties="clickRun:edior,openFrameIcon:false"></div>

 Later in 2012 [Inigo Quilez wrote an article on how to make precise voronoi borders](http://www.iquilezles.org/www/articles/voronoilines/voronoilines.htm).

@ -171,8 +175,6 @@ Inigio's experiment on voronoi didn't stop there. In 2014 he wrote this nice art

 Now is up to you to observe and learn how to use and modify this technique for your own expressive porpoises.

-<a href="../edit.html#12/stippling.frag"><img src="stippling-long.png"  width="520px" height="200px"></img></a>
-
-<a href="../edit.html#12/cell.frag"><img src="cell-long.png"></img></a>
+<div class="glslGallery" data="12/metaballs,12/stippling,12/cell,12/tissue,12/cracks,160504143842" data-properties="clickRun:edior,openFrameIcon:false"></div>

 ![Deyrolle glass film](DeyrolleFilm.png)
--- a/12/bubbles.jpg
+++ b/12/bubbles.jpg
--- a/12/cell-long.png
+++ b/12/cell-long.png
--- a/12/cellnoise-02.png
+++ b/12/cellnoise-02.png
--- a/12/tmp/cracks.frag
+++ b/12/tmp/cracks.frag
--- a/12/cracks.png
+++ b/12/cracks.png
--- a/12/metaballs.png
+++ b/12/metaballs.png
--- a/12/reza.jpg
+++ b/12/reza.jpg
--- a/12/reza.png
+++ b/12/reza.png
--- a/12/stippling-long.png
+++ b/12/stippling-long.png
--- a/12/stippling.png
+++ b/12/stippling.png
--- a/12/tissue.png
+++ b/12/tissue.png
--- a/12/vorono-01.png
+++ b/12/vorono-01.png
--- a/13/1d-fbm.png
+++ b/13/1d-fbm.png
--- a/13/clouds.png
+++ b/13/clouds.png
--- a/13/noise.png
+++ b/13/noise.png
--- a/examples/featured_examples.md
+++ b/examples/featured_examples.md
@ -1 +1 @@
-<div class="glslGallery" log="160423150559,160423150752,160423150810,160423150825,160423150844,160423150901,160423150919,160423150935,160423150954"></div>
+<div class="glslGallery" data="160423150559,160423150752,160423150810,160423150825,160423150844,160423150901,160423150919,160423150935,160423150954"></div>