nodeskini 1.0.2 → 1.0.5

package/blocklySkini/scripts/main2.js

@@ -333,10 +333,6 @@ function init(host) {
             "kind": "block",
             "type": "random_body"
           }
-          /* {
-             "kind": "block",
-             "type": "random_block"
-           }*/
         ]
       },
       {
@@ -681,6 +677,10 @@ function init(host) {
           {
             "kind": "block",
             "type": "hh_fork"
+          },
+                    {
+            "kind": "block",
+            "type": "hh_par"
           },
           {
             "kind": "block",

package/client/configurateur/configReact.js

@@ -135,7 +135,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [{ type: 'text', width: 80, title: 'Note' }, { type: 'text', width: 80, title: 'Note stop' }, { type: 'text', width: 80, title: 'Flag' }, { type: 'text', width: 120, title: 'Text' }, { type: 'text', width: 120, title: 'Sound file' }, { type: 'text', width: 80, title: 'Fifo' }, { type: 'text', width: 80, title: 'Slot' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'Vert. type' }, { type: 'text', width: 90, title: 'Group Index' }, { type: 'text', width: 80, title: 'Duration' }, { type: 'text', width: 100, title: 'IP address' }, { type: 'text', width: 80, title: 'Buffer num' }, { type: 'text', width: 80, title: 'Level' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));

package/client/configurateur/configReactbundle.js

@@ -136,7 +136,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [{ type: 'text', width: 80, title: 'Note' }, { type: 'text', width: 80, title: 'Note stop' }, { type: 'text', width: 80, title: 'Flag' }, { type: 'text', width: 120, title: 'Text' }, { type: 'text', width: 120, title: 'Sound file' }, { type: 'text', width: 80, title: 'Fifo' }, { type: 'text', width: 80, title: 'Slot' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'Vert. type' }, { type: 'text', width: 90, title: 'Group Index' }, { type: 'text', width: 80, title: 'Duration' }, { type: 'text', width: 100, title: 'IP address' }, { type: 'text', width: 80, title: 'Buffer num' }, { type: 'text', width: 80, title: 'Level' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));
@@ -275,21 +275,27 @@ var Jspreadsheet = function (_React$Component2) {
 },{"../../serveur/ipConfig.json":2}],2:[function(require,module,exports){
 module.exports={
   "remoteIPAddressImage": "192.168.1.251",
-  "remoteIPAddressSound": "localhost",
+  "remoteIPAddressSound": "192.168.1.251",
   "remoteIPAddressLumiere": "localhost",
-  "remoteIPAddressGame": "localhost",
-  "serverIPAddress": "localhost",
+  "remoteIPAddressGame": "192.168.1.223",
+  "interfaceZIPaddress": "192.168.1.250",
+  "serverIPAddress": "192.168.1.251",
   "webserveurPort": 8080,
   "websocketServeurPort": 8383,
   "InPortOSCMIDIfromDAW": 13000,
   "OutPortOSCMIDItoDAW": 12000,
-  "portOSCToGame": 3005,
-  "portOSCFromGame": 1000,
-  "distribSequencerPort": 8888,
+  "portOSCToGame": 1010,
+  "portOSCFromGame": 3010,
+  "portOSCFromInterfaceZData": 3005,
+  "portOSCFromInterfaceZMidi": 3006,
+  "portOSCFromInterfaceZMiniWi": 8888,
+  "portOSCToInterfaceZ": 1000,
+  "distribSequencerPort": 8899,
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
-}
+  "sessionPath": "./pieces/tutos/",
+  "piecePath" : "./pieces/tutos/"
+}
+
 },{}]},{},[1]);

package/client/configurateur/src/configReact.js

@@ -128,7 +128,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: msgRecu.descriptors,
-          minDimensions: [14, 14],
+          minDimensions: [14, 1],
           columns: [
             { type: 'text', width: 80, title: 'Note' },
             { type: 'text', width: 80, title: 'Note stop' },

package/client/parametrage/paramReact.js

@@ -185,7 +185,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9, 1],
           columns: [{ type: 'text', width: 80, title: 'Groupe' }, { type: 'text', width: 80, title: 'Index' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'X' }, { type: 'text', width: 80, title: 'Y' }, { type: 'text', width: 140, title: 'Nb of El. or Tank nb' }, { type: 'text', width: 80, title: 'Color' }, { type: 'text', width: 80, title: 'Previous' }, { type: 'text', width: 80, title: 'Scene' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));

package/client/parametrage/paramReactbundle.js

