littlejsengine 1.14.5 → 1.14.7

package/plugins/uiSystem.js

@@ -49,6 +49,8 @@ class UISystemPlugin
         this.defaultLineWidth = 4;
         /** @property {number} - Default rounded rect corner radius for UI elements */
         this.defaultCornerRadius = 0;
+        /** @property {number} - Default scale to use for fitting text to object */
+        this.defaultTextScale = .8;
         /** @property {string} - Default font for UI elements */
         this.defaultFont = 'arial';
         /** @property {Sound} - Default sound when interactive UI element is pressed */
@@ -65,6 +67,7 @@ class UISystemPlugin
         engineAddPlugin(uiUpdate, uiRender);
 
         // setup recursive update and render
+        // update in reverse order to detect mouse enter/leave
         function uiUpdate()
         {
             function updateInvisibleObject(o)
@@ -89,7 +92,11 @@ class UISystemPlugin
                 else
                     updateInvisibleObject(o);
             }
-            uiSystem.uiObjects.forEach(o=> o.parent || updateObject(o));
+            for (let i = uiSystem.uiObjects.length; i--;)
+            {
+                const o = uiSystem.uiObjects[i];
+                o.parent || updateObject(o)
+            }
         }
         function uiRender()
         {
@@ -168,10 +175,11 @@ class UISystemPlugin
     *  @param {number}  [lineWidth=uiSystem.defaultLineWidth]
     *  @param {Color}   [lineColor=uiSystem.defaultLineColor]
     *  @param {string}  [align]
-    *  @param {string}  [font=uiSystem.defaultFont] */
-    drawText(text, pos, size, color=uiSystem.defaultColor, lineWidth=uiSystem.defaultLineWidth, lineColor=uiSystem.defaultLineColor, align='center', font=uiSystem.defaultFont)
+    *  @param {string}  [font=uiSystem.defaultFont]
+    *  @param {boolean} [applyMaxWidth=true] */
+    drawText(text, pos, size, color=uiSystem.defaultColor, lineWidth=uiSystem.defaultLineWidth, lineColor=uiSystem.defaultLineColor, align='center', font=uiSystem.defaultFont, applyMaxWidth=true)
     {
-        drawTextScreen(text, pos, size.y, color, lineWidth, lineColor, align, font, size.x, uiSystem.uiContext);
+        drawTextScreen(text, pos, size.y, color, lineWidth, lineColor, align, font, applyMaxWidth ? size.x : undefined, uiSystem.uiContext);
     }
 }
 
@@ -213,8 +221,12 @@ class UIObject
         this.cornerRadius = uiSystem.defaultCornerRadius;
         /** @property {string} - Font for this objecct */
         this.font = uiSystem.defaultFont;
+        /** @property {number} - Override for text width */
+        this.textWidth = undefined;
         /** @property {number} - Override for text height */
         this.textHeight = undefined;
+        /** @property {number} - Scale text to fit in the object */
+        this.textScale = uiSystem.defaultTextScale;
         /** @property {boolean} - Should this object be drawn */
         this.visible  = true;
         /** @property {Array<UIObject>} - A list of this object's children */
@@ -324,6 +336,16 @@ class UIObject
         this.mouseIsOver = this.mouseIsHeld = false;
     }
 
+    /** Get the size for text with overrides and scale
+     *  @return {Vector2}
+     */
+    getTextSize()
+    {
+        return vec2(
+            this.textWidth  || this.textScale * this.size.x, 
+            this.textHeight || this.textScale * this.size.y);
+    }
+
     /** Called when the mouse enters the object */
     onEnter() {}
 
@@ -371,7 +393,7 @@ class UIText extends UIObject
     }
     render()
     {
-        const textSize = vec2(this.size.x, this.textHeight || this.size.y);
+        const textSize = this.getTextSize();
         uiSystem.drawText(this.text, this.pos, textSize, this.textColor, this.lineWidth, this.lineColor, this.align, this.font);
     }
 }
@@ -439,9 +461,8 @@ class UIButton extends UIObject
         const color = this.disabled ? this.disabledColor : this.mouseIsOver ? this.hoverColor : this.color;
         uiSystem.drawRect(this.pos, this.size, color, this.lineWidth, lineColor, this.cornerRadius);
         
-        // draw the text
-        const textScale = .8; // scale text to fit
-        const textSize = vec2(this.size.x, this.textHeight || this.size.y*textScale);
+        // draw the text scaled to fit
+        const textSize = this.getTextSize();
         uiSystem.drawText(this.text, this.pos, textSize, 
             this.textColor, 0, undefined, this.align, this.font);
     }
