littlejsengine 1.17.10 → 1.17.11

package/dist/littlejs.js

@@ -33,7 +33,7 @@ const engineName = 'LittleJS';
  *  @type {string}
  *  @default
  *  @memberof Engine */
-const engineVersion = '1.17.10';
+const engineVersion = '1.17.11';
 
 /** Frames per second to update
  *  @type {number}
@@ -396,33 +396,11 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
     workReadContext = workReadCanvas.getContext('2d', { willReadFrequently: true });
 
     // create promises for loading images
-    const promises = imageSources.map((src, textureIndex)=>
-        new Promise(resolve =>
-        {
-            ASSERT(isString(src), 'imageSources must be an array of strings');
-
-            const image = new Image;
-            image.onerror = image.onload = ()=>
-            {
-                const textureInfo = new TextureInfo(image);
-                textureInfos[textureIndex] = textureInfo;
-                resolve();
-            }
-            image.crossOrigin = 'anonymous';
-            image.src = src;
-        })
-    );
+    const promises = imageSources.map((src, i)=> loadTexture(i, src));
 
+    // no images to load
     if (!imageSources.length)
-    {
-        // no images to load
-        promises.push(new Promise(resolve =>
-        {
-            const textureInfo = new TextureInfo(new Image);
-            textureInfos[0] = textureInfo;
-            resolve();
-        }));
-    }
+        promises.push(loadTexture(0));
 
     // load engine font image
     promises.push(fontImageInit());
@@ -649,7 +627,7 @@ function drawEngineLogo(t)
         x.lineWidth = .1+p*3.9;
         x.textAlign = 'center';
         x.textBaseline = 'top';
-        rect(11,Y+2,59,8*p,-1);
+        rect(11,Y+1,59,8*p,-1);
         x.beginPath();
 
         let w2 = 0;
@@ -672,8 +650,8 @@ function drawEngineLogo(t)
     rect(25,15,8,25,-1);  // cab front
     rect(10,40,15,-25,1); // cab back
     rect(14,21,7,9,2);    // cab window
-    rect(38,15,6,6,2);    // little stack
-
+    rect(38,20,6,-6,2);   // little stack
+    
     // big stack
     rect(49,20,10,-6,0);
     const stackPoints = [vec2(44,8),vec2(64,8),vec2(59,8+6*p),vec2(49,8+6*p)];
@@ -681,8 +659,8 @@ function drawEngineLogo(t)
     rect(44,8,20,-7,0);
 
     // engine
-    for (let i=5;i--;) circle(59-i*6,30,10,0,9,1,0);
-    circle(59,30,4,0,9,2); // light
+    for (let i=5;i--;) circle(59-i*6*p,30,10,0,2*PI,1,0);
+    circle(59,30,4,0,7,2); // light
 
     // engine outline
     rect(35,20,24,0);  // top
@@ -693,9 +671,7 @@ function drawEngineLogo(t)
     rect(17,40,43,14,-1); // bottom center
 
     // wheels
-    for (let i=3;i--;)
-    for (let j=2;j--;)
-        circle(15*i+17,47,j?7:1,PI,3*PI,2);
+    for (let i=3;i--;) for (let j=2;j--;) circle(17+15*i,47,j?7:1,0,2*PI,2);
     
     // cowcatcher
     for (let i=2;i--;)
@@ -865,7 +841,7 @@ function debugPoint(pos, color, time, angle, screenSpace=false)
 function debugLine(posA, posB, color, width=.1, time, screenSpace=false)
 {
     ASSERT(isVector2(posA), 'posA must be a vec2');
-    ASSERT(isVector2(posB), 'posB must be sa vec2');
+    ASSERT(isVector2(posB), 'posB must be a vec2');
     ASSERT(isNumber(width), 'width must be a number');
 
     const halfDelta = vec2((posB.x - posA.x)/2, (posB.y - posA.y)/2);
@@ -1693,7 +1669,9 @@ function wave(frequency=1, amplitude=1, t=time, offset=0)
 function isNumber(n) { return typeof n === 'number' && !isNaN(n); }
 
 /**
- * Check if object is a valid string or can be converted to one
+ * Check if object can be converted to a string (has a toString method)
+ * - Returns true for strings, numbers, and most objects
+ * - Returns false for null and undefined
  * @param {any} s
  * @return {boolean}
  * @memberof Math */
