diff options
| -rw-r--r-- | js/frames.js | 6 | ||||
| -rw-r--r-- | js/help.js | 2 | ||||
| -rw-r--r-- | js/render.js | 2 | ||||
| -rw-r--r-- | shader-combo.html | 20 |
4 files changed, 21 insertions, 9 deletions
diff --git a/js/frames.js b/js/frames.js index c9c844d..2dddae2 100644 --- a/js/frames.js +++ b/js/frames.js @@ -29,6 +29,10 @@ frame_editor.bind = function(){ $("#render").click(render) $("#save").click(save) $("#upload").click(upload) + + $("#background").change(function(){ + document.body.style.backgroundColor = $("#background").string() + }) } function add_frame(){ @@ -121,8 +125,6 @@ function render (){ $("#render").html("rendering") } -function status(s){ $(".status").html(s) } - var encoder = new GifEncoder() encoder.on("quantized", function(url){ @@ -17,3 +17,5 @@ help.bind = function(){ function drag_start(){ dragging = true; $(this).addClass("dragging") } function drag_stop(){ dragging = false; $(".dragging").removeClass("dragging") } + +function status(s){ $(".status").html(s); console.log(s) } diff --git a/js/render.js b/js/render.js index 4a9eeef..a22c9fe 100644 --- a/js/render.js +++ b/js/render.js @@ -102,5 +102,3 @@ function draw(t) { frame = giveFrame(t) shade(frame, t) } - -function status(s){ $(".status").html(s); console.log(s) } diff --git a/shader-combo.html b/shader-combo.html index 92cb6e1..aa6edd2 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -46,13 +46,13 @@ a { color: #00f; } <button id="toggle-off">hide</button> | <span id="shader-api-form" class="form"> + <input type="checkbox" id="persist-image" checked> + <label for="persist-image">load image</label> <button id="fetch-latest">latest</button> <button id="fetch-next-page" class="hidden">→</button> <select id="pick-user"> <option>fetching users..</option> </select> - <input type="checkbox" id="persist-image" checked> - <label for="persist-image">load image</label> <span class="status"></span> <div id="shader-gallery"></div> </span> @@ -80,7 +80,6 @@ a { color: #00f; } <button id="pause">pause</button> <button id="reset">reset</button> <br> - </div> <div id="workspace"></div> @@ -125,16 +124,24 @@ a { color: #00f; } var cc = cq(0,0).appendTo("#workspace") var w, h +var lastGif +var mousex, mousey + var firsttime = true var shader_gallery_template = $("#shader-gallery-template").html() - $(init) function init(){ $("#url").change(load) $("#reset").click(reset) $("#pause").click(pause) + $("#step-forward").click(step_forward) + + $(document).on("mousemove", function(e) { + mousex = e.pageX + mousey = e.pageY + }) $("#toggle-shaders").click(function(){ $("#header .form").hide() @@ -152,6 +159,10 @@ function init(){ $("#header .form").hide() $(".bold").removeClass("bold") }) + + frame_editor.init() + help.init() + load() user.init() help.init() @@ -164,6 +175,5 @@ function init(){ } - </script> </html> |