summaryrefslogtreecommitdiff
path: root/shader-picker.html
diff options
context:
space:
mode:
Diffstat (limited to 'shader-picker.html')
-rw-r--r--shader-picker.html24
1 files changed, 2 insertions, 22 deletions
diff --git a/shader-picker.html b/shader-picker.html
index 923f1b6..0f27d6a 100644
--- a/shader-picker.html
+++ b/shader-picker.html
@@ -147,32 +147,13 @@ function init(){
mousey = e.pageY
})
- $("#add-frame").click(add_frame)
- $("#frames").sortable({
- start: drag_start,
- stop: drag_stop
- });
- $(document).on("click","#frames .remove",remove_frame)
- $("#framecount").change(function(){
- var val = $(this).int()
- if (val < 1 || isNaN(val)) $(this).val(val = 1)
- if (val == 1) $("#add-frame").html("+add frame")
- else $("#add-frame").html("+add frames")
- })
$("#background").change(function(){
document.body.style.backgroundColor = $("#background").string()
})
- $("#frames").disableSelection();
- $("#remove-all-frames").click(remove_all_frames)
- $("#weave-frames").click(weave_frames)
- $("#shuffle-frames").click(shuffle_frames)
- $("#reverse-frames").click(reverse_frames)
- $("#sort-frames").click(sort_frames)
+ frame_editor.init()
- $("#render").click(render)
- $("#save").click(save)
- $("#upload").click(upload)
+ $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
$("#help,#instructions .close").click(function(){ $("#instructions").toggle() })
$("#instructions").draggable({
start: drag_start,
@@ -181,7 +162,6 @@ function init(){
$("#instructions").disableSelection();
load()
- $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
gallery.choose = choose
gallery.init()