From 013d9d3d0ebb446aa7975c8e7ab922b7392df501 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Sun, 15 Mar 2015 11:40:08 -0400 Subject: [PATCH 01/12] changing size of moon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5179191..f6f59b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # The Book of Shaders *by [Patricio Gonzalez Vivo](http://patriciogonzalezvivo.com/)* From ce44d76393bca5a0153c3a2932b30da6ea13ae39 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Sun, 15 Mar 2015 11:54:38 -0400 Subject: [PATCH 02/12] adding thumb --- thumb.jpg | Bin 0 -> 13844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 thumb.jpg diff --git a/thumb.jpg b/thumb.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c4b945d0d405a631c7b2197a7668180deda78b68 GIT binary patch literal 13844 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 ORNhNybFO>w`u_ofuO!X@ literal 0 HcmV?d00001 From b003f30bb78ca894478f961c79fe31da4bee50ba Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Sun, 15 Mar 2015 12:03:03 -0400 Subject: [PATCH 03/12] fixing typos on comments --- 05/smoothstep.frag | 2 +- 05/step.frag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/05/smoothstep.frag b/05/smoothstep.frag index cb74404..350de26 100644 --- a/05/smoothstep.frag +++ b/05/smoothstep.frag @@ -16,7 +16,7 @@ float plot(vec2 _st, float _pct){ void main() { vec2 st = gl_FragCoord.xy/u_resolution; - // Everthins is over 0.5 will be 1.0 the rest 0.0 + // Smooth interpolation between 0.1 and 0.9 float y = smoothstep(0.1,0.9,st.x); vec3 color = vec3(y); diff --git a/05/step.frag b/05/step.frag index c7fa24d..41a82f0 100644 --- a/05/step.frag +++ b/05/step.frag @@ -16,7 +16,7 @@ void main() { vec2 st = gl_FragCoord.xy/u_resolution; // Step will return 0.0 unless the value is over 0.5, - // in that case will return 1.0 + // in that case it will return 1.0 float y = step(0.5,st.x); vec3 color = vec3(y); From 798ad11924f438f1d24cc2f09531fae79e0dc918 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Sun, 15 Mar 2015 17:48:06 -0400 Subject: [PATCH 04/12] overrideMimeType --- src/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 84a1c51..f1e81ad 100644 --- a/src/main.js +++ b/src/main.js @@ -114,7 +114,9 @@ function fetchHTTP(url, methood){ } } request.open(methood ? methood : 'GET', url, false); - request.send(); + request.overrideMimeType("text/plain"); + // request.overrideMimeType("text/html"); + request.send(null); return response; } From 29d9bae911f57f033e76b8a13ffd9646f7502c91 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Sun, 15 Mar 2015 18:17:38 -0400 Subject: [PATCH 05/12] request maimo --- src/glslCanvas.js | 1 + src/main.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glslCanvas.js b/src/glslCanvas.js index d78b272..939dad0 100644 --- a/src/glslCanvas.js +++ b/src/glslCanvas.js @@ -339,6 +339,7 @@ function fetchHTTP(url, methood){ } } request.open(methood ? methood : 'GET', url, false); + request.overrideMimeType("text/plain"); request.send(); return response; } diff --git a/src/main.js b/src/main.js index f1e81ad..5c77c0d 100644 --- a/src/main.js +++ b/src/main.js @@ -115,7 +115,6 @@ function fetchHTTP(url, methood){ } request.open(methood ? methood : 'GET', url, false); request.overrideMimeType("text/plain"); - // request.overrideMimeType("text/html"); request.send(null); return response; } From ab36c6f1c4312b1f87a3952dac1791a12f6472d6 Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Mon, 16 Mar 2015 06:54:08 -0400 Subject: [PATCH 06/12] changing dir --- 90/README.md | 2 +- 91/README.md | 2 +- 92/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/90/README.md b/90/README.md index 08d7096..fe23345 100644 --- a/90/README.md +++ b/90/README.md @@ -27,7 +27,7 @@ Once you have everything installed you just need to do: ```bash cd ~ git clone https://github.com/patriciogonzalezvivo/thebookofshaders.git -cd GLSL-Book +cd thebookofshaders python -m SimpleHTTPServer ``` diff --git a/91/README.md b/91/README.md index b371a9a..8c797f1 100644 --- a/91/README.md +++ b/91/README.md @@ -15,7 +15,7 @@ make make install cd ~ git clone https://github.com/patriciogonzalezvivo/thebookofshaders.git -cd GLSL-Book +cd thebookofshaders ``` At the end of each section you will find code and non-code based exercises to give to your students. They are designed to help students immediately put concepts into practice, making concrete the abstract principles of parallel programming. diff --git a/92/README.md b/92/README.md index d3cc516..75f8cf9 100644 --- a/92/README.md +++ b/92/README.md @@ -62,7 +62,7 @@ For that open your terminal once again and type: ```bash cd ~ git clone https://github.com/patriciogonzalezvivo/thebookofshaders.git -cd GLSL-Book +cd thebookofshaders make ``` From 4f264b486ad42baa5e3b5069705a15bf00a0c39e Mon Sep 17 00:00:00 2001 From: Patricio Gonzalez Vivo Date: Mon, 16 Mar 2015 07:20:58 -0400 Subject: [PATCH 07/12] fixing it on firefox --- 90/index.html | 1 + src/main.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/90/index.html b/90/index.html index 6efa064..6ffa9f5 100644 --- a/90/index.html +++ b/90/index.html @@ -54,6 +54,7 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - -

