Address errors from closure compiler

TODO: FIX GU / ETC

Author: aleksanb

nin/backend/dasbootgen.js

@@ -1,5 +1,6 @@
-const webpack = require('webpack');
+const ClosureCompiler = require('google-closure-compiler-js').webpack;
 const p = require('path');
+const webpack = require('webpack');
 
 
 async function dasbootGen(projectPath) {
@@ -11,7 +12,18 @@ async function dasbootGen(projectPath) {
       output: {
         path: p.join(projectPath, 'gen'),
         filename: 'dasBoot.js',
-      }
+      },
+      plugins: [
+        new ClosureCompiler({
+          options: {
+            languageIn: 'ECMASCRIPT6',
+            languageOut: 'ECMASCRIPT5',
+            compilationLevel: 'SIMPLE',
+            warningLevel: 'VERBOSE',
+            externs: ['GU', 'FILES', 'PROJECT', 'SHADERS'],
+          },
+        })
+      ]
     }).run((err) => {
       err ? reject() : resolve();
     });

nin/dasBoot/BEATBEAN.js

@@ -2,11 +2,11 @@ var framesPerBEAT;
 window.BEAN = 0;
 window.BEAT = false;
 
-initBeatBean = function() {
+const initBeatBean = function() {
   window.BEAN = 0;
   window.BEAT = false;
 
-  var BEATsPerMinute = PROJECT.music.bpm * PROJECT.music.subdivision;
+  var BEATsPerMinute = window.PROJECT.music.bpm * window.PROJECT.music.subdivision;
   var BEATsPerSecond = BEATsPerMinute / 60;
   var framesPerSecond = 60;
   framesPerBEAT = framesPerSecond / BEATsPerSecond;
@@ -20,7 +20,7 @@ initBeatBean = function() {
   };
 };
 
-updateBeatBean = function(frame) {
+const updateBeatBean = function(frame) {
   window.BEAT = false;
   if ((((frame + 1.5) / framesPerBEAT) | 0) >
       ((frame + 0.5) / framesPerBEAT) | 0) {

nin/dasBoot/CameraController.js

@@ -1,3 +1,5 @@
+const PathController = require('./PathController');
+
 function CameraController(rawPath) {
   this.camera = new THREE.PerspectiveCamera(45, 16/9, 1, 50000);
   this.rotVector = new THREE.Vector3(0, 0, 1);

nin/dasBoot/Loader.js

@@ -1,3 +1,5 @@
+const THREE = require('./lib/00_three');
+
 function Loader() {
   this.eventNames = {
     VIDEO: 'canplaythrough',
@@ -78,8 +80,8 @@ Loader.prototype.start = function(onprogress, oncomplete) {
         'webm': 'data:video/webm;base64,',
         'svg': 'data:image/svg+xml;base64,',
       }[item.filepath.slice(-3)];
-      console.log(that.id, item.filepath, prefix + (FILES[item.filepath] && FILES[item.filepath].slice(0, 10)));
-      item.element.src = prefix + FILES[item.filepath];
+      console.log(that.id, item.filepath, prefix + (window.FILES[item.filepath] && window.FILES[item.filepath].slice(0, 10)));
+      item.element.src = prefix + window.FILES[item.filepath];
     } else {
       item.element.crossOrigin = 'Anonymous';
       item.element.src = Loader.rootPath + item.filepath + '?_=' + Math.random();
@@ -88,8 +90,8 @@ Loader.prototype.start = function(onprogress, oncomplete) {
 
   this.itemsToAjax.forEach(function(item) {
     if(window.FILES) {
-      console.log(that.id, item.filepath, FILES[item.filepath] && atob(FILES[item.filepath]).slice(0, 10));
-      var bytes = atob(FILES[item.filepath]);
+      console.log(that.id, item.filepath, window.FILES[item.filepath] && atob(window.FILES[item.filepath]).slice(0, 10));
+      var bytes = atob(window.FILES[item.filepath]);
       if(item.options.responseType == 'arraybuffer') {
         var buffer = new ArrayBuffer(bytes.length);
         var bufferView = new Uint8Array(buffer);

nin/dasBoot/NodeManager.js

@@ -8,7 +8,7 @@ class NodeManager {
     nodeInfo.options = nodeInfo.options || {};
 
     const nodeConstructor = nodeInfo.type.slice(0, 4) === 'NIN.' ?
-      NIN[nodeInfo.type.slice(4)]
+      window['NIN'][nodeInfo.type.slice(4)]
       : window[nodeInfo.type];
 
     if (nodeConstructor === undefined) {

nin/dasBoot/PathController.js

@@ -1,3 +1,6 @@
+const {lerp, smoothstep, easeIn, easeOut} = require('./interpolations');
+const THREE = require('./lib/00_three');
+
 function PathController(raw_path, path_type) {
   this.path_type = path_type || '3D';
 

nin/dasBoot/RootNode.js

@@ -1,7 +1,10 @@
-class RootNode extends NIN.Node {
+const Node = require('./node');
+const TextureInput = require('./TextureInput');
+
+class RootNode extends Node {
   constructor(id, options) {
     super(id, {
-      inputs: {screen: new NIN.TextureInput()}
+      inputs: {screen: new TextureInput()}
     });
 
     this.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1); 

nin/dasBoot/ShaderNode.js

@@ -1,4 +1,6 @@
-class ShaderNode extends NIN.Node {
+const Node = require('./node');
+
+class ShaderNode extends Node {
   constructor(id, options) {
     super(id, {
       inputs: options.inputs,
@@ -16,7 +18,7 @@ class ShaderNode extends NIN.Node {
     });
 
     const shader = typeof options.shader === 'string'
-      ? SHADERS[options.shader] : options.shader;
+      ? window.SHADERS[options.shader] : options.shader;
 
     this.quad = new THREE.Mesh(
       new THREE.PlaneBufferGeometry(2, 2),
@@ -31,7 +33,7 @@ class ShaderNode extends NIN.Node {
   }
 
   resize() {
-    this.renderTarget.setSize(16 * GU, 9 * GU);
+    this.renderTarget.setSize(16 * window.GU, 9 * window.GU);
   }
 
   render(renderer) {

nin/dasBoot/THREENode.js

@@ -1,4 +1,8 @@
-class THREENode extends NIN.Node {
+const CameraController = require('./CameraController');
+const Loader = require('./Loader');
+const Node = require('./node');
+
+class THREENode extends Node {
   constructor(id, options) {
     super(id, {
       inputs: options.inputs,
@@ -30,7 +34,7 @@ class THREENode extends NIN.Node {
   }
 
   resize() {
-    this.renderTarget.setSize(16 * GU, 9 * GU);
+    this.renderTarget.setSize(16 * window.GU, 9 * window.GU);
   }
 
   render(renderer) {

nin/dasBoot/TextureNode.js

@@ -1,9 +1,13 @@
-class TextureNode extends NIN.Node {
+const Loader = require('./Loader');
+const Node = require('./node');
+const TextureOutput = require('./TextureOutput');
+
+class TextureNode extends Node {
   constructor(id, options) {
     super(id, {
       inputs: {},
       outputs: {
-        A: new NIN.TextureOutput()
+        A: new TextureOutput()
       }
     });
     var that = this;

nin/dasBoot/bootstrap.js

@@ -1,4 +1,4 @@
-window.THREE = require('./lib/00_three');
+const THREE = window['THREE'] = require('./lib/00_three');
 require('./lib/01_EffectComposer');
 require('./lib/BloomPass');
 require('./lib/ClearPass');
@@ -25,34 +25,31 @@ NIN.THREENode = require('./THREENode');
 NIN.ShaderNode = require('./ShaderNode');
 
 const {initBeatBean, updateBeatBean} = require('./BEATBEAN');
-window.initBeatBean = initBeatBean;
-window.updateBeatBean = updateBeatBean;
+window['initBeatBean'] = initBeatBean;
+window['updateBeatBean'] = updateBeatBean;
 
 const {lerp, clamp, smoothstep, easeIn, easeOut} = require('./interpolations');
-window.lerp = lerp;
-window.clamp = clamp;
-window.smoothstep = smoothstep;
-window.easeIn = easeIn;
-window.easeOut = easeOut;
-
-const {requestAnimFrame, makeFullscreen, audioContext} = require('./shims.js');
-window.requestAnimFrame = requestAnimFrame;
-window.makeFullscreen = makeFullscreen;
-window.audioContext = audioContext;
-
-window.Random = require('./Random');
-window.PathController = require('./PathController');
-window.CameraController = require('./CameraController');
-window.Loader = require('./Loader');
-window.createLoop = require('./loop');
-window.loadMusic = require('./music');
-window.NodeManager = require('./NodeManager');
+window['lerp'] = lerp;
+window['clamp'] = clamp;
+window['smoothstep'] = smoothstep;
+window['easeIn'] = easeIn;
+window['easeOut'] = easeOut;
+
+const {requestAnimFrame, makeFullscreen} = require('./shims.js');
+window['requestAnimFrame'] = requestAnimFrame;
+window['makeFullscreen'] = makeFullscreen;
+
+window['Random'] = require('./Random');
+window['PathController'] = require('./PathController');
+const Loader = window['Loader'] = require('./Loader');
+const loadMusic = require('./music');
+const NodeManager = window['NodeManager'] = require('./NodeManager');
 
 window['bootstrap'] = function(options) {
   options = options || {};
 
   var demo = {};
-  window.demo = demo;
+  window['demo'] = demo;
 
   var container = document.body;
 
@@ -110,15 +107,15 @@ window['bootstrap'] = function(options) {
     width = width || rect.width;
     height = height || rect.height;
     if (width / height > 16 / 9) {
-      GU = (height / 9);
+      window.GU = (height / 9);
     } else {
-      GU = (width / 16);
+      window.GU = (width / 16);
     }
-    demo.renderer.setSize(16 * GU, 9 * GU);
+    demo.renderer.setSize(16 * window.GU, 9 * window.GU);
     demo.renderer.domElement.style.zIndex = 10;
     demo.renderer.domElement.style.position = 'absolute';
-    demo.renderer.domElement.style.margin = ((rect.height - 9 * GU) / 2) +
-      'px 0 0 ' + ((rect.width - 16 * GU) / 2) + 'px';
+    demo.renderer.domElement.style.margin = ((rect.height - 9 * window.GU) / 2) +
+      'px 0 0 ' + ((rect.width - 16 * window.GU) / 2) + 'px';
     demo.nm.resize();
     demo.update(currentFrame);
     demo.render(demo.renderer, 0);
@@ -131,6 +128,39 @@ window['bootstrap'] = function(options) {
 
   demo.music = loadMusic();
 
+  function createLoop(options) {
+    var frameLength = 1000 / (options.frameRateInHz || 60);
+    var render = options.render;
+    var update = options.update;
+    var renderer = options.renderer;
+    var music = options.music;
+
+    function Looper() {
+      this.time = 0;
+      this.oldTime = 0;
+      this.deltaTime = 0;
+      this.currentFrame = 0;
+      this.frameLength = frameLength;
+
+      var that = this;
+      this.loop = function() {
+        that.time = music.getCurrentTime() * 1000;
+        that.deltaTime += that.time - that.oldTime;
+        that.oldTime = that.time;
+        while (that.deltaTime >= frameLength) {
+          that.deltaTime -= frameLength;
+          demo.music._calculateFFT();
+          updateBeatBean(that.currentFrame);
+          update(that.currentFrame++);
+        }
+        render(renderer, that.deltaTime / frameLength);
+        requestAnimFrame(that.loop);
+      };
+    }
+
+    return new Looper();
+  }
+
   demo.looper = createLoop({
     render: demo.render,
     update: demo.update,

nin/dasBoot/loop.js

@@ -1,9 +1,12 @@
+const Loader = require('./Loader');
+const {audioContext} = require('./shims');
+
 function loadMusic() {
   var webAudioContext = new audioContext();
   var _bufferSource;
   var _buffer;
   var _loaded = false;
-  Loader.loadAjax(PROJECT.music.path, {responseType: 'arraybuffer'}, function(data, registerAsLoaded) {
+  Loader.loadAjax(window.PROJECT.music.path, {responseType: 'arraybuffer'}, function(data, registerAsLoaded) {
     webAudioContext.decodeAudioData(data, function(buffer) {
       _buffer = buffer;
       _loaded = true;