littlejsengine 1.12.6 → 1.13.4

package/src/engineExport.js

@@ -14,6 +14,7 @@ export
 	time,
 	timeReal,
 	paused,
+	getPaused,
 	setPaused,
 	engineInit,
 	engineObjectsUpdate,
@@ -49,10 +50,13 @@ export
 
 	// Settings
 	cameraPos,
+	cameraAngle,
 	cameraScale,
+	canvasColorTiles,
 	canvasMaxSize,
 	canvasFixedSize,
 	canvasPixelated,
+	overlayCanvasPixelated,
 	tilesPixelated,
 	fontDefault,
 	showSplashScreen,
@@ -63,13 +67,12 @@ export
 	objectDefaultMass,
 	objectDefaultDamping,
 	objectDefaultAngleDamping,
-	objectDefaultElasticity,
+	objectDefaultRestitution,
 	objectDefaultFriction,
 	objectMaxSpeed,
 	gravity,
 	particleEmitRateScale,
 	glEnable,
-	glOverlay,
 	gamepadsEnable,
 	gamepadDirectionEmulateStick,
 	inputWASDEmulateDirection,
@@ -88,23 +91,25 @@ export
 
 	// Setters for globals
 	setCameraPos,
+	setCameraAngle,
 	setCameraScale,
+	setCanvasColorTiles,
 	setCanvasMaxSize,
 	setCanvasFixedSize,
 	setCanvasPixelated,
+	setOverlayCanvasPixelated,
 	setTilesPixelated,
 	setFontDefault,
 	setShowSplashScreen,
 	setHeadlessMode,
-	setGlEnable,
-	setGlOverlay,
+	setGLEnable,
 	setTileSizeDefault,
 	setTileFixBleedScale,
 	setEnablePhysicsSolver,
 	setObjectDefaultMass,
 	setObjectDefaultDamping,
 	setObjectDefaultAngleDamping,
-	setObjectDefaultElasticity,
+	setObjectDefaultRestitution,
 	setObjectDefaultFriction,
 	setObjectMaxSpeed,
 	setGravity,
@@ -156,7 +161,7 @@ export
 	randInt,
 	randSign,
 	randInCircle,
-	randVector,
+	randVec2,
 	randColor,
 
 	// Utility Classes
@@ -168,10 +173,14 @@ export
 	rgb,
 	hsl,
 	isColor,
+	isVector2,
+	isNumber,
 
 	// Default Colors
 	WHITE,
+	CLEAR_WHITE,
 	BLACK,
+	CLEAR_BLACK,
 	GRAY,
 	RED,
 	ORANGE,
@@ -220,6 +229,7 @@ export
 	glCopyToContext,
 	glCreateProgram,
 	glCreateTexture,
+	glDeleteTexture,
 	glSetTextureData,
 	glDraw,
 	glFlush,
@@ -242,12 +252,15 @@ export
 	keyWasPressed,
 	keyWasReleased,
 	keyDirection,
-	clearInput,
+	inputClear,
+	inputClearKey,
 	mouseIsDown,
 	mouseWasPressed,
 	mouseWasReleased,
 	mousePos,
 	mousePosScreen,
+	mouseDelta,
+	mouseDeltaScreen,
 	mouseWheel,
 	isUsingGamepad,
 	inputPreventDefault,
@@ -260,6 +273,9 @@ export
 	vibrate,
 	vibrateStop,
 	isTouchDevice,
+	pointerLockRequest,
+	pointerLockExit,
+	pointerLockIsActive,
 
 	// Audio
 	Sound,
@@ -279,10 +295,12 @@ export
 
 	// Tiles
 	tileCollisionLayers,
-	getTileCollisionData,
+	tileCollisionGetData,
 	tileCollisionTest,
 	tileCollisionRaycast,
+	tileCollisionLoad,
 	TileLayerData,
+	CanvasLayer,
 	TileLayer,
 	TileCollisionLayer,
 
@@ -295,4 +313,4 @@ export
 	medalsPreventUnlock,
 	medalsInit,
 	Medal,
-};
+};

package/src/engineInput.js

@@ -17,7 +17,8 @@
  *  @memberof Input */
 function keyIsDown(key, device=0)
 { 
-    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
+    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); 
 }
 
@@ -28,7 +29,8 @@ function keyIsDown(key, device=0)
  *  @memberof Input */
 function keyWasPressed(key, device=0)
 { 
-    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
+    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); 
 }
 
@@ -39,7 +41,8 @@ function keyWasPressed(key, device=0)
  *  @memberof Input */
 function keyWasReleased(key, device=0)
 { 
-    ASSERT(device > 0 || typeof key !== 'number' || key < 3, 'use code string for keyboard');
+    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] & 4);
 }
 