@@ -490,13 +511,11 @@ class UICheckbox extends UIObject
             uiSystem.drawLine(this.pos.add(s.multiply(vec2(-1,1))), this.pos.add(s.multiply(vec2(1,-1))), this.lineWidth, this.lineColor);
         }
         
-        // draw the text to the right side of the checkbox
-        const textScale = .8; // scale text to fit
-        const gapScale = .55;
-        const textSize = vec2(this.size.x, this.textHeight || this.size.y*textScale);
-        const pos = this.pos.add(vec2(this.size.x*gapScale,0));
+        // draw the text next to the checkbox
+        const textSize = this.getTextSize();
+        const pos = this.pos.add(vec2(this.size.x,0));
         uiSystem.drawText(this.text, pos, textSize, 
-            this.textColor, 0, undefined, 'left', this.font);
+            this.textColor, 0, undefined, 'left', this.font, false);
     }
 }
 
@@ -563,9 +582,8 @@ class UIScrollbar extends UIObject
             this.interactive && this.mouseIsHeld ? this.color : this.handleColor;
         uiSystem.drawRect(handlePos, handleSize, handleColor, this.lineWidth, this.lineColor, this.cornerRadius);
 
-        // draw the text on the scrollbar
-        const textScale = .8; // scale text to fit in scrollbar
-        const textSize = vec2(this.size.x, this.textHeight || this.size.y*textScale);
+        // draw the text scaled to fit on the scrollbar
+        const textSize = this.getTextSize();
         uiSystem.drawText(this.text, this.pos, textSize, 
             this.textColor, 0, undefined, this.align, this.font);
     }

package/src/engine.js

@@ -30,7 +30,7 @@ const engineName = 'LittleJS';
  *  @type {string}
  *  @default
  *  @memberof Engine */
-const engineVersion = '1.14.5';
+const engineVersion = '1.14.7';
 
 /** Frames per second to update
  *  @type {number}
@@ -169,15 +169,15 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
         frameTimeBufferMS += paused ? 0 : frameTimeDeltaMS;
         if (!debugSpeedUp)
             frameTimeBufferMS = min(frameTimeBufferMS, 50); // clamp min framerate
-        if (debugVideoCaptureIsActive())
-            frameTimeBufferMS = 0; // no time smoothing when capturing video
-        updateCanvas();
 
         if (paused)
         {
+            updateCanvas();
+
             // update object transforms even when paused
             for (const o of engineObjects)
                 o.parent || o.updateTransforms();
+
             inputUpdate();
             pluginUpdateList.forEach(f=>f());
             debugUpdate();
@@ -202,6 +202,7 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
                 time = frame++ / frameRate;
 
                 // update game and objects
+                updateCanvas();
                 inputUpdate();
                 gameUpdate();
                 pluginUpdateList.forEach(f=>f());
@@ -211,14 +212,23 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
                 debugUpdate();
                 gameUpdatePost();
                 inputUpdatePost();
+
+                if (debugVideoCaptureIsActive())
+                    renderFrame();
             }
 
             // add the time smoothing back in
             frameTimeBufferMS += deltaSmooth;
         }
 
-        if (!headlessMode)
+        if (!debugVideoCaptureIsActive())
+            renderFrame();
+        requestAnimationFrame(engineUpdate);
+
+        function renderFrame()
         {
+            if (headlessMode) return;
+
             // render sort then render while removing destroyed objects
             enginePreRender();
             gameRender();
@@ -248,7 +258,6 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
             }
             drawCount = 0;
         }
-        requestAnimationFrame(engineUpdate);
     }
 
     function updateCanvas()
@@ -274,6 +283,14 @@ async function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, game
             mainCanvas.height = min(innerHeight, canvasMaxSize.y);
         }
 
+        // apply the clear color to main canvas
+        if (canvasClearColor.a > 0)
+        {
+            mainContext.fillStyle = canvasClearColor.toString();
+            mainContext.fillRect(0, 0, mainCanvasSize.x, mainCanvasSize.y);
+            mainContext.fillStyle = BLACK.toString();
+        }
+
         // clear overlay canvas and set size
         overlayCanvas.width  = mainCanvas.width;
         overlayCanvas.height = mainCanvas.height;

package/src/engineDebug.js

@@ -524,7 +524,7 @@ function debugVideoCaptureStart()
     const chunks = [];
     debugVideoCaptureTrack = stream.getVideoTracks()[0];
     if (debugVideoCaptureTrack.applyConstraints)
-        debugVideoCaptureTrack.applyConstraints({frameRate:frameRate}); // force 60 fps
+        debugVideoCaptureTrack.applyConstraints({frameRate:60}); // force 60 fps
     debugVideoCapture = new MediaRecorder(stream, {mimeType:'video/webm;codecs=vp8'});
     debugVideoCapture.ondataavailable = (e)=> chunks.push(e.data);
     debugVideoCapture.onstop = ()=>

package/src/engineDraw.js

@@ -136,8 +136,9 @@ class TileInfo
      *  @param {Vector2} [size=tileSizeDefault] - Size of tile in pixels
      *  @param {number}  [textureIndex]         - Texture index to use
      *  @param {number}  [padding]              - How many pixels padding around tiles
+     *  @param {number}  [bleedScale]           - How many pixels smaller to draw tiles
      */
