Merge branch 'master' of https://github.com/DerSchmale/helixjs

examples/taa/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
     <title>Helix example: Temporal Anti-Aliasing</title>
 
-    <script src="../../build/helix.js"></script>
+    <script src="../../build/helix.min.js"></script>
     <script src="../../build/helix-io.min.js"></script>
     <script src="../js/ProjectTemplates.js"></script>
     <script src="../js/OrbitController.js"></script>

examples/taa/script.js

@@ -65,6 +65,7 @@ function initCamera(camera)
     camera.addComponent(controller);
 
     taa = new HX.TAA();
+    taa.alpha = 0.01;
     fxaa = new HX.FXAA();
     camera.addComponent(taa);
     camera.addComponent(fxaa);
@@ -90,7 +91,7 @@ function initScene(scene, camera, assetLibrary)
     var material = new HX.BasicMaterial();
     material.cullMode = HX.CullMode.NONE;
     material.metallicness = 1.0;
-    material.roughness = .01;
+    material.roughness = .1;
     replaceMaterials(model, material, floorMaterial);
 
     scene.startSystem(new HX.FixedLightsSystem());
@@ -123,5 +124,5 @@ function initGui()
 
     var taaFolder = gui.addFolder("TAA");
     taaFolder.add(taa, "alpha").min(0).max(1).step(.001);
-    taaFolder.add(taa, "gamma").min(0).max(1).step(.001);
+    taaFolder.add(taa, "gamma").min(0).max(2).step(.001);
 }

src/helix-core/effect/TAA.js

@@ -42,7 +42,7 @@ function TAA()
         ShaderLibrary.get("taa_fragment.glsl")
     );
     this._pass.setTexture("historyBuffer", this._historyTexture);
-    this.alpha = .01;
+    this.alpha = .1;
     this.gamma = 1.0;
 }
 

src/helix-core/glsl/post-processing/taa_fragment.glsl

@@ -16,8 +16,8 @@ void main()
 	float amount = alpha;
 
 	// out of bounds: take new value completely
-	if (oldUV.x < 0.0 || oldUV.x > 1.0 || oldUV.y < 0.0 || oldUV.y > 1.0)
-	    amount = 1.0;
+//	if (oldUV.x < 0.0 || oldUV.x > 1.0 || oldUV.y < 0.0 || oldUV.y > 1.0)
+//	    amount = 1.0;
 
     // neighbourhood clamping: the old colour is only considered valid if it's within the bounds of the current neighbours
     // https://de45xmedrsdbp.cloudfront.net/Resources/files/TemporalAA_small-59732822.pdf [Karis2014]
@@ -29,42 +29,34 @@ void main()
     vec3 maxBound = max(max(max(max(l, r), t), b), c);
 
     // just treat rgb space as a regular 3D space
-    if (any(lessThan(old, minBound)) || any(greaterThan(old, maxBound))) {
-        // variance clipping
-        // http://developer.download.nvidia.com/gameworks/events/GDC2016/msalvi_temporal_supersampling.pdf
-        // moments
-        vec3 m1 = l + r + t + b + c;
-        vec3 m2 = l * l + r * r + t * t + b * b + c * c;
-        // variance
-        vec3 mu = m1 / 5.0;
-        vec3 sigma = sqrt(m2 / 5.0 - mu * mu);
-
-        vec3 d = c - old;
-
-        // find relevant AABB planes (those closest to the ray, know this from ray direction)
-        vec3 planes = mu - sign(d) * gamma * sigma;
-
-        // clip to old AABB to make sure it's never bigger
-        planes = max(planes, minBound);
-        planes = min(planes, maxBound);
-
-
-        // clip segment [old -> C] against new AABB
-        // C is always inside AABB
-        vec3 tm = (planes - old) / d;
-        vec3 absD = abs(d);
-
-        float t = 0.0;
-
-        if (absD.x > 0.0003)
-            t = max(tm.x, t);
-        if (absD.y > 0.0003)
-            t = max(tm.y, t);
-        if (absD.z > 0.0003)
-            t = max(tm.z, t);
-
-        old += t * d;
-    }
+    // variance clipping
+    // http://developer.download.nvidia.com/gameworks/events/GDC2016/msalvi_temporal_supersampling.pdf
+    // moments
+    vec3 m1 = l + r + t + b + c;
+    vec3 m2 = l * l + r * r + t * t + b * b + c * c;
+    // variance
+    vec3 mu = m1 / 5.0;
+    vec3 sigma = sqrt(m2 / 5.0 - mu * mu);
+
+    vec3 d = c - old;
+
+    // find relevant AABB planes (those closest to the ray, know this from ray direction)
+    vec3 planes = mu - sign(d) * gamma * sigma;
+
+    // clip to old AABB to make sure it's never bigger
+    planes = max(planes, minBound);
+    planes = min(planes, maxBound);
+
+    // clip segment [old -> C] against new AABB
+    // C is always inside AABB
+    vec3 tm = (planes - old) / d;
+    vec3 absD = abs(d);
+
+    float tf = (max(tm.x, tm.y), tm.z);
+
+    // if already inside the box, or somehow overshooting target (?)
+    if (tf >= -0.001 && tf <= 1.001)
+        old += tf * d;
 
     hx_FragColor.xyz = mix(old, c, amount);
     hx_FragColor.w = col.w;

src/helix-core/math/Matrix4x4.js

@@ -1528,7 +1528,7 @@ Matrix4x4.prototype =
         cm[10] *= rcpZ;
 
         quat.fromMatrix(clone);
-        this.getColumn(3, pos)
+        this.getColumn(3, pos);
 
         return targetOrPos;
     },