diff options
| -rw-r--r-- | js/gallery.js | 12 | ||||
| -rw-r--r-- | js/help.js | 19 | ||||
| -rw-r--r-- | shader-api.html | 3 | ||||
| -rw-r--r-- | shader-picker.html | 16 |
4 files changed, 36 insertions, 14 deletions
diff --git a/js/gallery.js b/js/gallery.js index 16ecdd8..d114ec6 100644 --- a/js/gallery.js +++ b/js/gallery.js @@ -3,7 +3,10 @@ var gallery = {} -gallery.init = function(){ +gallery.init = function(choose){ + if (choose) { + galler.choose = choose; + } gallery.bind() } @@ -52,3 +55,10 @@ gallery.image = function(im){ gallery.click = function(){ gallery.choose() } + +// template for choose function.. bound to an image object +gallery.choose = function(){ + var img = this + var imageURL = this.src +} + diff --git a/js/help.js b/js/help.js new file mode 100644 index 0000000..5610794 --- /dev/null +++ b/js/help.js @@ -0,0 +1,19 @@ + +var help = {} + +help.init = function(){ + help.bind() +} + +help.bind = function(){ + $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true }) + $("#help,#instructions .close").click(function(){ $("#instructions").toggle() }) + $("#instructions").draggable({ + start: drag_start, + stop: drag_stop + }) + $("#instructions").disableSelection(); +} + +function drag_start(){ dragging = true; $(this).addClass("dragging") } +function drag_stop(){ dragging = false; $(".dragging").removeClass("dragging") } diff --git a/shader-api.html b/shader-api.html index aa9d1a6..416f21a 100644 --- a/shader-api.html +++ b/shader-api.html @@ -86,6 +86,7 @@ a { color: #00f; } <script type="text/javascript" src="js/render.js"></script> <script type="text/javascript" src="js/shader.js"></script> <script type="text/javascript" src="js/error.highlight.js"></script> +<script type="text/javascript" src="js/help.js"></script> <script type="text/javascript" src="js/api/gallery.js"></script> <script type="text/javascript" src="js/api/get.js"></script> <script type="text/javascript" src="js/api/set.js"></script> @@ -109,6 +110,7 @@ function init(){ $("#pause").click(pause) user.init() + help.init() shader_gallery.init() document.getElementById('shader').addEventListener('input', shader_build); @@ -120,3 +122,4 @@ function init(){ </script> </html> +-
\ No newline at end of file diff --git a/shader-picker.html b/shader-picker.html index d0d2625..0896609 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -128,6 +128,7 @@ a { color: #00f; } <script type="text/javascript" src="js/render.js"></script> <script type="text/javascript" src="js/shader.js"></script> <script type="text/javascript" src="js/util.js"></script> +<script type="text/javascript" src="js/help.js"></script> <script type="text/javascript" src="shaders.json"></script> <script type="text/javascript"> @@ -154,19 +155,10 @@ function init(){ }) frame_editor.init() - - $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true }) - $("#help,#instructions .close").click(function(){ $("#instructions").toggle() }) - $("#instructions").draggable({ - start: drag_start, - stop: drag_stop - }) - $("#instructions").disableSelection(); - + help.init() load() - gallery.choose = choose - gallery.init() + gallery.init(choose) user.init() if (user.username.length) { @@ -181,8 +173,6 @@ function init(){ requestAnimationFrame(animate) } -function drag_start(){ dragging = true; $(this).addClass("dragging") } -function drag_stop(){ dragging = false; $(".dragging").removeClass("dragging") } </script> <script type="text/html" id="frame-template"> |