Merge remote-tracking branch 'origin/HEAD' into webaudio

packages/core/signal.mjs

@@ -1,5 +1,5 @@
 import { Hap } from './hap.mjs';
-import { Pattern, fastcat } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 
 export function steady(value) {
@@ -28,3 +28,50 @@ export const square2 = square._toBipolar();
 
 export const tri = fastcat(isaw, saw);
 export const tri2 = fastcat(isaw2, saw2);
+
+// random signals
+
+const xorwise = (x) => {
+  const a = (x << 13) ^ x;
+  const b = (a >> 17) ^ a;
+  return (b << 5) ^ b;
+};
+
+// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
+const _frac = (x) => x - Math.trunc(x);
+
+const timeToIntSeed = (x) => xorwise(Math.trunc(_frac(x / 300) * 536870912));
+
+const intSeedToRand = (x) => (x % 536870912) / 536870912;
+
+const timeToRand = (x) => intSeedToRand(timeToIntSeed(x));
+
+const timeToRandsPrime = (seed, n) => {
+  const result = [];
+  for (let i = 0; i < n; ++n) {
+    result.push(intSeedToRand(seed));
+    seed = xorwise(seed);
+  }
+  return result;
+};
+
+const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
+
+export const rand2 = signal(timeToRand);
+export const rand = rand2.fmap(Math.abs);
+
+export const _brandBy = (p) => rand.fmap((x) => x < p);
+export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
+export const brand = _brandBy(0.5);
+
+export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
+export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();
+
+export const chooseWith = (pat, xs) => {
+  if (xs.length == 0) {
+    return silence;
+  }
+  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]);
+};
+
+export const choose = (...xs) => chooseWith(rand, xs);

packages/osc/osc.mjs

@@ -1,4 +1,4 @@
-import OSC from './osc.js';
+import OSC from 'osc-js';
 import { Pattern } from '@strudel.cycles/core';
 
 const comm = new OSC();

packages/osc/package-lock.json

@@ -9,24 +9,15 @@
 			"version": "0.0.1",
 			"license": "GPL-3.0-or-later",
 			"dependencies": {
-				"osc-js": "^2.3.0"
-			}
-		},
-		"node_modules/isomorphic-ws": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-			"integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
-			"peerDependencies": {
-				"ws": "*"
+				"osc-js": "^2.3.2"
 			}
 		},
 		"node_modules/osc-js": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.0.tgz",
-			"integrity": "sha512-P2Oy9tf8Z9lQw8JZeR62HNqbKdxj7Kqbsag+ImiJvyxPDReGMVt5LtZbMh/7Ve/wbYEGODkQdFAaLHFVkIlHPw==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
 			"dependencies": {
-				"isomorphic-ws": "4.0.1",
-				"ws": "8.5.0"
+				"ws": "^8.5.0"
 			}
 		},
 		"node_modules/ws": {
@@ -51,19 +42,12 @@
 		}
 	},
 	"dependencies": {
-		"isomorphic-ws": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-			"integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
-			"requires": {}
-		},
 		"osc-js": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.0.tgz",
-			"integrity": "sha512-P2Oy9tf8Z9lQw8JZeR62HNqbKdxj7Kqbsag+ImiJvyxPDReGMVt5LtZbMh/7Ve/wbYEGODkQdFAaLHFVkIlHPw==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
 			"requires": {
-				"isomorphic-ws": "4.0.1",
-				"ws": "8.5.0"
+				"ws": "^8.5.0"
 			}
 		},
 		"ws": {

packages/osc/package.json

@@ -27,6 +27,6 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "osc-js": "^2.3.0"
+    "osc-js": "^2.3.2"
   }
 }