summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Gruntfile.js91
-rw-r--r--README.md2
-rwxr-xr-xcgi-bin/save16
-rw-r--r--cgi-bin/thumbnail_upload4
-rw-r--r--commands.html (renamed from instructions.html)1
-rw-r--r--dither-localstorage.html132
-rw-r--r--dither-picker.html4
-rw-r--r--js/api/gallery.js95
-rw-r--r--js/api/get.js2
-rw-r--r--js/api/localstorage.js106
-rw-r--r--js/api/set.js98
-rw-r--r--js/asdf.js5
-rw-r--r--js/error.highlight.js152
-rw-r--r--js/frames.js60
-rw-r--r--js/gallery.js14
-rw-r--r--js/help.js47
-rw-r--r--js/image.js20
-rw-r--r--js/render.js198
-rw-r--r--js/shader.js29
-rw-r--r--js/user.js106
-rw-r--r--js/util.js12
-rw-r--r--js/vendor/acorn.js1768
-rw-r--r--js/vendor/gif-encode.min.js2
-rw-r--r--package.json23
-rw-r--r--shader-api.html146
-rw-r--r--shader-combo.html288
-rw-r--r--shader-gif.html4
-rw-r--r--shader-localstorage.html211
-rw-r--r--shader-picker.html209
-rw-r--r--shaders.json2
-rw-r--r--tutorial.html29
32 files changed, 3263 insertions, 615 deletions
diff --git a/.gitignore b/.gitignore
index 1787d3b..259fb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ v1
.sass-cache/
.#*
*.swp
+node_modules/
+dist
diff --git a/Gruntfile.js b/Gruntfile.js
index 371228c..42d25c3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,31 +3,89 @@ module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
+ dentist: {
+ options: {
+ include_js: "app.min.js",
+ include_css: "app.css"
+ },
+ build: {
+ src: 'shader-combo.html',
+ dest_js: 'dist/app.init.js',
+ dest_css: 'dist/app.css',
+ dest_html: 'dist/index.html'
+ }
+ },
concat: {
- dist: {
+ options: {
+ separator: ";"
+ },
+ build: {
src: [
- 'js/vendor/jquery/jquery.js',
- 'js/vendor/loader.js',
- 'js/mx/mx.js',
- 'js/mx/mx.*.js',
- 'js/spinner.js',
- 'js/pano.js'
-
+ "js/vendor/acorn.js",
+ "js/vendor/gif.js",
+ "js/vendor/gif-encode.min.js",
+ "js/vendor/jquery/jquery.min.js",
+ "js/vendor/jquery-ui-1.10.3.custom.min.js",
+ "js/vendor/canvasquery.js",
+ "js/vendor/FileSaver/FileSaver.js",
+ "js/vendor/dataUriToBlob.js",
+ "js/util.js",
+ "js/color.js",
+ "js/asdf.js",
+ "js/image.js",
+ "js/user.js",
+ "js/gallery.js",
+ "js/frames.js",
+ "js/render.js",
+ "js/shader.js",
+ "js/error.highlight.js",
+ "js/help.js",
+ "js/api/gallery.js",
+ "js/api/get.js",
+ "js/api/set.js",
+ "shaders.json",
+ "dist/app.init.js",
],
- dest: 'js/live.concat.js',
+ dest: 'dist/app.concat.js',
}
},
uglify: {
options: {
- banner: '/* asdf.us/dither */\n'
+ banner: '/* asdf.us/shader */\n'
},
build: {
- src: 'js/live.concat.js',
- dest: 'js/live.min.js'
+ src: 'dist/app.concat.js',
+ dest: 'dist/app.min.js'
}
},
+ clean: {
+ release: ["dist/app.concat.js","dist/app.init.js"],
+ },
+ copy: {
+ build: {
+ files: [
+ {
+ nonull: true,
+ expand: true,
+ src: ['commands.html', 'tutorial.html', 'img/*'],
+ dest: "dist/",
+ },
+ ]
+ },
+ release: {
+ files: [
+ {
+ nonull: true,
+ expand: true,
+ cwd: 'dist/',
+ src: ['**'],
+ dest: process.env.HOME + '/asdf/shader/',
+ },
+ ]
+ },
+ },
watch: {
- files: ['js/!(live.min|live.concat).js','js/vendor/*'],
+ files: ['dist/!(app.min|app.concat).js'],
tasks: ['default']
}
});
@@ -36,8 +94,11 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
-
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-contrib-copy');
+ grunt.loadNpmTasks('grunt-dentist');
// Default task(s).
- grunt.registerTask('default', ['concat', 'uglify']);
+ grunt.registerTask('default', ['dentist:build', 'concat:build', 'uglify:build', 'copy:build']);
+ grunt.registerTask('install', ['default', 'clean', 'copy:release']);
};
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..06b58cc
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+dither
+======
diff --git a/cgi-bin/save b/cgi-bin/save
index f6b0498..2bfb8c2 100755
--- a/cgi-bin/save
+++ b/cgi-bin/save
@@ -53,7 +53,7 @@ def strip_querystring(url):
p = re.compile('^[^\?]*')
return p.findall(url)[0]
-def store_shader_in_db(script, shader_id=False, image_url="",username=""):
+def store_shader_in_db(script, shader_id=False, image_url="",username="",name="",width="0",height="0"):
conn = MySQLdb.connect(host= "127.0.0.1",
user="asdfus",
@@ -66,8 +66,8 @@ def store_shader_in_db(script, shader_id=False, image_url="",username=""):
shader_id = conn.insert_id()
conn.commit()
- x.execute("""INSERT INTO shaders (script, image_url, username, time, shader_id) values (%s,%s,%s,%s,%s)""" ,
- (script, image_url, username, NOW, shader_id)
+ x.execute("""INSERT INTO shaders (script, image_url, username, name, remote_addr, time, shader_id, width, height) values (%s,%s,%s,%s,%s,%s,%s,%s,%s)""" ,
+ (script, image_url, username, name, REMOTE_IP, NOW, shader_id, width, height)
);
last_id = conn.insert_id()
conn.commit()
@@ -84,7 +84,7 @@ def main():
cgitb.enable()
limit_test = check_limits(API_NAME, MAX_INTERVAL, REQUEST_LIMIT, REMOTE_IP, NOW)
if limit_test: return error("You have exceeded the maximum number of requests, try again in %s seconds" % limit_test);
- #form should contain script, shader_id, username, image_url
+ #form should contain script, shader_id, username, name, image_url
form = cgi.FieldStorage(keep_blank_values=1)
if 'script' not in form or not form['script']:
error( 'script not found')
@@ -97,9 +97,13 @@ def main():
error("Cannot save this shader:%s" % test_failure)
shader_version_id = store_shader_in_db(
- form['script'].value, form['shader_id'].value,
+ form['script'].value,
+ form['shader_id'].value,
image_url,
- form['username'].value);
+ form['username'].value,
+ form['name'].value,
+ form['width'].value,
+ form['height'].value);
if not shader_version_id:
error('DB Error')
else:
diff --git a/cgi-bin/thumbnail_upload b/cgi-bin/thumbnail_upload
index 8ee9866..ab12c66 100644
--- a/cgi-bin/thumbnail_upload
+++ b/cgi-bin/thumbnail_upload
@@ -145,7 +145,7 @@ sub upload_to_AmazonS3{
sub error{
my $message = shift;
- my $resp = { success => "false", "error" => $message };
+ my $resp = { success => JSON::false, "error" => $message };
print JSON->new->encode($resp);
exit 1;
}
@@ -174,7 +174,7 @@ sub main{
error( "problem adding value to db");
}
my $resp = {
- success => "true",
+ success => JSON::true,
url => $thumbnail_url,
filesize => $filesize
};
diff --git a/instructions.html b/commands.html
index dff99d8..df9b072 100644
--- a/instructions.html
+++ b/commands.html
@@ -37,6 +37,7 @@ pixel(x,y) == 4*(y*w+h)
dist(x,y,a,b)
angle(x,y,a,b)
rand(n), randint(n)
+randrange(a,b)
choice(array)
deg(radians), rad(degrees)
diff --git a/dither-localstorage.html b/dither-localstorage.html
deleted file mode 100644
index 5e9bff9..0000000
--- a/dither-localstorage.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>Dither</title>
-<style>
- form { display: inline-block; }
- #gallery-images { display: block; max-height: 210px; overflow-y: auto; }
- #gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; }
-</style>
-</head>
-<body>
-
-<div id="gallery">
- <form id="gallery-search">
- <input type="text" id="dumpfm-search-query" value="duck bill">
- <button id="gallery-search">DUMP SEARCH</button>
- </form>
- <button id="gallery-random">IM RANDOM</button>
- <span id="status"></span>
- <div id="gallery-images"></div>
-</div>
-
-<div id="dither">
-<button id="random">random</button>
-<button id="pattern2">pattern2</button>
-<button id="pattern3">pattern3</button>
-<button id="pattern4">pattern4</button>
-<button id="pattern2Lite">pattern2lite</button>
-<button id="pattern3Lite">pattern3lite</button>
-<button id="pattern4Lite">pattern4lite</button>
-<button id="floydSteinberg">floyd-steinberg</button>
-<button id="right">right</button>
-</div>
-<div id="images"></div>
-
-
-</body>
-<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
-<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
-<script type="text/javascript" src="js/vendor/gif.js"></script>
-<script type="text/javascript" src="js/canvasquery.dither.js"></script>
-<script type="text/javascript" src="js/asdf.js"></script>
-<script type="text/javascript" src="js/image.js"></script>
-<script type="text/javascript" src="js/gallery.js"></script>
-<script type="text/javascript">
-
-var algo = 'random';
-var url = "img/abyss.png";
-var imgs = []
-var anim = []
-var complete = 0
-var viewport = cq(100, 100)
-$("#images").append(viewport.canvas)
-
-var ui = function(){}
-
-ui.init = function(){
- gallery.choose = ui.choose
- gallery.init()
- ui.bind()
- ui.animate()
- asdf.random()
-}
-
-ui.bind = function(){
- var buttons = $("#dither button")
- for (var i = 0; i < buttons.length; i++) {
- (function(n){
- buttons[n].onclick = function(){
- algo = buttons[n].id;
- ui.build()
- }
- })(i)
- }
-}
-
-ui.choose = function(){
- status("loading image..")
- loadImage( this.src, ui.ready );
-}
-
-ui.ready = function(){
- status("ready")
- loading = false
- if (window.gif) {
- frames = gif.frames
- }
- else {
- fc = cq(img.width, img.height)
- fc.drawImage(img, 0, 0)
- frames = [ { ctx: fc.context } ]
- }
- w = viewport.canvas.width = frames[0].ctx.canvas.width
- h = viewport.canvas.height = frames[0].ctx.canvas.height
- ui.build()
-}
-
-ui.build = function (){
- anim = []
- for (var i in frames) {
- anim.push( ui.dither(frames[i].ctx).context )
- }
-}
-
-ui.animate = function(t){
- requestAnimationFrame(ui.animate)
- if (! anim.length) return;
-
- if (window.gif && window.gif.currentFrame) {
- var idx = gif.currentFrame(t)
- var frame = anim[idx]
- }
- else {
- var frame = anim[0]
- }
- viewport.clearRect(0,0,w,h).drawImage(frame.canvas, 0, 0, w, h);
-}
-
-ui.dither = function (frame){
- var cc = cq(w, h)
- cc.drawImage(frame.canvas, 0, 0, w, h);
- cc[algo + "Dither"]( )
- return cc
-}
-
-function status(s){ $("#status").html(s); console.log(s) }
-
-$(ui.init)
-
-</script>
-</html>
-
diff --git a/dither-picker.html b/dither-picker.html
index 5e9bff9..fe210ef 100644
--- a/dither-picker.html
+++ b/dither-picker.html
@@ -16,7 +16,7 @@
<button id="gallery-search">DUMP SEARCH</button>
</form>
<button id="gallery-random">IM RANDOM</button>
- <span id="status"></span>
+ <span class="status"></span>
<div id="gallery-images"></div>
</div>
@@ -123,7 +123,7 @@ ui.dither = function (frame){
return cc
}
-function status(s){ $("#status").html(s); console.log(s) }
+function status(s){ $(".status").html(s); console.log(s) }
$(ui.init)
diff --git a/js/api/gallery.js b/js/api/gallery.js
new file mode 100644
index 0000000..0e6614b
--- /dev/null
+++ b/js/api/gallery.js
@@ -0,0 +1,95 @@
+var shader_gallery = {}
+
+shader_gallery.init = function(){
+ shader_gallery.bind()
+}
+
+shader_gallery.bind = function(){
+ $("#new-shader").click(new_shader)
+
+// $("#shader-id")
+// $("#fetch-info")
+ $("#fetch-all").click(function(){
+ ShaderAPI.all(load_shaders)
+ })
+ $("#fetch-latest").click(function(){
+ ShaderAPI.latest(load_shaders)
+ }).trigger("click")
+// $("#fetch-next-page")
+// $("#fetch-history")
+
+ $("#save-shader").click(save_shader)
+
+ ShaderAPI.list_users(function(err, users){
+ var $el = $("#pick-user").empty()
+ for (var i in users) {
+ var $option = $("<option>")
+ var username = users[i].username
+ $option.val(username).html(username)
+ $el.append( $option )
+ }
+ })
+
+ $(document).on("change", "#pick-user", function(){
+ var name = $(this).val()
+ ShaderAPI.username(name, load_shaders)
+ })
+ $(document).on("click", ".shader", function(){
+ run_shader( $(this).data("shader") )
+ })
+}
+
+function new_shader(opt){
+ opt = opt || {}
+ shader_id_root = null
+ run_shader({
+ id: "",
+ shader_id: "",
+ image_url: $("#url").val(),
+ script: opt.shader || "",
+ name: opt.name || ""
+ })
+}
+function run_shader(shader_object){
+ console.log(shader_object)
+ shader_id_root = shader_object.shader_id
+ if ($("#persist-image:checked").length) {
+ var new_w = parseInt(shader_object.width, 10)
+ var new_h = parseInt(shader_object.height, 10)
+ $("#url").val( shader_object.image_url )
+ if (new_w && new_h) {
+ preserve_dimensions = true
+ actual_w = w = new_w
+ actual_h = h = new_h
+ }
+ load()
+ }
+ $("#shader").val(shader_object.script)
+ $("#shader-id").val(shader_object.id)
+ $("#shader-name").val( shader_object.name || "")
+ shader_build()
+}
+function load_shaders(err, shaders){
+ var $el = $("#shader-gallery").empty()
+
+ for (var i in shaders) {
+ var $shader = display_shader(shaders[i])
+ $el.append( $shader )
+ }
+ if (firsttime) {
+ firsttime = false
+ run_shader(shaders[0])
+ }
+}
+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])
+ }
+ $shader.html(html)
+ shader_object.id && $shader.data("id", shader_object.id)
+ return $shader;
+}
diff --git a/js/api/get.js b/js/api/get.js
index ae06dbd..742d41f 100644
--- a/js/api/get.js
+++ b/js/api/get.js
@@ -1,5 +1,5 @@
;var ShaderAPI = {}
-ShaderAPI.limit = 24
+ShaderAPI.limit = 50
// info - fetch a single shader
// id: shader id
diff --git a/js/api/localstorage.js b/js/api/localstorage.js
new file mode 100644
index 0000000..309d49d
--- /dev/null
+++ b/js/api/localstorage.js
@@ -0,0 +1,106 @@
+
+local_shaders = new function(){}
+local_shaders.init = function(){
+ local_shaders.bind()
+}
+local_shaders.bind = function(){
+ local_shaders.buttons = {}
+ if ('EXAMPLE_SHADERS' in window) {
+ local_shaders.bindButtons( window.SHADERS )
+ }
+ local_shaders.bindButtons( local_shaders.getShaders() )
+ document.getElementById("add-shader").addEventListener("click", local_shaders.save, false)
+ document.getElementById("remove-shader").addEventListener("click", local_shaders.remove, false)
+}
+local_shaders.bindButtons = function(shaders){
+ for (var i = 0; i < shaders.length; i++){
+ local_shaders.bindButton(shaders[i])
+ }
+}
+local_shaders.bindButton = function(data){
+// console.log("button >> " + data.name)
+ var button = document.createElement("button")
+ button.innerHTML = data.name
+ button.addEventListener("click", local_shaders.load.bind(this, data), false)
+ document.getElementById("shaders").appendChild(button)
+ local_shaders.buttons[data.name] = button
+}
+local_shaders.load = function(data){
+ var shader = data.shader
+ if (shader && shader.length > 0) {
+ local_shaders.name = data.name
+ $("#shader").val(shader)
+ // pause here?
+ shader_build()
+ $(".active").removeClass("active")
+ $(local_shaders.buttons[data.name]).addClass("active")
+ local_shaders.setLastAccessed(data.name)
+ }
+}
+local_shaders.loadLastAccessed = function(){
+ var name = localStorage.getItem("im.lastShader") || "colorcycle"
+ if (name in local_shaders.buttons) {
+ $(local_shaders.buttons[name]).trigger("click")
+ }
+}
+local_shaders.setLastAccessed = function(name){
+ localStorage.setItem("im.lastShader", name)
+}
+
+local_shaders.getShaderByName = function(name){
+ return { name: name, shader: local_shaders.getShaderBody(name) }
+}
+local_shaders.getShaderIndex = function(){
+ return JSON.parse( localStorage.getItem("im.shaders") ) || []
+}
+local_shaders.getShaderBody = function(name){
+ return localStorage.getItem("im.shaders."+name) || null
+}
+local_shaders.getShaders = function(){
+ var shaders = local_shaders.getShaderIndex()
+ return shaders.map(function(name){ return { name: name, shader: local_shaders.getShaderBody(name) } })
+}
+local_shaders.setShaderIndex = function(shaders){
+ localStorage.setItem("im.shaders", JSON.stringify(shaders))
+}
+local_shaders.setShader = function(name, shader){
+ if (! name.length || ! shader.length || !name.length || !shader.length) return
+ localStorage.setItem("im.shaders." + name, shader)
+}
+local_shaders.removeShader = function(name){
+ localStorage.removeItem("im.shaders." + name)
+}
+
+local_shaders.save = function(){
+ var name = prompt("enter shader name")
+ var shader = $("#shader").val()
+
+ if (! name) return;
+ if (shade !== shade_no_error_handling) return;
+
+ local_shaders.setShader(name, shader)
+
+ var shaders = local_shaders.getShaderIndex()
+ shaders.push(name)
+ local_shaders.setShaderIndex(shaders)
+
+ local_shaders.name = name
+ local_shaders.bindButton({ name: name, shader: shader })
+
+ $(".active").removeClass("active")
+ $(local_shaders.buttons[name]).addClass("active")
+ local_shaders.setLastAccessed(name)
+}
+
+local_shaders.remove = function(){
+ var name = local_shaders.name
+ if (! name || ! name.length) return
+
+ var shaders = local_shaders.getShaderIndex()
+ if (shaders.splice( shaders.indexOf(name), 1 )) {
+ local_shaders.setShaderIndex(shaders)
+ local_shaders.removeShader(name)
+ $(local_shaders.buttons[name]).remove()
+ local_shaders.name = ""
+ }
+}
diff --git a/js/api/set.js b/js/api/set.js
index 1e7e31f..3446134 100644
--- a/js/api/set.js
+++ b/js/api/set.js
@@ -1,39 +1,67 @@
+var shader_id_root = null;
function save_shader(){
- typeof shader_id_root == 'undefined' ? shader_id_root = "" : shader_id_root
- var params = {
- script : $("#shader").val(),
- image_url : $("#url").val(),
- username : user.username,
- shader_id : shader_id_root
- }
- console.log(params)
- $.post("/cgi-bin/im/shader/save", params, function(resp){
- console.log(resp);
- data = JSON.parse(resp)
- if (data.ERROR ){
- alert(data.ERROR)
- return false
- }
- if (! shader_id_root) {
- shader_id_root = data.id;
- }
+ shader_id_root = shader_id_root || ""
+ var params = {
+ script: $("#shader").val(),
+ image_url: $("#url").val(),
+ username: user.username,
+ name: $("#shader-name").val() || "",
+ shader_id: shader_id_root,
+ width: $("#width").int() || "",
+ height: $("#height").int() || ""
+ }
+ var thumb = make_thumbnail()
- var blob = dataUriToBlob(cc.clone().resize(200,200).canvas.toDataURL("image/png"))
- var form = new FormData();
-
- form.append("id", data.id);
- form.append("qqfile", blob);
- $.ajax({
- url: "/cgi-bin/im/shader/thumbnail_upload",
- type: "POST",
- data: form,
- processData: false,
- contentType: false,
- }).done(function(resp){
- console.log(resp);
- });
+ status('saving..')
+ console.log(params)
+ $.post("http://asdf.us/cgi-bin/im/shader/save", params, function(resp){
+ console.log(resp);
+ data = JSON.parse(resp)
+ if (data.ERROR){
+ status('error saving shader')
+ alert(data.ERROR)
+ return false
+ }
+ status('uploading thumbnail')
+ if (! shader_id_root) {
+ shader_id_root = data.id;
+ }
+
+ params.id = data.id;
+ params.thumbnail_url = "http://i.asdf.us/im/9a/chtiny3_1334529294_1334529329.gif";
+
+ $shader = display_shader(params)
+ $("#shader-gallery").prepend($shader)
+
+ save_thumbnail(data.id, thumb, $shader)
+ })
+}
+
+function make_thumbnail(){
+ return dataUriToBlob(cc.clone().resize(200,200).canvas.toDataURL("image/png"))
+}
+
+function save_thumbnail(id, thumb, $shader){
+ if (! id || id == "") return
+
+ thumb = thumb || make_thumbnail()
+
+ var form = new FormData();
- })
- //maintain the shader_id_root...
- return shader_id_root;
+ form.append("id", id);
+ form.append("qqfile", thumb);
+ $.ajax({
+ url: "http://asdf.us/cgi-bin/im/shader/thumbnail_upload",
+ type: "POST",
+ data: form,
+ processData: false,
+ contentType: false,
+ }).done(function(resp){
+ console.log(resp);
+ status('')
+ var data = JSON.parse(resp)
+ if (data.success) {
+ $shader.find("img").attr("src", data.url)
+ }
+ });
}
diff --git a/js/asdf.js b/js/asdf.js
index 53222e8..6006eea 100644
--- a/js/asdf.js
+++ b/js/asdf.js
@@ -1,7 +1,7 @@
//
// asdf .. asdf.us/im search api
-var asdf = { fetching: false }
+var asdf = { fetching: false, fetched: false }
asdf.random = function (e){
status("fetching random photoblasts")
e && e.preventDefault();
@@ -13,7 +13,7 @@ asdf.random = function (e){
asdf.fetch = function (opt){
if (asdf.fetching) return;
- asdf.fetching = true;
+ asdf.fetching = true
var params = {random:1};
$.ajax({
'url': "http://asdf.us/cgi-bin/im/list",
@@ -21,6 +21,7 @@ asdf.fetch = function (opt){
'dataType': "jsonp",
'success': function(urls){
asdf.fetching = false;
+ asdf.fetched = true
opt.success && opt.success(urls)
},
'error': opt.error || function(err){
diff --git a/js/error.highlight.js b/js/error.highlight.js
new file mode 100644
index 0000000..c2d3947
--- /dev/null
+++ b/js/error.highlight.js
@@ -0,0 +1,152 @@
+(function(){
+
+var dom = {}
+var style = {}
+var pos = {}
+// i use this because a plain <br> collapses vertically sometimes...
+var zero_width_space = '&#xfeff;'
+var height_until_error = 0;
+var height_with_error = 0;
+var scrollbar_width = 0;
+
+var off = function(){
+ dom.highlight.style.display = 'none'
+}
+
+var on = function(line_num){
+ pos = dom.textarea.getBoundingClientRect()
+ var text = dom.textarea.value;
+
+ var lines = text.split('\n')
+ var lines_until_error = lines.slice(0, line_num)
+ var line_with_error = lines[line_num]
+
+ if (lines_until_error.length === 1)
+ dom.textmeasure.innerHTML = lines_until_error + zero_width_space
+ else
+ dom.textmeasure.innerHTML = lines_until_error.join('<br>' + zero_width_space)
+
+ height_until_error = dom.textmeasure.offsetHeight
+
+ dom.textmeasure.innerHTML = line_with_error + zero_width_space
+
+ height_with_error = dom.textmeasure.offsetHeight
+
+ reposition_highlight()
+}
+
+var reposition_highlight = function(){
+
+ var bounds_bottom = pos.top + pos.height
+
+ if (dom.textarea.scrollHeight > dom.textarea.clientHeight) // scrollbar exists
+ dom.highlight.style.width = pos.width - scrollbar_width + "px"
+ else
+ dom.highlight.style.width = pos.width + "px"
+
+ dom.highlight.style.left = pos.left + "px"
+
+ var y_pos = pos.top + height_until_error - dom.textarea.scrollTop
+ dom.highlight.style.top = y_pos + dom.html.scrollTop + dom.body.scrollTop + "px"
+
+ var height_of_highlight = height_with_error;
+
+ // nice clip on bottom
+ if (y_pos + height_of_highlight > bounds_bottom)
+ height_of_highlight = Math.max(0, bounds_bottom - y_pos)
+ // crap clip on top
+ if (y_pos < pos.top)
+ height_of_highlight = 0
+
+ dom.highlight.style.height = height_of_highlight + "px"
+
+ dom.highlight.style.display = 'block'
+}
+
+var calc_textarea_style = function(){
+ var $textarea = $("#shader")
+ dom.textarea = $textarea[0]
+
+ var props = ['lineHeight', 'fontFamily', 'fontSize', 'padding', 'margin', 'borderWidth', 'width']
+
+ for (var i=0, p; p=props[i]; i++){
+ style[p] = $textarea.css(p)
+ }
+}
+
+
+var calc_scrollbar_width = function() {
+ var outer = document.createElement("div");
+ outer.style.visibility = "hidden";
+ outer.style.width = "100px";
+ document.body.appendChild(outer);
+
+ var width_no_scroll = outer.offsetWidth;
+ // force scrollbars
+ outer.style.overflow = "scroll";
+
+ var inner = document.createElement("div");
+ inner.style.width = "100%";
+ outer.appendChild(inner);
+
+ var width_with_scroll = inner.offsetWidth;
+ outer.parentNode.removeChild(outer);
+
+ return width_no_scroll - width_with_scroll;
+}
+
+var create_el_textmeasure = function(){
+ var el = dom.textmeasure = document.createElement('div')
+ el.id = 'textmeasure'
+ var s = el.style
+ for (var key in style)
+ s[key] = style[key]
+
+ s.wordWrap = 'break-word'
+ s.wordBreak = 'break-all'
+ s.border = '1px solid red'
+ s.padding = '0'
+ s.display = 'block'
+ s.position = 'absolute'
+ s.left = "-5000px"
+ document.body.appendChild(el)
+}
+
+var create_el_highlight = function(){
+ var el = dom.highlight = document.createElement('div')
+ var s = el.style
+ for (var key in style)
+ s[key] = style[key]
+
+ s.pointerEvents = 'none'
+ s.opacity = '0.2'
+ s.backgroundColor = '#f00'
+ s.position = 'absolute'
+ s.lineHeight = '0'
+ s.fontSize = '0'
+ s.padding = '0'
+ s.borderWidth = '0'
+ s.display = 'block'
+ document.body.appendChild(el)
+}
+
+var init = function(){
+ dom.html = document.querySelector('html')
+ dom.body = document.querySelector('body')
+ calc_textarea_style()
+ create_el_highlight()
+ create_el_textmeasure()
+ scrollbar_width = calc_scrollbar_width()
+ dom.textarea.addEventListener('scroll', reposition_highlight)
+}
+
+// exports
+error_highlight = {
+ init: init,
+ on: on,
+ off: off
+}
+
+})();
+
+error_highlight.init()
diff --git a/js/frames.js b/js/frames.js
index 0ae256c..fc6ee24 100644
--- a/js/frames.js
+++ b/js/frames.js
@@ -1,3 +1,40 @@
+var frame_thumb_size = 93
+
+var frame_editor = {}
+
+frame_editor.init = function(){
+ frame_editor.bind()
+}
+
+frame_editor.bind = function(){
+ $("#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")
+ })
+
+ $("#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)
+
+ $("#render").click(render)
+ $("#save").click(save)
+ $("#upload").click(upload)
+
+ $("#background").change(function(){
+ document.body.style.backgroundColor = $("#background").string()
+ })
+}
function add_frame(){
var frame_count = $("#framecount").int()
@@ -15,14 +52,13 @@ 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)
@@ -34,9 +70,6 @@ function add_frames(frame_count){
}
function remove_frame(){
$(this).closest("div").remove()
- if ($("#frames div").length == 0) {
- $("#render").disable()
- }
}
function remove_all_frames(){
$("#frames").empty()
@@ -64,6 +97,10 @@ function sort_frames(){
function render (){
if (rendering) return
+ if ($("#frames canvas.fullsize").length == 0) {
+ add_frame()
+ }
+
rendering = true
encoder.reset()
var delay = $("#framedelay").float() * 1000 || 100
@@ -72,7 +109,7 @@ function render (){
encoder.addFrame(frame.canvas, delay)
})
$("#pause,#render,#add-frame").disable()
- $("#rendered").find("img").remove()
+ $("#workspace").find("img").remove()
$("#rendered").show()
// really bad results with neuquant?
// status("quantizing")
@@ -89,8 +126,6 @@ function render (){
$("#render").html("rendering")
}
-function status(s){ $(".status").html(s) }
-
var encoder = new GifEncoder()
encoder.on("quantized", function(url){
@@ -109,11 +144,13 @@ encoder.on("rendered", function(bytes){
encoder.on("rendered-url", function(url){
var image = new Image ()
lastGif = image.src = url
- $("#rendered").append(image)
+ $("#workspace canvas").hide()
+ $("#workspace").append(image)
$("#uploaded-url").hide().val("")
+ $("#uploaded-url + br").hide()
$("#save,#upload,#rendered").show()
$("#pause,#render,#add-frame,#save,#upload").enable()
- $("#render").html("render")
+ $("#render").html("render gif")
rendering = false
pause(true)
})
@@ -161,6 +198,7 @@ function upload(){
console.log(data);
status("uploaded");
$("#uploaded-url").show().focus().val(data.url)
+ $("#uploaded-url + br").show()
},
error: function(data){
console.log(data)
diff --git a/js/gallery.js b/js/gallery.js
index 16ecdd8..839316c 100644
--- a/js/gallery.js
+++ b/js/gallery.js
@@ -3,7 +3,10 @@
var gallery = {}
-gallery.init = function(){
+gallery.init = function(choose){
+ if (choose) {
+ gallery.choose = choose;
+ }
gallery.bind()
}
@@ -11,7 +14,6 @@ gallery.bind = function(){
$("#gallery-random").click(asdf.random)
$("#gallery-search").submit(dumpfm.search)
$(document).on("click", "#gallery-images canvas", gallery.click)
- status("ready")
}
gallery.load = function(ims){
@@ -43,6 +45,7 @@ gallery.image = function(im){
$(thumb.canvas).show()
})
$(img).click(gallery.choose);
+ $("#persist-image").attr("checked", false)
}
try { img.src = im.url; }
catch(e){ return; }
@@ -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..db0ac6d
--- /dev/null
+++ b/js/help.js
@@ -0,0 +1,47 @@
+
+var help = {}
+
+help.init = function(){
+ help.bind()
+}
+
+help.bind = function(){
+ $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
+ $("#show-commands").click(function(){ $("#tutorial").hide(); $("#commands").toggle() })
+ $("#show-tutorial").click(function(){ $("#commands").hide(); $("#tutorial").toggle() })
+ $("#commands .close").click(function(){ $("#commands").toggle() })
+ $("#tutorial .close").click(function(){ $("#tutorial").toggle() })
+ $("#commands,#tutorial").draggable({
+ start: drag_start,
+ stop: drag_stop
+ })
+ $("#commands,#tutorial").disableSelection();
+
+ $("#examples").change(function(){
+ help.load_example($(this).val())
+ $("#toggle-images").trigger("click")
+ })
+
+ if ('EXAMPLE_SHADERS' in window) {
+ help.examples = {}
+ window.EXAMPLE_SHADERS.forEach(function(s){
+ help.examples[ s.name ] = s.shader
+ var $option = $("<option value='" + s.name +"'>" + s.name + "</option>")
+ $("#examples").append($option)
+ })
+ }
+}
+
+help.examples = {}
+
+help.load_example = function(name){
+ var s = help.examples[name]
+ $("#shader").html(s)
+ new_shader({ name: name, shader: s })
+}
+
+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) }
+function quiet_status(s){ $(".status").html(s) }
diff --git a/js/image.js b/js/image.js
index 7a5240f..9ac1290 100644
--- a/js/image.js
+++ b/js/image.js
@@ -1,20 +1,30 @@
+var gif, img
+var imageURL = null
+
function loadImage(imageURL, callback) {
var imageURL = proxify( imageURL );
+ window.imageURL = imageURL
window.gif = window.img = null
- if (imageURL.substr(-3) === "gif") {
+ if (! imageURL) {
+ window.gif = null
+ window.img = null
+ callback()
+ }
+ else if (imageURL.substr(-3) === "gif") {
window.gif = GIF(imageURL);
// gif.on("error", tryToLoadNextImage);
// gif.on("rendered", trackLoadTime);
gif.on("rendered", callback);
- return gif.render();
- } else {
+ gif.render();
+ }
+ else {
window.img = new Image();
// img.addEventListener("error", tryToLoadNextImage);
img.addEventListener("load", callback);
img.crossOrigin = "anonymous";
- return img.src = imageURL;
+ img.src = imageURL;
}
}
@@ -28,7 +38,7 @@ function giveImage(t) {
function proxify (url) {
if (url.indexOf("http") == 0)
- return "/cgi-bin/proxy?" + url // .replace(/^https?:\/\//, "");
+ return "/cgi-bin/proxy?" + url.replace(/^https/, "http");
else
return url
}
diff --git a/js/render.js b/js/render.js
index fdb0125..7eea965 100644
--- a/js/render.js
+++ b/js/render.js
@@ -1,106 +1,152 @@
var frame, img_frame;
var timeout, raf_id, start_t = 0, old_t = 0, pause_t = 0
-var paused = false, dragging = false, rendering = false, scrolling = false, deferring = false, scrollTimeout = null;
-var fps = 30;
+var paused = false, dragging = false, rendering = false, scrolling = false, deferring = false, scrollTimeout = null
+var fps = 30
+var preserve_dimensions = true;
function choose (){
- imageURL = this.src
- loading = true
- $("#url").val(imageURL)
- loadImage(imageURL, ready)
+ loading = true
+ preserve_dimensions = false
+ $("#url").val(this.src)
+ loadImage(this.src, ready)
+ reset()
}
+
function load(){
- loading = true
- var imageURL = $("#url").val()
- loadImage(imageURL, ready)
+ var newImageURL = $("#url").val()
+ loading = true
+ if (newImageURL != imageURL) {
+ loadImage(newImageURL, ready)
+ status("loading")
+ }
}
function ready(){
- loading = false
- if (window.gif) {
- frame = gif.frames[0]
- w = cc.canvas.width = frame.ctx.canvas.width
- h = cc.canvas.height = frame.ctx.canvas.height
- for (var i=0, f; f=gif.frames[i]; i++){
- f.cloneData = f.ctx.getImageData(0,0,w,h)
- }
- }
- else {
- fc = cq(img.width, img.height)
- fc.drawImage(img, 0, 0)
- frame = img_frame = { ctx: fc.context }
- w = cc.canvas.width = frame.ctx.canvas.width
- h = cc.canvas.height = frame.ctx.canvas.height
- frame.cloneData = frame.ctx.getImageData(0,0,w,h)
- }
+ loading = false
+ status("")
+ if (window.gif) {
+ frame = gif.frames[0]
+ actual_w = cc.canvas.width = frame.ctx.canvas.width
+ actual_h = cc.canvas.height = frame.ctx.canvas.height
+ if (! preserve_dimensions) {
+ w = actual_w
+ h = actual_h
+ }
+ for (var i=0, f; f=gif.frames[i]; i++){
+ f.cloneData = f.ctx.getImageData(0,0,actual_w,actual_h)
+ }
+ }
+ else if (window.img) {
+ fc = cq(img.width, img.height)
+ fc.drawImage(img, 0, 0)
+ frame = img_frame = { ctx: fc.context }
+ actual_w = cc.canvas.width = frame.ctx.canvas.width
+ actual_h = cc.canvas.height = frame.ctx.canvas.height
+ if (! preserve_dimensions) {
+ w = actual_w
+ h = actual_h
+ }
+ frame.cloneData = frame.ctx.getImageData(0,0,actual_w,actual_h)
+ }
+ else {
+ cc.canvas.width = actual_w = w
+ cc.canvas.height = actual_h = h
+ shader_build()
+ }
+ displayWidthHeight(w, h)
+ preserve_dimensions = false;
+}
+
+function displayWidthHeight(width, height){
+ $("#width").val(width)
+ $("#height").val(height)
}
function giveFrame(t){
- if (window.gif) {
- if (gif.currentFrame) {
- return gif.frames[gif.currentFrame(t)]
- }
- else {
- return gif.frames[0]
- }
- }
- else if (window.img) {
- return img_frame
- }
- else {
- return cq(w, h)
- }
+ if (window.gif) {
+ if (gif.currentFrame) {
+ return gif.frames[gif.currentFrame(t)]
+ }
+ else if (gif.frames) {
+ return gif.frames[0]
+ }
+ }
+ if (window.img) {
+ return img_frame
+ }
+ else {
+ return empty_frame()
+ }
+}
+
+function empty_frame(){
+ actual_w = w = w || 400
+ actual_h = h = h || 266
+ var cx = cq(w, h).fillStyle("rgba(255,255,255,255)").fillRect(0,0,w,h)
+ return { ctx: cx.context, cloneData: cx.getImageData(0,0,w,h) }
+}
+
+function feedback_frame(){
+ return { ctx: cc.context, cloneData: cc.getImageData(0,0,w,h) }
}
function reset(){
- start_t = old_t
- pause_t = 0
- pause(false)
- $("#rendered img").remove()
- draw(0)
+ start_t = old_t
+ pause_t = 0
+ pause(false)
+ $("#workspace img").remove()
+ $("#workspace canvas").show()
+ $("#uploaded-url").hide()
+ $("#uploaded-url + br").show()
+ remove_all_frames()
+ draw(0)
}
function pause(state){
- $("#pause").toggleClass("paused", paused = typeof state == "boolean" ? state : ! paused).html(paused ? "paused" : "pause")
+ paused = typeof state == "boolean" ? state : ! paused
+ $("#pause").toggleClass("paused", paused).html(paused ? "paused" : "pause")
+ if (!paused) {
+ $("#workspace canvas").show()
+ $("#workspace img").hide()
+ $("#save,#upload").disable()
+ }
}
function step_forward(){
- var step = $("#framedelay").float() * 1000 || 100
- old_t += step
- draw(old_t)
- pause(true)
+ var step = $("#framedelay").float() * 1000 || 100
+ old_t += step
+ draw(old_t)
+ pause(true)
}
function animate(t){
- raf_id = requestAnimationFrame(animate);
+ raf_id = requestAnimationFrame(animate);
- var step_t = t - old_t
- old_t = t
-
- if (paused || dragging || rendering || scrolling || deferring) {
- pause_t += step_t
- if (scrolling) {
- scrolling = false
- deferring = true
- }
- else {
- deferring = false
- }
- return
- }
+ var step_t = t - old_t
+ old_t = t
- // var timing = +(new Date())
- draw(t)
- // timing = +(new Date()) - timing
- fps = avg(fps, 1000/step_t, 4)
- // status(~~(fps) + " fps")
+ if (paused || dragging || rendering || scrolling || deferring) {
+ pause_t += step_t
+ if (scrolling) {
+ scrolling = false
+ deferring = true
+ }
+ else {
+ deferring = false
+ }
+ return
+ }
+
+ // var timing = +(new Date())
+ draw(t)
+ // timing = +(new Date()) - timing
+ fps = avg(fps, 1000/step_t, 4)
+ quiet_status(~~(fps) + " fps")
}
function draw(t) {
- t -= start_t
- t -= pause_t
- frame = giveFrame(t)
- shade(frame, t)
+ t -= start_t
+ t -= pause_t
+ frame = giveFrame(t)
+ shade(frame, t)
}
-
-function status(s){ $("#status").html(s); console.log(s) }
diff --git a/js/shader.js b/js/shader.js
index 19c049b..a8559ba 100644
--- a/js/shader.js
+++ b/js/shader.js
@@ -1,3 +1,5 @@
+function shader (x,y,t,d) {}
+
var shader_build = function(){
var fn_str = document.getElementById('shader').value
if (!fn_str.length) fn_str = ""
@@ -6,12 +8,17 @@ var shader_build = function(){
shader = fn
shade = shade_error_handling
} catch (e) {
+ try {
+ acorn.parse(fn_str)
+ } catch(e){ //e.loc = {column: 0, line: 1} line is 1-based
+ error_highlight.on(e.loc.line-1)
+ }
throw Error ("Shader compilation error")
}
}
var r,g,b,a;
-
+var w, h, actual_w, actual_h;
function shade_no_error_handling(frame, t){
if (! t || isNaN(t)) throw Error ("No time specified")
if (! frame) throw Error ("No frame specified")
@@ -36,9 +43,12 @@ function shade_no_error_handling(frame, t){
cc.putImageData(imgData,0,0)
}
+var chrome_stack_regexp = /<anonymous>:([0-9]+)/;
+var firefox_stack_regexp = /:([0-9]+)$/;
+
function shade_error_handling(frame, t){
if (! t || isNaN(t)) throw Error ("No time specified")
- if (! frame) throw Error ("No frame specified")
+ if (! frame || ! frame.ctx || ! frame.cloneData) throw Error ("No frame specified")
var imgData = frame.ctx.getImageData(0,0,w,h)
var data = imgData.data
@@ -61,11 +71,24 @@ function shade_error_handling(frame, t){
}
}
catch(e){
+ var lines = (e.stack + "").split('\n')
+ if (lines[0].substr(0,10) === "anonymous@") { // firefox
+ var matches = lines[0].match(firefox_stack_regexp)
+ if (matches.length > 1)
+ error_highlight.on(parseInt(matches[1]) - 5)
+
+ } else if (lines.length > 1) { // attempt chrome match
+ var matches = lines[1].match(chrome_stack_regexp)
+ if (matches && matches.length > 1)
+ error_highlight.on(parseInt(matches[1]) - 3)
+ }
+
// console.log(e.stack)
throw Error ("Shader execution error")
}
cc.putImageData(imgData,0,0)
shade = shade_no_error_handling
+ error_highlight.off()
}
-shade = shade_error_handling
+shade = shade_error_handling \ No newline at end of file
diff --git a/js/user.js b/js/user.js
index 296974e..a1ac53e 100644
--- a/js/user.js
+++ b/js/user.js
@@ -37,109 +37,3 @@ user.setCookie = function(username){
document.cookie = "imname="+username+";path=/;domain=.asdf.us;max-age=1086400"
localStorage.setItem("im.name", username);
}
-
-user.shaders = new function(){}
-user.shaders.init = function(){
- user.shaders.bind()
-}
-user.shaders.bind = function(){
- user.shaders.buttons = {}
- if ('SHADERS' in window) {
- user.shaders.bindButtons( window.SHADERS )
- }
- user.shaders.bindButtons( user.shaders.getShaders() )
- document.getElementById("add-shader").addEventListener("click", user.shaders.save, false)
- document.getElementById("remove-shader").addEventListener("click", user.shaders.remove, false)
-}
-user.shaders.bindButtons = function(shaders){
- for (var i = 0; i < shaders.length; i++){
- user.shaders.bindButton(shaders[i])
- }
-}
-user.shaders.bindButton = function(data){
-// console.log("button >> " + data.name)
- var button = document.createElement("button")
- button.innerHTML = data.name
- button.addEventListener("click", user.shaders.load.bind(this, data), false)
- document.getElementById("shaders").appendChild(button)
- user.shaders.buttons[data.name] = button
-}
-user.shaders.load = function(data){
- var shader = data.shader
- if (shader && shader.length > 0) {
- user.shaders.name = data.name
- $("#shader").val(shader)
- // pause here?
- shader_build()
- $(".active").removeClass("active")
- $(user.shaders.buttons[data.name]).addClass("active")
- user.shaders.setLastAccessed(data.name)
- }
-}
-user.shaders.loadLastAccessed = function(){
- var name = localStorage.getItem("im.lastShader") || "colorcycle"
- if (name in user.shaders.buttons) {
- $(user.shaders.buttons[name]).trigger("click")
- }
-}
-user.shaders.setLastAccessed = function(name){
- localStorage.setItem("im.lastShader", name)
-}
-
-user.shaders.getShaderByName = function(name){
- return { name: name, shader: user.shaders.getShaderBody(name) }
-}
-user.shaders.getShaderIndex = function(){
- return JSON.parse( localStorage.getItem("im.shaders") ) || []
-}
-user.shaders.getShaderBody = function(name){
- return localStorage.getItem("im.shaders."+name) || null
-}
-user.shaders.getShaders = function(){
- var shaders = user.shaders.getShaderIndex()
- return shaders.map(function(name){ return { name: name, shader: user.shaders.getShaderBody(name) } })
-}
-user.shaders.setShaderIndex = function(shaders){
- localStorage.setItem("im.shaders", JSON.stringify(shaders))
-}
-user.shaders.setShader = function(name, shader){
- if (! name.length || ! shader.length || !name.length || !shader.length) return
- localStorage.setItem("im.shaders." + name, shader)
-}
-user.shaders.removeShader = function(name){
- localStorage.removeItem("im.shaders." + name)
-}
-
-user.shaders.save = function(){
- var name = prompt("enter shader name")
- var shader = $("#shader").val()
-
- if (! name) return;
- if (shade !== shade_no_error_handling) return;
-
- user.shaders.setShader(name, shader)
-
- var shaders = user.shaders.getShaderIndex()
- shaders.push(name)
- user.shaders.setShaderIndex(shaders)
-
- user.shaders.name = name
- user.shaders.bindButton({ name: name, shader: shader })
-
- $(".active").removeClass("active")
- $(user.shaders.buttons[name]).addClass("active")
- user.shaders.setLastAccessed(name)
-}
-
-user.shaders.remove = function(){
- var name = user.shaders.name
- if (! name || ! name.length) return
-
- var shaders = user.shaders.getShaderIndex()
- if (shaders.splice( shaders.indexOf(name), 1 )) {
- user.shaders.setShaderIndex(shaders)
- user.shaders.removeShader(name)
- $(user.shaders.buttons[name]).remove()
- user.shaders.name = ""
- }
-} \ No newline at end of file
diff --git a/js/util.js b/js/util.js
index 7bb1c78..cecb210 100644
--- a/js/util.js
+++ b/js/util.js
@@ -43,7 +43,12 @@ function choice(a){ return a[randint(a.length)] }
function deg(n){ return n*180/PI }
function rad(n){ return n*PI/180 }
function xor(a,b){ a=!!a; b=!!b; return (a||b) && !(a&&b) }
-function pixel(x,y){ return 4*(mod(y,h)*w+mod(x,w)) }
+function mod(n,m){ return n-(m * floor(n/m)) }
+function dist(x0,y0,x1,y1){ return sqrt(pow(x1-x0,2)+pow(y1-y0,2)) }
+function angle(x0,y0,x1,y1){ return atan2(y1-y0,x1-x0) }
+function avg(m,n,a){ return (m*(a-1)+n)/a }
+
+function pixel(x,y){ return 4*(mod(y,actual_h)*actual_w+mod(x,actual_w)) }
function rgbpixel(d,x,y){
var p = pixel(~~x,~~y)
r = d[p]
@@ -51,10 +56,7 @@ function rgbpixel(d,x,y){
b = d[p+2]
a = d[p+3]
}
-function mod(n,m){ return n-(m * floor(n/m)) }
-function dist(x0,y0,x1,y1){ return sqrt(pow(x1-x0,2)+pow(y1-y0,2)) }
-function angle(x0,y0,x1,y1){ return atan2(y1-y0,x1-x0) }
-function avg(m,n,a){ return (m*(a-1)+n)/a }
+function fit(d,x,y){ rgbpixel(d,x*actual_w/w,y*actual_h/h) }
function step(a, b){
return (b >= a) + 0
diff --git a/js/vendor/acorn.js b/js/vendor/acorn.js
new file mode 100644
index 0000000..c335f65
--- /dev/null
+++ b/js/vendor/acorn.js
@@ -0,0 +1,1768 @@
+// Acorn is a tiny, fast JavaScript parser written in JavaScript.
+//
+// Acorn was written by Marijn Haverbeke and released under an MIT
+// license. The Unicode regexps (for identifiers and whitespace) were
+// taken from [Esprima](http://esprima.org) by Ariya Hidayat.
+//
+// Git repositories for Acorn are available at
+//
+// http://marijnhaverbeke.nl/git/acorn
+// https://github.com/marijnh/acorn.git
+//
+// Please use the [github bug tracker][ghbt] to report issues.
+//
+// [ghbt]: https://github.com/marijnh/acorn/issues
+//
+// This file defines the main parser interface. The library also comes
+// with a [error-tolerant parser][dammit] and an
+// [abstract syntax tree walker][walk], defined in other files.
+//
+// [dammit]: acorn_loose.js
+// [walk]: util/walk.js
+
+(function(root, mod) {
+ if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
+ if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
+ mod(root.acorn || (root.acorn = {})); // Plain browser env
+})(this, function(exports) {
+ "use strict";
+
+ exports.version = "0.4.1";
+
+ // The main exported interface (under `self.acorn` when in the
+ // browser) is a `parse` function that takes a code string and
+ // returns an abstract syntax tree as specified by [Mozilla parser
+ // API][api], with the caveat that the SpiderMonkey-specific syntax
+ // (`let`, `yield`, inline XML, etc) is not recognized.
+ //
+ // [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+
+ var options, input, inputLen, sourceFile;
+
+ exports.parse = function(inpt, opts) {
+ input = String(inpt); inputLen = input.length;
+ setOptions(opts);
+ initTokenState();
+ return parseTopLevel(options.program);
+ };
+
+ // A second optional argument can be given to further configure
+ // the parser process. These options are recognized:
+
+ var defaultOptions = exports.defaultOptions = {
+ // `ecmaVersion` indicates the ECMAScript version to parse. Must
+ // be either 3 or 5. This
+ // influences support for strict mode, the set of reserved words, and
+ // support for getters and setter.
+ ecmaVersion: 5,
+ // Turn on `strictSemicolons` to prevent the parser from doing
+ // automatic semicolon insertion.
+ strictSemicolons: false,
+ // When `allowTrailingCommas` is false, the parser will not allow
+ // trailing commas in array and object literals.
+ allowTrailingCommas: true,
+ // By default, reserved words are not enforced. Enable
+ // `forbidReserved` to enforce them.
+ forbidReserved: false,
+ // When `locations` is on, `loc` properties holding objects with
+ // `start` and `end` properties in `{line, column}` form (with
+ // line being 1-based and column 0-based) will be attached to the
+ // nodes.
+ locations: false,
+ // A function can be passed as `onComment` option, which will
+ // cause Acorn to call that function with `(block, text, start,
+ // end)` parameters whenever a comment is skipped. `block` is a
+ // boolean indicating whether this is a block (`/* */`) comment,
+ // `text` is the content of the comment, and `start` and `end` are
+ // character offsets that denote the start and end of the comment.
+ // When the `locations` option is on, two more parameters are
+ // passed, the full `{line, column}` locations of the start and
+ // end of the comments. Note that you are not allowed to call the
+ // parser from the callback—that will corrupt its internal state.
+ onComment: null,
+ // Nodes have their start and end characters offsets recorded in
+ // `start` and `end` properties (directly on the node, rather than
+ // the `loc` object, which holds line/column data. To also add a
+ // [semi-standardized][range] `range` property holding a `[start,
+ // end]` array with the same numbers, set the `ranges` option to
+ // `true`.
+ //
+ // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+ ranges: false,
+ // It is possible to parse multiple files into a single AST by
+ // passing the tree produced by parsing the first file as
+ // `program` option in subsequent parses. This will add the
+ // toplevel forms of the parsed file to the `Program` (top) node
+ // of an existing parse tree.
+ program: null,
+ // When `locations` is on, you can pass this to record the source
+ // file in every node's `loc` object.
+ sourceFile: null,
+ // This value, if given, is stored in every node, whether
+ // `locations` is on or off.
+ directSourceFile: null
+ };
+
+ function setOptions(opts) {
+ options = opts || {};
+ for (var opt in defaultOptions) if (!Object.prototype.hasOwnProperty.call(options, opt))
+ options[opt] = defaultOptions[opt];
+ sourceFile = options.sourceFile || null;
+ }
+
+ // The `getLineInfo` function is mostly useful when the
+ // `locations` option is off (for performance reasons) and you
+ // want to find the line/column position for a given character
+ // offset. `input` should be the code string that the offset refers
+ // into.
+
+ var getLineInfo = exports.getLineInfo = function(input, offset) {
+ for (var line = 1, cur = 0;;) {
+ lineBreak.lastIndex = cur;
+ var match = lineBreak.exec(input);
+ if (match && match.index < offset) {
+ ++line;
+ cur = match.index + match[0].length;
+ } else break;
+ }
+ return {line: line, column: offset - cur};
+ };
+
+ // Acorn is organized as a tokenizer and a recursive-descent parser.
+ // The `tokenize` export provides an interface to the tokenizer.
+ // Because the tokenizer is optimized for being efficiently used by
+ // the Acorn parser itself, this interface is somewhat crude and not
+ // very modular. Performing another parse or call to `tokenize` will
+ // reset the internal state, and invalidate existing tokenizers.
+
+ exports.tokenize = function(inpt, opts) {
+ input = String(inpt); inputLen = input.length;
+ setOptions(opts);
+ initTokenState();
+
+ var t = {};
+ function getToken(forceRegexp) {
+ lastEnd = tokEnd;
+ readToken(forceRegexp);
+ t.start = tokStart; t.end = tokEnd;
+ t.startLoc = tokStartLoc; t.endLoc = tokEndLoc;
+ t.type = tokType; t.value = tokVal;
+ return t;
+ }
+ getToken.jumpTo = function(pos, reAllowed) {
+ tokPos = pos;
+ if (options.locations) {
+ tokCurLine = 1;
+ tokLineStart = lineBreak.lastIndex = 0;
+ var match;
+ while ((match = lineBreak.exec(input)) && match.index < pos) {
+ ++tokCurLine;
+ tokLineStart = match.index + match[0].length;
+ }
+ }
+ tokRegexpAllowed = reAllowed;
+ skipSpace();
+ };
+ return getToken;
+ };
+
+ // State is kept in (closure-)global variables. We already saw the
+ // `options`, `input`, and `inputLen` variables above.
+
+ // The current position of the tokenizer in the input.
+
+ var tokPos;
+
+ // The start and end offsets of the current token.
+
+ var tokStart, tokEnd;
+
+ // When `options.locations` is true, these hold objects
+ // containing the tokens start and end line/column pairs.
+
+ var tokStartLoc, tokEndLoc;
+
+ // The type and value of the current token. Token types are objects,
+ // named by variables against which they can be compared, and
+ // holding properties that describe them (indicating, for example,
+ // the precedence of an infix operator, and the original name of a
+ // keyword token). The kind of value that's held in `tokVal` depends
+ // on the type of the token. For literals, it is the literal value,
+ // for operators, the operator name, and so on.
+
+ var tokType, tokVal;
+
+ // Interal state for the tokenizer. To distinguish between division
+ // operators and regular expressions, it remembers whether the last
+ // token was one that is allowed to be followed by an expression.
+ // (If it is, a slash is probably a regexp, if it isn't it's a
+ // division operator. See the `parseStatement` function for a
+ // caveat.)
+
+ var tokRegexpAllowed;
+
+ // When `options.locations` is true, these are used to keep
+ // track of the current line, and know when a new line has been
+ // entered.
+
+ var tokCurLine, tokLineStart;
+
+ // These store the position of the previous token, which is useful
+ // when finishing a node and assigning its `end` position.
+
+ var lastStart, lastEnd, lastEndLoc;
+
+ // This is the parser's state. `inFunction` is used to reject
+ // `return` statements outside of functions, `labels` to verify that
+ // `break` and `continue` have somewhere to jump to, and `strict`
+ // indicates whether strict mode is on.
+
+ var inFunction, labels, strict;
+
+ // This function is used to raise exceptions on parse errors. It
+ // takes an offset integer (into the current `input`) to indicate
+ // the location of the error, attaches the position to the end
+ // of the error message, and then raises a `SyntaxError` with that
+ // message.
+
+ function raise(pos, message) {
+ var loc = getLineInfo(input, pos);
+ message += " (" + loc.line + ":" + loc.column + ")";
+ var err = new SyntaxError(message);
+ err.pos = pos; err.loc = loc; err.raisedAt = tokPos;
+ throw err;
+ }
+
+ // Reused empty array added for node fields that are always empty.
+
+ var empty = [];
+
+ // ## Token types
+
+ // The assignment of fine-grained, information-carrying type objects
+ // allows the tokenizer to store the information it has about a
+ // token in a way that is very cheap for the parser to look up.
+
+ // All token type variables start with an underscore, to make them
+ // easy to recognize.
+
+ // These are the general types. The `type` property is only used to
+ // make them recognizeable when debugging.
+
+ var _num = {type: "num"}, _regexp = {type: "regexp"}, _string = {type: "string"};
+ var _name = {type: "name"}, _eof = {type: "eof"};
+
+ // Keyword tokens. The `keyword` property (also used in keyword-like
+ // operators) indicates that the token originated from an
+ // identifier-like word, which is used when parsing property names.
+ //
+ // The `beforeExpr` property is used to disambiguate between regular
+ // expressions and divisions. It is set on all token types that can
+ // be followed by an expression (thus, a slash after them would be a
+ // regular expression).
+ //
+ // `isLoop` marks a keyword as starting a loop, which is important
+ // to know when parsing a label, in order to allow or disallow
+ // continue jumps to that label.
+
+ var _break = {keyword: "break"}, _case = {keyword: "case", beforeExpr: true}, _catch = {keyword: "catch"};
+ var _continue = {keyword: "continue"}, _debugger = {keyword: "debugger"}, _default = {keyword: "default"};
+ var _do = {keyword: "do", isLoop: true}, _else = {keyword: "else", beforeExpr: true};
+ var _finally = {keyword: "finally"}, _for = {keyword: "for", isLoop: true}, _function = {keyword: "function"};
+ var _if = {keyword: "if"}, _return = {keyword: "return", beforeExpr: true}, _switch = {keyword: "switch"};
+ var _throw = {keyword: "throw", beforeExpr: true}, _try = {keyword: "try"}, _var = {keyword: "var"};
+ var _while = {keyword: "while", isLoop: true}, _with = {keyword: "with"}, _new = {keyword: "new", beforeExpr: true};
+ var _this = {keyword: "this"};
+
+ // The keywords that denote values.
+
+ var _null = {keyword: "null", atomValue: null}, _true = {keyword: "true", atomValue: true};
+ var _false = {keyword: "false", atomValue: false};
+
+ // Some keywords are treated as regular operators. `in` sometimes
+ // (when parsing `for`) needs to be tested against specifically, so
+ // we assign a variable name to it for quick comparing.
+
+ var _in = {keyword: "in", binop: 7, beforeExpr: true};
+
+ // Map keyword names to token types.
+
+ var keywordTypes = {"break": _break, "case": _case, "catch": _catch,
+ "continue": _continue, "debugger": _debugger, "default": _default,
+ "do": _do, "else": _else, "finally": _finally, "for": _for,
+ "function": _function, "if": _if, "return": _return, "switch": _switch,
+ "throw": _throw, "try": _try, "var": _var, "while": _while, "with": _with,
+ "null": _null, "true": _true, "false": _false, "new": _new, "in": _in,
+ "instanceof": {keyword: "instanceof", binop: 7, beforeExpr: true}, "this": _this,
+ "typeof": {keyword: "typeof", prefix: true, beforeExpr: true},
+ "void": {keyword: "void", prefix: true, beforeExpr: true},
+ "delete": {keyword: "delete", prefix: true, beforeExpr: true}};
+
+ // Punctuation token types. Again, the `type` property is purely for debugging.
+
+ var _bracketL = {type: "[", beforeExpr: true}, _bracketR = {type: "]"}, _braceL = {type: "{", beforeExpr: true};
+ var _braceR = {type: "}"}, _parenL = {type: "(", beforeExpr: true}, _parenR = {type: ")"};
+ var _comma = {type: ",", beforeExpr: true}, _semi = {type: ";", beforeExpr: true};
+ var _colon = {type: ":", beforeExpr: true}, _dot = {type: "."}, _question = {type: "?", beforeExpr: true};
+
+ // Operators. These carry several kinds of properties to help the
+ // parser use them properly (the presence of these properties is
+ // what categorizes them as operators).
+ //
+ // `binop`, when present, specifies that this operator is a binary
+ // operator, and will refer to its precedence.
+ //
+ // `prefix` and `postfix` mark the operator as a prefix or postfix
+ // unary operator. `isUpdate` specifies that the node produced by
+ // the operator should be of type UpdateExpression rather than
+ // simply UnaryExpression (`++` and `--`).
+ //
+ // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+ // binary operators with a very low precedence, that should result
+ // in AssignmentExpression nodes.
+
+ var _slash = {binop: 10, beforeExpr: true}, _eq = {isAssign: true, beforeExpr: true};
+ var _assign = {isAssign: true, beforeExpr: true};
+ var _incDec = {postfix: true, prefix: true, isUpdate: true}, _prefix = {prefix: true, beforeExpr: true};
+ var _logicalOR = {binop: 1, beforeExpr: true};
+ var _logicalAND = {binop: 2, beforeExpr: true};
+ var _bitwiseOR = {binop: 3, beforeExpr: true};
+ var _bitwiseXOR = {binop: 4, beforeExpr: true};
+ var _bitwiseAND = {binop: 5, beforeExpr: true};
+ var _equality = {binop: 6, beforeExpr: true};
+ var _relational = {binop: 7, beforeExpr: true};
+ var _bitShift = {binop: 8, beforeExpr: true};
+ var _plusMin = {binop: 9, prefix: true, beforeExpr: true};
+ var _multiplyModulo = {binop: 10, beforeExpr: true};
+
+ // Provide access to the token types for external users of the
+ // tokenizer.
+
+ exports.tokTypes = {bracketL: _bracketL, bracketR: _bracketR, braceL: _braceL, braceR: _braceR,
+ parenL: _parenL, parenR: _parenR, comma: _comma, semi: _semi, colon: _colon,
+ dot: _dot, question: _question, slash: _slash, eq: _eq, name: _name, eof: _eof,
+ num: _num, regexp: _regexp, string: _string};
+ for (var kw in keywordTypes) exports.tokTypes["_" + kw] = keywordTypes[kw];
+
+ // This is a trick taken from Esprima. It turns out that, on
+ // non-Chrome browsers, to check whether a string is in a set, a
+ // predicate containing a big ugly `switch` statement is faster than
+ // a regular expression, and on Chrome the two are about on par.
+ // This function uses `eval` (non-lexical) to produce such a
+ // predicate from a space-separated string of words.
+ //
+ // It starts by sorting the words by length.
+
+ function makePredicate(words) {
+ words = words.split(" ");
+ var f = "", cats = [];
+ out: for (var i = 0; i < words.length; ++i) {
+ for (var j = 0; j < cats.length; ++j)
+ if (cats[j][0].length == words[i].length) {
+ cats[j].push(words[i]);
+ continue out;
+ }
+ cats.push([words[i]]);
+ }
+ function compareTo(arr) {
+ if (arr.length == 1) return f += "return str === " + JSON.stringify(arr[0]) + ";";
+ f += "switch(str){";
+ for (var i = 0; i < arr.length; ++i) f += "case " + JSON.stringify(arr[i]) + ":";
+ f += "return true}return false;";
+ }
+
+ // When there are more than three length categories, an outer
+ // switch first dispatches on the lengths, to save on comparisons.
+
+ if (cats.length > 3) {
+ cats.sort(function(a, b) {return b.length - a.length;});
+ f += "switch(str.length){";
+ for (var i = 0; i < cats.length; ++i) {
+ var cat = cats[i];
+ f += "case " + cat[0].length + ":";
+ compareTo(cat);
+ }
+ f += "}";
+
+ // Otherwise, simply generate a flat `switch` statement.
+
+ } else {
+ compareTo(words);
+ }
+ return new Function("str", f);
+ }
+
+ // The ECMAScript 3 reserved word list.
+
+ var isReservedWord3 = makePredicate("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile");
+
+ // ECMAScript 5 reserved words.
+
+ var isReservedWord5 = makePredicate("class enum extends super const export import");
+
+ // The additional reserved words in strict mode.
+
+ var isStrictReservedWord = makePredicate("implements interface let package private protected public static yield");
+
+ // The forbidden variable names in strict mode.
+
+ var isStrictBadIdWord = makePredicate("eval arguments");
+
+ // And the keywords.
+
+ var isKeyword = makePredicate("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this");
+
+ // ## Character categories
+
+ // Big ugly regular expressions that match characters in the
+ // whitespace, identifier, and identifier-start categories. These
+ // are only applied when a character is found to actually have a
+ // code point above 128.
+
+ var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/;
+ var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
+ var nonASCIIidentifierChars = "\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+ var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+ var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+
+ // Whether a single character denotes a newline.
+
+ var newline = /[\n\r\u2028\u2029]/;
+
+ // Matches a whole line break (where CRLF is considered a single
+ // line break). Used to count lines.
+
+ var lineBreak = /\r\n|[\n\r\u2028\u2029]/g;
+
+ // Test whether a given character code starts an identifier.
+
+ var isIdentifierStart = exports.isIdentifierStart = function(code) {
+ if (code < 65) return code === 36;
+ if (code < 91) return true;
+ if (code < 97) return code === 95;
+ if (code < 123)return true;
+ return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
+ };
+
+ // Test whether a given character is part of an identifier.
+
+ var isIdentifierChar = exports.isIdentifierChar = function(code) {
+ if (code < 48) return code === 36;
+ if (code < 58) return true;
+ if (code < 65) return false;
+ if (code < 91) return true;
+ if (code < 97) return code === 95;
+ if (code < 123)return true;
+ return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
+ };
+
+ // ## Tokenizer
+
+ // These are used when `options.locations` is on, for the
+ // `tokStartLoc` and `tokEndLoc` properties.
+
+ function line_loc_t() {
+ this.line = tokCurLine;
+ this.column = tokPos - tokLineStart;
+ }
+
+ // Reset the token state. Used at the start of a parse.
+
+ function initTokenState() {
+ tokCurLine = 1;
+ tokPos = tokLineStart = 0;
+ tokRegexpAllowed = true;
+ skipSpace();
+ }
+
+ // Called at the end of every token. Sets `tokEnd`, `tokVal`, and
+ // `tokRegexpAllowed`, and skips the space after the token, so that
+ // the next one's `tokStart` will point at the right position.
+
+ function finishToken(type, val) {
+ tokEnd = tokPos;
+ if (options.locations) tokEndLoc = new line_loc_t;
+ tokType = type;
+ skipSpace();
+ tokVal = val;
+ tokRegexpAllowed = type.beforeExpr;
+ }
+
+ function skipBlockComment() {
+ var startLoc = options.onComment && options.locations && new line_loc_t;
+ var start = tokPos, end = input.indexOf("*/", tokPos += 2);
+ if (end === -1) raise(tokPos - 2, "Unterminated comment");
+ tokPos = end + 2;
+ if (options.locations) {
+ lineBreak.lastIndex = start;
+ var match;
+ while ((match = lineBreak.exec(input)) && match.index < tokPos) {
+ ++tokCurLine;
+ tokLineStart = match.index + match[0].length;
+ }
+ }
+ if (options.onComment)
+ options.onComment(true, input.slice(start + 2, end), start, tokPos,
+ startLoc, options.locations && new line_loc_t);
+ }
+
+ function skipLineComment() {
+ var start = tokPos;
+ var startLoc = options.onComment && options.locations && new line_loc_t;
+ var ch = input.charCodeAt(tokPos+=2);
+ while (tokPos < inputLen && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+ ++tokPos;
+ ch = input.charCodeAt(tokPos);
+ }
+ if (options.onComment)
+ options.onComment(false, input.slice(start + 2, tokPos), start, tokPos,
+ startLoc, options.locations && new line_loc_t);
+ }
+
+ // Called at the start of the parse and after every token. Skips
+ // whitespace and comments, and.
+
+ function skipSpace() {
+ while (tokPos < inputLen) {
+ var ch = input.charCodeAt(tokPos);
+ if (ch === 32) { // ' '
+ ++tokPos;
+ } else if (ch === 13) {
+ ++tokPos;
+ var next = input.charCodeAt(tokPos);
+ if (next === 10) {
+ ++tokPos;
+ }
+ if (options.locations) {
+ ++tokCurLine;
+ tokLineStart = tokPos;
+ }
+ } else if (ch === 10 || ch === 8232 || ch === 8233) {
+ ++tokPos;
+ if (options.locations) {
+ ++tokCurLine;
+ tokLineStart = tokPos;
+ }
+ } else if (ch > 8 && ch < 14) {
+ ++tokPos;
+ } else if (ch === 47) { // '/'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === 42) { // '*'
+ skipBlockComment();
+ } else if (next === 47) { // '/'
+ skipLineComment();
+ } else break;
+ } else if (ch === 160) { // '\xa0'
+ ++tokPos;
+ } else if (ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+ ++tokPos;
+ } else {
+ break;
+ }
+ }
+ }
+
+ // ### Token reading
+
+ // This is the function that is called to fetch the next token. It
+ // is somewhat obscure, because it works in character codes rather
+ // than characters, and because operator parsing has been inlined
+ // into it.
+ //
+ // All in the name of speed.
+ //
+ // The `forceRegexp` parameter is used in the one case where the
+ // `tokRegexpAllowed` trick does not work. See `parseStatement`.
+
+ function readToken_dot() {
+ var next = input.charCodeAt(tokPos + 1);
+ if (next >= 48 && next <= 57) return readNumber(true);
+ ++tokPos;
+ return finishToken(_dot);
+ }
+
+ function readToken_slash() { // '/'
+ var next = input.charCodeAt(tokPos + 1);
+ if (tokRegexpAllowed) {++tokPos; return readRegexp();}
+ if (next === 61) return finishOp(_assign, 2);
+ return finishOp(_slash, 1);
+ }
+
+ function readToken_mult_modulo() { // '%*'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === 61) return finishOp(_assign, 2);
+ return finishOp(_multiplyModulo, 1);
+ }
+
+ function readToken_pipe_amp(code) { // '|&'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === code) return finishOp(code === 124 ? _logicalOR : _logicalAND, 2);
+ if (next === 61) return finishOp(_assign, 2);
+ return finishOp(code === 124 ? _bitwiseOR : _bitwiseAND, 1);
+ }
+
+ function readToken_caret() { // '^'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === 61) return finishOp(_assign, 2);
+ return finishOp(_bitwiseXOR, 1);
+ }
+
+ function readToken_plus_min(code) { // '+-'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === code) {
+ if (next == 45 && input.charCodeAt(tokPos + 2) == 62 &&
+ newline.test(input.slice(lastEnd, tokPos))) {
+ // A `-->` line comment
+ tokPos += 3;
+ skipLineComment();
+ skipSpace();
+ return readToken();
+ }
+ return finishOp(_incDec, 2);
+ }
+ if (next === 61) return finishOp(_assign, 2);
+ return finishOp(_plusMin, 1);
+ }
+
+ function readToken_lt_gt(code) { // '<>'
+ var next = input.charCodeAt(tokPos + 1);
+ var size = 1;
+ if (next === code) {
+ size = code === 62 && input.charCodeAt(tokPos + 2) === 62 ? 3 : 2;
+ if (input.charCodeAt(tokPos + size) === 61) return finishOp(_assign, size + 1);
+ return finishOp(_bitShift, size);
+ }
+ if (next == 33 && code == 60 && input.charCodeAt(tokPos + 2) == 45 &&
+ input.charCodeAt(tokPos + 3) == 45) {
+ // `<!--`, an XML-style comment that should be interpreted as a line comment
+ tokPos += 4;
+ skipLineComment();
+ skipSpace();
+ return readToken();
+ }
+ if (next === 61)
+ size = input.charCodeAt(tokPos + 2) === 61 ? 3 : 2;
+ return finishOp(_relational, size);
+ }
+
+ function readToken_eq_excl(code) { // '=!'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === 61) return finishOp(_equality, input.charCodeAt(tokPos + 2) === 61 ? 3 : 2);
+ return finishOp(code === 61 ? _eq : _prefix, 1);
+ }
+
+ function getTokenFromCode(code) {
+ switch(code) {
+ // The interpretation of a dot depends on whether it is followed
+ // by a digit.
+ case 46: // '.'
+ return readToken_dot();
+
+ // Punctuation tokens.
+ case 40: ++tokPos; return finishToken(_parenL);
+ case 41: ++tokPos; return finishToken(_parenR);
+ case 59: ++tokPos; return finishToken(_semi);
+ case 44: ++tokPos; return finishToken(_comma);
+ case 91: ++tokPos; return finishToken(_bracketL);
+ case 93: ++tokPos; return finishToken(_bracketR);
+ case 123: ++tokPos; return finishToken(_braceL);
+ case 125: ++tokPos; return finishToken(_braceR);
+ case 58: ++tokPos; return finishToken(_colon);
+ case 63: ++tokPos; return finishToken(_question);
+
+ // '0x' is a hexadecimal number.
+ case 48: // '0'
+ var next = input.charCodeAt(tokPos + 1);
+ if (next === 120 || next === 88) return readHexNumber();
+ // Anything else beginning with a digit is an integer, octal
+ // number, or float.
+ case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+ return readNumber(false);
+
+ // Quotes produce strings.
+ case 34: case 39: // '"', "'"
+ return readString(code);
+
+ // Operators are parsed inline in tiny state machines. '=' (61) is
+ // often referred to. `finishOp` simply skips the amount of
+ // characters it is given as second argument, and returns a token
+ // of the type given by its first argument.
+
+ case 47: // '/'
+ return readToken_slash(code);
+
+ case 37: case 42: // '%*'
+ return readToken_mult_modulo();
+
+ case 124: case 38: // '|&'
+ return readToken_pipe_amp(code);
+
+ case 94: // '^'
+ return readToken_caret();
+
+ case 43: case 45: // '+-'
+ return readToken_plus_min(code);
+
+ case 60: case 62: // '<>'
+ return readToken_lt_gt(code);
+
+ case 61: case 33: // '=!'
+ return readToken_eq_excl(code);
+
+ case 126: // '~'
+ return finishOp(_prefix, 1);
+ }
+
+ return false;
+ }
+
+ function readToken(forceRegexp) {
+ if (!forceRegexp) tokStart = tokPos;
+ else tokPos = tokStart + 1;
+ if (options.locations) tokStartLoc = new line_loc_t;
+ if (forceRegexp) return readRegexp();
+ if (tokPos >= inputLen) return finishToken(_eof);
+
+ var code = input.charCodeAt(tokPos);
+ // Identifier or keyword. '\uXXXX' sequences are allowed in
+ // identifiers, so '\' also dispatches to that.
+ if (isIdentifierStart(code) || code === 92 /* '\' */) return readWord();
+
+ var tok = getTokenFromCode(code);
+
+ if (tok === false) {
+ // If we are here, we either found a non-ASCII identifier
+ // character, or something that's entirely disallowed.
+ var ch = String.fromCharCode(code);
+ if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord();
+ raise(tokPos, "Unexpected character '" + ch + "'");
+ }
+ return tok;
+ }
+
+ function finishOp(type, size) {
+ var str = input.slice(tokPos, tokPos + size);
+ tokPos += size;
+ finishToken(type, str);
+ }
+
+ // Parse a regular expression. Some context-awareness is necessary,
+ // since a '/' inside a '[]' set does not end the expression.
+
+ function readRegexp() {
+ var content = "", escaped, inClass, start = tokPos;
+ for (;;) {
+ if (tokPos >= inputLen) raise(start, "Unterminated regular expression");
+ var ch = input.charAt(tokPos);
+ if (newline.test(ch)) raise(start, "Unterminated regular expression");
+ if (!escaped) {
+ if (ch === "[") inClass = true;
+ else if (ch === "]" && inClass) inClass = false;
+ else if (ch === "/" && !inClass) break;
+ escaped = ch === "\\";
+ } else escaped = false;
+ ++tokPos;
+ }
+ var content = input.slice(start, tokPos);
+ ++tokPos;
+ // Need to use `readWord1` because '\uXXXX' sequences are allowed
+ // here (don't ask).
+ var mods = readWord1();
+ if (mods && !/^[gmsiy]*$/.test(mods)) raise(start, "Invalid regexp flag");
+ try {
+ var value = new RegExp(content, mods);
+ } catch (e) {
+ if (e instanceof SyntaxError) raise(start, e.message);
+ raise(e);
+ }
+ return finishToken(_regexp, value);
+ }
+
+ // Read an integer in the given radix. Return null if zero digits
+ // were read, the integer value otherwise. When `len` is given, this
+ // will return `null` unless the integer has exactly `len` digits.
+
+ function readInt(radix, len) {
+ var start = tokPos, total = 0;
+ for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+ var code = input.charCodeAt(tokPos), val;
+ if (code >= 97) val = code - 97 + 10; // a
+ else if (code >= 65) val = code - 65 + 10; // A
+ else if (code >= 48 && code <= 57) val = code - 48; // 0-9
+ else val = Infinity;
+ if (val >= radix) break;
+ ++tokPos;
+ total = total * radix + val;
+ }
+ if (tokPos === start || len != null && tokPos - start !== len) return null;
+
+ return total;
+ }
+
+ function readHexNumber() {
+ tokPos += 2; // 0x
+ var val = readInt(16);
+ if (val == null) raise(tokStart + 2, "Expected hexadecimal number");
+ if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
+ return finishToken(_num, val);
+ }
+
+ // Read an integer, octal integer, or floating-point number.
+
+ function readNumber(startsWithDot) {
+ var start = tokPos, isFloat = false, octal = input.charCodeAt(tokPos) === 48;
+ if (!startsWithDot && readInt(10) === null) raise(start, "Invalid number");
+ if (input.charCodeAt(tokPos) === 46) {
+ ++tokPos;
+ readInt(10);
+ isFloat = true;
+ }
+ var next = input.charCodeAt(tokPos);
+ if (next === 69 || next === 101) { // 'eE'
+ next = input.charCodeAt(++tokPos);
+ if (next === 43 || next === 45) ++tokPos; // '+-'
+ if (readInt(10) === null) raise(start, "Invalid number");
+ isFloat = true;
+ }
+ if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
+
+ var str = input.slice(start, tokPos), val;
+ if (isFloat) val = parseFloat(str);
+ else if (!octal || str.length === 1) val = parseInt(str, 10);
+ else if (/[89]/.test(str) || strict) raise(start, "Invalid number");
+ else val = parseInt(str, 8);
+ return finishToken(_num, val);
+ }
+
+ // Read a string value, interpreting backslash-escapes.
+
+ function readString(quote) {
+ tokPos++;
+ var out = "";
+ for (;;) {
+ if (tokPos >= inputLen) raise(tokStart, "Unterminated string constant");
+ var ch = input.charCodeAt(tokPos);
+ if (ch === quote) {
+ ++tokPos;
+ return finishToken(_string, out);
+ }
+ if (ch === 92) { // '\'
+ ch = input.charCodeAt(++tokPos);
+ var octal = /^[0-7]+/.exec(input.slice(tokPos, tokPos + 3));
+ if (octal) octal = octal[0];
+ while (octal && parseInt(octal, 8) > 255) octal = octal.slice(0, -1);
+ if (octal === "0") octal = null;
+ ++tokPos;
+ if (octal) {
+ if (strict) raise(tokPos - 2, "Octal literal in strict mode");
+ out += String.fromCharCode(parseInt(octal, 8));
+ tokPos += octal.length - 1;
+ } else {
+ switch (ch) {
+ case 110: out += "\n"; break; // 'n' -> '\n'
+ case 114: out += "\r"; break; // 'r' -> '\r'
+ case 120: out += String.fromCharCode(readHexChar(2)); break; // 'x'
+ case 117: out += String.fromCharCode(readHexChar(4)); break; // 'u'
+ case 85: out += String.fromCharCode(readHexChar(8)); break; // 'U'
+ case 116: out += "\t"; break; // 't' -> '\t'
+ case 98: out += "\b"; break; // 'b' -> '\b'
+ case 118: out += "\u000b"; break; // 'v' -> '\u000b'
+ case 102: out += "\f"; break; // 'f' -> '\f'
+ case 48: out += "\0"; break; // 0 -> '\0'
+ case 13: if (input.charCodeAt(tokPos) === 10) ++tokPos; // '\r\n'
+ case 10: // ' \n'
+ if (options.locations) { tokLineStart = tokPos; ++tokCurLine; }
+ break;
+ default: out += String.fromCharCode(ch); break;
+ }
+ }
+ } else {
+ if (ch === 13 || ch === 10 || ch === 8232 || ch === 8233) raise(tokStart, "Unterminated string constant");
+ out += String.fromCharCode(ch); // '\'
+ ++tokPos;
+ }
+ }
+ }
+
+ // Used to read character escape sequences ('\x', '\u', '\U').
+
+ function readHexChar(len) {
+ var n = readInt(16, len);
+ if (n === null) raise(tokStart, "Bad character escape sequence");
+ return n;
+ }
+
+ // Used to signal to callers of `readWord1` whether the word
+ // contained any escape sequences. This is needed because words with
+ // escape sequences must not be interpreted as keywords.
+
+ var containsEsc;
+
+ // Read an identifier, and return it as a string. Sets `containsEsc`
+ // to whether the word contained a '\u' escape.
+ //
+ // Only builds up the word character-by-character when it actually
+ // containeds an escape, as a micro-optimization.
+
+ function readWord1() {
+ containsEsc = false;
+ var word, first = true, start = tokPos;
+ for (;;) {
+ var ch = input.charCodeAt(tokPos);
+ if (isIdentifierChar(ch)) {
+ if (containsEsc) word += input.charAt(tokPos);
+ ++tokPos;
+ } else if (ch === 92) { // "\"
+ if (!containsEsc) word = input.slice(start, tokPos);
+ containsEsc = true;
+ if (input.charCodeAt(++tokPos) != 117) // "u"
+ raise(tokPos, "Expecting Unicode escape sequence \\uXXXX");
+ ++tokPos;
+ var esc = readHexChar(4);
+ var escStr = String.fromCharCode(esc);
+ if (!escStr) raise(tokPos - 1, "Invalid Unicode escape");
+ if (!(first ? isIdentifierStart(esc) : isIdentifierChar(esc)))
+ raise(tokPos - 4, "Invalid Unicode escape");
+ word += escStr;
+ } else {
+ break;
+ }
+ first = false;
+ }
+ return containsEsc ? word : input.slice(start, tokPos);
+ }
+
+ // Read an identifier or keyword token. Will check for reserved
+ // words when necessary.
+
+ function readWord() {
+ var word = readWord1();
+ var type = _name;
+ if (!containsEsc) {
+ if (isKeyword(word)) type = keywordTypes[word];
+ else if (options.forbidReserved &&
+ (options.ecmaVersion === 3 ? isReservedWord3 : isReservedWord5)(word) ||
+ strict && isStrictReservedWord(word))
+ raise(tokStart, "The keyword '" + word + "' is reserved");
+ }
+ return finishToken(type, word);
+ }
+
+ // ## Parser
+
+ // A recursive descent parser operates by defining functions for all
+ // syntactic elements, and recursively calling those, each function
+ // advancing the input stream and returning an AST node. Precedence
+ // of constructs (for example, the fact that `!x[1]` means `!(x[1])`
+ // instead of `(!x)[1]` is handled by the fact that the parser
+ // function that parses unary prefix operators is called first, and
+ // in turn calls the function that parses `[]` subscripts — that
+ // way, it'll receive the node for `x[1]` already parsed, and wraps
+ // *that* in the unary operator node.
+ //
+ // Acorn uses an [operator precedence parser][opp] to handle binary
+ // operator precedence, because it is much more compact than using
+ // the technique outlined above, which uses different, nesting
+ // functions to specify precedence, for all of the ten binary
+ // precedence levels that JavaScript defines.
+ //
+ // [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
+
+ // ### Parser utilities
+
+ // Continue to the next token.
+
+ function next() {
+ lastStart = tokStart;
+ lastEnd = tokEnd;
+ lastEndLoc = tokEndLoc;
+ readToken();
+ }
+
+ // Enter strict mode. Re-reads the next token to please pedantic
+ // tests ("use strict"; 010; -- should fail).
+
+ function setStrict(strct) {
+ strict = strct;
+ tokPos = tokStart;
+ if (options.locations) {
+ while (tokPos < tokLineStart) {
+ tokLineStart = input.lastIndexOf("\n", tokLineStart - 2) + 1;
+ --tokCurLine;
+ }
+ }
+ skipSpace();
+ readToken();
+ }
+
+ // Start an AST node, attaching a start offset.
+
+ function node_t() {
+ this.type = null;
+ this.start = tokStart;
+ this.end = null;
+ }
+
+ function node_loc_t() {
+ this.start = tokStartLoc;
+ this.end = null;
+ if (sourceFile !== null) this.source = sourceFile;
+ }
+
+ function startNode() {
+ var node = new node_t();
+ if (options.locations)
+ node.loc = new node_loc_t();
+ if (options.directSourceFile)
+ node.sourceFile = options.directSourceFile;
+ if (options.ranges)
+ node.range = [tokStart, 0];
+ return node;
+ }
+
+ // Start a node whose start offset information should be based on
+ // the start of another node. For example, a binary operator node is
+ // only started after its left-hand side has already been parsed.
+
+ function startNodeFrom(other) {
+ var node = new node_t();
+ node.start = other.start;
+ if (options.locations) {
+ node.loc = new node_loc_t();
+ node.loc.start = other.loc.start;
+ }
+ if (options.ranges)
+ node.range = [other.range[0], 0];
+
+ return node;
+ }
+
+ // Finish an AST node, adding `type` and `end` properties.
+
+ function finishNode(node, type) {
+ node.type = type;
+ node.end = lastEnd;
+ if (options.locations)
+ node.loc.end = lastEndLoc;
+ if (options.ranges)
+ node.range[1] = lastEnd;
+ return node;
+ }
+
+ // Test whether a statement node is the string literal `"use strict"`.
+
+ function isUseStrict(stmt) {
+ return options.ecmaVersion >= 5 && stmt.type === "ExpressionStatement" &&
+ stmt.expression.type === "Literal" && stmt.expression.value === "use strict";
+ }
+
+ // Predicate that tests whether the next token is of the given
+ // type, and if yes, consumes it as a side effect.
+
+ function eat(type) {
+ if (tokType === type) {
+ next();
+ return true;
+ }
+ }
+
+ // Test whether a semicolon can be inserted at the current position.
+
+ function canInsertSemicolon() {
+ return !options.strictSemicolons &&
+ (tokType === _eof || tokType === _braceR || newline.test(input.slice(lastEnd, tokStart)));
+ }
+
+ // Consume a semicolon, or, failing that, see if we are allowed to
+ // pretend that there is a semicolon at this position.
+
+ function semicolon() {
+ if (!eat(_semi) && !canInsertSemicolon()) unexpected();
+ }
+
+ // Expect a token of a given type. If found, consume it, otherwise,
+ // raise an unexpected token error.
+
+ function expect(type) {
+ if (tokType === type) next();
+ else unexpected();
+ }
+
+ // Raise an unexpected token error.
+
+ function unexpected() {
+ raise(tokStart, "Unexpected token");
+ }
+
+ // Verify that a node is an lval — something that can be assigned
+ // to.
+
+ function checkLVal(expr) {
+ if (expr.type !== "Identifier" && expr.type !== "MemberExpression")
+ raise(expr.start, "Assigning to rvalue");
+ if (strict && expr.type === "Identifier" && isStrictBadIdWord(expr.name))
+ raise(expr.start, "Assigning to " + expr.name + " in strict mode");
+ }
+
+ // ### Statement parsing
+
+ // Parse a program. Initializes the parser, reads any number of
+ // statements, and wraps them in a Program node. Optionally takes a
+ // `program` argument. If present, the statements will be appended
+ // to its body instead of creating a new node.
+
+ function parseTopLevel(program) {
+ lastStart = lastEnd = tokPos;
+ if (options.locations) lastEndLoc = new line_loc_t;
+ inFunction = strict = null;
+ labels = [];
+ readToken();
+
+ var node = program || startNode(), first = true;
+ if (!program) node.body = [];
+ while (tokType !== _eof) {
+ var stmt = parseStatement();
+ node.body.push(stmt);
+ if (first && isUseStrict(stmt)) setStrict(true);
+ first = false;
+ }
+ return finishNode(node, "Program");
+ }
+
+ var loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"};
+
+ // Parse a single statement.
+ //
+ // If expecting a statement and finding a slash operator, parse a
+ // regular expression literal. This is to handle cases like
+ // `if (foo) /blah/.exec(foo);`, where looking at the previous token
+ // does not help.
+
+ function parseStatement() {
+ if (tokType === _slash || tokType === _assign && tokVal == "/=")
+ readToken(true);
+
+ var starttype = tokType, node = startNode();
+
+ // Most types of statements are recognized by the keyword they
+ // start with. Many are trivial to parse, some require a bit of
+ // complexity.
+
+ switch (starttype) {
+ case _break: case _continue:
+ next();
+ var isBreak = starttype === _break;
+ if (eat(_semi) || canInsertSemicolon()) node.label = null;
+ else if (tokType !== _name) unexpected();
+ else {
+ node.label = parseIdent();
+ semicolon();
+ }
+
+ // Verify that there is an actual destination to break or
+ // continue to.
+ for (var i = 0; i < labels.length; ++i) {
+ var lab = labels[i];
+ if (node.label == null || lab.name === node.label.name) {
+ if (lab.kind != null && (isBreak || lab.kind === "loop")) break;
+ if (node.label && isBreak) break;
+ }
+ }
+ if (i === labels.length) raise(node.start, "Unsyntactic " + starttype.keyword);
+ return finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement");
+
+ case _debugger:
+ next();
+ semicolon();
+ return finishNode(node, "DebuggerStatement");
+
+ case _do:
+ next();
+ labels.push(loopLabel);
+ node.body = parseStatement();
+ labels.pop();
+ expect(_while);
+ node.test = parseParenExpression();
+ semicolon();
+ return finishNode(node, "DoWhileStatement");
+
+ // Disambiguating between a `for` and a `for`/`in` loop is
+ // non-trivial. Basically, we have to parse the init `var`
+ // statement or expression, disallowing the `in` operator (see
+ // the second parameter to `parseExpression`), and then check
+ // whether the next token is `in`. When there is no init part
+ // (semicolon immediately after the opening parenthesis), it is
+ // a regular `for` loop.
+
+ case _for:
+ next();
+ labels.push(loopLabel);
+ expect(_parenL);
+ if (tokType === _semi) return parseFor(node, null);
+ if (tokType === _var) {
+ var init = startNode();
+ next();
+ parseVar(init, true);
+ finishNode(init, "VariableDeclaration");
+ if (init.declarations.length === 1 && eat(_in))
+ return parseForIn(node, init);
+ return parseFor(node, init);
+ }
+ var init = parseExpression(false, true);
+ if (eat(_in)) {checkLVal(init); return parseForIn(node, init);}
+ return parseFor(node, init);
+
+ case _function:
+ next();
+ return parseFunction(node, true);
+
+ case _if:
+ next();
+ node.test = parseParenExpression();
+ node.consequent = parseStatement();
+ node.alternate = eat(_else) ? parseStatement() : null;
+ return finishNode(node, "IfStatement");
+
+ case _return:
+ if (!inFunction) raise(tokStart, "'return' outside of function");
+ next();
+
+ // In `return` (and `break`/`continue`), the keywords with
+ // optional arguments, we eagerly look for a semicolon or the
+ // possibility to insert one.
+
+ if (eat(_semi) || canInsertSemicolon()) node.argument = null;
+ else { node.argument = parseExpression(); semicolon(); }
+ return finishNode(node, "ReturnStatement");
+
+ case _switch:
+ next();
+ node.discriminant = parseParenExpression();
+ node.cases = [];
+ expect(_braceL);
+ labels.push(switchLabel);
+
+ // Statements under must be grouped (by label) in SwitchCase
+ // nodes. `cur` is used to keep the node that we are currently
+ // adding statements to.
+
+ for (var cur, sawDefault; tokType != _braceR;) {
+ if (tokType === _case || tokType === _default) {
+ var isCase = tokType === _case;
+ if (cur) finishNode(cur, "SwitchCase");
+ node.cases.push(cur = startNode());
+ cur.consequent = [];
+ next();
+ if (isCase) cur.test = parseExpression();
+ else {
+ if (sawDefault) raise(lastStart, "Multiple default clauses"); sawDefault = true;
+ cur.test = null;
+ }
+ expect(_colon);
+ } else {
+ if (!cur) unexpected();
+ cur.consequent.push(parseStatement());
+ }
+ }
+ if (cur) finishNode(cur, "SwitchCase");
+ next(); // Closing brace
+ labels.pop();
+ return finishNode(node, "SwitchStatement");
+
+ case _throw:
+ next();
+ if (newline.test(input.slice(lastEnd, tokStart)))
+ raise(lastEnd, "Illegal newline after throw");
+ node.argument = parseExpression();
+ semicolon();
+ return finishNode(node, "ThrowStatement");
+
+ case _try:
+ next();
+ node.block = parseBlock();
+ node.handler = null;
+ if (tokType === _catch) {
+ var clause = startNode();
+ next();
+ expect(_parenL);
+ clause.param = parseIdent();
+ if (strict && isStrictBadIdWord(clause.param.name))
+ raise(clause.param.start, "Binding " + clause.param.name + " in strict mode");
+ expect(_parenR);
+ clause.guard = null;
+ clause.body = parseBlock();
+ node.handler = finishNode(clause, "CatchClause");
+ }
+ node.guardedHandlers = empty;
+ node.finalizer = eat(_finally) ? parseBlock() : null;
+ if (!node.handler && !node.finalizer)
+ raise(node.start, "Missing catch or finally clause");
+ return finishNode(node, "TryStatement");
+
+ case _var:
+ next();
+ parseVar(node);
+ semicolon();
+ return finishNode(node, "VariableDeclaration");
+
+ case _while:
+ next();
+ node.test = parseParenExpression();
+ labels.push(loopLabel);
+ node.body = parseStatement();
+ labels.pop();
+ return finishNode(node, "WhileStatement");
+
+ case _with:
+ if (strict) raise(tokStart, "'with' in strict mode");
+ next();
+ node.object = parseParenExpression();
+ node.body = parseStatement();
+ return finishNode(node, "WithStatement");
+
+ case _braceL:
+ return parseBlock();
+
+ case _semi:
+ next();
+ return finishNode(node, "EmptyStatement");
+
+ // If the statement does not start with a statement keyword or a
+ // brace, it's an ExpressionStatement or LabeledStatement. We
+ // simply start parsing an expression, and afterwards, if the
+ // next token is a colon and the expression was a simple
+ // Identifier node, we switch to interpreting it as a label.
+
+ default:
+ var maybeName = tokVal, expr = parseExpression();
+ if (starttype === _name && expr.type === "Identifier" && eat(_colon)) {
+ for (var i = 0; i < labels.length; ++i)
+ if (labels[i].name === maybeName) raise(expr.start, "Label '" + maybeName + "' is already declared");
+ var kind = tokType.isLoop ? "loop" : tokType === _switch ? "switch" : null;
+ labels.push({name: maybeName, kind: kind});
+ node.body = parseStatement();
+ labels.pop();
+ node.label = expr;
+ return finishNode(node, "LabeledStatement");
+ } else {
+ node.expression = expr;
+ semicolon();
+ return finishNode(node, "ExpressionStatement");
+ }
+ }
+ }
+
+ // Used for constructs like `switch` and `if` that insist on
+ // parentheses around their expression.
+
+ function parseParenExpression() {
+ expect(_parenL);
+ var val = parseExpression();
+ expect(_parenR);
+ return val;
+ }
+
+ // Parse a semicolon-enclosed block of statements, handling `"use
+ // strict"` declarations when `allowStrict` is true (used for
+ // function bodies).
+
+ function parseBlock(allowStrict) {
+ var node = startNode(), first = true, strict = false, oldStrict;
+ node.body = [];
+ expect(_braceL);
+ while (!eat(_braceR)) {
+ var stmt = parseStatement();
+ node.body.push(stmt);
+ if (first && allowStrict && isUseStrict(stmt)) {
+ oldStrict = strict;
+ setStrict(strict = true);
+ }
+ first = false;
+ }
+ if (strict && !oldStrict) setStrict(false);
+ return finishNode(node, "BlockStatement");
+ }
+
+ // Parse a regular `for` loop. The disambiguation code in
+ // `parseStatement` will already have parsed the init statement or
+ // expression.
+
+ function parseFor(node, init) {
+ node.init = init;
+ expect(_semi);
+ node.test = tokType === _semi ? null : parseExpression();
+ expect(_semi);
+ node.update = tokType === _parenR ? null : parseExpression();
+ expect(_parenR);
+ node.body = parseStatement();
+ labels.pop();
+ return finishNode(node, "ForStatement");
+ }
+
+ // Parse a `for`/`in` loop.
+
+ function parseForIn(node, init) {
+ node.left = init;
+ node.right = parseExpression();
+ expect(_parenR);
+ node.body = parseStatement();
+ labels.pop();
+ return finishNode(node, "ForInStatement");
+ }
+
+ // Parse a list of variable declarations.
+
+ function parseVar(node, noIn) {
+ node.declarations = [];
+ node.kind = "var";
+ for (;;) {
+ var decl = startNode();
+ decl.id = parseIdent();
+ if (strict && isStrictBadIdWord(decl.id.name))
+ raise(decl.id.start, "Binding " + decl.id.name + " in strict mode");
+ decl.init = eat(_eq) ? parseExpression(true, noIn) : null;
+ node.declarations.push(finishNode(decl, "VariableDeclarator"));
+ if (!eat(_comma)) break;
+ }
+ return node;
+ }
+
+ // ### Expression parsing
+
+ // These nest, from the most general expression type at the top to
+ // 'atomic', nondivisible expression types at the bottom. Most of
+ // the functions will simply let the function(s) below them parse,
+ // and, *if* the syntactic construct they handle is present, wrap
+ // the AST node that the inner parser gave them in another node.
+
+ // Parse a full expression. The arguments are used to forbid comma
+ // sequences (in argument lists, array literals, or object literals)
+ // or the `in` operator (in for loops initalization expressions).
+
+ function parseExpression(noComma, noIn) {
+ var expr = parseMaybeAssign(noIn);
+ if (!noComma && tokType === _comma) {
+ var node = startNodeFrom(expr);
+ node.expressions = [expr];
+ while (eat(_comma)) node.expressions.push(parseMaybeAssign(noIn));
+ return finishNode(node, "SequenceExpression");
+ }
+ return expr;
+ }
+
+ // Parse an assignment expression. This includes applications of
+ // operators like `+=`.
+
+ function parseMaybeAssign(noIn) {
+ var left = parseMaybeConditional(noIn);
+ if (tokType.isAssign) {
+ var node = startNodeFrom(left);
+ node.operator = tokVal;
+ node.left = left;
+ next();
+ node.right = parseMaybeAssign(noIn);
+ checkLVal(left);
+ return finishNode(node, "AssignmentExpression");
+ }
+ return left;
+ }
+
+ // Parse a ternary conditional (`?:`) operator.
+
+ function parseMaybeConditional(noIn) {
+ var expr = parseExprOps(noIn);
+ if (eat(_question)) {
+ var node = startNodeFrom(expr);
+ node.test = expr;
+ node.consequent = parseExpression(true);
+ expect(_colon);
+ node.alternate = parseExpression(true, noIn);
+ return finishNode(node, "ConditionalExpression");
+ }
+ return expr;
+ }
+
+ // Start the precedence parser.
+
+ function parseExprOps(noIn) {
+ return parseExprOp(parseMaybeUnary(), -1, noIn);
+ }
+
+ // Parse binary operators with the operator precedence parsing
+ // algorithm. `left` is the left-hand side of the operator.
+ // `minPrec` provides context that allows the function to stop and
+ // defer further parser to one of its callers when it encounters an
+ // operator that has a lower precedence than the set it is parsing.
+
+ function parseExprOp(left, minPrec, noIn) {
+ var prec = tokType.binop;
+ if (prec != null && (!noIn || tokType !== _in)) {
+ if (prec > minPrec) {
+ var node = startNodeFrom(left);
+ node.left = left;
+ node.operator = tokVal;
+ var op = tokType;
+ next();
+ node.right = parseExprOp(parseMaybeUnary(), prec, noIn);
+ var exprNode = finishNode(node, (op === _logicalOR || op === _logicalAND) ? "LogicalExpression" : "BinaryExpression");
+ return parseExprOp(exprNode, minPrec, noIn);
+ }
+ }
+ return left;
+ }
+
+ // Parse unary operators, both prefix and postfix.
+
+ function parseMaybeUnary() {
+ if (tokType.prefix) {
+ var node = startNode(), update = tokType.isUpdate;
+ node.operator = tokVal;
+ node.prefix = true;
+ tokRegexpAllowed = true;
+ next();
+ node.argument = parseMaybeUnary();
+ if (update) checkLVal(node.argument);
+ else if (strict && node.operator === "delete" &&
+ node.argument.type === "Identifier")
+ raise(node.start, "Deleting local variable in strict mode");
+ return finishNode(node, update ? "UpdateExpression" : "UnaryExpression");
+ }
+ var expr = parseExprSubscripts();
+ while (tokType.postfix && !canInsertSemicolon()) {
+ var node = startNodeFrom(expr);
+ node.operator = tokVal;
+ node.prefix = false;
+ node.argument = expr;
+ checkLVal(expr);
+ next();
+ expr = finishNode(node, "UpdateExpression");
+ }
+ return expr;
+ }
+
+ // Parse call, dot, and `[]`-subscript expressions.
+
+ function parseExprSubscripts() {
+ return parseSubscripts(parseExprAtom());
+ }
+
+ function parseSubscripts(base, noCalls) {
+ if (eat(_dot)) {
+ var node = startNodeFrom(base);
+ node.object = base;
+ node.property = parseIdent(true);
+ node.computed = false;
+ return parseSubscripts(finishNode(node, "MemberExpression"), noCalls);
+ } else if (eat(_bracketL)) {
+ var node = startNodeFrom(base);
+ node.object = base;
+ node.property = parseExpression();
+ node.computed = true;
+ expect(_bracketR);
+ return parseSubscripts(finishNode(node, "MemberExpression"), noCalls);
+ } else if (!noCalls && eat(_parenL)) {
+ var node = startNodeFrom(base);
+ node.callee = base;
+ node.arguments = parseExprList(_parenR, false);
+ return parseSubscripts(finishNode(node, "CallExpression"), noCalls);
+ } else return base;
+ }
+
+ // Parse an atomic expression — either a single token that is an
+ // expression, an expression started by a keyword like `function` or
+ // `new`, or an expression wrapped in punctuation like `()`, `[]`,
+ // or `{}`.
+
+ function parseExprAtom() {
+ switch (tokType) {
+ case _this:
+ var node = startNode();
+ next();
+ return finishNode(node, "ThisExpression");
+ case _name:
+ return parseIdent();
+ case _num: case _string: case _regexp:
+ var node = startNode();
+ node.value = tokVal;
+ node.raw = input.slice(tokStart, tokEnd);
+ next();
+ return finishNode(node, "Literal");
+
+ case _null: case _true: case _false:
+ var node = startNode();
+ node.value = tokType.atomValue;
+ node.raw = tokType.keyword;
+ next();
+ return finishNode(node, "Literal");
+
+ case _parenL:
+ var tokStartLoc1 = tokStartLoc, tokStart1 = tokStart;
+ next();
+ var val = parseExpression();
+ val.start = tokStart1;
+ val.end = tokEnd;
+ if (options.locations) {
+ val.loc.start = tokStartLoc1;
+ val.loc.end = tokEndLoc;
+ }
+ if (options.ranges)
+ val.range = [tokStart1, tokEnd];
+ expect(_parenR);
+ return val;
+
+ case _bracketL:
+ var node = startNode();
+ next();
+ node.elements = parseExprList(_bracketR, true, true);
+ return finishNode(node, "ArrayExpression");
+
+ case _braceL:
+ return parseObj();
+
+ case _function:
+ var node = startNode();
+ next();
+ return parseFunction(node, false);
+
+ case _new:
+ return parseNew();
+
+ default:
+ unexpected();
+ }
+ }
+
+ // New's precedence is slightly tricky. It must allow its argument
+ // to be a `[]` or dot subscript expression, but not a call — at
+ // least, not without wrapping it in parentheses. Thus, it uses the
+
+ function parseNew() {
+ var node = startNode();
+ next();
+ node.callee = parseSubscripts(parseExprAtom(), true);
+ if (eat(_parenL)) node.arguments = parseExprList(_parenR, false);
+ else node.arguments = empty;
+ return finishNode(node, "NewExpression");
+ }
+
+ // Parse an object literal.
+
+ function parseObj() {
+ var node = startNode(), first = true, sawGetSet = false;
+ node.properties = [];
+ next();
+ while (!eat(_braceR)) {
+ if (!first) {
+ expect(_comma);
+ if (options.allowTrailingCommas && eat(_braceR)) break;
+ } else first = false;
+
+ var prop = {key: parsePropertyName()}, isGetSet = false, kind;
+ if (eat(_colon)) {
+ prop.value = parseExpression(true);
+ kind = prop.kind = "init";
+ } else if (options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
+ (prop.key.name === "get" || prop.key.name === "set")) {
+ isGetSet = sawGetSet = true;
+ kind = prop.kind = prop.key.name;
+ prop.key = parsePropertyName();
+ if (tokType !== _parenL) unexpected();
+ prop.value = parseFunction(startNode(), false);
+ } else unexpected();
+
+ // getters and setters are not allowed to clash — either with
+ // each other or with an init property — and in strict mode,
+ // init properties are also not allowed to be repeated.
+
+ if (prop.key.type === "Identifier" && (strict || sawGetSet)) {
+ for (var i = 0; i < node.properties.length; ++i) {
+ var other = node.properties[i];
+ if (other.key.name === prop.key.name) {
+ var conflict = kind == other.kind || isGetSet && other.kind === "init" ||
+ kind === "init" && (other.kind === "get" || other.kind === "set");
+ if (conflict && !strict && kind === "init" && other.kind === "init") conflict = false;
+ if (conflict) raise(prop.key.start, "Redefinition of property");
+ }
+ }
+ }
+ node.properties.push(prop);
+ }
+ return finishNode(node, "ObjectExpression");
+ }
+
+ function parsePropertyName() {
+ if (tokType === _num || tokType === _string) return parseExprAtom();
+ return parseIdent(true);
+ }
+
+ // Parse a function declaration or literal (depending on the
+ // `isStatement` parameter).
+
+ function parseFunction(node, isStatement) {
+ if (tokType === _name) node.id = parseIdent();
+ else if (isStatement) unexpected();
+ else node.id = null;
+ node.params = [];
+ var first = true;
+ expect(_parenL);
+ while (!eat(_parenR)) {
+ if (!first) expect(_comma); else first = false;
+ node.params.push(parseIdent());
+ }
+
+ // Start a new scope with regard to labels and the `inFunction`
+ // flag (restore them to their old value afterwards).
+ var oldInFunc = inFunction, oldLabels = labels;
+ inFunction = true; labels = [];
+ node.body = parseBlock(true);
+ inFunction = oldInFunc; labels = oldLabels;
+
+ // If this is a strict mode function, verify that argument names
+ // are not repeated, and it does not try to bind the words `eval`
+ // or `arguments`.
+ if (strict || node.body.body.length && isUseStrict(node.body.body[0])) {
+ for (var i = node.id ? -1 : 0; i < node.params.length; ++i) {
+ var id = i < 0 ? node.id : node.params[i];
+ if (isStrictReservedWord(id.name) || isStrictBadIdWord(id.name))
+ raise(id.start, "Defining '" + id.name + "' in strict mode");
+ if (i >= 0) for (var j = 0; j < i; ++j) if (id.name === node.params[j].name)
+ raise(id.start, "Argument name clash in strict mode");
+ }
+ }
+
+ return finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression");
+ }
+
+ // Parses a comma-separated list of expressions, and returns them as
+ // an array. `close` is the token type that ends the list, and
+ // `allowEmpty` can be turned on to allow subsequent commas with
+ // nothing in between them to be parsed as `null` (which is needed
+ // for array literals).
+
+ function parseExprList(close, allowTrailingComma, allowEmpty) {
+ var elts = [], first = true;
+ while (!eat(close)) {
+ if (!first) {
+ expect(_comma);
+ if (allowTrailingComma && options.allowTrailingCommas && eat(close)) break;
+ } else first = false;
+
+ if (allowEmpty && tokType === _comma) elts.push(null);
+ else elts.push(parseExpression(true));
+ }
+ return elts;
+ }
+
+ // Parse the next token as an identifier. If `liberal` is true (used
+ // when parsing properties), it will also convert keywords into
+ // identifiers.
+
+ function parseIdent(liberal) {
+ var node = startNode();
+ node.name = tokType === _name ? tokVal : (liberal && !options.forbidReserved && tokType.keyword) || unexpected();
+ tokRegexpAllowed = false;
+ next();
+ return finishNode(node, "Identifier");
+ }
+
+});
diff --git a/js/vendor/gif-encode.min.js b/js/vendor/gif-encode.min.js
new file mode 100644
index 0000000..be5e2cd
--- /dev/null
+++ b/js/vendor/gif-encode.min.js
@@ -0,0 +1,2 @@
+/* asdf.us/gif-recorder */
+function shuffle(a){var b=new Array(a.length);b[0]=a[0];for(var c=1;c<a.length;c++){var d=Math.floor(Math.random()*c);b[c]=b[d],b[d]=a[c]}return b}function sample(a,b){var c=shuffle(a);return c.slice(0,b)}function GifEncoder(){function a(){var a=this,b=0,c=[];a.init=function(){for(var b=0;WORKERS>b;b++){var d=new Worker(workerURL);d.onmessage=a.receiveWork,c.push(d)}};var d={};a.hire=function(a,b){d[a]=b},a.work=function(a){c[++b%c.length].postMessage(a)},a.receiveWork=function(a){a.data.task in d&&d[a.data.task](a)},a.fire=function(){for(var b in c)c[b].postMessage("close");c=[],a.init()},a.init()}function b(a){console.log("[WORKER]",a.data.message)}function c(a){console.log(Date.now()-q,"quantization done"),i=a.data.neuquant,j=a.data.colortab,f.quantized=!0,f.tube("quantized")}function d(a){var b=a.data.frame_index,c=a.data.frame_data;m[b]=c,f.tube("encoded-frame",m.length,k.length);for(var d=0;d<k.length;d++)if(null==m[d])return;console.log("FINISHED "+k.length);var e=m.join(""),g=window.btoa(e),h="data:image/gif;base64,"+g;f.working=!1,f.tube("rendered",e),f.tube("rendered-url",h),console.log(Date.now()-q,"processed frames"),console.log(Date.now()-p,"done"),r.fire()}function e(a){var b=Date.now();a=Math.min(l.length,a);var c=document.createElement("canvas"),d=c.getContext("2d");c.width=g,c.height=h*a;for(var e=d.getImageData(0,0,c.width,c.height),f=e.data,i=0,j=sample(l,4);a--;)for(var k=j[a],m=k.getImageData(0,0,g,h).data,n=0;n<m.length;i++,n++)f[i]=m[n];return console.log(Date.now()-b,"built spritesheet"),e}var f=this;this.working=!1;var g,h,i,j,k=[],l=[],m=[],n=[],g=0,h=0,o=0,p=Date.now(),q=Date.now(),r=(f.tube=new Tube,new a);r.hire("message",b),r.hire("quantize",c),r.hire("encode",d);var s=(this.reset=function(){s(),i=null,j=null,f.quantized=!1},this.resetFrames=function(){k=[],l=[],m=[],n=[],g=0,h=0,o=0});this.on=function(){f.tube.on.apply(f.tube,arguments)},this.off=function(){f.tube.off.apply(f.tube,arguments)};{var i,j;this.addFrame=function(a,b){var c=a.getContext("2d");k.push(a),l.push(c),n.push(b),1==k.length&&(g=a.width,h=a.height)},this.addFrames=function(a,b){for(var c=0;c<a.length;c++){var d=a[c],e=d.getContext("2d");k.push(d),l.push(e),n.push(b)}k.length==a.length&&(g=a[0].width,h=a[0].height)},this.copyFrame=function(a,b){var c=document.createElement("canvas"),d=c.getContext("2d");d.drawImage(a,0,0,a.width,a.height),k.push(c),l.push(d),n.push(b),1==k.length&&(g=a.width,h=a.height)},this.quantize=function(){p=Date.now(),q=Date.now();var a=e(FRAMES_TO_QUANTIZE);r.work({task:"quantize",imageData:a})},this.encode=function(a,b){function c(){if(e==k.length)return d();var a=l[e],b=a.getImageData(0,0,g,h).data,f=n[e];r.work({task:"encode",frame_index:e,frame_length:l.length-1,height:h,width:g,delay:f,imageData:b,neuquant:i,colortab:j}),e++,setTimeout(c,16)}function d(){f.tube("done_sending")}if(!k.length)throw Error("No frames to encode");a=a||i,b=b||j,q=Date.now(),o=0,console.log("working .... ");var e=0;c()}}}var nextTick=function(){if(window.ActiveXObject||!window.postMessage)var a=function(a){setTimeout(a,0)};else{var b=[],c="next-tick-zero-timeout";window.addEventListener("message",function(a){a.source==window&&a.data==c&&(a.stopPropagation&&a.stopPropagation(),b.length&&b.shift()())},!0);var a=function(a){b.push(a),window.postMessage(c,"*")}}return a}(),Uid=function(){var a=0;return function(){return a++ +""}}(),tokenize=function(){var a=function(b,c){return b.trim().split(c||a.default)};return a.default=/\s+/g,a}(),globber=function(a,b){var c,d=a[0],e=a.slice(1),f=b.length;if("*"===d){for(var g=0;f>=g;++g)if(globber(e,b.slice(g)))return!0;return!1}return c=d===b[0],c&&(!e.length&&!f||globber(e,b.slice(1)))},setproto=function(a,b){if(a.__proto__)a.__proto__=b;else for(var c in b)a[c]=b[c]},Tube=function(){var a={},b=function(a){if(a=a||{},a.queue)var c=function(){var a=arguments;return nextTick(function(){c.send.apply(c,a)}),c};else var c=function(){return c.send.apply(c,arguments),c};return setproto(c,b.proto),c.listeners={},c.globListeners={},c};return b.total={},b.proto={},b.proto.on=function(){var a=this;if("string"==typeof arguments[0]){var b={};b[arguments[0]]=arguments[1];{arguments[2]||{}}}else{var b=arguments[0];arguments[1]||{}}for(var c in b){var d=c.split(" "),e=b[c];Array.isArray(e)||(e=[e]);for(var f,g=0;f=e[g];g++)f.uid||(f.uid=Uid());for(var h,g=0;h=d[g];g++){var i=-1===h.indexOf("*")?a.listeners:a.globListeners;i[h]=h in i?i[h].concat(e):e.concat()}}return a},b.proto.off=function(){var a,b,c,d,e=this;if(0===arguments.length)return e.listeners={},e.globListeners={},e;if(1===arguments.length&&"string"==typeof arguments[0]){for(c=arguments[0].split(" "),b=0;d=c[b];b++)delete e.listeners[d],delete e.globListeners[d];return e}if("function"==typeof arguments[0]||Array.isArray(arguments[0])){var f="function"==typeof arguments[0]?[arguments[0]]:arguments[0];return e}if(arguments.length>1){var g={};g[arguments[0]]=arguments[1]}else var g=arguments[0];for(var h in g){c=h.split(" ");var f=g[h];"function"==typeof f&&(f=[f]);for(var b=0;d=c[b];b++){if(d in e.listeners)a=e.listeners;else{if(!(d in e.globListeners))continue;a=e.globListeners}a[d]=a[d].filter(function(a){return-1===f.indexOf(a)})}}return e},b.proto.send=function(c){b.total[c]||(b.total[c]=0),b.total[c]+=1;var d,e,f,g=this.listeners,h=this.globListeners,i=tokenize(c);if(arguments.length){var j=Array.prototype.splice.call(arguments,1);j.push(c)}else var j=[];for(var k=0;e=i[k];k++){var l={},m={};if(d=g[e])for(var n=0;f=d[n];n++)l[f.uid]=f,m[f.uid]=e;var o=e.split(":");for(var p in h){if("*"!==p){var q=a[p]||(a[p]=p.split(":"));if(!globber(q,o))continue}d=h[p];for(var n=0;f=d[n];n++)l[f.uid]=f,m[f.uid]=e}var r=[];for(var f in l)r.push(l[f]);for(var f,n=0;f=r[n];n++)f.apply(f,j)}return this},b}(),FRAMES_PER_GIF=36,FPS=12,DELAY=Math.floor(1e3/FPS),WORKERS=6,FRAMES_TO_QUANTIZE=4,DO_UPLOAD=!0,workerURL=URL.createObjectURL(new Blob(["(",function(){function a(a){var c=a.imageData,d=b(c.data),e=new NeuQuant(d,d.length,1),f=e.process();self.postMessage({task:"quantize",neuquant:e.save(),colortab:f})}function b(a){for(var b=[],c=0,d=0,e=a.length;e>c;d+=4)b[c++]=a[d],b[c++]=a[d+1],b[c++]=a[d+2];return b}function c(a){var b=a.frame_index,c=a.frame_length,d=a.height,e=a.width,f=a.imageData,g=a.delay,h=a.neuquant,i=a.colortab,j=new GIFEncoder;j.setRepeat(0),j.setQuality(1),j.setSize(e,d),j.setDelay(g),0==b?j.start():(j.cont(),j.setProperties(!0,!1)),j.setNeuquant(h,i),j.addFrame(f,!0),c==b&&j.finish(),self.postMessage({task:"encode",frame_index:b,frame_data:j.stream().getData()}),delete j,delete a}GIFEncoder=function(){function a(){this.bin=[]}for(var b=0,c={};256>b;b++)c[b]=String.fromCharCode(b);a.prototype.getData=function(){for(var a="",b=this.bin.length,d=0;b>d;d++)a+=c[this.bin[d]];return a},a.prototype.writeByte=function(a){this.bin.push(a)},a.prototype.writeUTFBytes=function(a){for(var b=a.length,c=0;b>c;c++)this.writeByte(a.charCodeAt(c))},a.prototype.writeBytes=function(a,b,c){for(var d=c||a.length,e=b||0;d>e;e++)this.writeByte(a[e])};var d,e,f,g,h,i,j,k,l,m={},n=null,o=-1,p=0,q=!1,r=new Array,s=7,t=-1,u=!1,v=!0,w=!1,x=1,y=null,z=(m.setDelay=function(a){p=Math.round(a/10)},m.setDispose=function(a){a>=0&&(t=a)},m.setRepeat=function(a){a>=0&&(o=a)},m.setTransparent=function(a){n=a},m.addFrame=function(a,b){if(null==a||!q||null==g)throw new Error("Please call start method before calling addFrame");var c=!0;try{b?h=a:(h=a.getImageData(0,0,a.canvas.width,a.canvas.height).data,w||A(a.canvas.width,a.canvas.height)),D(),B(),v&&(G(),I(),o>=0&&H()),E(),F(),v||I(),K(),v=!1}catch(d){c=!1}return c},m.finish=function(){if(!q)return!1;var a=!0;q=!1;try{g.writeByte(59)}catch(b){a=!1}return a},function(){f=0,h=null,i=null,j=null,l=null,u=!1,v=!0}),A=(m.setFrameRate=function(a){15!=a&&(p=Math.round(100/a))},m.setQuality=function(a){x=Math.max(1,a)},m.setSize=function(a,b){(!q||v)&&(d=a,e=b,1>d&&(d=320),1>e&&(e=240),w=!0)}),B=(m.setNeuquant=function(a,b){y=a,l=b},m.start=function(){z();var b=!0;u=!1,g=new a;try{g.writeUTFBytes("GIF89a")}catch(c){b=!1}return q=b},m.cont=function(){z();var b=!0;return u=!1,g=new a,q=b},function(){var a=i.length,b=a/3;j=[];var c;y&&l?(c=new NeuQuant,c.load(y)):(c=new NeuQuant(i,a,x),l=c.process());for(var d=0,e=0;b>e;e++){var g=c.map(255&i[d++],255&i[d++],255&i[d++]);r[g]=!0,j[e]=g}i=null,k=8,s=7,null!=n&&(f=C(n))}),C=function(a){if(null==l)return-1;for(var b=(16711680&a)>>16,c=(65280&a)>>8,d=255&a,e=0,f=16777216,g=l.length,h=0;g>h;){var i=b-(255&l[h++]),j=c-(255&l[h++]),k=d-(255&l[h]),m=i*i+j*j+k*k,n=h/3;r[n]&&f>m&&(f=m,e=n),h++}return e},D=function(){var a=d,b=e;i=[];for(var c=h,f=0,g=0;b>g;g++)for(var j=0;a>j;j++){var k=g*a*4+4*j;i[f++]=c[k],i[f++]=c[k+1],i[f++]=c[k+2]}},E=function(){g.writeByte(33),g.writeByte(249),g.writeByte(4);var a,b;null==n?(a=0,b=0):(a=1,b=2),t>=0&&(b=7&t),b<<=2,g.writeByte(0|b|0|a),J(p),g.writeByte(f),g.writeByte(0)},F=function(){g.writeByte(44),J(0),J(0),J(d),J(e),g.writeByte(v?0:128|s)},G=function(){J(d),J(e),g.writeByte(240|s),g.writeByte(0),g.writeByte(0)},H=function(){g.writeByte(33),g.writeByte(255),g.writeByte(11),g.writeUTFBytes("NETSCAPE2.0"),g.writeByte(3),g.writeByte(1),J(o),g.writeByte(0)},I=function(){g.writeBytes(l);for(var a=768-l.length,b=0;a>b;b++)g.writeByte(0)},J=function(a){g.writeByte(255&a),g.writeByte(a>>8&255)},K=function(){var a=new LZWEncoder(d,e,j,k);a.encode(g)};return m.stream=function(){return g},m.setProperties=function(a,b){q=a,v=b},m},LZWEncoder=function(){var a,b,c,d,e,f,g,h,i,j,k,l,m={},n=-1,o=12,p=5003,q=o,r=1<<o,s=new Array,t=new Array,u=p,v=0,w=!1,x=0,y=0,z=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],A=[],B=m.LZWEncoder=function(e,f,g,h){a=e,b=f,c=g,d=Math.max(2,h)},C=function(a,b){A[l++]=a,l>=254&&G(b)},D=function(a){E(u),v=j+2,w=!0,J(j,a)},E=function(a){for(var b=0;a>b;++b)s[b]=-1},F=m.compress=function(a,b){var c,d,e,f,m,o,p;for(i=a,w=!1,g=i,h=H(g),j=1<<a-1,k=j+1,v=j+2,l=0,f=I(),p=0,c=u;65536>c;c*=2)++p;p=8-p,o=u,E(o),J(j,b);a:for(;(e=I())!=n;)if(c=(e<<q)+f,d=e<<p^f,s[d]!=c){if(s[d]>=0){m=o-d,0==d&&(m=1);do if((d-=m)<0&&(d+=o),s[d]==c){f=t[d];continue a}while(s[d]>=0)}J(f,b),f=e,r>v?(t[d]=v++,s[d]=c):D(b)}else f=t[d];J(f,b),J(k,b)},G=(m.encode=function(c){c.writeByte(d),e=a*b,f=0,F(d+1,c),c.writeByte(0)},function(a){l>0&&(a.writeByte(l),a.writeBytes(A,0,l),l=0)}),H=function(a){return(1<<a)-1},I=function(){if(0==e)return n;--e;var a=c[f++];return 255&a},J=function(a,b){for(x&=z[y],y>0?x|=a<<y:x=a,y+=g;y>=8;)C(255&x,b),x>>=8,y-=8;if((v>h||w)&&(w?(h=H(g=i),w=!1):(++g,h=g==q?r:H(g))),a==k){for(;y>0;)C(255&x,b),x>>=8,y-=8;G(b)}};return B.apply(this,arguments),m},NeuQuant=function(){var a,b,c,d,e,f={},g=128,h=499,i=491,j=487,k=503,l=3*k,m=g-1,n=4,o=100,p=16,q=1<<p,r=10,s=10,t=q>>s,u=q<<r-s,v=g>>3,w=6,x=1<<w,y=v*x,z=30,A=10,B=1<<A,C=8,D=1<<C,E=A+C,F=1<<E,G=new Array,H=new Array,I=new Array,J=new Array,K=f.NeuQuant=function(a,f,h){if(a&&f&&h){var i,j;for(b=a,c=f,d=h,e=new Array(g),i=0;g>i;i++)e[i]=new Array(4),j=e[i],j[0]=j[1]=j[2]=(i<<n+8)/g,I[i]=q/g,H[i]=0}},L=function(){for(var a=[],b=new Array(g),c=0;g>c;c++)b[e[c][3]]=c;for(var d=0,f=0;g>f;f++){var h=b[f];a[d++]=e[h][0],a[d++]=e[h][1],a[d++]=e[h][2]}return a},M=function(){var a,b,c,d,f,h,i,j;for(i=0,j=0,a=0;g>a;a++){for(f=e[a],c=a,d=f[1],b=a+1;g>b;b++)h=e[b],h[1]<d&&(c=b,d=h[1]);if(h=e[c],a!=c&&(b=h[0],h[0]=f[0],f[0]=b,b=h[1],h[1]=f[1],f[1]=b,b=h[2],h[2]=f[2],f[2]=b,b=h[3],h[3]=f[3],f[3]=b),d!=i){for(G[i]=j+a>>1,b=i+1;d>b;b++)G[b]=a;i=d,j=a}}for(G[i]=j+m>>1,b=i+1;256>b;b++)G[b]=m},N=function(){var e,f,g,m,p,q,r,s,t,u,v,x,A,C;for(l>c&&(d=1),a=30+(d-1)/3,x=b,A=0,C=c,v=c/(3*d),u=v/o,s=B,q=y,r=q>>w,1>=r&&(r=0),e=0;r>e;e++)J[e]=s*((r*r-e*e)*D/(r*r));for(t=l>c?3:c%h!=0?3*h:c%i!=0?3*i:c%j!=0?3*j:3*k,e=0;v>e;)if(g=(255&x[A+0])<<n,m=(255&x[A+1])<<n,p=(255&x[A+2])<<n,f=R(g,m,p),Q(s,f,g,m,p),0!=r&&P(r,f,g,m,p),A+=t,A>=C&&(A-=c),e++,0==u&&(u=1),e%u==0)for(s-=s/a,q-=q/z,r=q>>w,1>=r&&(r=0),f=0;r>f;f++)J[f]=s*((r*r-f*f)*D/(r*r))},O=(f.save=function(){var a={netindex:G,netsize:g,network:e};return a},f.load=function(a){G=a.netindex,g=a.netsize,e=a.network},f.map=function(a,b,c){var d,f,h,i,j,k,l;for(j=1e3,l=-1,d=G[b],f=d-1;g>d||f>=0;)g>d&&(k=e[d],h=k[1]-b,h>=j?d=g:(d++,0>h&&(h=-h),i=k[0]-a,0>i&&(i=-i),h+=i,j>h&&(i=k[2]-c,0>i&&(i=-i),h+=i,j>h&&(j=h,l=k[3])))),f>=0&&(k=e[f],h=b-k[1],h>=j?f=-1:(f--,0>h&&(h=-h),i=k[0]-a,0>i&&(i=-i),h+=i,j>h&&(i=k[2]-c,0>i&&(i=-i),h+=i,j>h&&(j=h,l=k[3]))));return l},f.process=function(){return N(),O(),M(),L()},function(){var a;for(a=0;g>a;a++)e[a][0]>>=n,e[a][1]>>=n,e[a][2]>>=n,e[a][3]=a}),P=function(a,b,c,d,f){var h,i,j,k,l,m,n;for(j=b-a,-1>j&&(j=-1),k=b+a,k>g&&(k=g),h=b+1,i=b-1,m=1;k>h||i>j;){if(l=J[m++],k>h){n=e[h++];try{n[0]-=l*(n[0]-c)/F,n[1]-=l*(n[1]-d)/F,n[2]-=l*(n[2]-f)/F}catch(o){}}if(i>j){n=e[i--];try{n[0]-=l*(n[0]-c)/F,n[1]-=l*(n[1]-d)/F,n[2]-=l*(n[2]-f)/F}catch(o){}}}},Q=function(a,b,c,d,f){var g=e[b];g[0]-=a*(g[0]-c)/B,g[1]-=a*(g[1]-d)/B,g[2]-=a*(g[2]-f)/B},R=function(a,b,c){var d,f,h,i,j,k,l,m,o,q;for(m=~(1<<31),o=m,k=-1,l=k,d=0;g>d;d++)q=e[d],f=q[0]-a,0>f&&(f=-f),h=q[1]-b,0>h&&(h=-h),f+=h,h=q[2]-c,0>h&&(h=-h),f+=h,m>f&&(m=f,k=d),i=f-(H[d]>>p-n),o>i&&(o=i,l=d),j=I[d]>>s,I[d]-=j,H[d]+=j<<r;return I[k]+=t,H[k]-=u,l};return K.apply(this,arguments),f},self.onmessage=function(b){var d=b.data,e=d.task;switch(e){case"encode":c(d);break;case"quantize":a(d);break;case"close":self.close()}}}.toString(),")()"],{type:"application/javascript"})); \ No newline at end of file
diff --git a/package.json b/package.json
index 8aa641a..b187cc0 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,17 @@
{
- "name": "dither",
- "version": "0.0.4",
- "devDependencies": {
- "grunt": "~0.4.1",
- "grunt-contrib-concat": "~0.3.0",
- "grunt-contrib-uglify": "~0.2.5",
- "grunt-contrib-watch": "~0.5.3"
- }
+ "name": "dither",
+ "version": "0.9.9",
+ "repository": {
+ "type": "git",
+ "url": "git://ghghgh.us/dither.git"
+ },
+ "devDependencies": {
+ "grunt": "~0.4.1",
+ "grunt-contrib-concat": "~0.3.0",
+ "grunt-contrib-uglify": "~0.2.5",
+ "grunt-contrib-watch": "~0.5.3",
+ "grunt-contrib-clean": "~0.5.0",
+ "grunt-contrib-copy": "~0.5.0",
+ "grunt-dentist": "~0.3.3"
+ }
}
diff --git a/shader-api.html b/shader-api.html
index 9020136..dc96762 100644
--- a/shader-api.html
+++ b/shader-api.html
@@ -2,39 +2,48 @@
<html>
<head>
<style type="text/css">
-#url { width: 300px; }
+#url { width: 250px; }
#width,#height,#frames,#delay {width: 30px; }
#shader { width: 400px; height: 247px; font-family: fixed; }
div { float: left; padding: 10px;}
form { display: inline-block; }
-#shader-api,#gallery { clear: right; width:100%; padding: 0; }
-#shader-gallery,#gallery-images { display: block; max-height: 210px; overflow-y: auto; width: 100%; }
-#shader-gallery img,#shader-gallery canvas,#gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; }
-.shader {
- width: 100px;
-}
-#username { width: 40px; }
-a { color: #00f; }
+#shader-api,#gallery { clear: right; width:100%; padding: 0; font-size: 12px; }
+#shader-gallery,#gallery-images { display: block; min-height: 152px; max-height: 210px; overflow-y: auto; width: 100%; padding: 0; }
+#shader-gallery img,#shader-gallery canvas,#gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; clear: right; }
+.shader { width: 100px; }
+.shader span { display: block }
+#username { width: 55px; }
+#shader-name { width: 75px; }
#shader-id { width: 40px; }
+a { color: #00f; }
+#help { float: right; }
+.dragging { cursor: -webkit-grabbing !important; }
+#instructions { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; }
+#instructions iframe {width: 100%;height:100%;margin:0;padding:0;border:0;}
+#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; }
+
</style>
</head>
<body>
<!--
<div id="gallery">
- <div id="gallery-form">
- <form id="gallery-search">
- <input type="text" id="dumpfm-search-query" value="duck bill">
- <button id="gallery-search">DUMP SEARCH</button>
- </form>
- <button id="gallery-random">IM RANDOM</button>
- <span class="status"></span>
- </div>
- <div id="gallery-images"></div>
+ <div id="gallery-form">
+ <form id="gallery-search">
+ <input type="text" id="dumpfm-search-query" value="duck bill">
+ <button id="gallery-search">DUMP SEARCH</button>
+ </form>
+ <button id="gallery-random">IM RANDOM</button>
+ <span class="status"></span>
+ </div>
+ <div id="gallery-images"></div>
</div>
-->
<div id="shader-api">
+ <button id="help">help</button>
+ <button id="new-shader"><b>new shader</b></button>
<input type="text" id="shader-id" disabled><button id="fetch-info" disabled>info</button>
<button id="fetch-history" disabled>history</button>
|
@@ -45,6 +54,8 @@ a { color: #00f; }
<select id="pick-user">
<option>fetching users..</option>
</select>
+ <input type="checkbox" id="persist-image" checked>
+ <label for="persist-image">load image</label>
<div id="shader-gallery">
</div>
@@ -52,105 +63,72 @@ a { color: #00f; }
<div id="controls">
<input type="text" id="url" value="img/1376516658960-dumpfm-DoritoWitch-TimeFLyTrans0001.png">
- <br>
- <br>
+ <input type="text" id="username" placeholder="username">
+ <input type="text" id="shader-name" placeholder="shader name">
+ <br>
+ <br>
- <textarea id="shader"></textarea>
- <br>
- <br>
+ <textarea id="shader"></textarea>
+ <br>
+ <button id="save-shader"><b>save shader</b></button>
+ <button id="pause">pause</button>
+ <button id="reset">reset</button>
+ <br>
</div>
<div id="workspace"></div>
+<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">&times;</button></div>
</body>
+<script type="text/javascript" src="js/vendor/acorn.js"></script>
<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="js/vendor/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
+<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
+<script type="text/javascript" src="js/vendor/dataUriToBlob.js"></script>
<script type="text/javascript" src="js/vendor/gif.js"></script>
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/color.js"></script>
<script type="text/javascript" src="js/image.js"></script>
+<script type="text/javascript" src="js/user.js"></script>
<script type="text/javascript" src="js/gallery.js"></script>
<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>
<script type="text/html" id="shader-gallery-template">
-<img src="{thumbnail_url}">
-{username}
+<span><img src="{thumbnail_url}"></span>
+{name} - {username}
</script>
<script type="text/javascript">
var cc = cq(0,0).appendTo("#workspace")
var w, h
+var firsttime = true
+var shader_gallery_template = $("#shader-gallery-template").html()
+
$(init)
function init(){
- $("#url").change(load)
-// run('#first')
-
-// $("#shader-id")
-// $("#fetch-info")
- $("#fetch-all").click(function(){
- ShaderAPI.all(load_shaders)
- })
- $("#fetch-latest").click(function(){
- ShaderAPI.latest(load_shaders)
- }).trigger("click")
-// $("#fetch-next-page")
-// $("#fetch-history")
+ $("#url").change(load)
+ $("#reset").click(reset)
+ $("#pause").click(pause)
- function load_shaders(err, shaders){
- var $el = $("#shader-gallery").empty()
- var template = $("#shader-gallery-template").html()
-
- for (var i in shaders) {
- var $shader = $("<div>").addClass("shader")
- $shader.data("shader", shaders[i])
- var html = template
- for (var field in shaders[i]) {
- html = html.replace("{" + field + "}", shaders[i][field])
- }
- $shader.html(html)
-
- $el.append( $shader )
- }
- }
-
- ShaderAPI.list_users(function(err, users){
- var $el = $("#pick-user").empty()
- for (var i in users) {
- var $option = $("<option>")
- var username = users[i].username
- $option.val(username).html(username)
- $el.append( $option )
- }
- })
+ user.init()
+ help.init()
+ shader_gallery.init()
- $(document).on("change", "#pick-user", function(){
- var name = $(this).val()
- ShaderAPI.username(name, load_shaders)
- })
- $(document).on("click", ".shader", function(){
- run( $(this).data("shader") )
- })
+ document.getElementById('shader').addEventListener('input', shader_build);
- load()
+ requestAnimationFrame(animate)
+}
- document.getElementById('shader').addEventListener('input', shader_build);
- shader_build()
- requestAnimationFrame(animate)
-}
-function run(shader_object){
- console.log(shader_object)
- $("#url").val( shader_object.image_url )
- $("#shader").html(shader_object.script)
- $("#shader-id").val(shader_object.id)
- load()
- shader_build()
-}
</script>
</html>
diff --git a/shader-combo.html b/shader-combo.html
new file mode 100644
index 0000000..60dc72a
--- /dev/null
+++ b/shader-combo.html
@@ -0,0 +1,288 @@
+<!doctype html>
+<html>
+<head>
+<title>Shaderblaster</title>
+<style type="text/css">
+body { background: #fbfbfb; 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; }
+#username { width: 55px; }
+#shader-name { width: 75px; }
+#shader-id { width: 40px; }
+#shader { width: 400px; height: 247px; font-family: fixed; }
+#uploaded-url { display: none; width: 400px; }
+#uploaded-url + br { display: none; }
+
+#header { width:calc(100% - 10px); padding: 0; font-size: 12px; position: fixed; bottom:0; left: 0; padding: 5px; background: rgba(255,255,255,0.9); box-shadow: 0 0 10px #888; z-index: 2;}
+.gallery { display: block; height: 152px; overflow-y: auto; width: 100%; padding: 0; border-bottom: 1px solid #ccc; }
+.gallery::-webkit-scrollbar { -webkit-appearance: none; width: 7px; }
+.gallery::-webkit-scrollbar-thumb { border-radius: 4px; background-color: rgba(0,0,0,.5); box-shadow: 0 0 1px rgba(255,255,255,.5); }
+#shader-gallery img,#shader-gallery canvas,#gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; clear: right; }
+.shader { width: 100px; }
+.shader span { display: block }
+
+.dragging { cursor: -webkit-grabbing !important; }
+.ui-sortable-helper { cursor: -webkit-grabbing !important; }
+
+#commands { top:40px;right:20px; width:190px;height:calc(95% - 230px); }
+#tutorial { top:40px;right:30px; width:290px;height:325px; display: block;}
+.iframe { position: absolute; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; }
+.iframe iframe {width: 100%;height:100%;margin:0;padding:0;border:0;}
+.iframe.dragging iframe { pointer-events: none; }
+.iframe .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; }
+
+#frame-controls { display: none; }
+#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; }
+
+.paused { background: black; color: white; border-width: 1px; padding: 1px 3px 2px 4px; outline: 0 !important; }
+.active { background: black; color: white; border-width: 1px; padding: 1px 4px 2px 4px; outline: 0 !important; }
+
+.hidden { display: none; }
+.form { display: none; border-left: 1px solid #ddd; padding-left: 5px; margin-left: 2px; }
+.bold { font-weight: bold; }
+.close,.remove { cursor: pointer; }
+
+.status { font-size: 12px; }
+
+#render,#save,#upload,#save-shader { font-weight: bold; }
+#save[disabled],#upload[disabled] { font-weight: normal; }
+
+#logo { display: inline; position: relative; top: 2px; font-size: 18px; font-family: georgia; font-weight: bold; font-style: italic; margin: 0px; color: #243; }
+#corner { position: fixed; top: -5px; right: 0px; }
+.right { position: absolute; right: 0; }
+
+</style>
+</head>
+<body>
+
+<div id="corner">
+ <button id="show-tutorial">help</button>
+ <button id="show-commands">commands</button>
+ <select id="examples">
+ <option>examples</option>
+ </select>
+</div>
+
+<div id="header">
+ <span class="right">
+ <a href="http://asdf.us/im/">Photoblaster</a>
+ &middot;
+ <a href="http://asdf.us/im/gallery/">Gallery</a>
+ &middot;
+ <a href="http://asdf.us/im/gallery/?tag=shader">Shaders</a>
+ <h1 id="logo">&nbsp;shaderblaster&nbsp;&nbsp;</h1>
+ </span>
+ <button class="toggle-off">x</button>
+<!--
+ <button id="new-shader"><b>new shader</b></button>
+-->
+<!--
+ <input type="text" id="shader-id" disabled><button id="fetch-info" disabled>info</button>
+ <button id="fetch-history" disabled>history</button>
+ |
+ <button id="fetch-originals" disabled>originals</button>
+ <button id="fetch-all">all</button>
+-->
+ <button id="toggle-shaders">browse shaders</button>
+ <button id="toggle-images">browse images</button>
+ <span class="status"></span>
+
+ <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">&rarr;</button>
+ <select id="pick-user">
+ <option>fetching users..</option>
+ </select>
+ <div id="shader-gallery" class="gallery"></div>
+ </span>
+ <span id="gallery-form" class="form">
+ <button id="gallery-random">asdf random</button>
+ <form id="gallery-search">
+ <input type="text" id="dumpfm-search-query" value="webcam">
+ <button id="gallery-search">search dump</button>
+ </form>
+ <div id="gallery-images" class="gallery"></div>
+ </span>
+</div>
+
+<div id="controls">
+ <input type="text" id="url">
+ <input type="text" id="username" placeholder="username">
+ <input type="text" id="shader-name" placeholder="shader name">
+ <br>
+ <br>
+
+ <textarea id="shader"></textarea>
+ <br>
+ <input type="text" id="uploaded-url">
+ <br>
+ <button id="render">render gif</button>
+ <button id="save" disabled>save gif</button>
+ <button id="upload" disabled>upload gif</button>
+ <button id="reset">reset</button>
+ <button id="pause">pause</button>
+ <br>
+ <button id="save-shader">save shader</button>
+ <input type="text" id="width" placeholder="width" value="0">
+ <input type="text" id="height" placeholder="height" value="0">
+ <span class="status"></span>
+ <!--<button id="step-forward">&gt;&gt;</button>-->
+ <br>
+ <br>
+ <span id="frame-hidden-controls">
+ <button id="show-frame-controls">show frame editor</button>
+ </span>
+ <span id="frame-controls">
+ <button id="hide-frame-controls">x</button>
+ frames <input type="text" id="framecount" value="10">
+ rate <input type="text" id="framedelay" value="0.06s">
+ bg <input type="text" id="background" value="#fff">
+ <button id="add-frame">+add</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>-->
+ <br>
+ <span id="frames"></span>
+ </span>
+</div>
+
+<div id="workspace"></div>
+
+<div class="iframe" id="tutorial"><iframe src="tutorial.html"></iframe><button class="close">&times;</button></div>
+<div class="iframe" id="commands"><iframe src="commands.html"></iframe><button class="close">&times;</button></div>
+<script type="text/javascript" src="js/vendor/acorn.js"></script>
+<script type="text/javascript" src="js/vendor/gif.js"></script>
+<script type="text/javascript" src="js/vendor/gif-encode.min.js"></script>
+<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="js/vendor/jquery-ui-1.10.3.custom.min.js"></script>
+<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
+<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
+<script type="text/javascript" src="js/vendor/dataUriToBlob.js"></script>
+<script type="text/javascript" src="js/util.js"></script>
+<script type="text/javascript" src="js/color.js"></script>
+<script type="text/javascript" src="js/asdf.js"></script>
+<script type="text/javascript" src="js/image.js"></script>
+<script type="text/javascript" src="js/user.js"></script>
+<script type="text/javascript" src="js/gallery.js"></script>
+<script type="text/javascript" src="js/frames.js"></script>
+<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>
+<script type="text/javascript" src="shaders.json"></script>
+
+<script type="text/html" id="shader-gallery-template">
+<span><img src="{thumbnail_url}"></span>
+{name} - {username}
+</script>
+
+<script type="text/html" id="frame-template">
+<button class="remove">x</button>
+<span class="frame"></span>
+</script>
+
+<script type="text/javascript">
+
+var cc = cq(0,0).appendTo("#workspace")
+var w = 400, h = 400
+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()
+ $("#shader-api-form").show()
+ $(".bold").removeClass("bold")
+ $(this).addClass("bold")
+ }).trigger("click")
+ $("#toggle-images").click(function(){
+ $("#header .form").hide()
+ $("#gallery-form").show()
+ $(".bold").removeClass("bold")
+ $(this).addClass("bold")
+ if (! asdf.fetched) {
+ $("#gallery-random").trigger("click")
+ }
+ })
+ $(".toggle-off").click(function(){
+ $("#header .form").hide()
+ $(".bold").removeClass("bold")
+ })
+ $("#width").change(function(){
+ w = abs(parseInt(this.value,10)) || 1
+ cc.canvas.width = w
+ cc.canvas.height = h
+ })
+ $("#height").change(function(){
+ h = abs(parseInt(this.value,10)) || 1
+ cc.canvas.width = w
+ cc.canvas.height = h
+ })
+ $("#show-frame-controls").click(function(){
+ $("#frame-controls").show()
+ $("#frame-hidden-controls").hide()
+ })
+ $("#hide-frame-controls").click(function(){
+ $("#frame-controls").hide()
+ $("#frame-hidden-controls").show()
+ })
+ $("#reorder-frames").change(function(){
+ var order = $(this).val()
+ console.log(order)
+ switch (order) {
+ case "weave-frames": weave_frames(); break;
+ case "shuffle-frames": shuffle_frames(); break;
+ case "reverse-frames": reverse_frames(); break;
+ case "sort-frames": sort_frames(); break;
+ default: return;
+ }
+ render()
+ })
+
+ load()
+ help.init()
+ user.init()
+ frame_editor.init()
+ shader_gallery.init()
+ gallery.init(choose)
+
+ document.getElementById('shader').addEventListener('input', shader_build);
+
+ requestAnimationFrame(animate)
+}
+</script>
+</body>
+</html>
diff --git a/shader-gif.html b/shader-gif.html
index 1369225..1f944c9 100644
--- a/shader-gif.html
+++ b/shader-gif.html
@@ -67,7 +67,7 @@ div { display: inline-block; padding: 10px;}
<button id="reset">reset</button>
<button id="pause">pause</button>
<button id="step-forward">&gt;&gt;</button>
- <span id="status"></span>
+ <span class="status"></span>
<button id="save" disabled>save</button>
<button id="upload" disabled>upload</button>
<br>
@@ -337,7 +337,7 @@ function render (){
}
function status(s){
- $("#status").html(s)
+ $(".status").html(s)
}
var encoder = new GifEncoder()
diff --git a/shader-localstorage.html b/shader-localstorage.html
new file mode 100644
index 0000000..923f1b6
--- /dev/null
+++ b/shader-localstorage.html
@@ -0,0 +1,211 @@
+<!doctype html>
+<html>
+<head>
+<title>Shader</title>
+<style type="text/css">
+html,body { margin: 0; padding: 0; }
+#url { width: 450px; }
+#width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; }
+#shader { width: 100%; height: 247px; font-family: fixed; }
+#controls { width: 450px; }
+#frames { width: 435px; 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; }
+.dragging { cursor: -webkit-grabbing !important; }
+.ui-sortable-helper { cursor: -webkit-grabbing !important; }
+#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; }
+.paused { background: black; color: white; border-width: 1px; padding: 1px 3px 2px 4px; outline: 0 !important; }
+.active { background: black; color: white; border-width: 1px; padding: 1px 4px 2px 4px; outline: 0 !important; }
+div { display: inline-block; padding: 10px;}
+#gallery,#controls,#workspace,#rendered{ float: left; }
+#rendered img { display: block; }
+#render,#save { font-weight: bold; }
+#render { float: right; }
+#instructions { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; }
+#instructions iframe {width: 100%;height:100%;margin:0;padding:0;border:0;}
+#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; }
+.close,.remove { cursor: pointer; }
+#uploaded-url { display: none; width: 300px; }
+form { display: inline-block; }
+#gallery { clear: right; width:100%; padding: 0; }
+#gallery-images { display: block; max-height: 210px; overflow-y: auto; }
+#gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; }
+#username { width: 40px; }
+a { color: #00f; }
+</style>
+</head>
+<body>
+<div id="gallery">
+ <div id="gallery-form">
+ <form id="gallery-search">
+ <input type="text" id="dumpfm-search-query" value="duck bill">
+ <button id="gallery-search">DUMP SEARCH</button>
+ </form>
+ <button id="gallery-random">IM RANDOM</button>
+ <span class="status"></span>
+ </div>
+ <div id="gallery-images"></div>
+</div>
+
+<div id="controls">
+
+ <input type="text" id="url" value="img/1376516658960-dumpfm-DoritoWitch-TimeFLyTrans0001.png">
+ <br>
+ <br>
+
+ <textarea id="shader"></textarea>
+ <br>
+ <br>
+
+ frames <input type="text" id="framecount" value="1">
+ interval <input type="text" id="frameinterval" value="0.1s">
+ <button id="add-frame">+add frame</button>
+ <button id="remove-all-frames">clear</button>
+ <button id="render" disabled>render</button>
+ <br>
+ reorder:
+ <button id="weave-frames">weave</button>
+ <button id="shuffle-frames">shuffle</button>
+ <button id="reverse-frames">reverse</button>
+ <button id="sort-frames">sort</button>
+
+ <div id="frames"></div>
+ <br>
+ <br>
+
+ gif delay <input type="text" id="framedelay" value="0.06s">
+ background <input type="text" id="background" value="#fff">
+ your name here &rarr; <input type="text" id="username" value="">
+ <br>
+ <br>
+ <button id="help">help</button>
+ &nbsp;
+ <button id="add-shader">+</button>
+ <button id="remove-shader">&times;</button>
+ &nbsp;
+ <span id="shaders"></span>
+ <br>
+ <br>
+ <a href="http://asdf.us/im/gallery/?tag=shader" target="_blank">Photoblaster Gallery</a>
+</div>
+
+<div id="workspace"></div>
+
+<div id="rendered">
+ <button id="reset">reset</button>
+ <button id="pause">pause</button>
+ <button id="step-forward">&gt;&gt;</button>
+ <span class="status"></span>
+ <button id="save" disabled>save</button>
+ <button id="upload" disabled>upload</button>
+ <br>
+ <input type="text" id="uploaded-url">
+</div>
+
+<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">&times;</button></div>
+</body>
+<script type="text/javascript" src="js/vendor/gif-encode/util.js"></script>
+<script type="text/javascript" src="js/vendor/gif-encode/tube.js"></script>
+<script type="text/javascript" src="js/vendor/gif-encode/client.js"></script>
+<script type="text/javascript" src="js/vendor/gif.js"></script>
+<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
+<script type="text/javascript" src="js/vendor/dataUriToBlob.js"></script>
+<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="js/vendor/jquery-ui-1.10.3.custom.min.js"></script>
+<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
+<script type="text/javascript" src="js/canvasquery.dither.js"></script>
+<script type="text/javascript" src="js/api/localstorage.js"></script>
+<script type="text/javascript" src="js/asdf.js"></script>
+<script type="text/javascript" src="js/image.js"></script>
+<script type="text/javascript" src="js/gallery.js"></script>
+<script type="text/javascript" src="js/color.js"></script>
+<script type="text/javascript" src="js/frames.js"></script>
+<script type="text/javascript" src="js/image.js"></script>
+<script type="text/javascript" src="js/user.js"></script>
+<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="shaders.json"></script>
+<script type="text/javascript">
+
+var cc = cq(0,0).appendTo("#workspace")
+var w, h
+var lastGif
+
+$(init)
+
+var mousex, mousey
+
+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
+ })
+
+ $("#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)
+
+ $("#render").click(render)
+ $("#save").click(save)
+ $("#upload").click(upload)
+ $("#help,#instructions .close").click(function(){ $("#instructions").toggle() })
+ $("#instructions").draggable({
+ start: drag_start,
+ stop: drag_stop
+ })
+ $("#instructions").disableSelection();
+
+ load()
+ $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
+
+ gallery.choose = choose
+ gallery.init()
+
+ user.init()
+ if (user.username.length) {
+ console.log("signed in as", user.username)
+ }
+
+ local_shaders.init()
+ local_shaders.loadLastAccessed()
+
+ document.getElementById('shader').addEventListener('input', shader_build);
+ shader_build()
+
+ 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">
+<button class="remove">x</button>
+<span class="frame"></span>
+</script>
+</html>
+
diff --git a/shader-picker.html b/shader-picker.html
index d482a6b..8bafc60 100644
--- a/shader-picker.html
+++ b/shader-picker.html
@@ -21,10 +21,10 @@ div { display: inline-block; padding: 10px;}
#rendered img { display: block; }
#render,#save { font-weight: bold; }
#render { float: right; }
-#instructions { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; }
-#instructions iframe {width: 100%;height:100%;margin:0;padding:0;border:0;}
-#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; }
+#commands { position: absolute;top:20px;right:20px; width:190px;height:465px; box-shadow:5px 5px 10px rgba(0,0,0,0.3); background:rgba(255,255,255,0.8); display: none; cursor: -webkit-grab; }
+#commands iframe {width: 100%;height:100%;margin:0;padding:0;border:0;}
+#commands.dragging iframe { pointer-events: none; }
+#commands .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; }
.close,.remove { cursor: pointer; }
#uploaded-url { display: none; width: 300px; }
form { display: inline-block; }
@@ -37,73 +37,73 @@ a { color: #00f; }
</head>
<body>
<div id="gallery">
- <div id="gallery-form">
- <form id="gallery-search">
- <input type="text" id="dumpfm-search-query" value="duck bill">
- <button id="gallery-search">DUMP SEARCH</button>
- </form>
- <button id="gallery-random">IM RANDOM</button>
- <span class="status"></span>
- </div>
- <div id="gallery-images"></div>
+ <div id="gallery-form">
+ <form id="gallery-search">
+ <input type="text" id="dumpfm-search-query" value="duck bill">
+ <button id="gallery-search">DUMP SEARCH</button>
+ </form>
+ <button id="gallery-random">IM RANDOM</button>
+ <span class="status"></span>
+ </div>
+ <div id="gallery-images"></div>
</div>
<div id="controls">
- <input type="text" id="url" value="img/1376516658960-dumpfm-DoritoWitch-TimeFLyTrans0001.png">
- <br>
- <br>
+ <input type="text" id="url" value="img/1376516658960-dumpfm-DoritoWitch-TimeFLyTrans0001.png">
+ <br>
+ <br>
- <textarea id="shader"></textarea>
- <br>
- <br>
+ <textarea id="shader"></textarea>
+ <br>
+ <br>
- frames <input type="text" id="framecount" value="1">
- interval <input type="text" id="frameinterval" value="0.1s">
- <button id="add-frame">+add frame</button>
- <button id="remove-all-frames">clear</button>
- <button id="render" disabled>render</button>
- <br>
- reorder:
- <button id="weave-frames">weave</button>
- <button id="shuffle-frames">shuffle</button>
- <button id="reverse-frames">reverse</button>
- <button id="sort-frames">sort</button>
-
- <div id="frames"></div>
- <br>
- <br>
+ frames <input type="text" id="framecount" value="1">
+ interval <input type="text" id="frameinterval" value="0.1s">
+ <button id="add-frame">+add frame</button>
+ <button id="remove-all-frames">clear</button>
+ <button id="render" disabled>render</button>
+ <br>
+ reorder:
+ <button id="weave-frames">weave</button>
+ <button id="shuffle-frames">shuffle</button>
+ <button id="reverse-frames">reverse</button>
+ <button id="sort-frames">sort</button>
+
+ <div id="frames"></div>
+ <br>
+ <br>
- gif delay <input type="text" id="framedelay" value="0.06s">
- background <input type="text" id="background" value="#fff">
- your name here &rarr; <input type="text" id="username" value="">
- <br>
- <br>
- <button id="help">help</button>
- &nbsp;
- <button id="add-shader">+</button>
- <button id="remove-shader">&times;</button>
- &nbsp;
- <span id="shaders"></span>
- <br>
- <br>
- <a href="http://asdf.us/im/gallery/?tag=shader" target="_blank">Photoblaster Gallery</a>
+ gif delay <input type="text" id="framedelay" value="0.06s">
+ background <input type="text" id="background" value="#fff">
+ your name here &rarr; <input type="text" id="username" value="">
+ <br>
+ <br>
+ <button id="show-commands">help</button>
+ &nbsp;
+ <button id="add-shader">+</button>
+ <button id="remove-shader">&times;</button>
+ &nbsp;
+ <span id="shaders"></span>
+ <br>
+ <br>
+ <a href="http://asdf.us/im/gallery/?tag=shader" target="_blank">Photoblaster Gallery</a>
</div>
<div id="workspace"></div>
<div id="rendered">
- <button id="reset">reset</button>
- <button id="pause">pause</button>
- <button id="step-forward">&gt;&gt;</button>
- <span class="status"></span>
- <button id="save" disabled>save</button>
- <button id="upload" disabled>upload</button>
- <br>
- <input type="text" id="uploaded-url">
+ <button id="reset">reset</button>
+ <button id="pause">pause</button>
+ <button id="step-forward">&gt;&gt;</button>
+ <span class="status"></span>
+ <button id="save" disabled>save</button>
+ <button id="upload" disabled>upload</button>
+ <br>
+ <input type="text" id="uploaded-url">
</div>
-<div id="instructions"><iframe src="instructions.html"></iframe><button class="close">&times;</button></div>
+<div id="commands"><iframe src="commands.html"></iframe><button class="close">&times;</button></div>
</body>
<script type="text/javascript" src="js/vendor/gif-encode/util.js"></script>
<script type="text/javascript" src="js/vendor/gif-encode/tube.js"></script>
@@ -111,10 +111,13 @@ a { color: #00f; }
<script type="text/javascript" src="js/vendor/gif.js"></script>
<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
<script type="text/javascript" src="js/vendor/dataUriToBlob.js"></script>
+<script type="text/javascript" src="js/vendor/acorn.js"></script>
<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/vendor/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
<script type="text/javascript" src="js/canvasquery.dither.js"></script>
+<script type="text/javascript" src="js/api/localstorage.js"></script>
+<script type="text/javascript" src="js/error.highlight.js"></script>
<script type="text/javascript" src="js/asdf.js"></script>
<script type="text/javascript" src="js/image.js"></script>
<script type="text/javascript" src="js/gallery.js"></script>
@@ -125,7 +128,14 @@ 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/html" id="frame-template">
+<button class="remove">x</button>
+<span class="frame"></span>
+</script>
+
<script type="text/javascript">
var cc = cq(0,0).appendTo("#workspace")
@@ -137,74 +147,39 @@ $(init)
var mousex, mousey
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
- })
+ $("#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
+ })
- $("#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)
+ $("#background").change(function(){
+ document.body.style.backgroundColor = $("#background").string()
+ })
+
+ frame_editor.init()
+ help.init()
+ load()
- $("#render").click(render)
- $("#save").click(save)
- $("#upload").click(upload)
- $("#help,#instructions .close").click(function(){ $("#instructions").toggle() })
- $("#instructions").draggable({
- start: drag_start,
- stop: drag_stop
- })
- $("#instructions").disableSelection();
+ gallery.init(choose)
- load()
- $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
+ user.init()
+ if (user.username.length) {
+ console.log("signed in as", user.username)
+ }
- gallery.choose = choose
- gallery.init()
+ local_shaders.init()
+ local_shaders.loadLastAccessed()
- user.init()
- if (user.username.length) {
- console.log("signed in as", user.username)
- }
+ document.getElementById('shader').addEventListener('input', shader_build);
+ shader_build()
- user.shaders.init()
- user.shaders.loadLastAccessed()
-
- document.getElementById('shader').addEventListener('input', shader_build);
- shader_build()
-
- requestAnimationFrame(animate)
+ 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">
-<button class="remove">x</button>
-<span class="frame"></span>
-</script>
</html>
diff --git a/shaders.json b/shaders.json
index 0653237..c44bc7e 100644
--- a/shaders.json
+++ b/shaders.json
@@ -1 +1 @@
-window.SHADERS = [{"name":"red","shader":"r = 255"},{"name":"demo","shader":"\n\nu = x + t/10\nv = y * sin(b/100)\n\nrgbpixel(d,u,v)\n\n"},{"name":"dither","shader":"\nxx = x, yy = y\n\nvar d = ((x % 2) + 2 * (y % 2)) - 2\n\nx += w/2\ny -= h/2\nt/=-200\ny/=96\nx/=50\nv = (sin(t+x*y) + 1.0) / 2\nv = (0.6) * v - 0.4 + random()\n\nv = clamp( v*64 + 128 , 0, 255)\nv += d*32\nif (a == 0) r = g = b = xx/w * 255\na = v > 128 ? v:0\n\n"},{"name":"rotozoom","shader":"u = (x * sin(t/10000)) - (y / cos(t/1000))\nv = (x / cos(t/1000)) + (y * sin(t/10000))\nrgbpixel(d,u,v)"},{"name":"donjuan","shader":"t /= 500\nif (a == 0) { r = g = b = 0; t /= -3 }\nr *= (sin(t*x/y) + 1)/2\ng *= (cos(t*y/x) + 0.4)/2\nb *= (sin(t) + 1.5)/2\na = b/9"},{"name":"barber","shader":"t/=10\noo = (y+x+t) % 100\nr *= 1/sin(oo/100)\ng *= 1/sin(oo/100)\nb *= 1/sin(oo/100)"},{"name":"redsmear","shader":"r = x\nz = 10\nr += random()*z\ng += random()*z\nb += random()*z"},{"name":"colorcycle","shader":"\nt /= 5000\nr = hsl2rgb( b/255 + t%2-1, 1.0, 0.5)[0]\n"},{"name":"tvfuzz","shader":"t /= 500\nif (a == 0) { r = g = b = x; t /= -3 }\nvar waveWidth = ((cos(t)/sin(t) - 0.5) * 100) /4\n\nlineSize = 5.0\nvar color = sin(t)*100;\nr -= color * abs(sin((x - (t * 50.0) - (sin(t * 0.2) * 60.0)) * 0.2))\ng -= color * abs(sin(((x + (2.0 * 3.14)) - (t * 50.0) - (sin(t * 0.4) * 60.0)) * 0.2))\nb -= color * abs( sin( ( x - (2.0 * 3.14) - (t * 50.0) - (sin(t * 1.0) * 60.0)) * 0.2 ) );\nif(r&g&b){a = abs(sin(y)*1000)+t}else{a=1000}\n//if(r&g&b){a = abs(sin(y)*1000)-t}else{a=1000}"},{"name":"pepper","shader":"t/=6000000\npx = x/100 - 1\npy = y/(100) -1\nsx = 0.8 * px -py * sin( abs(sin(x/abs(sin(t)))) * px - 5000. * t);\ndy = 1./ (abs(py - sx) );\ndy += (py - (px))*50;\nr += (px + 0.5) * dy \ng = abs(sin(t))*0.9 * dy \nb = dy\na =1000"}]
+window.EXAMPLE_SHADERS = [{"name":"red","shader":"r = 255"},{"name":"demo","shader":"\n\nu = x + t/10\nv = y * sin(b/100)\n\nrgbpixel(d,u,v)\n\n"},{"name":"dither","shader":"\nxx = x, yy = y\n\nvar d = ((x % 2) + 2 * (y % 2)) - 2\n\nx += w/2\ny -= h/2\nt/=-200\ny/=96\nx/=50\nv = (sin(t+x*y) + 1.0) / 2\nv = (0.6) * v - 0.4 + random()\n\nv = clamp( v*64 + 128 , 0, 255)\nv += d*32\nif (a == 0) r = g = b = xx/w * 255\na = v > 128 ? v:0\n\n"},{"name":"rotozoom","shader":"u = (x * sin(t/10000)) - (y / cos(t/1000))\nv = (x / cos(t/1000)) + (y * sin(t/10000))\nrgbpixel(d,u,v)"},{"name":"donjuan","shader":"t /= 500\nif (a == 0) { r = g = b = 0; t /= -3 }\nr *= (sin(t*x/y) + 1)/2\ng *= (cos(t*y/x) + 0.4)/2\nb *= (sin(t) + 1.5)/2\na = b/9"},{"name":"barber","shader":"t/=10\noo = (y+x+t) % 100\nr *= 1/sin(oo/100)\ng *= 1/sin(oo/100)\nb *= 1/sin(oo/100)"},{"name":"redsmear","shader":"r = x\nz = 10\nr += random()*z\ng += random()*z\nb += random()*z"},{"name":"colorcycle","shader":"\nt /= 5000\nr = hsl2rgb( b/255 + t%2-1, 1.0, 0.5)[0]\n"},{"name":"tvfuzz","shader":"t /= 500\nif (a == 0) { r = g = b = x; t /= -3 }\nvar waveWidth = ((cos(t)/sin(t) - 0.5) * 100) /4\n\nlineSize = 5.0\nvar color = sin(t)*100;\nr -= color * abs(sin((x - (t * 50.0) - (sin(t * 0.2) * 60.0)) * 0.2))\ng -= color * abs(sin(((x + (2.0 * 3.14)) - (t * 50.0) - (sin(t * 0.4) * 60.0)) * 0.2))\nb -= color * abs( sin( ( x - (2.0 * 3.14) - (t * 50.0) - (sin(t * 1.0) * 60.0)) * 0.2 ) );\nif(r&g&b){a = abs(sin(y)*1000)+t}else{a=1000}\n//if(r&g&b){a = abs(sin(y)*1000)-t}else{a=1000}"},{"name":"pepper","shader":"t/=6000000\npx = x/100 - 1\npy = y/(100) -1\nsx = 0.8 * px -py * sin( abs(sin(x/abs(sin(t)))) * px - 5000. * t);\ndy = 1./ (abs(py - sx) );\ndy += (py - (px))*50;\nr += (px + 0.5) * dy \ng = abs(sin(t))*0.9 * dy \nb = dy\na =1000"}]
diff --git a/tutorial.html b/tutorial.html
new file mode 100644
index 0000000..69b293e
--- /dev/null
+++ b/tutorial.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<head>
+<title>tutorial</title>
+<style type="text/css">
+html,body{margin:0;padding:5px 5px 5px 5px; }
+article { font-family: serif; font-size: 14px; margin:0;padding:0;}
+u{ color: #866; }
+i{ color: #666; }
+a{ color: #a39; }
+</style>
+</head>
+<body>
+<article id="pre">Shaders are little programs that draw a picture, pixel by pixel. With ShaderBlaster, use shaders on gifs and images to make new effects.
+
+Your basic variables are position (x, y),
+time (t), and color (r, g, b, a).
+
+Many math functions such as <i>cos</i> and <i>sqrt</i> are available, along with functions from GLSL like <i>step</i> and <i>mix</i>. Click commands to see a complete list.
+
+Use the bar below to search <a href="http://dump.fm/">Dumpfm</a> and <a href="http://asdf.us/im/">Photoblaster</a> for images.
+
+If you make a cool effect, you can render it out to a gif, or save the shader for others to use.
+</article>
+</body>
+<script>
+pre.innerHTML = pre.innerHTML.replace(/\(/g,"(<i>").replace(/\)/g,"</i>)").replace(/\n/g,"<br>")
+</script>
+</html>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 21:13:44 +0000