Merge branch 'master' into non-edited

00/README.md

@@ -38,11 +38,11 @@ Not much! If you have a modern browser that can do WebGL (like Chrome, Firefox o
 
 Alternatively, based on what you have or what you need from this book you can:
 
-- [Make a off-line version of this book](../90/)
+- [Make a off-line version of this book](http://thebookofshaders.com/appendix/index.html#00.md)
 
-- [Run the examples on a RaspberryPi without a browser](../91/)
+- [Run the examples on a RaspberryPi without a browser](http://thebookofshaders.com/appendix/index.html#01.md)
 
-- [Make a PDF of the book to print](../92/)
+- [Make a PDF of the book to print](http://thebookofshaders.com/appendix/index.html#02.md)
 
 - Use the [on-line repository](https://github.com/patriciogonzalezvivo/thebookofshaders) to help resolve issues and share code.
 

04/README.md

@@ -1,6 +1,6 @@
 ## Running your shader
 
-At this point you're probably excited to try shaders on platforms you feel comfortable with. The following are examples of how to set shaders in some popular frameworks with the same uniforms that we are going to use throughout this book. (In the [GitHub repository for this chapter](https://github.com/patriciogonzalezvivo/GLSL-Book/tree/master/04), you'll find the full source code for these three frameworks.)
+At this point you're probably excited to try shaders on platforms you feel comfortable with. The following are examples of how to set shaders in some popular frameworks with the same uniforms that we are going to use throughout this book. (In the [GitHub repository for this chapter](https://github.com/patriciogonzalezvivo/thebookofshaders/tree/master/04), you'll find the full source code for these three frameworks.)
 
 **Note**: In case you don't want to try shaders on the following frameworks, but you want to work outside a browser, you can download and compile [glslViewer](https://github.com/patriciogonzalezvivo/glslViewer). This MacOS and RaspberryPi program runs directly from terminal and is especially designed to execute the examples in this book.
 

README.md

@@ -51,8 +51,8 @@ This is a gentle step-by-step guide through the abstract and complex universe of
     * Reflect and refract
 
 * [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 can I navigate this book offline?](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)
 
 ## About the Author

src/glslCanvas.js

@@ -455,7 +455,7 @@ function renderShader( _billboard ) {
 		mouse.y <= rect.bottom){
 
 		var mouseLocation = _billboard.gl.getUniformLocation(_billboard.program, "u_mouse");
-		_billboard.gl.uniform2f(mouseLocation,mouse.x-rect.left,_billboard.canvas.height-mouse.y-rect.top);
+		_billboard.gl.uniform2f(mouseLocation,mouse.x-rect.left,_billboard.canvas.height-(mouse.y-rect.top));
 	}
 
 	// set the resolution uniform