littlejsengine 1.13.4 → 1.14.2

package/src/engineInput.js

@@ -1,4 +1,4 @@
-/** 
+/**
  * LittleJS Input System
  * - Tracks keyboard down, pressed, and released
  * - Tracks mouse buttons, position, and wheel
@@ -16,10 +16,10 @@
  *  @return {boolean}
  *  @memberof Input */
 function keyIsDown(key, device=0)
-{ 
+{
     ASSERT(key !== undefined, 'key is undefined');
-    ASSERT(device > 0 || typeof key != 'number' || key < 3, 'use code string for keyboard');
-    return inputData[device] && !!(inputData[device][key] & 1); 
+    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
+    return inputData[device] && !!(inputData[device][key] & 1);
 }
 
 /** Returns true if device key was pressed this frame
@@ -28,10 +28,10 @@ function keyIsDown(key, device=0)
  *  @return {boolean}
  *  @memberof Input */
 function keyWasPressed(key, device=0)
-{ 
+{
     ASSERT(key !== undefined, 'key is undefined');
-    ASSERT(device > 0 || typeof key != 'number' || key < 3, 'use code string for keyboard');
-    return inputData[device] && !!(inputData[device][key] & 2); 
+    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
+    return inputData[device] && !!(inputData[device][key] & 2);
 }
 
 /** Returns true if device key was released this frame
@@ -40,9 +40,9 @@ function keyWasPressed(key, device=0)
  *  @return {boolean}
  *  @memberof Input */
 function keyWasReleased(key, device=0)
-{ 
+{
     ASSERT(key !== undefined, 'key is undefined');
-    ASSERT(device > 0 || typeof key != 'number' || key < 3, 'use code string for keyboard');
+    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
     return inputData[device] && !!(inputData[device][key] & 4);
 }
 
@@ -164,7 +164,7 @@ function gamepadWasReleased(button, gamepad=0)
  *  @param {number} [gamepad]
  *  @return {Vector2}
  *  @memberof Input */
-function gamepadStick(stick,  gamepad=0)
+function gamepadStick(stick, gamepad=0)
 { return gamepadStickData[gamepad] ? gamepadStickData[gamepad][stick] || vec2() : vec2(); }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -241,10 +241,10 @@ function inputInit()
     {
         // handle remapping wasd keys to directions
         return inputWASDEmulateDirection ?
-            c == 'KeyW' ? 'ArrowUp' :
-            c == 'KeyS' ? 'ArrowDown' :
-            c == 'KeyA' ? 'ArrowLeft' :
-            c == 'KeyD' ? 'ArrowRight' : c : c;
+            c === 'KeyW' ? 'ArrowUp' :
+            c === 'KeyS' ? 'ArrowDown' :
+            c === 'KeyA' ? 'ArrowLeft' :
+            c === 'KeyD' ? 'ArrowRight' : c : c;
     }
     function onMouseDown(e)
     {
@@ -252,9 +252,9 @@ function inputInit()
             return;
 
         // fix stalled audio requiring user interaction
-        if (soundEnable && !headlessMode && audioContext && audioContext.state != 'running')
+        if (soundEnable && !headlessMode && audioContext && !audioIsRunning())
             audioContext.resume();
-        
+
         isUsingGamepad = false;
         inputData[0][e.button] = 3;
         mousePosScreen = mouseEventToScreen(vec2(e.x,e.y));
@@ -297,8 +297,8 @@ function gamepadsUpdate()
     const applyDeadZones = (v)=>
     {
         const min=.3, max=.8;
-        const deadZone = (v)=> 
-            v >  min ?  percent( v, min, max) : 
+        const deadZone = (v)=>
+            v > min ? percent(v, min, max) :
             v < -min ? -percent(-v, min, max) : 0;
         return vec2(deadZone(v.x), deadZone(-v.y)).clampLength();
     }
@@ -306,30 +306,29 @@ function gamepadsUpdate()
     // update touch gamepad if enabled
     if (touchGamepadEnable && isTouchDevice)
     {
-        ASSERT(touchGamepadButtons, 'set touchGamepadEnable before calling init!');
-        if (touchGamepadTimer.isSet())
+        if (!touchGamepadTimer.isSet())
+            return;
+
+        // read virtual analog stick
+        const sticks = gamepadStickData[0] || (gamepadStickData[0] = []);
+        sticks[0] = vec2();
+        if (touchGamepadAnalog)
+            sticks[0] = applyDeadZones(touchGamepadStick);
+        else if (touchGamepadStick.lengthSquared() > .3)
         {
-            // read virtual analog stick
-            const sticks = gamepadStickData[0] || (gamepadStickData[0] = []);
-            sticks[0] = vec2();
-            if (touchGamepadAnalog)
-                sticks[0] = applyDeadZones(touchGamepadStick);
-            else if (touchGamepadStick.lengthSquared() > .3)
-            {
-                // convert to 8 way dpad
-                sticks[0].x = Math.round(touchGamepadStick.x);
-                sticks[0].y = -Math.round(touchGamepadStick.y);
-                sticks[0] = sticks[0].clampLength();
-            }
+            // convert to 8 way dpad
+            sticks[0].x = Math.round(touchGamepadStick.x);
+            sticks[0].y = -Math.round(touchGamepadStick.y);
+            sticks[0] = sticks[0].clampLength();
+        }
 
-            // read virtual gamepad buttons
-            const data = inputData[1] || (inputData[1] = []);
-            for (let i=10; i--;)
-            {
-                const j = i == 3 ? 2 : i == 2 ? 3 : i; // fix button locations
-                const wasDown = gamepadIsDown(j,0);
-                data[j] = touchGamepadButtons[i] ? wasDown ? 1 : 3 : wasDown ? 4 : 0;
-            }
+        // read virtual gamepad buttons
+        const data = inputData[1] || (inputData[1] = []);
+        for (let i=10; i--;)
+        {
+            const j = i === 3 ? 2 : i === 2 ? 3 : i; // fix button locations
+            const wasDown = gamepadIsDown(j,0);
+            data[j] = touchGamepadButtons[i] ? wasDown ? 1 : 3 : wasDown ? 4 : 0;
         }
     }
 
@@ -355,7 +354,7 @@ function gamepadsUpdate()
             // read analog sticks
             for (let j = 0; j < gamepad.axes.length-1; j+=2)
                 sticks[j>>1] = applyDeadZones(vec2(gamepad.axes[j],gamepad.axes[j+1]));
-            
+
             // read buttons
             for (let j = gamepad.buttons.length; j--;)
             {
@@ -371,14 +370,14 @@ function gamepadsUpdate()
             {
                 // copy dpad to left analog stick when pressed
                 const dpad = vec2(
-                    (gamepadIsDown(15,i)&&1) - (gamepadIsDown(14,i)&&1), 
+                    (gamepadIsDown(15,i)&&1) - (gamepadIsDown(14,i)&&1),
                     (gamepadIsDown(12,i)&&1) - (gamepadIsDown(13,i)&&1));
                 if (dpad.lengthSquared())
                     sticks[0] = dpad.clampLength();
             }
 
             // disable touch gamepad if using real gamepad
-            touchGamepadEnable && isUsingGamepad && touchGamepadTimer.unset(); 
+            touchGamepadEnable && isUsingGamepad && touchGamepadTimer.unset();
         }
     }
 }
@@ -403,20 +402,13 @@ function vibrateStop() { vibrate(0); }
 const isTouchDevice = !headlessMode && window.ontouchstart !== undefined;
 
 // touch gamepad internal variables
-let touchGamepadTimer = new Timer, touchGamepadButtons, touchGamepadStick;
+let touchGamepadTimer = new Timer, touchGamepadButtons = [], touchGamepadStick = vec2();
 
 // enable touch input mouse passthrough
 function touchInputInit()
 {
     // add non passive touch event listeners
     let handleTouch = handleTouchDefault;
-    if (touchGamepadEnable)
-    {
-        // touch input internal variables
-        handleTouch = handleTouchGamepad;
-        touchGamepadButtons = [];
-        touchGamepadStick = vec2();
-    }
     document.addEventListener('touchstart', (e) => handleTouch(e), { passive: false });
     document.addEventListener('touchmove',  (e) => handleTouch(e), { passive: false });
     document.addEventListener('touchend',   (e) => handleTouch(e), { passive: false });
@@ -425,8 +417,15 @@ function touchInputInit()
     let wasTouching;
     function handleTouchDefault(e)
     {
+        if (!touchInputEnable)
+            return;
+
+        // route touch to gamepad
+        if (touchGamepadEnable)
+            handleTouchGamepad(e);
+
         // fix stalled audio requiring user interaction
-        if (soundEnable && !headlessMode && audioContext && audioContext.state != 'running')
+        if (soundEnable && !headlessMode && audioContext && !audioIsRunning())
             audioContext.resume();
 
         // check if touching and pass to mouse events
@@ -455,7 +454,7 @@ function touchInputInit()
         // prevent default handling like copy and magnifier lens
         if (inputPreventDefault && document.hasFocus()) // allow document to get focus
             e.preventDefault();
-        
+
         // must return true so the document will get focus
         return true;
     }
@@ -467,7 +466,7 @@ function touchInputInit()
         touchGamepadStick = vec2();
         touchGamepadButtons = [];
         isUsingGamepad = true;
-            
+
         const touching = e.touches.length;
         if (touching)
         {
@@ -476,9 +475,6 @@ function touchInputInit()
             {
                 // touch anywhere to press start when paused
                 touchGamepadButtons[9] = 1;
-
-                // call default touch handler so normal touch events still work
-                handleTouchDefault(e);
                 return;
             }
         }
@@ -509,12 +505,6 @@ function touchInputInit()
                 touchGamepadButtons[9] = 1;
             }
         }
-
-        // call default touch handler so normal touch events still work
-        handleTouchDefault(e);
-        
-        // must return true so the document will get focus
-        return true;
     }
 }
 
