diff options
| -rw-r--r-- | js/api/gallery.js | 1 | ||||
| -rw-r--r-- | js/frames.js | 3 | ||||
| -rw-r--r-- | js/render.js | 2 | ||||
| -rw-r--r-- | 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 = $("<div>").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 @@ <head> <style type="text/css"> body { background: #f8f8f8; font-size: 14px } +div { float: left; padding: 10px;} +form { display: inline-block; } +a { color: #00f; } + #url { width: 250px; } #width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; text-align: right; } #background { text-align: left; } @@ -11,10 +15,6 @@ body { background: #f8f8f8; font-size: 14px } #shader-id { width: 40px; } #shader { width: 400px; height: 247px; font-family: fixed; } #uploaded-url { display: none; width: 300px; clear: both; } -a { color: #00f; } - -div { float: left; padding: 10px;} -form { display: inline-block; } #header { clear: right; width:100%; padding: 0; font-size: 12px; } #shader-gallery,#gallery-images { display: block; height: 152px; overflow-y: auto; width: 100%; padding: 0; } @@ -45,7 +45,6 @@ form { display: inline-block; } .close,.remove { cursor: pointer; } .status { font-size: 12px; } -.toggle-off { float: right; } #render,#save,#upload,#save-shader { font-weight: bold; } #save[disabled],#upload[disabled] { font-weight: normal; } @@ -56,6 +55,7 @@ form { display: inline-block; } <div id="header"> <button id="help">help</button> + <button class="toggle-off">x</button> <button id="new-shader"><b>new shader</b></button> <select id="examples"> <option>examples</option> @@ -70,7 +70,6 @@ form { display: inline-block; } | <button id="toggle-shaders">browse shaders</button> <button id="toggle-images">browse images</button> - <button class="toggle-off">hide</button> <span class="status"></span> <span id="shader-api-form" class="form"> |