@@ -54,7 +57,21 @@ function keyDirection(up='ArrowUp', down='ArrowDown', left='ArrowLeft', right='A
 
 /** Clears all input
  *  @memberof Input */
-function clearInput() { inputData = [[]]; touchGamepadButtons = []; }
+function inputClear() { inputData = [[]]; touchGamepadButtons = []; }
+
+/** Clears an input key state
+ *  @param {string|number} key
+ *  @param {number} [device]
+ *  @param {boolean} [clearDown=true]
+ *  @param {boolean} [clearPressed=true]
+ *  @param {boolean} [clearReleased=true]
+ *  @memberof Input */
+function inputClearKey(key, device=0, clearDown=true, clearPressed=true, clearReleased=true)
+{
+    if (!inputData[device])
+        return;
+    inputData[device][key] &= ~((clearDown?1:0)|(clearPressed?2:0)|(clearReleased?4:0));
+}
 
 /** Returns true if mouse button is down
  *  @function
@@ -87,6 +104,16 @@ let mousePos = vec2();
  *  @memberof Input */
 let mousePosScreen = vec2();
 
+/** Mouse movement delta in world space
+ *  @type {Vector2}
+ *  @memberof Input */
+let mouseDelta = vec2();
+
+/** Mouse movement delta in screen space
+ *  @type {Vector2}
+ *  @memberof Input */
+let mouseDeltaScreen = vec2();
+
 /** Mouse wheel delta this frame
  *  @type {number}
  *  @memberof Input */
@@ -153,10 +180,11 @@ function inputUpdate()
 
     // clear input when lost focus (prevent stuck keys)
     if(!(touchInputEnable && isTouchDevice) && !document.hasFocus())
-        clearInput();
+        inputClear();
 
     // update mouse world space position
     mousePos = screenToWorld(mousePosScreen);
+    mouseDelta = mouseDeltaScreen.multiply(vec2(1,-1)).rotate(-cameraAngle);
 
     // update gamepads if enabled
     gamepadsUpdate();
@@ -171,13 +199,29 @@ function inputUpdatePost()
     for (const i in deviceInputData)
         deviceInputData[i] &= 1;
     mouseWheel = 0;
+    mouseDelta = vec2();
+    mouseDeltaScreen = vec2();
 }
 
 function inputInit()
 {
     if (headlessMode) return;
 
-    onkeydown = (e)=>
+    // add event listeners
+    document.addEventListener('keydown', onKeyDown);
+    document.addEventListener('keyup', onKeyUp);
+    document.addEventListener('mousedown', onMouseDown);
+    document.addEventListener('mouseup', onMouseUp);
+    document.addEventListener('mousemove', onMouseMove);
+    document.addEventListener('wheel', onMouseWheel);
+    document.addEventListener('contextmenu', onContextMenu);
+    document.addEventListener('blur', onBlur);
+
+    // init touch input
+    if (isTouchDevice && touchInputEnable)
+        touchInputInit();
+
+    function onKeyDown(e)
     {
         if (!e.repeat)
         {
@@ -187,45 +231,49 @@ function inputInit()
                 inputData[0][remapKey(e.code)] = 3;
         }
     }
-
-    onkeyup = (e)=>
+    function onKeyUp(e)
     {
-        inputData[0][e.code] = 4;
+        inputData[0][e.code] = (inputData[0][e.code]&2) | 4;
         if (inputWASDEmulateDirection)
             inputData[0][remapKey(e.code)] = 4;
     }
-
-    // handle remapping wasd keys to directions
     function remapKey(c)
     {
-        return inputWASDEmulateDirection ? 
-            c == 'KeyW' ? 'ArrowUp' : 
-            c == 'KeyS' ? 'ArrowDown' : 
-            c == 'KeyA' ? 'ArrowLeft' : 
+        // handle remapping wasd keys to directions
+        return inputWASDEmulateDirection ?
+            c == 'KeyW' ? 'ArrowUp' :
+            c == 'KeyS' ? 'ArrowDown' :
+            c == 'KeyA' ? 'ArrowLeft' :
             c == 'KeyD' ? 'ArrowRight' : c : c;
     }
-    
-    // mouse event handlers
-    onmousedown   = (e)=>
+    function onMouseDown(e)
     {
+        if (isTouchDevice && touchInputEnable)
+            return;
+
         // fix stalled audio requiring user interaction
         if (soundEnable && !headlessMode && audioContext && audioContext.state != 'running')
             audioContext.resume();
         
-        isUsingGamepad = false; 
-        inputData[0][e.button] = 3; 
-        mousePosScreen = mouseEventToScreen(e); 
+        isUsingGamepad = false;
+        inputData[0][e.button] = 3;
+        mousePosScreen = mouseEventToScreen(vec2(e.x,e.y));
         inputPreventDefault && e.button && e.preventDefault();
     }
-    onmouseup     = (e)=> inputData[0][e.button] = inputData[0][e.button] & 2 | 4;
-    onmousemove   = (e)=> mousePosScreen = mouseEventToScreen(e);
-    onwheel       = (e)=> mouseWheel = e.ctrlKey ? 0 : sign(e.deltaY);
-    oncontextmenu = (e)=> false; // prevent right click menu
-    onblur        = (e) => clearInput(); // reset input when focus is lost
-
-    // init touch input
-    if (isTouchDevice && touchInputEnable)
-        touchInputInit();
+    function onMouseUp(e)
+    {
+        if (isTouchDevice && touchInputEnable)
+            return;
+        inputData[0][e.button] = (inputData[0][e.button]&2) | 4;
+    }
+    function onMouseMove(e)
+    {
+        mousePosScreen = mouseEventToScreen(vec2(e.x,e.y));
+        mouseDeltaScreen = mouseDeltaScreen.add(vec2(e.movementX, e.movementY));
+    }
+    function onMouseWheel(e) { mouseWheel = e.ctrlKey ? 0 : sign(e.deltaY); }
+    function onContextMenu(e) { e.preventDefault(); } // prevent right click menu
+    function onBlur() { inputClear(); } // reset input when focus is lost
 }
 
 // convert a mouse or touch event position to screen space