@@ -186,7 +186,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9, 1],
           columns: [{ type: 'text', width: 80, title: 'Groupe' }, { type: 'text', width: 80, title: 'Index' }, { type: 'text', width: 80, title: 'Type' }, { type: 'text', width: 80, title: 'X' }, { type: 'text', width: 80, title: 'Y' }, { type: 'text', width: 140, title: 'Nb of El. or Tank nb' }, { type: 'text', width: 80, title: 'Color' }, { type: 'text', width: 80, title: 'Previous' }, { type: 'text', width: 80, title: 'Scene' }]
         };
         ReactDOM.render(React.createElement(Jspreadsheet, { options: options }), document.getElementById('spreadsheet'));
@@ -477,7 +477,7 @@ module.exports={
   "remoteIPAddressImage": "192.168.1.251",
   "remoteIPAddressSound": "192.168.1.251",
   "remoteIPAddressLumiere": "localhost",
-  "remoteIPAddressGame": "192.168.1.251",
+  "remoteIPAddressGame": "192.168.1.223",
   "interfaceZIPaddress": "192.168.1.250",
   "serverIPAddress": "192.168.1.251",
   "webserveurPort": 8080,
@@ -488,13 +488,14 @@ module.exports={
   "portOSCFromGame": 3010,
   "portOSCFromInterfaceZData": 3005,
   "portOSCFromInterfaceZMidi": 3006,
+  "portOSCFromInterfaceZMiniWi": 8888,
   "portOSCToInterfaceZ": 1000,
-  "distribSequencerPort": 8888,
+  "distribSequencerPort": 8899,
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/",
-  "piecePath" : "./pieces/"
+  "sessionPath": "./pieces/tutos/",
+  "piecePath" : "./pieces/tutos/"
 }
 
 },{}]},{},[1]);

package/client/parametrage/src/paramReact.js

@@ -2,7 +2,7 @@
  * @fileOverview Parametrage in React.js
  * To compile JSX to js, launch this in the terminal, in ./client/parametrage
  * npx babel --watch src --out-dir . --presets react-app/prod
- * Do also : browserify paramReact.js -o paramReactbundle.js in 
+ * Do also : browserify paramReact.js -o paramReactbundle.js
  * 
  * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
  * @version 1.0
