Merge branch 'master' of github.com:stackgl/shader-school

Author: mikolalysenko

exercises/geom-5/shaders/expected.glsl

@@ -1,9 +1,15 @@
-highp mat4 reflection(highp vec3 n) {
-  n = normalize(n);
-  return mat4(1.0-2.0*n.x*n.x,    -2.0*n.y*n.x,    -2.0*n.z*n.x, 0,
-                 -2.0*n.y*n.x, 1.0-2.0*n.y*n.y,    -2.0*n.z*n.y, 0, 
-                 -2.0*n.z*n.x,    -2.0*n.y*n.z, 1.0-2.0*n.z*n.z, 0,
-                            0,               0,               0, 1);
+highp mat4 rotation(highp vec3 n, highp float theta) {
+
+  float s = sin(theta);
+  float c = cos(theta);
+  float oc = 1.0 - c;
+
+  return mat4(
+    oc * n.x * n.x + c,       oc * n.x * n.y + n.z * s,   oc * n.z * n.x - n.y * s,   0.0,
+    oc * n.x * n.y - n.z * s, oc * n.y * n.y + c,         oc * n.y * n.z + n.x * s,   0.0,
+    oc * n.z * n.x + n.y * s, oc * n.y * n.z - n.x * s,   oc * n.z * n.z + c,         0.0,
+    0.0,                      0.0,                        0.0,                        1.0
+  );
 }
 
-#pragma glslify: export(reflection)
+#pragma glslify: export(rotation)

index.js

@@ -65,6 +65,13 @@ function createServer(root) {
     })
 
     http.createServer(function(req, res) {
+      // Force the addition of a query string. This
+      // works around an issue in beefy until it gets fixed:
+      // https://github.com/stackgl/shader-school/issues/107
+      req.url = req.url.indexOf('?') === -1
+        ? req.url + '?'
+        : req.url
+
       var uri = url.parse(req.url).pathname
       var paths = uri.split('/').filter(Boolean)