From becec126487292bafb09571340997de93552d9b7 Mon Sep 17 00:00:00 2001 From: Peter Salomonsen Date: Sun, 10 Nov 2019 08:30:16 +0100 Subject: [PATCH] assemblyscript from npm --- wasmaudioworklet/synth1/assembly/index.ts | 4 +- .../mixes/{piano.mix.ts => webchip.mix.ts} | 2 +- wasmaudioworklet/synth1/package-lock.json | 68 ++++++------------- wasmaudioworklet/synth1/package.json | 2 +- .../songs/{80smachine.js => webchipmusic.js} | 0 5 files changed, 26 insertions(+), 50 deletions(-) rename wasmaudioworklet/synth1/assembly/mixes/{piano.mix.ts => webchip.mix.ts} (99%) rename wasmaudioworklet/synth1/songs/{80smachine.js => webchipmusic.js} (100%) diff --git a/wasmaudioworklet/synth1/assembly/index.ts b/wasmaudioworklet/synth1/assembly/index.ts index fc091621..666d9c09 100644 --- a/wasmaudioworklet/synth1/assembly/index.ts +++ b/wasmaudioworklet/synth1/assembly/index.ts @@ -1,8 +1,8 @@ // The entry file of the synth WebAssembly module. // --- Replace with your own mix implementation here -import { mixernext, setChannelValue, PATTERN_SIZE_SHIFT, BEATS_PER_PATTERN_SHIFT } from './mixes/protracker.mix'; -export { setChannelValue } from './mixes/protracker.mix'; +import { mixernext, setChannelValue, PATTERN_SIZE_SHIFT, BEATS_PER_PATTERN_SHIFT } from './mixes/webchip.mix'; +export { setChannelValue } from './mixes/webchip.mix'; // ------------------------------------------------- import { SAMPLERATE } from './environment'; diff --git a/wasmaudioworklet/synth1/assembly/mixes/piano.mix.ts b/wasmaudioworklet/synth1/assembly/mixes/webchip.mix.ts similarity index 99% rename from wasmaudioworklet/synth1/assembly/mixes/piano.mix.ts rename to wasmaudioworklet/synth1/assembly/mixes/webchip.mix.ts index 99468e8d..87eff0c3 100644 --- a/wasmaudioworklet/synth1/assembly/mixes/piano.mix.ts +++ b/wasmaudioworklet/synth1/assembly/mixes/webchip.mix.ts @@ -36,7 +36,7 @@ let eqbandl = new EQBand(20, 19500); let eqbandr = new EQBand(20, 19500); function createInstrumentArray(length: i32, factoryFunc: () => T): T[] { - const arr = Array.create(length); + const arr = new Array(length); for(let n = 0; n < length;n++) { arr[n] = factoryFunc(); } diff --git a/wasmaudioworklet/synth1/package-lock.json b/wasmaudioworklet/synth1/package-lock.json index 2e1e0e01..1d579619 100644 --- a/wasmaudioworklet/synth1/package-lock.json +++ b/wasmaudioworklet/synth1/package-lock.json @@ -5,39 +5,34 @@ "@protobufjs/utf8": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", - "dev": true + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, "assemblyscript": { - "version": "github:AssemblyScript/assemblyscript#0bea37cc95d70df546236f6db60293ff94b942c9", - "from": "github:AssemblyScript/assemblyscript", - "dev": true, + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/assemblyscript/-/assemblyscript-0.8.0.tgz", + "integrity": "sha512-kggdeiWevgPnVgEOl0fgE3GHe78aNVn93QmzazkmEl5DZGUGhL5pYnJZ/B0lcni1sd7lYkGVZf/d+8myVx4hNw==", "requires": { "@protobufjs/utf8": "^1.1.0", "binaryen": "89.0.0-nightly.20191012", - "glob": "^7.1.4", + "glob": "^7.1.5", "long": "^4.0.0", - "opencollective-postinstall": "^2.0.0", - "source-map-support": "^0.5.13" + "source-map-support": "^0.5.16" } }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "binaryen": { "version": "89.0.0-nightly.20191012", "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-89.0.0-nightly.20191012.tgz", - "integrity": "sha512-ipKFZEyrMnFuEPCzEsXZ80DwZhGzrPldQ+vtcyCfdr8O75PKawfll1gmdWg4sUtzjSnfdvK9NiYfzm021lDNUg==", - "dev": true + "integrity": "sha512-ipKFZEyrMnFuEPCzEsXZ80DwZhGzrPldQ+vtcyCfdr8O75PKawfll1gmdWg4sUtzjSnfdvK9NiYfzm021lDNUg==" }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -46,26 +41,22 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "dev": true, + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -79,7 +70,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -88,20 +78,17 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -110,34 +97,24 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } }, - "opencollective-postinstall": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz", - "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==", - "dev": true - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", + "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -146,8 +123,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" } } } diff --git a/wasmaudioworklet/synth1/package.json b/wasmaudioworklet/synth1/package.json index 6a5687ab..652ea9a8 100644 --- a/wasmaudioworklet/synth1/package.json +++ b/wasmaudioworklet/synth1/package.json @@ -5,6 +5,6 @@ }, "dependencies": {}, "devDependencies": { - "assemblyscript": "github:AssemblyScript/assemblyscript" + "assemblyscript": "" } } diff --git a/wasmaudioworklet/synth1/songs/80smachine.js b/wasmaudioworklet/synth1/songs/webchipmusic.js similarity index 100% rename from wasmaudioworklet/synth1/songs/80smachine.js rename to wasmaudioworklet/synth1/songs/webchipmusic.js