The Book of Shaders by Patricio Gonzalez Vivo

-
-
-
-
    -
  • Home
    • -
- - - - - - - \ No newline at end of file diff --git a/92/index.html b/92/index.html deleted file mode 100644 index 19c6893..0000000 --- a/92/index.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - How to print this book? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

The Book of Shaders by Patricio Gonzalez Vivo

-
-
-
-
    -
  • Home
    • -
- - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index f6f59b2..77019c8 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,10 @@ This is a gentle step-by-step guide through the abstract and complex universe of * Environmental-maps (spherical and cube) * Reflect and refract -* Appendix - * [How can I navigate this book offline?](90/) - * [How to use this book in a classroom with RaspberryPi?](91/) - * [How to print this book?](92/) +* [Appendix](appendix/) + * [How can I navigate this book offline?](http://thebookofshaders.com/appendix/index.html#02.md) + * [How to use this book in a classroom with RaspberryPi?](http://thebookofshaders.com/appendix/index.html#02.md) + * [How to print this book?](http://thebookofshaders.com/appendix/index.html#02.md) ## About the Author diff --git a/90/README.md b/appendix/00.md similarity index 98% rename from 90/README.md rename to appendix/00.md index fe23345..5830b3e 100644 --- a/90/README.md +++ b/appendix/00.md @@ -1,5 +1,3 @@ -# APENDIX - ## How can I navigate this book off-line? Let’s say you have a long trip and you want to use it to teach yourself some shaders. In that case you can make a local copy of this book on your computer and run a local server. diff --git a/91/README.md b/appendix/01.md similarity index 100% rename from 91/README.md rename to appendix/01.md diff --git a/92/README.md b/appendix/02.md similarity index 100% rename from 92/README.md rename to appendix/02.md diff --git a/appendix/README.md b/appendix/README.md new file mode 100644 index 0000000..03d9281 --- /dev/null +++ b/appendix/README.md @@ -0,0 +1,7 @@ +# Appendix + +* [How can I navigate this book off-line?](http://thebookofshaders.com/appendix/index.html#00.md) + +* [How to use this book in a classroom with RaspberryPi?](http://thebookofshaders.com/appendix/index.html#01.md) + +* [How to print this book?](http://thebookofshaders.com/appendix/index.html#02.md) diff --git a/90/index.html b/appendix/index.html similarity index 100% rename from 90/index.html rename to appendix/index.html diff --git a/examples/README.md b/examples/README.md index 0c46c71..c868829 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,2 +1,25 @@ # List of Examples +### Chapters examples + +* Getting started + * Hello World + - ["Hello World!"](http://thebookofshaders.com/edit.html#02/hello_world.frag) + * Uniforms + - [u_time](http://thebookofshaders.com/edit.html#03/time.frag) + - [gl_FragCoord](http://thebookofshaders.com/edit.html#03/space.frag) +* Algorithmic drawing + * Shaping functions + - [Linear Interpolation](http://thebookofshaders.com/edit.html#05/linear.frag) + - [Exponential Interpolation](http://thebookofshaders.com/edit.html#05/expo.frag) + - [Step function](http://thebookofshaders.com/edit.html#05/step.frag) + - [Smoothstep function](http://thebookofshaders.com/edit.html#05/smoothstep.frag) + - [Iñigo Quiles's impulse](http://thebookofshaders.com/edit.html#05/impulse.frag) + - [Iñigo Quiles's Cubic Pulse](http://thebookofshaders.com/edit.html#05/cubicpulse.frag) + - [Iñigo Quiles's Exponential Step](http://thebookofshaders.com/edit.html#05/expstep.frag) + - [Iñigo Quiles's Parabola](http://thebookofshaders.com/edit.html#05/parabola.frag) + - [Iñigo Quiles's Power Curve](http://thebookofshaders.com/edit.html#05/pcurve.frag) + +### Advance + +* [Moon](http://thebookofshaders.com/edit.html#examples/moon.frag&examples/images/moon-texture.jpg) diff --git a/index.html b/index.html index 928167e..fd5d208 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - GLSL Book + The Book of Shaders