-    constructor(pos=vec2(), size=tileSizeDefault, textureIndex=0, padding=0)
+    constructor(pos=vec2(), size=tileSizeDefault, textureIndex=0, padding=0, bleedScale=tileFixBleedScale)
     {
         /** @property {Vector2} - Top left corner of tile in pixels */
         this.pos = pos.copy();
@@ -149,6 +150,8 @@ class TileInfo
         this.padding = padding;
         /** @property {TextureInfo} - The texture info for this tile */
         this.textureInfo = textureInfos[this.textureIndex];
+        /** @property {float} - Shrinks tile by this many pixels to prevent neighbors bleeding */
+        this.bleedScale = bleedScale;
     }
 
     /** Returns a copy of this tile offset by a vector
@@ -156,7 +159,7 @@ class TileInfo
     *  @return {TileInfo}
     */
     offset(offset)
-    { return new TileInfo(this.pos.add(offset), this.size, this.textureIndex); }
+    { return new TileInfo(this.pos.add(offset), this.size, this.textureIndex, this.padding, this.bleedScale); }
 
     /** Returns a copy of this tile offset by a number of animation frames
     *  @param {number} frame - Offset to apply in animation frames
@@ -179,6 +182,8 @@ class TileInfo
         this.pos = new Vector2;
         this.size = new Vector2(image.width, image.height);
         this.textureInfo = new TextureInfo(image, glTexture);
+        // do not use padding or bleed
+        this.bleedScale = this.padding = 0;
         return this;
     }
 }
@@ -236,6 +241,7 @@ function drawTile(pos, size=new Vector2(1), tileInfo, color=WHITE,
     ASSERT(!context || !useWebGL, 'context only supported in canvas 2D mode');
 
     const textureInfo = tileInfo && tileInfo.textureInfo;
+    const bleedScale = tileInfo ? tileInfo.bleedScale : 0;
     if (useWebGL)
     {
         if (screenSpace)
@@ -253,10 +259,10 @@ function drawTile(pos, size=new Vector2(1), tileInfo, color=WHITE,
             const w = tileInfo.size.x * sizeInverse.x;
             const h = tileInfo.size.y * sizeInverse.y;
             glSetTexture(textureInfo.glTexture);
-            if (tileFixBleedScale)
+            if (bleedScale)
             {
-                const tileImageFixBleedX = sizeInverse.x*tileFixBleedScale;
-                const tileImageFixBleedY = sizeInverse.y*tileFixBleedScale;
+                const tileImageFixBleedX = sizeInverse.x*bleedScale;
+                const tileImageFixBleedY = sizeInverse.y*bleedScale;
                 glDraw(pos.x, pos.y, mirror ? -size.x : size.x, size.y, angle,
                     x + tileImageFixBleedX,     y + tileImageFixBleedY,
                     x - tileImageFixBleedX + w, y - tileImageFixBleedY + h,
@@ -287,7 +293,7 @@ function drawTile(pos, size=new Vector2(1), tileInfo, color=WHITE,
                 // calculate uvs and render
                 const x = tileInfo.pos.x,  y = tileInfo.pos.y;
                 const w = tileInfo.size.x, h = tileInfo.size.y;
-                drawImageColor(context, textureInfo.image, x, y, w, h, -.5, -.5, 1, 1, color, additiveColor);
+                drawImageColor(context, textureInfo.image, x, y, w, h, -.5, -.5, 1, 1, color, additiveColor, bleedScale);
             }
             else
             {
@@ -775,15 +781,16 @@ function combineCanvases()
     *  @param {number} dHeight
     *  @param {Color} color
     *  @param {Color} [additiveColor]
+    *  @param {number} [bleedScale] - How much to shrink the source, used to fix bleeding
  *  @memberof Draw */
