From a10d2255169cdefdfe2372cfe8f6ca24b4e07e57 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Wed, 4 May 2016 06:41:28 -0400 Subject: [PATCH] fixies --- 12/2d-cnoise-2x2.frag | 2 +- 12/2d-cnoise-2x2x2.frag | 2 +- 12/{voronoi.gif => 2d-voronoi.gif} | Bin 12/README.md | 2 +- 13/README.md | 9 +++++++-- 5 files changed, 10 insertions(+), 5 deletions(-) rename 12/{voronoi.gif => 2d-voronoi.gif} (100%) diff --git a/12/2d-cnoise-2x2.frag b/12/2d-cnoise-2x2.frag index 1c0474b..94e7e77 100755 --- a/12/2d-cnoise-2x2.frag +++ b/12/2d-cnoise-2x2.frag @@ -1,5 +1,5 @@ // Author: Stefan Gustavson -// Title: Worley noise +// Title: Worley noise 2x2 #ifdef GL_ES precision mediump float; diff --git a/12/2d-cnoise-2x2x2.frag b/12/2d-cnoise-2x2x2.frag index 0cbb87f..bed344c 100755 --- a/12/2d-cnoise-2x2x2.frag +++ b/12/2d-cnoise-2x2x2.frag @@ -1,5 +1,5 @@ // Author: Stefan Gustavson -// Title: Worley noise +// Title: Worley noise 2x2x2 #ifdef GL_ES precision mediump float; diff --git a/12/voronoi.gif b/12/2d-voronoi.gif similarity index 100% rename from 12/voronoi.gif rename to 12/2d-voronoi.gif diff --git a/12/README.md b/12/README.md index df4944c..84b05e3 100644 --- a/12/README.md +++ b/12/README.md @@ -161,7 +161,7 @@ In 2011, [Stefan Gustavson optimized Steven Worley's algorithm to GPU](http://we Later in 2012 [Inigo Quilez wrote an article on how to make precise voronoi borders](http://www.iquilezles.org/www/articles/voronoilines/voronoilines.htm). - + Inigio's experiment on voronoi didn't stop there. In 2014 he wrote this nice article about what he call [voro-noise](http://www.iquilezles.org/www/articles/voronoise/voronoise.htm), and exploration between regular noise and voronoi. In his words: diff --git a/13/README.md b/13/README.md index 009f2d5..94739fd 100644 --- a/13/README.md +++ b/13/README.md @@ -16,14 +16,19 @@ By doing the last to excersize you have manage to "modulate" a sine wave, and yo Another interesting property of waves is their ability to add up. Add the following lines to the previus example and pay atention how the frequencies and amplitudes change conform we add different waves. -```glsl +
* Experiment by changing their values. * Is it possible to cancel two waves? how that will look like?