refactor to use es6 modules, build with rollup -c

Author: raffecat

Diff for: .eslintrc.json

@@ -0,0 +1,16 @@
+{
+  "extends": "eslint:recommended",
+  "env": {
+    "browser": true
+  },
+  "globals": {
+    "$":false
+  },
+  "parserOptions": {
+    "ecmaVersion": 5,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "impliedStrict": true
+    }
+  }
+}

Diff for: assets/sprites.png

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+"use strict";
+
+var fs = require('fs');
+
+// read and minify shaders.
+var shaders = 'var ShaderLibrary='+JSON.stringify({
+  vertex:   norm_ws(read('src/shader.vertex', 'utf8')),
+  fragment: norm_ws(read('src/shader.fragment', 'utf8')),
+})+';\n';
+
+// write the game-server data files.
+write('gen/shaders.js', 'export ' +shaders);
+
+function read(from) { return fs.readFileSync(from, 'utf8'); }
+function write(to, text) { fs.writeFileSync(to, text, 'utf8'); }
+function norm_ws(text) { return text.replace(/[ \t]+/g,' ').replace(/\n\s*/g,'\n'); }

Diff for: assets/tiles.png

@@ -164,7 +164,7 @@ Consider:
 Combine 2-3 enemy motions or player motions to make timing harder.
 Each room is a mini puzzle you must complete, on each traverse.
 - Kill monk, flip switch, climb plarforms.
-- Lead chaser, climb ladder, dodge snake while jumping spikes.
+- Chaser, climb ladder, dodge snake while jumping spikes.
 - Climb ropes across top while avoiding climbers [instead of moving ropes]
 - Fixed hazards and a moving hazard to force jumps or dancing around.
 - Two synchro left-right enemies with horns above.
@@ -176,7 +176,7 @@ Each room is a mini puzzle you must complete, on each traverse.
 - Ocean: quick way jumping over causes damage; slow way to swim down and up.
 
 Enemy mechanics:
-Horizontal and Vertical movers.
+Horizontal and Vertical movers [synchro, same-extents]
 Drop when underneath.
 Bats fly at the player.
 Chase the player on ground [unless have item, while have item]
@@ -186,13 +186,17 @@ Conveyor belt.
 Spikes [timed, switchable]
 Moving platforms [switchable]
 Fish swimming, jellyfish.
+Climbers on ropes.
 
 Environment mechanics:
 Cooking food.
-Put out fire.
+Light or extinguish fire.
+Light the torches.
 Lower/raise water level.
 Burn away.
-Catch water in bowl.
+Fill bucket, catch water in bowl.
+Fire enemies consume water.
+Simon says puzzle.
 
 Climbing mechanics:
 One-way drop.
@@ -238,18 +242,32 @@ Tile flipping (high bits)
 Chunks -> irregular chunks (a template group of chunks)
 Wang tiles -> wang chunks (for map generation)
 
+Item pads (unique id)
+Inventory.
 Keys and doors.
 Trampoline.
-Sprite sheet.
-Dark and light tiles (or light sources?)
-Puzzle.
 Health recovery.
 In/out platform.
 Bat gfx.
 Snake.
 Axe thrower (Horiz)
 Up/down spikes.
-Spear trap (side)
+Spear trap (distance trigger)
 Dart trap.
 Falling brick.
+
+Puzzle.
+Room names.
+Ropes sheet.
 Torch shader.
+Dark and light tiles (or light sources?)
+
+Content-Type: audio/x-wav
+
+rollup:
+* createCommonjsModule
+Colour conversions [xyz,lab,cie,etc]
+Derived conversions (breadth-first-search) is a thing.
+Generated bind functions are a thing.
+ANSI colour codes module.
+Call-site annotations always win e.g. @inline.

Diff for: make-shaders

@@ -32,6 +32,16 @@
     39: ('Entry', 'E', 7),
     # player start.
     48: ('Belle', 'P', 0),
+    # doors.
+    56: ('Green Door', '', 0),
+    57: ('Red Door', '', 0),
+    58: ('Blue Door', '', 0),
+    59: ('Orange Door', '', 0),
+    # keys.
+    64: ('Green Key', '', 0),
+    65: ('Red Key', '', 0),
+    66: ('Blue Key', '', 0),
+    67: ('Orange Key', '', 0),
 }
 
 def findTile(img, x, y, dx, dy, marker, name):

Diff for: notes.md