@@ -373,9 +421,6 @@ function touchInputInit()
     document.addEventListener('touchmove',  (e) => handleTouch(e), { passive: false });
     document.addEventListener('touchend',   (e) => handleTouch(e), { passive: false });
 
-    // override mouse events
-    onmousedown = onmouseup = ()=> 0;
-
     // handle all touch events the same way
     let wasTouching;
     function handleTouchDefault(e)
@@ -390,9 +435,16 @@ function touchInputInit()
         if (touching)
         {
             // set event pos and pass it along
-            const p = vec2(e.touches[0].clientX, e.touches[0].clientY);
-            mousePosScreen = mouseEventToScreen(p);
-            wasTouching ? isUsingGamepad = touchGamepadEnable : inputData[0][button] = 3;
+            const pos = vec2(e.touches[0].clientX, e.touches[0].clientY);
+            const lastMousePosScreen = mousePosScreen;
+            mousePosScreen = mouseEventToScreen(pos);
+            if (wasTouching)
+            {
+                mouseDeltaScreen = mouseDeltaScreen.add(mousePosScreen.subtract(lastMousePosScreen));
+                isUsingGamepad = touchGamepadEnable;
+            }
+            else
+                inputData[0][button] = 3;
         }
         else if (wasTouching)
             inputData[0][button] = inputData[0][button] & 2 | 4;
@@ -498,7 +550,7 @@ function touchGamepadRender()
     }
     else // draw cross shaped gamepad
     {
-        for(let i=10; i--;)
+        for (let i=10; i--;)
         {
             const angle = i*PI/4;
             context.arc(leftCenter.x, leftCenter.y,touchGamepadSize*.6, angle + PI/8, angle + PI/8);
@@ -522,4 +574,24 @@ function touchGamepadRender()
 
     // set canvas back to normal
     context.restore();
-}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Pointer Lock
+
+/** Request to lock the pointer, does not work on touch devices
+ *  @memberof Input */
+function pointerLockRequest()
+{
+    if (!isTouchDevice)
+        mainCanvas.requestPointerLock && mainCanvas.requestPointerLock();
+}
+
+/** Request to unlock the pointer
+ *  @memberof Input */
+function pointerLockExit() { document.exitPointerLock && document.exitPointerLock(); }
+
+/** Check if pointer is locked (true if locked)
+ *  @return {boolean}
+ *  @memberof Input */
+function pointerLockIsActive() { return document.pointerLockElement == mainCanvas; }

package/src/engineMedals.js

@@ -142,7 +142,7 @@ class Medal
         context.save();
         context.beginPath();
         context.fillStyle = new Color(.9,.9,.9).toString();
-        context.strokeStyle = new Color(0,0,0).toString();
+        context.strokeStyle = BLACK.toString();
         context.lineWidth = 3;
         context.rect(x, y, width, height);
         context.fill();
@@ -159,11 +159,11 @@ class Medal
         const descriptionSize = height*.3;
         const pos = vec2(x + medalDisplayIconSize + 2*gap.x, y + gap.y*2 + nameSize/2);
         const textWidth = width - medalDisplayIconSize - 3*gap.x;
-        drawTextScreen(this.name, pos, nameSize, new Color(0,0,0), 0, undefined, 'left', undefined, textWidth);
+        drawTextScreen(this.name, pos, nameSize, BLACK, 0, undefined, 'left', undefined, textWidth);
 
         // draw the description
         pos.y = y + height - gap.y*2 - descriptionSize/2;
-        drawTextScreen(this.description, pos, descriptionSize, new Color(0,0,0), 0, undefined, 'left', undefined, textWidth);
+        drawTextScreen(this.description, pos, descriptionSize, BLACK, 0, undefined, 'left', undefined, textWidth);
         context.restore();
     }
 
@@ -177,7 +177,7 @@ class Medal
         if (this.image)
             overlayContext.drawImage(this.image, pos.x-size/2, pos.y-size/2, size, size);
         else
-            drawTextScreen(this.icon, pos, size*.7, new Color(0,0,0));
+            drawTextScreen(this.icon, pos, size*.7, BLACK);
     }
  
     // Get local storage key used by the medal