Merge pull request #1 from livejs/webpackData

Webpack data

Author: Rumyra

defaultVJ.quneopreset

@@ -8,7 +8,7 @@
     "type": "git"
   },
   "scripts": {
-    "start": "nodemon server.js",
+    "vizra": "nodemon server.js",
     "build-css": "node-sass --output-style compressed -o public/styles src",
     "watch-sass": "nodemon -e scss -x \"npm run build-css\""
   },
@@ -22,6 +22,7 @@
   },
   "devDependencies": {
     "node-sass": "^3.10.1",
-    "nodemon": "^1.11.0"
+    "nodemon": "^1.11.0",
+    "webpack": "^3.5.5"
   }
 }

package-lock.json

@@ -1,36 +1,56 @@
 
 function onMIDIMessage(message) {
     data = message.data;
-    // console.log('MIDI data', data);
+    console.log('MIDI data', data);
 
     // Threshold for mixing - this show/hides screens
-    if ( (data[0] === minim.cross[0]) && (data[1] === minim.cross[1]) ) {
+    if ( (data[0] === quneo.mainSlider[0]) && (data[1] === quneo.mainSlider[1]) ) {
       var bezierVal = data[2]/127;
       threshold = ( easing(bezierVal) )*240
       // console.log('midi:'+data[2]+'bezier:'+bezierVal+'threshold:'+threshold);
       console.log(data[2],bezierVal,threshold);
     }
 
-    // if side buttons are pressed show set
-    for (i=0; i<8; i++) {
-      
-      if ( (data[0] === minim.side[i].onPress[0]) && data[1] === minim.side[i].onPress[1] ) {
-          set = sets[i];
-          console.log("set "+set.name);
-      }
+    // new control
+
+    // pad is pressed
+    for (i=0; i<4; i++) {
+
+      // if pad is pressed
+      if ( (data[0] === quneo.pads[i][data[1]].onPress[0]) && (data[1] === quneo.pads[i][data[1]].onPress[1]) ) {
+
+        set = sets[i];
+        console.log("set "+set.name);
+        var libraryName = '';
+        var libraryItemNo = data[i];
+
+        if (data[1]>31) {
+
+          screenNo = 1;
+          console.log("screen: "+screenNo);
+          libraryItemNo = data[1]-32;
 
-      if ( (data[0] === minim.pads[i].onPress[0]) && data[1] === minim.pads[i].onPress[1] ) {
+        } else {
+
+          screenNo = 0;
+          console.log("screen: "+screenNo);
+
+        }
+
+        libraryName = set.tracks[libraryItemNo];
+
+        libraryTrack = library[libraryName];
+        console.log('track: '+libraryTrack);
 
         // load correct set stuff
-        if (set.type === 'video') {
+        if (libraryTrack.type === 'video') {
 
-          console.log(library);
-          changeVidSrc(videoEls[screenNo], 'library/'+set.name+'/'+library.video[set.name][i]+'.mp4');
+          changeVidSrc(videoEls[screenNo], 'library/'+libraryTrack.file);
 
           showVideo(vidScreens[screenNo], domScreens[screenNo]);
 
           //set.name
-        } else if (set.type === 'dom') {
+        } else if (libraryItem.type === 'dom') {
 
           if (library.dom[set.name][i]) {
             var svg = d3.select(svgEls[screenNo]);
@@ -42,11 +62,12 @@ function onMIDIMessage(message) {
 
         }
 
-      }
+      }// if pad
 
     }// for
 
 
+
     // effects
 
     // black

package.json

@@ -0,0 +1,23 @@
+// invert
+
+function invertVideo(el) {
+  el.style. etc...
+}
+
+function invertCanvas(el) {
+  
+}
+
+// zoom
+
+// tile
+
+// symmetrysize
+
+// glitch
+
+// chroma
+
+// old film
+
+// pixelation