littlejsengine 1.17.14 → 1.18.0

package/dist/littlejs.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}
@@ -961,8 +961,6 @@ function debugUpdate()
         debugOverlay = !debugOverlay;
     if (debugOverlay)
     {
-        if (keyWasPressed('Digit0'))
-            debugWatermark = !debugWatermark;
         if (keyWasPressed('Digit1'))
             debugPhysics = !debugPhysics, debugParticles = false;
         if (keyWasPressed('Digit2'))
@@ -1250,7 +1248,7 @@ function debugRenderPost()
         return;
     }
 
-    if (!debugWatermark) return;
+    if (!debugWatermark && !debugOverlay) return;
     
     // update fps display
     mainContext.textAlign = 'right';
@@ -1767,15 +1765,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)
@@ -3014,6 +3014,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
@@ -3288,6 +3294,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 */
@@ -5759,10 +5770,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
@@ -9333,7 +9344,7 @@ function zzfxM(instruments, patterns, sequence, BPM = 125)
  * - Buttons
  * - Checkboxes
  * - Images
- * - Scrollbars
+ * - Sliders
  * - Video
  * @namespace UISystem
  */
@@ -10530,7 +10541,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;
@@ -10565,13 +10576,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]
@@ -10583,14 +10594,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;
@@ -10609,7 +10620,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;
@@ -10637,7 +10648,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;
@@ -10655,7 +10666,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));
@@ -10664,7 +10675,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);
@@ -10939,7 +10950,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);
@@ -11579,7 +11590,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 */
@@ -11864,7 +11875,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} */
@@ -12022,7 +12033,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} */
@@ -12636,7 +12647,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:
@@ -12694,9 +12705,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())
         {
@@ -12708,6 +12719,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: