Merge pull request #254 from ninjadev/paradigm-shift

Shift paradigm from layers to nodes

README.md

@@ -9,6 +9,14 @@ nin is Ninjadev's internal demo tool. It is a tool for easing development of bro
 This project has a node backend that keeps track of all files and compiles files as they are edited.
 The frontend of this project is written in Angular and displays among other the layers that the demo consists of.
 
+
+## nin is now node-based!
+
+Nin just became node-based instead of layer-based.
+Here is a list of gotchas to watch out for if you are used to layer-based nin:
+
+- Changing res/graph.json does *not* trigger updates in a running nin instance.
+
 ## How it works
 Create a new project with a structure like the one seen in the directory `example-project`.
 It may be stored anywhere on your disk.

nin/backend/generate/generate.js

@@ -1,7 +1,7 @@
 var fs = require('fs'),
     path = require('path'),
     utils = require('../utils'),
-    layers = require('../layers'),
+    graph = require('../graph'),
     mkdirp = require('mkdirp');
 
 var generate = function(projectRoot, type, name) {

nin/backend/graph.js

@@ -0,0 +1,62 @@
+var fs = require('fs');
+var utils = require('./utils');
+
+
+function update(projectPath, nodeId, data, callback) {
+  read(projectPath, function (err, graph) {
+    if (err) {
+      if (callback) {
+        callback(err);
+      }
+      return;
+    }
+    var index = graph.findIndex(nodeInfo => nodeInfo.id == nodeId);
+    for (var key in data) {
+      graph[index][key] = data[key];
+    }
+    write(projectPath, graph, function (err) {
+      if (callback) {
+        callback(err);
+      }
+    });
+  });
+}
+
+var operationQueue = [];
+var activeOperation = null;
+
+function read(projectPath, callback) {
+  operationQueue.push([projectPath, callback]);
+  if (activeOperation === null) {
+    advanceQueue();
+  }
+}
+
+function write(projectPath, layers, callback) {
+  var data = JSON.stringify(layers, null, 2) + '\n';
+  fs.writeFile(projectPath + '/res/graph.json', data, function(err) {
+    advanceQueue();
+    callback(err);
+  });
+}
+
+function advanceQueue() {
+  activeOperation = operationQueue.shift() || null;
+  if (activeOperation) {
+    _read.apply(this, activeOperation);
+  }
+}
+
+function _read(projectPath, callback) {
+  fs.readFile(projectPath + '/res/graph.json', function(err, data) {
+    if (err) {
+      advanceQueue();
+      callback(err);
+    } else {
+      var graph = JSON.parse(data);
+      callback(err, graph);
+    }
+  });
+}
+
+module.exports = {update: update};

nin/backend/serve.js

@@ -63,7 +63,7 @@ var serve = function(projectPath, shouldRunHeadlessly) {
         path: path
       };
 
-      if (filename == 'layers.json' ||
+      if (filename == 'graph.json' ||
             filename == 'camerapaths.json') {
         event.type = filenameWithoutExtension;
         event.content = content;
@@ -72,10 +72,8 @@ var serve = function(projectPath, shouldRunHeadlessly) {
         event.content = data.out;
         event.shadername = p.basename(p.dirname(path));
       } else {
-        event.type = 'layer';
+        event.type = 'node';
         event.content = content;
-        event.layername = filenameWithoutExtension;
-        event.shaderDependencies = findShaderDependencies(content);
       }
 
       return event;
@@ -92,7 +90,16 @@ var serve = function(projectPath, shouldRunHeadlessly) {
     var sockets = express();
     var sockets_server = require('http').createServer(sockets);
     var sock = socket(projectPath, function(conn) {
-      var sortedPaths = watcher.paths.sort();
+      var sortedPaths = watcher.paths.sort(function(a, b) {
+        var directoryPrecedence = {'lib': 0, 'src': 1, 'res': 2};
+        var directoryAScore = directoryPrecedence[a.slice(0, 3)];
+        var directoryBScore = directoryPrecedence[b.slice(0, 3)];
+        if(directoryAScore == directoryBScore) {
+          return a > b;
+        }
+        return directoryAScore > directoryBScore;
+
+      });
       for (var i in sortedPaths) {
         conn.send('add', eventFromPath({path: sortedPaths[i]}));
       }

nin/backend/socket.js

@@ -1,6 +1,6 @@
 var chalk = require('chalk');
 var generate = require('./generate/generate');
-var layers = require('./layers');
+var graph = require('./graph');
 var sock = require('sockjs');
 
 
@@ -38,9 +38,7 @@ function socket(projectPath, onConnectionCallback) {
       var event = JSON.parse(message);
       switch (event.type) {
         case 'set':
-          var data = {};
-          data[event.data.field] = event.data.value;
-          layers.update(projectPath, event.data.id, data, function (err) {
+          graph.update(projectPath, event.data.id, event.data.fields, function (err) {
             if (err) {
               console.log(err);
             }

nin/backend/watch.js

@@ -9,7 +9,7 @@ function watch(projectPath, cb) {
   var watcher = chokidar.watch(
     ['src/',
      'lib/',
-     'res/layers.json',
+     'res/graph.json',
      'res/camerapaths.json'], {
     ignored: [/[\/\\]\./, /\/shaders\//],
     persistent: true,
@@ -29,12 +29,21 @@ function watch(projectPath, cb) {
    * trigger intial callbacks for all files */
   watcher.on('add', function(){ });
 
+  var graphAlreadyLoaded = false;
+
   watcher.on('all', function (event, path) {
     if (event === 'unlink') event = 'delete';
     if (event == 'addDir') {
       return;
     }
 
+    if(path == 'res/graph.json') {
+      if(graphAlreadyLoaded) {
+        return;
+      }
+      graphAlreadyLoaded = true;
+    }
+
     if (logFileChanges) {
       console.log(chalk.yellow('Change in project detected: ') +
                   chalk.cyan(event) +

nin/dasBoot/00_NIN.js

@@ -0,0 +1 @@
+window['NIN'] = window['NIN'] || {}; 

nin/dasBoot/Input.js

@@ -0,0 +1,21 @@
+(function(NIN) {
+  'use strict';
+
+  class Input {
+
+    constructor(node) {
+      this.source = null;
+      this.node = node;
+      this.enabled = true;
+    }
+
+    getValue() {
+      if(!this.source) {
+        return null;
+      }
+      return this.source.getValue();
+    }
+  }
+
+  NIN.Input = Input;
+})(this.NIN);

nin/dasBoot/Loader.js

@@ -75,6 +75,7 @@ Loader.prototype.start = function(onprogress, oncomplete) {
         'png': 'data:image/png;base64,',
         'mp3': 'data:audio/mp3;base64,',
         'mp4': 'data:video/mp4;base64,',
+        '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)));

nin/dasBoot/Node.js

@@ -0,0 +1,22 @@
+(function(NIN) {
+  'use strict';
+
+  class Node {
+    constructor(id, options) {
+      this.id = id;
+      this.inputs = options.inputs || {};
+      this.outputs = options.outputs || {};
+    }
+
+    resize() {
+    }
+
+    render() {
+    }
+
+    update() {
+    }
+  }
+
+  NIN.Node = Node;
+})(this.NIN);