-function drawImageColor(context, image, sx, sy, sWidth, sHeight, dx, dy, dWidth, dHeight, color, additiveColor)
+function drawImageColor(context, image, sx, sy, sWidth, sHeight, dx, dy, dWidth, dHeight, color, additiveColor, bleedScale=0)
 {
     function isWhite(c) { return c.r >= 1 && c.g >= 1 && c.b >= 1; }
     function isBlack(c) { return c.r <= 0 && c.g <= 0 && c.b <= 0 && c.a <= 0; }
-    const sx2 = tileFixBleedScale;
-    const sy2 = tileFixBleedScale;
-    const sWidth2  = sWidth  - 2*tileFixBleedScale;
-    const sHeight2 = sHeight - 2*tileFixBleedScale;
+    const sx2 = bleedScale;
+    const sy2 = bleedScale;
+    const sWidth2  = sWidth  - 2*bleedScale;
+    const sHeight2 = sHeight - 2*bleedScale;
     if (!canvasColorTiles || (additiveColor ? isWhite(color.add(additiveColor)) && additiveColor.a <= 0 : isWhite(color)))
     {
         // white texture with no additive alpha, no need to tint

package/src/engineExport.js

@@ -53,6 +53,7 @@ export
 	cameraAngle,
 	cameraScale,
 	canvasColorTiles,
+	canvasClearColor,
 	canvasMaxSize,
 	canvasFixedSize,
 	canvasPixelated,
@@ -94,6 +95,7 @@ export
 	setCameraAngle,
 	setCameraScale,
 	setCanvasColorTiles,
+	setCanvasClearColor,
 	setCanvasMaxSize,
 	setCanvasFixedSize,
 	setCanvasPixelated,
@@ -192,8 +194,6 @@ export
 	MAGENTA,
 
 	// Draw
-	textureInfos,
-	drawCount,
 	tile,
 	TileInfo,
 	TextureInfo,
@@ -204,6 +204,8 @@ export
 	overlayCanvas,
 	overlayContext,
 	mainCanvasSize,
+	textureInfos,
+	drawCount,
 	screenToWorld,
 	worldToScreen,
 	drawTile,

package/src/engineSettings.js

@@ -37,6 +37,11 @@ let cameraScale = 32;
  *  @memberof Settings */
 let canvasColorTiles = true;
 
+/** Color to clear the canvas to before render
+ *  @type {Color}
+ *  @memberof Draw */
+let canvasClearColor = CLEAR_BLACK;
+
 /** The max size of the canvas, centered if window is larger
  *  @type {Vector2}
  *  @default Vector2(1920,1080)
@@ -315,6 +320,11 @@ function setCameraScale(scale) { cameraScale = scale; }
  *  @memberof Settings */
 function setCanvasColorTiles(colorTiles) { canvasColorTiles = colorTiles; }
 
+/** Set color to clear the canvas to before render
+ *  @param {Color} color
+ *  @memberof Settings */
+function setCanvasClearColor(color) { canvasClearColor = color; }
+
 /** Set max size of the canvas
  *  @param {Vector2} size
  *  @memberof Settings */

package/src/engineUtilities.js

@@ -985,6 +985,10 @@ class Timer
      * @return {number} */
     getPercent() { return this.isSet()? 1-percent(this.time - time, 0, this.setTime) : 0; }
 
+    /** Get the time this timer was set to, returns 0 if not set
+     * @return {number} */
+    getSetTime() { return this.isSet() ? this.setTime : 0; }
+
     /** Returns this timer expressed as a string
      * @return {string} */
     toString() { if (debug) { return this.isSet() ? Math.abs(this.get()) + ' seconds ' + (this.get()<0 ? 'before' : 'after' ) : 'unset'; }}

package/src/engineWebGL.js

@@ -260,7 +260,8 @@ function glSetTexture(texture, wrap=false)
         return;
 
     glFlush();
-    glContext.bindTexture(glContext.TEXTURE_2D, glActiveTexture = texture);
+    glActiveTexture = texture;
+    glContext.bindTexture(glContext.TEXTURE_2D, glActiveTexture);
 
     // set wrap mode
     const wrapMode = wrap ? glContext.REPEAT : glContext.CLAMP_TO_EDGE;
@@ -310,6 +311,7 @@ function glCreateProgram(vsSource, fsSource)
 }
 
 /** Create WebGL texture from an image and init the texture settings
+ *  Restores the active texture when done
  *  @param {HTMLImageElement|HTMLCanvasElement|OffscreenCanvas} [image]
  *  @return {WebGLTexture}
  *  @memberof WebGL */
@@ -319,30 +321,29 @@ function glCreateTexture(image)
 
     // build the texture
     const texture = glContext.createTexture();
-    glContext.bindTexture(glContext.TEXTURE_2D, texture);
+    let mipMap = false;
     if (image && image.width)
     {
         glSetTextureData(texture, image);
-        if (!tilesPixelated && isPowerOfTwo(image.width) && isPowerOfTwo(image.height))
-        {
-            // use mipmap filtering
-            glContext.generateMipmap(glContext.TEXTURE_2D);
-            glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MIN_FILTER, glContext.LINEAR_MIPMAP_LINEAR);
-            glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MAG_FILTER, glContext.LINEAR);
-            return texture;
-        }
+        glContext.bindTexture(glContext.TEXTURE_2D, texture);
+        mipMap = !tilesPixelated && isPowerOfTwo(image.width) && isPowerOfTwo(image.height);
     }
     else
     {
         // create a white texture
         const whitePixel = new Uint8Array([255, 255, 255, 255]);
+        glContext.bindTexture(glContext.TEXTURE_2D, texture);
         glContext.texImage2D(glContext.TEXTURE_2D, 0, glContext.RGBA, 1, 1, 0, glContext.RGBA, glContext.UNSIGNED_BYTE, whitePixel);
     }
 
     // set texture filtering
