diff options
| author | jules <jules@okfoc.us> | 2013-12-13 17:56:57 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2013-12-13 17:56:57 -0500 |
| commit | 87159fbb1efcaa9ee11467a4bfe9a239102adb29 (patch) | |
| tree | cc562dc30caa904e0d91302841db3c3dfac4bff2 | |
| parent | 9fa7fd851f3c4ea4a06de5929c0c44756c75b6b6 (diff) | |
gif!
| -rw-r--r-- | js/util.js | 2 | ||||
| -rw-r--r-- | shader-animate.html | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -27,7 +27,7 @@ function loadImage(imageURL, callback) { function giveImage() { if (window.gif) { - return gif.frames[gif.currentFrame()].ctx.canvas; + return gif.frames[gif.currentFrame()]; } else { return img; } diff --git a/shader-animate.html b/shader-animate.html index afacad0..67a0d57 100644 --- a/shader-animate.html +++ b/shader-animate.html @@ -26,6 +26,7 @@ delay <input type="text" id="delay" value="60"> </div> </body> <script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script> +<script type="text/javascript" src="js/vendor/gif.js"></script> <script type="text/javascript" src="js/vendor/canvasquery.js"></script> <script type="text/javascript" src="js/canvasquery.dither.js"></script> <script type="text/javascript" src="js/util.js"></script> @@ -77,6 +78,7 @@ function draw(t){ } function shade(frame, t){ try { + if (window.gif) frame = giveImage() var f = $("#shader").val() if (!f.length) return; var shader = new Function('x','y','t', f) |