@@ -1,13 +1,21 @@
 {
-  "name" : "starfall-ae",
-  "description" : "The space game",
-  "version" : "0.0.1",
-  "private" : true,
+  "name": "starfall-ae",
+  "description": "The space game",
+  "version": "0.0.1",
+  "private": true,
   "dependencies": {
     "uglify-js": "2.2.3",
     "express": "3.0.6",
     "cheerio": "0.10.5",
-    "socket.io" : ">0.9.13"
+    "socket.io": ">0.9.13"
   },
-  "main": "server"
+  "main": "server",
+  "devDependencies": {
+    "rollup": "^0.50.0",
+    "rollup-plugin-buble": "^0.15.0",
+    "rollup-plugin-closure-compiler-js": "^1.0.5",
+    "rollup-plugin-eslint": "^4.0.0",
+    "rollup-plugin-typescript2": "^0.5.2",
+    "rollup-plugin-uglify": "^2.0.1"
+  }
 }

Diff for: originals/basement.json

@@ -0,0 +1,21 @@
+import eslint from 'rollup-plugin-eslint';
+import closure from 'rollup-plugin-closure-compiler-js';
+
+// Doesn't match the docs (old format?)
+export default {
+  entry: 'src/start.js',
+  dest: 'gen/game.js',
+  format: 'iife',
+  intro: '(function($){',
+  outro: '})',
+  plugins: [
+    eslint({}),
+    closure({
+      env: 'BROWSER',
+      languageIn: 'ECMASCRIPT6_STRICT',
+      languageOut: 'ECMASCRIPT5',
+      compilationLevel: 'ADVANCED',
+      assumeFunctionWrapper: true
+    })
+  ]
+};

Diff for: originals/codes.bmp

@@ -0,0 +1,13 @@
+import eslint from 'rollup-plugin-eslint';
+import buble from 'rollup-plugin-buble';
+
+// Doesn't match the docs (old format?)
+export default {
+  entry: 'src/start.js',
+  dest: 'gen/game.js',
+  format: 'iife',
+  plugins: [
+    eslint({}),
+    buble()
+  ]
+};

Diff for: originals/halls.json

@@ -0,0 +1,17 @@
+import eslint from 'rollup-plugin-eslint';
+import uglify from 'rollup-plugin-uglify';
+import buble from 'rollup-plugin-buble';
+import typescript from 'rollup-plugin-typescript2';
+
+// Doesn't match the docs (old format?)
+export default {
+  entry: 'src/start.js',
+  dest: 'gen/game.js',
+  format: 'iife',
+  plugins: [
+    typescript(),
+    eslint({}),
+    buble(),
+    uglify()
+  ]
+};

Diff for: originals/make_maps.py

@@ -1,11 +1,14 @@
+"use strict";
+
+import { log } from './defs';
 
 // https://www.html5rocks.com/en/tutorials/webaudio/intro/
 // https://webaudio.github.io/web-audio-api/#idl-def-AudioBufferSourceNode
 
 // Webkit/blink browsers need prefix, Safari won't work without window.
 var Snd_Ctx = new (window['AudioContext'] || window['webkitAudioContext'])();
 