-    const filter = tilesPixelated ? glContext.NEAREST : glContext.LINEAR;
-    glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MIN_FILTER, filter);
-    glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MAG_FILTER, filter);
+    const magFilter = tilesPixelated ? glContext.NEAREST : glContext.LINEAR;
+    const minFilter = mipMap ? glContext.LINEAR_MIPMAP_LINEAR : magFilter;
+    glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MAG_FILTER, magFilter);
+    glContext.texParameteri(glContext.TEXTURE_2D, glContext.TEXTURE_MIN_FILTER, minFilter);
+    if (mipMap)
+        glContext.generateMipmap(glContext.TEXTURE_2D);
+    glContext.bindTexture(glContext.TEXTURE_2D, glActiveTexture); // rebind active texture
     return texture;
 }
 
@@ -355,7 +356,7 @@ function glDeleteTexture(texture)
     glContext.deleteTexture(texture);
 }
 
-/** Set WebGL texture data from an image
+/** Set WebGL texture data from an image, restores the active texture when done
  *  @param {WebGLTexture} texture
  *  @param {HTMLImageElement|HTMLCanvasElement|OffscreenCanvas} image
  *  @memberof WebGL */
@@ -367,6 +368,7 @@ function glSetTextureData(texture, image)
     ASSERT(!!image && image.width > 0, 'Invalid image data.');
     glContext.bindTexture(glContext.TEXTURE_2D, texture);
     glContext.texImage2D(glContext.TEXTURE_2D, 0, glContext.RGBA, glContext.RGBA, glContext.UNSIGNED_BYTE, image);
+    glContext.bindTexture(glContext.TEXTURE_2D, glActiveTexture); // rebind active texture
 }
 
 /** Draw all sprites and clear out the buffer, called automatically by the system whenever necessary
@@ -512,7 +514,7 @@ function glDrawPoints(points, rgba)
   
     // setup triangle strip with degenerate verts at start and end
     let offset = glBatchCount * gl_INDICES_PER_POLY_VERTEX;
-    for(let i = vertCount; i--;)
+    for (let i = vertCount; i--;)
     {
         const j = clamp(i-1, 0, vertCount-3);
         const point = points[j];
@@ -540,7 +542,7 @@ function glDrawColoredPoints(points, pointColors)
   
     // setup triangle strip with degenerate verts at start and end
     let offset = glBatchCount * gl_INDICES_PER_POLY_VERTEX;
-    for(let i = vertCount; i--;)
+    for (let i = vertCount; i--;)
     {
         const j = clamp(i-1, 0, vertCount-3);
         const point = points[j];