nodeskini 1.0.5 → 1.0.6

package/client/score/parto1.js

@@ -77,7 +77,10 @@ var textSize = 20 * screenY / Ybase;
 
 // La version processing.min.js ne sais pas gérer les couleur en hexa.
 function hex_to_RGB(hex) {
-    var m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
+    console.log("hex_to_RGB:", typeof hex, hex);
+    if(hex == '') return [0,0,0];
+
+    let m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
     return [ parseInt(m[1], 16), parseInt(m[2], 16), parseInt(m[3], 16)];
 }
 

package/client/score/parto1bundle.js

@@ -1,12 +1,26 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-/**************************************
-  SKINI
-
-  © Copyright 2019, B. Petit-Heidelein
-
-  browserify parto1.js -o parto1bundle.js
-
-***************************************/
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+/**
+ * @fileOverview Display the score of the Skini piece
+ * 
+ * browserify parto1.js -o parto1bundle.js
+ *
+ * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
+ * @version 1.0
+ * @copyright (C) 2022 Bertrand Petit-Hédelin
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 "use strict"
 
 var ipConfig = require('../../serveur/ipConfig');
@@ -64,7 +78,10 @@ var textSize = 20 * screenY / Ybase;
 
 // La version processing.min.js ne sais pas gérer les couleur en hexa.
 function hex_to_RGB(hex) {
-    var m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
+    console.log("hex_to_RGB:", typeof hex, hex);
+    if(hex == '') return [0,0,0];
+
+    let m = hex.match(/^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i);
     return [ parseInt(m[1], 16), parseInt(m[2], 16), parseInt(m[3], 16)];
 }
 
@@ -1156,26 +1173,31 @@ function initWSSocket(host) {
     }
 }
 window.initWSSocket = initWSSocket;
-
-},{"../../serveur/ipConfig":2}],2:[function(require,module,exports){
+
+},{"../../serveur/ipConfig":2}],2:[function(require,module,exports){
 module.exports={
-  "remoteIPAddressImage": "localhost",
-  "remoteIPAddressSound": "localhost",
+  "remoteIPAddressImage": "192.168.1.251",
+  "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": 1000,
-  "portOSCFromGame": 3005,
-  "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/opus/",
+  "piecePath" : "./pieces/opus/"
 }
-
-},{}]},{},[1]);
+
+},{}]},{},[1]);

package/myReact/orchestrationHH.hh.js

@@ -203,6 +203,9 @@ var Piano, StartTransSaxo, Saxo, Piano1Intro1, Piano1Intro2, Piano1Intro3, Piano
 //
 //
 //
+//
+//
+//
 
 "use strict";
 import { createRequire } from 'module';
@@ -690,6 +693,9 @@ export function setSignals(param) {
   //
   //
   //
+  //
+  //
+  //
   //
 
     const TransPianoEtNappe = hiphop module() {
@@ -922,6 +928,9 @@ export function setSignals(param) {
   //
   //
   //
+  //
+  //
+  //
   //
 
     const TransPianoEtNappe2 = hiphop module() {
@@ -1154,6 +1163,9 @@ export function setSignals(param) {
   //
   //
   //
+  //
+  //
+  //
   //
 
     const TransPianoEtNappe3 = hiphop module() {
@@ -1402,6 +1414,9 @@ export function setSignals(param) {
   //
   //
   //
+  //
+  //
+  //
   //
 
     const TransSaxo = hiphop module() {
@@ -1541,14 +1556,14 @@ export function setSignals(param) {
 
       }
 
-    M533953 : {
+    M370292 : {
     fork{
         run ${ Percu} () {*};
 
       }par{
         await count(5, tick.now);
         emit stopReservoir();
-        break M533953;
+        break M370292;
       }
     }
 
@@ -1572,14 +1587,14 @@ export function setSignals(param) {
 
       fork {
 
-        M642770 : {
+        M914075 : {
         fork{
             run ${ Piano} () {*};
 
           }par{
             await count(5, tick.now);
             emit stopReservoir();
-            break M642770;
+            break M914075;
           }
         }
 
@@ -1661,14 +1676,14 @@ export function setSignals(param) {
 
       fork {
 
-        M346707 : {
+        M712993 : {
         fork{
             run ${ Piano} () {*};
 
           }par{
             await count(30, tick.now);
             emit stopReservoir();
-            break M346707;
+            break M712993;
           }
         }
 
@@ -1750,14 +1765,14 @@ export function setSignals(param) {
 
       fork {
 
-        M607778 : {
+        M591004 : {
         fork{
             run ${ Piano} () {*};
 
           }par{
             await count(30, tick.now);
             emit stopReservoir();
-            break M607778;
+            break M591004;
           }
         }
 
@@ -1865,14 +1880,14 @@ export function setSignals(param) {
 
     fork {
 
-      M138663 : {
+      M396667 : {
       fork{
           run ${ Saxo} () {*};
 
         }par{
           await count(50, tick.now);
           emit stopReservoir();
-          break M138663;
+          break M396667;
         }
       }
 
@@ -1919,14 +1934,14 @@ export function setSignals(param) {
 
     fork {
 
-      M475594 : {
+      M62248 : {
       fork{
           run ${ Flute} () {*};
 
         }par{
           await count(40, tick.now);
           emit stopReservoir();
-          break M475594;
+          break M62248;
         }
       }