WooCode · JesperWooCode · Oct 20, 2020 · Oct 20, 2020 · Oct 20, 2020 · Oct 20, 2020
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+dist
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,22 +2,57 @@
   "name": "jsxm",
   "version": "1.0.1",
   "description": "WebAudio FastTracker 2 .XM module player",
-  "keywords": "fasttracker xm webaudio",
+  "keywords": [
+    "fasttracker xm webaudio"
+  ],
   "uri": "http://www.a1k0n.net/code/jsxm/",
   "repository": "a1k0n/jsxm",
   "author": "Andy Sloane <andy@a1k0n.net> (http://www.a1k0n.net/)",
   "license": "MIT",
-  "contributors": [{
-    "name": "Johan Hillerström",
-    "email": "progr@mmer.nu"
-  }],
+  "contributors": [
+    {
+      "name": "Johan Hillerström",
+      "email": "progr@mmer.nu"
+    }
+  ],
+  "private": true,
   "main": "index.html",
   "window": {
     "frame": true,
     "toolbar": false,
     "position": "center",
     "resizable": true
   },
-  "scripts": { "test": "node test/all.js" },
-  "devDependencies": { "test": ">=0.0.5" }
+  "watch": {
+    "build": {
+      "extensions": "js,ts,html,scss",
+      "quiet": false
+    },
+    "test": {
+      "extensions": "js,ts,html,scss",
+      "quiet": false
+    }
+  },
+  "scripts": {
+    "test": "node test/all.js",
+    "watch-test": "npm-watch test",
+    "watch": "webpack --watch",
+    "start": "webpack serve",
+    "build": "webpack"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "copy-webpack-plugin": "^6.3.2",
+    "eslint": "^7.14.0",
+    "install": "^0.13.0",
+    "npm": "^6.14.9",
+    "npm-watch": "^0.7.0",
+    "source-map-loader": "^1.1.2",
+    "test": ">=0.0.5",
+    "ts-loader": "^8.0.11",
+    "typescript": "^4.1.2",
+    "webpack": "^5.6.0",
+    "webpack-cli": "^4.2.0",
+    "webpack-dev-server": "^3.8.0"
+  }
 }
diff --git a/ft2font.png → public/ft2font.png b/ft2font.png → public/ft2font.png
diff --git a/index.html → public/index.html b/index.html → public/index.html
@@ -1,10 +1,11 @@
 <head>
   <title>js xm</title>
   <script src="http://a1k0n-pub.s3-website-us-west-1.amazonaws.com/xm/xmlist.js"></script>
-  <script src="xmeffects.js"></script>
+  <!-- <script src="xmeffects.js"></script>
   <script src="trackview.js"></script>
   <script src="xm.js"></script>
-  <script src="shell.js"></script>
+  <script src="shell.js"></script> -->
+  <script src="bundle.js"></script>
   <style>
 
 .centered {

diff --git a/shell.js b/shell.js
diff --git a/src/index.ts b/src/index.ts
@@ -0,0 +1,20 @@
+import "./shell";
+import "./trackview";
+import "./xmeffects";
+
+import XMPlayer from "./models/XMPlayer"
+
+declare global {
+    interface Window {
+        XMPlayer: XMPlayer;
+        XMView: any;
+
+        // Audio constructors
+        webkitAudioContext: any;
+        AudioContext: any;
+
+        // Sketch file loading via js
+        xmuris: any;
+        baseuri: any;
+     }
+}
diff --git a/src/models/ChannelInfo.ts b/src/models/ChannelInfo.ts
@@ -0,0 +1,52 @@
+import Instrument from './Instrument'
+import Sample  from './Sample'
+import EnvelopeFollower from './EnvelopeFollower'
+import XMPlayer from './XMPlayer';
+
+export default class ChannelInfo {
+    constructor(data: Partial<ChannelInfo>) {
+        Object.assign(this, data);
+    }
+
+    number: number
+
+    filterstate: Float32Array
+
+    vL: number
+    vR: number
+    vLprev: number
+    vRprev: number
+
+    mute: number
+    retrig: number
+
+    inst: Instrument
+    note: number
+    samp: Sample
+    vol: number
+    pan: number
+    fine: number
+    release: number
+    voleffectfn: (player: XMPlayer, channel: ChannelInfo, data: any) => void
+    voleffectdata: number
+    vibratospeed: number
+    vibratodepth: number
+    portaspeed: number
+    effect: number
+    effectdata: number
+    effectfn: (player: XMPlayer, ch, data) => void
+    periodtarget: number
+    env_vol: EnvelopeFollower
+    env_pan: EnvelopeFollower
+    envtick: number
+    off: number
+    period: number
+    vibratotype: number
+    vibratopos: number
+
+    periodoffset: number
+    doff: number
+    filter: Array<number>
+    volE: number
+    panE: number
+}
diff --git a/src/models/Envelope.ts b/src/models/Envelope.ts
@@ -0,0 +1,34 @@
+export default class Envelope {
+    points: Array<number>;
+    type: number;
+    sustain: number;
+    loopstart: number;
+    loopend: number;
+
+    constructor(points: Array<number>, type: number, sustain: number, loopstart: number, loopend: number) {
+      this.points = points;
+      this.type = type;
+      this.sustain = sustain;
+      this.loopstart = points[loopstart * 2];
+      this.loopend = points[loopend * 2];
+    }
+
+    public Get(ticks: number) {
+      // TODO: optimize follower with ptr
+      // or even do binary search here
+      var y0;
+      var env = this.points;
+      for (var i = 0; i < env.length; i += 2) {
+        y0 = env[i + 1];
+        if (ticks < env[i]) {
+          const x0 = env[i - 2];
+          y0 = env[i - 1];
+          const dx = env[i] - x0;
+          const dy = env[i + 1] - y0;
+          return y0 + (ticks - x0) * dy / dx;
+        }
+      }
+      return y0;
+    };
+  }
+
diff --git a/src/models/EnvelopeFollower.ts b/src/models/EnvelopeFollower.ts
@@ -0,0 +1,30 @@
+import Envelope from "./Envelope";
+
+export default class EnvelopeFollower {
+    env: Envelope;
+    tick: number;
+
+    constructor(env: Envelope) {
+      this.env = env;
+      this.tick = 0;
+    }
+
+    public Tick(release: number) {
+      var value = this.env.Get(this.tick);
+
+      // if we're sustaining a note, stop advancing the tick counter
+      if (!release && this.tick >= this.env.points[this.env.sustain * 2]) {
+        return this.env.points[this.env.sustain * 2 + 1];
+      }
+
+      this.tick++;
+      if (this.env.type & 4) {  // envelope loop?
+        if (!release &&
+          this.tick >= this.env.loopend) {
+          this.tick -= this.env.loopend - this.env.loopstart;
+        }
+      }
+      return value;
+    };
+  }
+
diff --git a/src/models/Instrument.ts b/src/models/Instrument.ts
@@ -0,0 +1,24 @@
+import Envelope from './Envelope'
+import Sample from './Sample'
+
+export default class Instrument {
+  name: string
+  number: number
+
+  samplemap: Uint8Array
+  samples: Sample[]
+
+  env_vol: Envelope
+  env_pan: Envelope
+
+  constructor(name: string, number: number) {
+    this.name = name
+    this.number = number
+
+    this.samplemap = undefined
+    this.samples = undefined
+
+    this.env_vol = undefined
+    this.env_pan = undefined
+  }
+}
diff --git a/src/models/Pattern.ts b/src/models/Pattern.ts
@@ -0,0 +1,3 @@
+export default  class Pattern {
+
+}