littlejsengine 1.17.14 → 1.18.0

package/dist/littlejs.release.js

@@ -35,7 +35,7 @@ const engineName = 'LittleJS';
  *  @type {string}
  *  @default
  *  @memberof Engine */
-const engineVersion = '1.17.14';
+const engineVersion = '1.18.0';
 
 /** Frames per second to update
  *  @type {number}
@@ -1087,15 +1087,17 @@ function lineTest(posStart, posEnd, testFunction, normal)
             // set hit point
             const hitPos = vec2(posStart.x + dirX*t, posStart.y + dirY*t);
 
-            // move inside of tile if on positive edge
+            // ensure result is inside the tile
             const e = 1e-9;
-            if (wasX)
-            {
-                if (stepX < 0)
-                    hitPos.x -= e;
-            }
-            else if (stepY < 0)
-                hitPos.y -= e;
+            const hitPosFloor = hitPos.floor();
+            if (hitPosFloor.x < pos.x)
+                hitPos.x = pos.x;
+            else if (hitPosFloor.x > pos.x)
+                hitPos.x = pos.x + 1 - e;
+            if (hitPosFloor.y < pos.y)
+                hitPos.y = pos.y;
+            else if (hitPosFloor.y > pos.y) 
+                hitPos.y = pos.y + 1 - e;
 
             // set normal
             if (normal)
@@ -2334,6 +2336,12 @@ let touchGamepadSize = 99;
  *  @memberof Settings */
 let touchGamepadAlpha = .3;
 
+/** How long to display the touch gamepad on screen in seconds, set to 0 to always display
+ *  @type {number}
+ *  @default
+ *  @memberof Settings */
+let touchGamepadDisplayTime = 3;
+
 /** Allow vibration hardware if it exists
  *  @type {boolean}
  *  @default
@@ -2608,6 +2616,11 @@ function setTouchGamepadSize(size) { touchGamepadSize = size; }
  *  @memberof Settings */
 function setTouchGamepadAlpha(alpha) { touchGamepadAlpha = alpha; }
 
+/** Set how long to display the touch gamepad on screen in seconds, set to 0 to always display
+ *  @param {number} time
+ *  @memberof Settings */
+function setTouchGamepadDisplayTime(time) { touchGamepadDisplayTime = time; }
+
 /** Set to allow vibration hardware if it exists
  *  @param {boolean} enable
  *  @memberof Settings */
