Merge pull request #74 from brianchirls/develop

Release 2014-10-26

README.md

@@ -14,10 +14,10 @@ Full documentation is in progress at the [wiki](https://github.com/brianchirls/S
 ## Features
 
 - Optimized rendering path and GPU accelerated up to 60 frames per second
-- Accept image input from varied sources: videos, images, canvases and arrays
+- Accept image input from varied sources: video, image, canvas, array, webcam, Three.js
 - Effect parameters accept multiple formats and can monitor HTML form inputs
 - Basic 2D transforms (translate, rotate, scale, skew) on effect nodes
-- Plugin architecture for adding new effects
+- Plugin architecture for adding new effects, sources and targets
 - Read pixel array from any node
 - Load with [AMD](http://requirejs.org/docs/whyamd.html#amd)/[RequireJS](http://www.requirejs.org/)
 
@@ -88,8 +88,8 @@ on the system's graphics card. Seriously.js is heavily optimized, so most
 modern desktops and notebooks should be sufficient. Older systems may
 run slower, especially when using high-resolution videos.
 
-Mobile browser support for WebGL is limited. Mobile Firefox and Chrome have decent
-support, but the Android Browser and Mobile Safari do not.
+Mobile browser support for WebGL has improved. Mobile Firefox, Chrome and Safari have decent
+support, but they can be slower than desktop versions due to limited system resources.
 
 Seriously.js provides a method to detect browser support and offer
 descriptive error messages wherever possible.

examples/demo/threejs-target.html

@@ -232,8 +232,12 @@
 				was its own render buffer. But Seriously.js changed it, so 
 				we need to make this call to force Three.js to update itself.
 				Setting render target to anything other than null should do it.
+
+				We also need to call resetGLState to force Three.js to use
+				its own shader
 				*/
 				renderer.setRenderTarget(noiseTexture);
+				renderer.resetGLState();
 
 				// render updated 3D scene to render target texture
 				renderer.render(scene, camera);