@@ -175,7 +175,7 @@ function initWSSocket(host) {
         par = msgRecu.value;
         var options = {
           data: par.groupesDesSons,
-          minDimensions: [9, 5],
+          minDimensions: [9,1],
           columns: [
             { type: 'text', width: 80, title: 'Groupe' },
             { type: 'text', width: 80, title: 'Index' },

package/client/simulateurListe/simulateurFork.mjs

@@ -101,7 +101,7 @@ for (var i = 0; i < myArgs.length; i++) {
 }
 
 /*******************************************************************
- * GESTION DES TYPES
+ * GESTION DES TYPES HORIZONTAUX
  * Traitement des listes reçues pour s'adapter à une séquence de types.
  * En utilisant les types avec des tanks on n'a pas besoin de gérer 
  * la mémoires des patterns sélectionnés, ni de revoir les FIFOs.

package/client/simulateurListe/simulateurListe.js

@@ -89,7 +89,7 @@ if (myArgs.includes("-sim")) {
 }
 
 /*******************************************************************
- * GESTION DES TYPES
+ * GESTION DES TYPES HORIZONTAUX
  * Traitement des listes reçues pour s'adapter à une séquence de types.
  * En utilisant les types avec des tanks on n'a pas besoin de gérer 
  * la mémoires des patterns sélectionnés, ni de revoir les FIFOs.
@@ -109,7 +109,7 @@ function resetListOfTypes() {
 resetListOfTypes();
 
 /**
- * Initialize the list of patterns according to their types 
+ * Initialize the list of patterns according to their horizontal types 
  * The index correponds to the type.
  * @param {Array} list of patterns
  */
@@ -451,7 +451,7 @@ function initWSSocket(port) {
         if (listClips.length === 0) {
           if (debug) console.log("WS Recu : listClips vide");
           if (tempoMax === tempoMin) {
-            console.log("WARN: tempoMin and tempoMax are equal");
+            console.log("WARN: tempoMin and tempoMax are equal", tempoMin, tempoMax);
             tempoInstantListClip = tempoMax;
           }
           else {

package/myReact/archive/Nodeemitvaluedlocal1.hh.js

@@ -7,7 +7,7 @@ var hh = require( "hiphop" );
 hiphop module prg( O ) {
    loop {
       signal S = 1;
-      
+
       emit S( S.preval + 1 );
       emit O( S.nowval );
       yield;
@@ -25,28 +25,28 @@ let prg;hh=require("hiphop");
 __hh_module=require("hiphop");
 
 prg=__hh_module.MODULE({"id":"prg","%location":{"filename":"emitvaluedlocal1.hh.js","pos":69},"%tag":"module"},
-	__hh_module.SIGNAL({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":81},"direction":"INOUT","name":"O"}),
-	__hh_module.LOOP({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":90}},
-		__hh_module.LOCAL({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":103},"%tag":"signal"},
-			__hh_module.SIGNAL(
-				{"name":"S",
-					"init_func":function (){return 1;}
-				}
-			),
-			__hh_module.EMIT(
-				{"%location":{"filename":"emitvaluedlocal1.hh.js","pos":135},
-				"%tag":"emit",
-				"S":"S",
-				"apply":function (){return ((() => {const S=this["S"];return S.preval + 1;})());
-			}
+  __hh_module.SIGNAL({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":81},"direction":"INOUT","name":"O"}),
+  __hh_module.LOOP({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":90}},
+    __hh_module.LOCAL({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":103},"%tag":"signal"},
+      __hh_module.SIGNAL(
+        {"name":"S",
+          "init_func":function (){return 1;}
+        }
+      ),
+      __hh_module.EMIT(
+        {"%location":{"filename":"emitvaluedlocal1.hh.js","pos":135},
+        "%tag":"emit",
+        "S":"S",
+        "apply":function (){return ((() => {const S=this["S"];return S.preval + 1;})());
+      }
 },
 __hh_module.SIGACCESS({"signame":"S","pre":true,"val":true,"cnt":false})),
-			__hh_module.EMIT({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":165},"%tag":"emit","O":"O","apply":function (){return ((() => {const S=this["S"];return S.nowval;})());}
+      __hh_module.EMIT({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":165},"%tag":"emit","O":"O","apply":function (){return ((() => {const S=this["S"];return S.nowval;})());}
 },
 __hh_module.SIGACCESS({"signame":"S","pre":false,"val":true,"cnt":false})),
-			__hh_module.PAUSE({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":186},"%tag":"yield"}),__hh_module.EMIT({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":204},"%tag":"emit","O":"O","apply":function (){return ((() => {const O=this["O"];return O.preval;})());}
+      __hh_module.PAUSE({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":186},"%tag":"yield"}),__hh_module.EMIT({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":204},"%tag":"emit","O":"O","apply":function (){return ((() => {const O=this["O"];return O.preval;})());}
 },
 __hh_module.SIGACCESS({"signame":"O","pre":true,"val":true,"cnt":false})),
-			__hh_module.PAUSE({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":225},"%tag":"yield"}))));
+      __hh_module.PAUSE({"%location":{"filename":"emitvaluedlocal1.hh.js","pos":225},"%tag":"yield"}))));
 
 exports.prg=new hh.ReactiveMachine(prg,"emitvaluedlocal1")

package/myReact/archive/atom.compile.hh.js

@@ -1,5 +1,5 @@
-"use strict"
-"use hopscript"
+'use strict';
+'use hopscript';
 
 /*var hh = require( "hiphop" );
 
@@ -23,29 +23,30 @@ var m;
 let prg;
 
 function func() {
-   console.log( "atom works!" );
+  console.log('atom works!');
 }
 
-__hh_module= require("../hiphop/hiphop.js");
-
-prg=__hh_module.MACHINE(
-	{"id":"prg","%location":{"filename":"emit-if2.hh.js","pos":290},"%tag":"module"},
-
-	__hh_module.LOOP({"%location":{"filename":"emit-if2.hh.js","pos":308}},
-		__hh_module.PAUSE({"%location":{"filename":"emit-if2.hh.js","pos":321},"%tag":"yield"}),
-		__hh_module.ATOM(
-			{
-				"%location":{"filename":"emit-if2.hh.js","pos":334},
-				"%tag":"hop",
-				"apply":function (){func();}
-			}
-		)
-	)
+__hh_module = require('../hiphop/hiphop.js');
+
+prg = __hh_module.MACHINE(
+  { id: 'prg', '%location': { filename: 'emit-if2.hh.js', pos: 290 }, '%tag': 'module' },
+
+  __hh_module.LOOP(
+    { '%location': { filename: 'emit-if2.hh.js', pos: 308 } },
+    __hh_module.PAUSE({ '%location': { filename: 'emit-if2.hh.js', pos: 321 }, '%tag': 'yield' }),
+    __hh_module.ATOM({
+      '%location': { filename: 'emit-if2.hh.js', pos: 334 },
+      '%tag': 'hop',
+      apply: function () {
+        func();
+      }
+    })
+  )
 );
-module.exports=prg;
+module.exports = prg;
 //m = new hh.ReactiveMachine(prg,"awaitvalued");
 
-prg.debug_emitted_func=console.log;
+prg.debug_emitted_func = console.log;
 
 prg.react();
 prg.react();