@@ -1770,7 +1748,7 @@ function lineTest(posStart, posEnd, testFunction, normal)
                 if (stepX < 0)
                     hitPos.x -= e;
             }
-            if (stepY < 0)
+            else if (stepY < 0)
                 hitPos.y -= e;
 
             // set normal
@@ -2477,7 +2455,7 @@ class Color
  *  @memberof Math */
 const WHITE = debugProtectConstant(rgb());
 
-/** Color - Clear White #757474ff with 0 alpha
+/** Color - Clear White #ffffff00 with 0 alpha
  *  @type {Color}
  *  @memberof Math */
 const CLEAR_WHITE = debugProtectConstant(rgb(1,1,1,0));
@@ -2487,7 +2465,7 @@ const CLEAR_WHITE = debugProtectConstant(rgb(1,1,1,0));
  *  @memberof Math */
 const BLACK = debugProtectConstant(rgb(0,0,0));
 
-/** Color - Clear Black #000000 with 0 alpha
+/** Color - Clear Black #00000000 with 0 alpha
  *  @type {Color}
  *  @memberof Math */
 const CLEAR_BLACK = debugProtectConstant(rgb(0,0,0,0));
@@ -4582,6 +4560,31 @@ function drawTextScreen(text, pos, size, color=WHITE, lineWidth=0, lineColor=BLA
 ///////////////////////////////////////////////////////////////////////////////
 // Drawing utilities
 
+/** Load a texture at a specific index
+ *  @param {number} textureIndex - Index to store the texture at
+ *  @param {string} [src] - Image source path
+ *  @return {Promise} Promise that resolves when texture is loaded
+ *  @memberof Draw */
+async function loadTexture(textureIndex, src)
+{
+    ASSERT(isNumber(textureIndex), 'textureIndex must be a number');
+    ASSERT(!textureInfos[textureIndex], 'textureIndex is already loaded!');
+    ASSERT(!src || isString(src), 'image src must be a string');
+    
+    const image = new Image;
+    if (src)
+    {
+        await new Promise(resolve =>
+        {
+            image.onerror = image.onload = resolve;
+            image.crossOrigin = 'anonymous';
+            image.src = src;
+        });
+    }
+    
+    textureInfos[textureIndex] = new TextureInfo(image);
+}
+
 /** Convert from screen to world space coordinates
  *  @param {Vector2} screenPos
  *  @return {Vector2}
@@ -4962,23 +4965,20 @@ class FontImage
 }
 
 // load engine font, called automatically on startup
-function fontImageInit()
+async function fontImageInit()
 {
-    return new Promise(resolve =>
+    const image = new Image;
+    await new Promise(resolve =>
     {
-        // create the engine font
-        const image = new Image;
-        image.onerror = image.onload = ()=>
-        {
-            const tilePos=vec2(), tileSize=vec2(8), padding=1, bleed=0;
-            const textureInfo = new TextureInfo(image);
-            const tileInfo = new TileInfo(tilePos, tileSize, textureInfo, padding, bleed);
-            engineFontImage = new FontImage(tileInfo);
-            resolve();
-        }
+        image.onerror = image.onload = resolve;
         image.crossOrigin = 'anonymous';
         image.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAAAeAQMAAABnrVXaAAAABlBMVEUAAAD///+l2Z/dAAAAAXRSTlMAQObYZgAAAjpJREFUOMu9kzFu2zAUhn+CAROgqrk+B2l0BWYxMjlXeYaAtFtbdA1sGgHqRQfI0CNkSG5AwYB0BQ8d5Bsomwah6CPVeGg6tEPzAxLwyI+P78cP4u9lNO9OoMKnLMOobG5020/yaj/MrRcCGh1gBbyiLTPJEYaIiom5KM9Jq7KgynMGtb6L4GL4MF2H4LQKCXTvDVw2I4MsgZT7QLExdiutH+D08VOP3INXRrWX1/mmpbkNgAPYRVANb4xpcegYvhiNbIXauQICEjBuYLfMakaakWQeXxiZ0VDtuJCKs3ztMV59QtsHJNcRxDzfdL21ty3PrfIcXTN+E+GFAv6T5nbT9jd50/WFxb5ksdAv49qS6ouymG66ji08UMT6moykYLAo+V0j23GN4m829ZySAD5K7QsBfQTvOG8eE+gTeGYRAmnNAubN3hf5Zv9tJWDHp/VTuaSm7SN4fyINQqaNO3RMVxvpSPXnOChnRNvFcGY0gnwiPswYwTKVPE0zVtX3mTEIOoFzaqLrGuJaV+Uqumb71fVk/VoOH3cdLNQP/FHi8hV0CQNoqBZsUPlLPMsdCJro9QAaQQ0woDy9BJm0eTxCFnO9srcYlhNVlfR2EyTrph1uUtbUtAJifwRgrKuYdXVHeb0YI3QpawohQHkloI3J5FuVwI5ORxC9k2Tuz9Ir1IjgeIPGMHYkAZe2RuYkmWFmt3gGbTPOmBUWVTmRmHtGrfpzG/yuQNOKa6gBB/WA9khitPgl6/GP+gl2Af6tCbvaygAAAABJRU5ErkJggg==';
     });
+    
+    const tilePos=vec2(), tileSize=vec2(8), padding=1, bleed=0;
+    const textureInfo = new TextureInfo(image);
+    const tileInfo = new TileInfo(tilePos, tileSize, textureInfo, padding, bleed);
+    engineFontImage = new FontImage(tileInfo);
 }
 /**
  * LittleJS Input System
@@ -5961,7 +5961,7 @@ class Sound
     
     /** Loads a sound from a URL and decodes it into sample data.
     *  @param {string} filename
-    *  @return {Promise<void>} */
+    *  @return {Promise} */
     async loadSound(filename)
     {
         const response = await fetch(filename);
@@ -6019,7 +6019,7 @@ class Sound
  * // Control the individual instance
  * instance.setVolume(.5);
  * instance.pause();
- * instance.unpause();
+ * instance.resume();
  * instance.stop();
  */
 class SoundInstance
@@ -6133,7 +6133,7 @@ class SoundInstance
         this.startTime = undefined;
     }
 
-    /** Unpauses this sound instance */
+    /** Resume this sound instance */
     resume()
     {
         if (!this.isPaused()) return;
@@ -6147,8 +6147,8 @@ class SoundInstance
      */
     isPlaying() { return !!this.source; }
 
-    /** Check if this instance is paused and was not stopped
-     *  @return {boolean} - True if paused
+    /** Check if this instance is paused or stopped (not currently playing)
+     *  @return {boolean} - True if not playing
      */
     isPaused() { return !this.isPlaying(); }
 
@@ -7074,7 +7074,7 @@ class TileCollisionLayer extends TileLayer
     collisionTest(pos, size=new Vector2, callbackObject)
     {
         ASSERT(isVector2(pos) && isVector2(size), 'pos and size must be Vector2s');
-        ASSERT(!callbackObject || typeof callbackObject === 'function' || callbackObject instanceof EngineObject, 'callbackObject must be a funtion or EngineObject');
+        ASSERT(!callbackObject || typeof callbackObject === 'function' || callbackObject instanceof EngineObject, 'callbackObject must be a function or EngineObject');
 
         // make function to check for collision
         const collisionTest = callbackObject ? typeof callbackObject === 'function' ?
@@ -7111,7 +7111,7 @@ class TileCollisionLayer extends TileLayer
     collisionRaycast(posStart, posEnd, callbackObject, normal)
     {
         ASSERT(isVector2(posStart) && isVector2(posEnd), 'positions must be Vector2s');
-        ASSERT(!callbackObject || typeof callbackObject === 'function' || callbackObject instanceof EngineObject, 'callbackObject must be a funtion or EngineObject');
+        ASSERT(!callbackObject || typeof callbackObject === 'function' || callbackObject instanceof EngineObject, 'callbackObject must be a function or EngineObject');
 
         // make function to check for collision
         const collisionTest = callbackObject ? typeof callbackObject === 'function' ?
@@ -10442,7 +10442,7 @@ class UIScrollbar extends UIObject
         else
         {
             // draw the scrollbar handle
-            const value = isHorizontal ? this.value : 1 - this.value;
+            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));
             const color = this.disabled ? this.disabledColor : this.handleColor;
@@ -10511,12 +10511,11 @@ class UIVideo extends UIObject
     
     /** Play or resume the video
      *  @return {Promise} Promise that resolves when playback starts */
-    play()
+    async play()
     {
         // try to play the video, catch any errors (autoplay may be blocked)
-        const promise = this.video.play();
-        promise?.catch(()=>{});
-        return promise;
+        try { await this.video.play(); }
+        catch(e) {}
     }
     
     /** Pause the video */