-function Snd_Sample(src) {
+export function Sample(src) {
   var sample = { buf:null };
   var req = new XMLHttpRequest();
   req.open('GET', src, true);
@@ -17,7 +20,7 @@ function Snd_Sample(src) {
     Snd_Ctx['decodeAudioData'](req['response'], function (buf) {
       sample.buf = buf;
       done();
-    }, function (e) { log("EAudio:"+src); done(); });
+    }, function () { log("EAudio:"+src); done(); });
   };
   req['onerror'] = function () {
     log("EAudio:"+src); done();
@@ -26,7 +29,7 @@ function Snd_Sample(src) {
   return sample;
 }
 
-function Snd_play(sample) {
+export function play(sample) {
   if (sample.buf) {
     var source = Snd_Ctx.createBufferSource();
     source['buffer'] = sample.buf;

Diff for: originals/passages.json

@@ -1,4 +1,6 @@
-function CacheLoader(loader) {
+"use strict";
+
+export function CacheLoader(loader) {
   var cache = {};
   var loading = 0;
   var queue = [];

Diff for: originals/rooftops.json

@@ -1,7 +1,7 @@
 
 /*
 
-var mouseIsDown = false;
+export var mouseIsDown = false;
 
 function onMouseDown(event) {
   event.preventDefault();
@@ -33,7 +33,7 @@ document.addEventListener( 'mousewheel', onMouseWheel, false );
 
 */
 
-var keys = [];
+export var keys = [];
 
 function onKeyDown(event) {
   // event.preventDefault();

Diff for: originals/upper.json

@@ -1,10 +1,11 @@
+"use strict";
 
-var debug = true;
+export var debug = true;
 
-var log = debug && window.console && console.log && console.log.bind && console.log.bind(console) || function(){};
-var trace = log;
+var c;
 
-var FloatArray = window.Float32Array || window.WebGLFloatArray;
-var Uint16Array = window.Uint16Array;
+export var log = debug && (c=window['console']) && c['log'] && c['log']['bind'] && c['log']['bind'](c) || function(){};
+export var trace = log;
 
-// var hasOwn = Object.prototype.hasOwnProperty;
+export var FloatArray = window.Float32Array || window.WebGLFloatArray;
+export var Uint16Array = window.Uint16Array;

Diff for: package.json

@@ -0,0 +1,4 @@
+"use strict";
+
+export function getElem(id) { return document.getElementById(id); }
+export function removeElem(id,e) { (e=getElem(id)).parentNode.removeChild(e); }

Diff for: rollup.closure.js

@@ -1,20 +1,29 @@
+"use strict";
 
-function setAnim(ent, anim) {
+import { Sample, play } from './audio';
+import { keys } from './controls';
+import { movers } from './spawn';
+import { white } from './glr';
+
+var jumpSound = Sample('/assets/jump.wav');
+var painSound = Sample('/assets/ouch.wav');
+
+export function setAnim(ent, anim) {
   // start or restart an animation.
   ent.anim = anim;
   ent.animOfs = 0;       // current animation entry.
   ent.animTr = anim[1];  // time remaining on current frame.
   ent.index = anim[0];   // current frame index.
 }
 
-function toAnim(ent, anim) {
+export function toAnim(ent, anim) {
   // change animation without restarting.
   if (ent.anim !== anim) {
     setAnim(ent, anim);
   }
 }
 
-function animateEnts(ents, delta) {
+export function animateEnts(ents, delta) {
   for (var i=0; i<ents.length; i++) {
     var ent = ents[i];
     var dt = delta;
@@ -80,8 +89,8 @@ function hitTestMap(map, L, B, R, T, falling, res) {
           ladder = true;
           if (falling) {
             // treat ladder tiles as solid tiles when falling.
-            var tileT = (y * 32) + 32;
-            if (tileT > hitB && tileT < T) hitB = tileT;
+            var ladderT = (y * 32) + 32;
+            if (ladderT > hitB && ladderT < T) hitB = ladderT;
           }
         }
       }
@@ -123,19 +132,19 @@ var jumpVelocity = 5 * (60/1000);
 var gravity = 0.01 * (60/1000);
 var walkSpeed = 3 * (60/1000);
 var climbSpeed = 3 * (60/1000);
-var maxVelX = 8 * (60/1000);
+// var maxVelX = 8 * (60/1000);
 var maxVelY = 10 * (60/1000);
 var res = {};
 
 var hitW = 16 - 5;    // subtract more than walkSpeed, for holes/ladders.
 var hitW2 = hitW*2-1; // added to left edge for right edge.
 var hitH = 16;        // must go all the way to bottom of feet.
 var hitH2 = 32 - 2;   // leave some head clearance for grabbing ledges.
-var ropeW = 8;        // center must be within 8px of the rope.
+// var ropeW = 8;        // center must be within 8px of the rope.
 
 var RED = { r:0.47, g:0.094, b:0.075, a:0.15 };
 
-function walkMove(actor, dt, map, movers) {
+export function walkMove(actor, dt, map) {
 
   var jump = keys[32]; // Space.
   var left = keys[65]; // A.
@@ -206,7 +215,7 @@ function walkMove(actor, dt, map, movers) {
       moveY = dt * jumpVelocity;
       turnTo = actor.jumpAnim; // overrides everything.
       actor.jumpHeld = 1;
-      Snd_play(jumpSound);
+      play(jumpSound);
     }
     /* } else if (actor.jumpHeld > 0 && actor.jumpHeld < 10) {
       actor.jumpHeld += 1;
@@ -328,10 +337,10 @@ function walkMove(actor, dt, map, movers) {
       actor.health -= 1;
       actor.lastDmg -= 250;
       actor.color = RED;
-      Snd_play(painSound);
+      play(painSound);
     } else {
       if (actor.lastDmg >= 100) { // stop flashing.
-        actor.color = GL_white;
+        actor.color = white;
       }
       actor.lastDmg += dt;
     }
@@ -340,7 +349,7 @@ function walkMove(actor, dt, map, movers) {
       actor.lastDmg += dt;
       if (actor.lastDmg >= 100) { // stop flashing.
         actor.lastDmg = 250; // reset the timer.
-        actor.color = GL_white;
+        actor.color = white;
       }
     }
   }