@@ -524,7 +514,7 @@ function touchGamepadRender()
     if (!touchInputEnable || !isTouchDevice || headlessMode) return;
     if (!touchGamepadEnable || !touchGamepadTimer.isSet())
         return;
-    
+
     // fade off when not touching or paused
     const alpha = percent(touchGamepadTimer.get(), 4, 3);
     if (!alpha || paused)
@@ -555,11 +545,11 @@ function touchGamepadRender()
             const angle = i*PI/4;
             context.arc(leftCenter.x, leftCenter.y,touchGamepadSize*.6, angle + PI/8, angle + PI/8);
             i%2 && context.arc(leftCenter.x, leftCenter.y, touchGamepadSize*.33, angle, angle);
-            i==1 && context.fill();
+            i===1 && context.fill();
         }
         context.stroke();
     }
-    
+
     // draw right face buttons
     const rightCenter = vec2(mainCanvasSize.x-touchGamepadSize, mainCanvasSize.y-touchGamepadSize);
     for (let i=4; i--;)
@@ -594,4 +584,4 @@ function pointerLockExit() { document.exitPointerLock && document.exitPointerLoc
 /** Check if pointer is locked (true if locked)
  *  @return {boolean}
  *  @memberof Input */
-function pointerLockIsActive() { return document.pointerLockElement == mainCanvas; }
+function pointerLockIsActive() { return document.pointerLockElement === mainCanvas; }

package/src/engineMedals.js

@@ -1,4 +1,4 @@
-/** 
+/**
  * LittleJS Medal System
  * - Tracks and displays medals
  * - Saves medals to local storage
@@ -21,7 +21,7 @@ let medalsDisplayQueue = [], medalsSaveName, medalsDisplayTimeLast;
 /** Initialize medals with a save name used for storage
  *  - Call this after creating all medals
  *  - Checks if medals are unlocked
- *  @param {String} saveName
+ *  @param {string} saveName
  *  @memberof Medals */
 function medalsInit(saveName)
 {
@@ -36,7 +36,7 @@ function medalsInit(saveName)
     {
         if (!medalsDisplayQueue.length)
             return;
-        
+
         // update first medal in queue
         const medal = medalsDisplayQueue[0];
         const time = timeReal - medalsDisplayTimeLast;
@@ -51,7 +51,7 @@ function medalsInit(saveName)
         {
             // slide on/off medals
             const slideOffTime = medalDisplayTime - medalDisplaySlideTime;
-            const hidePercent = 
+            const hidePercent =
                 time < medalDisplaySlideTime ? 1 - time / medalDisplaySlideTime :
                 time > slideOffTime ? (time - slideOffTime) / medalDisplaySlideTime : 0;
             medal.render(hidePercent);
@@ -67,43 +67,43 @@ function medalsForEach(callback)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/** 
- * Medal - Tracks an unlockable medal 
+/**
+ * Medal - Tracks an unlockable medal
  * @example
  * // create a medal
  * const medal_example = new Medal(0, 'Example Medal', 'More info about the medal goes here.', '🎖️');
- * 
+ *
  * // initialize medals
  * medalsInit('Example Game');
- * 
+ *
  * // unlock the medal
  * medal_example.unlock();
  */
 class Medal
 {
     /** Create a medal object and adds it to the list of medals
-     *  @param {Number} id            - The unique identifier of the medal
-     *  @param {String} name          - Name of the medal
-     *  @param {String} [description] - Description of the medal
-     *  @param {String} [icon]        - Icon for the medal
-     *  @param {String} [src]         - Image location for the medal
+     *  @param {number} id            - The unique identifier of the medal
+     *  @param {string} name          - Name of the medal
+     *  @param {string} [description] - Description of the medal
+     *  @param {string} [icon]        - Icon for the medal
+     *  @param {string} [src]         - Image location for the medal
      */
     constructor(id, name, description='', icon='🏆', src)
     {
         ASSERT(id >= 0 && !medals[id]);
-        
-        /** @property {Number} - The unique identifier of the medal */
+
+        /** @property {number} - The unique identifier of the medal */
         this.id = id;
-        
-        /** @property {String} - Name of the medal */
+
+        /** @property {string} - Name of the medal */
         this.name = name;
-        
-        /** @property {String} - Description of the medal */
+
+        /** @property {string} - Description of the medal */
         this.description = description;
-        
-        /** @property {String} - Icon for the medal */
+
+        /** @property {string} - Icon for the medal */
         this.icon = icon;
-        
+
         /** @property {boolean} - Is the medal unlocked? */
         this.unlocked = false;
 
@@ -128,7 +128,7 @@ class Medal
     }
 
     /** Render a medal
-     *  @param {Number} [hidePercent] - How much to slide the medal off screen
+     *  @param {number} [hidePercent] - How much to slide the medal off screen
      */
     render(hidePercent=0)
     {
@@ -169,7 +169,7 @@ class Medal
 
     /** Render the icon for a medal
      *  @param {Vector2} pos - Screen space position
-     *  @param {Number} size - Screen space size
+     *  @param {number} size - Screen space size
      */
     renderIcon(pos, size)
     {
@@ -179,7 +179,7 @@ class Medal
         else
             drawTextScreen(this.icon, pos, size*.7, BLACK);
     }
- 
+
     // Get local storage key used by the medal
     storageKey() { return medalsSaveName + '_' + this.id; }
 }

package/src/engineObject.js

@@ -1,10 +1,10 @@
-/** 
+/**
  * LittleJS Object System
  */
 
 'use strict';
 
-/** 
+/**
  * LittleJS Object Base Object Class
  * - Top level object class used by the engine
  * - Automatically adds self to object list
@@ -27,7 +27,7 @@
  * @example
  * // create an engine object, normally you would first extend the class with your own
  * const pos = vec2(2,3);
- * const object = new EngineObject(pos); 
+ * const object = new EngineObject(pos);
  */
 class EngineObject
 {
@@ -45,9 +45,9 @@ class EngineObject
         ASSERT(isVector2(pos) && pos.isValid(), 'object pos should be a vec2');
         ASSERT(isVector2(size) && size.isValid(), 'object size should be a vec2');
         ASSERT(!tileInfo || tileInfo instanceof TileInfo, 'object tileInfo should be a TileInfo or undefined');
-        ASSERT(typeof angle == 'number' && isFinite(angle), 'object angle should be a number');
+        ASSERT(typeof angle === 'number' && isFinite(angle), 'object angle should be a number');
         ASSERT(isColor(color) && color.isValid(), 'object color should be a valid rgba color');
-        ASSERT(typeof renderOrder == 'number', 'object renderOrder should be a number');
+        ASSERT(typeof renderOrder === 'number', 'object renderOrder should be a number');
 
         /** @property {Vector2} - World space position of the object */
         this.pos = pos.copy();
@@ -115,7 +115,7 @@ class EngineObject
         // add to list of objects
         engineObjects.push(this);
     }
-    
+
     /** Update the object transform, called automatically by engine even when paused */
     updateTransforms()
     {
@@ -184,7 +184,7 @@ class EngineObject
             for (const o of engineObjectsCollide)
             {
                 // non solid objects don't collide with each other
-                if (!this.isSolid && !o.isSolid || o.destroyed || o.parent || o == this)
+                if (!this.isSolid && !o.isSolid || o.destroyed || o.parent || o === this)
                     continue;
 
                 // check collision
@@ -207,7 +207,7 @@ class EngineObject
                     this.velocity = this.velocity.add(velocity);
                     if (o.mass) // push away if not fixed
                         o.velocity = o.velocity.subtract(velocity);
-                        
+
                     debugPhysics && debugOverlap(this.pos, this.size, o.pos, o.size, '#f00');
                     continue;
                 }
@@ -218,7 +218,7 @@ class EngineObject
                 const isBlockedX = abs(oldPos.y - o.pos.y)*2 < sizeBoth.y;
                 const isBlockedY = abs(oldPos.x - o.pos.x)*2 < sizeBoth.x;
                 const restitution = max(this.restitution, o.restitution);
-                
+
                 if (smallStepUp || isBlockedY || !isBlockedX) // resolve y collision
                 {
                     // push outside object collision
@@ -306,7 +306,7 @@ class EngineObject
                         {
                             // move to previous position
                             this.pos.y = oldPos.y;
-                            this.groundObject = undefined; 
+                            this.groundObject = undefined;
                         }
                     }
                     if (blockedLayerX)
@@ -320,20 +320,20 @@ class EngineObject
             }
         }
     }
-       
+
     /** Render the object, draws a tile by default, automatically called each frame, sorted by renderOrder */
     render()
     {
         // default object render
         drawTile(this.pos, this.drawSize || this.size, this.tileInfo, this.color, this.angle, this.mirror, this.additiveColor);
     }
-    
+
     /** Destroy this object, destroy its children, detach it's parent, and mark it for removal */
     destroy()
-    { 
+    {
         if (this.destroyed)
             return;
-        
+
         // disconnect from parent and destroy children
         this.destroyed = 1;
         this.parent && this.parent.removeChild(this);
@@ -359,7 +359,7 @@ class EngineObject
     /** Convert from world space to local space for a vector (rotation only)
      *  @param {Vector2} vec - world space vector */
     worldToLocalVector(vec) { return vec.rotate(-this.angle); }
-    
+
     /** Called to check if a tile collision should be resolved
      *  @param {number}  tileData - the value of the tile at the position
      *  @param {Vector2} pos      - tile where the collision occurred
@@ -378,16 +378,19 @@ class EngineObject
 
     /** Apply acceleration to this object (adjust velocity, not affected by mass)
      *  @param {Vector2} acceleration */
-    applyAcceleration(acceleration) { if (this.mass) this.velocity = this.velocity.add(acceleration); }
+    applyAcceleration(acceleration)
+    { if (this.mass) this.velocity = this.velocity.add(acceleration); }
 
-    /** Apply angular acceleration to this object 
+    /** Apply angular acceleration to this object
      *  @param {number} acceleration */
-    applyAngularAcceleration(acceleration) { if (this.mass) this.angleVelocity += acceleration; }
+    applyAngularAcceleration(acceleration)
+    { if (this.mass) this.angleVelocity += acceleration; }
 
     /** Apply force to this object (adjust velocity, affected by mass)
      *  @param {Vector2} force */
-    applyForce(force) { this.applyAcceleration(force.scale(1/this.mass)); }
-    
+    applyForce(force)
+    { if (this.mass) this.applyAcceleration(force.scale(1/this.mass)); }
+
     /** Get the direction of the mirror
      *  @return {number} -1 if this.mirror is true, or 1 if not mirrored */
     getMirrorSign() { return this.mirror ? -1 : 1; }
@@ -409,7 +412,7 @@ class EngineObject
      *  @param {EngineObject} child */
     removeChild(child)
     {
-        ASSERT(child.parent == this && this.children.includes(child));
+        ASSERT(child.parent === this && this.children.includes(child));
         this.children.splice(this.children.indexOf(child), 1);
         child.parent = 0;
     }
@@ -455,7 +458,7 @@ class EngineObject
     {
         if (!debug)
             return;
-        
+
         // show object info for debugging
         const size = vec2(max(this.size.x, .2), max(this.size.y, .2));
         const color = rgb(this.collideTiles?1:0, this.collideSolidObjects?1:0, this.isSolid?1:0, .5);