@@ -5079,10 +5092,10 @@ function inputRender()
     function touchGamepadRender()
     {
         if (!touchInputEnable || !isTouchDevice || headlessMode) return;
-        if (!touchGamepadEnable || !touchGamepadTimer.isSet()) return;
+        if (!touchGamepadEnable || !touchGamepadTimer.isSet() && touchGamepadDisplayTime) return;
 
         // fade off when not touching or paused
-        const alpha = percent(touchGamepadTimer.get(), 4, 3);
+        const alpha = touchGamepadDisplayTime ? percent(touchGamepadTimer.get(), touchGamepadDisplayTime+1, touchGamepadDisplayTime) : 1;
         if (!alpha || paused) return;
 
         // setup the canvas
@@ -8653,7 +8666,7 @@ function zzfxM(instruments, patterns, sequence, BPM = 125)
  * - Buttons
  * - Checkboxes
  * - Images
- * - Scrollbars
+ * - Sliders
  * - Video
  * @namespace UISystem
  */
@@ -9850,7 +9863,7 @@ class UICheckbox extends UIObject
         ASSERT(isString(text), 'ui checkbox must be a string');
         ASSERT(isColor(color), 'ui checkbox color must be a color');
 
-        /** @property {boolean} - Current percentage value of this scrollbar 0-1 */
+        /** @property {boolean} - Current percentage value of this slider 0-1 */
         this.checked = checked;
         // set properties
         this.text = text;
@@ -9885,13 +9898,13 @@ class UICheckbox extends UIObject
 
 ///////////////////////////////////////////////////////////////////////////////
 /** 
- * UIScrollbar - A UI object that acts as a scrollbar
+ * UISlider - A UI object that acts as a slider or scrollbar
  * @extends UIObject
  * @memberof UISystem
  */
-class UIScrollbar extends UIObject
+class UISlider extends UIObject
 {
-    /** Create a UIScrollbar object
+    /** Create a UISlider object
      *  @param {Vector2} [pos]
      *  @param {Vector2} [size]
      *  @param {number}  [value]
@@ -9903,14 +9916,14 @@ class UIScrollbar extends UIObject
     {
         super(pos, size);
 
-        ASSERT(isNumber(value), 'ui scrollbar value must be a number');
-        ASSERT(isString(text), 'ui scrollbar must be a string');
-        ASSERT(isColor(color), 'ui scrollbar color must be a color');
-        ASSERT(isColor(handleColor), 'ui scrollbar handleColor must be a color');
+        ASSERT(isNumber(value), 'ui slider value must be a number');
+        ASSERT(isString(text), 'ui slider must be a string');
+        ASSERT(isColor(color), 'ui slider color must be a color');
+        ASSERT(isColor(handleColor), 'ui slider handleColor must be a color');
 
-        /** @property {number} - Current percentage value of this scrollbar 0-1 */
+        /** @property {number} - Current percentage value of this slider 0-1 */
         this.value = value;
-        /** @property {Color} - Color for the handle part of the scrollbar */
+        /** @property {Color} - Color for the handle part of the slider */
         this.handleColor = handleColor.copy();
         /** @property {boolean} - Should it fill up like a progress bar? */
         this.fillMode = false;
@@ -9929,7 +9942,7 @@ class UIScrollbar extends UIObject
         const oldValue = this.value;
         if (this.isActiveObject())
         {
-            // handle horizontal or vertical scrollbar
+            // handle horizontal or vertical slider
             const isHorizontal = this.size.x > this.size.y;
             const handleSize = isHorizontal ? this.size.y : this.size.x;
             const barSize = isHorizontal ? this.size.x : this.size.y;
@@ -9957,7 +9970,7 @@ class UIScrollbar extends UIObject
     {
         super.render();
 
-        // handle horizontal or vertical scrollbar
+        // handle horizontal or vertical slider
         const isHorizontal = this.size.x > this.size.y;
         const barWidth = isHorizontal ? this.size.x : this.size.y;
         const handleWidth = isHorizontal ? this.size.y : this.size.x;
@@ -9975,7 +9988,7 @@ class UIScrollbar extends UIObject
         }
         else
         {
-            // draw the scrollbar handle
+            // draw the slider handle
             const value = clamp(isHorizontal ? this.value : 1 - this.value);
             const p = (barWidth - handleWidth) * (value - .5);
             const pos = this.pos.add(isHorizontal ? vec2(p, 0) : vec2(0, p));
@@ -9984,7 +9997,7 @@ class UIScrollbar extends UIObject
             uiSystem.drawRect(pos, drawSize, color, this.lineWidth, this.lineColor, this.cornerRadius, this.gradientColor);
         }
 
-        // draw the text scaled to fit on the scrollbar
+        // draw the text scaled to fit on the slider
         const textSize = this.getTextSize();
         uiSystem.drawText(this.text, this.pos, textSize, 
             this.textColor, this.textLineWidth, this.textLineColor, this.align, this.font, this.fontStyle, true, this.textShadow);
@@ -10259,7 +10272,7 @@ class Box2dObject extends EngineObject
         // draw non-edge fixtures
         this.getFixtureList().forEach((fixture)=>
         {
-            const shape = box2d.castObjectType(fixture.GetShape());
+            const shape = box2d.castShapeObject(fixture.GetShape());
             if (shape.GetType() !== box2d.instance.b2Shape.e_edge)
             {
                 box2d.drawFixture(fixture, this.pos, this.angle, color, lineColor, lineWidth, useWebGL, context);
@@ -10899,7 +10912,7 @@ class Box2dJoint
     constructor(jointDef)
     {
         /** @property {Object} - The Box2d joint */
-        this.box2dJoint = box2d.castObjectType(box2d.world.CreateJoint(jointDef));
+        this.box2dJoint = box2d.castJointObject(box2d.world.CreateJoint(jointDef));
     }
 
     /** Destroy this joint */
@@ -11184,7 +11197,7 @@ class Box2dRevoluteJoint extends Box2dJoint
 
     /** Enable/disable the joint limit
      *  @param {boolean} [enable] */
-    enableLimit(enable=true) { return this.box2dJoint.enableLimit(enable); }
+    enableLimit(enable=true) { return this.box2dJoint.EnableLimit(enable); }
 
     /** Get the lower joint limit
      *  @return {number} */
@@ -11342,7 +11355,7 @@ class Box2dPrismaticJoint extends Box2dJoint
     
     /** Enable/disable the joint limit
      *  @param {boolean} [enable] */
-    enableLimit(enable=true) { return this.box2dJoint.enableLimit(enable); }
+    enableLimit(enable=true) { return this.box2dJoint.EnableLimit(enable); }
     
     /** Get the lower joint limit
      *  @return {number} */
@@ -11956,7 +11969,7 @@ class Box2dPlugin
      *  @param {CanvasRenderingContext2D} [context] */
     drawFixture(fixture, pos, angle, color=WHITE, lineColor=BLACK, lineWidth=.1, useWebgl, context)
     {
-        const shape = box2d.castObjectType(fixture.GetShape());
+        const shape = box2d.castShapeObject(fixture.GetShape());
         switch (shape.GetType())
         {
             case box2d.instance.b2Shape.e_polygon:
@@ -12014,9 +12027,9 @@ class Box2dPlugin
      *  @param {Object} o */
     isNull(o) { return !box2d.instance.getPointer(o); }
 
-    /** casts a box2d object to its correct type
+    /** casts a box2d object to a shape type
      *  @param {Object} o */
-    castObjectType(o)
+    castShapeObject(o)
     {
         switch (o.GetType())
         {
@@ -12028,6 +12041,17 @@ class Box2dPlugin
                 return box2d.instance.castObject(o, box2d.instance.b2PolygonShape);
             case box2d.instance.b2Shape.e_chain:
                 return box2d.instance.castObject(o, box2d.instance.b2ChainShape);
+        }
+        
+        ASSERT(false, 'Unknown box2d object type');
+    }
+
+    /** casts a box2d object to a joint type
+     *  @param {Object} o */
+    castJointObject(o)
+    {
+        switch (o.GetType())
+        {
             case box2d.instance.e_revoluteJoint:
                 return box2d.instance.castObject(o, box2d.instance.b2RevoluteJoint);
             case box2d.instance.e_prismaticJoint:

package/examples/shorts/base.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html><meta charset=utf-8><body>
-<script src=../../dist/littlejs.js?1.17.14></script>
+<script src=../../dist/littlejs.js?1.18.0></script>
 <script src=../../dist/box2d.wasm.js></script>
 
 <!-- LittleJS Engine Source

package/examples/shorts/music.js

@@ -20,7 +20,7 @@ function gameInit()
     musicPlayer.addChild(infoText);
 
     // volume slider
-    const volumeSlider = new UIScrollbar(vec2(0, -20), vec2(400, 30), 
+    const volumeSlider = new UISlider(vec2(0, -20), vec2(400, 30), 
         musicVolume, 'Music Volume');
     volumeSlider.fillMode = true;
     musicPlayer.addChild(volumeSlider);

package/examples/shorts/musicPlayer.js

@@ -26,7 +26,7 @@ function gameInit()
     musicPlayer.addChild(dropZoneText);
 
     // volume slider
-    const volumeSlider = new UIScrollbar(vec2(0, -20), vec2(400, 30),
+    const volumeSlider = new UISlider(vec2(0, -20), vec2(400, 30),
         musicVolume, 'Music Volume');
     volumeSlider.fillMode = true;
     musicPlayer.addChild(volumeSlider);
@@ -58,8 +58,8 @@ function gameInit()
     stopButton.onClick = ()=>  musicInstance?.stop();
     musicPlayer.addChild(stopButton);
 
-    // progress bar and scrollbar for seeking
-    progressBar = new UIScrollbar(vec2(0, 120), vec2(400, 30), 0);
+    // progress bar and slider for seeking
+    progressBar = new UISlider(vec2(0, 120), vec2(400, 30), 0);
     progressBar.disabledColor = RED;
     progressBar.onChange = ()=> 
     {

package/examples/shorts/sequencer.js

@@ -91,7 +91,7 @@ function gameInit()
     // create tempo slider
     const minTempo = 120, maxTempo = 480;
     const tempoPercent = percent(tempo, minTempo, maxTempo);
-    const tempoSlider = new UIScrollbar(vec2(380,500), vec2(340,40), tempoPercent);
+    const tempoSlider = new UISlider(vec2(380,500), vec2(340,40), tempoPercent);
     tempoSlider.onChange = ()=>
     {
         tempo = lerp(minTempo, maxTempo, tempoSlider.value);

package/examples/shorts/timers.js

@@ -30,7 +30,7 @@ function gameInit()
     }
 
     // create non-interactive slider to display timer
-    timerSlider = new UIScrollbar(vec2(0, 100), vec2(400, 50));
+    timerSlider = new UISlider(vec2(0, 100), vec2(400, 50));
     timerSlider.interactive = false;
     timerSlider.update = ()=>
     {

package/examples/shorts/uiSystem.js

@@ -33,12 +33,12 @@ function gameInit()
     uiMenu.addChild(textInput);
     textInput.onChange = ()=> canvasClearColor = randColor();
 
-    // example scrollbar
-    const scrollbar = new UIScrollbar(vec2(0,90), vec2(400, 50), 
+    // example slider
+    const slider = new UISlider(vec2(0,90), vec2(400, 50), 
         soundVolume, 'Volume');
-    scrollbar.navigationIndex = ++navigationIndex;
-    uiMenu.addChild(scrollbar);
-    scrollbar.onChange = ()=> setSoundVolume(scrollbar.value);
+    slider.navigationIndex = ++navigationIndex;
+    uiMenu.addChild(slider);
+    slider.onChange = ()=> setSoundVolume(slider.value);
 
     // exit button
     const button1 = new UIButton(vec2(0,170), vec2(200, 50), 'Exit Menu');

package/examples/starter/index.html

@@ -7,7 +7,7 @@
 </head><body>
 
 <!-- LittleJS Engine -->
-<script src=../../dist/littlejs.js?1.17.14></script>
+<script src=../../dist/littlejs.js?1.18.0></script>
 
 <!-- LittleJS Engine Source
 <script src=../../src/engine.js></script>
@@ -32,4 +32,4 @@
 -->
 
 <!-- Add your game scripts here -->
-<script src=game.js?1.17.14></script>
+<script src=game.js?1.18.0></script>

package/examples/uiSystem/game.js

@@ -67,12 +67,12 @@ function createUI()
     checkbox.navigationIndex = ++navigationIndex;
     checkbox.text = 'Test Checkbox';
 
-    // example scrollbar
-    const scrollbar = new LJS.UIScrollbar(vec2(0,60), vec2(350, 50));
-    uiMenu.addChild(scrollbar);
-    scrollbar.onChange = ()=> scrollbar.text = scrollbar.value.toFixed(2)
-    scrollbar.onChange();
-    scrollbar.navigationIndex = ++navigationIndex;
+    // example slider
+    const slider = new LJS.UISlider(vec2(0,60), vec2(350, 50));
+    uiMenu.addChild(slider);
+    slider.onChange = ()=> slider.text = slider.value.toFixed(2)
+    slider.onChange();
+    slider.navigationIndex = ++navigationIndex;
 
     // example button
     const button1 = new LJS.UIButton(vec2(0,140), vec2(350, 50), 'Test Button');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "littlejsengine",
-  "version": "1.17.14",
+  "version": "1.18.0",
   "description": "LittleJS - Tiny and Fast HTML5 Game Engine",
   "main": "dist/littlejs.esm.js",
   "types": "dist/littlejs.d.ts",

package/plugins/box2d.js

@@ -119,7 +119,7 @@ class Box2dObject extends EngineObject
         // draw non-edge fixtures
         this.getFixtureList().forEach((fixture)=>
         {
-            const shape = box2d.castObjectType(fixture.GetShape());
+            const shape = box2d.castShapeObject(fixture.GetShape());
             if (shape.GetType() !== box2d.instance.b2Shape.e_edge)
             {
                 box2d.drawFixture(fixture, this.pos, this.angle, color, lineColor, lineWidth, useWebGL, context);
@@ -759,7 +759,7 @@ class Box2dJoint
     constructor(jointDef)
     {
         /** @property {Object} - The Box2d joint */
-        this.box2dJoint = box2d.castObjectType(box2d.world.CreateJoint(jointDef));
+        this.box2dJoint = box2d.castJointObject(box2d.world.CreateJoint(jointDef));
     }
 
     /** Destroy this joint */
@@ -1044,7 +1044,7 @@ class Box2dRevoluteJoint extends Box2dJoint
 
     /** Enable/disable the joint limit
      *  @param {boolean} [enable] */
-    enableLimit(enable=true) { return this.box2dJoint.enableLimit(enable); }
+    enableLimit(enable=true) { return this.box2dJoint.EnableLimit(enable); }
 
     /** Get the lower joint limit
      *  @return {number} */
@@ -1202,7 +1202,7 @@ class Box2dPrismaticJoint extends Box2dJoint
     
     /** Enable/disable the joint limit
      *  @param {boolean} [enable] */
-    enableLimit(enable=true) { return this.box2dJoint.enableLimit(enable); }
+    enableLimit(enable=true) { return this.box2dJoint.EnableLimit(enable); }
     
     /** Get the lower joint limit
      *  @return {number} */
@@ -1816,7 +1816,7 @@ class Box2dPlugin
      *  @param {CanvasRenderingContext2D} [context] */
     drawFixture(fixture, pos, angle, color=WHITE, lineColor=BLACK, lineWidth=.1, useWebgl, context)
     {
-        const shape = box2d.castObjectType(fixture.GetShape());
+        const shape = box2d.castShapeObject(fixture.GetShape());
         switch (shape.GetType())
         {
             case box2d.instance.b2Shape.e_polygon:
@@ -1874,9 +1874,9 @@ class Box2dPlugin
      *  @param {Object} o */
     isNull(o) { return !box2d.instance.getPointer(o); }
 
-    /** casts a box2d object to its correct type
+    /** casts a box2d object to a shape type
      *  @param {Object} o */
-    castObjectType(o)
+    castShapeObject(o)
     {
         switch (o.GetType())
         {
@@ -1888,6 +1888,17 @@ class Box2dPlugin
                 return box2d.instance.castObject(o, box2d.instance.b2PolygonShape);
             case box2d.instance.b2Shape.e_chain:
                 return box2d.instance.castObject(o, box2d.instance.b2ChainShape);
+        }
+        
+        ASSERT(false, 'Unknown box2d object type');
+    }
+
+    /** casts a box2d object to a joint type
+     *  @param {Object} o */
+    castJointObject(o)
+    {
+        switch (o.GetType())
+        {
             case box2d.instance.e_revoluteJoint:
                 return box2d.instance.castObject(o, box2d.instance.b2RevoluteJoint);
             case box2d.instance.e_prismaticJoint:

package/plugins/pluginExport.js

@@ -27,7 +27,7 @@ export
     UITile,
     UIButton,
     UICheckbox,
-    UIScrollbar,
+    UISlider,
     UIVideo,
 
     // Box2D Physics

package/plugins/uiSystem.js

@@ -7,7 +7,7 @@
  * - Buttons
  * - Checkboxes
  * - Images
- * - Scrollbars
+ * - Sliders
  * - Video
  * @namespace UISystem
  */
@@ -1206,7 +1206,7 @@ class UICheckbox extends UIObject
         ASSERT(isString(text), 'ui checkbox must be a string');
         ASSERT(isColor(color), 'ui checkbox color must be a color');
 
-        /** @property {boolean} - Current percentage value of this scrollbar 0-1 */
+        /** @property {boolean} - Current percentage value of this slider 0-1 */
         this.checked = checked;
         // set properties
         this.text = text;
@@ -1241,13 +1241,13 @@ class UICheckbox extends UIObject
 
 ///////////////////////////////////////////////////////////////////////////////
 /** 
- * UIScrollbar - A UI object that acts as a scrollbar
+ * UISlider - A UI object that acts as a slider or scrollbar
  * @extends UIObject
  * @memberof UISystem
  */
-class UIScrollbar extends UIObject
+class UISlider extends UIObject
 {
-    /** Create a UIScrollbar object
+    /** Create a UISlider object
      *  @param {Vector2} [pos]
      *  @param {Vector2} [size]
      *  @param {number}  [value]
@@ -1259,14 +1259,14 @@ class UIScrollbar extends UIObject
     {
         super(pos, size);
 
-        ASSERT(isNumber(value), 'ui scrollbar value must be a number');
-        ASSERT(isString(text), 'ui scrollbar must be a string');
-        ASSERT(isColor(color), 'ui scrollbar color must be a color');
-        ASSERT(isColor(handleColor), 'ui scrollbar handleColor must be a color');
+        ASSERT(isNumber(value), 'ui slider value must be a number');
+        ASSERT(isString(text), 'ui slider must be a string');
+        ASSERT(isColor(color), 'ui slider color must be a color');
+        ASSERT(isColor(handleColor), 'ui slider handleColor must be a color');
 
-        /** @property {number} - Current percentage value of this scrollbar 0-1 */
+        /** @property {number} - Current percentage value of this slider 0-1 */
         this.value = value;
-        /** @property {Color} - Color for the handle part of the scrollbar */
+        /** @property {Color} - Color for the handle part of the slider */
         this.handleColor = handleColor.copy();
         /** @property {boolean} - Should it fill up like a progress bar? */
         this.fillMode = false;
@@ -1285,7 +1285,7 @@ class UIScrollbar extends UIObject
         const oldValue = this.value;
         if (this.isActiveObject())
         {
-            // handle horizontal or vertical scrollbar
+            // handle horizontal or vertical slider
             const isHorizontal = this.size.x > this.size.y;
             const handleSize = isHorizontal ? this.size.y : this.size.x;
             const barSize = isHorizontal ? this.size.x : this.size.y;
@@ -1313,7 +1313,7 @@ class UIScrollbar extends UIObject
     {
         super.render();
 
-        // handle horizontal or vertical scrollbar
+        // handle horizontal or vertical slider
         const isHorizontal = this.size.x > this.size.y;
         const barWidth = isHorizontal ? this.size.x : this.size.y;
         const handleWidth = isHorizontal ? this.size.y : this.size.x;
@@ -1331,7 +1331,7 @@ class UIScrollbar extends UIObject
         }
         else
         {
-            // draw the scrollbar handle
+            // draw the slider handle
             const value = clamp(isHorizontal ? this.value : 1 - this.value);
             const p = (barWidth - handleWidth) * (value - .5);
             const pos = this.pos.add(isHorizontal ? vec2(p, 0) : vec2(0, p));
@@ -1340,7 +1340,7 @@ class UIScrollbar extends UIObject
             uiSystem.drawRect(pos, drawSize, color, this.lineWidth, this.lineColor, this.cornerRadius, this.gradientColor);
         }
 
-        // draw the text scaled to fit on the scrollbar
+        // draw the text scaled to fit on the slider
         const textSize = this.getTextSize();
         uiSystem.drawText(this.text, this.pos, textSize, 
             this.textColor, this.textLineWidth, this.textLineColor, this.align, this.font, this.fontStyle, true, this.textShadow);

package/src/engine.js

@@ -32,7 +32,7 @@ const engineName = 'LittleJS';
  *  @type {string}
  *  @default
  *  @memberof Engine */
-const engineVersion = '1.17.14';
+const engineVersion = '1.18.0';
 
 /** Frames per second to update
  *  @type {number}

package/src/engineDebug.js

@@ -276,8 +276,6 @@ function debugUpdate()
         debugOverlay = !debugOverlay;
     if (debugOverlay)
     {
-        if (keyWasPressed('Digit0'))
-            debugWatermark = !debugWatermark;
         if (keyWasPressed('Digit1'))
             debugPhysics = !debugPhysics, debugParticles = false;
         if (keyWasPressed('Digit2'))
@@ -565,7 +563,7 @@ function debugRenderPost()
         return;
     }
 
-    if (!debugWatermark) return;
+    if (!debugWatermark && !debugOverlay) return;
     
     // update fps display
     mainContext.textAlign = 'right';

package/src/engineExport.js

@@ -83,6 +83,7 @@ export
     touchGamepadAnalog,
     touchGamepadSize,
     touchGamepadAlpha,
+    touchGamepadDisplayTime,
     vibrateEnable,
     soundEnable,
     soundVolume,

package/src/engineInput.js

@@ -727,10 +727,10 @@ function inputRender()
     function touchGamepadRender()
     {
         if (!touchInputEnable || !isTouchDevice || headlessMode) return;
-        if (!touchGamepadEnable || !touchGamepadTimer.isSet()) return;
+        if (!touchGamepadEnable || !touchGamepadTimer.isSet() && touchGamepadDisplayTime) return;
 
         // fade off when not touching or paused
-        const alpha = percent(touchGamepadTimer.get(), 4, 3);
+        const alpha = touchGamepadDisplayTime ? percent(touchGamepadTimer.get(), touchGamepadDisplayTime+1, touchGamepadDisplayTime) : 1;
         if (!alpha || paused) return;
 
         // setup the canvas

package/src/engineMath.js

@@ -360,15 +360,17 @@ function lineTest(posStart, posEnd, testFunction, normal)
             // set hit point
             const hitPos = vec2(posStart.x + dirX*t, posStart.y + dirY*t);
 
-            // move inside of tile if on positive edge
+            // ensure result is inside the tile
             const e = 1e-9;
-            if (wasX)
-            {
-                if (stepX < 0)
-                    hitPos.x -= e;
-            }
-            else if (stepY < 0)
-                hitPos.y -= e;
+            const hitPosFloor = hitPos.floor();
+            if (hitPosFloor.x < pos.x)
+                hitPos.x = pos.x;
+            else if (hitPosFloor.x > pos.x)
+                hitPos.x = pos.x + 1 - e;
+            if (hitPosFloor.y < pos.y)
+                hitPos.y = pos.y;
+            else if (hitPosFloor.y > pos.y) 
+                hitPos.y = pos.y + 1 - e;
 
             // set normal
             if (normal)

package/src/engineSettings.js

@@ -260,6 +260,12 @@ let touchGamepadSize = 99;
  *  @memberof Settings */
 let touchGamepadAlpha = .3;
 
+/** How long to display the touch gamepad on screen in seconds, set to 0 to always display
+ *  @type {number}
+ *  @default
+ *  @memberof Settings */
+let touchGamepadDisplayTime = 3;
+
 /** Allow vibration hardware if it exists
  *  @type {boolean}
  *  @default
@@ -534,6 +540,11 @@ function setTouchGamepadSize(size) { touchGamepadSize = size; }
  *  @memberof Settings */
 function setTouchGamepadAlpha(alpha) { touchGamepadAlpha = alpha; }
 
+/** Set how long to display the touch gamepad on screen in seconds, set to 0 to always display
+ *  @param {number} time
+ *  @memberof Settings */
+function setTouchGamepadDisplayTime(time) { touchGamepadDisplayTime = time; }
+
 /** Set to allow vibration hardware if it exists
  *  @param {boolean} enable
  *  @memberof Settings */