diff --git a/frontend/web-editor/public/bundle.js b/frontend/web-editor/public/bundle.js index 154451a..fbbcd3e 100644 --- a/frontend/web-editor/public/bundle.js +++ b/frontend/web-editor/public/bundle.js @@ -13,7 +13,7 @@ app.mount('body') -},{"./src/store.js":76,"./src/views/main.js":78,"choo":15,"choo-devtools":2}],2:[function(require,module,exports){ +},{"./src/store.js":76,"./src/views/main.js":79,"choo":15,"choo-devtools":2}],2:[function(require,module,exports){ var EventEmitter = require('events').EventEmitter var storage = require('./lib/storage') @@ -65,7 +65,7 @@ function expose (opts) { } } -},{"./lib/copy":3,"./lib/debug":4,"./lib/help":5,"./lib/log":6,"./lib/logger":7,"./lib/perf":8,"./lib/storage":9,"events":86,"wayfarer/get-all-routes":73}],3:[function(require,module,exports){ +},{"./lib/copy":3,"./lib/debug":4,"./lib/help":5,"./lib/log":6,"./lib/logger":7,"./lib/perf":8,"./lib/storage":9,"events":88,"wayfarer/get-all-routes":73}],3:[function(require,module,exports){ var stateCopy = require('state-copy') var pluck = require('plucker') @@ -123,7 +123,7 @@ function debug (state, emitter, app, localEmitter) { }) } -},{"assert":79,"nanologger":55,"object-change-callsite":65}],5:[function(require,module,exports){ +},{"assert":81,"nanologger":55,"object-change-callsite":65}],5:[function(require,module,exports){ module.exports = help function help () { @@ -663,7 +663,7 @@ ChooHooks.prototype._emitLoaded = function () { }) } -},{"assert":79,"nanoscheduler":63,"on-performance":67}],12:[function(require,module,exports){ +},{"assert":81,"nanoscheduler":63,"on-performance":67}],12:[function(require,module,exports){ var assert = require('assert') var LRU = require('nanolru') @@ -1310,7 +1310,7 @@ if (typeof module === 'object' && module.exports) { } }).call(this)}).call(this,require("buffer").Buffer) -},{"buffer":85}],18:[function(require,module,exports){ +},{"buffer":87}],18:[function(require,module,exports){ 'use strict' module.exports = ready @@ -1581,7 +1581,7 @@ if (typeof document !== 'undefined') { module.exports = doccy; }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"min-document":84}],21:[function(require,module,exports){ +},{"min-document":86}],21:[function(require,module,exports){ (function (global){(function (){ var win; @@ -2065,7 +2065,7 @@ class HydraRenderer { module.exports = HydraRenderer -},{"./src/eval-sandbox.js":24,"./src/generator-factory.js":27,"./src/hydra-source.js":31,"./src/lib/array-utils.js":32,"./src/lib/audio.js":33,"./src/lib/mouse.js":36,"./src/lib/video-recorder.js":39,"./src/output.js":41,"raf-loop":93,"regl":95}],23:[function(require,module,exports){ +},{"./src/eval-sandbox.js":24,"./src/generator-factory.js":27,"./src/hydra-source.js":31,"./src/lib/array-utils.js":32,"./src/lib/audio.js":33,"./src/lib/mouse.js":36,"./src/lib/video-recorder.js":39,"./src/output.js":41,"raf-loop":95,"regl":97}],23:[function(require,module,exports){ const Synth = require('./hydra-synth.js') //const ShaderGenerator = require('./shader-generator.js') @@ -4287,7 +4287,7 @@ class Audio { module.exports = Audio -},{"meyda":89}],34:[function(require,module,exports){ +},{"meyda":91}],34:[function(require,module,exports){ // from https://gist.github.com/gre/1650294 module.exports = { @@ -6075,7 +6075,7 @@ function pad (str) { return str.length !== 2 ? 0 + str : str } -},{"assert":79}],56:[function(require,module,exports){ +},{"assert":81}],56:[function(require,module,exports){ module.exports = LRU function LRU (opts) { @@ -6861,7 +6861,7 @@ function strip (str) { return '\n' + arr.join('\n') } -},{"assert":79}],66:[function(require,module,exports){ +},{"assert":81}],66:[function(require,module,exports){ /* global MutationObserver */ var document = require('global/document') var window = require('global/window') @@ -7401,10 +7401,37 @@ function has (object, property) { },{"assert":44}],76:[function(require,module,exports){ module.exports = function countStore (state, emitter) { - state.count = 0 - emitter.on('increment', function (count) { - state.count += count - emitter.emit('render') + state.showInfo = true + emitter.on('shuffle sketches', function (count) { + + }) + + emitter.on('format code', function (count) { + + }) + + emitter.on('share sketch', function (count) { + + }) + + emitter.on('show confirmation', function (count) { + + }) + + emitter.on('clear all', function (count) { + + }) + + emitter.on('hide info', function (count) { + + }) + + emitter.on('show info', function () { + + }) + + emitter.on('mutate sketch', function () { + }) } },{}],77:[function(require,module,exports){ @@ -7430,38 +7457,22 @@ module.exports = class Hydra extends Component { createElement ({ width = window.innerWidth, height = window.innerHeight} = {}) { - return html`
-
` + return html`
+
` } } },{"choo/component":13,"choo/html":14,"hydra-synth":23}],78:[function(require,module,exports){ const html = require('choo/html') -const Hydra = require('./Hydra.js') +const toolbar = require('./toolbar.js') -module.exports = function mainView (state, emit) { +module.exports = function mainView(state, emit) { return html` - -
- - ${state.cache(Hydra, 'hydra-canvas').render(state, emit)} - - - -
+ ` + + function onclick() { + emit('increment', 1) + } +} +},{"./toolbar.js":80,"choo/html":14}],79:[function(require,module,exports){ +const html = require('choo/html') +const info = require('./info.js') +const Hydra = require('./Hydra.js') + +module.exports = function mainView (state, emit) { + return html` + +
+ + ${state.cache(Hydra, 'hydra-canvas').render(state, emit)} + + + +
+ ${info(state, emit)} ` @@ -7509,7 +7539,23 @@ module.exports = function mainView (state, emit) { emit('increment', 1) } } -},{"./Hydra.js":77,"choo/html":14}],79:[function(require,module,exports){ +},{"./Hydra.js":77,"./info.js":78,"choo/html":14}],80:[function(require,module,exports){ +const html = require('choo/html') + +module.exports = function toolbar(state, emit) { + const hidden = state.showInfo ? 'hidden' : '' + console.log('hidden', hidden) + return html`
+ + + + + + +
+ ` +} +},{"choo/html":14}],81:[function(require,module,exports){ (function (global){(function (){ 'use strict'; @@ -8019,7 +8065,7 @@ var objectKeys = Object.keys || function (obj) { }; }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"object-assign":90,"util/":82}],80:[function(require,module,exports){ +},{"object-assign":92,"util/":84}],82:[function(require,module,exports){ if (typeof Object.create === 'function') { // implementation from standard node.js 'util' module module.exports = function inherits(ctor, superCtor) { @@ -8044,14 +8090,14 @@ if (typeof Object.create === 'function') { } } -},{}],81:[function(require,module,exports){ +},{}],83:[function(require,module,exports){ module.exports = function isBuffer(arg) { return arg && typeof arg === 'object' && typeof arg.copy === 'function' && typeof arg.fill === 'function' && typeof arg.readUInt8 === 'function'; } -},{}],82:[function(require,module,exports){ +},{}],84:[function(require,module,exports){ (function (process,global){(function (){ // Copyright Joyent, Inc. and other Node contributors. // @@ -8641,7 +8687,7 @@ function hasOwnProperty(obj, prop) { } }).call(this)}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"./support/isBuffer":81,"_process":92,"inherits":80}],83:[function(require,module,exports){ +},{"./support/isBuffer":83,"_process":94,"inherits":82}],85:[function(require,module,exports){ 'use strict' exports.byteLength = byteLength @@ -8793,9 +8839,9 @@ function fromByteArray (uint8) { return parts.join('') } -},{}],84:[function(require,module,exports){ +},{}],86:[function(require,module,exports){ -},{}],85:[function(require,module,exports){ +},{}],87:[function(require,module,exports){ (function (Buffer){(function (){ /*! * The buffer module from node.js, for the browser. @@ -10576,7 +10622,7 @@ function numberIsNaN (obj) { } }).call(this)}).call(this,require("buffer").Buffer) -},{"base64-js":83,"buffer":85,"ieee754":87}],86:[function(require,module,exports){ +},{"base64-js":85,"buffer":87,"ieee754":89}],88:[function(require,module,exports){ // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -11075,7 +11121,7 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) { } } -},{}],87:[function(require,module,exports){ +},{}],89:[function(require,module,exports){ /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh */ exports.read = function (buffer, offset, isLE, mLen, nBytes) { var e, m @@ -11162,7 +11208,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) { buffer[offset + i - d] |= s * 128 } -},{}],88:[function(require,module,exports){ +},{}],90:[function(require,module,exports){ if (typeof Object.create === 'function') { // implementation from standard node.js 'util' module module.exports = function inherits(ctor, superCtor) { @@ -11191,7 +11237,7 @@ if (typeof Object.create === 'function') { } } -},{}],89:[function(require,module,exports){ +},{}],91:[function(require,module,exports){ (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') module.exports = factory(); @@ -14653,7 +14699,7 @@ function hamming(size) { /******/ }); }); -},{}],90:[function(require,module,exports){ +},{}],92:[function(require,module,exports){ /* object-assign (c) Sindre Sorhus @@ -14745,7 +14791,7 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) { return to; }; -},{}],91:[function(require,module,exports){ +},{}],93:[function(require,module,exports){ (function (process){(function (){ // Generated by CoffeeScript 1.12.2 (function() { @@ -14785,7 +14831,7 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) { }).call(this)}).call(this,require('_process')) -},{"_process":92}],92:[function(require,module,exports){ +},{"_process":94}],94:[function(require,module,exports){ // shim for using process in browser var process = module.exports = {}; @@ -14971,7 +15017,7 @@ process.chdir = function (dir) { }; process.umask = function() { return 0; }; -},{}],93:[function(require,module,exports){ +},{}],95:[function(require,module,exports){ var inherits = require('inherits') var EventEmitter = require('events').EventEmitter var now = require('right-now') @@ -15016,7 +15062,7 @@ Engine.prototype.tick = function() { this.emit('tick', dt) this.last = time } -},{"events":86,"inherits":88,"raf":94,"right-now":96}],94:[function(require,module,exports){ +},{"events":88,"inherits":90,"raf":96,"right-now":98}],96:[function(require,module,exports){ (function (global){(function (){ var now = require('performance-now') , root = typeof window === 'undefined' ? global : window @@ -15095,7 +15141,7 @@ module.exports.polyfill = function(object) { } }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) -},{"performance-now":91}],95:[function(require,module,exports){ +},{"performance-now":93}],97:[function(require,module,exports){ (function(U,X){"object"===typeof exports&&"undefined"!==typeof module?module.exports=X():"function"===typeof define&&define.amd?define(X):U.createREGL=X()})(this,function(){function U(a,b){this.id=Eb++;this.type=a;this.data=b}function X(a){if(0===a.length)return[];var b=a.charAt(0),c=a.charAt(a.length-1);if(1 - ` + return html`
+
` } } diff --git a/frontend/web-editor/src/views/main.js b/frontend/web-editor/src/views/main.js index 9441638..f763f5d 100644 --- a/frontend/web-editor/src/views/main.js +++ b/frontend/web-editor/src/views/main.js @@ -1,4 +1,5 @@ const html = require('choo/html') +const info = require('./info.js') const Hydra = require('./Hydra.js') module.exports = function mainView (state, emit) { @@ -11,59 +12,7 @@ module.exports = function mainView (state, emit) { -
- -
+ ${info(state, emit)} `