From e3297c52583f38ed71f7734f1ff04a267834e40c Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 26 Jan 2014 21:45:12 -0500 Subject: fix rendering bug --- js/api/gallery.js | 1 + js/frames.js | 3 +-- js/render.js | 2 ++ shader-combo.html | 11 +++++------ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/api/gallery.js b/js/api/gallery.js index 830ff93..e8af7f1 100644 --- a/js/api/gallery.js +++ b/js/api/gallery.js @@ -76,6 +76,7 @@ function load_shaders(err, shaders){ function display_shader(shader_object){ var $shader = $("
").addClass("shader") $shader.data("shader", shader_object) + $shader.data("id", shader_object.id) var html = shader_gallery_template for (var field in shader_object) { html = html.replace("{" + field + "}", shader_object[field]) diff --git a/js/frames.js b/js/frames.js index 887b497..571e862 100644 --- a/js/frames.js +++ b/js/frames.js @@ -97,12 +97,11 @@ function sort_frames(){ function render (){ if (rendering) return - rendering = true - if ($("#frames canvas.fullsize").length == 0) { add_frame() } + rendering = true encoder.reset() var delay = $("#framedelay").float() * 1000 || 100 $("#frames canvas.fullsize").each(function(){ diff --git a/js/render.js b/js/render.js index 205da88..bd6deb1 100644 --- a/js/render.js +++ b/js/render.js @@ -7,6 +7,7 @@ function choose (){ loading = true $("#url").val(this.src) loadImage(this.src, ready) + reset() } function load(){ @@ -84,6 +85,7 @@ function reset(){ pause(false) $("#workspace img").remove() $("#workspace canvas").show() + $("#uploaded-url").hide().val("") remove_all_frames() draw(0) } diff --git a/shader-combo.html b/shader-combo.html index 97ffd33..65b81e9 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -3,6 +3,10 @@