diff options
| -rw-r--r-- | js/frames.js | 5 | ||||
| -rw-r--r-- | shader-combo.html | 22 |
2 files changed, 24 insertions, 3 deletions
diff --git a/js/frames.js b/js/frames.js index 2dddae2..62306fa 100644 --- a/js/frames.js +++ b/js/frames.js @@ -1,3 +1,4 @@ +var frame_thumb_size = 93 var frame_editor = {} @@ -51,14 +52,14 @@ function add_single_frame(){ var frame = cc.clone().appendTo($el.find(".frame")[0]) frame.canvas.className = "fullsize" frame.canvas.style.display = "none" - var thumb = cc.clone().resize(100,100).appendTo($el.find(".frame")[0]) + var thumb = cc.clone().resize(frame_thumb_size,frame_thumb_size).appendTo($el.find(".frame")[0]) $("#frames").append($el) $("#render").enable() } function add_frames(frame_count){ rendering = true var t = old_t - start_t - pause_t - var frame_delay = $("#frameinterval").float() * 1000 + var frame_delay = ($("#frameinterval").float() || $("#framedelay").float()) * 1000 var frame for (var i = 0; i < frame_count; i++) { frame = giveFrame(t) diff --git a/shader-combo.html b/shader-combo.html index 0a5fcab..282e5e2 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -30,7 +30,7 @@ form { display: inline-block; } #instructions.dragging iframe { pointer-events: none; } #instructions .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } -#frames { width: 435px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } +#frames { display: block; width: 404px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } #frames div { margin: 1px; padding: 0; position: relative; border: 1px solid #eee; cursor: -webkit-grab; } #frames canvas { display: block } #frames .remove { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } @@ -112,7 +112,27 @@ form { display: inline-block; } <br> <input type="text" id="uploaded-url"> </span> + <br> + + frames <input type="text" id="framecount" value="1"> + <button id="add-frame">+add frame</button> + <select id="reorder-frames"> + <option value="">reorder</option> + <option value="weave-frames">weave</button> + <option value="shuffle-frames">shuffle</button> + <option value="reverse-frames">reverse</button> + <option value="sort-frames">sort</button> + </select> + <button id="remove-all-frames">clear</button> + <button id="render" disabled>render</button> + <br> + + <span id="frames"></span> + <br> + <br> + gif delay <input type="text" id="framedelay" value="0.06s"> + background <input type="text" id="background" value="#fff"> </div> <div id="workspace"></div> |