diff --git a/build/litegraph.js b/build/litegraph.js index 05fa7edd3..ee8de0f79 100644 --- a/build/litegraph.js +++ b/build/litegraph.js @@ -3698,6 +3698,7 @@ LGraphCanvas.prototype.setCanvas = function( canvas, skip_events ) //this.canvas.tabindex = "1000"; canvas.className += " lgraphcanvas"; canvas.data = this; + canvas.tabindex = '1'; //to allow key events //bg canvas: used for non changing stuff this.bgcanvas = null; @@ -3959,6 +3960,7 @@ LGraphCanvas.prototype.processMouseDown = function(e) this.canvas_mouse[0] = e.canvasX; this.canvas_mouse[1] = e.canvasY; + this.canvas.focus(); LiteGraph.closeAllContextMenus( ref_window ); @@ -4891,12 +4893,12 @@ LGraphCanvas.prototype.selectNodes = function( nodes, add_to_current_selection ) for(var i = 0; i < nodes.length; ++i) { var node = nodes[i]; - if(node.selected) + if(node.is_selected) continue; - if( !node.selected && node.onSelected ) + if( !node.is_selected && node.onSelected ) node.onSelected(); - node.selected = true; + node.is_selected = true; this.selected_nodes[ node.id ] = node; if(node.inputs) @@ -4922,11 +4924,11 @@ LGraphCanvas.prototype.selectNodes = function( nodes, add_to_current_selection ) **/ LGraphCanvas.prototype.deselectNode = function( node ) { - if(!node.selected) + if(!node.is_selected) return; if(node.onDeselected) node.onDeselected(); - node.selected = false; + node.is_selected = false; //remove highlighted if(node.inputs) @@ -4954,11 +4956,11 @@ LGraphCanvas.prototype.deselectAllNodes = function() for(var i = 0, l = nodes.length; i < l; ++i) { var node = nodes[i]; - if(!node.selected) + if(!node.is_selected) continue; if(node.onDeselected) node.onDeselected(); - node.selected = false; + node.is_selected = false; } this.selected_nodes = {}; this.highlighted_links = {}; @@ -5568,7 +5570,7 @@ LGraphCanvas.prototype.drawNode = function(node, ctx ) } //draw shape - this.drawNodeShape( node, ctx, size, color, bgcolor, node.selected, node.mouseOver ); + this.drawNodeShape( node, ctx, size, color, bgcolor, node.is_selected, node.mouseOver ); ctx.shadowColor = "transparent"; //connection slots @@ -7073,6 +7075,7 @@ LGraphCanvas.prototype.showSearchBox = function(event) dialog.close = function() { that.search_box = null; + setTimeout( function(){ that.canvas.focus(); },10 ); //important, if canvas loses focus keys wont be captured dialog.parentNode.removeChild( dialog ); } @@ -15378,7 +15381,10 @@ if(typeof(GL) != "undefined") })(this); (function( global ) { + var LiteGraph = global.LiteGraph; +var MIDI_COLOR = "#243"; + function MIDIEvent( data ) { @@ -15797,6 +15803,8 @@ LGMIDIIn.MIDIInterface = MIDIInterface; LGMIDIIn.title = "MIDI Input"; LGMIDIIn.desc = "Reads MIDI from a input port"; +LGMIDIIn.color = MIDI_COLOR; + LGMIDIIn.prototype.getPropertyInfo = function(name) { @@ -15891,6 +15899,7 @@ LGMIDIOut.MIDIInterface = MIDIInterface; LGMIDIOut.title = "MIDI Output"; LGMIDIOut.desc = "Sends MIDI to output channel"; +LGMIDIOut.color = MIDI_COLOR; LGMIDIOut.prototype.getPropertyInfo = function(name) { @@ -15940,6 +15949,8 @@ function LGMIDIShow() LGMIDIShow.title = "MIDI Show"; LGMIDIShow.desc = "Shows MIDI in the graph"; +LGMIDIShow.color = MIDI_COLOR; + LGMIDIShow.prototype.onAction = function(event, midi_event ) { @@ -15987,6 +15998,7 @@ function LGMIDIFilter() LGMIDIFilter.title = "MIDI Filter"; LGMIDIFilter.desc = "Filters MIDI messages"; +LGMIDIFilter.color = MIDI_COLOR; LGMIDIFilter.prototype.onAction = function(event, midi_event ) { @@ -16025,6 +16037,7 @@ function LGMIDIEvent() LGMIDIEvent.title = "MIDIEvent"; LGMIDIEvent.desc = "Create a MIDI Event"; +LGMIDIEvent.color = MIDI_COLOR; LGMIDIEvent.prototype.onAction = function( event, midi_event ) { @@ -16147,6 +16160,7 @@ function LGMIDICC() LGMIDICC.title = "MIDICC"; LGMIDICC.desc = "gets a Controller Change"; +LGMIDICC.color = MIDI_COLOR; LGMIDICC.prototype.onExecute = function() { @@ -16168,6 +16182,7 @@ function LGMIDIGenerator() this.properties = { notes: "A,A#,B,C,C#,D,D#,E,F,F#,G,G#", octave: 2, + duration: 0.5, mode: "sequence" }; @@ -16177,12 +16192,19 @@ function LGMIDIGenerator() LGMIDIGenerator.title = "MIDI Generator"; LGMIDIGenerator.desc = "Generates a random MIDI note"; +LGMIDIGenerator.color = MIDI_COLOR; LGMIDIGenerator.processScale = function(scale) { var notes = scale.split(","); for(var i = 0; i < notes.length; ++i) - notes[i] = MIDIEvent.note_to_index[ notes[i] ] || 0; + { + var n = notes[i]; + if( (n.length == 2 && n[1] != "#" ) || n.length > 2) + notes[i] = -LiteGraph.MIDIEvent.NoteStringToPitch(n); + else + notes[i] = MIDIEvent.note_to_index[ n ] || 0; + } return notes; } @@ -16209,20 +16231,30 @@ LGMIDIGenerator.prototype.onAction = function( event, midi_event ) //var pitch = this.properties.min + ((Math.random() * range)|0); var pitch = 0; var range = this.notes_pitches.length; + var index = 0; if( this.properties.mode == "sequence" ) - { - var index = this.sequence_index = (this.sequence_index + 1) % range; - pitch = this.notes_pitches[ index ] + ( (this.properties.octave-1) * 12) + 33; - } + index = this.sequence_index = (this.sequence_index + 1) % range; else if( this.properties.mode == "random" ) - { - var index = Math.floor(Math.random()*range); - pitch = this.notes_pitches[ index ] + ( (this.properties.octave-1) * 12) + 33; - } - var note = new MIDIEvent(); - note.setup([ MIDIEvent.NOTEON, pitch, 10 ]); - this.trigger("note", note); + index = Math.floor(Math.random()*range); + + var note = this.notes_pitches[ index ]; + if(note >= 0) + pitch = note + ( (this.properties.octave-1) * 12) + 33; + else + pitch = -note; + + var midi_event = new MIDIEvent(); + midi_event.setup([ MIDIEvent.NOTEON, pitch, 10 ]); + var duration = this.properties.duration || 1; + this.trigger("note", midi_event); + + //noteoff + setTimeout( (function(){ + var midi_event = new MIDIEvent(); + midi_event.setup([ MIDIEvent.NOTEOFF, pitch, 0 ]); + this.trigger("note", midi_event); + }).bind(this), duration * 1000 ); } @@ -16242,12 +16274,22 @@ function LGMIDITranspose() LGMIDITranspose.title = "MIDI Transpose"; LGMIDITranspose.desc = "Transpose a MIDI note"; +LGMIDITranspose.color = MIDI_COLOR; LGMIDITranspose.prototype.onAction = function( event, midi_event ) { - this.midi_event.setup( midi_event.data ); - this.midi_event.data[1] = Math.round( this.midi_event.data[1] + this.properties.amount ); - this.trigger("out", this.midi_event ); + if( !midi_event || midi_event.constructor !== MIDIEvent ) + return; + + if( midi_event.data[0] == MIDIEvent.NOTEON || midi_event.data[0] == MIDIEvent.NOTEOFF ) + { + this.midi_event = new MIDIEvent(); + this.midi_event.setup( midi_event.data ); + this.midi_event.data[1] = Math.round( this.midi_event.data[1] + this.properties.amount ); + this.trigger("out", this.midi_event ); + } + else + this.trigger("out", midi_event ); } LGMIDITranspose.prototype.onExecute = function() @@ -16272,11 +16314,11 @@ function LGMIDIQuantize() this.valid_notes = new Array(12); this.offset_notes = new Array(12); this.processScale( this.properties.scale ); - this.midi_event = new MIDIEvent(); } LGMIDIQuantize.title = "MIDI Quantize Pitch"; LGMIDIQuantize.desc = "Transpose a MIDI note tp fit an scale"; +LGMIDIQuantize.color = MIDI_COLOR; LGMIDIQuantize.prototype.onPropertyChanged = function(name,value) { @@ -16316,12 +16358,21 @@ LGMIDIQuantize.prototype.processScale = function( scale ) LGMIDIQuantize.prototype.onAction = function( event, midi_event ) { - this.midi_event.setup( midi_event.data ); - var note = midi_event.note; - var index = MIDIEvent.note_to_index[ note ]; - var offset = this.offset_notes[index]; - this.midi_event.data[1] += offset; - this.trigger("out", this.midi_event ); + if( !midi_event || midi_event.constructor !== MIDIEvent ) + return; + + if( midi_event.data[0] == MIDIEvent.NOTEON || midi_event.data[0] == MIDIEvent.NOTEOFF ) + { + this.midi_event = new MIDIEvent(); + this.midi_event.setup( midi_event.data ); + var note = midi_event.note; + var index = MIDIEvent.note_to_index[ note ]; + var offset = this.offset_notes[index]; + this.midi_event.data[1] += offset; + this.trigger("out", this.midi_event ); + } + else + this.trigger("out", midi_event ); } LGMIDIQuantize.prototype.onExecute = function() @@ -16359,15 +16410,20 @@ function LGMIDIPlay() LGMIDIPlay.title = "MIDI Play"; LGMIDIPlay.desc = "Plays a MIDI note"; +LGMIDIPlay.color = MIDI_COLOR; LGMIDIPlay.prototype.onAction = function( event, midi_event ) { - if(!this.instrument) + if( !midi_event || midi_event.constructor !== MIDIEvent ) return; - var note = midi_event.note; //C# - if( !note || note == "undefined" || note.constructor !== String ) - return; - this.instrument.play( note, midi_event.octave, this.properties.duration, this.properties.volume ); + + if( this.instrument && midi_event.data[0] == MIDIEvent.NOTEON ) + { + var note = midi_event.note; //C# + if( !note || note == "undefined" || note.constructor !== String ) + return; + this.instrument.play( note, midi_event.octave, this.properties.duration, this.properties.volume ); + } this.trigger("note", midi_event ); } @@ -16386,6 +16442,169 @@ LiteGraph.registerNodeType("midi/play", LGMIDIPlay); +function LGMIDIKeys() +{ + this.properties = { + num_octaves: 2, + start_octave: 2 + } + this.addInput( "note", LiteGraph.ACTION ); + this.addInput( "reset", LiteGraph.ACTION ); + this.addOutput( "note", LiteGraph.EVENT ); + this.size = [400,100]; + this.keys = []; + this._last_key = -1; +} + +LGMIDIKeys.title = "MIDI Keys"; +LGMIDIKeys.desc = "Keyboard to play notes"; +LGMIDIKeys.color = MIDI_COLOR; + +LGMIDIKeys.keys = [ + {x:0,w:1,h:1,t:0}, + {x:0.75,w:0.5,h:0.6,t:1}, + {x:1,w:1,h:1,t:0}, + {x:1.75,w:0.5,h:0.6,t:1}, + {x:2,w:1,h:1,t:0}, + {x:2.75,w:0.5,h:0.6,t:1}, + {x:3,w:1,h:1,t:0}, + {x:4,w:1,h:1,t:0}, + {x:4.75,w:0.5,h:0.6,t:1}, + {x:5,w:1,h:1,t:0}, + {x:5.75,w:0.5,h:0.6,t:1}, + {x:6,w:1,h:1,t:0}]; + +LGMIDIKeys.prototype.onDrawBackground = function(ctx) +{ + if(this.flags.collapsed) + return; + + var num_keys = this.properties.num_octaves * 12; + this.keys.length = num_keys; + var key_width = this.size[0] / (this.properties.num_octaves * 7); + var key_height = this.size[1]; + + for(var k = 0; k < 2; k++) //draw first whites (0) then blacks (1) + for(var i = 0; i < num_keys; ++i) + { + var key_info = LGMIDIKeys.keys[i%12]; + if( key_info.t != k ) + continue; + var octave = Math.floor(i/12); + var x = octave * 7 * key_width + key_info.x * key_width; + if(k == 0) + ctx.fillStyle = this.keys[i] ? "#CCC" : "white"; + else + ctx.fillStyle = this.keys[i] ? "#333" : "black"; + ctx.fillRect( x+1, 0, key_width * key_info.w - 2, key_height * key_info.h ); + } +} + +LGMIDIKeys.prototype.getKeyIndex = function(pos) +{ + var num_keys = this.properties.num_octaves * 12; + var key_width = this.size[0] / (this.properties.num_octaves * 7); + var key_height = this.size[1]; + + for(var k = 1; k >= 0; k--) //test blacks first (1) then whites (0) + for(var i = 0; i < this.keys.length; ++i) + { + var key_info = LGMIDIKeys.keys[i%12]; + if( key_info.t != k ) + continue; + var octave = Math.floor(i/12); + var x = octave * 7 * key_width + key_info.x * key_width; + var w = key_width * key_info.w; + var h = key_height * key_info.h; + if( pos[0] < x || pos[0] > (x + w) || pos[1] > h ) + continue; + return i; + } + return -1; +} + +LGMIDIKeys.prototype.onAction = function(event, params) +{ + if(event == "reset") + { + for(var i = 0; i < this.keys.length; ++i) + this.keys[i] = false; + return; + } + + if( !params || params.constructor !== MIDIEvent ) + return; + var midi_event = params; + var start_note = (this.properties.start_octave - 1) * 12 + 29; + var index = midi_event.data[1] - start_note; + if( index >= 0 && index < this.keys.length ) + { + if(midi_event.data[0] == MIDIEvent.NOTEON) + this.keys[index] = true; + else if(midi_event.data[0] == MIDIEvent.NOTEOFF) + this.keys[index] = false; + } + + this.trigger("note",midi_event); +} + + +LGMIDIKeys.prototype.onMouseDown = function(e, pos) +{ + if(pos[1] < 0) + return; + var index = this.getKeyIndex( pos ); + this.keys[ index ] = true; + this._last_key = index; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEON, pitch, 100]); + this.trigger("note",midi_event); + return true; +} + +LGMIDIKeys.prototype.onMouseMove = function(e, pos) +{ + if(pos[1] < 0 || this._last_key == -1) + return; + this.setDirtyCanvas(true); + var index = this.getKeyIndex( pos ); + if (this._last_key == index) + return true; + this.keys[ this._last_key ] = false; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + this._last_key; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEOFF, pitch, 100]); + this.trigger("note",midi_event); + + this.keys[ index ] = true; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEON, pitch, 100]); + this.trigger("note",midi_event); + + this._last_key = index; + return true; +} + +LGMIDIKeys.prototype.onMouseUp = function(e, pos) +{ + if(pos[1] < 0) + return; + var index = this.getKeyIndex( pos ); + this.keys[ index ] = false; + this._last_key = -1; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEOFF, pitch, 100]); + this.trigger("note",midi_event); + return true; +} + +LiteGraph.registerNodeType("midi/keys", LGMIDIKeys); + + + function now() { return window.performance.now() } diff --git a/build/litegraph.min.js b/build/litegraph.min.js index 309ff2d54..af06a956d 100755 --- a/build/litegraph.min.js +++ b/build/litegraph.min.js @@ -3,39 +3,39 @@ $jscomp.scope = {}; $jscomp.ASSUME_ES5 = !1; $jscomp.ASSUME_NO_NATIVE_MAP = !1; $jscomp.ASSUME_NO_NATIVE_SET = !1; -$jscomp.defineProperty = $jscomp.ASSUME_ES5 || "function" == typeof Object.defineProperties ? Object.defineProperty : function(v, k, h) { - v != Array.prototype && v != Object.prototype && (v[k] = h.value); +$jscomp.defineProperty = $jscomp.ASSUME_ES5 || "function" == typeof Object.defineProperties ? Object.defineProperty : function(v, d, m) { + v != Array.prototype && v != Object.prototype && (v[d] = m.value); }; $jscomp.getGlobal = function(v) { return "undefined" != typeof window && window === v ? v : "undefined" != typeof global && null != global ? global : v; }; $jscomp.global = $jscomp.getGlobal(this); -$jscomp.polyfill = function(v, k, h, q) { - if (k) { - h = $jscomp.global; +$jscomp.polyfill = function(v, d, m, q) { + if (d) { + m = $jscomp.global; v = v.split("."); for (q = 0; q < v.length - 1; q++) { - var d = v[q]; - d in h || (h[d] = {}); - h = h[d]; + var h = v[q]; + h in m || (m[h] = {}); + m = m[h]; } v = v[v.length - 1]; - q = h[v]; - k = k(q); - k != q && null != k && $jscomp.defineProperty(h, v, {configurable:!0, writable:!0, value:k}); + q = m[v]; + d = d(q); + d != q && null != d && $jscomp.defineProperty(m, v, {configurable:!0, writable:!0, value:d}); } }; $jscomp.polyfill("Array.prototype.fill", function(v) { - return v ? v : function(k, h, q) { - var d = this.length || 0; - 0 > h && (h = Math.max(0, d + h)); - if (null == q || q > d) { - q = d; + return v ? v : function(d, m, q) { + var h = this.length || 0; + 0 > m && (m = Math.max(0, h + m)); + if (null == q || q > h) { + q = h; } q = Number(q); - 0 > q && (q = Math.max(0, d + q)); - for (h = Number(h || 0); h < q; h++) { - this[h] = k; + 0 > q && (q = Math.max(0, h + q)); + for (m = Number(m || 0); m < q; m++) { + this[m] = d; } return this; }; @@ -48,8 +48,8 @@ $jscomp.initSymbol = function() { }; $jscomp.Symbol = function() { var v = 0; - return function(k) { - return $jscomp.SYMBOL_PREFIX + (k || "") + v++; + return function(d) { + return $jscomp.SYMBOL_PREFIX + (d || "") + v++; }; }(); $jscomp.initSymbolIterator = function() { @@ -63,9 +63,9 @@ $jscomp.initSymbolIterator = function() { }; }; $jscomp.arrayIterator = function(v) { - var k = 0; + var d = 0; return $jscomp.iteratorPrototype(function() { - return k < v.length ? {done:!1, value:v[k++]} : {done:!0}; + return d < v.length ? {done:!1, value:v[d++]} : {done:!0}; }); }; $jscomp.iteratorPrototype = function(v) { @@ -76,13 +76,13 @@ $jscomp.iteratorPrototype = function(v) { }; return v; }; -$jscomp.iteratorFromArray = function(v, k) { +$jscomp.iteratorFromArray = function(v, d) { $jscomp.initSymbolIterator(); v instanceof String && (v += ""); - var h = 0, q = {next:function() { - if (h < v.length) { - var d = h++; - return {value:k(d, v[d]), done:!1}; + var m = 0, q = {next:function() { + if (m < v.length) { + var h = m++; + return {value:d(h, v[h]), done:!1}; } q.next = function() { return {done:!0, value:void 0}; @@ -96,42 +96,42 @@ $jscomp.iteratorFromArray = function(v, k) { }; $jscomp.polyfill("Array.prototype.values", function(v) { return v ? v : function() { - return $jscomp.iteratorFromArray(this, function(k, h) { - return h; + return $jscomp.iteratorFromArray(this, function(d, m) { + return m; }); }; }, "es8", "es3"); $jscomp.polyfill("Array.prototype.keys", function(v) { return v ? v : function() { - return $jscomp.iteratorFromArray(this, function(k) { - return k; + return $jscomp.iteratorFromArray(this, function(d) { + return d; }); }; }, "es6", "es3"); (function(v) { - function k(a) { - g.debug && console.log("Graph created"); + function d(a) { + l.debug && console.log("Graph created"); this.list_of_graphcanvas = null; this.clear(); a && this.configure(a); } - function h(a) { + function m(a) { this._ctor(a); } function q(a) { this._ctor(a); } - function d(a, b, c) { + function h(a, b, c) { c = c || {}; this.background_image = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQBJREFUeNrs1rEKwjAUhlETUkj3vP9rdmr1Ysammk2w5wdxuLgcMHyptfawuZX4pJSWZTnfnu/lnIe/jNNxHHGNn//HNbbv+4dr6V+11uF527arU7+u63qfa/bnmh8sWLBgwYJlqRf8MEptXPBXJXa37BSl3ixYsGDBMliwFLyCV/DeLIMFCxYsWLBMwSt4Be/NggXLYMGCBUvBK3iNruC9WbBgwYJlsGApeAWv4L1ZBgsWLFiwYJmCV/AK3psFC5bBggULloJX8BpdwXuzYMGCBctgwVLwCl7Be7MMFixYsGDBsu8FH1FaSmExVfAxBa/gvVmwYMGCZbBg/W4vAQYA5tRF9QYlv/QAAAAASUVORK5CYII="; a && a.constructor === String && (a = document.querySelector(a)); this.max_zoom = 10; this.min_zoom = 0.1; this.zoom_modify_alpha = !0; - this.title_text_font = "bold " + g.NODE_TEXT_SIZE + "px Arial"; - this.inner_text_font = "normal " + g.NODE_SUBTEXT_SIZE + "px Arial"; - this.node_title_color = g.NODE_TITLE_COLOR; - this.default_link_color = g.LINK_COLOR; + this.title_text_font = "bold " + l.NODE_TEXT_SIZE + "px Arial"; + this.inner_text_font = "normal " + l.NODE_SUBTEXT_SIZE + "px Arial"; + this.node_title_color = l.NODE_TITLE_COLOR; + this.default_link_color = l.LINK_COLOR; this.default_connection_color = {input_off:"#AAB", input_on:"#7F7", output_off:"#AAB", output_on:"#7F7"}; this.highquality_render = !0; this.use_gradients = !1; @@ -163,8 +163,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { function u(a, b) { return Math.sqrt((b[0] - a[0]) * (b[0] - a[0]) + (b[1] - a[1]) * (b[1] - a[1])); } - function t(a, b, c, e, f, l) { - return c < a && c + f > a && e < b && e + l > b ? !0 : !1; + function t(a, b, c, e, f, k) { + return c < a && c + f > a && e < b && e + k > b ? !0 : !1; } function w(a, b) { var c = a[0] + a[2], e = a[1] + a[3], f = b[1] + b[3]; @@ -211,17 +211,17 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { f.addEventListener("mousewheel", c, !0); this.root = f; if (b.title) { - var l = document.createElement("div"); - l.className = "litemenu-title"; - l.innerHTML = b.title; - f.appendChild(l); + var k = document.createElement("div"); + k.className = "litemenu-title"; + k.innerHTML = b.title; + f.appendChild(k); } - l = 0; - for (var p in a) { - var g = a.constructor == Array ? a[p] : p; - null != g && g.constructor !== String && (g = void 0 === g.content ? String(g) : g.content); - this.addItem(g, a[p], b); - l++; + k = 0; + for (var n in a) { + var l = a.constructor == Array ? a[n] : n; + null != l && l.constructor !== String && (l = void 0 === l.content ? String(l) : l.content); + this.addItem(l, a[n], b); + k++; } f.addEventListener("mouseleave", function(a) { e.lock || (f.closing_timer && clearTimeout(f.closing_timer), f.closing_timer = setTimeout(e.close.bind(e, a), 500)); @@ -233,27 +233,27 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b.event && (a = b.event.target.ownerDocument); a || (a = document); a.body.appendChild(f); - p = b.left || 0; + n = b.left || 0; a = b.top || 0; - b.event && (p = b.event.pageX - 10, a = b.event.pageY - 10, b.title && (a -= 20), b.parentMenu && (p = b.parentMenu.root.getBoundingClientRect(), p = p.left + p.width), l = document.body.getBoundingClientRect(), g = f.getBoundingClientRect(), p > l.width - g.width - 10 && (p = l.width - g.width - 10), a > l.height - g.height - 10 && (a = l.height - g.height - 10)); - f.style.left = p + "px"; + b.event && (n = b.event.pageX - 10, a = b.event.pageY - 10, b.title && (a -= 20), b.parentMenu && (n = b.parentMenu.root.getBoundingClientRect(), n = n.left + n.width), k = document.body.getBoundingClientRect(), l = f.getBoundingClientRect(), n > k.width - l.width - 10 && (n = k.width - l.width - 10), a > k.height - l.height - 10 && (a = k.height - l.height - 10)); + f.style.left = n + "px"; f.style.top = a + "px"; } - var g = v.LiteGraph = {CANVAS_GRID_SIZE:10, NODE_TITLE_HEIGHT:20, NODE_SLOT_HEIGHT:15, NODE_WIDGET_HEIGHT:20, NODE_WIDTH:140, NODE_MIN_WIDTH:50, NODE_COLLAPSED_RADIUS:10, NODE_COLLAPSED_WIDTH:80, NODE_TITLE_COLOR:"#999", NODE_TEXT_SIZE:14, NODE_TEXT_COLOR:"#AAA", NODE_SUBTEXT_SIZE:12, NODE_DEFAULT_COLOR:"#333", NODE_DEFAULT_BGCOLOR:"#444", NODE_DEFAULT_BOXCOLOR:"#666", NODE_DEFAULT_SHAPE:"box", DEFAULT_SHADOW_COLOR:"rgba(0,0,0,0.5)", DEFAULT_GROUP_FONT:24, LINK_COLOR:"#AAD", EVENT_LINK_COLOR:"#F85", + var l = v.LiteGraph = {CANVAS_GRID_SIZE:10, NODE_TITLE_HEIGHT:20, NODE_SLOT_HEIGHT:15, NODE_WIDGET_HEIGHT:20, NODE_WIDTH:140, NODE_MIN_WIDTH:50, NODE_COLLAPSED_RADIUS:10, NODE_COLLAPSED_WIDTH:80, NODE_TITLE_COLOR:"#999", NODE_TEXT_SIZE:14, NODE_TEXT_COLOR:"#AAA", NODE_SUBTEXT_SIZE:12, NODE_DEFAULT_COLOR:"#333", NODE_DEFAULT_BGCOLOR:"#444", NODE_DEFAULT_BOXCOLOR:"#666", NODE_DEFAULT_SHAPE:"box", DEFAULT_SHADOW_COLOR:"rgba(0,0,0,0.5)", DEFAULT_GROUP_FONT:24, LINK_COLOR:"#AAD", EVENT_LINK_COLOR:"#F85", CONNECTING_LINK_COLOR:"#AFA", MAX_NUMBER_OF_NODES:1000, DEFAULT_POSITION:[100, 100], VALID_SHAPES:["default", "box", "round", "card"], BOX_SHAPE:1, ROUND_SHAPE:2, CIRCLE_SHAPE:3, CARD_SHAPE:4, ARROW_SHAPE:5, INPUT:1, OUTPUT:2, EVENT:-1, ACTION:-1, ALWAYS:0, ON_EVENT:1, NEVER:2, ON_TRIGGER:3, UP:1, DOWN:2, LEFT:3, RIGHT:4, CENTER:5, NORMAL_TITLE:0, NO_TITLE:1, TRANSPARENT_TITLE:2, AUTOHIDE_TITLE:3, proxy:null, node_images_path:"", debug:!1, throw_errors:!0, allow_scripts:!1, registered_node_types:{}, node_types_by_file_extension:{}, Nodes:{}, searchbox_extras:{}, registerNodeType:function(a, b) { if (!b.prototype) { throw "Cannot register a simple object, it must be a class with a prototype"; } b.type = a; - g.debug && console.log("Node registered: " + a); + l.debug && console.log("Node registered: " + a); a.split("/"); var c = b.name, e = a.lastIndexOf("/"); b.category = a.substr(0, e); b.title || (b.title = c); if (b.prototype) { - for (var f in h.prototype) { - b.prototype[f] || (b.prototype[f] = h.prototype[f]); + for (var f in m.prototype) { + b.prototype[f] || (b.prototype[f] = m.prototype[f]); } } Object.defineProperty(b.prototype, "shape", {set:function(a) { @@ -262,16 +262,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { delete this._shape; break; case "box": - this._shape = g.BOX_SHAPE; + this._shape = l.BOX_SHAPE; break; case "round": - this._shape = g.ROUND_SHAPE; + this._shape = l.ROUND_SHAPE; break; case "circle": - this._shape = g.CIRCLE_SHAPE; + this._shape = l.CIRCLE_SHAPE; break; case "card": - this._shape = g.CARD_SHAPE; + this._shape = l.CARD_SHAPE; break; default: this._shape = a; @@ -288,10 +288,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }, wrapFunctionAsNode:function(a, b, c, e) { - for (var f = Array(b.length), l = "", p = g.getParameterNames(b), d = 0; d < p.length; ++d) { - l += "this.addInput('" + p[d] + "'," + (c && c[d] ? "'" + c[d] + "'" : "0") + ");\n"; + for (var f = Array(b.length), k = "", n = l.getParameterNames(b), h = 0; h < n.length; ++h) { + k += "this.addInput('" + n[h] + "'," + (c && c[h] ? "'" + c[h] + "'" : "0") + ");\n"; } - c = Function(l + ("this.addOutput('out'," + (e ? "'" + e + "'" : 0) + ");\n")); + c = Function(k + ("this.addOutput('out'," + (e ? "'" + e + "'" : 0) + ");\n")); c.title = a.split("/").pop(); c.desc = "Generated from " + b.name; c.prototype.onExecute = function() { @@ -303,7 +303,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }; this.registerNodeType(a, c); }, addNodeMethod:function(a, b) { - h.prototype[a] = b; + m.prototype[a] = b; for (var c in this.registered_node_types) { var e = this.registered_node_types[c]; e.prototype[a] && (e.prototype["_" + a] = e.prototype[a]); @@ -312,7 +312,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }, createNode:function(a, b, c) { var e = this.registered_node_types[a]; if (!e) { - return g.debug && console.log('GraphNode type "' + a + '" not registered.'), null; + return l.debug && console.log('GraphNode type "' + a + '" not registered.'), null; } b = b || e.title || a; e = new e(b); @@ -322,8 +322,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { e.properties_info || (e.properties_info = []); e.flags || (e.flags = {}); e.size || (e.size = e.computeSize()); - e.pos || (e.pos = g.DEFAULT_POSITION.concat()); - e.mode || (e.mode = g.ALWAYS); + e.pos || (e.pos = l.DEFAULT_POSITION.concat()); + e.mode || (e.mode = l.ALWAYS); if (c) { for (var f in c) { e[f] = c[f]; @@ -360,21 +360,21 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var f = c[e].src; if (f && f.substr(0, a.length) == a) { try { - g.debug && console.log("Reloading: " + f); - var l = document.createElement("script"); - l.type = "text/javascript"; - l.src = f; - b.appendChild(l); + l.debug && console.log("Reloading: " + f); + var k = document.createElement("script"); + k.type = "text/javascript"; + k.src = f; + b.appendChild(k); b.removeChild(c[e]); - } catch (p) { - if (g.throw_errors) { - throw p; + } catch (n) { + if (l.throw_errors) { + throw n; } - g.debug && console.log("Error while reloading " + f); + l.debug && console.log("Error while reloading " + f); } } } - g.debug && console.log("Nodes reloaded"); + l.debug && console.log("Nodes reloaded"); }, cloneObject:function(a, b) { if (null == a) { return null; @@ -388,7 +388,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return b; }, isValidConnection:function(a, b) { - if (!a || !b || a == b || a == g.EVENT && b == g.ACTION) { + if (!a || !b || a == b || a == l.EVENT && b == l.ACTION) { return !0; } a = String(a); @@ -411,22 +411,22 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }, registerSearchboxExtra:function(a, b, c) { this.searchbox_extras[b] = {type:a, desc:b, data:c}; }}; - g.getTime = "undefined" != typeof performance ? performance.now.bind(performance) : "undefined" != typeof Date && Date.now ? Date.now.bind(Date) : "undefined" != typeof process ? function() { + l.getTime = "undefined" != typeof performance ? performance.now.bind(performance) : "undefined" != typeof Date && Date.now ? Date.now.bind(Date) : "undefined" != typeof process ? function() { var a = process.hrtime(); return 0.001 * a[0] + 1e-6 * a[1]; } : function() { return (new Date).getTime(); }; - v.LGraph = g.LGraph = k; - k.supported_types = ["number", "string", "boolean"]; - k.prototype.getSupportedTypes = function() { - return this.supported_types || k.supported_types; + v.LGraph = l.LGraph = d; + d.supported_types = ["number", "string", "boolean"]; + d.prototype.getSupportedTypes = function() { + return this.supported_types || d.supported_types; }; - k.STATUS_STOPPED = 1; - k.STATUS_RUNNING = 2; - k.prototype.clear = function() { + d.STATUS_STOPPED = 1; + d.STATUS_RUNNING = 2; + d.prototype.clear = function() { this.stop(); - this.status = k.STATUS_STOPPED; + this.status = d.STATUS_STOPPED; this.last_link_id = this.last_node_id = 1; this._version = -1; if (this._nodes) { @@ -454,8 +454,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.change(); this.sendActionToCanvas("clear"); }; - k.prototype.attachCanvas = function(a) { - if (a.constructor != d) { + d.prototype.attachCanvas = function(a) { + if (a.constructor != h) { throw "attachCanvas expects a LGraphCanvas instance"; } a.graph && a.graph != this && a.graph.detachCanvas(a); @@ -463,20 +463,20 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.list_of_graphcanvas || (this.list_of_graphcanvas = []); this.list_of_graphcanvas.push(a); }; - k.prototype.detachCanvas = function(a) { + d.prototype.detachCanvas = function(a) { if (this.list_of_graphcanvas) { var b = this.list_of_graphcanvas.indexOf(a); -1 != b && (a.graph = null, this.list_of_graphcanvas.splice(b, 1)); } }; - k.prototype.start = function(a) { - if (this.status != k.STATUS_RUNNING) { - this.status = k.STATUS_RUNNING; + d.prototype.start = function(a) { + if (this.status != d.STATUS_RUNNING) { + this.status = d.STATUS_RUNNING; if (this.onPlayEvent) { this.onPlayEvent(); } this.sendEventToAllNodes("onStart"); - this.last_update_time = this.starttime = g.getTime(); + this.last_update_time = this.starttime = l.getTime(); a = a || 0; var b = this; if (0 == a && "undefined" != typeof window && window.requestAnimationFrame) { @@ -492,9 +492,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.stop = function() { - if (this.status != k.STATUS_STOPPED) { - this.status = k.STATUS_STOPPED; + d.prototype.stop = function() { + if (this.status != d.STATUS_STOPPED) { + this.status = d.STATUS_STOPPED; if (this.onStopEvent) { this.onStopEvent(); } @@ -502,18 +502,18 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.sendEventToAllNodes("onStop"); } }; - k.prototype.runStep = function(a, b) { + d.prototype.runStep = function(a, b) { a = a || 1; - var c = g.getTime(); + var c = l.getTime(); this.globaltime = 0.001 * (c - this.starttime); var e = this._nodes_executable ? this._nodes_executable : this._nodes; if (e) { if (b) { for (var f = 0; f < a; f++) { - for (var l = 0, p = e.length; l < p; ++l) { - var d = e[l]; - if (d.mode == g.ALWAYS && d.onExecute) { - d.onExecute(); + for (var k = 0, n = e.length; k < n; ++k) { + var h = e[k]; + if (h.mode == l.ALWAYS && h.onExecute) { + h.onExecute(); } } this.fixedtime += this.fixedtime_lapse; @@ -527,10 +527,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } else { try { for (f = 0; f < a; f++) { - l = 0; - for (p = e.length; l < p; ++l) { - if (d = e[l], d.mode == g.ALWAYS && d.onExecute) { - d.onExecute(); + k = 0; + for (n = e.length; k < n; ++k) { + if (h = e[k], h.mode == l.ALWAYS && h.onExecute) { + h.onExecute(); } } this.fixedtime += this.fixedtime_lapse; @@ -544,14 +544,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.errors_in_execution = !1; } catch (G) { this.errors_in_execution = !0; - if (g.throw_errors) { + if (l.throw_errors) { throw G; } - g.debug && console.log("Error during execution: " + G); + l.debug && console.log("Error during execution: " + G); this.stop(); } } - a = g.getTime(); + a = l.getTime(); c = a - c; 0 == c && (c = 1); this.execution_time = 0.001 * c; @@ -561,63 +561,63 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.last_update_time = a; } }; - k.prototype.updateExecutionOrder = function() { + d.prototype.updateExecutionOrder = function() { this._nodes_in_order = this.computeExecutionOrder(!1); this._nodes_executable = []; for (var a = 0; a < this._nodes_in_order.length; ++a) { this._nodes_in_order[a].onExecute && this._nodes_executable.push(this._nodes_in_order[a]); } }; - k.prototype.computeExecutionOrder = function(a, b) { - for (var c = [], e = [], f = {}, l = {}, p = {}, d = 0, n = this._nodes.length; d < n; ++d) { - var k = this._nodes[d]; - if (!a || k.onExecute) { - f[k.id] = k; - var m = 0; - if (k.inputs) { - for (var h = 0, q = k.inputs.length; h < q; h++) { - k.inputs[h] && null != k.inputs[h].link && (m += 1); + d.prototype.computeExecutionOrder = function(a, b) { + for (var c = [], e = [], f = {}, k = {}, n = {}, h = 0, d = this._nodes.length; h < d; ++h) { + var p = this._nodes[h]; + if (!a || p.onExecute) { + f[p.id] = p; + var g = 0; + if (p.inputs) { + for (var m = 0, q = p.inputs.length; m < q; m++) { + p.inputs[m] && null != p.inputs[m].link && (g += 1); } } - 0 == m ? (e.push(k), b && (k._level = 1)) : (b && (k._level = 0), p[k.id] = m); + 0 == g ? (e.push(p), b && (p._level = 1)) : (b && (p._level = 0), n[p.id] = g); } } for (; 0 != e.length;) { - if (k = e.shift(), c.push(k), delete f[k.id], k.outputs) { - for (d = 0; d < k.outputs.length; d++) { - if (a = k.outputs[d], null != a && null != a.links && 0 != a.links.length) { - for (h = 0; h < a.links.length; h++) { - (n = this.links[a.links[h]]) && !l[n.id] && (m = this.getNodeById(n.target_id), null == m ? l[n.id] = !0 : (b && (!m._level || m._level <= k._level) && (m._level = k._level + 1), l[n.id] = !0, --p[m.id], 0 == p[m.id] && e.push(m))); + if (p = e.shift(), c.push(p), delete f[p.id], p.outputs) { + for (h = 0; h < p.outputs.length; h++) { + if (a = p.outputs[h], null != a && null != a.links && 0 != a.links.length) { + for (m = 0; m < a.links.length; m++) { + (d = this.links[a.links[m]]) && !k[d.id] && (g = this.getNodeById(d.target_id), null == g ? k[d.id] = !0 : (b && (!g._level || g._level <= p._level) && (g._level = p._level + 1), k[d.id] = !0, --n[g.id], 0 == n[g.id] && e.push(g))); } } } } } - for (d in f) { - c.push(f[d]); + for (h in f) { + c.push(f[h]); } - c.length != this._nodes.length && g.debug && console.warn("something went wrong, nodes missing"); - n = c.length; - for (d = 0; d < n; ++d) { - c[d].order = d; + c.length != this._nodes.length && l.debug && console.warn("something went wrong, nodes missing"); + d = c.length; + for (h = 0; h < d; ++h) { + c[h].order = h; } c = c.sort(function(a, b) { var c = a.constructor.priority || a.priority || 0, e = b.constructor.priority || b.priority || 0; return c == e ? a.order - b.order : c - e; }); - for (d = 0; d < n; ++d) { - c[d].order = d; + for (h = 0; h < d; ++h) { + c[h].order = h; } return c; }; - k.prototype.getAncestors = function(a) { + d.prototype.getAncestors = function(a) { for (var b = [], c = [a], e = {}; c.length;) { var f = c.shift(); if (f.inputs) { e[f.id] || f == a || (e[f.id] = !0, b.push(f)); - for (var l = 0; l < f.inputs.length; ++l) { - var p = f.getInputNode(l); - p && -1 == b.indexOf(p) && c.push(p); + for (var k = 0; k < f.inputs.length; ++k) { + var n = f.getInputNode(k); + n && -1 == b.indexOf(n) && c.push(n); } } } @@ -626,54 +626,54 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }); return b; }; - k.prototype.arrange = function(a) { + d.prototype.arrange = function(a) { a = a || 40; for (var b = this.computeExecutionOrder(!1, !0), c = [], e = 0; e < b.length; ++e) { - var f = b[e], l = f._level || 1; - c[l] || (c[l] = []); - c[l].push(f); + var f = b[e], k = f._level || 1; + c[k] || (c[k] = []); + c[k].push(f); } b = a; for (e = 0; e < c.length; ++e) { - if (l = c[e]) { - for (var p = 100, d = a, g = 0; g < l.length; ++g) { - f = l[g], f.pos[0] = b, f.pos[1] = d, f.size[0] > p && (p = f.size[0]), d += f.size[1] + a; + if (k = c[e]) { + for (var n = 100, h = a, l = 0; l < k.length; ++l) { + f = k[l], f.pos[0] = b, f.pos[1] = h, f.size[0] > n && (n = f.size[0]), h += f.size[1] + a; } - b += p + a; + b += n + a; } } this.setDirtyCanvas(!0, !0); }; - k.prototype.getTime = function() { + d.prototype.getTime = function() { return this.globaltime; }; - k.prototype.getFixedTime = function() { + d.prototype.getFixedTime = function() { return this.fixedtime; }; - k.prototype.getElapsedTime = function() { + d.prototype.getElapsedTime = function() { return this.elapsed_time; }; - k.prototype.sendEventToAllNodes = function(a, b, c) { - c = c || g.ALWAYS; + d.prototype.sendEventToAllNodes = function(a, b, c) { + c = c || l.ALWAYS; var e = this._nodes_in_order ? this._nodes_in_order : this._nodes; if (e) { - for (var f = 0, l = e.length; f < l; ++f) { - var p = e[f]; - if (p[a] && p.mode == c) { + for (var f = 0, k = e.length; f < k; ++f) { + var n = e[f]; + if (n[a] && n.mode == c) { if (void 0 === b) { - p[a](); + n[a](); } else { if (b && b.constructor === Array) { - p[a].apply(p, b); + n[a].apply(n, b); } else { - p[a](b); + n[a](b); } } } } } }; - k.prototype.sendActionToCanvas = function(a, b) { + d.prototype.sendActionToCanvas = function(a, b) { if (this.list_of_graphcanvas) { for (var c = 0; c < this.list_of_graphcanvas.length; ++c) { var e = this.list_of_graphcanvas[c]; @@ -681,13 +681,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.add = function(a, b) { + d.prototype.add = function(a, b) { if (a) { if (a.constructor === q) { this._groups.push(a), this.setDirtyCanvas(!0), this.change(), a.graph = this, this._version++; } else { -1 != a.id && null != this._nodes_by_id[a.id] && (console.warn("LiteGraph: there is already a node with this ID, changing it"), a.id = ++this.last_node_id); - if (this._nodes.length >= g.MAX_NUMBER_OF_NODES) { + if (this._nodes.length >= l.MAX_NUMBER_OF_NODES) { throw "LiteGraph: max number of nodes in a graph reached"; } null == a.id || -1 == a.id ? a.id = ++this.last_node_id : this.last_node_id < a.id && (this.last_node_id = a.id); @@ -709,8 +709,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.remove = function(a) { - if (a.constructor === g.LGraphGroup) { + d.prototype.remove = function(a) { + if (a.constructor === l.LGraphGroup) { var b = this._groups.indexOf(a); -1 != b && this._groups.splice(b, 1); a.graph = null; @@ -752,39 +752,39 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.getNodeById = function(a) { + d.prototype.getNodeById = function(a) { return null == a ? null : this._nodes_by_id[a]; }; - k.prototype.findNodesByClass = function(a) { + d.prototype.findNodesByClass = function(a) { for (var b = [], c = 0, e = this._nodes.length; c < e; ++c) { this._nodes[c].constructor === a && b.push(this._nodes[c]); } return b; }; - k.prototype.findNodesByType = function(a) { + d.prototype.findNodesByType = function(a) { a = a.toLowerCase(); for (var b = [], c = 0, e = this._nodes.length; c < e; ++c) { this._nodes[c].type.toLowerCase() == a && b.push(this._nodes[c]); } return b; }; - k.prototype.findNodesByTitle = function(a) { + d.prototype.findNodesByTitle = function(a) { for (var b = [], c = 0, e = this._nodes.length; c < e; ++c) { this._nodes[c].title == a && b.push(this._nodes[c]); } return b; }; - k.prototype.getNodeOnPos = function(a, b, c, e) { + d.prototype.getNodeOnPos = function(a, b, c, e) { c = c || this._nodes; for (var f = c.length - 1; 0 <= f; f--) { - var l = c[f]; - if (l.isPointInside(a, b, e)) { - return l; + var k = c[f]; + if (k.isPointInside(a, b, e)) { + return k; } } return null; }; - k.prototype.getGroupOnPos = function(a, b) { + d.prototype.getGroupOnPos = function(a, b) { for (var c = this._groups.length - 1; 0 <= c; c--) { var e = this._groups[c]; if (e.isPointInside(a, b, 2, !0)) { @@ -793,7 +793,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return null; }; - k.prototype.addGlobalInput = function(a, b, c) { + d.prototype.addGlobalInput = function(a, b, c) { this.global_inputs[a] = {name:a, type:b, value:c}; this._version++; if (this.onGlobalInputAdded) { @@ -803,16 +803,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onGlobalsChange(); } }; - k.prototype.setGlobalInputData = function(a, b) { + d.prototype.setGlobalInputData = function(a, b) { if (a = this.global_inputs[a]) { a.value = b; } }; - k.prototype.setInputData = k.prototype.setGlobalInputData; - k.prototype.getGlobalInputData = function(a) { + d.prototype.setInputData = d.prototype.setGlobalInputData; + d.prototype.getGlobalInputData = function(a) { return (a = this.global_inputs[a]) ? a.value : null; }; - k.prototype.renameGlobalInput = function(a, b) { + d.prototype.renameGlobalInput = function(a, b) { if (b != a) { if (!this.global_inputs[a]) { return !1; @@ -831,7 +831,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.changeGlobalInputType = function(a, b) { + d.prototype.changeGlobalInputType = function(a, b) { if (!this.global_inputs[a]) { return !1; } @@ -841,7 +841,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.removeGlobalInput = function(a) { + d.prototype.removeGlobalInput = function(a) { if (!this.global_inputs[a]) { return !1; } @@ -855,7 +855,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !0; }; - k.prototype.addGlobalOutput = function(a, b, c) { + d.prototype.addGlobalOutput = function(a, b, c) { this.global_outputs[a] = {name:a, type:b, value:c}; this._version++; if (this.onGlobalOutputAdded) { @@ -865,16 +865,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onGlobalsChange(); } }; - k.prototype.setGlobalOutputData = function(a, b) { + d.prototype.setGlobalOutputData = function(a, b) { if (a = this.global_outputs[a]) { a.value = b; } }; - k.prototype.getGlobalOutputData = function(a) { + d.prototype.getGlobalOutputData = function(a) { return (a = this.global_outputs[a]) ? a.value : null; }; - k.prototype.getOutputData = k.prototype.getGlobalOutputData; - k.prototype.renameGlobalOutput = function(a, b) { + d.prototype.getOutputData = d.prototype.getGlobalOutputData; + d.prototype.renameGlobalOutput = function(a, b) { if (!this.global_outputs[a]) { return !1; } @@ -891,7 +891,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onGlobalsChange(); } }; - k.prototype.changeGlobalOutputType = function(a, b) { + d.prototype.changeGlobalOutputType = function(a, b) { if (!this.global_outputs[a]) { return !1; } @@ -901,7 +901,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.removeGlobalOutput = function(a) { + d.prototype.removeGlobalOutput = function(a) { if (!this.global_outputs[a]) { return !1; } @@ -915,19 +915,19 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !0; }; - k.prototype.triggerInput = function(a, b) { + d.prototype.triggerInput = function(a, b) { a = this.findNodesByTitle(a); for (var c = 0; c < a.length; ++c) { a[c].onTrigger(b); } }; - k.prototype.setCallback = function(a, b) { + d.prototype.setCallback = function(a, b) { a = this.findNodesByTitle(a); for (var c = 0; c < a.length; ++c) { a[c].setTrigger(b); } }; - k.prototype.connectionChange = function(a, b) { + d.prototype.connectionChange = function(a, b) { this.updateExecutionOrder(); if (this.onConnectionChange) { this.onConnectionChange(a); @@ -935,7 +935,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._version++; this.sendActionToCanvas("onConnectionChange"); }; - k.prototype.isLive = function() { + d.prototype.isLive = function() { if (!this.list_of_graphcanvas) { return !1; } @@ -946,23 +946,23 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !1; }; - k.prototype.clearTriggeredSlots = function() { + d.prototype.clearTriggeredSlots = function() { for (var a in this.links) { var b = this.links[a]; b && b._last_time && (b._last_time = 0); } }; - k.prototype.change = function() { - g.debug && console.log("Graph changed"); + d.prototype.change = function() { + l.debug && console.log("Graph changed"); this.sendActionToCanvas("setDirty", [!0, !0]); if (this.on_change) { this.on_change(this); } }; - k.prototype.setDirtyCanvas = function(a, b) { + d.prototype.setDirtyCanvas = function(a, b) { this.sendActionToCanvas("setDirty", [a, b]); }; - k.prototype.serialize = function() { + d.prototype.serialize = function() { for (var a = [], b = 0, c = this._nodes.length; b < c; ++b) { a.push(this._nodes[b].serialize()); } @@ -977,7 +977,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return {last_node_id:this.last_node_id, last_link_id:this.last_link_id, nodes:a, links:c, groups:e, config:this.config}; }; - k.prototype.configure = function(a, b) { + d.prototype.configure = function(a, b) { if (a) { b || this.clear(); b = a.nodes; @@ -996,18 +996,18 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (b) { e = 0; for (f = b.length; e < f; ++e) { - var l = b[e], p = g.createNode(l.type, l.title); - p ? (p.id = l.id, this.add(p, !0)) : (g.debug && console.log("Node not found: " + l.type), c = !0); + var k = b[e], n = l.createNode(k.type, k.title); + n ? (n.id = k.id, this.add(n, !0)) : (l.debug && console.log("Node not found: " + k.type), c = !0); } e = 0; for (f = b.length; e < f; ++e) { - l = b[e], (p = this.getNodeById(l.id)) && p.configure(l); + k = b[e], (n = this.getNodeById(k.id)) && n.configure(k); } } this._groups.length = 0; if (a.groups) { for (e = 0; e < a.groups.length; ++e) { - b = new g.LGraphGroup, b.configure(a.groups[e]), this.add(b); + b = new l.LGraphGroup, b.configure(a.groups[e]), this.add(b); } } this.updateExecutionOrder(); @@ -1016,7 +1016,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return c; } }; - k.prototype.load = function(a) { + d.prototype.load = function(a) { var b = this, c = new XMLHttpRequest; c.open("GET", a, !0); c.send(null); @@ -1027,12 +1027,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { console.error("Error loading graph:", a); }; }; - k.prototype.onNodeTrace = function(a, b, c) { + d.prototype.onNodeTrace = function(a, b, c) { }; - v.LGraphNode = g.LGraphNode = h; - h.prototype._ctor = function(a) { + v.LGraphNode = l.LGraphNode = m; + m.prototype._ctor = function(a) { this.title = a || "Unnamed"; - this.size = [g.NODE_WIDTH, 60]; + this.size = [l.NODE_WIDTH, 60]; this.graph = null; this._pos = new Float32Array(10, 10); Object.defineProperty(this, "pos", {set:function(a) { @@ -1049,7 +1049,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.properties_info = []; this.flags = {}; }; - h.prototype.configure = function(a) { + m.prototype.configure = function(a) { this.graph && this.graph._version++; for (var b in a) { if ("console" != b) { @@ -1060,7 +1060,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } } else { - null != a[b] && ("object" == typeof a[b] ? this[b] && this[b].configure ? this[b].configure(a[b]) : this[b] = g.cloneObject(a[b], this[b]) : this[b] = a[b]); + null != a[b] && ("object" == typeof a[b] ? this[b] && this[b].configure ? this[b].configure(a[b]) : this[b] = l.cloneObject(a[b], this[b]) : this[b] = a[b]); } } } @@ -1070,14 +1070,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { for (var e = 0; e < this.inputs.length; ++e) { c = this.inputs[e]; var f = this.graph ? this.graph.links[c.link] : null; - this.onConnectionsChange(g.INPUT, e, !0, f, c); + this.onConnectionsChange(l.INPUT, e, !0, f, c); } } if (this.outputs) { for (e = 0; e < this.outputs.length; ++e) { if (c = this.outputs[e], c.links) { for (b = 0; b < c.links.length; ++b) { - f = this.graph ? this.graph.links[c.links[b]] : null, this.onConnectionsChange(g.OUTPUT, e, !0, f, c); + f = this.graph ? this.graph.links[c.links[b]] : null, this.onConnectionsChange(l.OUTPUT, e, !0, f, c); } } } @@ -1097,8 +1097,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onConfigure(a); } }; - h.prototype.serialize = function() { - var a = {id:this.id, type:this.type, pos:this.pos, size:this.size, flags:g.cloneObject(this.flags), mode:this.mode}; + m.prototype.serialize = function() { + var a = {id:this.id, type:this.type, pos:this.pos, size:this.size, flags:l.cloneObject(this.flags), mode:this.mode}; this.inputs && (a.inputs = this.inputs); if (this.outputs) { for (var b = 0; b < this.outputs.length; b++) { @@ -1107,7 +1107,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.outputs = this.outputs; } this.title && this.title != this.constructor.title && (a.title = this.title); - this.properties && (a.properties = g.cloneObject(this.properties)); + this.properties && (a.properties = l.cloneObject(this.properties)); a.type || (a.type = this.constructor.type); this.color && (a.color = this.color); this.bgcolor && (a.bgcolor = this.bgcolor); @@ -1116,8 +1116,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onSerialize && this.onSerialize(a) && console.warn("node onSerialize shouldnt return anything, data should be stored in the object pass in the first parameter"); return a; }; - h.prototype.clone = function() { - var a = g.createNode(this.type), b = g.cloneObject(this.serialize()); + m.prototype.clone = function() { + var a = l.createNode(this.type), b = l.cloneObject(this.serialize()); if (b.inputs) { for (var c = 0; c < b.inputs.length; ++c) { b.inputs[c].link = null; @@ -1132,13 +1132,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.configure(b); return a; }; - h.prototype.toString = function() { + m.prototype.toString = function() { return JSON.stringify(this.serialize()); }; - h.prototype.getTitle = function() { + m.prototype.getTitle = function() { return this.title || this.constructor.title; }; - h.prototype.setOutputData = function(a, b) { + m.prototype.setOutputData = function(a, b) { if (this.outputs && !(-1 == a || a >= this.outputs.length)) { var c = this.outputs[a]; if (c && (c._data = b, this.outputs[a].links)) { @@ -1148,7 +1148,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - h.prototype.getInputData = function(a, b) { + m.prototype.getInputData = function(a, b) { if (this.inputs && !(a >= this.inputs.length || null == this.inputs[a].link)) { a = this.graph.links[this.inputs[a].link]; if (!a) { @@ -1171,24 +1171,24 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return a.data; } }; - h.prototype.getInputDataByName = function(a, b) { + m.prototype.getInputDataByName = function(a, b) { a = this.findInputSlot(a); return -1 == a ? null : this.getInputData(a, b); }; - h.prototype.isInputConnected = function(a) { + m.prototype.isInputConnected = function(a) { return this.inputs ? a < this.inputs.length && null != this.inputs[a].link : !1; }; - h.prototype.getInputInfo = function(a) { + m.prototype.getInputInfo = function(a) { return this.inputs ? a < this.inputs.length ? this.inputs[a] : null : null; }; - h.prototype.getInputNode = function(a) { + m.prototype.getInputNode = function(a) { if (!this.inputs || a >= this.inputs.length) { return null; } a = this.inputs[a]; return a && null !== a.link ? (a = this.graph.links[a.link]) ? this.graph.getNodeById(a.origin_id) : null : null; }; - h.prototype.getInputOrProperty = function(a) { + m.prototype.getInputOrProperty = function(a) { if (!this.inputs || !this.inputs.length) { return this.properties ? this.properties[a] : null; } @@ -1200,16 +1200,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return this.properties[a]; }; - h.prototype.getOutputData = function(a) { + m.prototype.getOutputData = function(a) { return !this.outputs || a >= this.outputs.length ? null : this.outputs[a]._data; }; - h.prototype.getOutputInfo = function(a) { + m.prototype.getOutputInfo = function(a) { return this.outputs ? a < this.outputs.length ? this.outputs[a] : null : null; }; - h.prototype.isOutputConnected = function(a) { + m.prototype.isOutputConnected = function(a) { return this.outputs ? a < this.outputs.length && this.outputs[a].links && this.outputs[a].links.length : !1; }; - h.prototype.isAnyOutputConnected = function() { + m.prototype.isAnyOutputConnected = function() { if (!this.outputs) { return !1; } @@ -1220,7 +1220,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !1; }; - h.prototype.getOutputNodes = function(a) { + m.prototype.getOutputNodes = function(a) { if (!this.outputs || 0 == this.outputs.length || a >= this.outputs.length) { return null; } @@ -1234,27 +1234,27 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return b; }; - h.prototype.trigger = function(a, b) { + m.prototype.trigger = function(a, b) { if (this.outputs && this.outputs.length) { - this.graph && (this.graph._last_trigger_time = g.getTime()); + this.graph && (this.graph._last_trigger_time = l.getTime()); for (var c = 0; c < this.outputs.length; ++c) { var e = this.outputs[c]; - !e || e.type !== g.EVENT || a && e.name != a || this.triggerSlot(c, b); + !e || e.type !== l.EVENT || a && e.name != a || this.triggerSlot(c, b); } } }; - h.prototype.triggerSlot = function(a, b, c) { + m.prototype.triggerSlot = function(a, b, c) { if (this.outputs && (a = this.outputs[a]) && (a = a.links) && a.length) { - this.graph && (this.graph._last_trigger_time = g.getTime()); + this.graph && (this.graph._last_trigger_time = l.getTime()); for (var e = 0; e < a.length; ++e) { var f = a[e]; if (null == c || c == f) { - var l = this.graph.links[a[e]]; - if (l && (l._last_time = g.getTime(), f = this.graph.getNodeById(l.target_id))) { - if (l = f.inputs[l.target_slot], f.onAction) { - f.onAction(l.name, b); + var k = this.graph.links[a[e]]; + if (k && (k._last_time = l.getTime(), f = this.graph.getNodeById(k.target_id))) { + if (k = f.inputs[k.target_slot], f.onAction) { + f.onAction(k.name, b); } else { - if (f.mode === g.ON_TRIGGER && f.onExecute) { + if (f.mode === l.ON_TRIGGER && f.onExecute) { f.onExecute(b); } } @@ -1263,7 +1263,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - h.prototype.clearTriggeredSlot = function(a, b) { + m.prototype.clearTriggeredSlot = function(a, b) { if (this.outputs && (a = this.outputs[a]) && (a = a.links) && a.length) { for (var c = 0; c < a.length; ++c) { var e = a[c]; @@ -1275,7 +1275,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - h.prototype.addProperty = function(a, b, c, e) { + m.prototype.addProperty = function(a, b, c, e) { c = {name:a, type:c, default_value:b}; if (e) { for (var f in e) { @@ -1288,7 +1288,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.properties[a] = b; return c; }; - h.prototype.addOutput = function(a, b, c) { + m.prototype.addOutput = function(a, b, c) { a = {name:a, type:b, links:null}; if (c) { for (var e in c) { @@ -1304,7 +1304,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setDirtyCanvas(!0, !0); return a; }; - h.prototype.addOutputs = function(a) { + m.prototype.addOutputs = function(a) { for (var b = 0; b < a.length; ++b) { var c = a[b], e = {name:c[0], type:c[1], link:null}; if (a[2]) { @@ -1321,7 +1321,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.size = this.computeSize(); this.setDirtyCanvas(!0, !0); }; - h.prototype.removeOutput = function(a) { + m.prototype.removeOutput = function(a) { this.disconnectOutput(a); this.outputs.splice(a, 1); for (var b = a; b < this.outputs.length; ++b) { @@ -1338,7 +1338,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.setDirtyCanvas(!0, !0); }; - h.prototype.addInput = function(a, b, c) { + m.prototype.addInput = function(a, b, c) { a = {name:a, type:b || 0, link:null}; if (c) { for (var e in c) { @@ -1354,7 +1354,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setDirtyCanvas(!0, !0); return a; }; - h.prototype.addInputs = function(a) { + m.prototype.addInputs = function(a) { for (var b = 0; b < a.length; ++b) { var c = a[b], e = {name:c[0], type:c[1], link:null}; if (a[2]) { @@ -1371,7 +1371,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.size = this.computeSize(); this.setDirtyCanvas(!0, !0); }; - h.prototype.removeInput = function(a) { + m.prototype.removeInput = function(a) { this.disconnectInput(a); this.inputs.splice(a, 1); for (var b = a; b < this.inputs.length; ++b) { @@ -1386,45 +1386,45 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.setDirtyCanvas(!0, !0); }; - h.prototype.addConnection = function(a, b, c, e) { + m.prototype.addConnection = function(a, b, c, e) { a = {name:a, type:b, pos:c, direction:e, links:null}; this.connections.push(a); return a; }; - h.prototype.computeSize = function(a, b) { + m.prototype.computeSize = function(a, b) { function c(a) { return a ? e * a.length * 0.6 : 0; } a = Math.max(this.inputs ? this.inputs.length : 1, this.outputs ? this.outputs.length : 1); b = b || new Float32Array([0, 0]); a = Math.max(a, 1); - var e = g.NODE_TEXT_SIZE; + var e = l.NODE_TEXT_SIZE; b[1] = (this.constructor.slot_start_y || 0) + a * (e + 1) + 4; - this.widgets && this.widgets.length && (b[1] += this.widgets.length * (g.NODE_WIDGET_HEIGHT + 4) + 8); + this.widgets && this.widgets.length && (b[1] += this.widgets.length * (l.NODE_WIDGET_HEIGHT + 4) + 8); a = c(this.title); - var f = 0, l = 0; + var f = 0, k = 0; if (this.inputs) { - for (var p = 0, d = this.inputs.length; p < d; ++p) { - var n = this.inputs[p]; - n = n.label || n.name || ""; - n = c(n); - f < n && (f = n); + for (var n = 0, h = this.inputs.length; n < h; ++n) { + var p = this.inputs[n]; + p = p.label || p.name || ""; + p = c(p); + f < p && (f = p); } } if (this.outputs) { - for (p = 0, d = this.outputs.length; p < d; ++p) { - n = this.outputs[p], n = n.label || n.name || "", n = c(n), l < n && (l = n); + for (n = 0, h = this.outputs.length; n < h; ++n) { + p = this.outputs[n], p = p.label || p.name || "", p = c(p), k < p && (k = p); } } - b[0] = Math.max(f + l + 10, a); - b[0] = Math.max(b[0], g.NODE_WIDTH); - this.widgets && this.widgets.length && (b[0] = Math.max(b[0], 1.5 * g.NODE_WIDTH)); + b[0] = Math.max(f + k + 10, a); + b[0] = Math.max(b[0], l.NODE_WIDTH); + this.widgets && this.widgets.length && (b[0] = Math.max(b[0], 1.5 * l.NODE_WIDTH)); if (this.onResize) { this.onResize(b); } return b; }; - h.prototype.addWidget = function(a, b, c, e, f) { + m.prototype.addWidget = function(a, b, c, e, f) { this.widgets || (this.widgets = []); b = {type:a.toLowerCase(), name:b, value:c, callback:e, options:f || {}}; void 0 !== b.options.y && (b.y = b.options.y); @@ -1435,28 +1435,28 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.widgets.push(b); return b; }; - h.prototype.addCustomWidget = function(a) { + m.prototype.addCustomWidget = function(a) { this.widgets || (this.widgets = []); this.widgets.push(a); return a; }; - h.prototype.getBounding = function(a) { + m.prototype.getBounding = function(a) { a = a || new Float32Array(4); a[0] = this.pos[0] - 4; - a[1] = this.pos[1] - g.NODE_TITLE_HEIGHT; + a[1] = this.pos[1] - l.NODE_TITLE_HEIGHT; a[2] = this.size[0] + 4; - a[3] = this.size[1] + g.NODE_TITLE_HEIGHT; + a[3] = this.size[1] + l.NODE_TITLE_HEIGHT; if (this.onBounding) { this.onBounding(a); } return a; }; - h.prototype.isPointInside = function(a, b, c, e) { + m.prototype.isPointInside = function(a, b, c, e) { c = c || 0; var f = this.graph && this.graph.isLive() ? 0 : 20; e && (f = 0); if (this.flags && this.flags.collapsed) { - if (t(a, b, this.pos[0] - c, this.pos[1] - g.NODE_TITLE_HEIGHT - c, (this._collapsed_width || g.NODE_COLLAPSED_WIDTH) + 2 * c, g.NODE_TITLE_HEIGHT + 2 * c)) { + if (t(a, b, this.pos[0] - c, this.pos[1] - l.NODE_TITLE_HEIGHT - c, (this._collapsed_width || l.NODE_COLLAPSED_WIDTH) + 2 * c, l.NODE_TITLE_HEIGHT + 2 * c)) { return !0; } } else { @@ -1466,27 +1466,27 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !1; }; - h.prototype.getSlotInPosition = function(a, b) { + m.prototype.getSlotInPosition = function(a, b) { var c = new Float32Array(2); if (this.inputs) { for (var e = 0, f = this.inputs.length; e < f; ++e) { - var l = this.inputs[e]; + var k = this.inputs[e]; this.getConnectionPos(!0, e, c); if (t(a, b, c[0] - 10, c[1] - 5, 20, 10)) { - return {input:l, slot:e, link_pos:c, locked:l.locked}; + return {input:k, slot:e, link_pos:c, locked:k.locked}; } } } if (this.outputs) { for (e = 0, f = this.outputs.length; e < f; ++e) { - if (l = this.outputs[e], this.getConnectionPos(!1, e, c), t(a, b, c[0] - 10, c[1] - 5, 20, 10)) { - return {output:l, slot:e, link_pos:c, locked:l.locked}; + if (k = this.outputs[e], this.getConnectionPos(!1, e, c), t(a, b, c[0] - 10, c[1] - 5, 20, 10)) { + return {output:k, slot:e, link_pos:c, locked:k.locked}; } } } return null; }; - h.prototype.findInputSlot = function(a) { + m.prototype.findInputSlot = function(a) { if (!this.inputs) { return -1; } @@ -1497,7 +1497,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return -1; }; - h.prototype.findOutputSlot = function(a) { + m.prototype.findOutputSlot = function(a) { if (!this.outputs) { return -1; } @@ -1508,18 +1508,18 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return -1; }; - h.prototype.connect = function(a, b, c) { + m.prototype.connect = function(a, b, c) { c = c || 0; if (!this.graph) { return console.log("Connect: Error, node doesnt belong to any graph. Nodes must be added first to a graph before connecting them."), null; } if (a.constructor === String) { if (a = this.findOutputSlot(a), -1 == a) { - return g.debug && console.log("Connect: Error, no slot of name " + a), null; + return l.debug && console.log("Connect: Error, no slot of name " + a), null; } } else { if (!this.outputs || a >= this.outputs.length) { - return g.debug && console.log("Connect: Error, slot number not found"), null; + return l.debug && console.log("Connect: Error, slot number not found"), null; } } b && b.constructor === Number && (b = this.graph.getNodeById(b)); @@ -1531,14 +1531,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } if (c.constructor === String) { if (c = b.findInputSlot(c), -1 == c) { - return g.debug && console.log("Connect: Error, no slot of name " + c), null; + return l.debug && console.log("Connect: Error, no slot of name " + c), null; } } else { - if (c === g.EVENT) { + if (c === l.EVENT) { return null; } if (!b.inputs || c >= b.inputs.length) { - return g.debug && console.log("Connect: Error, slot number not found"), null; + return l.debug && console.log("Connect: Error, slot number not found"), null; } } null != b.inputs[c].link && b.disconnectInput(c); @@ -1546,34 +1546,34 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (b.onConnectInput && !1 === b.onConnectInput(c, e.type, e)) { return null; } - var f = b.inputs[c], l = null; - if (g.isValidConnection(e.type, f.type)) { - l = {id:this.graph.last_link_id++, type:f.type, origin_id:this.id, origin_slot:a, target_id:b.id, target_slot:c}; - this.graph.links[l.id] = l; + var f = b.inputs[c], k = null; + if (l.isValidConnection(e.type, f.type)) { + k = {id:this.graph.last_link_id++, type:f.type, origin_id:this.id, origin_slot:a, target_id:b.id, target_slot:c}; + this.graph.links[k.id] = k; null == e.links && (e.links = []); - e.links.push(l.id); - b.inputs[c].link = l.id; + e.links.push(k.id); + b.inputs[c].link = k.id; this.graph && this.graph._version++; if (this.onConnectionsChange) { - this.onConnectionsChange(g.OUTPUT, a, !0, l, e); + this.onConnectionsChange(l.OUTPUT, a, !0, k, e); } if (b.onConnectionsChange) { - b.onConnectionsChange(g.INPUT, c, !0, l, f); + b.onConnectionsChange(l.INPUT, c, !0, k, f); } - this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(g.INPUT, b, c, this, a), this.graph.onNodeConnectionChange(g.OUTPUT, this, a, b, c)); + this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(l.INPUT, b, c, this, a), this.graph.onNodeConnectionChange(l.OUTPUT, this, a, b, c)); } this.setDirtyCanvas(!1, !0); - this.graph.connectionChange(this, l); - return l; + this.graph.connectionChange(this, k); + return k; }; - h.prototype.disconnectOutput = function(a, b) { + m.prototype.disconnectOutput = function(a, b) { if (a.constructor === String) { if (a = this.findOutputSlot(a), -1 == a) { - return g.debug && console.log("Connect: Error, no slot of name " + a), !1; + return l.debug && console.log("Connect: Error, no slot of name " + a), !1; } } else { if (!this.outputs || a >= this.outputs.length) { - return g.debug && console.log("Connect: Error, slot number not found"), !1; + return l.debug && console.log("Connect: Error, slot number not found"), !1; } } var c = this.outputs[a]; @@ -1586,47 +1586,47 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { throw "Target Node not found"; } for (var e = 0, f = c.links.length; e < f; e++) { - var l = c.links[e], p = this.graph.links[l]; - if (p.target_id == b.id) { + var k = c.links[e], n = this.graph.links[k]; + if (n.target_id == b.id) { c.links.splice(e, 1); - var d = b.inputs[p.target_slot]; - d.link = null; - delete this.graph.links[l]; + var h = b.inputs[n.target_slot]; + h.link = null; + delete this.graph.links[k]; this.graph && this.graph._version++; if (b.onConnectionsChange) { - b.onConnectionsChange(g.INPUT, p.target_slot, !1, p, d); + b.onConnectionsChange(l.INPUT, n.target_slot, !1, n, h); } if (this.onConnectionsChange) { - this.onConnectionsChange(g.OUTPUT, a, !1, p, c); + this.onConnectionsChange(l.OUTPUT, a, !1, n, c); } if (this.graph && this.graph.onNodeConnectionChange) { - this.graph.onNodeConnectionChange(g.OUTPUT, this, a); + this.graph.onNodeConnectionChange(l.OUTPUT, this, a); } - this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(g.OUTPUT, this, a), this.graph.onNodeConnectionChange(g.INPUT, b, p.target_slot)); + this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(l.OUTPUT, this, a), this.graph.onNodeConnectionChange(l.INPUT, b, n.target_slot)); break; } } } else { e = 0; for (f = c.links.length; e < f; e++) { - if (l = c.links[e], p = this.graph.links[l]) { - b = this.graph.getNodeById(p.target_id); + if (k = c.links[e], n = this.graph.links[k]) { + b = this.graph.getNodeById(n.target_id); this.graph && this.graph._version++; if (b) { - d = b.inputs[p.target_slot]; - d.link = null; + h = b.inputs[n.target_slot]; + h.link = null; if (b.onConnectionsChange) { - b.onConnectionsChange(g.INPUT, p.target_slot, !1, p, d); + b.onConnectionsChange(l.INPUT, n.target_slot, !1, n, h); } if (this.graph && this.graph.onNodeConnectionChange) { - this.graph.onNodeConnectionChange(g.INPUT, b, p.target_slot); + this.graph.onNodeConnectionChange(l.INPUT, b, n.target_slot); } } - delete this.graph.links[l]; + delete this.graph.links[k]; if (this.onConnectionsChange) { - this.onConnectionsChange(g.OUTPUT, a, !1, p, c); + this.onConnectionsChange(l.OUTPUT, a, !1, n, c); } - this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(g.OUTPUT, this, a), this.graph.onNodeConnectionChange(g.INPUT, b, p.target_slot)); + this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(l.OUTPUT, this, a), this.graph.onNodeConnectionChange(l.INPUT, b, n.target_slot)); } } c.links = null; @@ -1635,14 +1635,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.graph.connectionChange(this); return !0; }; - h.prototype.disconnectInput = function(a) { + m.prototype.disconnectInput = function(a) { if (a.constructor === String) { if (a = this.findInputSlot(a), -1 == a) { - return g.debug && console.log("Connect: Error, no slot of name " + a), !1; + return l.debug && console.log("Connect: Error, no slot of name " + a), !1; } } else { if (!this.inputs || a >= this.inputs.length) { - return g.debug && console.log("Connect: Error, slot number not found"), !1; + return l.debug && console.log("Connect: Error, slot number not found"), !1; } } var b = this.inputs[a]; @@ -1657,37 +1657,37 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (!f) { return !1; } - var l = f.outputs[e.origin_slot]; - if (!l || !l.links || 0 == l.links.length) { + var k = f.outputs[e.origin_slot]; + if (!k || !k.links || 0 == k.links.length) { return !1; } - for (var p = 0, d = l.links.length; p < d; p++) { - if (l.links[p] == c) { - l.links.splice(p, 1); + for (var n = 0, h = k.links.length; n < h; n++) { + if (k.links[n] == c) { + k.links.splice(n, 1); break; } } delete this.graph.links[c]; this.graph && this.graph._version++; if (this.onConnectionsChange) { - this.onConnectionsChange(g.INPUT, a, !1, e, b); + this.onConnectionsChange(l.INPUT, a, !1, e, b); } if (f.onConnectionsChange) { - f.onConnectionsChange(g.OUTPUT, p, !1, e, l); + f.onConnectionsChange(l.OUTPUT, n, !1, e, k); } - this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(g.OUTPUT, f, p), this.graph.onNodeConnectionChange(g.INPUT, this, a)); + this.graph && this.graph.onNodeConnectionChange && (this.graph.onNodeConnectionChange(l.OUTPUT, f, n), this.graph.onNodeConnectionChange(l.INPUT, this, a)); } this.setDirtyCanvas(!1, !0); this.graph.connectionChange(this); return !0; }; - h.prototype.getConnectionPos = function(a, b, c) { + m.prototype.getConnectionPos = function(a, b, c) { c = c || new Float32Array(2); var e = 0; a && this.inputs && (e = this.inputs.length); !a && this.outputs && (e = this.outputs.length); if (this.flags.collapsed) { - return b = this._collapsed_width || g.NODE_COLLAPSED_WIDTH, this.flags.horizontal ? (c[0] = this.pos[0] + 0.5 * b, c[1] = a ? this.pos[1] - g.NODE_TITLE_HEIGHT : this.pos[1]) : (c[0] = a ? this.pos[0] : this.pos[0] + b, c[1] = this.pos[1] - 0.5 * g.NODE_TITLE_HEIGHT), c; + return b = this._collapsed_width || l.NODE_COLLAPSED_WIDTH, this.flags.horizontal ? (c[0] = this.pos[0] + 0.5 * b, c[1] = a ? this.pos[1] - l.NODE_TITLE_HEIGHT : this.pos[1]) : (c[0] = a ? this.pos[0] : this.pos[0] + b, c[1] = this.pos[1] - 0.5 * l.NODE_TITLE_HEIGHT), c; } if (a && -1 == b) { return c[0] = this.pos[0] + 10, c[1] = this.pos[1] + 10, c; @@ -1699,28 +1699,28 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return c[0] = this.pos[0] + this.outputs[b].pos[0], c[1] = this.pos[1] + this.outputs[b].pos[1], c; } if (this.flags.horizontal) { - return c[0] = this.pos[0] + this.size[0] / e * (b + 0.5), c[1] = a ? this.pos[1] - g.NODE_TITLE_HEIGHT : this.pos[1] + this.size[1], c; + return c[0] = this.pos[0] + this.size[0] / e * (b + 0.5), c[1] = a ? this.pos[1] - l.NODE_TITLE_HEIGHT : this.pos[1] + this.size[1], c; } c[0] = a ? this.pos[0] : this.pos[0] + this.size[0] + 1; - c[1] = this.pos[1] + 10 + b * g.NODE_SLOT_HEIGHT + (this.constructor.slot_start_y || 0); + c[1] = this.pos[1] + 10 + b * l.NODE_SLOT_HEIGHT + (this.constructor.slot_start_y || 0); return c; }; - h.prototype.alignToGrid = function() { - this.pos[0] = g.CANVAS_GRID_SIZE * Math.round(this.pos[0] / g.CANVAS_GRID_SIZE); - this.pos[1] = g.CANVAS_GRID_SIZE * Math.round(this.pos[1] / g.CANVAS_GRID_SIZE); + m.prototype.alignToGrid = function() { + this.pos[0] = l.CANVAS_GRID_SIZE * Math.round(this.pos[0] / l.CANVAS_GRID_SIZE); + this.pos[1] = l.CANVAS_GRID_SIZE * Math.round(this.pos[1] / l.CANVAS_GRID_SIZE); }; - h.prototype.trace = function(a) { + m.prototype.trace = function(a) { this.console || (this.console = []); this.console.push(a); - this.console.length > h.MAX_CONSOLE && this.console.shift(); + this.console.length > m.MAX_CONSOLE && this.console.shift(); this.graph.onNodeTrace(this, a); }; - h.prototype.setDirtyCanvas = function(a, b) { + m.prototype.setDirtyCanvas = function(a, b) { this.graph && this.graph.sendActionToCanvas("setDirty", [a, b]); }; - h.prototype.loadImage = function(a) { + m.prototype.loadImage = function(a) { var b = new Image; - b.src = g.node_images_path + a; + b.src = l.node_images_path + a; b.ready = !1; var c = this; b.onload = function() { @@ -1729,7 +1729,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }; return b; }; - h.prototype.captureInput = function(a) { + m.prototype.captureInput = function(a) { if (this.graph && this.graph.list_of_graphcanvas) { for (var b = this.graph.list_of_graphcanvas, c = 0; c < b.length; ++c) { var e = b[c]; @@ -1739,24 +1739,24 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - h.prototype.collapse = function(a) { + m.prototype.collapse = function(a) { this.graph._version++; if (!1 !== this.constructor.collapsable || a) { this.flags.collapsed = this.flags.collapsed ? !1 : !0, this.setDirtyCanvas(!0, !0); } }; - h.prototype.pin = function(a) { + m.prototype.pin = function(a) { this.graph._version++; this.flags.pinned = void 0 === a ? !this.flags.pinned : a; }; - h.prototype.localToScreen = function(a, b, c) { + m.prototype.localToScreen = function(a, b, c) { return [(a + this.pos[0]) * c.scale + c.offset[0], (b + this.pos[1]) * c.scale + c.offset[1]]; }; - v.LGraphGroup = g.LGraphGroup = q; + v.LGraphGroup = l.LGraphGroup = q; q.prototype._ctor = function(a) { this.title = a || "Group"; this.font_size = 24; - this.color = d.node_colors.pale_blue ? d.node_colors.pale_blue.groupcolor : "#AAA"; + this.color = h.node_colors.pale_blue ? h.node_colors.pale_blue.groupcolor : "#AAA"; this._bounding = new Float32Array([10, 10, 140, 80]); this._pos = this._bounding.subarray(0, 2); this._size = this._bounding.subarray(2, 4); @@ -1802,12 +1802,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { w(this._bounding, b) && this._nodes.push(e); } }; - q.prototype.isPointInside = h.prototype.isPointInside; - q.prototype.setDirtyCanvas = h.prototype.setDirtyCanvas; - v.LGraphCanvas = g.LGraphCanvas = d; - d.link_type_colors = {"-1":"#F85", number:"#AAA", node:"#DCA"}; - d.gradients = {}; - d.prototype.clear = function() { + q.prototype.isPointInside = m.prototype.isPointInside; + q.prototype.setDirtyCanvas = m.prototype.setDirtyCanvas; + v.LGraphCanvas = l.LGraphCanvas = h; + h.link_type_colors = {"-1":"#F85", number:"#AAA", node:"#DCA"}; + h.gradients = {}; + h.prototype.clear = function() { this.fps = this.render_time = this.last_draw_time = this.frame = 0; this.scale = 1; this.offset = [0, 0]; @@ -1826,10 +1826,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onClear(); } }; - d.prototype.setGraph = function(a, b) { + h.prototype.setGraph = function(a, b) { this.graph != a && (b || this.clear(), !a && this.graph ? this.graph.detachCanvas(this) : (a.attachCanvas(this), this.setDirty(!0, !0))); }; - d.prototype.openSubgraph = function(a) { + h.prototype.openSubgraph = function(a) { if (!a) { throw "graph cannot be null"; } @@ -1841,7 +1841,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.attachCanvas(this); this.setDirty(!0, !0); }; - d.prototype.closeSubgraph = function() { + h.prototype.closeSubgraph = function() { if (this._graph_stack && 0 != this._graph_stack.length) { var a = this.graph._subgraph_node, b = this._graph_stack.pop(); this.selected_nodes = {}; @@ -1851,13 +1851,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a && (this.centerOnNode(a), this.selectNodes([a])); } }; - d.prototype.setCanvas = function(a, b) { + h.prototype.setCanvas = function(a, b) { if (a && a.constructor === String && (a = document.getElementById(a), !a)) { throw "Error creating LiteGraph canvas: Canvas not found"; } if (a !== this.canvas && (!a && this.canvas && (b || this.unbindEvents()), this.canvas = a)) { a.className += " lgraphcanvas"; a.data = this; + a.tabindex = "1"; this.bgcanvas = null; this.bgcanvas || (this.bgcanvas = document.createElement("canvas"), this.bgcanvas.width = this.canvas.width, this.bgcanvas.height = this.canvas.height); if (null == a.getContext) { @@ -1872,15 +1873,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b || this.bindEvents(); } }; - d.prototype._doNothing = function(a) { + h.prototype._doNothing = function(a) { a.preventDefault(); return !1; }; - d.prototype._doReturnTrue = function(a) { + h.prototype._doReturnTrue = function(a) { a.preventDefault(); return !0; }; - d.prototype.bindEvents = function() { + h.prototype.bindEvents = function() { if (this._events_binded) { console.warn("LGraphCanvas: events already binded"); } else { @@ -1907,7 +1908,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._events_binded = !0; } }; - d.prototype.unbindEvents = function() { + h.prototype.unbindEvents = function() { if (this._events_binded) { var a = this.getCanvasWindow().document; this.canvas.removeEventListener("mousedown", this._mousedown_callback); @@ -1928,31 +1929,31 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { console.warn("LGraphCanvas: no events binded"); } }; - d.getFileExtension = function(a) { + h.getFileExtension = function(a) { var b = a.indexOf("?"); -1 != b && (a = a.substr(0, b)); b = a.lastIndexOf("."); return -1 == b ? "" : a.substr(b + 1).toLowerCase(); }; - d.prototype.enableWebGL = function() { + h.prototype.enableWebGL = function() { this.gl = this.ctx = enableWebGLCanvas(this.canvas); this.ctx.webgl = !0; this.bgcanvas = this.canvas; this.bgctx = this.gl; this.canvas.webgl_enabled = !0; }; - d.prototype.setDirty = function(a, b) { + h.prototype.setDirty = function(a, b) { a && (this.dirty_canvas = !0); b && (this.dirty_bgcanvas = !0); }; - d.prototype.getCanvasWindow = function() { + h.prototype.getCanvasWindow = function() { if (!this.canvas) { return window; } var a = this.canvas.ownerDocument; return a.defaultView || a.parentWindow; }; - d.prototype.startRendering = function() { + h.prototype.startRendering = function() { function a() { this.pause_rendering || this.draw(); var b = this.getCanvasWindow(); @@ -1960,25 +1961,26 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.is_rendering || (this.is_rendering = !0, a.call(this)); }; - d.prototype.stopRendering = function() { + h.prototype.stopRendering = function() { this.is_rendering = !1; }; - d.prototype.processMouseDown = function(a) { + h.prototype.processMouseDown = function(a) { if (this.graph) { this.adjustMouseEvent(a); var b = this.getCanvasWindow(); - d.active_canvas = this; + h.active_canvas = this; this.canvas.removeEventListener("mousemove", this._mousemove_callback); b.document.addEventListener("mousemove", this._mousemove_callback, !0); b.document.addEventListener("mouseup", this._mouseup_callback, !0); - var c = this.graph.getNodeOnPos(a.canvasX, a.canvasY, this.visible_nodes, 5), e = !1, f = 300 > g.getTime() - this.last_mouseclick; + var c = this.graph.getNodeOnPos(a.canvasX, a.canvasY, this.visible_nodes, 5), e = !1, f = 300 > l.getTime() - this.last_mouseclick; this.canvas_mouse[0] = a.canvasX; this.canvas_mouse[1] = a.canvasY; - g.closeAllContextMenus(b); + this.canvas.focus(); + l.closeAllContextMenus(b); if (!this.onMouse || 1 != this.onMouse(a)) { if (1 == a.which) { a.ctrlKey && (this.dragging_rectangle = new Float32Array(4), this.dragging_rectangle[0] = a.canvasX, this.dragging_rectangle[1] = a.canvasY, this.dragging_rectangle[2] = 1, this.dragging_rectangle[3] = 1, e = !0); - var l = !1; + var k = !1; if (c && this.allow_interaction && !e) { this.live_mode || c.flags.pinned || this.bringToFront(c); if (!this.connecting_node && !c.flags.collapsed && !this.live_mode) { @@ -1986,21 +1988,21 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.resizing_node = c, this.canvas.style.cursor = "se-resize", e = !0; } else { if (c.outputs) { - for (var p = 0, n = c.outputs.length; p < n; ++p) { - var k = c.outputs[p], m = c.getConnectionPos(!1, p); - if (t(a.canvasX, a.canvasY, m[0] - 15, m[1] - 10, 30, 20)) { + for (var n = 0, p = c.outputs.length; n < p; ++n) { + var d = c.outputs[n], g = c.getConnectionPos(!1, n); + if (t(a.canvasX, a.canvasY, g[0] - 15, g[1] - 10, 30, 20)) { this.connecting_node = c; - this.connecting_output = k; - this.connecting_pos = c.getConnectionPos(!1, p); - this.connecting_slot = p; - a.shiftKey && c.disconnectOutput(p); + this.connecting_output = d; + this.connecting_pos = c.getConnectionPos(!1, n); + this.connecting_slot = n; + a.shiftKey && c.disconnectOutput(n); if (f) { if (c.onOutputDblClick) { - c.onOutputDblClick(p, a); + c.onOutputDblClick(n, a); } } else { if (c.onOutputClick) { - c.onOutputClick(p, a); + c.onOutputClick(n, a); } } e = !0; @@ -2009,20 +2011,20 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } if (c.inputs) { - for (p = 0, n = c.inputs.length; p < n; ++p) { - if (k = c.inputs[p], m = c.getConnectionPos(!0, p), t(a.canvasX, a.canvasY, m[0] - 15, m[1] - 10, 30, 20)) { + for (n = 0, p = c.inputs.length; n < p; ++n) { + if (d = c.inputs[n], g = c.getConnectionPos(!0, n), t(a.canvasX, a.canvasY, g[0] - 15, g[1] - 10, 30, 20)) { if (f) { if (c.onInputDblClick) { - c.onInputDblClick(p, a); + c.onInputDblClick(n, a); } } else { if (c.onInputClick) { - c.onInputClick(p, a); + c.onInputClick(n, a); } } - if (null !== k.link) { - e = this.graph.links[k.link]; - c.disconnectInput(p); + if (null !== d.link) { + e = this.graph.links[d.link]; + c.disconnectInput(n); if (this.allow_reconnect_links || a.shiftKey) { this.connecting_node = this.graph._nodes_by_id[e.origin_id], this.connecting_slot = e.origin_slot, this.connecting_output = this.connecting_node.outputs[this.connecting_slot], this.connecting_pos = this.connecting_node.getConnectionPos(!1, this.connecting_slot); } @@ -2033,33 +2035,33 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } } - !e && t(a.canvasX, a.canvasY, c.pos[0], c.pos[1] - g.NODE_TITLE_HEIGHT, g.NODE_TITLE_HEIGHT, g.NODE_TITLE_HEIGHT) && (c.collapse(), e = !0); + !e && t(a.canvasX, a.canvasY, c.pos[0], c.pos[1] - l.NODE_TITLE_HEIGHT, l.NODE_TITLE_HEIGHT, l.NODE_TITLE_HEIGHT) && (c.collapse(), e = !0); if (!e) { - p = !1; - if (n = this.processNodeWidgets(c, this.canvas_mouse, a)) { - p = !0, this.node_widget = [c, n]; + n = !1; + if (p = this.processNodeWidgets(c, this.canvas_mouse, a)) { + n = !0, this.node_widget = [c, p]; } if (f && this.selected_nodes[c.id]) { if (c.onDblClick) { c.onDblClick(a, [a.canvasX - c.pos[0], a.canvasY - c.pos[1]], this); } this.processNodeDblClicked(c); - p = !0; + n = !0; } - c.onMouseDown && c.onMouseDown(a, [a.canvasX - c.pos[0], a.canvasY - c.pos[1]], this) ? p = !0 : this.live_mode && (p = l = !0); - p || (this.allow_dragnodes && (this.node_dragged = c), this.selected_nodes[c.id] || this.processNodeSelected(c, a)); + c.onMouseDown && c.onMouseDown(a, [a.canvasX - c.pos[0], a.canvasY - c.pos[1]], this) ? n = !0 : this.live_mode && (n = k = !0); + n || (this.allow_dragnodes && (this.node_dragged = c), this.selected_nodes[c.id] || this.processNodeSelected(c, a)); this.dirty_canvas = !0; } } else { - this.selected_group = this.graph.getGroupOnPos(a.canvasX, a.canvasY), this.selected_group_resizing = !1, this.selected_group && (a.ctrlKey && (this.dragging_rectangle = null), 10 > u([a.canvasX, a.canvasY], [this.selected_group.pos[0] + this.selected_group.size[0], this.selected_group.pos[1] + this.selected_group.size[1]]) * this.scale ? this.selected_group_resizing = !0 : this.selected_group.recomputeInsideNodes()), f && this.showSearchBox(a), l = !0; + this.selected_group = this.graph.getGroupOnPos(a.canvasX, a.canvasY), this.selected_group_resizing = !1, this.selected_group && (a.ctrlKey && (this.dragging_rectangle = null), 10 > u([a.canvasX, a.canvasY], [this.selected_group.pos[0] + this.selected_group.size[0], this.selected_group.pos[1] + this.selected_group.size[1]]) * this.scale ? this.selected_group_resizing = !0 : this.selected_group.recomputeInsideNodes()), f && this.showSearchBox(a), k = !0; } - !e && l && this.allow_dragcanvas && (this.dragging_canvas = !0); + !e && k && this.allow_dragcanvas && (this.dragging_canvas = !0); } else { 2 != a.which && 3 == a.which && this.processContextMenu(c, a); } this.last_mouse[0] = a.localX; this.last_mouse[1] = a.localY; - this.last_mouseclick = g.getTime(); + this.last_mouseclick = l.getTime(); this.last_mouse_dragging = !0; this.graph.change(); (!b.document.activeElement || "input" != b.document.activeElement.nodeName.toLowerCase() && "textarea" != b.document.activeElement.nodeName.toLowerCase()) && a.preventDefault(); @@ -2071,10 +2073,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - d.prototype.processMouseMove = function(a) { + h.prototype.processMouseMove = function(a) { this.autoresize && this.resize(); if (this.graph) { - d.active_canvas = this; + h.active_canvas = this; this.adjustMouseEvent(a); var b = [a.localX, a.localY], c = [b[0] - this.last_mouse[0], b[1] - this.last_mouse[1]]; this.last_mouse = b; @@ -2113,8 +2115,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { e.onMouseMove(a, [a.canvasX - e.pos[0], a.canvasY - e.pos[1]], this); } if (this.connecting_node && (f = this._highlight_input || [0, 0], !this.isOverNodeBox(e, a.canvasX, a.canvasY))) { - var l = this.isOverNodeInput(e, a.canvasX, a.canvasY, f); - -1 != l && e.inputs[l] ? g.isValidConnection(this.connecting_output.type, e.inputs[l].type) && (this._highlight_input = f) : this._highlight_input = null; + var k = this.isOverNodeInput(e, a.canvasX, a.canvasY, f); + -1 != k && e.inputs[k] ? l.isValidConnection(this.connecting_output.type, e.inputs[k].type) && (this._highlight_input = f) : this._highlight_input = null; } this.canvas && (t(a.canvasX, a.canvasY, e.pos[0] + e.size[0] - 5, e.pos[1] + e.size[1] - 5, 5, 5) ? this.canvas.style.cursor = "se-resize" : this.canvas.style.cursor = ""); } else { @@ -2129,8 +2131,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.dirty_bgcanvas = this.dirty_canvas = !0; } - this.resizing_node && !this.live_mode && (this.resizing_node.size[0] = a.canvasX - this.resizing_node.pos[0], this.resizing_node.size[1] = a.canvasY - this.resizing_node.pos[1], c = Math.max(this.resizing_node.inputs ? this.resizing_node.inputs.length : 0, this.resizing_node.outputs ? this.resizing_node.outputs.length : 0) * g.NODE_SLOT_HEIGHT + (this.resizing_node.widgets ? this.resizing_node.widgets.length : 0) * (g.NODE_WIDGET_HEIGHT + 4) + 4, this.resizing_node.size[1] < c && (this.resizing_node.size[1] = - c), this.resizing_node.size[0] < g.NODE_MIN_WIDTH && (this.resizing_node.size[0] = g.NODE_MIN_WIDTH), this.canvas.style.cursor = "se-resize", this.dirty_bgcanvas = this.dirty_canvas = !0); + this.resizing_node && !this.live_mode && (this.resizing_node.size[0] = a.canvasX - this.resizing_node.pos[0], this.resizing_node.size[1] = a.canvasY - this.resizing_node.pos[1], c = Math.max(this.resizing_node.inputs ? this.resizing_node.inputs.length : 0, this.resizing_node.outputs ? this.resizing_node.outputs.length : 0) * l.NODE_SLOT_HEIGHT + (this.resizing_node.widgets ? this.resizing_node.widgets.length : 0) * (l.NODE_WIDGET_HEIGHT + 4) + 4, this.resizing_node.size[1] < c && (this.resizing_node.size[1] = + c), this.resizing_node.size[0] < l.NODE_MIN_WIDTH && (this.resizing_node.size[0] = l.NODE_MIN_WIDTH), this.canvas.style.cursor = "se-resize", this.dirty_bgcanvas = this.dirty_canvas = !0); } } } @@ -2139,15 +2141,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return !1; } }; - d.prototype.processMouseUp = function(a) { + h.prototype.processMouseUp = function(a) { if (this.graph) { var b = this.getCanvasWindow().document; - d.active_canvas = this; + h.active_canvas = this; b.removeEventListener("mousemove", this._mousemove_callback, !0); this.canvas.addEventListener("mousemove", this._mousemove_callback, !0); b.removeEventListener("mouseup", this._mouseup_callback, !0); this.adjustMouseEvent(a); - b = g.getTime(); + b = l.getTime(); a.click_time = b - this.last_mouseclick; this.last_mouse_dragging = !1; if (1 == a.which) { @@ -2157,14 +2159,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b = this.graph._nodes; var c = new Float32Array(4); this.deselectAllNodes(); - var e = Math.abs(this.dragging_rectangle[2]), f = Math.abs(this.dragging_rectangle[3]), l = 0 > this.dragging_rectangle[3] ? this.dragging_rectangle[1] - f : this.dragging_rectangle[1]; + var e = Math.abs(this.dragging_rectangle[2]), f = Math.abs(this.dragging_rectangle[3]), k = 0 > this.dragging_rectangle[3] ? this.dragging_rectangle[1] - f : this.dragging_rectangle[1]; this.dragging_rectangle[0] = 0 > this.dragging_rectangle[2] ? this.dragging_rectangle[0] - e : this.dragging_rectangle[0]; - this.dragging_rectangle[1] = l; + this.dragging_rectangle[1] = k; this.dragging_rectangle[2] = e; this.dragging_rectangle[3] = f; f = []; - for (l = 0; l < b.length; ++l) { - e = b[l], e.getBounding(c), w(this.dragging_rectangle, c) && f.push(e); + for (k = 0; k < b.length; ++k) { + e = b[k], e.getBounding(c), w(this.dragging_rectangle, c) && f.push(e); } f.length && this.selectNodes(f); } @@ -2173,7 +2175,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (this.connecting_node) { this.dirty_bgcanvas = this.dirty_canvas = !0; if (e = this.graph.getNodeOnPos(a.canvasX, a.canvasY, this.visible_nodes)) { - this.connecting_output.type == g.EVENT && this.isOverNodeBox(e, a.canvasX, a.canvasY) ? this.connecting_node.connect(this.connecting_slot, e, g.EVENT) : (b = this.isOverNodeInput(e, a.canvasX, a.canvasY), -1 != b ? this.connecting_node.connect(this.connecting_slot, e, b) : (b = e.getInputInfo(0), this.connecting_output.type == g.EVENT ? this.connecting_node.connect(this.connecting_slot, e, g.EVENT) : b && !b.link && g.isValidConnection(b.type && this.connecting_output.type) && this.connecting_node.connect(this.connecting_slot, + this.connecting_output.type == l.EVENT && this.isOverNodeBox(e, a.canvasX, a.canvasY) ? this.connecting_node.connect(this.connecting_slot, e, l.EVENT) : (b = this.isOverNodeInput(e, a.canvasX, a.canvasY), -1 != b ? this.connecting_node.connect(this.connecting_slot, e, b) : (b = e.getInputInfo(0), this.connecting_output.type == l.EVENT ? this.connecting_node.connect(this.connecting_slot, e, l.EVENT) : b && !b.link && l.isValidConnection(b.type && this.connecting_output.type) && this.connecting_node.connect(this.connecting_slot, e, 0))); } this.connecting_node = this.connecting_pos = this.connecting_output = null; @@ -2208,7 +2210,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return !1; } }; - d.prototype.processMouseWheel = function(a) { + h.prototype.processMouseWheel = function(a) { if (this.graph && this.allow_dragcanvas) { var b = null != a.wheelDeltaY ? a.wheelDeltaY : -60 * a.detail; this.adjustMouseEvent(a); @@ -2220,22 +2222,22 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return !1; } }; - d.prototype.isOverNodeBox = function(a, b, c) { - var e = g.NODE_TITLE_HEIGHT; + h.prototype.isOverNodeBox = function(a, b, c) { + var e = l.NODE_TITLE_HEIGHT; return t(b, c, a.pos[0] + 2, a.pos[1] + 2 - e, e - 4, e - 4) ? !0 : !1; }; - d.prototype.isOverNodeInput = function(a, b, c, e) { + h.prototype.isOverNodeInput = function(a, b, c, e) { if (a.inputs) { - for (var f = 0, l = a.inputs.length; f < l; ++f) { - var p = a.getConnectionPos(!0, f); - if (t(b, c, p[0] - 10, p[1] - 5, 20, 10)) { - return e && (e[0] = p[0], e[1] = p[1]), f; + for (var f = 0, k = a.inputs.length; f < k; ++f) { + var n = a.getConnectionPos(!0, f); + if (t(b, c, n[0] - 10, n[1] - 5, 20, 10)) { + return e && (e[0] = n[0], e[1] = n[1]), f; } } } return -1; }; - d.prototype.processKey = function(a) { + h.prototype.processKey = function(a) { if (this.graph) { var b = !1; if ("input" != a.target.localName) { @@ -2263,7 +2265,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - d.prototype.copyToClipboard = function() { + h.prototype.copyToClipboard = function() { var a = {nodes:[], links:[]}, b = 0, c = [], e; for (e in this.selected_nodes) { var f = this.selected_nodes[e]; @@ -2274,22 +2276,22 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { for (e = 0; e < c.length; ++e) { if (f = c[e], a.nodes.push(f.clone().serialize()), f.inputs && f.inputs.length) { for (b = 0; b < f.inputs.length; ++b) { - var l = f.inputs[b]; - if (l && null != l.link && (l = this.graph.links[l.link])) { - var p = this.graph.getNodeById(l.origin_id); - p && this.selected_nodes[p.id] && a.links.push([p._relative_id, b, f._relative_id, l.target_slot]); + var k = f.inputs[b]; + if (k && null != k.link && (k = this.graph.links[k.link])) { + var n = this.graph.getNodeById(k.origin_id); + n && this.selected_nodes[n.id] && a.links.push([n._relative_id, b, f._relative_id, k.target_slot]); } } } } localStorage.setItem("litegrapheditor_clipboard", JSON.stringify(a)); }; - d.prototype.pasteFromClipboard = function() { + h.prototype.pasteFromClipboard = function() { var a = localStorage.getItem("litegrapheditor_clipboard"); if (a) { a = JSON.parse(a); for (var b = [], c = 0; c < a.nodes.length; ++c) { - var e = a.nodes[c], f = g.createNode(e.type); + var e = a.nodes[c], f = l.createNode(e.type); f && (f.configure(e), f.pos[0] += 5, f.pos[1] += 5, this.graph.add(f), b.push(f)); } for (c = 0; c < a.links.length; ++c) { @@ -2298,25 +2300,25 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.selectNodes(b); } }; - d.prototype.processDrop = function(a) { + h.prototype.processDrop = function(a) { a.preventDefault(); this.adjustMouseEvent(a); var b = [a.canvasX, a.canvasY], c = this.graph.getNodeOnPos(b[0], b[1]); if (c) { if ((c.onDropFile || c.onDropData) && (b = a.dataTransfer.files) && b.length) { for (var e = 0; e < b.length; e++) { - var f = a.dataTransfer.files[0], l = f.name; - d.getFileExtension(l); + var f = a.dataTransfer.files[0], k = f.name; + h.getFileExtension(k); if (c.onDropFile) { c.onDropFile(f); } if (c.onDropData) { - var p = new FileReader; - p.onload = function(a) { - c.onDropData(a.target.result, l, f); + var n = new FileReader; + n.onload = function(a) { + c.onDropData(a.target.result, k, f); }; - var g = f.type.split("/")[0]; - "text" == g || "" == g ? p.readAsText(f) : "image" == g ? p.readAsDataURL(f) : p.readAsArrayBuffer(f); + var l = f.type.split("/")[0]; + "text" == l || "" == l ? n.readAsText(f) : "image" == l ? n.readAsDataURL(f) : n.readAsArrayBuffer(f); } } } @@ -2326,17 +2328,17 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.onDropItem && (b = this.onDropItem(event)); b || this.checkDropItem(a); }; - d.prototype.checkDropItem = function(a) { + h.prototype.checkDropItem = function(a) { if (a.dataTransfer.files.length) { - var b = a.dataTransfer.files[0], c = d.getFileExtension(b.name).toLowerCase(); - if (c = g.node_types_by_file_extension[c]) { - if (c = g.createNode(c.type), c.pos = [a.canvasX, a.canvasY], this.graph.add(c), c.onDropFile) { + var b = a.dataTransfer.files[0], c = h.getFileExtension(b.name).toLowerCase(); + if (c = l.node_types_by_file_extension[c]) { + if (c = l.createNode(c.type), c.pos = [a.canvasX, a.canvasY], this.graph.add(c), c.onDropFile) { c.onDropFile(b); } } } }; - d.prototype.processNodeDblClicked = function(a) { + h.prototype.processNodeDblClicked = function(a) { if (this.onShowNodePanel) { this.onShowNodePanel(a); } @@ -2345,31 +2347,31 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.setDirty(!0); }; - d.prototype.processNodeSelected = function(a, b) { + h.prototype.processNodeSelected = function(a, b) { this.selectNode(a, b && b.shiftKey); if (this.onNodeSelected) { this.onNodeSelected(a); } }; - d.prototype.processNodeDeselected = function(a) { + h.prototype.processNodeDeselected = function(a) { this.deselectNode(a); if (this.onNodeDeselected) { this.onNodeDeselected(a); } }; - d.prototype.selectNode = function(a, b) { + h.prototype.selectNode = function(a, b) { null == a ? this.deselectAllNodes() : this.selectNodes([a], b); }; - d.prototype.selectNodes = function(a, b) { + h.prototype.selectNodes = function(a, b) { b || this.deselectAllNodes(); a = a || this.graph._nodes; for (b = 0; b < a.length; ++b) { var c = a[b]; - if (!c.selected) { - if (!c.selected && c.onSelected) { + if (!c.is_selected) { + if (!c.is_selected && c.onSelected) { c.onSelected(); } - c.selected = !0; + c.is_selected = !0; this.selected_nodes[c.id] = c; if (c.inputs) { for (var e = 0; e < c.inputs.length; ++e) { @@ -2380,8 +2382,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { for (e = 0; e < c.outputs.length; ++e) { var f = c.outputs[e]; if (f.links) { - for (var l = 0; l < f.links.length; ++l) { - this.highlighted_links[f.links[l]] = !0; + for (var k = 0; k < f.links.length; ++k) { + this.highlighted_links[f.links[k]] = !0; } } } @@ -2390,12 +2392,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.setDirty(!0); }; - d.prototype.deselectNode = function(a) { - if (a.selected) { + h.prototype.deselectNode = function(a) { + if (a.is_selected) { if (a.onDeselected) { a.onDeselected(); } - a.selected = !1; + a.is_selected = !1; if (a.inputs) { for (var b = 0; b < a.inputs.length; ++b) { delete this.highlighted_links[a.inputs[b].link]; @@ -2413,15 +2415,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - d.prototype.deselectAllNodes = function() { + h.prototype.deselectAllNodes = function() { if (this.graph) { for (var a = this.graph._nodes, b = 0, c = a.length; b < c; ++b) { var e = a[b]; - if (e.selected) { + if (e.is_selected) { if (e.onDeselected) { e.onDeselected(); } - e.selected = !1; + e.is_selected = !1; } } this.selected_nodes = {}; @@ -2429,7 +2431,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setDirty(!0); } }; - d.prototype.deleteSelectedNodes = function() { + h.prototype.deleteSelectedNodes = function() { for (var a in this.selected_nodes) { this.graph.remove(this.selected_nodes[a]); } @@ -2437,12 +2439,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.highlighted_links = {}; this.setDirty(!0); }; - d.prototype.centerOnNode = function(a) { + h.prototype.centerOnNode = function(a) { this.offset[0] = -a.pos[0] - 0.5 * a.size[0] + 0.5 * this.canvas.width / this.scale; this.offset[1] = -a.pos[1] - 0.5 * a.size[1] + 0.5 * this.canvas.height / this.scale; this.setDirty(!0, !0); }; - d.prototype.adjustMouseEvent = function(a) { + h.prototype.adjustMouseEvent = function(a) { if (this.canvas) { var b = this.canvas.getBoundingClientRect(); a.localX = a.pageX - b.left; @@ -2457,7 +2459,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.canvasX = a.localX / this.scale - this.offset[0]; a.canvasY = a.localY / this.scale - this.offset[1]; }; - d.prototype.setZoom = function(a, b) { + h.prototype.setZoom = function(a, b) { !b && this.canvas && (b = [0.5 * this.canvas.width, 0.5 * this.canvas.height]); var c = this.convertOffsetToCanvas(b); this.scale = a; @@ -2468,32 +2470,32 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.offset[1] += c[1]; this.dirty_bgcanvas = this.dirty_canvas = !0; }; - d.prototype.convertOffsetToCanvas = function(a, b) { + h.prototype.convertOffsetToCanvas = function(a, b) { b = b || []; b[0] = a[0] / this.scale - this.offset[0]; b[1] = a[1] / this.scale - this.offset[1]; return b; }; - d.prototype.convertCanvasToOffset = function(a, b) { + h.prototype.convertCanvasToOffset = function(a, b) { b = b || []; b[0] = (a[0] + this.offset[0]) * this.scale; b[1] = (a[1] + this.offset[1]) * this.scale; return b; }; - d.prototype.convertEventToCanvas = function(a) { + h.prototype.convertEventToCanvas = function(a) { var b = this.canvas.getBoundingClientRect(); return this.convertOffsetToCanvas([a.pageX - b.left, a.pageY - b.top]); }; - d.prototype.bringToFront = function(a) { + h.prototype.bringToFront = function(a) { var b = this.graph._nodes.indexOf(a); -1 != b && (this.graph._nodes.splice(b, 1), this.graph._nodes.push(a)); }; - d.prototype.sendToBack = function(a) { + h.prototype.sendToBack = function(a) { var b = this.graph._nodes.indexOf(a); -1 != b && (this.graph._nodes.splice(b, 1), this.graph._nodes.unshift(a)); }; var z = new Float32Array(4); - d.prototype.computeVisibleNodes = function(a, b) { + h.prototype.computeVisibleNodes = function(a, b) { b = b || []; b.length = 0; a = a || this.graph._nodes; @@ -2503,17 +2505,17 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return b; }; - d.prototype.draw = function(a, b) { + h.prototype.draw = function(a, b) { if (this.canvas) { - var c = g.getTime(); + var c = l.getTime(); this.render_time = 0.001 * (c - this.last_draw_time); this.last_draw_time = c; if (this.graph) { - var e = -this.offset[0], f = -this.offset[1], l = e + this.canvas.width / this.scale, p = f + this.canvas.height / this.scale; + var e = -this.offset[0], f = -this.offset[1], k = e + this.canvas.width / this.scale, n = f + this.canvas.height / this.scale; this.visible_area[0] = e; this.visible_area[1] = f; - this.visible_area[2] = l - e; - this.visible_area[3] = p - f; + this.visible_area[2] = k - e; + this.visible_area[3] = n - f; } (this.dirty_bgcanvas || b || this.always_render_background || this.graph && this.graph._last_trigger_time && 1000 > c - this.graph._last_trigger_time) && this.drawBackCanvas(); (this.dirty_canvas || a) && this.drawFrontCanvas(); @@ -2521,7 +2523,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.frame += 1; } }; - d.prototype.drawFrontCanvas = function() { + h.prototype.drawFrontCanvas = function() { this.dirty_canvas = !1; this.ctx || (this.ctx = this.bgcanvas.getContext("2d")); var a = this.ctx; @@ -2554,15 +2556,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (null != this.connecting_pos) { a.lineWidth = this.connections_width; switch(this.connecting_output.type) { - case g.EVENT: - b = g.EVENT_LINK_COLOR; + case l.EVENT: + b = l.EVENT_LINK_COLOR; break; default: - b = g.CONNECTING_LINK_COLOR; + b = l.CONNECTING_LINK_COLOR; } - this.renderLink(a, this.connecting_pos, [this.canvas_mouse[0], this.canvas_mouse[1]], null, !1, null, b, this.connecting_output.dir || (this.connecting_node.flags.horizontal ? g.DOWN : g.RIGHT), g.CENTER); + this.renderLink(a, this.connecting_pos, [this.canvas_mouse[0], this.canvas_mouse[1]], null, !1, null, b, this.connecting_output.dir || (this.connecting_node.flags.horizontal ? l.DOWN : l.RIGHT), l.CENTER); a.beginPath(); - this.connecting_output.type === g.EVENT || this.connecting_output.shape === g.BOX_SHAPE ? a.rect(this.connecting_pos[0] - 6 + 0.5, this.connecting_pos[1] - 5 + 0.5, 14, 10) : a.arc(this.connecting_pos[0], this.connecting_pos[1], 4, 0, 2 * Math.PI); + this.connecting_output.type === l.EVENT || this.connecting_output.shape === l.BOX_SHAPE ? a.rect(this.connecting_pos[0] - 6 + 0.5, this.connecting_pos[1] - 5 + 0.5, 14, 10) : a.arc(this.connecting_pos[0], this.connecting_pos[1], 4, 0, 2 * Math.PI); a.fill(); a.fillStyle = "#ffcc00"; this._highlight_input && (a.beginPath(), a.arc(this._highlight_input[0], this._highlight_input[1], 6, 0, 2 * Math.PI), a.fill()); @@ -2580,7 +2582,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.finish2D && a.finish2D(); } }; - d.prototype.renderInfo = function(a, b, c) { + h.prototype.renderInfo = function(a, b, c) { b = b || 0; c = c || 0; a.save(); @@ -2590,7 +2592,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.graph ? (a.fillText("T: " + this.graph.globaltime.toFixed(2) + "s", 5, 13), a.fillText("I: " + this.graph.iteration, 5, 26), a.fillText("N: " + this.graph._nodes.length + " [" + this.visible_nodes.length + "]", 5, 39), a.fillText("V: " + this.graph._version, 5, 52), a.fillText("FPS:" + this.fps.toFixed(2), 5, 65)) : a.fillText("No graph selected", 5, 13); a.restore(); }; - d.prototype.drawBackCanvas = function() { + h.prototype.drawBackCanvas = function() { var a = this.bgcanvas; if (a.width != this.canvas.width || a.height != this.canvas.height) { a.width = this.canvas.width, a.height = this.canvas.height; @@ -2630,9 +2632,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._bg_img = new Image; this._bg_img.name = this.background_image; this._bg_img.src = this.background_image; - var l = this; + var k = this; this._bg_img.onload = function() { - l.draw(!0, !0); + k.draw(!0, !0); }; } c = null; @@ -2656,10 +2658,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.dirty_bgcanvas = !1; this.dirty_canvas = !0; }; - var n = new Float32Array(2); - d.prototype.drawNode = function(a, b) { + var p = new Float32Array(2); + h.prototype.drawNode = function(a, b) { this.current_node = a; - var c = a.color || a.constructor.color || g.NODE_DEFAULT_COLOR, e = a.bgcolor || a.constructor.bgcolor || g.NODE_DEFAULT_BGCOLOR; + var c = a.color || a.constructor.color || l.NODE_DEFAULT_COLOR, e = a.bgcolor || a.constructor.bgcolor || l.NODE_DEFAULT_BGCOLOR; if (this.live_mode) { if (!a.flags.collapsed && (b.shadowColor = "transparent", a.onDrawForeground)) { a.onDrawForeground(b, this, this.canvas); @@ -2667,84 +2669,84 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } else { var f = this.editor_alpha; b.globalAlpha = f; - this.render_shadows ? (b.shadowColor = g.DEFAULT_SHADOW_COLOR, b.shadowOffsetX = 2 * this.scale, b.shadowOffsetY = 2 * this.scale, b.shadowBlur = 3 * this.scale) : b.shadowColor = "transparent"; + this.render_shadows ? (b.shadowColor = l.DEFAULT_SHADOW_COLOR, b.shadowOffsetX = 2 * this.scale, b.shadowOffsetY = 2 * this.scale, b.shadowBlur = 3 * this.scale) : b.shadowColor = "transparent"; if (!a.flags.collapsed || !a.onDrawCollaped || 1 != a.onDrawCollapsed(b, this)) { - var l = a._shape || g.BOX_SHAPE; - n.set(a.size); - var p = a.horizontal || a.flags.horizontal; + var k = a._shape || l.BOX_SHAPE; + p.set(a.size); + var n = a.horizontal || a.flags.horizontal; if (a.flags.collapsed) { b.font = this.inner_text_font; - var d = a.getTitle ? a.getTitle() : a.title; - a._collapsed_width = Math.min(a.size[0], b.measureText(d).width + 40); - n[0] = a._collapsed_width; - n[1] = 0; + var h = a.getTitle ? a.getTitle() : a.title; + a._collapsed_width = Math.min(a.size[0], b.measureText(h).width + 40); + p[0] = a._collapsed_width; + p[1] = 0; } - a.clip_area && (b.save(), b.beginPath(), l == g.BOX_SHAPE ? b.rect(0, 0, n[0], n[1]) : l == g.ROUND_SHAPE ? b.roundRect(0, 0, n[0], n[1], 10) : l == g.CIRCLE_SHAPE && b.arc(0.5 * n[0], 0.5 * n[1], 0.5 * n[0], 0, 2 * Math.PI), b.clip()); - this.drawNodeShape(a, b, n, c, e, a.selected, a.mouseOver); + a.clip_area && (b.save(), b.beginPath(), k == l.BOX_SHAPE ? b.rect(0, 0, p[0], p[1]) : k == l.ROUND_SHAPE ? b.roundRect(0, 0, p[0], p[1], 10) : k == l.CIRCLE_SHAPE && b.arc(0.5 * p[0], 0.5 * p[1], 0.5 * p[0], 0, 2 * Math.PI), b.clip()); + this.drawNodeShape(a, b, p, c, e, a.is_selected, a.mouseOver); b.shadowColor = "transparent"; - b.textAlign = p ? "center" : "left"; + b.textAlign = n ? "center" : "left"; b.font = this.inner_text_font; e = 0.6 < this.scale; - l = this.connecting_output; + k = this.connecting_output; b.lineWidth = 1; - d = 0; - var k = new Float32Array(2); + h = 0; + var d = new Float32Array(2); if (a.flags.collapsed) { f = e = null; if (a.inputs) { for (c = 0; c < a.inputs.length; c++) { - if (m = a.inputs[c], null != m.link) { - e = m; + if (g = a.inputs[c], null != g.link) { + e = g; break; } } } if (a.outputs) { for (c = 0; c < a.outputs.length; c++) { - m = a.outputs[c], m.links && m.links.length && (f = m); + g = a.outputs[c], g.links && g.links.length && (f = g); } } - e && (c = 0, e = -0.5 * g.NODE_TITLE_HEIGHT, p && (c = 0.5 * a._collapsed_width, e = -g.NODE_TITLE_HEIGHT), b.fillStyle = m.color_on || this.default_connection_color.input_on, b.beginPath(), m.type === g.EVENT || m.shape === g.BOX_SHAPE ? b.rect(c - 7 + 0.5, e + 4 - 0.5 * g.NODE_TITLE_HEIGHT + 0.5, 14, g.NODE_TITLE_HEIGHT - 8) : m.shape === g.ARROW_SHAPE ? (b.moveTo(c + 8, e), b.lineTo(c + -4, e - 4), b.lineTo(c + -4, e + 4), b.closePath()) : b.arc(c, e, 4, 0, 2 * Math.PI), b.fill()); - f && (c = a._collapsed_width, e = -0.5 * g.NODE_TITLE_HEIGHT, p && (c = 0.5 * a._collapsed_width, e = 0), b.fillStyle = m.color_on || this.default_connection_color.output_on, b.strokeStyle = "black", b.beginPath(), m.type === g.EVENT || m.shape === g.BOX_SHAPE ? b.rect(c - 7 + 0.5, e + 4 - 0.5 * g.NODE_TITLE_HEIGHT + 0.5, 14, g.NODE_TITLE_HEIGHT - 8) : m.shape === g.ARROW_SHAPE ? (b.moveTo(c + 6, e), b.lineTo(c - 6, e - 4), b.lineTo(c - 6, e + 4), b.closePath()) : b.arc(c, e, 4, 0, 2 * + e && (c = 0, e = -0.5 * l.NODE_TITLE_HEIGHT, n && (c = 0.5 * a._collapsed_width, e = -l.NODE_TITLE_HEIGHT), b.fillStyle = g.color_on || this.default_connection_color.input_on, b.beginPath(), g.type === l.EVENT || g.shape === l.BOX_SHAPE ? b.rect(c - 7 + 0.5, e + 4 - 0.5 * l.NODE_TITLE_HEIGHT + 0.5, 14, l.NODE_TITLE_HEIGHT - 8) : g.shape === l.ARROW_SHAPE ? (b.moveTo(c + 8, e), b.lineTo(c + -4, e - 4), b.lineTo(c + -4, e + 4), b.closePath()) : b.arc(c, e, 4, 0, 2 * Math.PI), b.fill()); + f && (c = a._collapsed_width, e = -0.5 * l.NODE_TITLE_HEIGHT, n && (c = 0.5 * a._collapsed_width, e = 0), b.fillStyle = g.color_on || this.default_connection_color.output_on, b.strokeStyle = "black", b.beginPath(), g.type === l.EVENT || g.shape === l.BOX_SHAPE ? b.rect(c - 7 + 0.5, e + 4 - 0.5 * l.NODE_TITLE_HEIGHT + 0.5, 14, l.NODE_TITLE_HEIGHT - 8) : g.shape === l.ARROW_SHAPE ? (b.moveTo(c + 6, e), b.lineTo(c - 6, e - 4), b.lineTo(c - 6, e + 4), b.closePath()) : b.arc(c, e, 4, 0, 2 * Math.PI), b.fill(), b.stroke()); } else { if (a.inputs) { for (c = 0; c < a.inputs.length; c++) { - var m = a.inputs[c]; + var g = a.inputs[c]; b.globalAlpha = f; - this.connecting_node && g.isValidConnection(m.type && l.type) && (b.globalAlpha = 0.4 * f); - b.fillStyle = null != m.link ? m.color_on || this.default_connection_color.input_on : m.color_off || this.default_connection_color.input_off; - var x = a.getConnectionPos(!0, c, k); + this.connecting_node && l.isValidConnection(g.type && k.type) && (b.globalAlpha = 0.4 * f); + b.fillStyle = null != g.link ? g.color_on || this.default_connection_color.input_on : g.color_off || this.default_connection_color.input_off; + var x = a.getConnectionPos(!0, c, d); x[0] -= a.pos[0]; x[1] -= a.pos[1]; - d < x[1] + 0.5 * g.NODE_SLOT_HEIGHT && (d = x[1] + 0.5 * g.NODE_SLOT_HEIGHT); + h < x[1] + 0.5 * l.NODE_SLOT_HEIGHT && (h = x[1] + 0.5 * l.NODE_SLOT_HEIGHT); b.beginPath(); - m.type === g.EVENT || m.shape === g.BOX_SHAPE ? p ? b.rect(x[0] - 5 + 0.5, x[1] - 8 + 0.5, 10, 14) : b.rect(x[0] - 6 + 0.5, x[1] - 5 + 0.5, 14, 10) : m.shape === g.ARROW_SHAPE ? (b.moveTo(x[0] + 8, x[1] + 0.5), b.lineTo(x[0] - 4, x[1] + 6 + 0.5), b.lineTo(x[0] - 4, x[1] - 6 + 0.5), b.closePath()) : b.arc(x[0], x[1], 4, 0, 2 * Math.PI); + g.type === l.EVENT || g.shape === l.BOX_SHAPE ? n ? b.rect(x[0] - 5 + 0.5, x[1] - 8 + 0.5, 10, 14) : b.rect(x[0] - 6 + 0.5, x[1] - 5 + 0.5, 14, 10) : g.shape === l.ARROW_SHAPE ? (b.moveTo(x[0] + 8, x[1] + 0.5), b.lineTo(x[0] - 4, x[1] + 6 + 0.5), b.lineTo(x[0] - 4, x[1] - 6 + 0.5), b.closePath()) : b.arc(x[0], x[1], 4, 0, 2 * Math.PI); b.fill(); if (e) { - var h = null != m.label ? m.label : m.name; - h && (b.fillStyle = g.NODE_TEXT_COLOR, p || m.dir == g.UP ? b.fillText(h, x[0], x[1] - 10) : b.fillText(h, x[0] + 10, x[1] + 5)); + var m = null != g.label ? g.label : g.name; + m && (b.fillStyle = l.NODE_TEXT_COLOR, n || g.dir == l.UP ? b.fillText(m, x[0], x[1] - 10) : b.fillText(m, x[0] + 10, x[1] + 5)); } } } this.connecting_node && (b.globalAlpha = 0.4 * f); - b.textAlign = p ? "center" : "right"; + b.textAlign = n ? "center" : "right"; b.strokeStyle = "black"; if (a.outputs) { for (c = 0; c < a.outputs.length; c++) { - if (m = a.outputs[c], x = a.getConnectionPos(!1, c, k), x[0] -= a.pos[0], x[1] -= a.pos[1], d < x[1] + 0.5 * g.NODE_SLOT_HEIGHT && (d = x[1] + 0.5 * g.NODE_SLOT_HEIGHT), b.fillStyle = m.links && m.links.length ? m.color_on || this.default_connection_color.output_on : m.color_off || this.default_connection_color.output_off, b.beginPath(), m.type === g.EVENT || m.shape === g.BOX_SHAPE ? p ? b.rect(x[0] - 5 + 0.5, x[1] - 8 + 0.5, 10, 14) : b.rect(x[0] - 6 + 0.5, x[1] - 5 + 0.5, 14, 10) : - m.shape === g.ARROW_SHAPE ? (b.moveTo(x[0] + 8, x[1] + 0.5), b.lineTo(x[0] - 4, x[1] + 6 + 0.5), b.lineTo(x[0] - 4, x[1] - 6 + 0.5), b.closePath()) : b.arc(x[0], x[1], 4, 0, 2 * Math.PI), b.fill(), b.stroke(), e && (h = null != m.label ? m.label : m.name)) { - b.fillStyle = g.NODE_TEXT_COLOR, p || m.dir == g.DOWN ? b.fillText(h, x[0], x[1] - 8) : b.fillText(h, x[0] - 10, x[1] + 5); + if (g = a.outputs[c], x = a.getConnectionPos(!1, c, d), x[0] -= a.pos[0], x[1] -= a.pos[1], h < x[1] + 0.5 * l.NODE_SLOT_HEIGHT && (h = x[1] + 0.5 * l.NODE_SLOT_HEIGHT), b.fillStyle = g.links && g.links.length ? g.color_on || this.default_connection_color.output_on : g.color_off || this.default_connection_color.output_off, b.beginPath(), g.type === l.EVENT || g.shape === l.BOX_SHAPE ? n ? b.rect(x[0] - 5 + 0.5, x[1] - 8 + 0.5, 10, 14) : b.rect(x[0] - 6 + 0.5, x[1] - 5 + 0.5, 14, 10) : + g.shape === l.ARROW_SHAPE ? (b.moveTo(x[0] + 8, x[1] + 0.5), b.lineTo(x[0] - 4, x[1] + 6 + 0.5), b.lineTo(x[0] - 4, x[1] - 6 + 0.5), b.closePath()) : b.arc(x[0], x[1], 4, 0, 2 * Math.PI), b.fill(), b.stroke(), e && (m = null != g.label ? g.label : g.name)) { + b.fillStyle = l.NODE_TEXT_COLOR, n || g.dir == l.DOWN ? b.fillText(m, x[0], x[1] - 8) : b.fillText(m, x[0] - 10, x[1] + 5); } } } b.textAlign = "left"; b.globalAlpha = 1; if (a.widgets) { - if (p || a.widgets_up) { - d = 2; + if (n || a.widgets_up) { + h = 2; } - this.drawNodeWidgets(a, d, b, this.node_widget && this.node_widget[0] == a ? this.node_widget[1] : null); + this.drawNodeWidgets(a, h, b, this.node_widget && this.node_widget[0] == a ? this.node_widget[1] : null); } if (a.onDrawForeground) { a.onDrawForeground(b, this, this.canvas); @@ -2755,34 +2757,34 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - var m = new Float32Array(4); - d.prototype.drawNodeShape = function(a, b, c, e, f, l, p) { + var g = new Float32Array(4); + h.prototype.drawNodeShape = function(a, b, c, e, f, k, n) { b.strokeStyle = e; b.fillStyle = f; - f = g.NODE_TITLE_HEIGHT; - var n = a._shape || a.constructor.shape || g.BOX_SHAPE, k = a.constructor.title_mode, h = !0; - k == g.TRANSPARENT_TITLE ? h = !1 : k == g.AUTOHIDE_TITLE && p && (h = !0); - m[0] = 0; - m[1] = h ? -f : 0; - m[2] = c[0] + 1; - m[3] = h ? c[1] + f : c[1]; - a.flags.collapsed || (b.beginPath(), n == g.BOX_SHAPE || 0.5 > this.scale ? b.fillRect(m[0], m[1], m[2], m[3]) : n == g.ROUND_SHAPE || n == g.CARD_SHAPE ? b.roundRect(m[0], m[1], m[2], m[3], this.round_radius, n == g.CARD_SHAPE ? 0 : this.round_radius) : n == g.CIRCLE_SHAPE && b.arc(0.5 * c[0], 0.5 * c[1], 0.5 * c[0], 0, 2 * Math.PI), b.fill()); + f = l.NODE_TITLE_HEIGHT; + var p = a._shape || a.constructor.shape || l.BOX_SHAPE, d = a.constructor.title_mode, m = !0; + d == l.TRANSPARENT_TITLE ? m = !1 : d == l.AUTOHIDE_TITLE && n && (m = !0); + g[0] = 0; + g[1] = m ? -f : 0; + g[2] = c[0] + 1; + g[3] = m ? c[1] + f : c[1]; + a.flags.collapsed || (b.beginPath(), p == l.BOX_SHAPE || 0.5 > this.scale ? b.fillRect(g[0], g[1], g[2], g[3]) : p == l.ROUND_SHAPE || p == l.CARD_SHAPE ? b.roundRect(g[0], g[1], g[2], g[3], this.round_radius, p == l.CARD_SHAPE ? 0 : this.round_radius) : p == l.CIRCLE_SHAPE && b.arc(0.5 * c[0], 0.5 * c[1], 0.5 * c[0], 0, 2 * Math.PI), b.fill()); b.shadowColor = "transparent"; a.bgImage && a.bgImage.width && b.drawImage(a.bgImage, 0.5 * (c[0] - a.bgImage.width), 0.5 * (c[1] - a.bgImage.height)); a.bgImageUrl && !a.bgImage && (a.bgImage = a.loadImage(a.bgImageUrl)); if (a.onDrawBackground) { a.onDrawBackground(b, this, this.canvas); } - if (h || k == g.TRANSPARENT_TITLE) { + if (m || d == l.TRANSPARENT_TITLE) { if (a.onDrawTitleBar) { a.onDrawTitleBar(b, f, c, this.scale, e); } else { - if (k != g.TRANSPARENT_TITLE) { - a.flags.collapsed && (b.shadowColor = g.DEFAULT_SHADOW_COLOR); - this.use_gradients ? (p = d.gradients[e], p || (p = d.gradients[e] = b.createLinearGradient(0, 0, 400, 0), p.addColorStop(0, e), p.addColorStop(1, "#000")), b.fillStyle = p) : b.fillStyle = e; + if (d != l.TRANSPARENT_TITLE) { + a.flags.collapsed && (b.shadowColor = l.DEFAULT_SHADOW_COLOR); + this.use_gradients ? (n = h.gradients[e], n || (n = h.gradients[e] = b.createLinearGradient(0, 0, 400, 0), n.addColorStop(0, e), n.addColorStop(1, "#000")), b.fillStyle = n) : b.fillStyle = e; var x = b.globalAlpha; b.beginPath(); - n == g.BOX_SHAPE || 0.5 > this.scale ? b.rect(0, -f, c[0] + 1, f) : (n == g.ROUND_SHAPE || n == g.CARD_SHAPE) && b.roundRect(0, -f, c[0] + 1, f, this.round_radius, a.flags.collapsed ? this.round_radius : 0); + p == l.BOX_SHAPE || 0.5 > this.scale ? b.rect(0, -f, c[0] + 1, f) : (p == l.ROUND_SHAPE || p == l.CARD_SHAPE) && b.roundRect(0, -f, c[0] + 1, f, this.round_radius, a.flags.collapsed ? this.round_radius : 0); b.fill(); b.shadowColor = "transparent"; } @@ -2790,52 +2792,52 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (a.onDrawTitleBox) { a.onDrawTitleBox(b, f, c, this.scale); } else { - n == g.ROUND_SHAPE || n == g.CIRCLE_SHAPE || n == g.CARD_SHAPE ? (0.5 < this.scale && (b.fillStyle = "black", b.beginPath(), b.arc(0.5 * f, -0.5 * f, 0.5 * (f - 8), 0, 2 * Math.PI), b.fill()), b.fillStyle = a.boxcolor || g.NODE_DEFAULT_BOXCOLOR, b.beginPath(), b.arc(0.5 * f, -0.5 * f, 0.4 * (f - 8), 0, 2 * Math.PI), b.fill()) : (0.5 < this.scale && (b.fillStyle = "black", b.fillRect(4, -f + 4, f - 8, f - 8)), b.fillStyle = a.boxcolor || g.NODE_DEFAULT_BOXCOLOR, b.fillRect(5, -f + 5, f - 10, + p == l.ROUND_SHAPE || p == l.CIRCLE_SHAPE || p == l.CARD_SHAPE ? (0.5 < this.scale && (b.fillStyle = "black", b.beginPath(), b.arc(0.5 * f, -0.5 * f, 0.5 * (f - 8), 0, 2 * Math.PI), b.fill()), b.fillStyle = a.boxcolor || l.NODE_DEFAULT_BOXCOLOR, b.beginPath(), b.arc(0.5 * f, -0.5 * f, 0.4 * (f - 8), 0, 2 * Math.PI), b.fill()) : (0.5 < this.scale && (b.fillStyle = "black", b.fillRect(4, -f + 4, f - 8, f - 8)), b.fillStyle = a.boxcolor || l.NODE_DEFAULT_BOXCOLOR, b.fillRect(5, -f + 5, f - 10, f - 10)); } b.globalAlpha = x; if (a.onDrawTitleText) { - a.onDrawTitleText(b, f, c, this.scale, this.title_text_font, l); + a.onDrawTitleText(b, f, c, this.scale, this.title_text_font, k); } - 0.5 < this.scale && (b.font = this.title_text_font, p = a.getTitle()) && (b.fillStyle = l ? "white" : a.constructor.title_text_color || this.node_title_color, a.flags.collapsed ? (b.textAlign = "center", x = b.measureText(p), b.fillText(p, f + 0.5 * x.width, 0.2 * -f), b.textAlign = "left") : (b.textAlign = "left", b.fillText(p, f, 0.2 * -f))); + 0.5 < this.scale && (b.font = this.title_text_font, n = a.getTitle()) && (b.fillStyle = k ? "white" : a.constructor.title_text_color || this.node_title_color, a.flags.collapsed ? (b.textAlign = "center", x = b.measureText(n), b.fillText(n, f + 0.5 * x.width, 0.2 * -f), b.textAlign = "left") : (b.textAlign = "left", b.fillText(n, f, 0.2 * -f))); if (a.onDrawTitle) { a.onDrawTitle(b); } } - if (l) { + if (k) { if (a.onBounding) { - a.onBounding(m); + a.onBounding(g); } - k == g.TRANSPARENT_TITLE && (m[1] -= f, m[3] += f); + d == l.TRANSPARENT_TITLE && (g[1] -= f, g[3] += f); b.lineWidth = 1; b.globalAlpha = 0.8; b.beginPath(); - n == g.BOX_SHAPE ? b.rect(-6 + m[0], -6 + m[1], 12 + m[2], 12 + m[3]) : n == g.ROUND_SHAPE || n == g.CARD_SHAPE && a.flags.collapsed ? b.roundRect(-6 + m[0], -6 + m[1], 12 + m[2], 12 + m[3], 2 * this.round_radius) : n == g.CARD_SHAPE ? b.roundRect(-6 + m[0], -6 + m[1], 12 + m[2], 12 + m[3], 2 * this.round_radius, 2) : n == g.CIRCLE_SHAPE && b.arc(0.5 * c[0], 0.5 * c[1], 0.5 * c[0] + 6, 0, 2 * Math.PI); + p == l.BOX_SHAPE ? b.rect(-6 + g[0], -6 + g[1], 12 + g[2], 12 + g[3]) : p == l.ROUND_SHAPE || p == l.CARD_SHAPE && a.flags.collapsed ? b.roundRect(-6 + g[0], -6 + g[1], 12 + g[2], 12 + g[3], 2 * this.round_radius) : p == l.CARD_SHAPE ? b.roundRect(-6 + g[0], -6 + g[1], 12 + g[2], 12 + g[3], 2 * this.round_radius, 2) : p == l.CIRCLE_SHAPE && b.arc(0.5 * c[0], 0.5 * c[1], 0.5 * c[0] + 6, 0, 2 * Math.PI); b.strokeStyle = "#FFF"; b.stroke(); b.strokeStyle = e; b.globalAlpha = 1; } }; - d.prototype.drawConnections = function(a) { - var b = g.getTime(), c = this.visible_area; + h.prototype.drawConnections = function(a) { + var b = l.getTime(), c = this.visible_area; c = new Float32Array([c[0] - 20, c[1] - 20, c[2] + 40, c[3] + 40]); - var e = new Float32Array(4), f = new Float32Array(2), l = new Float32Array(2); + var e = new Float32Array(4), f = new Float32Array(2), k = new Float32Array(2); a.lineWidth = this.connections_width; a.fillStyle = "#AAA"; a.strokeStyle = "#AAA"; a.globalAlpha = this.editor_alpha; - for (var p = this.graph._nodes, d = 0, n = p.length; d < n; ++d) { - var k = p[d]; - if (k.inputs && k.inputs.length) { - for (var m = 0; m < k.inputs.length; ++m) { - var h = k.inputs[m]; - if (h && null != h.link && (h = this.graph.links[h.link])) { - var q = this.graph.getNodeById(h.origin_id); + for (var n = this.graph._nodes, h = 0, p = n.length; h < p; ++h) { + var d = n[h]; + if (d.inputs && d.inputs.length) { + for (var g = 0; g < d.inputs.length; ++g) { + var m = d.inputs[g]; + if (m && null != m.link && (m = this.graph.links[m.link])) { + var q = this.graph.getNodeById(m.origin_id); if (null != q) { - var u = h.origin_slot; + var u = m.origin_slot; var t = -1 == u ? [q.pos[0] + 10, q.pos[1] + 10] : q.getConnectionPos(!1, u, f); - var y = k.getConnectionPos(!0, m, l); + var y = d.getConnectionPos(!0, g, k); e[0] = t[0]; e[1] = t[1]; e[2] = y[0] - t[0]; @@ -2844,12 +2846,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { 0 > e[3] && (e[1] += e[3], e[3] = Math.abs(e[3])); if (w(e, c)) { var v = q.outputs[u]; - u = k.inputs[m]; - if (v && u && (q = v.dir || (q.flags.horizontal ? g.DOWN : g.RIGHT), u = u.dir || (k.flags.horizontal ? g.UP : g.LEFT), this.renderLink(a, t, y, h, !1, 0, null, q, u), h && h._last_time && 1000 > b - h._last_time)) { - v = 2.0 - 0.002 * (b - h._last_time); + u = d.inputs[g]; + if (v && u && (q = v.dir || (q.flags.horizontal ? l.DOWN : l.RIGHT), u = u.dir || (d.flags.horizontal ? l.UP : l.LEFT), this.renderLink(a, t, y, m, !1, 0, null, q, u), m && m._last_time && 1000 > b - m._last_time)) { + v = 2.0 - 0.002 * (b - m._last_time); var z = a.globalAlpha; a.globalAlpha = z * v; - this.renderLink(a, t, y, h, !0, v, "white", q, u); + this.renderLink(a, t, y, m, !0, v, "white", q, u); a.globalAlpha = z; } } @@ -2860,100 +2862,100 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } a.globalAlpha = 1; }; - d.prototype.renderLink = function(a, b, c, e, f, l, p, n, k) { + h.prototype.renderLink = function(a, b, c, e, f, k, n, p, d) { if (this.highquality_render) { - n = n || g.RIGHT; - k = k || g.LEFT; - var m = u(b, c); + p = p || l.RIGHT; + d = d || l.LEFT; + var g = u(b, c); this.render_connections_border && 0.6 < this.scale && (a.lineWidth = this.connections_width + 4); - !p && e && (p = e.color || d.link_type_colors[e.type]); - p || (p = this.default_link_color); - null != e && this.highlighted_links[e.id] && (p = "#FFF"); + !n && e && (n = e.color || h.link_type_colors[e.type]); + n || (n = this.default_link_color); + null != e && this.highlighted_links[e.id] && (n = "#FFF"); a.beginPath(); if (this.render_curved_connections) { a.moveTo(b[0], b[1]); - var h = e = 0, q = 0, B = 0; - switch(n) { - case g.LEFT: - e = -0.25 * m; + var m = e = 0, B = 0, q = 0; + switch(p) { + case l.LEFT: + e = -0.25 * g; break; - case g.RIGHT: - e = 0.25 * m; + case l.RIGHT: + e = 0.25 * g; break; - case g.UP: - h = -0.25 * m; + case l.UP: + m = -0.25 * g; break; - case g.DOWN: - h = 0.25 * m; + case l.DOWN: + m = 0.25 * g; } - switch(k) { - case g.LEFT: - q = -0.25 * m; + switch(d) { + case l.LEFT: + B = -0.25 * g; break; - case g.RIGHT: - q = 0.25 * m; + case l.RIGHT: + B = 0.25 * g; break; - case g.UP: - B = -0.25 * m; + case l.UP: + q = -0.25 * g; break; - case g.DOWN: - B = 0.25 * m; + case l.DOWN: + q = 0.25 * g; } - a.bezierCurveTo(b[0] + e, b[1] + h, c[0] + q, c[1] + B, c[0], c[1]); + a.bezierCurveTo(b[0] + e, b[1] + m, c[0] + B, c[1] + q, c[0], c[1]); } else { a.moveTo(b[0] + 10, b[1]), a.lineTo(0.5 * (b[0] + 10 + (c[0] - 10)), b[1]), a.lineTo(0.5 * (b[0] + 10 + (c[0] - 10)), c[1]), a.lineTo(c[0] - 10, c[1]); } this.render_connections_border && 0.6 < this.scale && !f && (a.strokeStyle = "rgba(0,0,0,0.5)", a.stroke()); a.lineWidth = this.connections_width; - a.fillStyle = a.strokeStyle = p; + a.fillStyle = a.strokeStyle = n; a.stroke(); - this.render_connection_arrows && 0.6 <= this.scale && this.render_connection_arrows && 0.6 < this.scale && (f = this.computeConnectionPoint(b, c, 0.5, n, k), p = this.computeConnectionPoint(b, c, 0.51, n, k), p = this.render_curved_connections ? -Math.atan2(p[0] - f[0], p[1] - f[1]) : c[1] > b[1] ? 0 : Math.PI, a.save(), a.translate(f[0], f[1]), a.rotate(p), a.beginPath(), a.moveTo(-5, -5), a.lineTo(0, 5), a.lineTo(5, -5), a.fill(), a.restore()); - if (l) { - for (l = 0; 5 > l; ++l) { - f = (0.001 * g.getTime() + 0.2 * l) % 1, f = this.computeConnectionPoint(b, c, f, n, k), a.beginPath(), a.arc(f[0], f[1], 5, 0, 2 * Math.PI), a.fill(); + this.render_connection_arrows && 0.6 <= this.scale && this.render_connection_arrows && 0.6 < this.scale && (f = this.computeConnectionPoint(b, c, 0.5, p, d), n = this.computeConnectionPoint(b, c, 0.51, p, d), n = this.render_curved_connections ? -Math.atan2(n[0] - f[0], n[1] - f[1]) : c[1] > b[1] ? 0 : Math.PI, a.save(), a.translate(f[0], f[1]), a.rotate(n), a.beginPath(), a.moveTo(-5, -5), a.lineTo(0, 5), a.lineTo(5, -5), a.fill(), a.restore()); + if (k) { + for (k = 0; 5 > k; ++k) { + f = (0.001 * l.getTime() + 0.2 * k) % 1, f = this.computeConnectionPoint(b, c, f, p, d), a.beginPath(), a.arc(f[0], f[1], 5, 0, 2 * Math.PI), a.fill(); } } } else { a.beginPath(), a.moveTo(b[0], b[1]), a.lineTo(c[0], c[1]), a.stroke(); } }; - d.prototype.computeConnectionPoint = function(a, b, c, e, f) { - e = e || g.RIGHT; - f = f || g.LEFT; - var l = u(a, b), p = [a[0], a[1]], d = [b[0], b[1]]; + h.prototype.computeConnectionPoint = function(a, b, c, e, f) { + e = e || l.RIGHT; + f = f || l.LEFT; + var k = u(a, b), n = [a[0], a[1]], h = [b[0], b[1]]; switch(e) { - case g.LEFT: - p[0] += -0.25 * l; + case l.LEFT: + n[0] += -0.25 * k; break; - case g.RIGHT: - p[0] += 0.25 * l; + case l.RIGHT: + n[0] += 0.25 * k; break; - case g.UP: - p[1] += -0.25 * l; + case l.UP: + n[1] += -0.25 * k; break; - case g.DOWN: - p[1] += 0.25 * l; + case l.DOWN: + n[1] += 0.25 * k; } switch(f) { - case g.LEFT: - d[0] += -0.25 * l; + case l.LEFT: + h[0] += -0.25 * k; break; - case g.RIGHT: - d[0] += 0.25 * l; + case l.RIGHT: + h[0] += 0.25 * k; break; - case g.UP: - d[1] += -0.25 * l; + case l.UP: + h[1] += -0.25 * k; break; - case g.DOWN: - d[1] += 0.25 * l; + case l.DOWN: + h[1] += 0.25 * k; } e = (1 - c) * (1 - c) * (1 - c); f = 3 * (1 - c) * (1 - c) * c; - l = 3 * (1 - c) * c * c; + k = 3 * (1 - c) * c * c; c *= c * c; - return [e * a[0] + f * p[0] + l * d[0] + c * b[0], e * a[1] + f * p[1] + l * d[1] + c * b[1]]; + return [e * a[0] + f * n[0] + k * h[0] + c * b[0], e * a[1] + f * n[1] + k * h[1] + c * b[1]]; }; - d.prototype.drawExecutionOrder = function(a) { + h.prototype.drawExecutionOrder = function(a) { a.shadowColor = "transparent"; a.globalAlpha = 0.25; a.textAlign = "center"; @@ -2962,58 +2964,58 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { for (var b = this.visible_nodes, c = 0; c < b.length; ++c) { var e = b[c]; a.fillStyle = "black"; - a.fillRect(e.pos[0] - g.NODE_TITLE_HEIGHT, e.pos[1] - g.NODE_TITLE_HEIGHT, g.NODE_TITLE_HEIGHT, g.NODE_TITLE_HEIGHT); - 0 == e.order && a.strokeRect(e.pos[0] - g.NODE_TITLE_HEIGHT + 0.5, e.pos[1] - g.NODE_TITLE_HEIGHT + 0.5, g.NODE_TITLE_HEIGHT, g.NODE_TITLE_HEIGHT); + a.fillRect(e.pos[0] - l.NODE_TITLE_HEIGHT, e.pos[1] - l.NODE_TITLE_HEIGHT, l.NODE_TITLE_HEIGHT, l.NODE_TITLE_HEIGHT); + 0 == e.order && a.strokeRect(e.pos[0] - l.NODE_TITLE_HEIGHT + 0.5, e.pos[1] - l.NODE_TITLE_HEIGHT + 0.5, l.NODE_TITLE_HEIGHT, l.NODE_TITLE_HEIGHT); a.fillStyle = "#FFF"; - a.fillText(e.order, e.pos[0] + -0.5 * g.NODE_TITLE_HEIGHT, e.pos[1] - 6); + a.fillText(e.order, e.pos[0] + -0.5 * l.NODE_TITLE_HEIGHT, e.pos[1] - 6); } a.globalAlpha = 1; }; - d.prototype.drawNodeWidgets = function(a, b, c, e) { + h.prototype.drawNodeWidgets = function(a, b, c, e) { if (!a.widgets || !a.widgets.length) { return 0; } - var f = a.size[0], l = a.widgets; + var f = a.size[0], k = a.widgets; b += 2; - var d = g.NODE_WIDGET_HEIGHT, n = 0.5 < this.scale; + var n = l.NODE_WIDGET_HEIGHT, h = 0.5 < this.scale; c.save(); c.globalAlpha = this.editor_alpha; - for (var k = 0; k < l.length; ++k) { - var m = l[k], h = b; - m.y && (h = m.y); - m.last_y = h; + for (var p = 0; p < k.length; ++p) { + var d = k[p], g = b; + d.y && (g = d.y); + d.last_y = g; c.strokeStyle = "#AAA"; c.fillStyle = "#222"; c.textAlign = "left"; - switch(m.type) { + switch(d.type) { case "button": - m.clicked && (c.fillStyle = "#AAA", m.clicked = !1, this.dirty_canvas = !0); - c.fillRect(10, h, f - 20, d); - c.strokeRect(10, h, f - 20, d); - n && (c.textAlign = "center", c.fillStyle = "#AAA", c.fillText(m.name, 0.5 * f, h + 0.7 * d)); + d.clicked && (c.fillStyle = "#AAA", d.clicked = !1, this.dirty_canvas = !0); + c.fillRect(10, g, f - 20, n); + c.strokeRect(10, g, f - 20, n); + h && (c.textAlign = "center", c.fillStyle = "#AAA", c.fillText(d.name, 0.5 * f, g + 0.7 * n)); break; case "toggle": c.textAlign = "left"; c.strokeStyle = "#AAA"; c.fillStyle = "#111"; c.beginPath(); - c.roundRect(10, b, f - 20, d, 0.5 * d); + c.roundRect(10, b, f - 20, n, 0.5 * n); c.fill(); c.stroke(); - c.fillStyle = m.value ? "#89A" : "#333"; + c.fillStyle = d.value ? "#89A" : "#333"; c.beginPath(); - c.arc(f - 20, h + 0.5 * d, 0.36 * d, 0, 2 * Math.PI); + c.arc(f - 20, g + 0.5 * n, 0.36 * n, 0, 2 * Math.PI); c.fill(); - n && (c.fillStyle = "#999", null != m.name && c.fillText(m.name, 20, h + 0.7 * d), c.fillStyle = m.value ? "#DDD" : "#888", c.textAlign = "right", c.fillText(m.value ? m.options.on || "true" : m.options.off || "false", f - 30, h + 0.7 * d)); + h && (c.fillStyle = "#999", null != d.name && c.fillText(d.name, 20, g + 0.7 * n), c.fillStyle = d.value ? "#DDD" : "#888", c.textAlign = "right", c.fillText(d.value ? d.options.on || "true" : d.options.off || "false", f - 30, g + 0.7 * n)); break; case "slider": c.fillStyle = "#111"; - c.fillRect(10, h, f - 20, d); - var q = (m.value - m.options.min) / (m.options.max - m.options.min); - c.fillStyle = e == m ? "#89A" : "#678"; - c.fillRect(10, h, q * (f - 20), d); - c.strokeRect(10, h, f - 20, d); - n && (c.textAlign = "center", c.fillStyle = "#DDD", c.fillText(m.name + " " + Number(m.value).toFixed(3), 0.5 * f, h + 0.7 * d)); + c.fillRect(10, g, f - 20, n); + var m = (d.value - d.options.min) / (d.options.max - d.options.min); + c.fillStyle = e == d ? "#89A" : "#678"; + c.fillRect(10, g, m * (f - 20), n); + c.strokeRect(10, g, f - 20, n); + h && (c.textAlign = "center", c.fillStyle = "#DDD", c.fillText(d.name + " " + Number(d.value).toFixed(3), 0.5 * f, g + 0.7 * n)); break; case "number": case "combo": @@ -3021,11 +3023,11 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { c.strokeStyle = "#AAA"; c.fillStyle = "#111"; c.beginPath(); - c.roundRect(10, b, f - 20, d, 0.5 * d); + c.roundRect(10, b, f - 20, n, 0.5 * n); c.fill(); c.stroke(); - n && (c.fillStyle = "#AAA", c.beginPath(), c.moveTo(26, b + 5), c.lineTo(16, b + 0.5 * d), c.lineTo(26, b + d - 5), c.moveTo(f - 26, b + 5), c.lineTo(f - 16, b + 0.5 * d), c.lineTo(f - 26, b + d - 5), c.fill(), c.fillStyle = "#999", c.fillText(m.name, 30, h + 0.7 * d), c.fillStyle = "#DDD", c.textAlign = "right", "number" == m.type ? c.fillText(Number(m.value).toFixed(void 0 !== m.options.precision ? m.options.precision : 3), f - 40, h + 0.7 * d) : c.fillText(m.value, f - 40, h + 0.7 * - d)); + h && (c.fillStyle = "#AAA", c.beginPath(), c.moveTo(26, b + 5), c.lineTo(16, b + 0.5 * n), c.lineTo(26, b + n - 5), c.moveTo(f - 26, b + 5), c.lineTo(f - 16, b + 0.5 * n), c.lineTo(f - 26, b + n - 5), c.fill(), c.fillStyle = "#999", c.fillText(d.name, 30, g + 0.7 * n), c.fillStyle = "#DDD", c.textAlign = "right", "number" == d.type ? c.fillText(Number(d.value).toFixed(void 0 !== d.options.precision ? d.options.precision : 3), f - 40, g + 0.7 * n) : c.fillText(d.value, f - 40, g + 0.7 * + n)); break; case "string": case "text": @@ -3033,74 +3035,74 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { c.strokeStyle = "#AAA"; c.fillStyle = "#111"; c.beginPath(); - c.roundRect(10, b, f - 20, d, 0.5 * d); + c.roundRect(10, b, f - 20, n, 0.5 * n); c.fill(); c.stroke(); - n && (c.fillStyle = "#999", null != m.name && c.fillText(m.name, 20, h + 0.7 * d), c.fillStyle = "#DDD", c.textAlign = "right", c.fillText(m.value, f - 20, h + 0.7 * d)); + h && (c.fillStyle = "#999", null != d.name && c.fillText(d.name, 20, g + 0.7 * n), c.fillStyle = "#DDD", c.textAlign = "right", c.fillText(d.value, f - 20, g + 0.7 * n)); break; default: - m.draw && m.draw(c, a, m, h, d); + d.draw && d.draw(c, a, d, g, n); } - b += d + 4; + b += n + 4; } c.restore(); }; - d.prototype.processNodeWidgets = function(a, b, c, e) { + h.prototype.processNodeWidgets = function(a, b, c, e) { if (!a.widgets || !a.widgets.length) { return null; } - for (var f = b[0] - a.pos[0], l = b[1] - a.pos[1], d = a.size[0], n = this, m = this.getCanvasWindow(), k = 0; k < a.widgets.length; ++k) { - var h = a.widgets[k]; - if (h == e || 6 < f && f < d - 12 && l > h.last_y && l < h.last_y + g.NODE_WIDGET_HEIGHT) { - switch(h.type) { + for (var f = b[0] - a.pos[0], k = b[1] - a.pos[1], n = a.size[0], h = this, d = this.getCanvasWindow(), p = 0; p < a.widgets.length; ++p) { + var g = a.widgets[p]; + if (g == e || 6 < f && f < n - 12 && k > g.last_y && k < g.last_y + l.NODE_WIDGET_HEIGHT) { + switch(g.type) { case "button": - h.callback && setTimeout(function() { - h.callback(h, n, a, b); + g.callback && setTimeout(function() { + g.callback(g, h, a, b); }, 20); - this.dirty_canvas = h.clicked = !0; + this.dirty_canvas = g.clicked = !0; break; case "slider": - c = Math.clamp((f - 10) / (d - 20), 0, 1); - h.value = h.options.min + (h.options.max - h.options.min) * c; - h.callback && setTimeout(function() { - h.callback(h.value, n, a, b); + c = Math.clamp((f - 10) / (n - 20), 0, 1); + g.value = g.options.min + (g.options.max - g.options.min) * c; + g.callback && setTimeout(function() { + g.callback(g.value, h, a, b); }, 20); this.dirty_canvas = !0; break; case "number": case "combo": - "mousemove" == c.type && "number" == h.type ? (h.value += 0.1 * c.deltaX * (h.options.step || 1), null != h.options.min && h.value < h.options.min && (h.value = h.options.min), null != h.options.max && h.value > h.options.max && (h.value = h.options.max)) : "mousedown" == c.type && ((e = h.options.values) && e.constructor === Function && (e = h.options.values(h, a)), f = 40 > f ? -1 : f > d - 40 ? 1 : 0, "number" == h.type ? (h.value += 0.1 * f * (h.options.step || 1), null != h.options.min && - h.value < h.options.min && (h.value = h.options.min), null != h.options.max && h.value > h.options.max && (h.value = h.options.max)) : f ? (c = e.indexOf(h.value) + f, c >= e.length && (c = 0), 0 > c && (c = e.length - 1), h.value = e[c]) : new g.ContextMenu(e, {event:c, className:"dark", callback:function(a, b, c) { + "mousemove" == c.type && "number" == g.type ? (g.value += 0.1 * c.deltaX * (g.options.step || 1), null != g.options.min && g.value < g.options.min && (g.value = g.options.min), null != g.options.max && g.value > g.options.max && (g.value = g.options.max)) : "mousedown" == c.type && ((e = g.options.values) && e.constructor === Function && (e = g.options.values(g, a)), f = 40 > f ? -1 : f > n - 40 ? 1 : 0, "number" == g.type ? (g.value += 0.1 * f * (g.options.step || 1), null != g.options.min && + g.value < g.options.min && (g.value = g.options.min), null != g.options.max && g.value > g.options.max && (g.value = g.options.max)) : f ? (c = e.indexOf(g.value) + f, c >= e.length && (c = 0), 0 > c && (c = e.length - 1), g.value = e[c]) : new l.ContextMenu(e, {event:c, className:"dark", callback:function(a, b, c) { this.value = a; - n.dirty_canvas = !0; + h.dirty_canvas = !0; return !1; - }.bind(h)}, m)); - h.callback && setTimeout(function() { - this.callback(this.value, n, a, b); - }.bind(h), 20); + }.bind(g)}, d)); + g.callback && setTimeout(function() { + this.callback(this.value, h, a, b); + }.bind(g), 20); this.dirty_canvas = !0; break; case "toggle": - "mousedown" == c.type && (h.value = !h.value, h.callback && setTimeout(function() { - h.callback(h.value, n, a, b); + "mousedown" == c.type && (g.value = !g.value, g.callback && setTimeout(function() { + g.callback(g.value, h, a, b); }, 20)); break; case "string": case "text": - "mousedown" == c.type && this.prompt("Value", h.value, function(b) { + "mousedown" == c.type && this.prompt("Value", g.value, function(b) { this.value = b; - h.callback && h.callback(b, n, a); - }.bind(h), c); + g.callback && g.callback(b, h, a); + }.bind(g), c); break; default: - h.mouse && h.mouse(ctx, c, [f, l], a); + g.mouse && g.mouse(ctx, c, [f, k], a); } - return h; + return g; } } return null; }; - d.prototype.drawGroups = function(a, b) { + h.prototype.drawGroups = function(a, b) { if (this.graph) { a = this.graph._groups; b.save(); @@ -3110,33 +3112,33 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (w(this.visible_area, e._bounding)) { b.fillStyle = e.color || "#335"; b.strokeStyle = e.color || "#335"; - var f = e._pos, l = e._size; + var f = e._pos, k = e._size; b.globalAlpha = 0.25 * this.editor_alpha; b.beginPath(); - b.rect(f[0] + 0.5, f[1] + 0.5, l[0], l[1]); + b.rect(f[0] + 0.5, f[1] + 0.5, k[0], k[1]); b.fill(); b.globalAlpha = this.editor_alpha; b.stroke(); b.beginPath(); - b.moveTo(f[0] + l[0], f[1] + l[1]); - b.lineTo(f[0] + l[0] - 10, f[1] + l[1]); - b.lineTo(f[0] + l[0], f[1] + l[1] - 10); + b.moveTo(f[0] + k[0], f[1] + k[1]); + b.lineTo(f[0] + k[0] - 10, f[1] + k[1]); + b.lineTo(f[0] + k[0], f[1] + k[1] - 10); b.fill(); - l = e.font_size || g.DEFAULT_GROUP_FONT_SIZE; - b.font = l + "px Arial"; - b.fillText(e.title, f[0] + 4, f[1] + l); + k = e.font_size || l.DEFAULT_GROUP_FONT_SIZE; + b.font = k + "px Arial"; + b.fillText(e.title, f[0] + 4, f[1] + k); } } b.restore(); } }; - d.prototype.resize = function(a, b) { + h.prototype.resize = function(a, b) { a || b || (b = this.canvas.parentNode, a = b.offsetWidth, b = b.offsetHeight); if (this.canvas.width != a || this.canvas.height != b) { this.canvas.width = a, this.canvas.height = b, this.bgcanvas.width = this.canvas.width, this.bgcanvas.height = this.canvas.height, this.setDirty(!0, !0); } }; - d.prototype.switchLiveMode = function(a) { + h.prototype.switchLiveMode = function(a) { if (a) { var b = this, c = this.live_mode ? 1.1 : 0.9; this.live_mode && (this.live_mode = !1, this.editor_alpha = 0.1); @@ -3151,9 +3153,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.live_mode = !this.live_mode, this.dirty_bgcanvas = this.dirty_canvas = !0; } }; - d.prototype.onNodeSelectionChange = function(a) { + h.prototype.onNodeSelectionChange = function(a) { }; - d.prototype.touchHandler = function(a) { + h.prototype.touchHandler = function(a) { var b = a.changedTouches[0]; switch(a.type) { case "touchstart": @@ -3173,57 +3175,57 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b.target.dispatchEvent(f); a.preventDefault(); }; - d.onGroupAdd = function(a, b, c) { - a = d.active_canvas; + h.onGroupAdd = function(a, b, c) { + a = h.active_canvas; a.getCanvasWindow(); - b = new g.LGraphGroup; + b = new l.LGraphGroup; b.pos = a.convertEventToCanvas(c); a.graph.add(b); }; - d.onMenuAdd = function(a, b, c, e) { + h.onMenuAdd = function(a, b, c, e) { function f(a, b) { b = e.getFirstEvent(); - if (a = g.createNode(a.value)) { - a.pos = l.convertEventToCanvas(b), l.graph.add(a); + if (a = l.createNode(a.value)) { + a.pos = k.convertEventToCanvas(b), k.graph.add(a); } } - var l = d.active_canvas, p = l.getCanvasWindow(); - a = g.getNodeTypesCategories(); + var k = h.active_canvas, n = k.getCanvasWindow(); + a = l.getNodeTypesCategories(); b = []; - for (var n in a) { - a[n] && b.push({value:a[n], content:a[n], has_submenu:!0}); + for (var g in a) { + a[g] && b.push({value:a[g], content:a[g], has_submenu:!0}); } - var m = new g.ContextMenu(b, {event:c, callback:function(a, b, c) { - a = g.getNodeTypesInCategory(a.value, l.filter); + var d = new l.ContextMenu(b, {event:c, callback:function(a, b, c) { + a = l.getNodeTypesInCategory(a.value, k.filter); b = []; for (var e in a) { a[e].skip_list || b.push({content:a[e].title, value:a[e].type}); } - new g.ContextMenu(b, {event:c, callback:f, parentMenu:m}, p); + new l.ContextMenu(b, {event:c, callback:f, parentMenu:d}, n); return !1; - }, parentMenu:e}, p); + }, parentMenu:e}, n); return !1; }; - d.onMenuCollapseAll = function() { + h.onMenuCollapseAll = function() { }; - d.onMenuNodeEdit = function() { + h.onMenuNodeEdit = function() { }; - d.showMenuNodeOptionalInputs = function(a, b, c, e, f) { + h.showMenuNodeOptionalInputs = function(a, b, c, e, f) { if (f) { - var l = this; - a = d.active_canvas.getCanvasWindow(); + var k = this; + a = h.active_canvas.getCanvasWindow(); b = f.optional_inputs; f.onGetInputs && (b = f.onGetInputs()); var n = []; if (b) { - for (var m in b) { - var k = b[m]; - if (k) { - var h = k[0]; - k[2] && k[2].label && (h = k[2].label); - h = {content:h, value:k}; - k[1] == g.ACTION && (h.className = "event"); - n.push(h); + for (var g in b) { + var d = b[g]; + if (d) { + var p = d[0]; + d[2] && d[2].label && (p = d[2].label); + p = {content:p, value:d}; + d[1] == l.ACTION && (p.className = "event"); + n.push(p); } else { n.push(null); } @@ -3231,130 +3233,130 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } this.onMenuNodeInputs && (n = this.onMenuNodeInputs(n)); if (n.length) { - return new g.ContextMenu(n, {event:c, callback:function(a, b, c) { - f && (a.callback && a.callback.call(l, f, a, b, c), a.value && (f.addInput(a.value[0], a.value[1], a.value[2]), f.setDirtyCanvas(!0, !0))); + return new l.ContextMenu(n, {event:c, callback:function(a, b, c) { + f && (a.callback && a.callback.call(k, f, a, b, c), a.value && (f.addInput(a.value[0], a.value[1], a.value[2]), f.setDirtyCanvas(!0, !0))); }, parentMenu:e, node:f}, a), !1; } } }; - d.showMenuNodeOptionalOutputs = function(a, b, c, e, f) { - function l(a, b, c) { + h.showMenuNodeOptionalOutputs = function(a, b, c, e, f) { + function k(a, b, c) { if (f && (a.callback && a.callback.call(n, f, a, b, c), a.value)) { if (c = a.value[1], !c || c.constructor !== Object && c.constructor !== Array) { f.addOutput(a.value[0], a.value[1], a.value[2]), f.setDirtyCanvas(!0, !0); } else { a = []; - for (var d in c) { - a.push({content:d, value:c[d]}); + for (var g in c) { + a.push({content:g, value:c[g]}); } - new g.ContextMenu(a, {event:b, callback:l, parentMenu:e, node:f}); + new l.ContextMenu(a, {event:b, callback:k, parentMenu:e, node:f}); return !1; } } } if (f) { var n = this; - a = d.active_canvas.getCanvasWindow(); + a = h.active_canvas.getCanvasWindow(); b = f.optional_outputs; f.onGetOutputs && (b = f.onGetOutputs()); - var m = []; + var g = []; if (b) { - for (var k in b) { - var h = b[k]; - if (!h) { - m.push(null); + for (var d in b) { + var p = b[d]; + if (!p) { + g.push(null); } else { - if (!f.flags || !f.flags.skip_repeated_outputs || -1 == f.findOutputSlot(h[0])) { - var q = h[0]; - h[2] && h[2].label && (q = h[2].label); - q = {content:q, value:h}; - h[1] == g.EVENT && (q.className = "event"); - m.push(q); + if (!f.flags || !f.flags.skip_repeated_outputs || -1 == f.findOutputSlot(p[0])) { + var m = p[0]; + p[2] && p[2].label && (m = p[2].label); + m = {content:m, value:p}; + p[1] == l.EVENT && (m.className = "event"); + g.push(m); } } } } - this.onMenuNodeOutputs && (m = this.onMenuNodeOutputs(m)); - if (m.length) { - return new g.ContextMenu(m, {event:c, callback:l, parentMenu:e, node:f}, a), !1; + this.onMenuNodeOutputs && (g = this.onMenuNodeOutputs(g)); + if (g.length) { + return new l.ContextMenu(g, {event:c, callback:k, parentMenu:e, node:f}, a), !1; } } }; - d.onShowMenuNodeProperties = function(a, b, c, e, f) { + h.onShowMenuNodeProperties = function(a, b, c, e, f) { if (f && f.properties) { - var l = d.active_canvas; - b = l.getCanvasWindow(); - var n = [], m; - for (m in f.properties) { - a = void 0 !== f.properties[m] ? f.properties[m] : " ", a = d.decodeHTML(a), n.push({content:"" + m + "" + a + "", value:m}); + var k = h.active_canvas; + b = k.getCanvasWindow(); + var g = [], d; + for (d in f.properties) { + a = void 0 !== f.properties[d] ? f.properties[d] : " ", a = h.decodeHTML(a), g.push({content:"" + d + "" + a + "", value:d}); } - if (n.length) { - return new g.ContextMenu(n, {event:c, callback:function(a, b, c, e) { - f && (b = this.getBoundingClientRect(), l.showEditPropertyValue(f, a.value, {position:[b.left, b.top]})); + if (g.length) { + return new l.ContextMenu(g, {event:c, callback:function(a, b, c, e) { + f && (b = this.getBoundingClientRect(), k.showEditPropertyValue(f, a.value, {position:[b.left, b.top]})); }, parentMenu:e, allow_html:!0, node:f}, b), !1; } } }; - d.decodeHTML = function(a) { + h.decodeHTML = function(a) { var b = document.createElement("div"); b.innerText = a; return b.innerHTML; }; - d.onResizeNode = function(a, b, c, e, f) { + h.onResizeNode = function(a, b, c, e, f) { f && (f.size = f.computeSize(), f.setDirtyCanvas(!0, !0)); }; - d.onShowPropertyEditor = function(a, b, c, e, f) { - function l() { - var b = g.value; + h.onShowPropertyEditor = function(a, b, c, e, f) { + function k() { + var b = p.value; "Number" == a.type ? b = Number(b) : "Boolean" == a.type && (b = !!b); - f[n] = b; - m.parentNode.removeChild(m); + f[g] = b; + d.parentNode.removeChild(d); f.setDirtyCanvas(!0, !0); } - var n = a.property || "title"; - b = f[n]; - var m = document.createElement("div"); - m.className = "graphdialog"; - m.innerHTML = ""; - m.querySelector(".name").innerText = n; - var g = m.querySelector("input"); - g && (g.value = b, g.addEventListener("blur", function(a) { + var g = a.property || "title"; + b = f[g]; + var d = document.createElement("div"); + d.className = "graphdialog"; + d.innerHTML = ""; + d.querySelector(".name").innerText = g; + var p = d.querySelector("input"); + p && (p.value = b, p.addEventListener("blur", function(a) { this.focus(); - }), g.addEventListener("keydown", function(a) { - 13 == a.keyCode && (l(), a.preventDefault(), a.stopPropagation()); + }), p.addEventListener("keydown", function(a) { + 13 == a.keyCode && (k(), a.preventDefault(), a.stopPropagation()); })); - b = d.active_canvas.canvas; + b = h.active_canvas.canvas; c = b.getBoundingClientRect(); - var k = e = -20; - c && (e -= c.left, k -= c.top); - event ? (m.style.left = event.pageX + e + "px", m.style.top = event.pageY + k + "px") : (m.style.left = 0.5 * b.width + e + "px", m.style.top = 0.5 * b.height + k + "px"); - m.querySelector("button").addEventListener("click", l); - b.parentNode.appendChild(m); + var l = e = -20; + c && (e -= c.left, l -= c.top); + event ? (d.style.left = event.pageX + e + "px", d.style.top = event.pageY + l + "px") : (d.style.left = 0.5 * b.width + e + "px", d.style.top = 0.5 * b.height + l + "px"); + d.querySelector("button").addEventListener("click", k); + b.parentNode.appendChild(d); }; - d.prototype.prompt = function(a, b, c, e) { + h.prototype.prompt = function(a, b, c, e) { var f = this; a = a || ""; - var l = document.createElement("div"); - l.className = "graphdialog rounded"; - l.innerHTML = " "; - l.close = function() { + var k = document.createElement("div"); + k.className = "graphdialog rounded"; + k.innerHTML = " "; + k.close = function() { f.prompt_box = null; - l.parentNode.removeChild(l); + k.parentNode.removeChild(k); }; - l.addEventListener("mouseleave", function(a) { - l.close(); + k.addEventListener("mouseleave", function(a) { + k.close(); }); f.prompt_box && f.prompt_box.close(); - f.prompt_box = l; - l.querySelector(".name").innerText = a; - l.querySelector(".value").value = b; - var m = l.querySelector("input"); - m.addEventListener("keydown", function(a) { + f.prompt_box = k; + k.querySelector(".name").innerText = a; + k.querySelector(".value").value = b; + var g = k.querySelector("input"); + g.addEventListener("keydown", function(a) { if (27 == a.keyCode) { - l.close(); + k.close(); } else { if (13 == a.keyCode) { - c && c(this.value), l.close(); + c && c(this.value), k.close(); } else { return; } @@ -3362,32 +3364,32 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.preventDefault(); a.stopPropagation(); }); - l.querySelector("button").addEventListener("click", function(a) { - c && c(m.value); + k.querySelector("button").addEventListener("click", function(a) { + c && c(g.value); f.setDirty(!0); - l.close(); + k.close(); }); - a = d.active_canvas.canvas; + a = h.active_canvas.canvas; b = a.getBoundingClientRect(); - var n = -20, g = -20; - b && (n -= b.left, g -= b.top); - e ? (l.style.left = e.pageX + n + "px", l.style.top = e.pageY + g + "px") : (l.style.left = 0.5 * a.width + n + "px", l.style.top = 0.5 * a.height + g + "px"); - a.parentNode.appendChild(l); + var d = -20, p = -20; + b && (d -= b.left, p -= b.top); + e ? (k.style.left = e.pageX + d + "px", k.style.top = e.pageY + p + "px") : (k.style.left = 0.5 * a.width + d + "px", k.style.top = 0.5 * a.height + p + "px"); + a.parentNode.appendChild(k); setTimeout(function() { - m.focus(); + g.focus(); }, 10); - return l; + return k; }; - d.search_limit = -1; - d.prototype.showSearchBox = function(a) { + h.search_limit = -1; + h.prototype.showSearchBox = function(a) { function b(b) { if (b) { if (f.onSearchBoxSelection) { f.onSearchBoxSelection(b, a, u); } else { - var c = g.searchbox_extras[b]; + var c = l.searchbox_extras[b]; c && (b = c.type); - if (b = g.createNode(b)) { + if (b = l.createNode(b)) { b.pos = u.convertEventToCanvas(a), u.graph.add(b); } if (c && c.data) { @@ -3411,18 +3413,18 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } } - l.close(); + k.close(); } function c(a) { - var b = h; - h && h.classList.remove("selected"); - h ? (h = a ? h.nextSibling : h.previousSibling) || (h = b) : h = a ? m.childNodes[0] : m.childNodes[m.childNodes.length]; - h && (h.classList.add("selected"), h.scrollIntoView()); + var b = m; + m && m.classList.remove("selected"); + m ? (m = a ? m.nextSibling : m.previousSibling) || (m = b) : m = a ? g.childNodes[0] : g.childNodes[g.childNodes.length]; + m && (m.classList.add("selected"), m.scrollIntoView()); } function e() { function a(a, c) { var e = document.createElement("div"); - n || (n = a); + d || (d = a); e.innerText = a; e.dataset.type = escape(a); e.className = "litegraph lite-search-item"; @@ -3430,37 +3432,37 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { e.addEventListener("click", function(a) { b(unescape(this.dataset.type)); }); - m.appendChild(e); + g.appendChild(e); } - k = null; + p = null; var c = q.value; - n = null; - m.innerHTML = ""; + d = null; + g.innerHTML = ""; if (c) { if (f.onSearchBox) { var e = f.onSearchBox(help, c, u); if (e) { - for (var l = 0; l < e.length; ++l) { - a(e[l]); + for (var k = 0; k < e.length; ++k) { + a(e[k]); } } } else { e = 0; c = c.toLowerCase(); - for (l in g.searchbox_extras) { - var L = g.searchbox_extras[l]; - if (-1 !== L.desc.toLowerCase().indexOf(c) && (a(L.desc, "searchbox_extra"), -1 !== d.search_limit && e++ > d.search_limit)) { + for (k in l.searchbox_extras) { + var L = l.searchbox_extras[k]; + if (-1 !== L.desc.toLowerCase().indexOf(c) && (a(L.desc, "searchbox_extra"), -1 !== h.search_limit && e++ > h.search_limit)) { break; } } if (Array.prototype.filter) { - for (L = Object.keys(g.registered_node_types).filter(function(a) { + for (L = Object.keys(l.registered_node_types).filter(function(a) { return -1 !== a.toLowerCase().indexOf(c); - }), l = 0; l < L.length && !(a(L[l]), -1 !== d.search_limit && e++ > d.search_limit); l++) { + }), k = 0; k < L.length && !(a(L[k]), -1 !== h.search_limit && e++ > h.search_limit); k++) { } } else { - for (l in g.registered_node_types) { - if (-1 != l.indexOf(c) && (a(l), -1 !== d.search_limit && e++ > d.search_limit)) { + for (k in l.registered_node_types) { + if (-1 != k.indexOf(c) && (a(k), -1 !== h.search_limit && e++ > h.search_limit)) { break; } } @@ -3468,19 +3470,22 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } } - var f = this, l = document.createElement("div"); - l.className = "litegraph litesearchbox graphdialog rounded"; - l.innerHTML = "Search
"; - l.close = function() { + var f = this, k = document.createElement("div"); + k.className = "litegraph litesearchbox graphdialog rounded"; + k.innerHTML = "Search
"; + k.close = function() { f.search_box = null; - l.parentNode.removeChild(l); + setTimeout(function() { + f.canvas.focus(); + }, 10); + k.parentNode.removeChild(k); }; - l.addEventListener("mouseleave", function(a) { - l.close(); + k.addEventListener("mouseleave", function(a) { + k.close(); }); f.search_box && f.search_box.close(); - f.search_box = l; - var m = l.querySelector(".helper"), n = null, k = null, h = null, q = l.querySelector("input"); + f.search_box = k; + var g = k.querySelector(".helper"), d = null, p = null, m = null, q = k.querySelector("input"); q && (q.addEventListener("blur", function(a) { this.focus(); }), q.addEventListener("keydown", function(a) { @@ -3491,13 +3496,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { c(!0); } else { if (27 == a.keyCode) { - l.close(); + k.close(); } else { if (13 == a.keyCode) { - h ? b(h.innerHTML) : n ? b(n) : l.close(); + m ? b(m.innerHTML) : d ? b(d) : k.close(); } else { - k && clearInterval(k); - k = setTimeout(e, 10); + p && clearInterval(p); + p = setTimeout(e, 10); return; } } @@ -3506,89 +3511,89 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.preventDefault(); a.stopPropagation(); })); - var u = d.active_canvas, t = u.canvas, w = t.getBoundingClientRect(), y = -20, v = -20; + var u = h.active_canvas, t = u.canvas, w = t.getBoundingClientRect(), y = -20, v = -20; w && (y -= w.left, v -= w.top); - a ? (l.style.left = a.pageX + y + "px", l.style.top = a.pageY + v + "px") : (l.style.left = 0.5 * t.width + y + "px", l.style.top = 0.5 * t.height + v + "px"); - t.parentNode.appendChild(l); + a ? (k.style.left = a.pageX + y + "px", k.style.top = a.pageY + v + "px") : (k.style.left = 0.5 * t.width + y + "px", k.style.top = 0.5 * t.height + v + "px"); + t.parentNode.appendChild(k); q.focus(); - return l; + return k; }; - d.prototype.showEditPropertyValue = function(a, b, c) { + h.prototype.showEditPropertyValue = function(a, b, c) { function e() { - f(h.value); + f(m.value); } function f(c) { "number" == typeof a.properties[b] && (c = Number(c)); - "array" == l && (c = c.split(",").map(Number)); + "array" == k && (c = c.split(",").map(Number)); a.properties[b] = c; a._graph && a._graph._version++; if (a.onPropertyChanged) { a.onPropertyChanged(b, c); } - k.close(); + l.close(); a.setDirtyCanvas(!0, !0); } if (a && void 0 !== a.properties[b]) { c = c || {}; - var l = "string"; - null !== a.properties[b] && (l = typeof a.properties[b]); - "object" == l && a.properties[b].length && (l = "array"); - var d = null; - a.getPropertyInfo && (d = a.getPropertyInfo(b)); + var k = "string"; + null !== a.properties[b] && (k = typeof a.properties[b]); + "object" == k && a.properties[b].length && (k = "array"); + var g = null; + a.getPropertyInfo && (g = a.getPropertyInfo(b)); if (a.properties_info) { - for (var m = 0; m < a.properties_info.length; ++m) { - if (a.properties_info[m].name == b) { - d = a.properties_info[m]; + for (var d = 0; d < a.properties_info.length; ++d) { + if (a.properties_info[d].name == b) { + g = a.properties_info[d]; break; } } } - void 0 !== d && null !== d && d.type && (l = d.type); - var n = ""; - if ("string" == l || "number" == l || "array" == l) { - n = ""; + void 0 !== g && null !== g && g.type && (k = g.type); + var h = ""; + if ("string" == k || "number" == k || "array" == k) { + h = ""; } else { - if ("enum" == l && d.values) { - n = ""; + for (d in g.values) { + var p = g.values.constructor === Array ? g.values[d] : d; + h += ""; } - n += ""; + h += ""; } else { - if ("boolean" == l) { - n = ""; + if ("boolean" == k) { + h = ""; } else { - console.warn("unknown type: " + l); + console.warn("unknown type: " + k); return; } } } - var k = this.createDialog("" + b + "" + n + "", c); - if ("enum" == l && d.values) { - var h = k.querySelector("select"); - h.addEventListener("change", function(a) { + var l = this.createDialog("" + b + "" + h + "", c); + if ("enum" == k && g.values) { + var m = l.querySelector("select"); + m.addEventListener("change", function(a) { f(a.target.value); }); } else { - if ("boolean" == l) { - (h = k.querySelector("input")) && h.addEventListener("click", function(a) { - f(!!h.checked); + if ("boolean" == k) { + (m = l.querySelector("input")) && m.addEventListener("click", function(a) { + f(!!m.checked); }); } else { - if (h = k.querySelector("input")) { - h.addEventListener("blur", function(a) { + if (m = l.querySelector("input")) { + m.addEventListener("blur", function(a) { this.focus(); - }), h.value = void 0 !== a.properties[b] ? a.properties[b] : "", h.addEventListener("keydown", function(a) { + }), m.value = void 0 !== a.properties[b] ? a.properties[b] : "", m.addEventListener("keydown", function(a) { 13 == a.keyCode && (e(), a.preventDefault(), a.stopPropagation()); }); } } } - k.querySelector("button").addEventListener("click", e); + l.querySelector("button").addEventListener("click", e); } }; - d.prototype.createDialog = function(a, b) { + h.prototype.createDialog = function(a, b) { b = b || {}; var c = document.createElement("div"); c.className = "graphdialog"; @@ -3605,71 +3610,71 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }; return c; }; - d.onMenuNodeCollapse = function(a, b, c, e, f) { + h.onMenuNodeCollapse = function(a, b, c, e, f) { f.collapse(); }; - d.onMenuNodePin = function(a, b, c, e, f) { + h.onMenuNodePin = function(a, b, c, e, f) { f.pin(); }; - d.onMenuNodeMode = function(a, b, c, e, f) { - new g.ContextMenu(["Always", "On Event", "On Trigger", "Never"], {event:c, callback:function(a) { + h.onMenuNodeMode = function(a, b, c, e, f) { + new l.ContextMenu(["Always", "On Event", "On Trigger", "Never"], {event:c, callback:function(a) { if (f) { switch(a) { case "On Event": - f.mode = g.ON_EVENT; + f.mode = l.ON_EVENT; break; case "On Trigger": - f.mode = g.ON_TRIGGER; + f.mode = l.ON_TRIGGER; break; case "Never": - f.mode = g.NEVER; + f.mode = l.NEVER; break; default: - f.mode = g.ALWAYS; + f.mode = l.ALWAYS; } } }, parentMenu:e, node:f}); return !1; }; - d.onMenuNodeColors = function(a, b, c, e, f) { + h.onMenuNodeColors = function(a, b, c, e, f) { if (!f) { throw "no node for color"; } b = []; b.push({value:null, content:"No color"}); - for (var l in d.node_colors) { - a = d.node_colors[l], a = {value:l, content:"" + l + ""}, b.push(a); + for (var k in h.node_colors) { + a = h.node_colors[k], a = {value:k, content:"" + k + ""}, b.push(a); } - new g.ContextMenu(b, {event:c, callback:function(a) { - f && ((a = a.value ? d.node_colors[a.value] : null) ? f.constructor === g.LGraphGroup ? f.color = a.groupcolor : (f.color = a.color, f.bgcolor = a.bgcolor) : (delete f.color, delete f.bgcolor), f.setDirtyCanvas(!0, !0)); + new l.ContextMenu(b, {event:c, callback:function(a) { + f && ((a = a.value ? h.node_colors[a.value] : null) ? f.constructor === l.LGraphGroup ? f.color = a.groupcolor : (f.color = a.color, f.bgcolor = a.bgcolor) : (delete f.color, delete f.bgcolor), f.setDirtyCanvas(!0, !0)); }, parentMenu:e, node:f}); return !1; }; - d.onMenuNodeShapes = function(a, b, c, e, f) { + h.onMenuNodeShapes = function(a, b, c, e, f) { if (!f) { throw "no node passed"; } - new g.ContextMenu(g.VALID_SHAPES, {event:c, callback:function(a) { + new l.ContextMenu(l.VALID_SHAPES, {event:c, callback:function(a) { f && (f.shape = a, f.setDirtyCanvas(!0)); }, parentMenu:e, node:f}); return !1; }; - d.onMenuNodeRemove = function(a, b, c, e, f) { + h.onMenuNodeRemove = function(a, b, c, e, f) { if (!f) { throw "no node passed"; } !1 !== f.removable && (f.graph.remove(f), f.setDirtyCanvas(!0, !0)); }; - d.onMenuNodeClone = function(a, b, c, e, f) { + h.onMenuNodeClone = function(a, b, c, e, f) { 0 != f.clonable && (a = f.clone()) && (a.pos = [f.pos[0] + 5, f.pos[1] + 5], f.graph.add(a), f.setDirtyCanvas(!0, !0)); }; - d.node_colors = {red:{color:"#322", bgcolor:"#533", groupcolor:"#A88"}, brown:{color:"#332922", bgcolor:"#593930", groupcolor:"#b06634"}, green:{color:"#232", bgcolor:"#353", groupcolor:"#8A8"}, blue:{color:"#223", bgcolor:"#335", groupcolor:"#88A"}, pale_blue:{color:"#2a363b", bgcolor:"#3f5159", groupcolor:"#3f789e"}, cyan:{color:"#233", bgcolor:"#355", groupcolor:"#8AA"}, purple:{color:"#323", bgcolor:"#535", groupcolor:"#a1309b"}, yellow:{color:"#432", bgcolor:"#653", groupcolor:"#b58b2a"}, + h.node_colors = {red:{color:"#322", bgcolor:"#533", groupcolor:"#A88"}, brown:{color:"#332922", bgcolor:"#593930", groupcolor:"#b06634"}, green:{color:"#232", bgcolor:"#353", groupcolor:"#8A8"}, blue:{color:"#223", bgcolor:"#335", groupcolor:"#88A"}, pale_blue:{color:"#2a363b", bgcolor:"#3f5159", groupcolor:"#3f789e"}, cyan:{color:"#233", bgcolor:"#355", groupcolor:"#8AA"}, purple:{color:"#323", bgcolor:"#535", groupcolor:"#a1309b"}, yellow:{color:"#432", bgcolor:"#653", groupcolor:"#b58b2a"}, black:{color:"#222", bgcolor:"#000", groupcolor:"#444"}}; - d.prototype.getCanvasMenuOptions = function() { + h.prototype.getCanvasMenuOptions = function() { if (this.getMenuOptions) { var a = this.getMenuOptions(); } else { - a = [{content:"Add Node", has_submenu:!0, callback:d.onMenuAdd}, {content:"Add Group", callback:d.onGroupAdd}], this._graph_stack && 0 < this._graph_stack.length && a.push(null, {content:"Close subgraph", callback:this.closeSubgraph.bind(this)}); + a = [{content:"Add Node", has_submenu:!0, callback:h.onMenuAdd}, {content:"Add Group", callback:h.onGroupAdd}], this._graph_stack && 0 < this._graph_stack.length && a.push(null, {content:"Close subgraph", callback:this.closeSubgraph.bind(this)}); } if (this.getExtraMenuOptions) { var b = this.getExtraMenuOptions(this, a); @@ -3677,27 +3682,27 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return a; }; - d.prototype.getNodeMenuOptions = function(a) { - var b = a.getMenuOptions ? a.getMenuOptions(this) : [{content:"Inputs", has_submenu:!0, disabled:!0, callback:d.showMenuNodeOptionalInputs}, {content:"Outputs", has_submenu:!0, disabled:!0, callback:d.showMenuNodeOptionalOutputs}, null, {content:"Properties", has_submenu:!0, callback:d.onShowMenuNodeProperties}, null, {content:"Title", callback:d.onShowPropertyEditor}, {content:"Mode", has_submenu:!0, callback:d.onMenuNodeMode}, {content:"Resize", callback:d.onResizeNode}, {content:"Collapse", - callback:d.onMenuNodeCollapse}, {content:"Pin", callback:d.onMenuNodePin}, {content:"Colors", has_submenu:!0, callback:d.onMenuNodeColors}, {content:"Shapes", has_submenu:!0, callback:d.onMenuNodeShapes}, null]; + h.prototype.getNodeMenuOptions = function(a) { + var b = a.getMenuOptions ? a.getMenuOptions(this) : [{content:"Inputs", has_submenu:!0, disabled:!0, callback:h.showMenuNodeOptionalInputs}, {content:"Outputs", has_submenu:!0, disabled:!0, callback:h.showMenuNodeOptionalOutputs}, null, {content:"Properties", has_submenu:!0, callback:h.onShowMenuNodeProperties}, null, {content:"Title", callback:h.onShowPropertyEditor}, {content:"Mode", has_submenu:!0, callback:h.onMenuNodeMode}, {content:"Resize", callback:h.onResizeNode}, {content:"Collapse", + callback:h.onMenuNodeCollapse}, {content:"Pin", callback:h.onMenuNodePin}, {content:"Colors", has_submenu:!0, callback:h.onMenuNodeColors}, {content:"Shapes", has_submenu:!0, callback:h.onMenuNodeShapes}, null]; if (a.onGetInputs) { var c = a.onGetInputs(); c && c.length && (b[0].disabled = !1); } a.onGetOutputs && (c = a.onGetOutputs()) && c.length && (b[1].disabled = !1); a.getExtraMenuOptions && (c = a.getExtraMenuOptions(this)) && (c.push(null), b = c.concat(b)); - !1 !== a.clonable && b.push({content:"Clone", callback:d.onMenuNodeClone}); - !1 !== a.removable && b.push(null, {content:"Remove", callback:d.onMenuNodeRemove}); + !1 !== a.clonable && b.push({content:"Clone", callback:h.onMenuNodeClone}); + !1 !== a.removable && b.push(null, {content:"Remove", callback:h.onMenuNodeRemove}); if (a.graph && a.graph.onGetNodeMenuOptions) { a.graph.onGetNodeMenuOptions(b, a); } return b; }; - d.prototype.getGroupMenuOptions = function(a) { - return [{content:"Title", callback:d.onShowPropertyEditor}, {content:"Color", has_submenu:!0, callback:d.onMenuNodeColors}, {content:"Font size", property:"font_size", type:"Number", callback:d.onShowPropertyEditor}, null, {content:"Remove", callback:d.onMenuNodeRemove}]; + h.prototype.getGroupMenuOptions = function(a) { + return [{content:"Title", callback:h.onShowPropertyEditor}, {content:"Color", has_submenu:!0, callback:h.onMenuNodeColors}, {content:"Font size", property:"font_size", type:"Number", callback:h.onShowPropertyEditor}, null, {content:"Remove", callback:h.onMenuNodeRemove}]; }; - d.prototype.processContextMenu = function(a, b) { - var c = this, e = d.active_canvas.getCanvasWindow(), f = null, l = {event:b, callback:function(b, e, f) { + h.prototype.processContextMenu = function(a, b) { + var c = this, e = h.active_canvas.getCanvasWindow(), f = null, k = {event:b, callback:function(b, e, f) { if (b) { if ("Remove Slot" == b.content) { b = b.slot, b.input ? a.removeInput(b.slot) : b.output && a.removeOutput(b.slot); @@ -3707,36 +3712,36 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } else { if ("Rename Slot" == b.content) { b = b.slot; - var l = b.input ? a.getInputInfo(b.slot) : a.getOutputInfo(b.slot), d = c.createDialog("Name", e), m = d.querySelector("input"); - m && l && (m.value = l.label); - d.querySelector("button").addEventListener("click", function(a) { - m.value && (l && (l.label = m.value), c.setDirty(!0)); - d.close(); + var k = b.input ? a.getInputInfo(b.slot) : a.getOutputInfo(b.slot), g = c.createDialog("Name", e), d = g.querySelector("input"); + d && k && (d.value = k.label); + g.querySelector("button").addEventListener("click", function(a) { + d.value && (k && (k.label = d.value), c.setDirty(!0)); + g.close(); }); } } } } - }, extra:a}, m = null; - a && (m = a.getSlotInPosition(b.canvasX, b.canvasY), d.active_node = a); - m ? (f = [], m && m.output && m.output.links && m.output.links.length && f.push({content:"Disconnect Links", slot:m}), f.push(m.locked ? "Cannot remove" : {content:"Remove Slot", slot:m}), f.push(m.nameLocked ? "Cannot rename" : {content:"Rename Slot", slot:m}), l.title = (m.input ? m.input.type : m.output.type) || "*", m.input && m.input.type == g.ACTION && (l.title = "Action"), m.output && m.output.type == g.EVENT && (l.title = "Event")) : a ? f = this.getNodeMenuOptions(a) : (f = this.getCanvasMenuOptions(), + }, extra:a}, g = null; + a && (g = a.getSlotInPosition(b.canvasX, b.canvasY), h.active_node = a); + g ? (f = [], g && g.output && g.output.links && g.output.links.length && f.push({content:"Disconnect Links", slot:g}), f.push(g.locked ? "Cannot remove" : {content:"Remove Slot", slot:g}), f.push(g.nameLocked ? "Cannot rename" : {content:"Rename Slot", slot:g}), k.title = (g.input ? g.input.type : g.output.type) || "*", g.input && g.input.type == l.ACTION && (k.title = "Action"), g.output && g.output.type == l.EVENT && (k.title = "Event")) : a ? f = this.getNodeMenuOptions(a) : (f = this.getCanvasMenuOptions(), (b = this.graph.getGroupOnPos(b.canvasX, b.canvasY)) && f.push(null, {content:"Edit Group", has_submenu:!0, submenu:{title:"Group", extra:b, options:this.getGroupMenuOptions(b)}})); - f && new g.ContextMenu(f, l, e); + f && new l.ContextMenu(f, k, e); }; - this.CanvasRenderingContext2D && (CanvasRenderingContext2D.prototype.roundRect = function(a, b, c, e, f, l) { + this.CanvasRenderingContext2D && (CanvasRenderingContext2D.prototype.roundRect = function(a, b, c, e, f, k) { void 0 === f && (f = 5); - void 0 === l && (l = f); + void 0 === k && (k = f); this.moveTo(a + f, b); this.lineTo(a + c - f, b); this.quadraticCurveTo(a + c, b, a + c, b + f); - this.lineTo(a + c, b + e - l); - this.quadraticCurveTo(a + c, b + e, a + c - l, b + e); - this.lineTo(a + l, b + e); - this.quadraticCurveTo(a, b + e, a, b + e - l); + this.lineTo(a + c, b + e - k); + this.quadraticCurveTo(a + c, b + e, a + c - k, b + e); + this.lineTo(a + k, b + e); + this.quadraticCurveTo(a, b + e, a, b + e - k); this.lineTo(a, b + f); this.quadraticCurveTo(a, b, a + f, b); }); - g.compareObjects = function(a, b) { + l.compareObjects = function(a, b) { for (var c in a) { if (a[c] != b[c]) { return !1; @@ -3744,28 +3749,28 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !0; }; - g.distance = u; - g.colorToString = function(a) { + l.distance = u; + l.colorToString = function(a) { return "rgba(" + Math.round(255 * a[0]).toFixed() + "," + Math.round(255 * a[1]).toFixed() + "," + Math.round(255 * a[2]).toFixed() + "," + (4 == a.length ? a[3].toFixed(2) : "1.0") + ")"; }; - g.isInsideRectangle = t; - g.growBounding = function(a, b, c) { + l.isInsideRectangle = t; + l.growBounding = function(a, b, c) { b < a[0] ? a[0] = b : b > a[2] && (a[2] = b); c < a[1] ? a[1] = c : c > a[3] && (a[3] = c); }; - g.isInsideBounding = function(a, b) { + l.isInsideBounding = function(a, b) { return a[0] < b[0][0] || a[1] < b[0][1] || a[0] > b[1][0] || a[1] > b[1][1] ? !1 : !0; }; - g.overlapBounding = w; - g.hex2num = function(a) { + l.overlapBounding = w; + l.hex2num = function(a) { "#" == a.charAt(0) && (a = a.slice(1)); a = a.toUpperCase(); - for (var b = Array(3), c = 0, e, f, l = 0; 6 > l; l += 2) { - e = "0123456789ABCDEF".indexOf(a.charAt(l)), f = "0123456789ABCDEF".indexOf(a.charAt(l + 1)), b[c] = 16 * e + f, c++; + for (var b = Array(3), c = 0, e, f, k = 0; 6 > k; k += 2) { + e = "0123456789ABCDEF".indexOf(a.charAt(k)), f = "0123456789ABCDEF".indexOf(a.charAt(k + 1)), b[c] = 16 * e + f, c++; } return b; }; - g.num2hex = function(a) { + l.num2hex = function(a) { for (var b = "#", c, e, f = 0; 3 > f; f++) { c = a[f] / 16, e = a[f] % 16, b += "0123456789ABCDEF".charAt(c) + "0123456789ABCDEF".charAt(e); } @@ -3778,39 +3783,39 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } function f(a) { var b = this.value, e = !0; - l.current_submenu && l.current_submenu.close(a); + k.current_submenu && k.current_submenu.close(a); if (c.callback) { - var f = c.callback.call(this, b, c, a, l, c.node); + var f = c.callback.call(this, b, c, a, k, c.node); !0 === f && (e = !1); } - if (b && (b.callback && !c.ignore_item_callbacks && !0 !== b.disabled && (f = b.callback.call(this, b, c, a, l, c.extra), !0 === f && (e = !1)), b.submenu)) { + if (b && (b.callback && !c.ignore_item_callbacks && !0 !== b.disabled && (f = b.callback.call(this, b, c, a, k, c.extra), !0 === f && (e = !1)), b.submenu)) { if (!b.submenu.options) { throw "ContextMenu submenu needs options"; } - new l.constructor(b.submenu.options, {callback:b.submenu.callback, event:a, parentMenu:l, ignore_item_callbacks:b.submenu.ignore_item_callbacks, title:b.submenu.title, extra:b.submenu.extra, autoopen:c.autoopen}); + new k.constructor(b.submenu.options, {callback:b.submenu.callback, event:a, parentMenu:k, ignore_item_callbacks:b.submenu.ignore_item_callbacks, title:b.submenu.title, extra:b.submenu.extra, autoopen:c.autoopen}); e = !1; } - e && !l.lock && l.close(); + e && !k.lock && k.close(); } - var l = this; + var k = this; c = c || {}; - var d = document.createElement("div"); - d.className = "litemenu-entry submenu"; - var m = !1; + var g = document.createElement("div"); + g.className = "litemenu-entry submenu"; + var d = !1; if (null === b) { - d.classList.add("separator"); + g.classList.add("separator"); } else { - d.innerHTML = b && b.title ? b.title : a; - if (d.value = b) { - b.disabled && (m = !0, d.classList.add("disabled")), (b.submenu || b.has_submenu) && d.classList.add("has_submenu"); + g.innerHTML = b && b.title ? b.title : a; + if (g.value = b) { + b.disabled && (d = !0, g.classList.add("disabled")), (b.submenu || b.has_submenu) && g.classList.add("has_submenu"); } - "function" == typeof b ? (d.dataset.value = a, d.onclick_callback = b) : d.dataset.value = b; - b.className && (d.className += " " + b.className); + "function" == typeof b ? (g.dataset.value = a, g.onclick_callback = b) : g.dataset.value = b; + b.className && (g.className += " " + b.className); } - this.root.appendChild(d); - m || d.addEventListener("click", f); - c.autoopen && d.addEventListener("mouseenter", e); - return d; + this.root.appendChild(g); + d || g.addEventListener("click", f); + c.autoopen && g.addEventListener("mouseenter", e); + return g; }; y.prototype.close = function(a, b) { this.root.parentNode && this.root.parentNode.removeChild(this.root); @@ -3836,8 +3841,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a = a.pageY; return (b = b.getBoundingClientRect()) ? a > b.top && a < b.top + b.height && c > b.left && c < b.left + b.width ? !0 : !1 : !1; }; - g.ContextMenu = y; - g.closeAllContextMenus = function(a) { + l.ContextMenu = y; + l.closeAllContextMenus = function(a) { a = a || window; a = a.document.querySelectorAll(".litecontextmenu"); if (a.length) { @@ -3849,7 +3854,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - g.extendClass = function(a, b) { + l.extendClass = function(a, b) { for (var c in b) { a.hasOwnProperty(c) || (a[c] = b[c]); } @@ -3859,7 +3864,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - g.getParameterNames = function(a) { + l.getParameterNames = function(a) { return (a + "").replace(/[/][/].*$/mg, "").replace(/\s+/g, "").replace(/[/][*][^/*]*[*][/]/g, "").split("){", 1)[0].replace(/^[^(]*[(]/, "").replace(/=[^,]+/g, "").split(",").filter(Boolean); }; Math.clamp = function(a, b, c) { @@ -3871,11 +3876,11 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { })(this); "undefined" != typeof exports && (exports.LiteGraph = this.LiteGraph); (function(v) { - function k() { + function d() { this.addOutput("in ms", "number"); this.addOutput("in sec", "number"); } - function h() { + function m() { this.size = [120, 80]; this.subgraph = new LGraph; this.subgraph._subgraph_node = this; @@ -3890,44 +3895,44 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.bgcolor = "#557"; } function q() { - var d = "input_" + (1000 * Math.random()).toFixed(); - this.addOutput(d, null); - this.properties = {name:d, type:null}; + var g = "input_" + (1000 * Math.random()).toFixed(); + this.addOutput(g, null); + this.properties = {name:g, type:null}; var a = this; Object.defineProperty(this.properties, "name", {get:function() { - return d; + return g; }, set:function(b) { if ("" != b) { var c = a.getOutputInfo(0); - c.name != b && (c.name = b, a.graph && a.graph.renameGlobalInput(d, b), d = b); + c.name != b && (c.name = b, a.graph && a.graph.renameGlobalInput(g, b), g = b); } }, enumerable:!0}); Object.defineProperty(this.properties, "type", {get:function() { return a.outputs[0].type; }, set:function(b) { a.outputs[0].type = b; - a.graph && a.graph.changeGlobalInputType(d, a.outputs[0].type); + a.graph && a.graph.changeGlobalInputType(g, a.outputs[0].type); }, enumerable:!0}); } - function d() { - var d = "output_" + (1000 * Math.random()).toFixed(); - this.addInput(d, null); + function h() { + var g = "output_" + (1000 * Math.random()).toFixed(); + this.addInput(g, null); this._value = null; - this.properties = {name:d, type:null}; + this.properties = {name:g, type:null}; var a = this; Object.defineProperty(this.properties, "name", {get:function() { - return d; + return g; }, set:function(b) { if ("" != b) { var c = a.getInputInfo(0); - c.name != b && (c.name = b, a.graph && a.graph.renameGlobalOutput(d, b), d = b); + c.name != b && (c.name = b, a.graph && a.graph.renameGlobalOutput(g, b), g = b); } }, enumerable:!0}); Object.defineProperty(this.properties, "type", {get:function() { return a.inputs[0].type; }, set:function(b) { a.inputs[0].type = b; - a.graph && a.graph.changeGlobalInputType(d, a.inputs[0].type); + a.graph && a.graph.changeGlobalInputType(g, a.inputs[0].type); }, enumerable:!0}); } function u() { @@ -3950,11 +3955,11 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out", 0); this.size = [40, 20]; } - function g() { - this.mode = n.ON_EVENT; + function l() { + this.mode = p.ON_EVENT; this.size = [60, 20]; this.addProperty("msg", ""); - this.addInput("log", n.EVENT); + this.addInput("log", p.EVENT); this.addInput("msg", 0); } function z() { @@ -3966,198 +3971,198 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out2", ""); this._func = null; } - var n = v.LiteGraph; - k.title = "Time"; - k.desc = "Time"; - k.prototype.onExecute = function() { + var p = v.LiteGraph; + d.title = "Time"; + d.desc = "Time"; + d.prototype.onExecute = function() { this.setOutputData(0, 1000 * this.graph.globaltime); this.setOutputData(1, this.graph.globaltime); }; - n.registerNodeType("basic/time", k); - h.title = "Subgraph"; - h.desc = "Graph inside a node"; - h.prototype.onDrawTitle = function(d) { + p.registerNodeType("basic/time", d); + m.title = "Subgraph"; + m.desc = "Graph inside a node"; + m.prototype.onDrawTitle = function(g) { if (!this.flags.collapsed) { - d.fillStyle = "#AAA"; - var a = n.NODE_TITLE_HEIGHT, b = this.size[0] - a; - d.fillRect(b, -a, a, a); - d.fillStyle = "#333"; - d.beginPath(); - d.moveTo(b + 0.2 * a, 0.6 * -a); - d.lineTo(b + 0.8 * a, 0.6 * -a); - d.lineTo(b + 0.5 * a, 0.3 * -a); - d.fill(); + g.fillStyle = "#AAA"; + var a = p.NODE_TITLE_HEIGHT, b = this.size[0] - a; + g.fillRect(b, -a, a, a); + g.fillStyle = "#333"; + g.beginPath(); + g.moveTo(b + 0.2 * a, 0.6 * -a); + g.lineTo(b + 0.8 * a, 0.6 * -a); + g.lineTo(b + 0.5 * a, 0.3 * -a); + g.fill(); } }; - h.prototype.onDblClick = function(d, a, b) { + m.prototype.onDblClick = function(g, a, b) { var c = this; setTimeout(function() { b.openSubgraph(c.subgraph); }, 10); }; - h.prototype.onMouseDown = function(d, a, b) { - if (!this.flags.collapsed && a[0] > this.size[0] - n.NODE_TITLE_HEIGHT && 0 > a[1]) { + m.prototype.onMouseDown = function(g, a, b) { + if (!this.flags.collapsed && a[0] > this.size[0] - p.NODE_TITLE_HEIGHT && 0 > a[1]) { var c = this; setTimeout(function() { b.openSubgraph(c.subgraph); }, 10); } }; - h.prototype.onSubgraphNewGlobalInput = function(d, a) { - this.addInput(d, a); + m.prototype.onSubgraphNewGlobalInput = function(g, a) { + this.addInput(g, a); }; - h.prototype.onSubgraphRenamedGlobalInput = function(d, a) { - d = this.findInputSlot(d); - -1 != d && (this.getInputInfo(d).name = a); + m.prototype.onSubgraphRenamedGlobalInput = function(g, a) { + g = this.findInputSlot(g); + -1 != g && (this.getInputInfo(g).name = a); }; - h.prototype.onSubgraphTypeChangeGlobalInput = function(d, a) { - d = this.findInputSlot(d); - -1 != d && (this.getInputInfo(d).type = a); + m.prototype.onSubgraphTypeChangeGlobalInput = function(g, a) { + g = this.findInputSlot(g); + -1 != g && (this.getInputInfo(g).type = a); }; - h.prototype.onSubgraphNewGlobalOutput = function(d, a) { - this.addOutput(d, a); + m.prototype.onSubgraphNewGlobalOutput = function(g, a) { + this.addOutput(g, a); }; - h.prototype.onSubgraphRenamedGlobalOutput = function(d, a) { - d = this.findOutputSlot(d); - -1 != d && (this.getOutputInfo(d).name = a); + m.prototype.onSubgraphRenamedGlobalOutput = function(g, a) { + g = this.findOutputSlot(g); + -1 != g && (this.getOutputInfo(g).name = a); }; - h.prototype.onSubgraphTypeChangeGlobalOutput = function(d, a) { - d = this.findOutputSlot(d); - -1 != d && (this.getOutputInfo(d).type = a); + m.prototype.onSubgraphTypeChangeGlobalOutput = function(g, a) { + g = this.findOutputSlot(g); + -1 != g && (this.getOutputInfo(g).type = a); }; - h.prototype.getExtraMenuOptions = function(d) { + m.prototype.getExtraMenuOptions = function(g) { var a = this; return [{content:"Open", callback:function() { - d.openSubgraph(a.subgraph); + g.openSubgraph(a.subgraph); }}]; }; - h.prototype.onResize = function(d) { - d[1] += 20; + m.prototype.onResize = function(g) { + g[1] += 20; }; - h.prototype.onExecute = function() { + m.prototype.onExecute = function() { if (this.inputs) { - for (var d = 0; d < this.inputs.length; d++) { - var a = this.inputs[d], b = this.getInputData(d); + for (var g = 0; g < this.inputs.length; g++) { + var a = this.inputs[g], b = this.getInputData(g); this.subgraph.setGlobalInputData(a.name, b); } } this.subgraph.runStep(); if (this.outputs) { - for (d = 0; d < this.outputs.length; d++) { - b = this.subgraph.getGlobalOutputData(this.outputs[d].name), this.setOutputData(d, b); + for (g = 0; g < this.outputs.length; g++) { + b = this.subgraph.getGlobalOutputData(this.outputs[g].name), this.setOutputData(g, b); } } }; - h.prototype.configure = function(d) { - LGraphNode.prototype.configure.call(this, d); + m.prototype.configure = function(g) { + LGraphNode.prototype.configure.call(this, g); }; - h.prototype.serialize = function() { - var d = LGraphNode.prototype.serialize.call(this); - d.subgraph = this.subgraph.serialize(); - return d; + m.prototype.serialize = function() { + var g = LGraphNode.prototype.serialize.call(this); + g.subgraph = this.subgraph.serialize(); + return g; }; - h.prototype.clone = function() { - var d = n.createNode(this.type), a = this.serialize(); + m.prototype.clone = function() { + var g = p.createNode(this.type), a = this.serialize(); delete a.id; delete a.inputs; delete a.outputs; - d.configure(a); - return d; + g.configure(a); + return g; }; - n.registerNodeType("graph/subgraph", h); + p.registerNodeType("graph/subgraph", m); q.title = "Input"; q.desc = "Input of the graph"; q.prototype.onAdded = function() { this.graph.addGlobalInput(this.properties.name, this.properties.type); }; q.prototype.onExecute = function() { - var d = this.graph.global_inputs[this.properties.name]; - d && this.setOutputData(0, d.value); + var g = this.graph.global_inputs[this.properties.name]; + g && this.setOutputData(0, g.value); }; - n.registerNodeType("graph/input", q); - d.title = "Output"; - d.desc = "Output of the graph"; - d.prototype.onAdded = function() { + p.registerNodeType("graph/input", q); + h.title = "Output"; + h.desc = "Output of the graph"; + h.prototype.onAdded = function() { this.graph.addGlobalOutput(this.properties.name, this.properties.type); }; - d.prototype.getValue = function() { + h.prototype.getValue = function() { return this._value; }; - d.prototype.onExecute = function() { + h.prototype.onExecute = function() { this._value = this.getInputData(0); this.graph.setGlobalOutputData(this.properties.name, this._value); }; - n.registerNodeType("graph/output", d); + p.registerNodeType("graph/output", h); u.title = "Const Number"; u.desc = "Constant number"; u.prototype.onExecute = function() { this.setOutputData(0, parseFloat(this.properties.value)); }; - u.prototype.onDrawBackground = function(d) { + u.prototype.onDrawBackground = function(g) { this.outputs[0].label = this.properties.value.toFixed(3); }; - n.registerNodeType("basic/const", u); + p.registerNodeType("basic/const", u); t.title = "Const String"; t.desc = "Constant string"; - t.prototype.setValue = function(d) { - this.properties.value = d; + t.prototype.setValue = function(g) { + this.properties.value = g; }; - t.prototype.onPropertyChanged = function(d, a) { + t.prototype.onPropertyChanged = function(g, a) { this.widget.value = a; }; t.prototype.onExecute = function() { this.setOutputData(0, this.properties.value); }; - n.registerNodeType("basic/string", t); + p.registerNodeType("basic/string", t); w.title = "Watch"; w.desc = "Show value of input"; w.prototype.onExecute = function() { this.inputs[0] && (this.value = this.getInputData(0)); }; - w.toString = function(d) { - if (null == d) { + w.toString = function(g) { + if (null == g) { return "null"; } - if (d.constructor === Number) { - return d.toFixed(3); + if (g.constructor === Number) { + return g.toFixed(3); } - if (d.constructor === Array) { - for (var a = "[", b = 0; b < d.length; ++b) { - a += w.toString(d[b]) + (b + 1 != d.length ? "," : ""); + if (g.constructor === Array) { + for (var a = "[", b = 0; b < g.length; ++b) { + a += w.toString(g[b]) + (b + 1 != g.length ? "," : ""); } return a + "]"; } - return String(d); + return String(g); }; - w.prototype.onDrawBackground = function(d) { + w.prototype.onDrawBackground = function(g) { this.inputs[0].label = w.toString(this.value); }; - n.registerNodeType("basic/watch", w); + p.registerNodeType("basic/watch", w); y.title = "Pass"; y.desc = "Allows to connect different types"; y.prototype.onExecute = function() { this.setOutputData(0, this.getInputData(0)); }; - n.registerNodeType("basic/pass", y); - g.title = "Console"; - g.desc = "Show value inside the console"; - g.prototype.onAction = function(d, a) { - "log" == d ? console.log(a) : "warn" == d ? console.warn(a) : "error" == d && console.error(a); + p.registerNodeType("basic/pass", y); + l.title = "Console"; + l.desc = "Show value inside the console"; + l.prototype.onAction = function(g, a) { + "log" == g ? console.log(a) : "warn" == g ? console.warn(a) : "error" == g && console.error(a); }; - g.prototype.onExecute = function() { - var d = this.getInputData(1); - null !== d && (this.properties.msg = d); - console.log(d); + l.prototype.onExecute = function() { + var g = this.getInputData(1); + null !== g && (this.properties.msg = g); + console.log(g); }; - g.prototype.onGetInputs = function() { - return [["log", n.ACTION], ["warn", n.ACTION], ["error", n.ACTION]]; + l.prototype.onGetInputs = function() { + return [["log", p.ACTION], ["warn", p.ACTION], ["error", p.ACTION]]; }; - n.registerNodeType("basic/console", g); + p.registerNodeType("basic/console", l); z.title = "Script"; z.desc = "executes a code"; z.widgets_info = {onExecute:{type:"code"}}; - z.prototype.onPropertyChanged = function(d, a) { - if ("onExecute" == d && n.allow_scripts) { + z.prototype.onPropertyChanged = function(g, a) { + if ("onExecute" == g && p.allow_scripts) { this._func = null; try { this._func = new Function(a); @@ -4170,19 +4175,19 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (this._func) { try { this._func.call(this); - } catch (m) { - console.error("Error in script"), console.error(m); + } catch (g) { + console.error("Error in script"), console.error(g); } } }; - n.registerNodeType("basic/script", z); + p.registerNodeType("basic/script", z); })(this); (function(v) { - function k() { + function d() { this.size = [60, 20]; this.addInput("event", w.ACTION); } - function h() { + function m() { this.addInput("", w.ACTION); this.addInput("", w.ACTION); this.addInput("", w.ACTION); @@ -4204,7 +4209,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("event", w.EVENT); this.properties = {equal_to:"", has_property:"", property_equal_to:""}; } - function d() { + function h() { this.addInput("inc", w.ACTION); this.addInput("dec", w.ACTION); this.addInput("reset", w.ACTION); @@ -4228,60 +4233,60 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.triggered = !1; } var w = v.LiteGraph; - k.title = "Log Event"; - k.desc = "Log event in console"; - k.prototype.onAction = function(d, g) { - console.log(d, g); + d.title = "Log Event"; + d.desc = "Log event in console"; + d.prototype.onAction = function(d, h) { + console.log(d, h); }; - w.registerNodeType("events/log", k); - h.title = "Sequencer"; - h.desc = "Trigger events when an event arrives"; - h.prototype.getTitle = function() { + w.registerNodeType("events/log", d); + m.title = "Sequencer"; + m.desc = "Trigger events when an event arrives"; + m.prototype.getTitle = function() { return ""; }; - h.prototype.onAction = function(d, g) { + m.prototype.onAction = function(d, h) { if (this.outputs) { for (d = 0; d < this.outputs.length; ++d) { - this.triggerSlot(d, g); + this.triggerSlot(d, h); } } }; - w.registerNodeType("events/sequencer", h); + w.registerNodeType("events/sequencer", m); q.title = "Filter Event"; q.desc = "Blocks events that do not match the filter"; - q.prototype.onAction = function(d, g) { - if (null != g && (!this.properties.equal_to || this.properties.equal_to == g)) { - if (this.properties.has_property && (d = g[this.properties.has_property], null == d || this.properties.property_equal_to && this.properties.property_equal_to != d)) { + q.prototype.onAction = function(d, h) { + if (null != h && (!this.properties.equal_to || this.properties.equal_to == h)) { + if (this.properties.has_property && (d = h[this.properties.has_property], null == d || this.properties.property_equal_to && this.properties.property_equal_to != d)) { return; } - this.triggerSlot(0, g); + this.triggerSlot(0, h); } }; w.registerNodeType("events/filter", q); - d.title = "Counter"; - d.desc = "Counts events"; - d.prototype.onAction = function(d, g) { - g = this.num; + h.title = "Counter"; + h.desc = "Counts events"; + h.prototype.onAction = function(d, h) { + h = this.num; "inc" == d ? this.num += 1 : "dec" == d ? --this.num : "reset" == d && (this.num = 0); - this.num != g && this.trigger("change", this.num); + this.num != h && this.trigger("change", this.num); }; - d.prototype.onDrawBackground = function(d) { + h.prototype.onDrawBackground = function(d) { this.flags.collapsed || (d.fillStyle = "#AAA", d.font = "20px Arial", d.textAlign = "center", d.fillText(this.num, 0.5 * this.size[0], 0.5 * this.size[1])); }; - d.prototype.onExecute = function() { + h.prototype.onExecute = function() { this.setOutputData(1, this.num); }; - w.registerNodeType("events/counter", d); + w.registerNodeType("events/counter", h); u.title = "Delay"; u.desc = "Delays one event"; - u.prototype.onAction = function(d, g) { - this._pending.push([this.properties.time, g]); + u.prototype.onAction = function(d, h) { + this._pending.push([this.properties.time, h]); }; u.prototype.onExecute = function() { - for (var d = 1000 * this.graph.elapsed_time, g = 0; g < this._pending.length; ++g) { - var k = this._pending[g]; - k[0] -= d; - 0 < k[0] || (this._pending.splice(g, 1), --g, this.trigger(null, k[1])); + for (var d = 1000 * this.graph.elapsed_time, h = 0; h < this._pending.length; ++h) { + var m = this._pending[h]; + m[0] -= d; + 0 < m[0] || (this._pending.splice(h, 1), --h, this.trigger(null, m[1])); } }; u.prototype.onGetInputs = function() { @@ -4317,14 +4322,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { w.registerNodeType("events/timer", t); })(this); (function(v) { - function k() { + function d() { this.addOutput("clicked", z.EVENT); this.addProperty("text", ""); this.addProperty("font_size", 40); this.addProperty("message", ""); this.size = [64, 84]; } - function h() { + function m() { this.addInput("", "boolean"); this.addInput("e", z.ACTION); this.addOutput("v", "boolean"); @@ -4340,7 +4345,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._precision = this._remainder = 0; this.mouse_captured = !1; } - function d() { + function h() { this.addOutput("", "number"); this.size = [64, 84]; this.properties = {min:0, max:1, value:0.5, wcolor:"#7AF", size:50}; @@ -4350,8 +4355,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.properties = {value:0.5, min:0, max:1, text:"V"}; var d = this; this.size = [80, 60]; - this.slider = this.addWidget("slider", "V", this.properties.value, function(n) { - d.properties.value = n; + this.slider = this.addWidget("slider", "V", this.properties.value, function(g) { + d.properties.value = g; }, this.properties); } function t() { @@ -4368,36 +4373,36 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInputs("", 0); this.properties = {value:"...", font:"Arial", fontsize:18, color:"#AAA", align:"left", glowSize:0, decimals:1}; } - function g() { + function l() { this.size = [200, 100]; this.properties = {borderColor:"#ffffff", bgcolorTop:"#f0f0f0", bgcolorBottom:"#e0e0e0", shadowSize:2, borderRadius:3}; } var z = v.LiteGraph; - k.title = "Button"; - k.desc = "Triggers an event"; - k.font = "Arial"; - k.prototype.onDrawForeground = function(d) { - if (!this.flags.collapsed && (d.fillStyle = "black", d.fillRect(1, 1, this.size[0] - 3, this.size[1] - 3), d.fillStyle = "#AAF", d.fillRect(0, 0, this.size[0] - 3, this.size[1] - 3), d.fillStyle = this.clicked ? "white" : this.mouseOver ? "#668" : "#334", d.fillRect(1, 1, this.size[0] - 4, this.size[1] - 4), this.properties.text || 0 === this.properties.text)) { - var n = this.properties.font_size || 30; - d.textAlign = "center"; - d.fillStyle = this.clicked ? "black" : "white"; - d.font = n + "px " + k.font; - d.fillText(this.properties.text, 0.5 * this.size[0], 0.5 * this.size[1] + 0.3 * n); - d.textAlign = "left"; + d.title = "Button"; + d.desc = "Triggers an event"; + d.font = "Arial"; + d.prototype.onDrawForeground = function(h) { + if (!this.flags.collapsed && (h.fillStyle = "black", h.fillRect(1, 1, this.size[0] - 3, this.size[1] - 3), h.fillStyle = "#AAF", h.fillRect(0, 0, this.size[0] - 3, this.size[1] - 3), h.fillStyle = this.clicked ? "white" : this.mouseOver ? "#668" : "#334", h.fillRect(1, 1, this.size[0] - 4, this.size[1] - 4), this.properties.text || 0 === this.properties.text)) { + var g = this.properties.font_size || 30; + h.textAlign = "center"; + h.fillStyle = this.clicked ? "black" : "white"; + h.font = g + "px " + d.font; + h.fillText(this.properties.text, 0.5 * this.size[0], 0.5 * this.size[1] + 0.3 * g); + h.textAlign = "left"; } }; - k.prototype.onMouseDown = function(d, g) { + d.prototype.onMouseDown = function(d, g) { if (1 < g[0] && 1 < g[1] && g[0] < this.size[0] - 2 && g[1] < this.size[1] - 2) { return this.clicked = !0, this.trigger("clicked", this.properties.message), !0; } }; - k.prototype.onMouseUp = function(d) { + d.prototype.onMouseUp = function(d) { this.clicked = !1; }; - z.registerNodeType("widget/button", k); - h.title = "Toggle"; - h.desc = "Toggles between true or false"; - h.prototype.onDrawForeground = function(d) { + z.registerNodeType("widget/button", d); + m.title = "Toggle"; + m.desc = "Toggles between true or false"; + m.prototype.onDrawForeground = function(d) { if (!this.flags.collapsed) { var g = 0.5 * this.size[1], a = 0.8 * this.size[1]; d.fillStyle = "#AAA"; @@ -4411,21 +4416,21 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { d.textAlign = "left"; } }; - h.prototype.onAction = function(d) { + m.prototype.onAction = function(d) { this.properties.value = !this.properties.value; this.trigger("e", this.properties.value); }; - h.prototype.onExecute = function() { + m.prototype.onExecute = function() { var d = this.getInputData(0); null != d && (this.properties.value = d); this.setOutputData(0, this.properties.value); }; - h.prototype.onMouseDown = function(d, g) { + m.prototype.onMouseDown = function(d, g) { if (1 < g[0] && 1 < g[1] && g[0] < this.size[0] - 2 && g[1] < this.size[1] - 2) { return this.properties.value = !this.properties.value, this.graph._version++, this.trigger("e", this.properties.value), !0; } }; - z.registerNodeType("widget/toggle", h); + z.registerNodeType("widget/toggle", m); q.title = "Number"; q.desc = "Widget to select number value"; q.pixels_threshold = 10; @@ -4471,15 +4476,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.mouse_captured && (this.mouse_captured = !1, this.captureInput(!1)); }; z.registerNodeType("widget/number", q); - d.title = "Knob"; - d.desc = "Circular controller"; - d.widgets = [{name:"increase", text:"+", type:"minibutton"}, {name:"decrease", text:"-", type:"minibutton"}]; - d.prototype.onAdded = function() { + h.title = "Knob"; + h.desc = "Circular controller"; + h.widgets = [{name:"increase", text:"+", type:"minibutton"}, {name:"decrease", text:"-", type:"minibutton"}]; + h.prototype.onAdded = function() { this.value = (this.properties.value - this.properties.min) / (this.properties.max - this.properties.min); this.imgbg = this.loadImage("imgs/knob_bg.png"); this.imgfg = this.loadImage("imgs/knob_fg.png"); }; - d.prototype.onDrawImageKnob = function(d) { + h.prototype.onDrawImageKnob = function(d) { if (this.imgfg && this.imgfg.width) { var g = 0.5 * this.imgbg.width, a = this.size[0] / this.imgfg.width; d.save(); @@ -4494,7 +4499,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.title && (d.font = "bold 16px Criticized,Tahoma", d.fillStyle = "rgba(100,100,100,0.8)", d.textAlign = "center", d.fillText(this.title.toUpperCase(), 0.5 * this.size[0], 18), d.textAlign = "left"); } }; - d.prototype.onDrawVectorKnob = function(d) { + h.prototype.onDrawVectorKnob = function(d) { if (this.imgfg && this.imgfg.width) { d.lineWidth = 1; d.strokeStyle = this.mouseOver ? "#FFF" : "#AAA"; @@ -4512,14 +4517,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { d.textAlign = "left"; } }; - d.prototype.onDrawForeground = function(d) { + h.prototype.onDrawForeground = function(d) { this.onDrawImageKnob(d); }; - d.prototype.onExecute = function() { + h.prototype.onExecute = function() { this.setOutputData(0, this.properties.value); this.boxcolor = z.colorToString([this.value, this.value, this.value]); }; - d.prototype.onMouseDown = function(d) { + h.prototype.onMouseDown = function(d) { if (this.imgfg && this.imgfg.width) { this.center = [0.5 * this.size[0], 0.5 * this.size[1] + 20]; this.radius = 0.5 * this.size[0]; @@ -4531,7 +4536,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return !0; } }; - d.prototype.onMouseMove = function(d) { + h.prototype.onMouseMove = function(d) { if (this.oldmouse) { d = [d.canvasX - this.pos[0], d.canvasY - this.pos[1]]; var g = this.value; @@ -4543,12 +4548,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setDirtyCanvas(!0); } }; - d.prototype.onMouseUp = function(d) { + h.prototype.onMouseUp = function(d) { this.oldmouse && (this.oldmouse = null, this.captureInput(!1)); }; - d.prototype.onMouseLeave = function(d) { + h.prototype.onMouseLeave = function(d) { }; - d.prototype.onPropertyChanged = function(d, g) { + h.prototype.onPropertyChanged = function(d, g) { if ("wcolor" == d) { this.properties[d] = g; } else { @@ -4564,7 +4569,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } return !0; }; - z.registerNodeType("widget/knob", d); + z.registerNodeType("widget/knob", h); u.title = "Internal Slider"; u.prototype.onPropertyChanged = function(d, g) { "value" == d && (this.slider.value = g); @@ -4687,23 +4692,23 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return !0; }; z.registerNodeType("widget/text", y); - g.title = "Panel"; - g.desc = "Non interactive panel"; - g.widgets = [{name:"update", text:"Update", type:"button"}]; - g.prototype.createGradient = function(d) { + l.title = "Panel"; + l.desc = "Non interactive panel"; + l.widgets = [{name:"update", text:"Update", type:"button"}]; + l.prototype.createGradient = function(d) { "" == this.properties.bgcolorTop || "" == this.properties.bgcolorBottom ? this.lineargradient = 0 : (this.lineargradient = d.createLinearGradient(0, 0, 0, this.size[1]), this.lineargradient.addColorStop(0, this.properties.bgcolorTop), this.lineargradient.addColorStop(1, this.properties.bgcolorBottom)); }; - g.prototype.onDrawForeground = function(d) { + l.prototype.onDrawForeground = function(d) { null == this.lineargradient && this.createGradient(d); this.lineargradient && (d.lineWidth = 1, d.strokeStyle = this.properties.borderColor, d.fillStyle = this.lineargradient, this.properties.shadowSize ? (d.shadowColor = "#000", d.shadowOffsetX = 0, d.shadowOffsetY = 0, d.shadowBlur = this.properties.shadowSize) : d.shadowColor = "transparent", d.roundRect(0, 0, this.size[0] - 1, this.size[1] - 1, this.properties.shadowSize), d.fill(), d.shadowColor = "transparent", d.stroke()); }; - z.registerNodeType("widget/panel", g); + z.registerNodeType("widget/panel", l); })(this); (function(v) { - function k() { + function d() { this.addOutput("left_x_axis", "number"); this.addOutput("left_y_axis", "number"); - this.addOutput("button_pressed", h.EVENT); + this.addOutput("button_pressed", m.EVENT); this.properties = {gamepad_index:0, threshold:0.1}; this._left_axis = new Float32Array(2); this._right_axis = new Float32Array(2); @@ -4711,20 +4716,20 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._previous_buttons = new Uint8Array(17); this._current_buttons = new Uint8Array(17); } - var h = v.LiteGraph; - k.title = "Gamepad"; - k.desc = "gets the input of the gamepad"; - k.zero = new Float32Array(2); - k.buttons = "a b x y lb rb lt rt back start ls rs home".split(" "); - k.prototype.onExecute = function() { - var h = this.getGamepad(), d = this.properties.threshold || 0.0; - h && (this._left_axis[0] = Math.abs(h.xbox.axes.lx) > d ? h.xbox.axes.lx : 0, this._left_axis[1] = Math.abs(h.xbox.axes.ly) > d ? h.xbox.axes.ly : 0, this._right_axis[0] = Math.abs(h.xbox.axes.rx) > d ? h.xbox.axes.rx : 0, this._right_axis[1] = Math.abs(h.xbox.axes.ry) > d ? h.xbox.axes.ry : 0, this._triggers[0] = Math.abs(h.xbox.axes.ltrigger) > d ? h.xbox.axes.ltrigger : 0, this._triggers[1] = Math.abs(h.xbox.axes.rtrigger) > d ? h.xbox.axes.rtrigger : 0); + var m = v.LiteGraph; + d.title = "Gamepad"; + d.desc = "gets the input of the gamepad"; + d.zero = new Float32Array(2); + d.buttons = "a b x y lb rb lt rt back start ls rs home".split(" "); + d.prototype.onExecute = function() { + var m = this.getGamepad(), h = this.properties.threshold || 0.0; + m && (this._left_axis[0] = Math.abs(m.xbox.axes.lx) > h ? m.xbox.axes.lx : 0, this._left_axis[1] = Math.abs(m.xbox.axes.ly) > h ? m.xbox.axes.ly : 0, this._right_axis[0] = Math.abs(m.xbox.axes.rx) > h ? m.xbox.axes.rx : 0, this._right_axis[1] = Math.abs(m.xbox.axes.ry) > h ? m.xbox.axes.ry : 0, this._triggers[0] = Math.abs(m.xbox.axes.ltrigger) > h ? m.xbox.axes.ltrigger : 0, this._triggers[1] = Math.abs(m.xbox.axes.rtrigger) > h ? m.xbox.axes.rtrigger : 0); if (this.outputs) { - for (d = 0; d < this.outputs.length; d++) { - var u = this.outputs[d]; + for (h = 0; h < this.outputs.length; h++) { + var u = this.outputs[h]; if (u.links && u.links.length) { var t = null; - if (h) { + if (m) { switch(u.name) { case "left_axis": t = this._left_axis; @@ -4751,38 +4756,38 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { t = this._triggers[1]; break; case "a_button": - t = h.xbox.buttons.a ? 1 : 0; + t = m.xbox.buttons.a ? 1 : 0; break; case "b_button": - t = h.xbox.buttons.b ? 1 : 0; + t = m.xbox.buttons.b ? 1 : 0; break; case "x_button": - t = h.xbox.buttons.x ? 1 : 0; + t = m.xbox.buttons.x ? 1 : 0; break; case "y_button": - t = h.xbox.buttons.y ? 1 : 0; + t = m.xbox.buttons.y ? 1 : 0; break; case "lb_button": - t = h.xbox.buttons.lb ? 1 : 0; + t = m.xbox.buttons.lb ? 1 : 0; break; case "rb_button": - t = h.xbox.buttons.rb ? 1 : 0; + t = m.xbox.buttons.rb ? 1 : 0; break; case "ls_button": - t = h.xbox.buttons.ls ? 1 : 0; + t = m.xbox.buttons.ls ? 1 : 0; break; case "rs_button": - t = h.xbox.buttons.rs ? 1 : 0; + t = m.xbox.buttons.rs ? 1 : 0; break; case "start_button": - t = h.xbox.buttons.start ? 1 : 0; + t = m.xbox.buttons.start ? 1 : 0; break; case "back_button": - t = h.xbox.buttons.back ? 1 : 0; + t = m.xbox.buttons.back ? 1 : 0; break; case "button_pressed": for (u = 0; u < this._current_buttons.length; ++u) { - this._current_buttons[u] && !this._previous_buttons[u] && this.triggerSlot(d, k.buttons[u]); + this._current_buttons[u] && !this._previous_buttons[u] && this.triggerSlot(h, d.buttons[u]); } } } else { @@ -4791,119 +4796,119 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { break; case "left_axis": case "right_axis": - t = k.zero; + t = d.zero; break; default: t = 0; } } - this.setOutputData(d, t); + this.setOutputData(h, t); } } } }; - k.prototype.getGamepad = function() { - var h = navigator.getGamepads || navigator.webkitGetGamepads || navigator.mozGetGamepads; - if (!h) { + d.prototype.getGamepad = function() { + var d = navigator.getGamepads || navigator.webkitGetGamepads || navigator.mozGetGamepads; + if (!d) { return null; } - h = h.call(navigator); + d = d.call(navigator); this._previous_buttons.set(this._current_buttons); - for (var d = this.properties.gamepad_index; 4 > d; d++) { - if (h[d]) { - h = h[d]; - d = this.xbox_mapping; - d || (d = this.xbox_mapping = {axes:[], buttons:{}, hat:""}); - d.axes.lx = h.axes[0]; - d.axes.ly = h.axes[1]; - d.axes.rx = h.axes[2]; - d.axes.ry = h.axes[3]; - d.axes.ltrigger = h.buttons[6].value; - d.axes.rtrigger = h.buttons[7].value; - for (var k = 0; k < h.buttons.length; k++) { - switch(this._current_buttons[k] = h.buttons[k].pressed, k) { + for (var h = this.properties.gamepad_index; 4 > h; h++) { + if (d[h]) { + d = d[h]; + h = this.xbox_mapping; + h || (h = this.xbox_mapping = {axes:[], buttons:{}, hat:""}); + h.axes.lx = d.axes[0]; + h.axes.ly = d.axes[1]; + h.axes.rx = d.axes[2]; + h.axes.ry = d.axes[3]; + h.axes.ltrigger = d.buttons[6].value; + h.axes.rtrigger = d.buttons[7].value; + for (var m = 0; m < d.buttons.length; m++) { + switch(this._current_buttons[m] = d.buttons[m].pressed, m) { case 0: - d.buttons.a = h.buttons[k].pressed; + h.buttons.a = d.buttons[m].pressed; break; case 1: - d.buttons.b = h.buttons[k].pressed; + h.buttons.b = d.buttons[m].pressed; break; case 2: - d.buttons.x = h.buttons[k].pressed; + h.buttons.x = d.buttons[m].pressed; break; case 3: - d.buttons.y = h.buttons[k].pressed; + h.buttons.y = d.buttons[m].pressed; break; case 4: - d.buttons.lb = h.buttons[k].pressed; + h.buttons.lb = d.buttons[m].pressed; break; case 5: - d.buttons.rb = h.buttons[k].pressed; + h.buttons.rb = d.buttons[m].pressed; break; case 6: - d.buttons.lt = h.buttons[k].pressed; + h.buttons.lt = d.buttons[m].pressed; break; case 7: - d.buttons.rt = h.buttons[k].pressed; + h.buttons.rt = d.buttons[m].pressed; break; case 8: - d.buttons.back = h.buttons[k].pressed; + h.buttons.back = d.buttons[m].pressed; break; case 9: - d.buttons.start = h.buttons[k].pressed; + h.buttons.start = d.buttons[m].pressed; break; case 10: - d.buttons.ls = h.buttons[k].pressed; + h.buttons.ls = d.buttons[m].pressed; break; case 11: - d.buttons.rs = h.buttons[k].pressed; + h.buttons.rs = d.buttons[m].pressed; break; case 12: - h.buttons[k].pressed && (d.hat += "up"); + d.buttons[m].pressed && (h.hat += "up"); break; case 13: - h.buttons[k].pressed && (d.hat += "down"); + d.buttons[m].pressed && (h.hat += "down"); break; case 14: - h.buttons[k].pressed && (d.hat += "left"); + d.buttons[m].pressed && (h.hat += "left"); break; case 15: - h.buttons[k].pressed && (d.hat += "right"); + d.buttons[m].pressed && (h.hat += "right"); break; case 16: - d.buttons.home = h.buttons[k].pressed; + h.buttons.home = d.buttons[m].pressed; } } - h.xbox = d; - return h; + d.xbox = h; + return d; } } }; - k.prototype.onDrawBackground = function(h) { + d.prototype.onDrawBackground = function(d) { if (!this.flags.collapsed) { - var d = this._left_axis, k = this._right_axis; - h.strokeStyle = "#88A"; - h.strokeRect(0.5 * (d[0] + 1) * this.size[0] - 4, 0.5 * (d[1] + 1) * this.size[1] - 4, 8, 8); - h.strokeStyle = "#8A8"; - h.strokeRect(0.5 * (k[0] + 1) * this.size[0] - 4, 0.5 * (k[1] + 1) * this.size[1] - 4, 8, 8); - d = this.size[1] / this._current_buttons.length; - h.fillStyle = "#AEB"; - for (k = 0; k < this._current_buttons.length; ++k) { - this._current_buttons[k] && h.fillRect(0, d * k, 6, d); + var h = this._left_axis, m = this._right_axis; + d.strokeStyle = "#88A"; + d.strokeRect(0.5 * (h[0] + 1) * this.size[0] - 4, 0.5 * (h[1] + 1) * this.size[1] - 4, 8, 8); + d.strokeStyle = "#8A8"; + d.strokeRect(0.5 * (m[0] + 1) * this.size[0] - 4, 0.5 * (m[1] + 1) * this.size[1] - 4, 8, 8); + h = this.size[1] / this._current_buttons.length; + d.fillStyle = "#AEB"; + for (m = 0; m < this._current_buttons.length; ++m) { + this._current_buttons[m] && d.fillRect(0, h * m, 6, h); } } }; - k.prototype.onGetOutputs = function() { - return [["left_axis", "vec2"], ["right_axis", "vec2"], ["left_x_axis", "number"], ["left_y_axis", "number"], ["right_x_axis", "number"], ["right_y_axis", "number"], ["trigger_left", "number"], ["trigger_right", "number"], ["a_button", "number"], ["b_button", "number"], ["x_button", "number"], ["y_button", "number"], ["lb_button", "number"], ["rb_button", "number"], ["ls_button", "number"], ["rs_button", "number"], ["start", "number"], ["back", "number"], ["button_pressed", h.EVENT]]; + d.prototype.onGetOutputs = function() { + return [["left_axis", "vec2"], ["right_axis", "vec2"], ["left_x_axis", "number"], ["left_y_axis", "number"], ["right_x_axis", "number"], ["right_y_axis", "number"], ["trigger_left", "number"], ["trigger_right", "number"], ["a_button", "number"], ["b_button", "number"], ["x_button", "number"], ["y_button", "number"], ["lb_button", "number"], ["rb_button", "number"], ["ls_button", "number"], ["rs_button", "number"], ["start", "number"], ["back", "number"], ["button_pressed", m.EVENT]]; }; - h.registerNodeType("input/gamepad", k); + m.registerNodeType("input/gamepad", d); })(this); (function(v) { - function k() { + function d() { this.addInput("in", "*"); this.size = [60, 20]; } - function h() { + function m() { this.addInput("in"); this.addOutput("out"); this.size = [60, 20]; @@ -4912,7 +4917,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInput("in"); this.addOutput("out"); } - function d() { + function h() { this.addInput("in", "number", {locked:!0}); this.addOutput("out", "number", {locked:!0}); this.addProperty("in", 0); @@ -4946,7 +4951,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out", "number"); this.size = [60, 20]; } - function g() { + function l() { this.addInput("in", "number"); this.addOutput("out", "number"); this.size = [60, 20]; @@ -4956,13 +4961,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out", "number"); this.size = [60, 20]; } - function n() { + function p() { this.addInput("in", "number"); this.addOutput("out", "number"); this.size = [60, 20]; this.properties = {A:0, B:1}; } - function m() { + function g() { this.addInput("in", "number", {label:""}); this.addOutput("out", "number", {label:""}); this.size = [60, 20]; @@ -5008,13 +5013,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addProperty("OP", ">", "string", {values:f.values}); this.size = [60, 40]; } - function l() { + function k() { this.addInput("inc", "number"); this.addOutput("total", "number"); this.addProperty("increment", 1); this.addProperty("value", 0); } - function p() { + function n() { this.addInput("v", "number"); this.addOutput("sin", "number"); this.addProperty("amplitude", 1); @@ -5068,57 +5073,57 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._data = new Float32Array(4); } var A = v.LiteGraph; - k.title = "Converter"; - k.desc = "type A to type B"; - k.prototype.onExecute = function() { + d.title = "Converter"; + d.desc = "type A to type B"; + d.prototype.onExecute = function() { var a = this.getInputData(0); if (null != a && this.outputs) { for (var b = 0; b < this.outputs.length; b++) { var c = this.outputs[b]; if (c.links && c.links.length) { - var d = null; + var e = null; switch(c.name) { case "number": - d = a.length ? a[0] : parseFloat(a); + e = a.length ? a[0] : parseFloat(a); break; case "vec2": case "vec3": case "vec4": - d = 1; + e = 1; switch(c.name) { case "vec2": - d = 2; + e = 2; break; case "vec3": - d = 3; + e = 3; break; case "vec4": - d = 4; - }d = new Float32Array(d); + e = 4; + }e = new Float32Array(e); if (a.length) { - for (c = 0; c < a.length && c < d.length; c++) { - d[c] = a[c]; + for (c = 0; c < a.length && c < e.length; c++) { + e[c] = a[c]; } } else { - d[0] = parseFloat(a); + e[0] = parseFloat(a); } } - this.setOutputData(b, d); + this.setOutputData(b, e); } } } }; - k.prototype.onGetOutputs = function() { + d.prototype.onGetOutputs = function() { return [["number", "number"], ["vec2", "vec2"], ["vec3", "vec3"], ["vec4", "vec4"]]; }; - A.registerNodeType("math/converter", k); - h.title = "Bypass"; - h.desc = "removes the type"; - h.prototype.onExecute = function() { + A.registerNodeType("math/converter", d); + m.title = "Bypass"; + m.desc = "removes the type"; + m.prototype.onExecute = function() { var a = this.getInputData(0); this.setOutputData(0, a); }; - A.registerNodeType("math/bypass", h); + A.registerNodeType("math/bypass", m); q.title = "to Number"; q.desc = "Cast to number"; q.prototype.onExecute = function() { @@ -5126,12 +5131,12 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setOutputData(0, Number(a)); }; A.registerNodeType("math/to_number", q); - d.title = "Range"; - d.desc = "Convert a number from one range to another"; - d.prototype.getTitle = function() { + h.title = "Range"; + h.desc = "Convert a number from one range to another"; + h.prototype.getTitle = function() { return this.flags.collapsed ? (this._last_v || 0).toFixed(2) : this.title; }; - d.prototype.onExecute = function() { + h.prototype.onExecute = function() { if (this.inputs) { for (var a = 0; a < this.inputs.length; a++) { var b = this.inputs[a], c = this.getInputData(a); @@ -5147,13 +5152,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._last_v = (c - a) / (this.properties.in_max - a) * (this.properties.out_max - b) + b; this.setOutputData(0, this._last_v); }; - d.prototype.onDrawBackground = function(a) { + h.prototype.onDrawBackground = function(a) { this.outputs[0].label = this._last_v ? this._last_v.toFixed(3) : "?"; }; - d.prototype.onGetInputs = function() { + h.prototype.onGetInputs = function() { return [["in_min", "number"], ["in_max", "number"], ["out_min", "number"], ["out_max", "number"]]; }; - A.registerNodeType("math/range", d); + A.registerNodeType("math/range", h); u.title = "Rand"; u.desc = "Random number"; u.prototype.onExecute = function() { @@ -5194,8 +5199,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { null == a && (a = 0); var b = this.getInputData(1); null == b && (b = 0); - var c = this.properties.f, d = this.getInputData(2); - void 0 !== d && (c = d); + var c = this.properties.f, e = this.getInputData(2); + void 0 !== e && (c = e); this.setOutputData(0, a * (1 - c) + b * c); }; w.prototype.onGetInputs = function() { @@ -5209,13 +5214,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { null != a && this.setOutputData(0, Math.abs(a)); }; A.registerNodeType("math/abs", y); - g.title = "Floor"; - g.desc = "Floor number to remove fractional part"; - g.prototype.onExecute = function() { + l.title = "Floor"; + l.desc = "Floor number to remove fractional part"; + l.prototype.onExecute = function() { var a = this.getInputData(0); null != a && this.setOutputData(0, Math.floor(a)); }; - A.registerNodeType("math/floor", g); + A.registerNodeType("math/floor", l); z.title = "Frac"; z.desc = "Returns fractional part"; z.prototype.onExecute = function() { @@ -5223,9 +5228,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { null != a && this.setOutputData(0, a % 1); }; A.registerNodeType("math/frac", z); - n.title = "Smoothstep"; - n.desc = "Smoothstep"; - n.prototype.onExecute = function() { + p.title = "Smoothstep"; + p.desc = "Smoothstep"; + p.prototype.onExecute = function() { var a = this.getInputData(0); if (void 0 !== a) { var b = this.properties.A; @@ -5233,14 +5238,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setOutputData(0, a * a * (3 - 2 * a)); } }; - A.registerNodeType("math/smoothstep", n); - m.title = "Scale"; - m.desc = "v * factor"; - m.prototype.onExecute = function() { + A.registerNodeType("math/smoothstep", p); + g.title = "Scale"; + g.desc = "v * factor"; + g.prototype.onExecute = function() { var a = this.getInputData(0); null != a && this.setOutputData(0, a * this.properties.factor); }; - A.registerNodeType("math/scale", m); + A.registerNodeType("math/scale", g); a.title = "Average"; a.desc = "Average Filter"; a.prototype.onExecute = function() { @@ -5325,10 +5330,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var a = this.getInputData(0), b = this.getInputData(1); void 0 !== a ? this.properties.A = a : a = this.properties.A; void 0 !== b ? this.properties.B = b : b = this.properties.B; - for (var c = 0, d = this.outputs.length; c < d; ++c) { - var e = this.outputs[c]; - if (e.links && e.links.length) { - switch(e.name) { + for (var c = 0, e = this.outputs.length; c < e; ++c) { + var d = this.outputs[c]; + if (d.links && d.links.length) { + switch(d.name) { case "A==B": value = a == b; break; @@ -5393,28 +5398,28 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setOutputData(0, c); }; A.registerNodeType("math/condition", f); - l.title = "Accumulate"; - l.desc = "Increments a value every time"; - l.prototype.onExecute = function() { + k.title = "Accumulate"; + k.desc = "Increments a value every time"; + k.prototype.onExecute = function() { null === this.properties.value && (this.properties.value = 0); var a = this.getInputData(0); this.properties.value = null !== a ? this.properties.value + a : this.properties.value + this.properties.increment; this.setOutputData(0, this.properties.value); }; - A.registerNodeType("math/accumulate", l); - p.title = "Trigonometry"; - p.desc = "Sin Cos Tan"; - p.filter = "shader"; - p.prototype.onExecute = function() { + A.registerNodeType("math/accumulate", k); + n.title = "Trigonometry"; + n.desc = "Sin Cos Tan"; + n.filter = "shader"; + n.prototype.onExecute = function() { var a = this.getInputData(0); null == a && (a = 0); var b = this.properties.amplitude, c = this.findInputSlot("amplitude"); -1 != c && (b = this.getInputData(c)); - var d = this.properties.offset; + var e = this.properties.offset; c = this.findInputSlot("offset"); - -1 != c && (d = this.getInputData(c)); + -1 != c && (e = this.getInputData(c)); c = 0; - for (var e = this.outputs.length; c < e; ++c) { + for (var d = this.outputs.length; c < d; ++c) { switch(this.outputs[c].name) { case "sin": value = Math.sin(a); @@ -5434,16 +5439,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { case "atan": value = Math.atan(a); } - this.setOutputData(c, b * value + d); + this.setOutputData(c, b * value + e); } }; - p.prototype.onGetInputs = function() { + n.prototype.onGetInputs = function() { return [["v", "number"], ["amplitude", "number"], ["offset", "number"]]; }; - p.prototype.onGetOutputs = function() { + n.prototype.onGetOutputs = function() { return [["sin", "number"], ["cos", "number"], ["tan", "number"], ["asin", "number"], ["acos", "number"], ["atan", "number"]]; }; - A.registerNodeType("math/trigonometry", p); + A.registerNodeType("math/trigonometry", n); A.registerSearchboxExtra("math/trigonometry", "SIN()", {outputs:[["sin", "number"]], title:"SIN()"}); A.registerSearchboxExtra("math/trigonometry", "COS()", {outputs:[["cos", "number"]], title:"COS()"}); A.registerSearchboxExtra("math/trigonometry", "TAN()", {outputs:[["tan", "number"]], title:"TAN()"}); @@ -5503,11 +5508,11 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { null == b && (b = this.properties.y); var c = this.getInputData(2); null == c && (c = this.properties.z); - var d = this._data; - d[0] = a; - d[1] = b; - d[2] = c; - this.setOutputData(0, d); + var e = this._data; + e[0] = a; + e[1] = b; + e[2] = c; + this.setOutputData(0, e); }; A.registerNodeType("math3d/xyz-to-vec3", J); C.title = "Vec4->XYZW"; @@ -5526,14 +5531,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { null == b && (b = this.properties.y); var c = this.getInputData(2); null == c && (c = this.properties.z); - var d = this.getInputData(3); - null == d && (d = this.properties.w); - var e = this._data; - e[0] = a; - e[1] = b; - e[2] = c; - e[3] = d; - this.setOutputData(0, e); + var e = this.getInputData(3); + null == e && (e = this.properties.w); + var d = this._data; + d[0] = a; + d[1] = b; + d[2] = c; + d[3] = e; + this.setOutputData(0, d); }; A.registerNodeType("math3d/xyzw-to-vec4", H); if (v.glMatrix) { @@ -5619,7 +5624,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } })(this); (function(v) { - function k() { + function d() { this.addInput("sel", "number"); this.addInput("A"); this.addInput("B"); @@ -5628,7 +5633,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out"); this.selected = 0; } - function h() { + function m() { this.properties = {sequence:"A,B,C"}; this.addInput("index", "number"); this.addInput("seq"); @@ -5637,9 +5642,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.values = this.properties.sequence.split(","); } var q = v.LiteGraph; - k.title = "Selector"; - k.desc = "selects an output"; - k.prototype.onDrawBackground = function(d) { + d.title = "Selector"; + d.desc = "selects an output"; + d.prototype.onDrawBackground = function(d) { if (!this.flags.collapsed) { d.fillStyle = "#AFB"; var h = (this.selected + 1) * q.NODE_SLOT_HEIGHT + 2; @@ -5650,23 +5655,23 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { d.fill(); } }; - k.prototype.onExecute = function() { + d.prototype.onExecute = function() { var d = this.getInputData(0); null == d && (d = 0); this.selected = d = Math.round(d) % (this.inputs.length - 1); d = this.getInputData(d + 1); void 0 !== d && this.setOutputData(0, d); }; - k.prototype.onGetInputs = function() { + d.prototype.onGetInputs = function() { return [["E", 0], ["F", 0], ["G", 0], ["H", 0]]; }; - q.registerNodeType("logic/selector", k); - h.title = "Sequence"; - h.desc = "select one element from a sequence from a string"; - h.prototype.onPropertyChanged = function(d, h) { - "sequence" == d && (this.values = h.split(",")); + q.registerNodeType("logic/selector", d); + m.title = "Sequence"; + m.desc = "select one element from a sequence from a string"; + m.prototype.onPropertyChanged = function(d, m) { + "sequence" == d && (this.values = m.split(",")); }; - h.prototype.onExecute = function() { + m.prototype.onExecute = function() { var d = this.getInputData(1); d && d != this.current_sequence && (this.values = d.split(","), this.current_sequence = d); d = this.getInputData(0); @@ -5674,13 +5679,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.index = d = Math.round(d) % this.values.length; this.setOutputData(0, this.values[d]); }; - q.registerNodeType("logic/sequence", h); + q.registerNodeType("logic/sequence", m); })(this); (function(v) { - var k = v.LiteGraph; + var d = v.LiteGraph; v.LGraphTexture = null; if ("undefined" != typeof GL) { - var h = function() { + var m = function() { this.addOutput("Cubemap", "Cubemap"); this.properties = {name:""}; this.size = [r.image_preview_size, r.image_preview_size]; @@ -5688,7 +5693,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInput("in", "Texture"); this.addOutput("out", "Texture"); this.properties = {key_color:vec3.fromValues(0., 1., 0.), threshold:0.8, slope:0.2, precision:r.DEFAULT}; - }, d = function() { + }, h = function() { this.addOutput("out", "Texture"); this.properties = {code:"", width:512, height:512, precision:r.DEFAULT}; this._temp_texture = this._func = null; @@ -5715,7 +5720,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("out", "Texture"); this.properties = {enabled:!0, factor:1, precision:r.LOW}; this._uniforms = {u_texture:0, u_factor:1}; - }, g = function() { + }, l = function() { this.addOutput("Webcam", "Texture"); this.properties = {texture_name:"", facingMode:"user"}; this.boxcolor = "black"; @@ -5724,7 +5729,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInput("Texture", "Texture"); this.addOutput("Filtered", "Texture"); this.properties = {intensity:1, radius:5}; - }, n = function() { + }, p = function() { this.addInput("in", "Texture"); this.addInput("dirt", "Texture"); this.addOutput("out", "Texture"); @@ -5732,7 +5737,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.properties = {enabled:!0, intensity:1, persistence:0.99, iterations:16, threshold:0, scale:1, dirt_factor:0.5, precision:r.DEFAULT}; this._textures = []; this._uniforms = {u_intensity:1, u_texture:0, u_glow_texture:1, u_threshold:0, u_texel_size:vec2.create()}; - }, m = function() { + }, g = function() { this.addInput("Texture", "Texture"); this.addInput("Iterations", "number"); this.addInput("Intensity", "number"); @@ -5768,22 +5773,22 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("Texture", "Texture"); this._tex_color = vec4.create(); this.properties = {color:vec4.create(), precision:r.DEFAULT}; - }, l = function() { + }, k = function() { this.addInput("R", "Texture"); this.addInput("G", "Texture"); this.addInput("B", "Texture"); this.addInput("A", "Texture"); this.addOutput("Texture", "Texture"); this.properties = {}; - l._shader || (l._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, l.pixel_shader)); - }, p = function() { + k._shader || (k._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, k.pixel_shader)); + }, n = function() { this.addInput("Texture", "Texture"); this.addOutput("R", "Texture"); this.addOutput("G", "Texture"); this.addOutput("B", "Texture"); this.addOutput("A", "Texture"); this.properties = {}; - p._shader || (p._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, p.pixel_shader)); + n._shader || (n._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, n.pixel_shader)); }, B = function() { this.addInput("Texture", "Texture"); this.addInput("LUT", "Texture"); @@ -5872,7 +5877,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { r.loadTexture = function(a, b) { b = b || {}; var c = a; - "http://" == c.substr(0, 7) && k.proxy && (c = k.proxy + c.substr(7)); + "http://" == c.substr(0, 7) && d.proxy && (c = d.proxy + c.substr(7)); return r.getTexturesContainer()[a] = GL.Texture.fromURL(c, b); }; r.getTexture = function(a) { @@ -5946,9 +5951,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { for (var b = 1; b < this.outputs.length; b++) { var c = this.outputs[b]; if (c) { - var d = null; - "width" == c.name ? d = a.width : "height" == c.name ? d = a.height : "aspect" == c.name && (d = a.width / a.height); - this.setOutputData(b, d); + var e = null; + "width" == c.name ? e = a.width : "height" == c.name ? e = a.height : "aspect" == c.name && (e = a.width / a.height); + this.setOutputData(b, e); } } } @@ -6003,7 +6008,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { r.prototype.onGetOutputs = function() { return [["width", "number"], ["height", "number"], ["aspect", "number"]]; }; - k.registerNodeType("texture/texture", r); + d.registerNodeType("texture/texture", r); I.title = "Preview"; I.desc = "Show a texture in the graph canvas"; I.allow_preview = !1; @@ -6013,14 +6018,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b && (b = !b.handle && a.webgl ? b : r.generateLowResTexturePreview(b), a.save(), this.properties.flipY && (a.translate(0, this.size[1]), a.scale(1, -1)), a.drawImage(b, 0, 0, this.size[0], this.size[1]), a.restore()); } }; - k.registerNodeType("texture/preview", I); + d.registerNodeType("texture/preview", I); K.title = "Save"; K.desc = "Save a texture in the repository"; K.prototype.onExecute = function() { var a = this.getInputData(0); a && (this.properties.name && (r.storeTexture ? r.storeTexture(this.properties.name, a) : r.getTexturesContainer()[this.properties.name] = a), this.setOutputData(0, a)); }; - k.registerNodeType("texture/save", K); + d.registerNodeType("texture/save", K); F.widgets_info = {uvcode:{widget:"textarea", height:100}, pixelcode:{widget:"textarea", height:100}, precision:{widget:"combo", values:r.MODE_VALUES}}; F.title = "Operation"; F.desc = "Texture shader operation"; @@ -6041,28 +6046,28 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } else { var b = this.getInputData(1); if (this.properties.uvcode || this.properties.pixelcode) { - var c = 512, d = 512; - a ? (c = a.width, d = a.height) : b && (c = b.width, d = b.height); - var e = r.getTextureType(this.properties.precision, a); - this._tex = a || this._tex ? r.getTargetTexture(a || this._tex, this._tex, this.properties.precision) : new GL.Texture(c, d, {type:e, format:gl.RGBA, filter:gl.LINEAR}); - e = ""; - this.properties.uvcode && (e = "uv = " + this.properties.uvcode, -1 != this.properties.uvcode.indexOf(";") && (e = this.properties.uvcode)); + var c = 512, e = 512; + a ? (c = a.width, e = a.height) : b && (c = b.width, e = b.height); + var d = r.getTextureType(this.properties.precision, a); + this._tex = a || this._tex ? r.getTargetTexture(a || this._tex, this._tex, this.properties.precision) : new GL.Texture(c, e, {type:d, format:gl.RGBA, filter:gl.LINEAR}); + d = ""; + this.properties.uvcode && (d = "uv = " + this.properties.uvcode, -1 != this.properties.uvcode.indexOf(";") && (d = this.properties.uvcode)); var f = ""; this.properties.pixelcode && (f = "result = " + this.properties.pixelcode, -1 != this.properties.pixelcode.indexOf(";") && (f = this.properties.pixelcode)); - var l = this._shader; - if (!l || this._shader_code != e + "|" + f) { + var k = this._shader; + if (!k || this._shader_code != d + "|" + f) { try { - this._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, F.pixel_shader, {UV_CODE:e, PIXEL_CODE:f}), this.boxcolor = "#00FF00"; + this._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, F.pixel_shader, {UV_CODE:d, PIXEL_CODE:f}), this.boxcolor = "#00FF00"; } catch (P) { console.log("Error compiling shader: ", P); this.boxcolor = "#FF0000"; return; } this.boxcolor = "#FF0000"; - this._shader_code = e + "|" + f; - l = this._shader; + this._shader_code = d + "|" + f; + k = this._shader; } - if (l) { + if (k) { this.boxcolor = "green"; var g = this.getInputData(2); null != g ? this.properties.value = g : g = parseFloat(this.properties.value); @@ -6073,8 +6078,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { gl.disable(gl.BLEND); a && a.bind(0); b && b.bind(1); - var e = Mesh.getScreenQuad(); - l.uniforms({u_texture:0, u_textureB:1, value:g, texSize:[c, d], time:h}).draw(e); + var d = Mesh.getScreenQuad(); + k.uniforms({u_texture:0, u_textureB:1, value:g, texSize:[c, e], time:h}).draw(d); }); this.setOutputData(0, this._tex); } else { @@ -6085,7 +6090,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }; F.pixel_shader = "precision highp float;\n\r\n\t\t\t\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform vec2 texSize;\n\r\n\t\t\tuniform float time;\n\r\n\t\t\tuniform float value;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 uv = v_coord;\n\r\n\t\t\t\tUV_CODE;\n\r\n\t\t\t\tvec4 color4 = texture2D(u_texture, uv);\n\r\n\t\t\t\tvec3 color = color4.rgb;\n\r\n\t\t\t\tvec4 color4B = texture2D(u_textureB, uv);\n\r\n\t\t\t\tvec3 colorB = color4B.rgb;\n\r\n\t\t\t\tvec3 result = color;\n\r\n\t\t\t\tfloat alpha = 1.0;\n\r\n\t\t\t\tPIXEL_CODE;\n\r\n\t\t\t\tgl_FragColor = vec4(result, alpha);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/operation", F); + d.registerNodeType("texture/operation", F); E.title = "Shader"; E.desc = "Texture shader"; E.widgets_info = {code:{type:"code"}, precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6093,17 +6098,17 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if ("code" == a && (a = this.getShader())) { b = a.uniformInfo; if (this.inputs) { - for (var c = {}, d = 0; d < this.inputs.length; ++d) { - var e = this.getInputInfo(d); - e && (b[e.name] && !c[e.name] ? c[e.name] = !0 : (this.removeInput(d), d--)); + for (var c = {}, e = 0; e < this.inputs.length; ++e) { + var d = this.getInputInfo(e); + d && (b[d.name] && !c[d.name] ? c[d.name] = !0 : (this.removeInput(e), e--)); } } - for (d in b) { - if (e = a.uniformInfo[d], null !== e.loc && "time" != d) { - if (this._shader.samplers[d]) { + for (e in b) { + if (d = a.uniformInfo[e], null !== d.loc && "time" != e) { + if (this._shader.samplers[e]) { b = "texture"; } else { - switch(e.size) { + switch(d.size) { case 1: b = "number"; break; @@ -6126,14 +6131,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { continue; } } - c = this.findInputSlot(d); - if (-1 != c && (e = this.getInputInfo(c))) { - if (e.type == b) { + c = this.findInputSlot(e); + if (-1 != c && (d = this.getInputInfo(c))) { + if (d.type == b) { continue; } this.removeInput(c, b); } - this.addInput(d, b); + this.addInput(e, b); } } } @@ -6150,29 +6155,29 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (this.isOutputConnected(0)) { var a = this.getShader(); if (a) { - for (var b = 0, c = null, d = 0; d < this.inputs.length; ++d) { - var e = this.getInputInfo(d), f = this.getInputData(d); - null != f && (f.constructor === GL.Texture && (f.bind(b), c || (c = f), f = b, b++), a.setUniform(e.name, f)); + for (var b = 0, c = null, e = 0; e < this.inputs.length; ++e) { + var d = this.getInputInfo(e), f = this.getInputData(e); + null != f && (f.constructor === GL.Texture && (f.bind(b), c || (c = f), f = b, b++), a.setUniform(d.name, f)); } - var l = this._uniforms; + var k = this._uniforms; b = r.getTextureType(this.properties.precision, c); - d = this.properties.width | 0; - e = this.properties.height | 0; - 0 == d && (d = c ? c.width : gl.canvas.width); - 0 == e && (e = c ? c.height : gl.canvas.height); - l.texSize[0] = d; - l.texSize[1] = e; - l.time = this.graph.getTime(); - this._tex && this._tex.type == b && this._tex.width == d && this._tex.height == e || (this._tex = new GL.Texture(d, e, {type:b, format:gl.RGBA, filter:gl.LINEAR})); + e = this.properties.width | 0; + d = this.properties.height | 0; + 0 == e && (e = c ? c.width : gl.canvas.width); + 0 == d && (d = c ? c.height : gl.canvas.height); + k.texSize[0] = e; + k.texSize[1] = d; + k.time = this.graph.getTime(); + this._tex && this._tex.type == b && this._tex.width == e && this._tex.height == d || (this._tex = new GL.Texture(e, d, {type:b, format:gl.RGBA, filter:gl.LINEAR})); this._tex.drawTo(function() { - a.uniforms(l).draw(GL.Mesh.getScreenQuad()); + a.uniforms(k).draw(GL.Mesh.getScreenQuad()); }); this.setOutputData(0, this._tex); } } }; E.pixel_shader = "precision highp float;\n\r\n\t\t\t\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform float time;\n\r\n\t"; - k.registerNodeType("texture/shader", E); + d.registerNodeType("texture/shader", E); A.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; A.title = "Scale/Offset"; A.desc = "Applies an scaling and offseting"; @@ -6182,29 +6187,29 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (this.properties.precision === r.PASS_THROUGH) { this.setOutputData(0, a); } else { - var b = a.width, c = a.height, d = this.precision === r.LOW ? gl.UNSIGNED_BYTE : gl.HIGH_PRECISION_FORMAT; - this.precision === r.DEFAULT && (d = a.type); - this._tex && this._tex.width == b && this._tex.height == c && this._tex.type == d || (this._tex = new GL.Texture(b, c, {type:d, format:gl.RGBA, filter:gl.LINEAR})); - var e = this._shader; - e || (e = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, A.pixel_shader)); + var b = a.width, c = a.height, e = this.precision === r.LOW ? gl.UNSIGNED_BYTE : gl.HIGH_PRECISION_FORMAT; + this.precision === r.DEFAULT && (e = a.type); + this._tex && this._tex.width == b && this._tex.height == c && this._tex.type == e || (this._tex = new GL.Texture(b, c, {type:e, format:gl.RGBA, filter:gl.LINEAR})); + var d = this._shader; + d || (d = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, A.pixel_shader)); var f = this.getInputData(1); f ? (this.properties.scale[0] = f[0], this.properties.scale[1] = f[1]) : f = this.properties.scale; - var l = this.getInputData(2); - l ? (this.properties.offset[0] = l[0], this.properties.offset[1] = l[1]) : l = this.properties.offset; + var k = this.getInputData(2); + k ? (this.properties.offset[0] = k[0], this.properties.offset[1] = k[1]) : k = this.properties.offset; this._tex.drawTo(function() { gl.disable(gl.DEPTH_TEST); gl.disable(gl.CULL_FACE); gl.disable(gl.BLEND); a.bind(0); var b = Mesh.getScreenQuad(); - e.uniforms({u_texture:0, u_scale:f, u_offset:l}).draw(b); + d.uniforms({u_texture:0, u_scale:f, u_offset:k}).draw(b); }); this.setOutputData(0, this._tex); } } }; A.pixel_shader = "precision highp float;\n\r\n\t\t\t\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform vec2 u_scale;\n\r\n\t\t\tuniform vec2 u_offset;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 uv = v_coord;\n\r\n\t\t\t\tuv = uv / u_scale - u_offset;\n\r\n\t\t\t\tgl_FragColor = texture2D(u_texture, uv);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/scaleOffset", A); + d.registerNodeType("texture/scaleOffset", A); H.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; H.title = "Warp"; H.desc = "Texture warp operation"; @@ -6214,11 +6219,11 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (this.properties.precision === r.PASS_THROUGH) { this.setOutputData(0, a); } else { - var b = this.getInputData(1), c = 512, d = 512; - a ? (c = a.width, d = a.height) : b && (c = b.width, d = b.height); - this._tex = a || this._tex ? r.getTargetTexture(a || this._tex, this._tex, this.properties.precision) : new GL.Texture(c, d, {type:this.precision === r.LOW ? gl.UNSIGNED_BYTE : gl.HIGH_PRECISION_FORMAT, format:gl.RGBA, filter:gl.LINEAR}); - var e = this._shader; - e || (e = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, H.pixel_shader)); + var b = this.getInputData(1), c = 512, e = 512; + a ? (c = a.width, e = a.height) : b && (c = b.width, e = b.height); + this._tex = a || this._tex ? r.getTargetTexture(a || this._tex, this._tex, this.properties.precision) : new GL.Texture(c, e, {type:this.precision === r.LOW ? gl.UNSIGNED_BYTE : gl.HIGH_PRECISION_FORMAT, format:gl.RGBA, filter:gl.LINEAR}); + var d = this._shader; + d || (d = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, H.pixel_shader)); var f = this.getInputData(2); null != f ? this.properties.factor = f : f = parseFloat(this.properties.factor); this._tex.drawTo(function() { @@ -6228,14 +6233,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a && a.bind(0); b && b.bind(1); var c = Mesh.getScreenQuad(); - e.uniforms({u_texture:0, u_textureB:1, u_factor:f}).draw(c); + d.uniforms({u_texture:0, u_textureB:1, u_factor:f}).draw(c); }); this.setOutputData(0, this._tex); } } }; H.pixel_shader = "precision highp float;\n\r\n\t\t\t\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform float u_factor;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 uv = v_coord;\n\r\n\t\t\t\tuv += ( texture2D(u_textureB, uv).rg - vec2(0.5)) * u_factor;\n\r\n\t\t\t\tgl_FragColor = texture2D(u_texture, uv);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/warp", H); + d.registerNodeType("texture/warp", H); C.title = "to Viewport"; C.desc = "Texture to viewport"; C.prototype.onExecute = function() { @@ -6262,7 +6267,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }; C.aa_pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 uViewportSize;\n\r\n\t\t\tuniform vec2 inverseVP;\n\r\n\t\t\tuniform float u_igamma;\n\r\n\t\t\t#define FXAA_REDUCE_MIN (1.0/ 128.0)\n\r\n\t\t\t#define FXAA_REDUCE_MUL (1.0 / 8.0)\n\r\n\t\t\t#define FXAA_SPAN_MAX 8.0\n\r\n\t\t\t\n\r\n\t\t\t/* from mitsuhiko/webgl-meincraft based on the code on geeks3d.com */\n\r\n\t\t\tvec4 applyFXAA(sampler2D tex, vec2 fragCoord)\n\r\n\t\t\t{\n\r\n\t\t\t\tvec4 color = vec4(0.0);\n\r\n\t\t\t\t/*vec2 inverseVP = vec2(1.0 / uViewportSize.x, 1.0 / uViewportSize.y);*/\n\r\n\t\t\t\tvec3 rgbNW = texture2D(tex, (fragCoord + vec2(-1.0, -1.0)) * inverseVP).xyz;\n\r\n\t\t\t\tvec3 rgbNE = texture2D(tex, (fragCoord + vec2(1.0, -1.0)) * inverseVP).xyz;\n\r\n\t\t\t\tvec3 rgbSW = texture2D(tex, (fragCoord + vec2(-1.0, 1.0)) * inverseVP).xyz;\n\r\n\t\t\t\tvec3 rgbSE = texture2D(tex, (fragCoord + vec2(1.0, 1.0)) * inverseVP).xyz;\n\r\n\t\t\t\tvec3 rgbM = texture2D(tex, fragCoord * inverseVP).xyz;\n\r\n\t\t\t\tvec3 luma = vec3(0.299, 0.587, 0.114);\n\r\n\t\t\t\tfloat lumaNW = dot(rgbNW, luma);\n\r\n\t\t\t\tfloat lumaNE = dot(rgbNE, luma);\n\r\n\t\t\t\tfloat lumaSW = dot(rgbSW, luma);\n\r\n\t\t\t\tfloat lumaSE = dot(rgbSE, luma);\n\r\n\t\t\t\tfloat lumaM = dot(rgbM, luma);\n\r\n\t\t\t\tfloat lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));\n\r\n\t\t\t\tfloat lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));\n\r\n\t\t\t\t\n\r\n\t\t\t\tvec2 dir;\n\r\n\t\t\t\tdir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));\n\r\n\t\t\t\tdir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE));\n\r\n\t\t\t\t\n\r\n\t\t\t\tfloat dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);\n\r\n\t\t\t\t\n\r\n\t\t\t\tfloat rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);\n\r\n\t\t\t\tdir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX), max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), dir * rcpDirMin)) * inverseVP;\n\r\n\t\t\t\t\n\r\n\t\t\t\tvec3 rgbA = 0.5 * (texture2D(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz + \n\r\n\t\t\t\t\ttexture2D(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);\n\r\n\t\t\t\tvec3 rgbB = rgbA * 0.5 + 0.25 * (texture2D(tex, fragCoord * inverseVP + dir * -0.5).xyz + \n\r\n\t\t\t\t\ttexture2D(tex, fragCoord * inverseVP + dir * 0.5).xyz);\n\r\n\t\t\t\t\n\r\n\t\t\t\t//return vec4(rgbA,1.0);\n\r\n\t\t\t\tfloat lumaB = dot(rgbB, luma);\n\r\n\t\t\t\tif ((lumaB < lumaMin) || (lumaB > lumaMax))\n\r\n\t\t\t\t\tcolor = vec4(rgbA, 1.0);\n\r\n\t\t\t\telse\n\r\n\t\t\t\t\tcolor = vec4(rgbB, 1.0);\n\r\n\t\t\t\tif(u_igamma != 1.0)\n\r\n\t\t\t\t\tcolor.xyz = pow( color.xyz, vec3(u_igamma) );\n\r\n\t\t\t\treturn color;\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t gl_FragColor = applyFXAA( u_texture, v_coord * uViewportSize) ;\n\r\n\t\t\t}\n\r\n\t\t\t"; C.gamma_pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_igamma;\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D( u_texture, v_coord);\n\r\n\t\t\t\tcolor.xyz = pow(color.xyz, vec3(u_igamma) );\n\r\n\t\t\t gl_FragColor = color;\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/toviewport", C); + d.registerNodeType("texture/toviewport", C); J.title = "Copy"; J.desc = "Copy Texture"; J.widgets_info = {size:{widget:"combo", values:[0, 32, 64, 128, 256, 512, 1024, 2048]}, precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6272,16 +6277,16 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (a) { var b = a.width, c = a.height; 0 != this.properties.size && (c = b = this.properties.size); - var d = this._temp_texture, e = a.type; - this.properties.precision === r.LOW ? e = gl.UNSIGNED_BYTE : this.properties.precision === r.HIGH && (e = gl.HIGH_PRECISION_FORMAT); - d && d.width == b && d.height == c && d.type == e || (d = gl.LINEAR, this.properties.generate_mipmaps && isPowerOfTwo(b) && isPowerOfTwo(c) && (d = gl.LINEAR_MIPMAP_LINEAR), this._temp_texture = new GL.Texture(b, c, {type:e, format:gl.RGBA, minFilter:d, magFilter:gl.LINEAR})); + var e = this._temp_texture, d = a.type; + this.properties.precision === r.LOW ? d = gl.UNSIGNED_BYTE : this.properties.precision === r.HIGH && (d = gl.HIGH_PRECISION_FORMAT); + e && e.width == b && e.height == c && e.type == d || (e = gl.LINEAR, this.properties.generate_mipmaps && isPowerOfTwo(b) && isPowerOfTwo(c) && (e = gl.LINEAR_MIPMAP_LINEAR), this._temp_texture = new GL.Texture(b, c, {type:d, format:gl.RGBA, minFilter:e, magFilter:gl.LINEAR})); a.copyTo(this._temp_texture); this.properties.generate_mipmaps && (this._temp_texture.bind(0), gl.generateMipmap(this._temp_texture.texture_type), this._temp_texture.unbind(0)); } this.setOutputData(0, this._temp_texture); } }; - k.registerNodeType("texture/copy", J); + d.registerNodeType("texture/copy", J); x.title = "Downsample"; x.desc = "Downsample Texture"; x.widgets_info = {iterations:{type:"number", step:1, precision:0, min:1}, precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6290,36 +6295,36 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if ((a || this._temp_texture) && this.isOutputConnected(0) && a && a.texture_type === GL.TEXTURE_2D) { var b = x._shader; b || (x._shader = b = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, x.pixel_shader)); - var c = a.width | 0, d = a.height | 0, e = a.type; - this.properties.precision === r.LOW ? e = gl.UNSIGNED_BYTE : this.properties.precision === r.HIGH && (e = gl.HIGH_PRECISION_FORMAT); - var f = this.properties.iterations || 1, l = a, g = []; - e = {type:e, format:a.format}; - var h = vec2.create(), k = {u_offset:h}; + var c = a.width | 0, e = a.height | 0, d = a.type; + this.properties.precision === r.LOW ? d = gl.UNSIGNED_BYTE : this.properties.precision === r.HIGH && (d = gl.HIGH_PRECISION_FORMAT); + var f = this.properties.iterations || 1, k = a, g = []; + d = {type:d, format:a.format}; + var h = vec2.create(), l = {u_offset:h}; this._texture && GL.Texture.releaseTemporary(this._texture); - for (var p = 0; p < f; ++p) { + for (var n = 0; n < f; ++n) { h[0] = 1 / c; - h[1] = 1 / d; + h[1] = 1 / e; c = c >> 1 || 0; - d = d >> 1 || 0; - a = GL.Texture.getTemporary(c, d, e); + e = e >> 1 || 0; + a = GL.Texture.getTemporary(c, e, d); g.push(a); - l.setParameter(GL.TEXTURE_MAG_FILTER, GL.NEAREST); - l.copyTo(a, b, k); - if (1 == c && 1 == d) { + k.setParameter(GL.TEXTURE_MAG_FILTER, GL.NEAREST); + k.copyTo(a, b, l); + if (1 == c && 1 == e) { break; } - l = a; + k = a; } this._texture = g.pop(); - for (p = 0; p < g.length; ++p) { - GL.Texture.releaseTemporary(g[p]); + for (n = 0; n < g.length; ++n) { + GL.Texture.releaseTemporary(g[n]); } this.properties.generate_mipmaps && (this._texture.bind(0), gl.generateMipmap(this._texture.texture_type), this._texture.unbind(0)); this.setOutputData(0, this._texture); } }; x.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 u_offset;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord );\n\r\n\t\t\t\tcolor += texture2D(u_texture, v_coord + vec2( u_offset.x, 0.0 ) );\n\r\n\t\t\t\tcolor += texture2D(u_texture, v_coord + vec2( 0.0, u_offset.y ) );\n\r\n\t\t\t\tcolor += texture2D(u_texture, v_coord + vec2( u_offset.x, u_offset.y ) );\n\r\n\t\t\t gl_FragColor = color * 0.25;\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/downsample", x); + d.registerNodeType("texture/downsample", x); D.title = "Average"; D.desc = "Compute a partial average (32 random samples) of a texture and stores it as a 1x1 pixel texture"; D.prototype.onExecute = function() { @@ -6336,10 +6341,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b = gl.UNSIGNED_BYTE; a.type != b && (b = gl.FLOAT); c && c.type == b || (this._temp_texture = new GL.Texture(1, 1, {type:b, format:gl.RGBA, filter:gl.NEAREST})); - var d = D._shader, e = this._uniforms; - e.u_mipmap_offset = this.properties.mipmap_offset; + var e = D._shader, d = this._uniforms; + d.u_mipmap_offset = this.properties.mipmap_offset; this._temp_texture.drawTo(function() { - a.toViewport(d, e); + a.toViewport(e, d); }); this.setOutputData(0, this._temp_texture); if (this.isOutputConnected(1) || this.isOutputConnected(2)) { @@ -6355,7 +6360,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }; D.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tuniform mat4 u_samples_a;\n\r\n\t\t\tuniform mat4 u_samples_b;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_mipmap_offset;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = vec4(0.0);\n\r\n\t\t\t\tfor(int i = 0; i < 4; ++i)\n\r\n\t\t\t\t\tfor(int j = 0; j < 4; ++j)\n\r\n\t\t\t\t\t{\n\r\n\t\t\t\t\t\tcolor += texture2D(u_texture, vec2( u_samples_a[i][j], u_samples_b[i][j] ), u_mipmap_offset );\n\r\n\t\t\t\t\t\tcolor += texture2D(u_texture, vec2( 1.0 - u_samples_a[i][j], 1.0 - u_samples_b[i][j] ), u_mipmap_offset );\n\r\n\t\t\t\t\t}\n\r\n\t\t\t gl_FragColor = color * 0.03125;\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/average", D); + d.registerNodeType("texture/average", D); G.title = "Image to Texture"; G.desc = "Uploads an image to the GPU"; G.prototype.onExecute = function() { @@ -6365,8 +6370,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (a.gltexture) { this.setOutputData(0, a.gltexture); } else { - var d = this._temp_texture; - d && d.width == b && d.height == c || (this._temp_texture = new GL.Texture(b, c, {format:gl.RGBA, filter:gl.LINEAR})); + var e = this._temp_texture; + e && e.width == b && e.height == c || (this._temp_texture = new GL.Texture(b, c, {format:gl.RGBA, filter:gl.LINEAR})); try { this._temp_texture.uploadImage(a); } catch (N) { @@ -6377,7 +6382,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.registerNodeType("texture/imageToTexture", G); + d.registerNodeType("texture/imageToTexture", G); B.widgets_info = {texture:{widget:"texture"}, precision:{widget:"combo", values:r.MODE_VALUES}}; B.title = "LUT"; B.desc = "Apply LUT to Texture"; @@ -6412,10 +6417,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }; B.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tuniform float u_amount;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\t lowp vec4 textureColor = clamp( texture2D(u_texture, v_coord), vec4(0.0), vec4(1.0) );\n\r\n\t\t\t\t mediump float blueColor = textureColor.b * 63.0;\n\r\n\t\t\t\t mediump vec2 quad1;\n\r\n\t\t\t\t quad1.y = floor(floor(blueColor) / 8.0);\n\r\n\t\t\t\t quad1.x = floor(blueColor) - (quad1.y * 8.0);\n\r\n\t\t\t\t mediump vec2 quad2;\n\r\n\t\t\t\t quad2.y = floor(ceil(blueColor) / 8.0);\n\r\n\t\t\t\t quad2.x = ceil(blueColor) - (quad2.y * 8.0);\n\r\n\t\t\t\t highp vec2 texPos1;\n\r\n\t\t\t\t texPos1.x = (quad1.x * 0.125) + 0.5/512.0 + ((0.125 - 1.0/512.0) * textureColor.r);\n\r\n\t\t\t\t texPos1.y = 1.0 - ((quad1.y * 0.125) + 0.5/512.0 + ((0.125 - 1.0/512.0) * textureColor.g));\n\r\n\t\t\t\t highp vec2 texPos2;\n\r\n\t\t\t\t texPos2.x = (quad2.x * 0.125) + 0.5/512.0 + ((0.125 - 1.0/512.0) * textureColor.r);\n\r\n\t\t\t\t texPos2.y = 1.0 - ((quad2.y * 0.125) + 0.5/512.0 + ((0.125 - 1.0/512.0) * textureColor.g));\n\r\n\t\t\t\t lowp vec4 newColor1 = texture2D(u_textureB, texPos1);\n\r\n\t\t\t\t lowp vec4 newColor2 = texture2D(u_textureB, texPos2);\n\r\n\t\t\t\t lowp vec4 newColor = mix(newColor1, newColor2, fract(blueColor));\n\r\n\t\t\t\t gl_FragColor = vec4( mix( textureColor.rgb, newColor.rgb, u_amount), textureColor.w);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/LUT", B); - p.title = "Texture to Channels"; - p.desc = "Split texture channels"; - p.prototype.onExecute = function() { + d.registerNodeType("texture/LUT", B); + n.title = "Texture to Channels"; + n.desc = "Split texture channels"; + n.prototype.onExecute = function() { var a = this.getInputData(0); if (a) { this._channels || (this._channels = Array(4)); @@ -6425,26 +6430,26 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (b) { gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var d = Mesh.getScreenQuad(), e = p._shader, f = [[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]; + var e = Mesh.getScreenQuad(), d = n._shader, f = [[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]; for (c = 0; 4 > c; c++) { this._channels[c] && (this._channels[c].drawTo(function() { a.bind(0); - e.uniforms({u_texture:0, u_mask:f[c]}).draw(d); + d.uniforms({u_texture:0, u_mask:f[c]}).draw(e); }), this.setOutputData(c, this._channels[c])); } } } }; - p.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec4 u_mask;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t gl_FragColor = vec4( vec3( length( texture2D(u_texture, v_coord) * u_mask )), 1.0 );\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/textureChannels", p); - l.title = "Channels to Texture"; - l.desc = "Split texture channels"; - l.prototype.onExecute = function() { + n.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec4 u_mask;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t gl_FragColor = vec4( vec3( length( texture2D(u_texture, v_coord) * u_mask )), 1.0 );\n\r\n\t\t\t}\n\r\n\t\t\t"; + d.registerNodeType("texture/textureChannels", n); + k.title = "Channels to Texture"; + k.desc = "Split texture channels"; + k.prototype.onExecute = function() { var a = [this.getInputData(0), this.getInputData(1), this.getInputData(2), this.getInputData(3)]; if (a[0] && a[1] && a[2] && a[3]) { gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var b = Mesh.getScreenQuad(), c = l._shader; + var b = Mesh.getScreenQuad(), c = k._shader; this._tex = r.getTargetTexture(a[0], this._tex); this._tex.drawTo(function() { a[0].bind(0); @@ -6456,8 +6461,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.setOutputData(0, this._tex); } }; - l.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_textureR;\n\r\n\t\t\tuniform sampler2D u_textureG;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tuniform sampler2D u_textureA;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t gl_FragColor = vec4( \r\n\t\t\t\t\t\ttexture2D(u_textureR, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureG, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureB, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureA, v_coord).r);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/channelsTexture", l); + k.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_textureR;\n\r\n\t\t\tuniform sampler2D u_textureG;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\tuniform sampler2D u_textureA;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t gl_FragColor = vec4( \r\n\t\t\t\t\t\ttexture2D(u_textureR, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureG, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureB, v_coord).r,\r\n\t\t\t\t\t\ttexture2D(u_textureA, v_coord).r);\n\r\n\t\t\t}\n\r\n\t\t\t"; + d.registerNodeType("texture/channelsTexture", k); f.title = "Color"; f.desc = "Generates a 1x1 texture with a constant color"; f.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6472,24 +6477,24 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a = this.properties.color; if (this.inputs) { for (var b = 0; b < this.inputs.length; b++) { - var c = this.inputs[b], d = this.getInputData(b); - if (void 0 !== d) { + var c = this.inputs[b], e = this.getInputData(b); + if (void 0 !== e) { switch(c.name) { case "RGB": case "RGBA": - a.set(d); + a.set(e); break; case "R": - a[0] = d; + a[0] = e; break; case "G": - a[1] = d; + a[1] = e; break; case "B": - a[2] = d; + a[2] = e; break; case "A": - a[3] = d; + a[3] = e; } } } @@ -6500,7 +6505,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { f.prototype.onGetInputs = function() { return [["RGB", "vec3"], ["RGBA", "vec4"], ["R", "number"], ["G", "number"], ["B", "number"], ["A", "number"]]; }; - k.registerNodeType("texture/color", f); + d.registerNodeType("texture/color", f); e.title = "Gradient"; e.desc = "Generates a gradient"; e["@A"] = {type:"color"}; @@ -6514,8 +6519,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var d = this.getInputData(1); d || (d = this.properties.B); for (var f = 2; f < this.inputs.length; f++) { - var l = this.inputs[f], g = this.getInputData(f); - void 0 !== g && (this.properties[l.name] = g); + var k = this.inputs[f], g = this.getInputData(f); + void 0 !== g && (this.properties[k.name] = g); } var h = this._uniforms; this._uniforms.u_angle = this.properties.angle * DEG2RAD; @@ -6533,7 +6538,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return [["angle", "number"], ["scale", "number"]]; }; e.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform float u_angle;\n\r\n\t\t\tuniform float u_scale;\n\r\n\t\t\tuniform vec3 u_colorA;\n\r\n\t\t\tuniform vec3 u_colorB;\n\r\n\t\t\t\n\r\n\t\t\tvec2 rotate(vec2 v, float angle)\n\r\n\t\t\t{\n\r\n\t\t\t\tvec2 result;\n\r\n\t\t\t\tfloat _cos = cos(angle);\n\r\n\t\t\t\tfloat _sin = sin(angle);\n\r\n\t\t\t\tresult.x = v.x * _cos - v.y * _sin;\n\r\n\t\t\t\tresult.y = v.x * _sin + v.y * _cos;\n\r\n\t\t\t\treturn result;\n\r\n\t\t\t}\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tfloat f = (rotate(u_scale * (v_coord - vec2(0.5)), u_angle) + vec2(0.5)).x;\n\r\n\t\t\t\tvec3 color = mix(u_colorA,u_colorB,clamp(f,0.0,1.0));\n\r\n\t\t\t gl_FragColor = vec4(color,1.0);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/gradient", e); + d.registerNodeType("texture/gradient", e); c.title = "Mix"; c.desc = "Generates a texture mixing two textures"; c.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6545,17 +6550,17 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } else { var b = this.getInputData(1); if (a && b) { - var d = this.getInputData(2), e = this.getInputData(3); + var e = this.getInputData(2), d = this.getInputData(3); this._tex = r.getTargetTexture(a, this._tex, this.properties.precision); gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var f = Mesh.getScreenQuad(), l = null, g = this._uniforms; - d ? (l = c._shader_tex, l || (l = c._shader_tex = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, c.pixel_shader, {MIX_TEX:""}))) : (l = c._shader_factor, l || (l = c._shader_factor = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, c.pixel_shader)), e = null == e ? this.properties.factor : e, g.u_mix.set([e, e, e, e])); + var f = Mesh.getScreenQuad(), k = null, g = this._uniforms; + e ? (k = c._shader_tex, k || (k = c._shader_tex = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, c.pixel_shader, {MIX_TEX:""}))) : (k = c._shader_factor, k || (k = c._shader_factor = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, c.pixel_shader)), d = null == d ? this.properties.factor : d, g.u_mix.set([d, d, d, d])); this._tex.drawTo(function() { a.bind(0); b.bind(1); - d && d.bind(2); - l.uniforms(g).draw(f); + e && e.bind(2); + k.uniforms(g).draw(f); }); this.setOutputData(0, this._tex); } @@ -6566,7 +6571,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return [["factor", "number"]]; }; c.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_textureA;\n\r\n\t\t\tuniform sampler2D u_textureB;\n\r\n\t\t\t#ifdef MIX_TEX\n\r\n\t\t\t\tuniform sampler2D u_textureMix;\n\r\n\t\t\t#else\n\r\n\t\t\t\tuniform vec4 u_mix;\n\r\n\t\t\t#endif\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\t#ifdef MIX_TEX\n\r\n\t\t\t\t vec4 f = texture2D(u_textureMix, v_coord);\n\r\n\t\t\t\t#else\n\r\n\t\t\t\t vec4 f = u_mix;\n\r\n\t\t\t\t#endif\n\r\n\t\t\t gl_FragColor = mix( texture2D(u_textureA, v_coord), texture2D(u_textureB, v_coord), f );\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/mix", c); + d.registerNodeType("texture/mix", c); b.title = "Edges"; b.desc = "Detects edges"; b.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6580,10 +6585,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._tex = r.getTargetTexture(a, this._tex, this.properties.precision); gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var c = Mesh.getScreenQuad(), d = b._shader, e = this.properties.invert, f = this.properties.factor, l = this.properties.threshold ? 1 : 0; + var c = Mesh.getScreenQuad(), e = b._shader, d = this.properties.invert, f = this.properties.factor, k = this.properties.threshold ? 1 : 0; this._tex.drawTo(function() { a.bind(0); - d.uniforms({u_texture:0, u_isize:[1 / a.width, 1 / a.height], u_factor:f, u_threshold:l, u_invert:e ? 1 : 0}).draw(c); + e.uniforms({u_texture:0, u_isize:[1 / a.width, 1 / a.height], u_factor:f, u_threshold:k, u_invert:d ? 1 : 0}).draw(c); }); this.setOutputData(0, this._tex); } @@ -6591,7 +6596,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }; b.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 u_isize;\n\r\n\t\t\tuniform int u_invert;\n\r\n\t\t\tuniform float u_factor;\n\r\n\t\t\tuniform float u_threshold;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 center = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tvec4 up = texture2D(u_texture, v_coord + u_isize * vec2(0.0,1.0) );\n\r\n\t\t\t\tvec4 down = texture2D(u_texture, v_coord + u_isize * vec2(0.0,-1.0) );\n\r\n\t\t\t\tvec4 left = texture2D(u_texture, v_coord + u_isize * vec2(1.0,0.0) );\n\r\n\t\t\t\tvec4 right = texture2D(u_texture, v_coord + u_isize * vec2(-1.0,0.0) );\n\r\n\t\t\t\tvec4 diff = abs(center - up) + abs(center - down) + abs(center - left) + abs(center - right);\n\r\n\t\t\t\tdiff *= u_factor;\n\r\n\t\t\t\tif(u_invert == 1)\n\r\n\t\t\t\t\tdiff.xyz = vec3(1.0) - diff.xyz;\n\r\n\t\t\t\tif( u_threshold == 0.0 )\n\r\n\t\t\t\t\tgl_FragColor = vec4( diff.xyz, center.a );\n\r\n\t\t\t\telse\n\r\n\t\t\t\t\tgl_FragColor = vec4( diff.x > 0.5 ? 1.0 : 0.0, diff.y > 0.5 ? 1.0 : 0.0, diff.z > 0.5 ? 1.0 : 0.0, center.a );\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/edges", b); + d.registerNodeType("texture/edges", b); a.title = "Depth Range"; a.desc = "Generates a texture with a depth range"; a.prototype.onExecute = function() { @@ -6601,24 +6606,24 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var c = gl.UNSIGNED_BYTE; this.properties.high_precision && (c = gl.half_float_ext ? gl.HALF_FLOAT_OES : gl.FLOAT); this._temp_texture && this._temp_texture.type == c && this._temp_texture.width == b.width && this._temp_texture.height == b.height || (this._temp_texture = new GL.Texture(b.width, b.height, {type:c, format:gl.RGBA, filter:gl.LINEAR})); - var d = this._uniforms; + var e = this._uniforms; c = this.properties.distance; this.isInputConnected(1) && (c = this.getInputData(1), this.properties.distance = c); - var e = this.properties.range; - this.isInputConnected(2) && (e = this.getInputData(2), this.properties.range = e); - d.u_distance = c; - d.u_range = e; + var d = this.properties.range; + this.isInputConnected(2) && (d = this.getInputData(2), this.properties.range = d); + e.u_distance = c; + e.u_range = d; gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); var f = Mesh.getScreenQuad(); a._shader || (a._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, a.pixel_shader), a._shader_onlydepth = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, a.pixel_shader, {ONLY_DEPTH:""})); - var l = this.properties.only_depth ? a._shader_onlydepth : a._shader; + var k = this.properties.only_depth ? a._shader_onlydepth : a._shader; c = null; c = b.near_far_planes ? b.near_far_planes : window.LS && LS.Renderer._main_camera ? LS.Renderer._main_camera._uniforms.u_camera_planes : [0.1, 1000]; - d.u_camera_planes = c; + e.u_camera_planes = c; this._temp_texture.drawTo(function() { b.bind(0); - l.uniforms(d).draw(f); + k.uniforms(e).draw(f); }); this._temp_texture.near_far_planes = c; this.setOutputData(0, this._temp_texture); @@ -6626,113 +6631,113 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }; a.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 u_camera_planes;\n\r\n\t\t\tuniform float u_distance;\n\r\n\t\t\tuniform float u_range;\n\r\n\t\t\t\n\r\n\t\t\tfloat LinearDepth()\n\r\n\t\t\t{\n\r\n\t\t\t\tfloat zNear = u_camera_planes.x;\n\r\n\t\t\t\tfloat zFar = u_camera_planes.y;\n\r\n\t\t\t\tfloat depth = texture2D(u_texture, v_coord).x;\n\r\n\t\t\t\tdepth = depth * 2.0 - 1.0;\n\r\n\t\t\t\treturn zNear * (depth + 1.0) / (zFar + zNear - depth * (zFar - zNear));\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tfloat depth = LinearDepth();\n\r\n\t\t\t\t#ifdef ONLY_DEPTH\n\r\n\t\t\t\t gl_FragColor = vec4(depth);\n\r\n\t\t\t\t#else\n\r\n\t\t\t\t\tfloat diff = abs(depth * u_camera_planes.y - u_distance);\n\r\n\t\t\t\t\tfloat dof = 1.0;\n\r\n\t\t\t\t\tif(diff <= u_range)\n\r\n\t\t\t\t\t\tdof = diff / u_range;\n\r\n\t\t\t\t gl_FragColor = vec4(dof);\n\r\n\t\t\t\t#endif\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("texture/depth_range", a); - m.title = "Blur"; - m.desc = "Blur a texture"; - m.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; - m.max_iterations = 20; - m.prototype.onExecute = function() { + d.registerNodeType("texture/depth_range", a); + g.title = "Blur"; + g.desc = "Blur a texture"; + g.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; + g.max_iterations = 20; + g.prototype.onExecute = function() { var a = this.getInputData(0); if (a && this.isOutputConnected(0)) { var b = this._final_texture; b && b.width == a.width && b.height == a.height && b.type == a.type || (b = this._final_texture = new GL.Texture(a.width, a.height, {type:a.type, format:gl.RGBA, filter:gl.LINEAR})); var c = this.properties.iterations; this.isInputConnected(1) && (c = this.getInputData(1), this.properties.iterations = c); - c = Math.min(Math.floor(c), m.max_iterations); + c = Math.min(Math.floor(c), g.max_iterations); if (0 == c) { this.setOutputData(0, a); } else { - var d = this.properties.intensity; - this.isInputConnected(2) && (d = this.getInputData(2), this.properties.intensity = d); - var e = k.camera_aspect; - e || void 0 === window.gl || (e = gl.canvas.height / gl.canvas.width); - e || (e = 1); - e = this.properties.preserve_aspect ? e : 1; - var f = this.properties.scale || [1, 1]; - a.applyBlur(e * f[0], f[1], d, b); + var e = this.properties.intensity; + this.isInputConnected(2) && (e = this.getInputData(2), this.properties.intensity = e); + var f = d.camera_aspect; + f || void 0 === window.gl || (f = gl.canvas.height / gl.canvas.width); + f || (f = 1); + f = this.properties.preserve_aspect ? f : 1; + var k = this.properties.scale || [1, 1]; + a.applyBlur(f * k[0], k[1], e, b); for (a = 1; a < c; ++a) { - b.applyBlur(e * f[0] * (a + 1), f[1] * (a + 1), d); + b.applyBlur(f * k[0] * (a + 1), k[1] * (a + 1), e); } this.setOutputData(0, b); } } }; - k.registerNodeType("texture/blur", m); - n.title = "Glow"; - n.desc = "Filters a texture giving it a glow effect"; - n.weights = new Float32Array([0.5, 0.4, 0.3, 0.2]); - n.widgets_info = {iterations:{type:"number", min:0, max:16, step:1, precision:0}, threshold:{type:"number", min:0, max:10, step:0.01, precision:2}, precision:{widget:"combo", values:r.MODE_VALUES}}; - n.prototype.onGetInputs = function() { + d.registerNodeType("texture/blur", g); + p.title = "Glow"; + p.desc = "Filters a texture giving it a glow effect"; + p.weights = new Float32Array([0.5, 0.4, 0.3, 0.2]); + p.widgets_info = {iterations:{type:"number", min:0, max:16, step:1, precision:0}, threshold:{type:"number", min:0, max:10, step:0.01, precision:2}, precision:{widget:"combo", values:r.MODE_VALUES}}; + p.prototype.onGetInputs = function() { return [["enabled", "boolean"], ["threshold", "number"], ["intensity", "number"], ["persistence", "number"], ["iterations", "number"], ["dirt_factor", "number"]]; }; - n.prototype.onGetOutputs = function() { + p.prototype.onGetOutputs = function() { return [["average", "Texture"]]; }; - n.prototype.onExecute = function() { + p.prototype.onExecute = function() { var a = this.getInputData(0); if (a && this.isAnyOutputConnected()) { if (this.properties.precision === r.PASS_THROUGH || !1 === this.getInputOrProperty("enabled")) { this.setOutputData(0, a); } else { - var b = a.width, c = a.height, d = {format:a.format, type:a.type, minFilter:GL.LINEAR, magFilter:GL.LINEAR, wrap:gl.CLAMP_TO_EDGE}, e = r.getTextureType(this.properties.precision, a), f = this._uniforms, l = this._textures, g = n._cut_shader; - g || (g = n._cut_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, n.cut_pixel_shader)); + var b = a.width, c = a.height, e = {format:a.format, type:a.type, minFilter:GL.LINEAR, magFilter:GL.LINEAR, wrap:gl.CLAMP_TO_EDGE}, d = r.getTextureType(this.properties.precision, a), f = this._uniforms, k = this._textures, g = p._cut_shader; + g || (g = p._cut_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, p.cut_pixel_shader)); gl.disable(gl.DEPTH_TEST); gl.disable(gl.BLEND); f.u_threshold = this.getInputOrProperty("threshold"); - var h = l[0] = GL.Texture.getTemporary(b, c, d); + var h = k[0] = GL.Texture.getTemporary(b, c, e); a.blit(h, g.uniforms(f)); - var k = h, p = this.getInputOrProperty("iterations"); - p = Math.clamp(p, 1, 16) | 0; + var l = h, n = this.getInputOrProperty("iterations"); + n = Math.clamp(n, 1, 16) | 0; var m = f.u_texel_size, t = this.getInputOrProperty("intensity"); f.u_intensity = 1; f.u_delta = this.properties.scale; - g = n._shader; - g || (g = n._shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, n.scale_pixel_shader)); - for (var q = 1; q < p; q++) { + g = p._shader; + g || (g = p._shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, p.scale_pixel_shader)); + for (var q = 1; q < n; q++) { b >>= 1; 1 < (c | 0) && (c >>= 1); if (2 > b) { break; } - h = l[q] = GL.Texture.getTemporary(b, c, d); - m[0] = 1 / k.width; - m[1] = 1 / k.height; - k.blit(h, g.uniforms(f)); - k = h; + h = k[q] = GL.Texture.getTemporary(b, c, e); + m[0] = 1 / l.width; + m[1] = 1 / l.height; + l.blit(h, g.uniforms(f)); + l = h; } - this.isOutputConnected(2) && (b = this._average_texture, b && b.type == a.type && b.format == a.format || (b = this._average_texture = new GL.Texture(1, 1, {type:a.type, format:a.format, filter:gl.LINEAR})), m[0] = 1 / k.width, m[1] = 1 / k.height, f.u_intensity = t, f.u_delta = 1, k.blit(b, g.uniforms(f)), this.setOutputData(2, b)); + this.isOutputConnected(2) && (b = this._average_texture, b && b.type == a.type && b.format == a.format || (b = this._average_texture = new GL.Texture(1, 1, {type:a.type, format:a.format, filter:gl.LINEAR})), m[0] = 1 / l.width, m[1] = 1 / l.height, f.u_intensity = t, f.u_delta = 1, l.blit(b, g.uniforms(f)), this.setOutputData(2, b)); gl.enable(gl.BLEND); gl.blendFunc(gl.ONE, gl.ONE); f.u_intensity = this.getInputOrProperty("persistence"); f.u_delta = 0.5; for (q -= 2; 0 <= q; q--) { - h = l[q], l[q] = null, m[0] = 1 / k.width, m[1] = 1 / k.height, k.blit(h, g.uniforms(f)), GL.Texture.releaseTemporary(k), k = h; + h = k[q], k[q] = null, m[0] = 1 / l.width, m[1] = 1 / l.height, l.blit(h, g.uniforms(f)), GL.Texture.releaseTemporary(l), l = h; } gl.disable(gl.BLEND); - this.isOutputConnected(1) && (l = this._glow_texture, l && l.width == a.width && l.height == a.height && l.type == e && l.format == a.format || (l = this._glow_texture = new GL.Texture(a.width, a.height, {type:e, format:a.format, filter:gl.LINEAR})), k.blit(l), this.setOutputData(1, l)); + this.isOutputConnected(1) && (k = this._glow_texture, k && k.width == a.width && k.height == a.height && k.type == d && k.format == a.format || (k = this._glow_texture = new GL.Texture(a.width, a.height, {type:d, format:a.format, filter:gl.LINEAR})), l.blit(k), this.setOutputData(1, k)); if (this.isOutputConnected(0)) { - l = this._final_texture; - l && l.width == a.width && l.height == a.height && l.type == e && l.format == a.format || (l = this._final_texture = new GL.Texture(a.width, a.height, {type:e, format:a.format, filter:gl.LINEAR})); - var u = this.getInputData(1), w = this.getInputOrProperty("dirt_factor"); + k = this._final_texture; + k && k.width == a.width && k.height == a.height && k.type == d && k.format == a.format || (k = this._final_texture = new GL.Texture(a.width, a.height, {type:d, format:a.format, filter:gl.LINEAR})); + var u = this.getInputData(1), B = this.getInputOrProperty("dirt_factor"); f.u_intensity = t; - g = u ? n._dirt_final_shader : n._final_shader; - g || (g = u ? n._dirt_final_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, n.final_pixel_shader, {USE_DIRT:""}) : n._final_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, n.final_pixel_shader)); - l.drawTo(function() { + g = u ? p._dirt_final_shader : p._final_shader; + g || (g = u ? p._dirt_final_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, p.final_pixel_shader, {USE_DIRT:""}) : p._final_shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, p.final_pixel_shader)); + k.drawTo(function() { a.bind(0); - k.bind(1); - u && (g.setUniform("u_dirt_factor", w), g.setUniform("u_dirt_texture", u.bind(2))); + l.bind(1); + u && (g.setUniform("u_dirt_factor", B), g.setUniform("u_dirt_texture", u.bind(2))); g.toViewport(f); }); - this.setOutputData(0, l); + this.setOutputData(0, k); } - GL.Texture.releaseTemporary(k); + GL.Texture.releaseTemporary(l); } } }; - n.cut_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform float u_threshold;\n\r\n\t\tvoid main() {\n\r\n\t\t\tgl_FragColor = max( texture2D( u_texture, v_coord ) - vec4( u_threshold ), vec4(0.0) );\n\r\n\t\t}"; - n.scale_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform vec2 u_texel_size;\n\r\n\t\tuniform float u_delta;\n\r\n\t\tuniform float u_intensity;\n\r\n\t\t\n\r\n\t\tvec4 sampleBox(vec2 uv) {\n\r\n\t\t\tvec4 o = u_texel_size.xyxy * vec2(-u_delta, u_delta).xxyy;\n\r\n\t\t\tvec4 s = texture2D( u_texture, uv + o.xy ) + texture2D( u_texture, uv + o.zy) + texture2D( u_texture, uv + o.xw) + texture2D( u_texture, uv + o.zw);\n\r\n\t\t\treturn s * 0.25;\n\r\n\t\t}\n\r\n\t\tvoid main() {\n\r\n\t\t\tgl_FragColor = u_intensity * sampleBox( v_coord );\n\r\n\t\t}"; - n.final_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform sampler2D u_glow_texture;\n\r\n\t\t#ifdef USE_DIRT\n\r\n\t\t\tuniform sampler2D u_dirt_texture;\n\r\n\t\t#endif\n\r\n\t\tuniform vec2 u_texel_size;\n\r\n\t\tuniform float u_delta;\n\r\n\t\tuniform float u_intensity;\n\r\n\t\tuniform float u_dirt_factor;\n\r\n\t\t\n\r\n\t\tvec4 sampleBox(vec2 uv) {\n\r\n\t\t\tvec4 o = u_texel_size.xyxy * vec2(-u_delta, u_delta).xxyy;\n\r\n\t\t\tvec4 s = texture2D( u_glow_texture, uv + o.xy ) + texture2D( u_glow_texture, uv + o.zy) + texture2D( u_glow_texture, uv + o.xw) + texture2D( u_glow_texture, uv + o.zw);\n\r\n\t\t\treturn s * 0.25;\n\r\n\t\t}\n\r\n\t\tvoid main() {\n\r\n\t\t\tvec4 glow = sampleBox( v_coord );\n\r\n\t\t\t#ifdef USE_DIRT\n\r\n\t\t\t\tglow = mix( glow, glow * texture2D( u_dirt_texture, v_coord ), u_dirt_factor );\n\r\n\t\t\t#endif\n\r\n\t\t\tgl_FragColor = texture2D( u_texture, v_coord ) + u_intensity * glow;\n\r\n\t\t}"; - k.registerNodeType("texture/glow", n); + p.cut_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform float u_threshold;\n\r\n\t\tvoid main() {\n\r\n\t\t\tgl_FragColor = max( texture2D( u_texture, v_coord ) - vec4( u_threshold ), vec4(0.0) );\n\r\n\t\t}"; + p.scale_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform vec2 u_texel_size;\n\r\n\t\tuniform float u_delta;\n\r\n\t\tuniform float u_intensity;\n\r\n\t\t\n\r\n\t\tvec4 sampleBox(vec2 uv) {\n\r\n\t\t\tvec4 o = u_texel_size.xyxy * vec2(-u_delta, u_delta).xxyy;\n\r\n\t\t\tvec4 s = texture2D( u_texture, uv + o.xy ) + texture2D( u_texture, uv + o.zy) + texture2D( u_texture, uv + o.xw) + texture2D( u_texture, uv + o.zw);\n\r\n\t\t\treturn s * 0.25;\n\r\n\t\t}\n\r\n\t\tvoid main() {\n\r\n\t\t\tgl_FragColor = u_intensity * sampleBox( v_coord );\n\r\n\t\t}"; + p.final_pixel_shader = "precision highp float;\n\r\n\t\tvarying vec2 v_coord;\n\r\n\t\tuniform sampler2D u_texture;\n\r\n\t\tuniform sampler2D u_glow_texture;\n\r\n\t\t#ifdef USE_DIRT\n\r\n\t\t\tuniform sampler2D u_dirt_texture;\n\r\n\t\t#endif\n\r\n\t\tuniform vec2 u_texel_size;\n\r\n\t\tuniform float u_delta;\n\r\n\t\tuniform float u_intensity;\n\r\n\t\tuniform float u_dirt_factor;\n\r\n\t\t\n\r\n\t\tvec4 sampleBox(vec2 uv) {\n\r\n\t\t\tvec4 o = u_texel_size.xyxy * vec2(-u_delta, u_delta).xxyy;\n\r\n\t\t\tvec4 s = texture2D( u_glow_texture, uv + o.xy ) + texture2D( u_glow_texture, uv + o.zy) + texture2D( u_glow_texture, uv + o.xw) + texture2D( u_glow_texture, uv + o.zw);\n\r\n\t\t\treturn s * 0.25;\n\r\n\t\t}\n\r\n\t\tvoid main() {\n\r\n\t\t\tvec4 glow = sampleBox( v_coord );\n\r\n\t\t\t#ifdef USE_DIRT\n\r\n\t\t\t\tglow = mix( glow, glow * texture2D( u_dirt_texture, v_coord ), u_dirt_factor );\n\r\n\t\t\t#endif\n\r\n\t\t\tgl_FragColor = texture2D( u_texture, v_coord ) + u_intensity * glow;\n\r\n\t\t}"; + d.registerNodeType("texture/glow", p); z.title = "Kuwahara Filter"; z.desc = "Filters a texture giving an artistic oil canvas painting"; z.max_radius = 10; @@ -6747,25 +6752,25 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { if (0 == b) { this.setOutputData(0, a); } else { - var c = this.properties.intensity, d = k.camera_aspect; - d || void 0 === window.gl || (d = gl.canvas.height / gl.canvas.width); - d || (d = 1); - d = this.properties.preserve_aspect ? d : 1; + var c = this.properties.intensity, e = d.camera_aspect; + e || void 0 === window.gl || (e = gl.canvas.height / gl.canvas.width); + e || (e = 1); + e = this.properties.preserve_aspect ? e : 1; z._shaders[b] || (z._shaders[b] = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, z.pixel_shader, {RADIUS:b.toFixed(0)})); - var e = z._shaders[b], f = GL.Mesh.getScreenQuad(); + var f = z._shaders[b], k = GL.Mesh.getScreenQuad(); a.bind(0); this._temp_texture.drawTo(function() { - e.uniforms({u_texture:0, u_intensity:c, u_resolution:[a.width, a.height], u_iResolution:[1 / a.width, 1 / a.height]}).draw(f); + f.uniforms({u_texture:0, u_intensity:c, u_resolution:[a.width, a.height], u_iResolution:[1 / a.width, 1 / a.height]}).draw(k); }); this.setOutputData(0, this._temp_texture); } } }; z.pixel_shader = "\n\r\n\tprecision highp float;\n\r\n\tvarying vec2 v_coord;\n\r\n\tuniform sampler2D u_texture;\n\r\n\tuniform float u_intensity;\n\r\n\tuniform vec2 u_resolution;\n\r\n\tuniform vec2 u_iResolution;\n\r\n\t#ifndef RADIUS\n\r\n\t\t#define RADIUS 7\n\r\n\t#endif\n\r\n\tvoid main() {\n\r\n\t\n\r\n\t\tconst int radius = RADIUS;\n\r\n\t\tvec2 fragCoord = v_coord;\n\r\n\t\tvec2 src_size = u_iResolution;\n\r\n\t\tvec2 uv = v_coord;\n\r\n\t\tfloat n = float((radius + 1) * (radius + 1));\n\r\n\t\tint i;\n\r\n\t\tint j;\n\r\n\t\tvec3 m0 = vec3(0.0); vec3 m1 = vec3(0.0); vec3 m2 = vec3(0.0); vec3 m3 = vec3(0.0);\n\r\n\t\tvec3 s0 = vec3(0.0); vec3 s1 = vec3(0.0); vec3 s2 = vec3(0.0); vec3 s3 = vec3(0.0);\n\r\n\t\tvec3 c;\n\r\n\t\t\n\r\n\t\tfor (int j = -radius; j <= 0; ++j) {\n\r\n\t\t\tfor (int i = -radius; i <= 0; ++i) {\n\r\n\t\t\t\tc = texture2D(u_texture, uv + vec2(i,j) * src_size).rgb;\n\r\n\t\t\t\tm0 += c;\n\r\n\t\t\t\ts0 += c * c;\n\r\n\t\t\t}\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tfor (int j = -radius; j <= 0; ++j) {\n\r\n\t\t\tfor (int i = 0; i <= radius; ++i) {\n\r\n\t\t\t\tc = texture2D(u_texture, uv + vec2(i,j) * src_size).rgb;\n\r\n\t\t\t\tm1 += c;\n\r\n\t\t\t\ts1 += c * c;\n\r\n\t\t\t}\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tfor (int j = 0; j <= radius; ++j) {\n\r\n\t\t\tfor (int i = 0; i <= radius; ++i) {\n\r\n\t\t\t\tc = texture2D(u_texture, uv + vec2(i,j) * src_size).rgb;\n\r\n\t\t\t\tm2 += c;\n\r\n\t\t\t\ts2 += c * c;\n\r\n\t\t\t}\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tfor (int j = 0; j <= radius; ++j) {\n\r\n\t\t\tfor (int i = -radius; i <= 0; ++i) {\n\r\n\t\t\t\tc = texture2D(u_texture, uv + vec2(i,j) * src_size).rgb;\n\r\n\t\t\t\tm3 += c;\n\r\n\t\t\t\ts3 += c * c;\n\r\n\t\t\t}\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tfloat min_sigma2 = 1e+2;\n\r\n\t\tm0 /= n;\n\r\n\t\ts0 = abs(s0 / n - m0 * m0);\n\r\n\t\t\n\r\n\t\tfloat sigma2 = s0.r + s0.g + s0.b;\n\r\n\t\tif (sigma2 < min_sigma2) {\n\r\n\t\t\tmin_sigma2 = sigma2;\n\r\n\t\t\tgl_FragColor = vec4(m0, 1.0);\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tm1 /= n;\n\r\n\t\ts1 = abs(s1 / n - m1 * m1);\n\r\n\t\t\n\r\n\t\tsigma2 = s1.r + s1.g + s1.b;\n\r\n\t\tif (sigma2 < min_sigma2) {\n\r\n\t\t\tmin_sigma2 = sigma2;\n\r\n\t\t\tgl_FragColor = vec4(m1, 1.0);\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tm2 /= n;\n\r\n\t\ts2 = abs(s2 / n - m2 * m2);\n\r\n\t\t\n\r\n\t\tsigma2 = s2.r + s2.g + s2.b;\n\r\n\t\tif (sigma2 < min_sigma2) {\n\r\n\t\t\tmin_sigma2 = sigma2;\n\r\n\t\t\tgl_FragColor = vec4(m2, 1.0);\n\r\n\t\t}\n\r\n\t\t\n\r\n\t\tm3 /= n;\n\r\n\t\ts3 = abs(s3 / n - m3 * m3);\n\r\n\t\t\n\r\n\t\tsigma2 = s3.r + s3.g + s3.b;\n\r\n\t\tif (sigma2 < min_sigma2) {\n\r\n\t\t\tmin_sigma2 = sigma2;\n\r\n\t\t\tgl_FragColor = vec4(m3, 1.0);\n\r\n\t\t}\n\r\n\t}\n\r\n\t"; - k.registerNodeType("texture/kuwahara", z); - g.title = "Webcam"; - g.desc = "Webcam texture"; - g.prototype.openStream = function() { + d.registerNodeType("texture/kuwahara", z); + l.title = "Webcam"; + l.desc = "Webcam texture"; + l.prototype.openStream = function() { if (navigator.getUserMedia) { this._waiting_confirmation = !0; navigator.mediaDevices.getUserMedia({audio:!1, video:{facingMode:this.properties.facingMode}}).then(this.streamReady.bind(this)).catch(function(b) { @@ -6777,7 +6782,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var a = this; } }; - g.prototype.closeStream = function() { + l.prototype.closeStream = function() { if (this._webcam_stream) { var a = this._webcam_stream.getTracks(); if (a.length) { @@ -6790,7 +6795,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.trigger("stream_closed"); } }; - g.prototype.streamReady = function(a) { + l.prototype.streamReady = function(a) { this._webcam_stream = a; this.boxcolor = "green"; var b = this._video; @@ -6799,10 +6804,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { }); this.trigger("stream_ready", b); }; - g.prototype.onPropertyChanged = function(a, b) { + l.prototype.onPropertyChanged = function(a, b) { "facingMode" == a && (this.properties.facingMode = b, this.closeStream(), this.openStream()); }; - g.prototype.onRemoved = function() { + l.prototype.onRemoved = function() { if (this._webcam_stream) { var a = this._webcam_stream.getTracks(); if (a.length) { @@ -6813,10 +6818,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._video = this._webcam_stream = null; } }; - g.prototype.onDrawBackground = function(a) { + l.prototype.onDrawBackground = function(a) { this.flags.collapsed || 20 >= this.size[1] || !this._video || (a.save(), a.webgl ? this._video_texture && a.drawImage(this._video_texture, 0, 0, this.size[0], this.size[1]) : a.drawImage(this._video, 0, 0, this.size[0], this.size[1]), a.restore()); }; - g.prototype.onExecute = function() { + l.prototype.onExecute = function() { null != this._webcam_stream || this._waiting_confirmation || this.openStream(); if (this._video && this._video.videoWidth) { var a = this._video.videoWidth, b = this._video.videoHeight, c = this._video_texture; @@ -6838,10 +6843,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - g.prototype.onGetOutputs = function() { - return [["width", "number"], ["height", "number"], ["stream_ready", k.EVENT], ["stream_closed", k.EVENT], ["stream_error", k.EVENT]]; + l.prototype.onGetOutputs = function() { + return [["width", "number"], ["height", "number"], ["stream_ready", d.EVENT], ["stream_closed", d.EVENT], ["stream_error", d.EVENT]]; }; - k.registerNodeType("texture/webcam", g); + d.registerNodeType("texture/webcam", l); y.title = "Lens FX"; y.desc = "distortion and chromatic aberration"; y.widgets_info = {precision:{widget:"combo", values:r.MODE_VALUES}}; @@ -6858,21 +6863,21 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b && b.width == a.width && b.height == a.height && b.type == a.type || (b = this._temp_texture = new GL.Texture(a.width, a.height, {type:a.type, format:gl.RGBA, filter:gl.LINEAR})); var c = y._shader; c || (c = y._shader = new GL.Shader(GL.Shader.SCREEN_VERTEX_SHADER, y.pixel_shader)); - var d = this.getInputData(1); - null == d && (d = this.properties.factor); - var e = this._uniforms; - e.u_factor = d; + var e = this.getInputData(1); + null == e && (e = this.properties.factor); + var d = this._uniforms; + d.u_factor = e; gl.disable(gl.DEPTH_TEST); b.drawTo(function() { a.bind(0); - c.uniforms(e).draw(GL.Mesh.getScreenQuad()); + c.uniforms(d).draw(GL.Mesh.getScreenQuad()); }); this.setOutputData(0, b); } } }; y.pixel_shader = "precision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_factor;\n\r\n\t\t\tvec2 barrelDistortion(vec2 coord, float amt) {\n\r\n\t\t\t\tvec2 cc = coord - 0.5;\n\r\n\t\t\t\tfloat dist = dot(cc, cc);\n\r\n\t\t\t\treturn coord + cc * dist * amt;\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tfloat sat( float t )\n\r\n\t\t\t{\n\r\n\t\t\t\treturn clamp( t, 0.0, 1.0 );\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tfloat linterp( float t ) {\n\r\n\t\t\t\treturn sat( 1.0 - abs( 2.0*t - 1.0 ) );\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tfloat remap( float t, float a, float b ) {\n\r\n\t\t\t\treturn sat( (t - a) / (b - a) );\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tvec4 spectrum_offset( float t ) {\n\r\n\t\t\t\tvec4 ret;\n\r\n\t\t\t\tfloat lo = step(t,0.5);\n\r\n\t\t\t\tfloat hi = 1.0-lo;\n\r\n\t\t\t\tfloat w = linterp( remap( t, 1.0/6.0, 5.0/6.0 ) );\n\r\n\t\t\t\tret = vec4(lo,1.0,hi, 1.) * vec4(1.0-w, w, 1.0-w, 1.);\n\r\n\t\t\t\n\r\n\t\t\t\treturn pow( ret, vec4(1.0/2.2) );\n\r\n\t\t\t}\n\r\n\t\t\t\n\r\n\t\t\tconst float max_distort = 2.2;\n\r\n\t\t\tconst int num_iter = 12;\n\r\n\t\t\tconst float reci_num_iter_f = 1.0 / float(num_iter);\n\r\n\t\t\t\n\r\n\t\t\tvoid main()\n\r\n\t\t\t{\t\n\r\n\t\t\t\tvec2 uv=v_coord;\n\r\n\t\t\t\tvec4 sumcol = vec4(0.0);\n\r\n\t\t\t\tvec4 sumw = vec4(0.0);\t\n\r\n\t\t\t\tfor ( int i=0; i= this.size[1] || !a.webgl || gl.meshes.cube || (gl.meshes.cube = GL.Mesh.cube({size:1})); }; - k.registerNodeType("texture/cubemap", h); + d.registerNodeType("texture/cubemap", m); } })(this); (function(v) { - var k = v.LiteGraph; + var d = v.LiteGraph; if ("undefined" != typeof GL) { - var h = function() { + var m = function() { this.addInput("Tex.", "Texture"); this.addInput("intensity", "number"); this.addOutput("Texture", "Texture"); this.properties = {intensity:1, invert:!1, precision:LGraphTexture.DEFAULT}; - h._shader || (h._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, h.pixel_shader)); + m._shader || (m._shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, m.pixel_shader)); }, q = function() { this.addInput("Texture", "Texture"); this.addInput("value1", "number"); this.addInput("value2", "number"); this.addOutput("Texture", "Texture"); this.properties = {fx:"halftone", value1:1, value2:1, precision:LGraphTexture.DEFAULT}; - }, d = function() { + }, h = function() { this.addInput("Texture", "Texture"); this.addInput("Blurred", "Texture"); this.addInput("Mask", "Texture"); @@ -7095,87 +7100,87 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._tex = LGraphTexture.getTargetTexture(d, this._tex, this.properties.precision); var h = this.properties.aberration; this.isInputConnected(1) && (h = this.getInputData(1), this.properties.aberration = h); - var k = this.properties.distortion; - this.isInputConnected(2) && (k = this.getInputData(2), this.properties.distortion = k); - var g = this.properties.blur; - this.isInputConnected(3) && (g = this.getInputData(3), this.properties.blur = g); + var m = this.properties.distortion; + this.isInputConnected(2) && (m = this.getInputData(2), this.properties.distortion = m); + var l = this.properties.blur; + this.isInputConnected(3) && (l = this.getInputData(3), this.properties.blur = l); gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var q = Mesh.getScreenQuad(), n = u._shader; + var q = Mesh.getScreenQuad(), p = u._shader; this._tex.drawTo(function() { d.bind(0); - n.uniforms({u_texture:0, u_aberration:h, u_distortion:k, u_blur:g}).draw(q); + p.uniforms({u_texture:0, u_aberration:h, u_distortion:m, u_blur:l}).draw(q); }); this.setOutputData(0, this._tex); } } }; u.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 u_camera_planes;\n\r\n\t\t\tuniform float u_aberration;\n\r\n\t\t\tuniform float u_distortion;\n\r\n\t\t\tuniform float u_blur;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 coord = v_coord;\n\r\n\t\t\t\tfloat dist = distance(vec2(0.5), coord);\n\r\n\t\t\t\tvec2 dist_coord = coord - vec2(0.5);\n\r\n\t\t\t\tfloat percent = 1.0 + ((0.5 - dist) / 0.5) * u_distortion;\n\r\n\t\t\t\tdist_coord *= percent;\n\r\n\t\t\t\tcoord = dist_coord + vec2(0.5);\n\r\n\t\t\t\tvec4 color = texture2D(u_texture,coord, u_blur * dist);\n\r\n\t\t\t\tcolor.r = texture2D(u_texture,vec2(0.5) + dist_coord * (1.0+0.01*u_aberration), u_blur * dist ).r;\n\r\n\t\t\t\tcolor.b = texture2D(u_texture,vec2(0.5) + dist_coord * (1.0-0.01*u_aberration), u_blur * dist ).b;\n\r\n\t\t\t\tgl_FragColor = color;\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("fx/lens", u); + d.registerNodeType("fx/lens", u); v.LGraphFXLens = u; - d.title = "Bokeh"; - d.desc = "applies an Bokeh effect"; - d.widgets_info = {shape:{widget:"texture"}}; - d.prototype.onExecute = function() { - var h = this.getInputData(0), k = this.getInputData(1), q = this.getInputData(2); - if (h && q && this.properties.shape) { - k || (k = h); - var g = LGraphTexture.getTexture(this.properties.shape); - if (g) { + h.title = "Bokeh"; + h.desc = "applies an Bokeh effect"; + h.widgets_info = {shape:{widget:"texture"}}; + h.prototype.onExecute = function() { + var d = this.getInputData(0), m = this.getInputData(1), q = this.getInputData(2); + if (d && q && this.properties.shape) { + m || (m = d); + var l = LGraphTexture.getTexture(this.properties.shape); + if (l) { var u = this.properties.threshold; this.isInputConnected(3) && (u = this.getInputData(3), this.properties.threshold = u); - var n = gl.UNSIGNED_BYTE; - this.properties.high_precision && (n = gl.half_float_ext ? gl.HALF_FLOAT_OES : gl.FLOAT); - this._temp_texture && this._temp_texture.type == n && this._temp_texture.width == h.width && this._temp_texture.height == h.height || (this._temp_texture = new GL.Texture(h.width, h.height, {type:n, format:gl.RGBA, filter:gl.LINEAR})); - var m = d._first_shader; - m || (m = d._first_shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, d._first_pixel_shader)); - var a = d._second_shader; - a || (a = d._second_shader = new GL.Shader(d._second_vertex_shader, d._second_pixel_shader)); + var p = gl.UNSIGNED_BYTE; + this.properties.high_precision && (p = gl.half_float_ext ? gl.HALF_FLOAT_OES : gl.FLOAT); + this._temp_texture && this._temp_texture.type == p && this._temp_texture.width == d.width && this._temp_texture.height == d.height || (this._temp_texture = new GL.Texture(d.width, d.height, {type:p, format:gl.RGBA, filter:gl.LINEAR})); + var g = h._first_shader; + g || (g = h._first_shader = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, h._first_pixel_shader)); + var a = h._second_shader; + a || (a = h._second_shader = new GL.Shader(h._second_vertex_shader, h._second_pixel_shader)); var b = this._points_mesh; - b && b._width == h.width && b._height == h.height && 2 == b._spacing || (b = this.createPointsMesh(h.width, h.height, 2)); + b && b._width == d.width && b._height == d.height && 2 == b._spacing || (b = this.createPointsMesh(d.width, d.height, 2)); var c = Mesh.getScreenQuad(), e = this.properties.size, f = this.properties.alpha; gl.disable(gl.DEPTH_TEST); gl.disable(gl.BLEND); this._temp_texture.drawTo(function() { - h.bind(0); - k.bind(1); + d.bind(0); + m.bind(1); q.bind(2); - m.uniforms({u_texture:0, u_texture_blur:1, u_mask:2, u_texsize:[h.width, h.height]}).draw(c); + g.uniforms({u_texture:0, u_texture_blur:1, u_mask:2, u_texsize:[d.width, d.height]}).draw(c); }); this._temp_texture.drawTo(function() { gl.enable(gl.BLEND); gl.blendFunc(gl.ONE, gl.ONE); - h.bind(0); - g.bind(3); - a.uniforms({u_texture:0, u_mask:2, u_shape:3, u_alpha:f, u_threshold:u, u_pointSize:e, u_itexsize:[1.0 / h.width, 1.0 / h.height]}).draw(b, gl.POINTS); + d.bind(0); + l.bind(3); + a.uniforms({u_texture:0, u_mask:2, u_shape:3, u_alpha:f, u_threshold:u, u_pointSize:e, u_itexsize:[1.0 / d.width, 1.0 / d.height]}).draw(b, gl.POINTS); }); this.setOutputData(0, this._temp_texture); } } else { - this.setOutputData(0, h); + this.setOutputData(0, d); } }; - d.prototype.createPointsMesh = function(d, h, k) { - for (var g = Math.round(d / k), q = Math.round(h / k), n = new Float32Array(g * q * 2), m = -1, a = 2 / d * k, b = 2 / h * k, c = 0; c < q; ++c) { - for (var e = -1, f = 0; f < g; ++f) { - var l = c * g * 2 + 2 * f; - n[l] = e; - n[l + 1] = m; + h.prototype.createPointsMesh = function(d, h, m) { + for (var l = Math.round(d / m), q = Math.round(h / m), p = new Float32Array(l * q * 2), g = -1, a = 2 / d * m, b = 2 / h * m, c = 0; c < q; ++c) { + for (var e = -1, f = 0; f < l; ++f) { + var k = c * l * 2 + 2 * f; + p[k] = e; + p[k + 1] = g; e += a; } - m += b; + g += b; } - this._points_mesh = GL.Mesh.load({vertices2D:n}); + this._points_mesh = GL.Mesh.load({vertices2D:p}); this._points_mesh._width = d; this._points_mesh._height = h; - this._points_mesh._spacing = k; + this._points_mesh._spacing = m; return this._points_mesh; }; - d._first_pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_texture_blur;\n\r\n\t\t\tuniform sampler2D u_mask;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tvec4 blurred_color = texture2D(u_texture_blur, v_coord);\n\r\n\t\t\t\tfloat mask = texture2D(u_mask, v_coord).x;\n\r\n\t\t\t gl_FragColor = mix(color, blurred_color, mask);\n\r\n\t\t\t}\n\r\n\t\t\t"; - d._second_vertex_shader = "precision highp float;\n\r\n\t\t\tattribute vec2 a_vertex2D;\n\r\n\t\t\tvarying vec4 v_color;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_mask;\n\r\n\t\t\tuniform vec2 u_itexsize;\n\r\n\t\t\tuniform float u_pointSize;\n\r\n\t\t\tuniform float u_threshold;\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 coord = a_vertex2D * 0.5 + 0.5;\n\r\n\t\t\t\tv_color = texture2D( u_texture, coord );\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + vec2(u_itexsize.x, 0.0) );\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + vec2(0.0, u_itexsize.y));\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + u_itexsize);\n\r\n\t\t\t\tv_color *= 0.25;\n\r\n\t\t\t\tfloat mask = texture2D(u_mask, coord).x;\n\r\n\t\t\t\tfloat luminance = length(v_color) * mask;\n\r\n\t\t\t\t/*luminance /= (u_pointSize*u_pointSize)*0.01 */;\n\r\n\t\t\t\tluminance -= u_threshold;\n\r\n\t\t\t\tif(luminance < 0.0)\n\r\n\t\t\t\t{\n\r\n\t\t\t\t\tgl_Position.x = -100.0;\n\r\n\t\t\t\t\treturn;\n\r\n\t\t\t\t}\n\r\n\t\t\t\tgl_PointSize = u_pointSize;\n\r\n\t\t\t\tgl_Position = vec4(a_vertex2D,0.0,1.0);\n\r\n\t\t\t}\n\r\n\t\t\t"; - d._second_pixel_shader = "precision highp float;\n\r\n\t\t\tvarying vec4 v_color;\n\r\n\t\t\tuniform sampler2D u_shape;\n\r\n\t\t\tuniform float u_alpha;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D( u_shape, gl_PointCoord );\n\r\n\t\t\t\tcolor *= v_color * u_alpha;\n\r\n\t\t\t\tgl_FragColor = color;\n\r\n\t\t\t}\n"; - k.registerNodeType("fx/bokeh", d); - v.LGraphFXBokeh = d; + h._first_pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_texture_blur;\n\r\n\t\t\tuniform sampler2D u_mask;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tvec4 blurred_color = texture2D(u_texture_blur, v_coord);\n\r\n\t\t\t\tfloat mask = texture2D(u_mask, v_coord).x;\n\r\n\t\t\t gl_FragColor = mix(color, blurred_color, mask);\n\r\n\t\t\t}\n\r\n\t\t\t"; + h._second_vertex_shader = "precision highp float;\n\r\n\t\t\tattribute vec2 a_vertex2D;\n\r\n\t\t\tvarying vec4 v_color;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_mask;\n\r\n\t\t\tuniform vec2 u_itexsize;\n\r\n\t\t\tuniform float u_pointSize;\n\r\n\t\t\tuniform float u_threshold;\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec2 coord = a_vertex2D * 0.5 + 0.5;\n\r\n\t\t\t\tv_color = texture2D( u_texture, coord );\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + vec2(u_itexsize.x, 0.0) );\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + vec2(0.0, u_itexsize.y));\n\r\n\t\t\t\tv_color += texture2D( u_texture, coord + u_itexsize);\n\r\n\t\t\t\tv_color *= 0.25;\n\r\n\t\t\t\tfloat mask = texture2D(u_mask, coord).x;\n\r\n\t\t\t\tfloat luminance = length(v_color) * mask;\n\r\n\t\t\t\t/*luminance /= (u_pointSize*u_pointSize)*0.01 */;\n\r\n\t\t\t\tluminance -= u_threshold;\n\r\n\t\t\t\tif(luminance < 0.0)\n\r\n\t\t\t\t{\n\r\n\t\t\t\t\tgl_Position.x = -100.0;\n\r\n\t\t\t\t\treturn;\n\r\n\t\t\t\t}\n\r\n\t\t\t\tgl_PointSize = u_pointSize;\n\r\n\t\t\t\tgl_Position = vec4(a_vertex2D,0.0,1.0);\n\r\n\t\t\t}\n\r\n\t\t\t"; + h._second_pixel_shader = "precision highp float;\n\r\n\t\t\tvarying vec4 v_color;\n\r\n\t\t\tuniform sampler2D u_shape;\n\r\n\t\t\tuniform float u_alpha;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D( u_shape, gl_PointCoord );\n\r\n\t\t\t\tcolor *= v_color * u_alpha;\n\r\n\t\t\t\tgl_FragColor = color;\n\r\n\t\t\t}\n"; + d.registerNodeType("fx/bokeh", h); + v.LGraphFXBokeh = h; q.title = "FX"; q.desc = "applies an FX from a list"; q.widgets_info = {fx:{widget:"combo", values:["halftone", "pixelate", "lowpalette", "noise", "gamma"]}, precision:{widget:"combo", values:LGraphTexture.MODE_VALUES}}; @@ -7190,26 +7195,26 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._tex = LGraphTexture.getTargetTexture(d, this._tex, this.properties.precision); var h = this.properties.value1; this.isInputConnected(1) && (h = this.getInputData(1), this.properties.value1 = h); - var k = this.properties.value2; - this.isInputConnected(2) && (k = this.getInputData(2), this.properties.value2 = k); - var g = this.properties.fx, u = q.shaders[g]; + var m = this.properties.value2; + this.isInputConnected(2) && (m = this.getInputData(2), this.properties.value2 = m); + var l = this.properties.fx, u = q.shaders[l]; if (!u) { - var n = q["pixel_shader_" + g]; - if (!n) { + var p = q["pixel_shader_" + l]; + if (!p) { return; } - u = q.shaders[g] = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, n); + u = q.shaders[l] = new GL.Shader(Shader.SCREEN_VERTEX_SHADER, p); } gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var m = Mesh.getScreenQuad(); + var g = Mesh.getScreenQuad(); camera_planes = v.LS && LS.Renderer._current_camera ? [LS.Renderer._current_camera.near, LS.Renderer._current_camera.far] : [1, 100]; var a = null; - "noise" == g && (a = LGraphTexture.getNoiseTexture()); + "noise" == l && (a = LGraphTexture.getNoiseTexture()); this._tex.drawTo(function() { d.bind(0); - "noise" == g && a.bind(1); - u.uniforms({u_texture:0, u_noise:1, u_size:[d.width, d.height], u_rand:[Math.random(), Math.random()], u_value1:h, u_value2:k, u_camera_planes:camera_planes}).draw(m); + "noise" == l && a.bind(1); + u.uniforms({u_texture:0, u_noise:1, u_size:[d.width, d.height], u_rand:[Math.random(), Math.random()], u_value1:h, u_value2:m, u_camera_planes:camera_planes}).draw(g); }); this.setOutputData(0, this._tex); } @@ -7221,174 +7226,182 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { q.pixel_shader_lowpalette = "precision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform vec2 u_camera_planes;\n\r\n\t\t\tuniform vec2 u_size;\n\r\n\t\t\tuniform float u_value1;\n\r\n\t\t\tuniform float u_value2;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tgl_FragColor = floor(color * u_value1) / u_value1;\n\r\n\t\t\t}\n"; q.pixel_shader_noise = "precision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform sampler2D u_noise;\n\r\n\t\t\tuniform vec2 u_size;\n\r\n\t\t\tuniform float u_value1;\n\r\n\t\t\tuniform float u_value2;\n\r\n\t\t\tuniform vec2 u_rand;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tvec3 noise = texture2D(u_noise, v_coord * vec2(u_size.x / 512.0, u_size.y / 512.0) + u_rand).xyz - vec3(0.5);\n\r\n\t\t\t\tgl_FragColor = vec4( color.xyz + noise * u_value1, color.a );\n\r\n\t\t\t}\n"; q.pixel_shader_gamma = "precision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_value1;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tfloat gamma = 1.0 / u_value1;\n\r\n\t\t\t\tgl_FragColor = vec4( pow( color.xyz, vec3(gamma) ), color.a );\n\r\n\t\t\t}\n"; - k.registerNodeType("fx/generic", q); + d.registerNodeType("fx/generic", q); v.LGraphFXGeneric = q; - h.title = "Vigneting"; - h.desc = "Vigneting"; - h.widgets_info = {precision:{widget:"combo", values:LGraphTexture.MODE_VALUES}}; - h.prototype.onExecute = function() { + m.title = "Vigneting"; + m.desc = "Vigneting"; + m.widgets_info = {precision:{widget:"combo", values:LGraphTexture.MODE_VALUES}}; + m.prototype.onExecute = function() { var d = this.getInputData(0); if (this.properties.precision === LGraphTexture.PASS_THROUGH) { this.setOutputData(0, d); } else { if (d) { this._tex = LGraphTexture.getTargetTexture(d, this._tex, this.properties.precision); - var k = this.properties.intensity; - this.isInputConnected(1) && (k = this.getInputData(1), this.properties.intensity = k); + var h = this.properties.intensity; + this.isInputConnected(1) && (h = this.getInputData(1), this.properties.intensity = h); gl.disable(gl.BLEND); gl.disable(gl.DEPTH_TEST); - var q = Mesh.getScreenQuad(), g = h._shader, u = this.properties.invert; + var q = Mesh.getScreenQuad(), l = m._shader, u = this.properties.invert; this._tex.drawTo(function() { d.bind(0); - g.uniforms({u_texture:0, u_intensity:k, u_isize:[1 / d.width, 1 / d.height], u_invert:u ? 1 : 0}).draw(q); + l.uniforms({u_texture:0, u_intensity:h, u_isize:[1 / d.width, 1 / d.height], u_invert:u ? 1 : 0}).draw(q); }); this.setOutputData(0, this._tex); } } }; - h.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_intensity;\n\r\n\t\t\tuniform int u_invert;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tfloat luminance = 1.0 - length( v_coord - vec2(0.5) ) * 1.414;\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tif(u_invert == 1)\n\r\n\t\t\t\t\tluminance = 1.0 - luminance;\n\r\n\t\t\t\tluminance = mix(1.0, luminance, u_intensity);\n\r\n\t\t\t gl_FragColor = vec4( luminance * color.xyz, color.a);\n\r\n\t\t\t}\n\r\n\t\t\t"; - k.registerNodeType("fx/vigneting", h); - v.LGraphFXVigneting = h; + m.pixel_shader = "precision highp float;\n\r\n\t\t\tprecision highp float;\n\r\n\t\t\tvarying vec2 v_coord;\n\r\n\t\t\tuniform sampler2D u_texture;\n\r\n\t\t\tuniform float u_intensity;\n\r\n\t\t\tuniform int u_invert;\n\r\n\t\t\t\n\r\n\t\t\tvoid main() {\n\r\n\t\t\t\tfloat luminance = 1.0 - length( v_coord - vec2(0.5) ) * 1.414;\n\r\n\t\t\t\tvec4 color = texture2D(u_texture, v_coord);\n\r\n\t\t\t\tif(u_invert == 1)\n\r\n\t\t\t\t\tluminance = 1.0 - luminance;\n\r\n\t\t\t\tluminance = mix(1.0, luminance, u_intensity);\n\r\n\t\t\t gl_FragColor = vec4( luminance * color.xyz, color.a);\n\r\n\t\t\t}\n\r\n\t\t\t"; + d.registerNodeType("fx/vigneting", m); + v.LGraphFXVigneting = m; } })(this); (function(v) { - function k(a) { + function d(a) { this.cmd = this.channel = 0; this.data = new Uint32Array(3); a && this.setup(a); } - function h(a, c) { - navigator.requestMIDIAccess ? (this.on_ready = a, this.state = {note:[], cc:[]}, navigator.requestMIDIAccess().then(this.onMIDISuccess.bind(this), this.onMIDIFailure.bind(this))) : (this.error = "not suppoorted", c ? c("Not supported") : console.error("MIDI NOT SUPPORTED, enable by chrome://flags")); + function m(a, b) { + navigator.requestMIDIAccess ? (this.on_ready = a, this.state = {note:[], cc:[]}, navigator.requestMIDIAccess().then(this.onMIDISuccess.bind(this), this.onMIDIFailure.bind(this))) : (this.error = "not suppoorted", b ? b("Not supported") : console.error("MIDI NOT SUPPORTED, enable by chrome://flags")); } function q() { - this.addOutput("on_midi", a.EVENT); + this.addOutput("on_midi", b.EVENT); this.addOutput("out", "midi"); this.properties = {port:0}; this._current_midi_event = this._last_midi_event = null; - var b = this; - new h(function(a) { - b._midi = a; - if (b._waiting) { - b.onStart(); + var a = this; + new m(function(b) { + a._midi = b; + if (a._waiting) { + a.onStart(); } - b._waiting = !1; + a._waiting = !1; }); } - function d() { - this.addInput("send", a.EVENT); + function h() { + this.addInput("send", b.EVENT); this.properties = {port:0}; - var b = this; - new h(function(a) { - b._midi = a; + var a = this; + new m(function(b) { + a._midi = b; }); } function u() { - this.addInput("on_midi", a.EVENT); + this.addInput("on_midi", b.EVENT); this._str = ""; this.size = [200, 40]; } function t() { this.properties = {channel:-1, cmd:-1, min_value:-1, max_value:-1}; - this.addInput("in", a.EVENT); - this.addOutput("on_midi", a.EVENT); + this.addInput("in", b.EVENT); + this.addOutput("on_midi", b.EVENT); } function w() { this.properties = {channel:0, cmd:144, value1:1, value2:1}; - this.addInput("send", a.EVENT); - this.addInput("assign", a.EVENT); - this.addOutput("on_midi", a.EVENT); - this.midi_event = new k; + this.addInput("send", b.EVENT); + this.addInput("assign", b.EVENT); + this.addOutput("on_midi", b.EVENT); + this.midi_event = new d; } function y() { this.properties = {cc:1, value:0}; this.addOutput("value", "number"); } - function g() { - this.addInput("generate", a.ACTION); + function l() { + this.addInput("generate", b.ACTION); this.addInput("scale", "string"); this.addInput("octave", "number"); - this.addOutput("note", a.EVENT); - this.properties = {notes:"A,A#,B,C,C#,D,D#,E,F,F#,G,G#", octave:2, mode:"sequence"}; - this.notes_pitches = g.processScale(this.properties.notes); + this.addOutput("note", b.EVENT); + this.properties = {notes:"A,A#,B,C,C#,D,D#,E,F,F#,G,G#", octave:2, duration:0.5, mode:"sequence"}; + this.notes_pitches = l.processScale(this.properties.notes); this.sequence_index = 0; } function z() { this.properties = {amount:0}; - this.addInput("in", a.ACTION); + this.addInput("in", b.ACTION); this.addInput("amount", "number"); - this.addOutput("out", a.EVENT); - this.midi_event = new k; + this.addOutput("out", b.EVENT); + this.midi_event = new d; } - function n() { + function p() { this.properties = {scale:"A,A#,B,C,C#,D,D#,E,F,F#,G,G#"}; - this.addInput("note", a.ACTION); + this.addInput("note", b.ACTION); this.addInput("scale", "string"); - this.addOutput("out", a.EVENT); + this.addOutput("out", b.EVENT); this.valid_notes = Array(12); this.offset_notes = Array(12); this.processScale(this.properties.scale); - this.midi_event = new k; } - function m() { + function g() { this.properties = {volume:0.5, duration:1}; - this.addInput("note", a.ACTION); + this.addInput("note", b.ACTION); this.addInput("volume", "number"); this.addInput("duration", "number"); - this.addOutput("note", a.EVENT); + this.addOutput("note", b.EVENT); "undefined" == typeof AudioSynth ? (console.error("Audiosynth.js not included, LGMidiPlay requires that library"), this.boxcolor = "red") : this.instrument = (this.synth = new AudioSynth).createInstrument("piano"); } - var a = v.LiteGraph; - a.MIDIEvent = k; - k.prototype.setup = function(a) { + function a() { + this.properties = {num_octaves:2, start_octave:2}; + this.addInput("note", b.ACTION); + this.addInput("reset", b.ACTION); + this.addOutput("note", b.EVENT); + this.size = [400, 100]; + this.keys = []; + this._last_key = -1; + } + var b = v.LiteGraph; + b.MIDIEvent = d; + d.prototype.setup = function(a) { this.data.set(a); this.status = a = a[0]; var b = a & 240; this.cmd = 240 <= a ? a : b; - this.cmd == k.NOTEON && 0 == this.velocity && (this.cmd = k.NOTEOFF); - this.cmd_str = k.commands[this.cmd] || ""; - if (b >= k.NOTEON || b <= k.NOTEOFF) { + this.cmd == d.NOTEON && 0 == this.velocity && (this.cmd = d.NOTEOFF); + this.cmd_str = d.commands[this.cmd] || ""; + if (b >= d.NOTEON || b <= d.NOTEOFF) { this.channel = a & 15; } }; - Object.defineProperty(k.prototype, "velocity", {get:function() { - return this.cmd == k.NOTEON ? this.data[2] : -1; + Object.defineProperty(d.prototype, "velocity", {get:function() { + return this.cmd == d.NOTEON ? this.data[2] : -1; }, set:function(a) { this.data[2] = a; }, enumerable:!0}); - k.notes = "A A# B C C# D D# E F F# G G#".split(" "); - k.note_to_index = {A:0, "A#":1, B:2, C:3, "C#":4, D:5, "D#":6, E:7, F:8, "F#":9, G:10, "G#":11}; - Object.defineProperty(k.prototype, "note", {get:function() { - return this.cmd != k.NOTEON ? -1 : k.toNoteString(this.data[1], !0); + d.notes = "A A# B C C# D D# E F F# G G#".split(" "); + d.note_to_index = {A:0, "A#":1, B:2, C:3, "C#":4, D:5, "D#":6, E:7, F:8, "F#":9, G:10, "G#":11}; + Object.defineProperty(d.prototype, "note", {get:function() { + return this.cmd != d.NOTEON ? -1 : d.toNoteString(this.data[1], !0); }, set:function(a) { throw "notes cannot be assigned this way, must modify the data[1]"; }, enumerable:!0}); - Object.defineProperty(k.prototype, "octave", {get:function() { - return this.cmd != k.NOTEON ? -1 : Math.floor((this.data[1] - 24) / 12 + 1); + Object.defineProperty(d.prototype, "octave", {get:function() { + return this.cmd != d.NOTEON ? -1 : Math.floor((this.data[1] - 24) / 12 + 1); }, set:function(a) { throw "octave cannot be assigned this way, must modify the data[1]"; }, enumerable:!0}); - k.prototype.getPitch = function() { + d.prototype.getPitch = function() { return 440 * Math.pow(2, (this.data[1] - 69) / 12); }; - k.computePitch = function(a) { + d.computePitch = function(a) { return 440 * Math.pow(2, (a - 69) / 12); }; - k.prototype.getCC = function() { + d.prototype.getCC = function() { return this.data[1]; }; - k.prototype.getCCValue = function() { + d.prototype.getCCValue = function() { return this.data[2]; }; - k.prototype.getPitchBend = function() { + d.prototype.getPitchBend = function() { return this.data[1] + (this.data[2] << 7) - 8192; }; - k.computePitchBend = function(a, c) { - return a + (c << 7) - 8192; + d.computePitchBend = function(a, b) { + return a + (b << 7) - 8192; }; - k.prototype.setCommandFromString = function(a) { - this.cmd = k.computeCommandFromString(a); + d.prototype.setCommandFromString = function(a) { + this.cmd = d.computeCommandFromString(a); }; - k.computeCommandFromString = function(a) { + d.computeCommandFromString = function(a) { if (!a) { return 0; } @@ -7399,88 +7412,88 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { switch(a) { case "NOTE ON": case "NOTEON": - return k.NOTEON; + return d.NOTEON; case "NOTE OFF": case "NOTEOFF": - return k.NOTEON; + return d.NOTEON; case "KEY PRESSURE": case "KEYPRESSURE": - return k.KEYPRESSURE; + return d.KEYPRESSURE; case "CONTROLLER CHANGE": case "CONTROLLERCHANGE": case "CC": - return k.CONTROLLERCHANGE; + return d.CONTROLLERCHANGE; case "PROGRAM CHANGE": case "PROGRAMCHANGE": case "PC": - return k.PROGRAMCHANGE; + return d.PROGRAMCHANGE; case "CHANNEL PRESSURE": case "CHANNELPRESSURE": - return k.CHANNELPRESSURE; + return d.CHANNELPRESSURE; case "PITCH BEND": case "PITCHBEND": - return k.PITCHBEND; + return d.PITCHBEND; case "TIME TICK": case "TIMETICK": - return k.TIMETICK; + return d.TIMETICK; default: return Number(a); } }; - k.toNoteString = function(a, c) { + d.toNoteString = function(a, b) { a = Math.round(a); - var b = Math.floor((a - 24) / 12 + 1); + var c = Math.floor((a - 24) / 12 + 1); a = (a - 21) % 12; 0 > a && (a = 12 + a); - return k.notes[a] + (c ? "" : b); + return d.notes[a] + (b ? "" : c); }; - k.NoteStringToPitch = function(a) { + d.NoteStringToPitch = function(a) { a = a.toUpperCase(); - var b = a[0], d = 4; - "#" == a[1] ? (b += "#", 2 < a.length && (d = Number(a[2]))) : 1 < a.length && (d = Number(a[1])); - a = k.note_to_index[b]; - return null == a ? null : 12 * (d - 1) + a + 21; + var b = a[0], c = 4; + "#" == a[1] ? (b += "#", 2 < a.length && (c = Number(a[2]))) : 1 < a.length && (c = Number(a[1])); + a = d.note_to_index[b]; + return null == a ? null : 12 * (c - 1) + a + 21; }; - k.prototype.toString = function() { + d.prototype.toString = function() { var a = "" + this.channel + ". "; switch(this.cmd) { - case k.NOTEON: - a += "NOTEON " + k.toNoteString(this.data[1]); + case d.NOTEON: + a += "NOTEON " + d.toNoteString(this.data[1]); break; - case k.NOTEOFF: - a += "NOTEOFF " + k.toNoteString(this.data[1]); + case d.NOTEOFF: + a += "NOTEOFF " + d.toNoteString(this.data[1]); break; - case k.CONTROLLERCHANGE: + case d.CONTROLLERCHANGE: a += "CC " + this.data[1] + " " + this.data[2]; break; - case k.PROGRAMCHANGE: + case d.PROGRAMCHANGE: a += "PC " + this.data[1]; break; - case k.PITCHBEND: + case d.PITCHBEND: a += "PITCHBEND " + this.getPitchBend(); break; - case k.KEYPRESSURE: + case d.KEYPRESSURE: a += "KEYPRESS " + this.data[1]; } return a; }; - k.prototype.toHexString = function() { - for (var a = "", c = 0; c < this.data.length; c++) { - a += this.data[c].toString(16) + " "; + d.prototype.toHexString = function() { + for (var a = "", b = 0; b < this.data.length; b++) { + a += this.data[b].toString(16) + " "; } }; - k.NOTEOFF = 128; - k.NOTEON = 144; - k.KEYPRESSURE = 160; - k.CONTROLLERCHANGE = 176; - k.PROGRAMCHANGE = 192; - k.CHANNELPRESSURE = 208; - k.PITCHBEND = 224; - k.TIMETICK = 248; - k.commands = {128:"note off", 144:"note on", 160:"key pressure", 176:"controller change", 192:"program change", 208:"channel pressure", 224:"pitch bend", 240:"system", 242:"Song pos", 243:"Song select", 246:"Tune request", 248:"time tick", 250:"Start Song", 251:"Continue Song", 252:"Stop Song", 254:"Sensing", 255:"Reset"}; - h.input = null; - h.MIDIEvent = k; - h.prototype.onMIDISuccess = function(a) { + d.NOTEOFF = 128; + d.NOTEON = 144; + d.KEYPRESSURE = 160; + d.CONTROLLERCHANGE = 176; + d.PROGRAMCHANGE = 192; + d.CHANNELPRESSURE = 208; + d.PITCHBEND = 224; + d.TIMETICK = 248; + d.commands = {128:"note off", 144:"note on", 160:"key pressure", 176:"controller change", 192:"program change", 208:"channel pressure", 224:"pitch bend", 240:"system", 242:"Song pos", 243:"Song select", 246:"Tune request", 248:"time tick", 250:"Start Song", 251:"Continue Song", 252:"Stop Song", 254:"Sensing", 255:"Reset"}; + m.input = null; + m.MIDIEvent = d; + m.prototype.onMIDISuccess = function(a) { console.log("MIDI ready!"); console.log(a); this.midi = a; @@ -7489,68 +7502,69 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.on_ready(this); } }; - h.prototype.updatePorts = function() { + m.prototype.updatePorts = function() { var a = this.midi; this.input_ports = a.inputs; - for (var c = 0, d = this.input_ports.values(), f = d.next(); f && !1 === f.done;) { - f = f.value, console.log("Input port [type:'" + f.type + "'] id:'" + f.id + "' manufacturer:'" + f.manufacturer + "' name:'" + f.name + "' version:'" + f.version + "'"), c++, f = d.next(); + for (var b = 0, d = this.input_ports.values(), k = d.next(); k && !1 === k.done;) { + k = k.value, console.log("Input port [type:'" + k.type + "'] id:'" + k.id + "' manufacturer:'" + k.manufacturer + "' name:'" + k.name + "' version:'" + k.version + "'"), b++, k = d.next(); } - this.num_input_ports = c; - c = 0; + this.num_input_ports = b; + b = 0; this.output_ports = a.outputs; d = this.output_ports.values(); - for (f = d.next(); f && !1 === f.done;) { - f = f.value, console.log("Output port [type:'" + f.type + "'] id:'" + f.id + "' manufacturer:'" + f.manufacturer + "' name:'" + f.name + "' version:'" + f.version + "'"), c++, f = d.next(); + for (k = d.next(); k && !1 === k.done;) { + k = k.value, console.log("Output port [type:'" + k.type + "'] id:'" + k.id + "' manufacturer:'" + k.manufacturer + "' name:'" + k.name + "' version:'" + k.version + "'"), b++, k = d.next(); } - this.num_output_ports = c; + this.num_output_ports = b; }; - h.prototype.onMIDIFailure = function(a) { + m.prototype.onMIDIFailure = function(a) { console.error("Failed to get MIDI access - " + a); }; - h.prototype.openInputPort = function(a, c) { + m.prototype.openInputPort = function(a, b) { a = this.input_ports.get("input-" + a); if (!a) { return !1; } - h.input = this; - var b = this; + m.input = this; + var c = this; a.onmidimessage = function(a) { - var d = new k(a.data); - b.updateState(d); - c && c(a.data, d); - if (h.on_message) { - h.on_message(a.data, d); + var e = new d(a.data); + c.updateState(e); + b && b(a.data, e); + if (m.on_message) { + m.on_message(a.data, e); } }; console.log("port open: ", a); return !0; }; - h.parseMsg = function(a) { + m.parseMsg = function(a) { }; - h.prototype.updateState = function(a) { + m.prototype.updateState = function(a) { switch(a.cmd) { - case k.NOTEON: + case d.NOTEON: this.state.note[a.value1 | 0] = a.value2; break; - case k.NOTEOFF: + case d.NOTEOFF: this.state.note[a.value1 | 0] = 0; break; - case k.CONTROLLERCHANGE: + case d.CONTROLLERCHANGE: this.state.cc[a.getCC()] = a.getCCValue(); } }; - h.prototype.sendMIDI = function(a, c) { - c && (a = this.output_ports.get("output-" + a)) && (h.output = this, c.constructor === k ? a.send(c.data) : a.send(c)); + m.prototype.sendMIDI = function(a, b) { + b && (a = this.output_ports.get("output-" + a)) && (m.output = this, b.constructor === d ? a.send(b.data) : a.send(b)); }; - q.MIDIInterface = h; + q.MIDIInterface = m; q.title = "MIDI Input"; q.desc = "Reads MIDI from a input port"; + q.color = "#243"; q.prototype.getPropertyInfo = function(a) { if (this._midi && "port" == a) { a = {}; for (var b = 0; b < this._midi.input_ports.size; ++b) { - var d = this._midi.input_ports.get("input-" + b); - a[b] = b + ".- " + d.name + " version:" + d.version; + var c = this._midi.input_ports.get("input-" + b); + a[b] = b + ".- " + c.name + " version:" + c.version; } return {type:"enum", values:a}; } @@ -7558,15 +7572,15 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { q.prototype.onStart = function() { this._midi ? this._midi.openInputPort(this.properties.port, this.onMIDIEvent.bind(this)) : this._waiting = !0; }; - q.prototype.onMIDIEvent = function(a, c) { - this._last_midi_event = c; - this.trigger("on_midi", c); - c.cmd == k.NOTEON ? this.trigger("on_noteon", c) : c.cmd == k.NOTEOFF ? this.trigger("on_noteoff", c) : c.cmd == k.CONTROLLERCHANGE ? this.trigger("on_cc", c) : c.cmd == k.PROGRAMCHANGE ? this.trigger("on_pc", c) : c.cmd == k.PITCHBEND && this.trigger("on_pitchbend", c); + q.prototype.onMIDIEvent = function(a, b) { + this._last_midi_event = b; + this.trigger("on_midi", b); + b.cmd == d.NOTEON ? this.trigger("on_noteon", b) : b.cmd == d.NOTEOFF ? this.trigger("on_noteoff", b) : b.cmd == d.CONTROLLERCHANGE ? this.trigger("on_cc", b) : b.cmd == d.PROGRAMCHANGE ? this.trigger("on_pc", b) : b.cmd == d.PITCHBEND && this.trigger("on_pitchbend", b); }; q.prototype.onExecute = function() { if (this.outputs) { - for (var a = this._last_midi_event, c = 0; c < this.outputs.length; ++c) { - switch(this.outputs[c].name) { + for (var a = this._last_midi_event, b = 0; b < this.outputs.length; ++b) { + switch(this.outputs[b].name) { case "midi": var d = this._midi; break; @@ -7576,178 +7590,194 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { default: continue; } - this.setOutputData(c, d); + this.setOutputData(b, d); } } }; q.prototype.onGetOutputs = function() { - return [["last_midi", "midi"], ["on_midi", a.EVENT], ["on_noteon", a.EVENT], ["on_noteoff", a.EVENT], ["on_cc", a.EVENT], ["on_pc", a.EVENT], ["on_pitchbend", a.EVENT]]; + return [["last_midi", "midi"], ["on_midi", b.EVENT], ["on_noteon", b.EVENT], ["on_noteoff", b.EVENT], ["on_cc", b.EVENT], ["on_pc", b.EVENT], ["on_pitchbend", b.EVENT]]; }; - a.registerNodeType("midi/input", q); - d.MIDIInterface = h; - d.title = "MIDI Output"; - d.desc = "Sends MIDI to output channel"; - d.prototype.getPropertyInfo = function(a) { + b.registerNodeType("midi/input", q); + h.MIDIInterface = m; + h.title = "MIDI Output"; + h.desc = "Sends MIDI to output channel"; + h.color = "#243"; + h.prototype.getPropertyInfo = function(a) { if (this._midi && "port" == a) { a = {}; for (var b = 0; b < this._midi.output_ports.size; ++b) { - var d = this._midi.output_ports.get(b); - a[b] = b + ".- " + d.name + " version:" + d.version; + var c = this._midi.output_ports.get(b); + a[b] = b + ".- " + c.name + " version:" + c.version; } return {type:"enum", values:a}; } }; - d.prototype.onAction = function(a, c) { - this._midi && ("send" == a && this._midi.sendMIDI(this.port, c), this.trigger("midi", c)); + h.prototype.onAction = function(a, b) { + this._midi && ("send" == a && this._midi.sendMIDI(this.port, b), this.trigger("midi", b)); }; - d.prototype.onGetInputs = function() { - return [["send", a.ACTION]]; + h.prototype.onGetInputs = function() { + return [["send", b.ACTION]]; }; - d.prototype.onGetOutputs = function() { - return [["on_midi", a.EVENT]]; + h.prototype.onGetOutputs = function() { + return [["on_midi", b.EVENT]]; }; - a.registerNodeType("midi/output", d); + b.registerNodeType("midi/output", h); u.title = "MIDI Show"; u.desc = "Shows MIDI in the graph"; - u.prototype.onAction = function(a, c) { - c && (this._str = c.constructor === k ? c.toString() : "???"); + u.color = "#243"; + u.prototype.onAction = function(a, b) { + b && (this._str = b.constructor === d ? b.toString() : "???"); }; u.prototype.onDrawForeground = function(a) { this._str && (a.font = "30px Arial", a.fillText(this._str, 10, 0.8 * this.size[1])); }; u.prototype.onGetInputs = function() { - return [["in", a.ACTION]]; + return [["in", b.ACTION]]; }; u.prototype.onGetOutputs = function() { - return [["on_midi", a.EVENT]]; + return [["on_midi", b.EVENT]]; }; - a.registerNodeType("midi/show", u); + b.registerNodeType("midi/show", u); t.title = "MIDI Filter"; t.desc = "Filters MIDI messages"; - t.prototype.onAction = function(a, c) { - !c || c.constructor !== k || -1 != this.properties.channel && c.channel != this.properties.channel || -1 != this.properties.cmd && c.cmd != this.properties.cmd || -1 != this.properties.min_value && c.data[1] < this.properties.min_value || -1 != this.properties.max_value && c.data[1] > this.properties.max_value || this.trigger("on_midi", c); + t.color = "#243"; + t.prototype.onAction = function(a, b) { + !b || b.constructor !== d || -1 != this.properties.channel && b.channel != this.properties.channel || -1 != this.properties.cmd && b.cmd != this.properties.cmd || -1 != this.properties.min_value && b.data[1] < this.properties.min_value || -1 != this.properties.max_value && b.data[1] > this.properties.max_value || this.trigger("on_midi", b); }; - a.registerNodeType("midi/filter", t); + b.registerNodeType("midi/filter", t); w.title = "MIDIEvent"; w.desc = "Create a MIDI Event"; - w.prototype.onAction = function(a, c) { - "assign" == a ? (this.properties.channel = c.channel, this.properties.cmd = c.cmd, this.properties.value1 = c.data[1], this.properties.value2 = c.data[2]) : (c = this.midi_event, c.channel = this.properties.channel, this.properties.cmd && this.properties.cmd.constructor === String ? c.setCommandFromString(this.properties.cmd) : c.cmd = this.properties.cmd, c.data[0] = c.cmd | c.channel, c.data[1] = Number(this.properties.value1), c.data[2] = Number(this.properties.value2), this.trigger("on_midi", - c)); + w.color = "#243"; + w.prototype.onAction = function(a, b) { + "assign" == a ? (this.properties.channel = b.channel, this.properties.cmd = b.cmd, this.properties.value1 = b.data[1], this.properties.value2 = b.data[2]) : (b = this.midi_event, b.channel = this.properties.channel, this.properties.cmd && this.properties.cmd.constructor === String ? b.setCommandFromString(this.properties.cmd) : b.cmd = this.properties.cmd, b.data[0] = b.cmd | b.channel, b.data[1] = Number(this.properties.value1), b.data[2] = Number(this.properties.value2), this.trigger("on_midi", + b)); }; w.prototype.onExecute = function() { var a = this.properties; if (this.inputs) { - for (var c = 0; c < this.inputs.length; ++c) { - var d = this.inputs[c]; - if (-1 != d.link) { - switch(d.name) { + for (var b = 0; b < this.inputs.length; ++b) { + var f = this.inputs[b]; + if (-1 != f.link) { + switch(f.name) { case "note": - d = this.getInputData(c), null != d && (d.constructor === String && (d = k.NoteStringToPitch(d)), this.properties.value1 = (d | 0) % 255); + f = this.getInputData(b), null != f && (f.constructor === String && (f = d.NoteStringToPitch(f)), this.properties.value1 = (f | 0) % 255); } } } } if (this.outputs) { - for (c = 0; c < this.outputs.length; ++c) { - switch(this.outputs[c].name) { + for (b = 0; b < this.outputs.length; ++b) { + switch(this.outputs[b].name) { case "midi": - d = new k; - d.setup([a.cmd, a.value1, a.value2]); - d.channel = a.channel; + f = new d; + f.setup([a.cmd, a.value1, a.value2]); + f.channel = a.channel; break; case "command": - d = a.cmd; + f = a.cmd; break; case "cc": - d = a.value1; + f = a.value1; break; case "cc_value": - d = a.value2; + f = a.value2; break; case "note": - d = a.cmd == k.NOTEON || a.cmd == k.NOTEOFF ? a.value1 : null; + f = a.cmd == d.NOTEON || a.cmd == d.NOTEOFF ? a.value1 : null; break; case "velocity": - d = a.cmd == k.NOTEON ? a.value2 : null; + f = a.cmd == d.NOTEON ? a.value2 : null; break; case "pitch": - d = a.cmd == k.NOTEON ? k.computePitch(a.value1) : null; + f = a.cmd == d.NOTEON ? d.computePitch(a.value1) : null; break; case "pitchbend": - d = a.cmd == k.PITCHBEND ? k.computePitchBend(a.value1, a.value2) : null; + f = a.cmd == d.PITCHBEND ? d.computePitchBend(a.value1, a.value2) : null; break; default: continue; } - null !== d && this.setOutputData(c, d); + null !== f && this.setOutputData(b, f); } } }; - w.prototype.onPropertyChanged = function(a, c) { - "cmd" == a && (this.properties.cmd = k.computeCommandFromString(c)); + w.prototype.onPropertyChanged = function(a, b) { + "cmd" == a && (this.properties.cmd = d.computeCommandFromString(b)); }; w.prototype.onGetInputs = function() { return [["note", "number"]]; }; w.prototype.onGetOutputs = function() { - return [["midi", "midi"], ["on_midi", a.EVENT], ["command", "number"], ["note", "number"], ["velocity", "number"], ["cc", "number"], ["cc_value", "number"], ["pitch", "number"], ["pitchbend", "number"]]; + return [["midi", "midi"], ["on_midi", b.EVENT], ["command", "number"], ["note", "number"], ["velocity", "number"], ["cc", "number"], ["cc_value", "number"], ["pitch", "number"], ["pitchbend", "number"]]; }; - a.registerNodeType("midi/event", w); + b.registerNodeType("midi/event", w); y.title = "MIDICC"; y.desc = "gets a Controller Change"; + y.color = "#243"; y.prototype.onExecute = function() { - h.input && (this.properties.value = h.input.state.cc[this.properties.cc]); + m.input && (this.properties.value = m.input.state.cc[this.properties.cc]); this.setOutputData(0, this.properties.value); }; - a.registerNodeType("midi/cc", y); - g.title = "MIDI Generator"; - g.desc = "Generates a random MIDI note"; - g.processScale = function(a) { + b.registerNodeType("midi/cc", y); + l.title = "MIDI Generator"; + l.desc = "Generates a random MIDI note"; + l.color = "#243"; + l.processScale = function(a) { a = a.split(","); - for (var b = 0; b < a.length; ++b) { - a[b] = k.note_to_index[a[b]] || 0; + for (var c = 0; c < a.length; ++c) { + var f = a[c]; + a[c] = 2 == f.length && "#" != f[1] || 2 < f.length ? -b.MIDIEvent.NoteStringToPitch(f) : d.note_to_index[f] || 0; } return a; }; - g.prototype.onPropertyChanged = function(a, c) { - "notes" == a && (this.notes_pitches = g.processScale(c)); + l.prototype.onPropertyChanged = function(a, b) { + "notes" == a && (this.notes_pitches = l.processScale(b)); }; - g.prototype.onExecute = function() { + l.prototype.onExecute = function() { var a = this.getInputData(2); null != a && (this.properties.octave = a); if (a = this.getInputData(1)) { - this.notes_pitches = g.processScale(a); + this.notes_pitches = l.processScale(a); } }; - g.prototype.onAction = function(a, c) { + l.prototype.onAction = function(a, b) { + var c = 0; + b = this.notes_pitches.length; a = 0; - c = this.notes_pitches.length; - "sequence" == this.properties.mode ? (a = this.sequence_index = (this.sequence_index + 1) % c, a = this.notes_pitches[a] + 12 * (this.properties.octave - 1) + 33) : "random" == this.properties.mode && (a = Math.floor(Math.random() * c), a = this.notes_pitches[a] + 12 * (this.properties.octave - 1) + 33); - c = new k; - c.setup([k.NOTEON, a, 10]); - this.trigger("note", c); + "sequence" == this.properties.mode ? a = this.sequence_index = (this.sequence_index + 1) % b : "random" == this.properties.mode && (a = Math.floor(Math.random() * b)); + b = this.notes_pitches[a]; + c = 0 <= b ? b + 12 * (this.properties.octave - 1) + 33 : -b; + b = new d; + b.setup([d.NOTEON, c, 10]); + a = this.properties.duration || 1; + this.trigger("note", b); + setTimeout(function() { + var a = new d; + a.setup([d.NOTEOFF, c, 0]); + this.trigger("note", a); + }.bind(this), 1000 * a); }; - a.registerNodeType("midi/generator", g); + b.registerNodeType("midi/generator", l); z.title = "MIDI Transpose"; z.desc = "Transpose a MIDI note"; - z.prototype.onAction = function(a, c) { - this.midi_event.setup(c.data); - this.midi_event.data[1] = Math.round(this.midi_event.data[1] + this.properties.amount); - this.trigger("out", this.midi_event); + z.color = "#243"; + z.prototype.onAction = function(a, b) { + b && b.constructor === d && (b.data[0] == d.NOTEON || b.data[0] == d.NOTEOFF ? (this.midi_event = new d, this.midi_event.setup(b.data), this.midi_event.data[1] = Math.round(this.midi_event.data[1] + this.properties.amount), this.trigger("out", this.midi_event)) : this.trigger("out", b)); }; z.prototype.onExecute = function() { var a = this.getInputData(1); null != a && (this.properties.amount = a); }; - a.registerNodeType("midi/transpose", z); - n.title = "MIDI Quantize Pitch"; - n.desc = "Transpose a MIDI note tp fit an scale"; - n.prototype.onPropertyChanged = function(a, c) { - "scale" == a && this.processScale(c); + b.registerNodeType("midi/transpose", z); + p.title = "MIDI Quantize Pitch"; + p.desc = "Transpose a MIDI note tp fit an scale"; + p.color = "#243"; + p.prototype.onPropertyChanged = function(a, b) { + "scale" == a && this.processScale(b); }; - n.prototype.processScale = function(a) { + p.prototype.processScale = function(a) { this._current_scale = a; - this.notes_pitches = g.processScale(a); + this.notes_pitches = l.processScale(a); for (a = 0; 12 > a; ++a) { this.valid_notes[a] = -1 != this.notes_pitches.indexOf(a); } @@ -7768,31 +7798,115 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - n.prototype.onAction = function(a, c) { - this.midi_event.setup(c.data); - this.midi_event.data[1] += this.offset_notes[k.note_to_index[c.note]]; - this.trigger("out", this.midi_event); + p.prototype.onAction = function(a, b) { + b && b.constructor === d && (b.data[0] == d.NOTEON || b.data[0] == d.NOTEOFF ? (this.midi_event = new d, this.midi_event.setup(b.data), this.midi_event.data[1] += this.offset_notes[d.note_to_index[b.note]], this.trigger("out", this.midi_event)) : this.trigger("out", b)); }; - n.prototype.onExecute = function() { + p.prototype.onExecute = function() { var a = this.getInputData(1); null != a && a != this._current_scale && this.processScale(a); }; - a.registerNodeType("midi/quantize", n); - m.title = "MIDI Play"; - m.desc = "Plays a MIDI note"; - m.prototype.onAction = function(a, c) { - this.instrument && (a = c.note) && "undefined" != a && a.constructor === String && (this.instrument.play(a, c.octave, this.properties.duration, this.properties.volume), this.trigger("note", c)); + b.registerNodeType("midi/quantize", p); + g.title = "MIDI Play"; + g.desc = "Plays a MIDI note"; + g.color = "#243"; + g.prototype.onAction = function(a, b) { + if (b && b.constructor === d) { + if (this.instrument && b.data[0] == d.NOTEON) { + a = b.note; + if (!a || "undefined" == a || a.constructor !== String) { + return; + } + this.instrument.play(a, b.octave, this.properties.duration, this.properties.volume); + } + this.trigger("note", b); + } }; - m.prototype.onExecute = function() { + g.prototype.onExecute = function() { var a = this.getInputData(1); null != a && (this.properties.volume = a); a = this.getInputData(2); null != a && (this.properties.duration = a); }; - a.registerNodeType("midi/play", m); + b.registerNodeType("midi/play", g); + a.title = "MIDI Keys"; + a.desc = "Keyboard to play notes"; + a.color = "#243"; + a.keys = [{x:0, w:1, h:1, t:0}, {x:0.75, w:0.5, h:0.6, t:1}, {x:1, w:1, h:1, t:0}, {x:1.75, w:0.5, h:0.6, t:1}, {x:2, w:1, h:1, t:0}, {x:2.75, w:0.5, h:0.6, t:1}, {x:3, w:1, h:1, t:0}, {x:4, w:1, h:1, t:0}, {x:4.75, w:0.5, h:0.6, t:1}, {x:5, w:1, h:1, t:0}, {x:5.75, w:0.5, h:0.6, t:1}, {x:6, w:1, h:1, t:0}]; + a.prototype.onDrawBackground = function(b) { + if (!this.flags.collapsed) { + var c = 12 * this.properties.num_octaves; + this.keys.length = c; + for (var d = this.size[0] / (7 * this.properties.num_octaves), k = this.size[1], g = 0; 2 > g; g++) { + for (var h = 0; h < c; ++h) { + var l = a.keys[h % 12]; + if (l.t == g) { + var m = 7 * Math.floor(h / 12) * d + l.x * d; + b.fillStyle = 0 == g ? this.keys[h] ? "#CCC" : "white" : this.keys[h] ? "#333" : "black"; + b.fillRect(m + 1, 0, d * l.w - 2, k * l.h); + } + } + } + } + }; + a.prototype.getKeyIndex = function(b) { + for (var c = this.size[0] / (7 * this.properties.num_octaves), d = this.size[1], k = 1; 0 <= k; k--) { + for (var g = 0; g < this.keys.length; ++g) { + var h = a.keys[g % 12]; + if (h.t == k) { + var l = 7 * Math.floor(g / 12) * c + h.x * c, m = c * h.w; + h = d * h.h; + if (!(b[0] < l || b[0] > l + m || b[1] > h)) { + return g; + } + } + } + } + return -1; + }; + a.prototype.onAction = function(a, b) { + if ("reset" == a) { + for (b = 0; b < this.keys.length; ++b) { + this.keys[b] = !1; + } + } else { + b && b.constructor === d && (a = b.data[1] - (12 * (this.properties.start_octave - 1) + 29), 0 <= a && a < this.keys.length && (b.data[0] == d.NOTEON ? this.keys[a] = !0 : b.data[0] == d.NOTEOFF && (this.keys[a] = !1)), this.trigger("note", b)); + } + }; + a.prototype.onMouseDown = function(a, b) { + if (!(0 > b[1])) { + return a = this.getKeyIndex(b), this.keys[a] = !0, this._last_key = a, a = 12 * (this.properties.start_octave - 1) + 29 + a, b = new d, b.setup([d.NOTEON, a, 100]), this.trigger("note", b), !0; + } + }; + a.prototype.onMouseMove = function(a, b) { + if (!(0 > b[1] || -1 == this._last_key)) { + this.setDirtyCanvas(!0); + a = this.getKeyIndex(b); + if (this._last_key == a) { + return !0; + } + this.keys[this._last_key] = !1; + b = 12 * (this.properties.start_octave - 1) + 29 + this._last_key; + var c = new d; + c.setup([d.NOTEOFF, b, 100]); + this.trigger("note", c); + this.keys[a] = !0; + b = 12 * (this.properties.start_octave - 1) + 29 + a; + c = new d; + c.setup([d.NOTEON, b, 100]); + this.trigger("note", c); + this._last_key = a; + return !0; + } + }; + a.prototype.onMouseUp = function(a, b) { + if (!(0 > b[1])) { + return a = this.getKeyIndex(b), this.keys[a] = !1, this._last_key = -1, a = 12 * (this.properties.start_octave - 1) + 29 + a, b = new d, b.setup([d.NOTEOFF, a, 100]), this.trigger("note", b), !0; + } + }; + b.registerNodeType("midi/keys", a); })(this); (function(v) { - function k() { + function d() { this.properties = {src:"", gain:0.5, loop:!0, autoplay:!0, playbackRate:1}; this._loading_audio = !1; this._audiobuffer = null; @@ -7805,7 +7919,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.audionode.gain.value = this.properties.gain; this.properties.src && this.loadSound(this.properties.src); } - function h() { + function m() { this.properties = {gain:0.5}; this._audionodes = []; this._media_stream = null; @@ -7828,7 +7942,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addOutput("samples", "array"); this._time_bin = this._freq_bin = null; } - function d() { + function h() { this.properties = {gain:1}; this.audionode = f.getAudioContext().createGain(); this.addInput("in", "audio"); @@ -7869,7 +7983,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInput("in2 gain", "number"); this.addOutput("out", "audio"); } - function g() { + function l() { this.properties = {delayTime:0.5}; this.audionode = f.getAudioContext().createDelay(10); this.audionode.delayTime.value = this.properties.delayTime; @@ -7884,13 +7998,13 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.addInput("in", "audio"); this.addOutput("out", "audio"); } - function n() { + function p() { this.properties = {frequency:440, detune:0, type:"sine"}; this.addProperty("type", "sine", "enum", {values:["sine", "square", "sawtooth", "triangle", "custom"]}); this.audionode = f.getAudioContext().createOscillator(); this.addOutput("out", "audio"); } - function m() { + function g() { this.properties = {continuous:!0, mark:-1}; this.addInput("data", "array"); this.addInput("mark", "number"); @@ -7968,8 +8082,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } if (a.outputs) { for (c = 0; c < a.outputs.length; ++c) { - for (var l = a.outputs[c], g = 0; g < l.links.length; ++g) { - if (d = a.graph.links[l.links[g]]) { + for (var k = a.outputs[c], g = 0; g < k.links.length; ++g) { + if (d = a.graph.links[k.links[g]]) { e = a.getAudioNodeInOutputSlot ? a.getAudioNodeInOutputSlot(c) : a.audionode; var h = a.graph.getNodeById(d.target_id); d = h.getAudioNodeInInputSlot ? h.getAudioNodeInInputSlot(d.target_slot) : h.audionode; @@ -8003,10 +8117,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { var e = new XMLHttpRequest; e.open("GET", a, !0); e.responseType = "arraybuffer"; - var l = f.getAudioContext(); + var k = f.getAudioContext(); e.onload = function() { console.log("AudioSource loaded"); - l.decodeAudioData(e.response, function(c) { + k.decodeAudioData(e.response, function(c) { console.log("AudioSource decoded"); f.cached_audios[a] = c; b && b(c); @@ -8016,42 +8130,42 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { return e; } }; - k["@src"] = {widget:"resource"}; - k.supported_extensions = ["wav", "ogg", "mp3"]; - k.prototype.onAdded = function(a) { + d["@src"] = {widget:"resource"}; + d.supported_extensions = ["wav", "ogg", "mp3"]; + d.prototype.onAdded = function(a) { if (a.status === LGraph.STATUS_RUNNING) { this.onStart(); } }; - k.prototype.onStart = function() { + d.prototype.onStart = function() { this._audiobuffer && this.properties.autoplay && this.playBuffer(this._audiobuffer); }; - k.prototype.onStop = function() { + d.prototype.onStop = function() { this.stopAllSounds(); }; - k.prototype.onPause = function() { + d.prototype.onPause = function() { this.pauseAllSounds(); }; - k.prototype.onUnpause = function() { + d.prototype.onUnpause = function() { this.unpauseAllSounds(); }; - k.prototype.onRemoved = function() { + d.prototype.onRemoved = function() { this.stopAllSounds(); this._dropped_url && URL.revokeObjectURL(this._url); }; - k.prototype.stopAllSounds = function() { + d.prototype.stopAllSounds = function() { for (var a = 0; a < this._audionodes.length; ++a) { this._audionodes[a].started && (this._audionodes[a].started = !1, this._audionodes[a].stop()); } this._audionodes.length = 0; }; - k.prototype.pauseAllSounds = function() { + d.prototype.pauseAllSounds = function() { f.getAudioContext().suspend(); }; - k.prototype.unpauseAllSounds = function() { + d.prototype.unpauseAllSounds = function() { f.getAudioContext().resume(); }; - k.prototype.onExecute = function() { + d.prototype.onExecute = function() { if (this.inputs) { for (var a = 0; a < this.inputs.length; ++a) { var b = this.inputs[a]; @@ -8077,10 +8191,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.onAction = function(a) { + d.prototype.onAction = function(a) { this._audiobuffer && ("Play" == a ? this.playBuffer(this._audiobuffer) : "Stop" == a && this.stopAllSounds()); }; - k.prototype.onPropertyChanged = function(a, b) { + d.prototype.onPropertyChanged = function(a, b) { if ("src" == a) { this.loadSound(b); } else { @@ -8095,7 +8209,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - k.prototype.playBuffer = function(a) { + d.prototype.playBuffer = function(a) { var b = this, c = f.getAudioContext().createBufferSource(); this._last_sourcenode = c; c.graphnode = this; @@ -8113,7 +8227,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { c.started || (c.started = !0, c.start()); return c; }; - k.prototype.loadSound = function(a) { + d.prototype.loadSound = function(a) { var b = this; this._request && (this._request.abort(), this._request = null); this._audiobuffer = null; @@ -8127,41 +8241,41 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } }), this._loading_audio = !0, this.boxcolor = "#AA4"); }; - k.prototype.onConnectionsChange = f.onConnectionsChange; - k.prototype.onGetInputs = function() { + d.prototype.onConnectionsChange = f.onConnectionsChange; + d.prototype.onGetInputs = function() { return [["playbackRate", "number"], ["Play", e.ACTION], ["Stop", e.ACTION]]; }; - k.prototype.onGetOutputs = function() { + d.prototype.onGetOutputs = function() { return [["buffer", "audiobuffer"], ["ended", e.EVENT]]; }; - k.prototype.onDropFile = function(a) { + d.prototype.onDropFile = function(a) { this._dropped_url && URL.revokeObjectURL(this._dropped_url); a = URL.createObjectURL(a); this.properties.src = a; this.loadSound(a); this._dropped_url = a; }; - k.title = "Source"; - k.desc = "Plays audio"; - e.registerNodeType("audio/source", k); - h.prototype.onAdded = function(a) { + d.title = "Source"; + d.desc = "Plays audio"; + e.registerNodeType("audio/source", d); + m.prototype.onAdded = function(a) { if (a.status === LGraph.STATUS_RUNNING) { this.onStart(); } }; - h.prototype.onStart = function() { + m.prototype.onStart = function() { null != this._media_stream || this._waiting_confirmation || this.openStream(); }; - h.prototype.onStop = function() { + m.prototype.onStop = function() { this.audionode.gain.value = 0; }; - h.prototype.onPause = function() { + m.prototype.onPause = function() { this.audionode.gain.value = 0; }; - h.prototype.onUnpause = function() { + m.prototype.onUnpause = function() { this.audionode.gain.value = this.properties.gain; }; - h.prototype.onRemoved = function() { + m.prototype.onRemoved = function() { this.audionode.gain.value = 0; this.audiosource_node && (this.audiosource_node.disconnect(this.audionode), this.audiosource_node = null); if (this._media_stream) { @@ -8169,7 +8283,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { a.length && a[0].stop(); } }; - h.prototype.openStream = function() { + m.prototype.openStream = function() { if (navigator.mediaDevices) { this._waiting_confirmation = !0; navigator.mediaDevices.getUserMedia({audio:!0, video:!1}).then(this.streamReady.bind(this)).catch(function(b) { @@ -8182,7 +8296,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { console.log("getUserMedia() is not supported in your browser, use chrome and enable WebRTC from about://flags"); } }; - h.prototype.streamReady = function(a) { + m.prototype.streamReady = function(a) { this._media_stream = a; this.audiosource_node && this.audiosource_node.disconnect(this.audionode); this.audiosource_node = f.getAudioContext().createMediaStreamSource(a); @@ -8190,7 +8304,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this.audiosource_node.connect(this.audionode); this.boxcolor = "white"; }; - h.prototype.onExecute = function() { + m.prototype.onExecute = function() { null != this._media_stream || this._waiting_confirmation || this.openStream(); if (this.inputs) { for (var a = 0; a < this.inputs.length; ++a) { @@ -8202,19 +8316,19 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - h.prototype.onAction = function(a) { + m.prototype.onAction = function(a) { "Play" == a ? this.audionode.gain.value = this.properties.gain : "Stop" == a && (this.audionode.gain.value = 0); }; - h.prototype.onPropertyChanged = function(a, b) { + m.prototype.onPropertyChanged = function(a, b) { "gain" == a && (this.audionode.gain.value = b); }; - h.prototype.onConnectionsChange = f.onConnectionsChange; - h.prototype.onGetInputs = function() { + m.prototype.onConnectionsChange = f.onConnectionsChange; + m.prototype.onGetInputs = function() { return [["playbackRate", "number"], ["Play", e.ACTION], ["Stop", e.ACTION]]; }; - h.title = "MediaSource"; - h.desc = "Plays microphone"; - e.registerNodeType("audio/media_source", h); + m.title = "MediaSource"; + m.desc = "Plays microphone"; + e.registerNodeType("audio/media_source", m); q.prototype.onPropertyChanged = function(a, b) { this.audionode[a] = b; }; @@ -8243,7 +8357,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { q.title = "Analyser"; q.desc = "Audio Analyser"; e.registerNodeType("audio/analyser", q); - d.prototype.onExecute = function() { + h.prototype.onExecute = function() { if (this.inputs && this.inputs.length) { for (var a = 1; a < this.inputs.length; ++a) { var b = this.inputs[a], c = this.getInputData(a); @@ -8251,10 +8365,10 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - f.createAudioNodeWrapper(d); - d.title = "Gain"; - d.desc = "Audio gain"; - e.registerNodeType("audio/gain", d); + f.createAudioNodeWrapper(h); + h.title = "Gain"; + h.desc = "Audio gain"; + e.registerNodeType("audio/gain", h); f.createAudioNodeWrapper(u); u.prototype.onRemove = function() { this._dropped_url && URL.revokeObjectURL(this._dropped_url); @@ -8334,14 +8448,14 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { y.title = "Mixer"; y.desc = "Audio mixer"; e.registerNodeType("audio/mixer", y); - f.createAudioNodeWrapper(g); - g.prototype.onExecute = function() { + f.createAudioNodeWrapper(l); + l.prototype.onExecute = function() { var a = this.getInputData(1); void 0 !== a && (this.audionode.delayTime.value = a); }; - g.title = "Delay"; - g.desc = "Audio delay"; - e.registerNodeType("audio/delay", g); + l.title = "Delay"; + l.desc = "Audio delay"; + e.registerNodeType("audio/delay", l); z.prototype.onExecute = function() { if (this.inputs && this.inputs.length) { for (var a = 1; a < this.inputs.length; ++a) { @@ -8360,19 +8474,19 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { z.title = "BiquadFilter"; z.desc = "Audio filter"; e.registerNodeType("audio/biquadfilter", z); - n.prototype.onStart = function() { + p.prototype.onStart = function() { this.audionode.started || (this.audionode.started = !0, this.audionode.start()); }; - n.prototype.onStop = function() { + p.prototype.onStop = function() { this.audionode.started && (this.audionode.started = !1, this.audionode.stop()); }; - n.prototype.onPause = function() { + p.prototype.onPause = function() { this.onStop(); }; - n.prototype.onUnpause = function() { + p.prototype.onUnpause = function() { this.onStart(); }; - n.prototype.onExecute = function() { + p.prototype.onExecute = function() { if (this.inputs && this.inputs.length) { for (var a = 0; a < this.inputs.length; ++a) { var b = this.inputs[a]; @@ -8383,20 +8497,20 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { } } }; - n.prototype.onGetInputs = function() { + p.prototype.onGetInputs = function() { return [["frequency", "number"], ["detune", "number"], ["type", "string"]]; }; - f.createAudioNodeWrapper(n); - n.title = "Oscillator"; - n.desc = "Oscillator"; - e.registerNodeType("audio/oscillator", n); - m.prototype.onExecute = function() { + f.createAudioNodeWrapper(p); + p.title = "Oscillator"; + p.desc = "Oscillator"; + e.registerNodeType("audio/oscillator", p); + g.prototype.onExecute = function() { this._last_buffer = this.getInputData(0); var a = this.getInputData(1); void 0 !== a && (this.properties.mark = a); this.setDirtyCanvas(!0, !1); }; - m.prototype.onDrawForeground = function(a) { + g.prototype.onDrawForeground = function(a) { if (this._last_buffer) { var b = this._last_buffer, c = b.length / this.size[0], d = this.size[1]; a.fillStyle = "black"; @@ -8418,9 +8532,9 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { 0 <= this.properties.mark && (b = f.getAudioContext().sampleRate / b.length, e = this.properties.mark / b * 2 / c, e >= this.size[0] && (e = this.size[0] - 1), a.strokeStyle = "red", a.beginPath(), a.moveTo(e, d), a.lineTo(e, 0), a.stroke()); } }; - m.title = "Visualization"; - m.desc = "Audio Visualization"; - e.registerNodeType("audio/visualization", m); + g.title = "Visualization"; + g.desc = "Audio Visualization"; + e.registerNodeType("audio/visualization", g); a.prototype.onExecute = function() { if (this._freqs = this.getInputData(0)) { var a = this.properties.band, b = this.getInputData(1); @@ -8461,8 +8575,8 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { b.prototype.processCode = function() { try { this._script = new (new Function("properties", this.properties.code))(this.properties), this._old_code = this.properties.code, this._callback = this._script.onaudioprocess; - } catch (l) { - console.error("Error in onaudioprocess code", l), this._callback = b._bypass_function, this.audionode.onaudioprocess = this._callback; + } catch (k) { + console.error("Error in onaudioprocess code", k), this._callback = b._bypass_function, this.audionode.onaudioprocess = this._callback; } }; b.prototype.onPropertyChanged = function(a, b) { @@ -8488,7 +8602,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { e.registerNodeType("audio/destination", c); })(this); (function(v) { - function k() { + function d() { this.size = [60, 20]; this.addInput("send", q.ACTION); this.addOutput("received", q.EVENT); @@ -8498,7 +8612,7 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._ws = null; this._last_data = []; } - function h() { + function m() { this.size = [60, 20]; this.addInput("send", q.ACTION); this.addOutput("received", q.EVENT); @@ -8511,41 +8625,41 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { this._last_output_data = []; } var q = v.LiteGraph; - k.title = "WebSocket"; - k.desc = "Send data through a websocket"; - k.prototype.onPropertyChanged = function(d, h) { + d.title = "WebSocket"; + d.desc = "Send data through a websocket"; + d.prototype.onPropertyChanged = function(d, m) { "url" == d && this.createSocket(); }; - k.prototype.onExecute = function() { + d.prototype.onExecute = function() { !this._ws && this.properties.url && this.createSocket(); if (this._ws && this._ws.readyState == WebSocket.OPEN) { - for (var d = this.properties.room, h = 1; h < this.inputs.length; ++h) { - var k = this.getInputData(h); - if (null != k) { + for (var d = this.properties.room, m = 1; m < this.inputs.length; ++m) { + var q = this.getInputData(m); + if (null != q) { try { - var q = JSON.stringify({type:0, room:d, channel:h, data:k}); + var v = JSON.stringify({type:0, room:d, channel:m, data:q}); } catch (y) { continue; } - this._ws.send(q); + this._ws.send(v); } } - for (h = 1; h < this.outputs.length; ++h) { - this.setOutputData(h, this._last_data[h]); + for (m = 1; m < this.outputs.length; ++m) { + this.setOutputData(m, this._last_data[m]); } } }; - k.prototype.createSocket = function() { - var d = this, h = this.properties.url; - "ws" != h.substr(0, 2) && (h = "ws://" + h); - this._ws = new WebSocket(h); + d.prototype.createSocket = function() { + var d = this, m = this.properties.url; + "ws" != m.substr(0, 2) && (m = "ws://" + m); + this._ws = new WebSocket(m); this._ws.onopen = function() { console.log("ready"); d.boxcolor = "#8E8"; }; this._ws.onmessage = function(h) { - var k = JSON.parse(h.data); - k.room && k.room != this.properties.room || (1 == h.data.type ? d.triggerSlot(0, k) : d._last_data[h.data.channel || 0] = k.data); + var m = JSON.parse(h.data); + m.room && m.room != this.properties.room || (1 == h.data.type ? d.triggerSlot(0, m) : d._last_data[h.data.channel || 0] = m.data); }; this._ws.onerror = function(h) { console.log("couldnt connect to websocket"); @@ -8556,45 +8670,45 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { d.boxcolor = "#000"; }; }; - k.prototype.send = function(d) { + d.prototype.send = function(d) { this._ws && this._ws.readyState == WebSocket.OPEN && this._ws.send(JSON.stringify({type:1, msg:d})); }; - k.prototype.onAction = function(d, h) { - this._ws && this._ws.readyState == WebSocket.OPEN && this._ws.send({type:1, room:this.properties.room, action:d, data:h}); + d.prototype.onAction = function(d, m) { + this._ws && this._ws.readyState == WebSocket.OPEN && this._ws.send({type:1, room:this.properties.room, action:d, data:m}); }; - k.prototype.onGetInputs = function() { + d.prototype.onGetInputs = function() { return [["in", 0]]; }; - k.prototype.onGetOutputs = function() { + d.prototype.onGetOutputs = function() { return [["out", 0]]; }; - q.registerNodeType("network/websocket", k); - h.title = "SillyClient"; - h.desc = "Connects to SillyServer to broadcast messages"; - h.prototype.onPropertyChanged = function(d, h) { + q.registerNodeType("network/websocket", d); + m.title = "SillyClient"; + m.desc = "Connects to SillyServer to broadcast messages"; + m.prototype.onPropertyChanged = function(d, m) { d = this.properties.url + "/" + this.properties.room; this._server && this._final_url != d && (this._server.connect(this.properties.url, this.properties.room), this._final_url = d); }; - h.prototype.onExecute = function() { + m.prototype.onExecute = function() { if (this._server && this._server.is_connected) { - for (var d = this.properties.save_bandwidth, h = 1; h < this.inputs.length; ++h) { - var k = this.getInputData(h); - null == k || d && this._last_input_data[h] == k || (this._server.sendMessage({type:0, channel:h, data:k}), this._last_input_data[h] = k); + for (var d = this.properties.save_bandwidth, m = 1; m < this.inputs.length; ++m) { + var q = this.getInputData(m); + null == q || d && this._last_input_data[m] == q || (this._server.sendMessage({type:0, channel:m, data:q}), this._last_input_data[m] = q); } - for (h = 1; h < this.outputs.length; ++h) { - this.setOutputData(h, this._last_output_data[h]); + for (m = 1; m < this.outputs.length; ++m) { + this.setOutputData(m, this._last_output_data[m]); } } }; - h.prototype.createSocket = function() { + m.prototype.createSocket = function() { var d = this; "undefined" == typeof SillyClient ? (this._error || console.error("SillyClient node cannot be used, you must include SillyServer.js"), this._error = !0) : (this._server = new SillyClient, this._server.on_ready = function() { console.log("ready"); d.boxcolor = "#8E8"; - }, this._server.on_message = function(h, k) { + }, this._server.on_message = function(h, m) { h = null; try { - h = JSON.parse(k); + h = JSON.parse(m); } catch (w) { return; } @@ -8607,18 +8721,18 @@ $jscomp.polyfill("Array.prototype.keys", function(v) { d.boxcolor = "#000"; }, this.properties.url && this.properties.room && (this._server.connect(this.properties.url, this.properties.room), this._final_url = this.properties.url + "/" + this.properties.room)); }; - h.prototype.send = function(d) { + m.prototype.send = function(d) { this._server && this._server.is_connected && this._server.sendMessage({type:1, data:d}); }; - h.prototype.onAction = function(d, h) { - this._server && this._server.is_connected && this._server.sendMessage({type:1, action:d, data:h}); + m.prototype.onAction = function(d, m) { + this._server && this._server.is_connected && this._server.sendMessage({type:1, action:d, data:m}); }; - h.prototype.onGetInputs = function() { + m.prototype.onGetInputs = function() { return [["in", 0]]; }; - h.prototype.onGetOutputs = function() { + m.prototype.onGetOutputs = function() { return [["out", 0]]; }; - q.registerNodeType("network/sillyclient", h); + q.registerNodeType("network/sillyclient", m); })(this); diff --git a/demo/examples/midi_generation.json b/demo/examples/midi_generation.json index febff18a5..3a086fbb7 100644 --- a/demo/examples/midi_generation.json +++ b/demo/examples/midi_generation.json @@ -1 +1 @@ -{"last_node_id":37,"last_link_id":55,"nodes":[{"id":12,"type":"events/timer","pos":[180,284],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"interval","type":"number","link":null}],"outputs":[{"name":"on_tick","type":-1,"links":[11]}],"properties":{"interval":1200,"event":"tick"},"boxcolor":"#222"},{"id":8,"type":"midi/generator","pos":[548,390],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":11},{"name":"scale","type":"string","link":47},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[10,19]}],"properties":{"notes":"A,B,C","octave":2,"mode":"sequence"}},{"id":20,"type":"midi/transpose","pos":[726,489],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"in","type":-1,"link":19},{"name":"amount","type":"number","link":null}],"outputs":[{"name":"out","type":-1,"links":[21]}],"properties":{"amount":5}},{"id":3,"type":"events/timer","pos":[181,227],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"interval","type":"number","link":null}],"outputs":[{"name":"on_tick","type":-1,"links":[5]}],"properties":{"interval":300,"event":"tick"},"boxcolor":"#222"},{"id":7,"type":"midi/generator","pos":[543,283],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":5},{"name":"scale","type":"string","link":48},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[7,12]}],"properties":{"notes":"A,B,C","octave":2,"mode":"random"}},{"id":15,"type":"math/floor","pos":[572,106],"size":[60,20],"flags":{},"mode":0,"inputs":[{"name":"in","type":"number","link":14}],"outputs":[{"name":"out","type":"number","links":[15]}],"properties":{}},{"id":16,"type":"math/operation","pos":[689,119],"size":{"0":140,"1":34},"flags":{"collapsed":true},"mode":0,"inputs":[{"name":"A","type":"number","link":15},{"name":"B","type":"number","link":null}],"outputs":[{"name":"=","type":"number","links":[16]}],"properties":{"A":1,"B":12,"OP":"*"}},{"id":14,"type":"math/rand","pos":[464,105],"size":[60,20],"flags":{},"mode":0,"outputs":[{"name":"value","type":"number","links":[14],"label":"1.204"}],"properties":{"min":-1,"max":2}},{"id":17,"type":"widget/knob","pos":[995,68],"size":[54,74],"flags":{"collapsed":false},"mode":0,"outputs":[{"name":"","type":"number","links":[17]}],"properties":{"min":0,"max":1,"value":0.21000000000000005,"wcolor":"#7AF","size":50},"boxcolor":"rgba(128,128,128,1.0)"},{"id":6,"type":"midi/show","pos":[892,350],"size":[241,61],"flags":{},"mode":0,"inputs":[{"name":"on_midi","type":-1,"link":7}],"properties":{}},{"id":18,"type":"widget/knob","pos":[925,69],"size":[54,74],"flags":{},"mode":0,"outputs":[{"name":"","type":"number","links":[18,36]}],"properties":{"min":0,"max":1,"value":0.3599999999999999,"wcolor":"#7AF","size":50},"boxcolor":"rgba(128,128,128,1.0)"},{"id":28,"type":"midi/output","pos":[1477,421],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":33},{"name":"send","type":-1,"link":34},{"name":"send","type":-1,"link":35}],"properties":{"port":0}},{"id":31,"type":"midi/event","pos":[1463,586],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":43}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[42]}],"properties":{"channel":0,"cmd":144,"value1":55,"value2":10}},{"id":30,"type":"midi/event","pos":[1469,262],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":39}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[38]}],"properties":{"channel":0,"cmd":144,"value1":38,"value2":10}},{"id":32,"type":"midi/event","pos":[1465,656],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":44}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[45]}],"properties":{"channel":0,"cmd":144,"value1":60,"value2":10}},{"id":29,"type":"graphics/plot","pos":[1724,337],"size":{"0":681,"1":381},"flags":{},"mode":0,"inputs":[{"name":"A","type":"Number","link":38},{"name":"B","type":"Number","link":42},{"name":"C","type":"Number","link":45},{"name":"D","type":"Number","link":null}],"properties":{"scale":100}},{"id":11,"type":"midi/play","pos":[1116,504],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":10},{"name":"volume","type":"number","link":18},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[34,43]}],"properties":{"volume":0.3599999999999999,"duration":4,"value":0}},{"id":10,"type":"basic/string","pos":[82,370],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[46],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"A,B,C,D,E,F,G"}},{"id":19,"type":"midi/play","pos":[1132,611],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":53},{"name":"volume","type":"number","link":36},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[35,44]}],"properties":{"volume":0.3599999999999999,"duration":4,"value":0}},{"id":4,"type":"midi/play","pos":[1191,240],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":54},{"name":"volume","type":"number","link":17},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[33,39]}],"properties":{"volume":0.21000000000000005,"duration":1,"value":0}},{"id":21,"type":"midi/quantize","pos":[903,589],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":21},{"name":"scale","type":"string","link":49}],"outputs":[{"name":"out","type":-1,"links":[53]}],"properties":{"scale":"A,A#,B,C,C#,D,D#,E,F,F#,G,G#","amount":"A,B,C,D,E,F,G"}},{"id":13,"type":"midi/transpose","pos":[932,271],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"in","type":-1,"link":12},{"name":"amount","type":"number","link":16}],"outputs":[{"name":"out","type":-1,"links":[54]}],"properties":{"amount":12}},{"id":37,"type":"basic/watch","pos":[547,615],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"value","type":0,"link":52,"label":"A,B,C,D,E,F,G"}],"properties":{}},{"id":34,"type":"logic/selector","pos":[339,472],"size":{"0":85,"1":79},"flags":{},"mode":0,"inputs":[{"name":"sel","type":"number","link":51},{"name":"A","type":0,"link":46},{"name":"B","type":0,"link":50},{"name":"C","type":0,"link":null},{"name":"D","type":0,"link":null}],"outputs":[{"name":"out","links":[47,48,49,52]}],"properties":{}},{"id":35,"type":"basic/string","pos":[79,456],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[50],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"A,B,C,B"}},{"id":36,"type":"widget/knob","pos":[214,557],"size":[54,74],"flags":{},"mode":0,"outputs":[{"name":"","type":"number","links":[51]}],"properties":{"min":0,"max":1,"value":0.24999999999999978,"wcolor":"#7AF","size":50},"boxcolor":"rgba(64,64,64,1.0)"}],"links":[[5,3,0,7,0,-1],[7,7,0,6,0,-1],[10,8,0,11,0,-1],[11,12,0,8,0,-1],[12,7,0,13,0,-1],[14,14,0,15,0,"number"],[15,15,0,16,0,"number"],[16,16,0,13,1,"number"],[17,17,0,4,1,"number"],[18,18,0,11,1,"number"],[19,8,0,20,0,-1],[21,20,0,21,0,-1],[33,4,0,28,0,-1],[34,11,0,28,1,-1],[35,19,0,28,2,-1],[36,18,0,19,1,"number"],[38,30,1,29,0,"Number"],[39,4,0,30,1,-1],[42,31,1,29,1,"Number"],[43,11,0,31,1,-1],[44,19,0,32,1,-1],[45,32,1,29,2,"Number"],[46,10,0,34,1,0],[47,34,0,8,1,"string"],[48,34,0,7,1,"string"],[49,34,0,21,1,"string"],[50,35,0,34,2,0],[51,36,0,34,0,"number"],[52,34,0,37,0,0],[53,21,0,19,0,-1],[54,13,0,4,0,-1]],"groups":[],"config":{}} \ No newline at end of file +{"last_node_id":47,"last_link_id":62,"nodes":[{"id":12,"type":"events/timer","pos":[180,284],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"interval","type":"number","link":null}],"outputs":[{"name":"on_tick","type":-1,"links":[11]}],"properties":{"interval":1200,"event":"tick"},"boxcolor":"#222"},{"id":8,"type":"midi/generator","pos":[548,390],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":11},{"name":"scale","type":"string","link":47},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[10,19]}],"properties":{"notes":"A,B,C","octave":2,"duration":0.5,"mode":"sequence"}},{"id":20,"type":"midi/transpose","pos":[726,489],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"in","type":-1,"link":19},{"name":"amount","type":"number","link":null}],"outputs":[{"name":"out","type":-1,"links":[21]}],"properties":{"amount":5}},{"id":15,"type":"math/floor","pos":[572,106],"size":[60,20],"flags":{},"mode":0,"inputs":[{"name":"in","type":"number","link":14}],"outputs":[{"name":"out","type":"number","links":[15]}],"properties":{}},{"id":16,"type":"math/operation","pos":[689,119],"size":{"0":140,"1":34},"flags":{"collapsed":true},"mode":0,"inputs":[{"name":"A","type":"number","link":15},{"name":"B","type":"number","link":null}],"outputs":[{"name":"=","type":"number","links":[16]}],"properties":{"A":1,"B":12,"OP":"*"}},{"id":14,"type":"math/rand","pos":[464,105],"size":[60,20],"flags":{},"mode":0,"outputs":[{"name":"value","type":"number","links":[14],"label":"1.907"}],"properties":{"min":-1,"max":2}},{"id":17,"type":"widget/knob","pos":[995,68],"size":[54,74],"flags":{"collapsed":false},"mode":0,"outputs":[{"name":"","type":"number","links":[17]}],"properties":{"min":0,"max":1,"value":0.21000000000000005,"wcolor":"#7AF","size":50},"boxcolor":"rgba(128,128,128,1.0)"},{"id":6,"type":"midi/show","pos":[892,350],"size":[241,61],"flags":{},"mode":0,"inputs":[{"name":"on_midi","type":-1,"link":7}],"properties":{}},{"id":28,"type":"midi/output","pos":[1477,421],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":33},{"name":"send","type":-1,"link":34},{"name":"send","type":-1,"link":35}],"properties":{"port":0}},{"id":31,"type":"midi/event","pos":[1463,586],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":43}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[42]}],"properties":{"channel":0,"cmd":144,"value1":47,"value2":10}},{"id":30,"type":"midi/event","pos":[1469,262],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":39}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[38]}],"properties":{"channel":0,"cmd":144,"value1":59,"value2":10}},{"id":32,"type":"midi/event","pos":[1465,656],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"send","type":-1,"link":null},{"name":"assign","type":-1,"link":44}],"outputs":[{"name":"on_midi","type":-1,"links":null},{"name":"note","type":"number","links":[45]}],"properties":{"channel":0,"cmd":144,"value1":48,"value2":10}},{"id":29,"type":"graphics/plot","pos":[1724,337],"size":{"0":681,"1":381},"flags":{},"mode":0,"inputs":[{"name":"A","type":"Number","link":38},{"name":"B","type":"Number","link":42},{"name":"C","type":"Number","link":45},{"name":"D","type":"Number","link":null}],"properties":{"scale":100}},{"id":11,"type":"midi/play","pos":[1116,504],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":10},{"name":"volume","type":"number","link":18},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[34,43]}],"properties":{"volume":0.3599999999999999,"duration":4,"value":0}},{"id":10,"type":"basic/string","pos":[82,370],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[46],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"A,B,C,D,E,F,G"}},{"id":19,"type":"midi/play","pos":[1132,611],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":53},{"name":"volume","type":"number","link":36},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[35,44]}],"properties":{"volume":0.3599999999999999,"duration":4,"value":0}},{"id":21,"type":"midi/quantize","pos":[903,589],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":21},{"name":"scale","type":"string","link":49}],"outputs":[{"name":"out","type":-1,"links":[53]}],"properties":{"scale":"A,A#,B,C,C#,D,D#,E,F,F#,G,G#","amount":"A,B,C,D,E,F,G"}},{"id":13,"type":"midi/transpose","pos":[932,271],"size":{"0":140,"1":34},"flags":{},"mode":0,"inputs":[{"name":"in","type":-1,"link":12},{"name":"amount","type":"number","link":16}],"outputs":[{"name":"out","type":-1,"links":[54]}],"properties":{"amount":12}},{"id":37,"type":"basic/watch","pos":[547,615],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"value","type":0,"link":52,"label":"A,B,C,B"}],"properties":{}},{"id":4,"type":"midi/play","pos":[1191,240],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":54},{"name":"volume","type":"number","link":17},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[33,39]}],"properties":{"volume":0.21000000000000005,"duration":1,"value":0}},{"id":38,"type":"midi/play","pos":[1196,245],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":null},{"name":"volume","type":"number","link":null},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[]}],"properties":{"volume":0.21000000000000005,"duration":1,"value":0}},{"id":7,"type":"midi/generator","pos":[543,283],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":5},{"name":"scale","type":"string","link":48},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[7,12]}],"properties":{"notes":"A,B,C","octave":2,"duration":0.5,"mode":"random"}},{"id":40,"type":"midi/generator","pos":[548,288],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":null},{"name":"scale","type":"string","link":null},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[]}],"properties":{"notes":"A,B,C","octave":2,"duration":0.5,"mode":"random"}},{"id":34,"type":"logic/selector","pos":[339,472],"size":{"0":85,"1":79},"flags":{},"mode":0,"inputs":[{"name":"sel","type":"number","link":58},{"name":"A","type":0,"link":46},{"name":"B","type":0,"link":50},{"name":"C","type":0,"link":59},{"name":"D","type":0,"link":null}],"outputs":[{"name":"out","links":[47,48,49,52,55]}],"properties":{}},{"id":3,"type":"events/timer","pos":[181,227],"size":{"0":140,"1":19},"flags":{},"mode":0,"inputs":[{"name":"interval","type":"number","link":null}],"outputs":[{"name":"on_tick","type":-1,"links":[5,57]}],"properties":{"interval":300,"event":"tick"},"boxcolor":"#222"},{"id":41,"type":"midi/generator","pos":[552,189],"size":{"0":140,"1":49},"flags":{},"mode":0,"inputs":[{"name":"generate","type":-1,"link":57},{"name":"scale","type":"string","link":55},{"name":"octave","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[56]}],"properties":{"notes":"A,B,C","octave":3,"duration":0.5,"mode":"sequence"}},{"id":35,"type":"basic/string","pos":[79,456],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[50],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"A,B,C,B"}},{"id":42,"type":"basic/string","pos":[84,461],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"A,B,C,B"}},{"id":43,"type":"basic/string","pos":[74,541],"size":{"0":175,"1":43},"flags":{},"mode":0,"outputs":[{"name":"value","type":"string","links":[59],"label":"A,B,C"}],"title":"NOTE SCALE","properties":{"value":"D,E,F,G,F,E"}},{"id":44,"type":"math/rand","pos":[263,630],"size":[60,20],"flags":{},"mode":0,"outputs":[{"name":"value","type":"number","links":[58],"label":"0.516"}],"properties":{"min":0,"max":1}},{"id":45,"type":"math/rand","pos":[268,635],"size":[60,20],"flags":{},"mode":0,"outputs":[{"name":"value","type":"number","links":[],"label":"0.928"}],"properties":{"min":0,"max":1}},{"id":18,"type":"widget/knob","pos":[919,66],"size":[54,74],"flags":{},"mode":0,"outputs":[{"name":"","type":"number","links":[18,36]}],"properties":{"min":0,"max":1,"value":0.3599999999999999,"wcolor":"#7AF","size":50},"boxcolor":"rgba(128,128,128,1.0)"},{"id":46,"type":"math/rand","pos":[1077,71],"size":[60,20],"flags":{},"mode":0,"outputs":[{"name":"value","type":"number","links":[60],"label":"0.009"}],"properties":{"min":0,"max":0.2}},{"id":39,"type":"midi/play","pos":[1193,136],"size":{"0":184,"1":54},"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":56},{"name":"volume","type":"number","link":60},{"name":"duration","type":"number","link":null}],"outputs":[{"name":"note","type":-1,"links":[61]}],"properties":{"volume":0.008901629125006938,"duration":1,"value":0}},{"id":47,"type":"midi/keys","pos":[1539,98],"size":[400,100],"flags":{},"mode":0,"inputs":[{"name":"note","type":-1,"link":61},{"name":"reset","type":-1,"link":null}],"outputs":[{"name":"note","type":-1,"links":null}],"properties":{"num_octaves":2,"start_octave":3}}],"links":[[5,3,0,7,0,-1],[7,7,0,6,0,-1],[10,8,0,11,0,-1],[11,12,0,8,0,-1],[12,7,0,13,0,-1],[14,14,0,15,0,"number"],[15,15,0,16,0,"number"],[16,16,0,13,1,"number"],[17,17,0,4,1,"number"],[18,18,0,11,1,"number"],[19,8,0,20,0,-1],[21,20,0,21,0,-1],[33,4,0,28,0,-1],[34,11,0,28,1,-1],[35,19,0,28,2,-1],[36,18,0,19,1,"number"],[38,30,1,29,0,"Number"],[39,4,0,30,1,-1],[42,31,1,29,1,"Number"],[43,11,0,31,1,-1],[44,19,0,32,1,-1],[45,32,1,29,2,"Number"],[46,10,0,34,1,0],[47,34,0,8,1,"string"],[48,34,0,7,1,"string"],[49,34,0,21,1,"string"],[50,35,0,34,2,0],[52,34,0,37,0,0],[53,21,0,19,0,-1],[54,13,0,4,0,-1],[55,34,0,41,1,"string"],[56,41,0,39,0,-1],[57,3,0,41,0,-1],[58,44,0,34,0,"number"],[59,43,0,34,3,0],[60,46,0,39,1,"number"],[61,39,0,47,0,-1]],"groups":[],"config":{}} \ No newline at end of file diff --git a/src/litegraph.js b/src/litegraph.js index ad3ed6f45..b5da01954 100755 --- a/src/litegraph.js +++ b/src/litegraph.js @@ -3698,6 +3698,7 @@ LGraphCanvas.prototype.setCanvas = function( canvas, skip_events ) //this.canvas.tabindex = "1000"; canvas.className += " lgraphcanvas"; canvas.data = this; + canvas.tabindex = '1'; //to allow key events //bg canvas: used for non changing stuff this.bgcanvas = null; @@ -3959,6 +3960,7 @@ LGraphCanvas.prototype.processMouseDown = function(e) this.canvas_mouse[0] = e.canvasX; this.canvas_mouse[1] = e.canvasY; + this.canvas.focus(); LiteGraph.closeAllContextMenus( ref_window ); @@ -4891,12 +4893,12 @@ LGraphCanvas.prototype.selectNodes = function( nodes, add_to_current_selection ) for(var i = 0; i < nodes.length; ++i) { var node = nodes[i]; - if(node.selected) + if(node.is_selected) continue; - if( !node.selected && node.onSelected ) + if( !node.is_selected && node.onSelected ) node.onSelected(); - node.selected = true; + node.is_selected = true; this.selected_nodes[ node.id ] = node; if(node.inputs) @@ -4922,11 +4924,11 @@ LGraphCanvas.prototype.selectNodes = function( nodes, add_to_current_selection ) **/ LGraphCanvas.prototype.deselectNode = function( node ) { - if(!node.selected) + if(!node.is_selected) return; if(node.onDeselected) node.onDeselected(); - node.selected = false; + node.is_selected = false; //remove highlighted if(node.inputs) @@ -4954,11 +4956,11 @@ LGraphCanvas.prototype.deselectAllNodes = function() for(var i = 0, l = nodes.length; i < l; ++i) { var node = nodes[i]; - if(!node.selected) + if(!node.is_selected) continue; if(node.onDeselected) node.onDeselected(); - node.selected = false; + node.is_selected = false; } this.selected_nodes = {}; this.highlighted_links = {}; @@ -5568,7 +5570,7 @@ LGraphCanvas.prototype.drawNode = function(node, ctx ) } //draw shape - this.drawNodeShape( node, ctx, size, color, bgcolor, node.selected, node.mouseOver ); + this.drawNodeShape( node, ctx, size, color, bgcolor, node.is_selected, node.mouseOver ); ctx.shadowColor = "transparent"; //connection slots @@ -7073,6 +7075,7 @@ LGraphCanvas.prototype.showSearchBox = function(event) dialog.close = function() { that.search_box = null; + setTimeout( function(){ that.canvas.focus(); },10 ); //important, if canvas loses focus keys wont be captured dialog.parentNode.removeChild( dialog ); } diff --git a/src/nodes/midi.js b/src/nodes/midi.js index 9211d4c28..524cff336 100644 --- a/src/nodes/midi.js +++ b/src/nodes/midi.js @@ -1,6 +1,9 @@ (function( global ) { + var LiteGraph = global.LiteGraph; +var MIDI_COLOR = "#243"; + function MIDIEvent( data ) { @@ -419,6 +422,8 @@ LGMIDIIn.MIDIInterface = MIDIInterface; LGMIDIIn.title = "MIDI Input"; LGMIDIIn.desc = "Reads MIDI from a input port"; +LGMIDIIn.color = MIDI_COLOR; + LGMIDIIn.prototype.getPropertyInfo = function(name) { @@ -513,6 +518,7 @@ LGMIDIOut.MIDIInterface = MIDIInterface; LGMIDIOut.title = "MIDI Output"; LGMIDIOut.desc = "Sends MIDI to output channel"; +LGMIDIOut.color = MIDI_COLOR; LGMIDIOut.prototype.getPropertyInfo = function(name) { @@ -562,6 +568,8 @@ function LGMIDIShow() LGMIDIShow.title = "MIDI Show"; LGMIDIShow.desc = "Shows MIDI in the graph"; +LGMIDIShow.color = MIDI_COLOR; + LGMIDIShow.prototype.onAction = function(event, midi_event ) { @@ -609,6 +617,7 @@ function LGMIDIFilter() LGMIDIFilter.title = "MIDI Filter"; LGMIDIFilter.desc = "Filters MIDI messages"; +LGMIDIFilter.color = MIDI_COLOR; LGMIDIFilter.prototype.onAction = function(event, midi_event ) { @@ -647,6 +656,7 @@ function LGMIDIEvent() LGMIDIEvent.title = "MIDIEvent"; LGMIDIEvent.desc = "Create a MIDI Event"; +LGMIDIEvent.color = MIDI_COLOR; LGMIDIEvent.prototype.onAction = function( event, midi_event ) { @@ -769,6 +779,7 @@ function LGMIDICC() LGMIDICC.title = "MIDICC"; LGMIDICC.desc = "gets a Controller Change"; +LGMIDICC.color = MIDI_COLOR; LGMIDICC.prototype.onExecute = function() { @@ -790,6 +801,7 @@ function LGMIDIGenerator() this.properties = { notes: "A,A#,B,C,C#,D,D#,E,F,F#,G,G#", octave: 2, + duration: 0.5, mode: "sequence" }; @@ -799,12 +811,19 @@ function LGMIDIGenerator() LGMIDIGenerator.title = "MIDI Generator"; LGMIDIGenerator.desc = "Generates a random MIDI note"; +LGMIDIGenerator.color = MIDI_COLOR; LGMIDIGenerator.processScale = function(scale) { var notes = scale.split(","); for(var i = 0; i < notes.length; ++i) - notes[i] = MIDIEvent.note_to_index[ notes[i] ] || 0; + { + var n = notes[i]; + if( (n.length == 2 && n[1] != "#" ) || n.length > 2) + notes[i] = -LiteGraph.MIDIEvent.NoteStringToPitch(n); + else + notes[i] = MIDIEvent.note_to_index[ n ] || 0; + } return notes; } @@ -831,20 +850,30 @@ LGMIDIGenerator.prototype.onAction = function( event, midi_event ) //var pitch = this.properties.min + ((Math.random() * range)|0); var pitch = 0; var range = this.notes_pitches.length; + var index = 0; if( this.properties.mode == "sequence" ) - { - var index = this.sequence_index = (this.sequence_index + 1) % range; - pitch = this.notes_pitches[ index ] + ( (this.properties.octave-1) * 12) + 33; - } + index = this.sequence_index = (this.sequence_index + 1) % range; else if( this.properties.mode == "random" ) - { - var index = Math.floor(Math.random()*range); - pitch = this.notes_pitches[ index ] + ( (this.properties.octave-1) * 12) + 33; - } - var note = new MIDIEvent(); - note.setup([ MIDIEvent.NOTEON, pitch, 10 ]); - this.trigger("note", note); + index = Math.floor(Math.random()*range); + + var note = this.notes_pitches[ index ]; + if(note >= 0) + pitch = note + ( (this.properties.octave-1) * 12) + 33; + else + pitch = -note; + + var midi_event = new MIDIEvent(); + midi_event.setup([ MIDIEvent.NOTEON, pitch, 10 ]); + var duration = this.properties.duration || 1; + this.trigger("note", midi_event); + + //noteoff + setTimeout( (function(){ + var midi_event = new MIDIEvent(); + midi_event.setup([ MIDIEvent.NOTEOFF, pitch, 0 ]); + this.trigger("note", midi_event); + }).bind(this), duration * 1000 ); } @@ -864,12 +893,22 @@ function LGMIDITranspose() LGMIDITranspose.title = "MIDI Transpose"; LGMIDITranspose.desc = "Transpose a MIDI note"; +LGMIDITranspose.color = MIDI_COLOR; LGMIDITranspose.prototype.onAction = function( event, midi_event ) { - this.midi_event.setup( midi_event.data ); - this.midi_event.data[1] = Math.round( this.midi_event.data[1] + this.properties.amount ); - this.trigger("out", this.midi_event ); + if( !midi_event || midi_event.constructor !== MIDIEvent ) + return; + + if( midi_event.data[0] == MIDIEvent.NOTEON || midi_event.data[0] == MIDIEvent.NOTEOFF ) + { + this.midi_event = new MIDIEvent(); + this.midi_event.setup( midi_event.data ); + this.midi_event.data[1] = Math.round( this.midi_event.data[1] + this.properties.amount ); + this.trigger("out", this.midi_event ); + } + else + this.trigger("out", midi_event ); } LGMIDITranspose.prototype.onExecute = function() @@ -894,11 +933,11 @@ function LGMIDIQuantize() this.valid_notes = new Array(12); this.offset_notes = new Array(12); this.processScale( this.properties.scale ); - this.midi_event = new MIDIEvent(); } LGMIDIQuantize.title = "MIDI Quantize Pitch"; LGMIDIQuantize.desc = "Transpose a MIDI note tp fit an scale"; +LGMIDIQuantize.color = MIDI_COLOR; LGMIDIQuantize.prototype.onPropertyChanged = function(name,value) { @@ -938,12 +977,21 @@ LGMIDIQuantize.prototype.processScale = function( scale ) LGMIDIQuantize.prototype.onAction = function( event, midi_event ) { - this.midi_event.setup( midi_event.data ); - var note = midi_event.note; - var index = MIDIEvent.note_to_index[ note ]; - var offset = this.offset_notes[index]; - this.midi_event.data[1] += offset; - this.trigger("out", this.midi_event ); + if( !midi_event || midi_event.constructor !== MIDIEvent ) + return; + + if( midi_event.data[0] == MIDIEvent.NOTEON || midi_event.data[0] == MIDIEvent.NOTEOFF ) + { + this.midi_event = new MIDIEvent(); + this.midi_event.setup( midi_event.data ); + var note = midi_event.note; + var index = MIDIEvent.note_to_index[ note ]; + var offset = this.offset_notes[index]; + this.midi_event.data[1] += offset; + this.trigger("out", this.midi_event ); + } + else + this.trigger("out", midi_event ); } LGMIDIQuantize.prototype.onExecute = function() @@ -981,15 +1029,20 @@ function LGMIDIPlay() LGMIDIPlay.title = "MIDI Play"; LGMIDIPlay.desc = "Plays a MIDI note"; +LGMIDIPlay.color = MIDI_COLOR; LGMIDIPlay.prototype.onAction = function( event, midi_event ) { - if(!this.instrument) + if( !midi_event || midi_event.constructor !== MIDIEvent ) return; - var note = midi_event.note; //C# - if( !note || note == "undefined" || note.constructor !== String ) - return; - this.instrument.play( note, midi_event.octave, this.properties.duration, this.properties.volume ); + + if( this.instrument && midi_event.data[0] == MIDIEvent.NOTEON ) + { + var note = midi_event.note; //C# + if( !note || note == "undefined" || note.constructor !== String ) + return; + this.instrument.play( note, midi_event.octave, this.properties.duration, this.properties.volume ); + } this.trigger("note", midi_event ); } @@ -1008,6 +1061,169 @@ LiteGraph.registerNodeType("midi/play", LGMIDIPlay); +function LGMIDIKeys() +{ + this.properties = { + num_octaves: 2, + start_octave: 2 + } + this.addInput( "note", LiteGraph.ACTION ); + this.addInput( "reset", LiteGraph.ACTION ); + this.addOutput( "note", LiteGraph.EVENT ); + this.size = [400,100]; + this.keys = []; + this._last_key = -1; +} + +LGMIDIKeys.title = "MIDI Keys"; +LGMIDIKeys.desc = "Keyboard to play notes"; +LGMIDIKeys.color = MIDI_COLOR; + +LGMIDIKeys.keys = [ + {x:0,w:1,h:1,t:0}, + {x:0.75,w:0.5,h:0.6,t:1}, + {x:1,w:1,h:1,t:0}, + {x:1.75,w:0.5,h:0.6,t:1}, + {x:2,w:1,h:1,t:0}, + {x:2.75,w:0.5,h:0.6,t:1}, + {x:3,w:1,h:1,t:0}, + {x:4,w:1,h:1,t:0}, + {x:4.75,w:0.5,h:0.6,t:1}, + {x:5,w:1,h:1,t:0}, + {x:5.75,w:0.5,h:0.6,t:1}, + {x:6,w:1,h:1,t:0}]; + +LGMIDIKeys.prototype.onDrawBackground = function(ctx) +{ + if(this.flags.collapsed) + return; + + var num_keys = this.properties.num_octaves * 12; + this.keys.length = num_keys; + var key_width = this.size[0] / (this.properties.num_octaves * 7); + var key_height = this.size[1]; + + for(var k = 0; k < 2; k++) //draw first whites (0) then blacks (1) + for(var i = 0; i < num_keys; ++i) + { + var key_info = LGMIDIKeys.keys[i%12]; + if( key_info.t != k ) + continue; + var octave = Math.floor(i/12); + var x = octave * 7 * key_width + key_info.x * key_width; + if(k == 0) + ctx.fillStyle = this.keys[i] ? "#CCC" : "white"; + else + ctx.fillStyle = this.keys[i] ? "#333" : "black"; + ctx.fillRect( x+1, 0, key_width * key_info.w - 2, key_height * key_info.h ); + } +} + +LGMIDIKeys.prototype.getKeyIndex = function(pos) +{ + var num_keys = this.properties.num_octaves * 12; + var key_width = this.size[0] / (this.properties.num_octaves * 7); + var key_height = this.size[1]; + + for(var k = 1; k >= 0; k--) //test blacks first (1) then whites (0) + for(var i = 0; i < this.keys.length; ++i) + { + var key_info = LGMIDIKeys.keys[i%12]; + if( key_info.t != k ) + continue; + var octave = Math.floor(i/12); + var x = octave * 7 * key_width + key_info.x * key_width; + var w = key_width * key_info.w; + var h = key_height * key_info.h; + if( pos[0] < x || pos[0] > (x + w) || pos[1] > h ) + continue; + return i; + } + return -1; +} + +LGMIDIKeys.prototype.onAction = function(event, params) +{ + if(event == "reset") + { + for(var i = 0; i < this.keys.length; ++i) + this.keys[i] = false; + return; + } + + if( !params || params.constructor !== MIDIEvent ) + return; + var midi_event = params; + var start_note = (this.properties.start_octave - 1) * 12 + 29; + var index = midi_event.data[1] - start_note; + if( index >= 0 && index < this.keys.length ) + { + if(midi_event.data[0] == MIDIEvent.NOTEON) + this.keys[index] = true; + else if(midi_event.data[0] == MIDIEvent.NOTEOFF) + this.keys[index] = false; + } + + this.trigger("note",midi_event); +} + + +LGMIDIKeys.prototype.onMouseDown = function(e, pos) +{ + if(pos[1] < 0) + return; + var index = this.getKeyIndex( pos ); + this.keys[ index ] = true; + this._last_key = index; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEON, pitch, 100]); + this.trigger("note",midi_event); + return true; +} + +LGMIDIKeys.prototype.onMouseMove = function(e, pos) +{ + if(pos[1] < 0 || this._last_key == -1) + return; + this.setDirtyCanvas(true); + var index = this.getKeyIndex( pos ); + if (this._last_key == index) + return true; + this.keys[ this._last_key ] = false; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + this._last_key; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEOFF, pitch, 100]); + this.trigger("note",midi_event); + + this.keys[ index ] = true; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEON, pitch, 100]); + this.trigger("note",midi_event); + + this._last_key = index; + return true; +} + +LGMIDIKeys.prototype.onMouseUp = function(e, pos) +{ + if(pos[1] < 0) + return; + var index = this.getKeyIndex( pos ); + this.keys[ index ] = false; + this._last_key = -1; + var pitch = (this.properties.start_octave - 1) * 12 + 29 + index; + var midi_event = new MIDIEvent(); + midi_event.setup([MIDIEvent.NOTEOFF, pitch, 100]); + this.trigger("note",midi_event); + return true; +} + +LiteGraph.registerNodeType("midi/keys", LGMIDIKeys); + + + function now() { return window.performance.now() }