summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/util.js2
-rw-r--r--shader-animate.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/js/util.js b/js/util.js
index d31af47..5466c07 100644
--- a/js/util.js
+++ b/js/util.js
@@ -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)