littlejsengine 1.3.5 → 1.4.0

package/engine/engine.all.release.js

@@ -8,9 +8,9 @@
 
 'use strict';
 
+let showWatermark = 0;
+let godMode = 0;
 const debug = 0;
-const showWatermark = 0;
-const godMode = 0;
 const debugOverlay = 0;
 const debugPhysics = 0;
 const debugParticles = 0;
@@ -355,6 +355,28 @@ class Vector2
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/** 
+ * Create a color object with RGBA values
+ * @param {Number} [r=1]
+ * @param {Number} [g=1]
+ * @param {Number} [b=1]
+ * @param {Number} [a=1]
+ * @return {Color}
+ * @memberof Utilities
+ */
+const colorRGBA = (r, g, b, a)=> new Color(r, g, b, a);
+
+/** 
+ * Create a color object with HSLA values
+ * @param {Number} [h=0]
+ * @param {Number} [s=0]
+ * @param {Number} [l=1]
+ * @param {Number} [a=1]
+ * @return {Color}
+ * @memberof Utilities
+ */
+const colorHSLA = (h, s, l, a)=> new Color().setHSLA(h, s, l, a);
+
 /** 
  * Color object (red, green, blue, alpha) with some helpful functions
  * @example
@@ -442,6 +464,34 @@ class Color
         return this;
     }
 
+    /** Returns this color expressed in hsla format
+     * @return {Array} */
+    getHSLA()
+    {
+        const r = this.r;
+        const g = this.g;
+        const b = this.b;
+        const a = this.a;
+        const max = Math.max(r, g, b);
+        const min = Math.min(r, g, b);
+        const l = (max + min) / 2;
+        
+        let h = 0, s = 0;
+        if (max != min)
+        {
+            let d = max - min;
+            s = l > .5 ? d / (2 - max - min) : d / (max + min);
+            if (r == max)
+                h = (g - b) / d + (g < b ? 6 : 0);
+            else if (g == max)
+                h = (b - r) / d + 2;
+            else if (b == max)
+                h =  (r - g) / d + 4;
+        }
+
+        return [h / 6, s, l, a];
+    }
+
     /** Returns a new color that has each component randomly adjusted
      * @param {Number} [amount=.05]
      * @param {Number} [alphaAmount=0]
@@ -473,42 +523,6 @@ class Color
         return (this.r*255|0) + (this.g*255<<8) + (this.b*255<<16) + (this.a*255<<24); 
     }
 
-    /** Returns this color expressed as a hex code
-     * @return {String} */
-    hex()
-    {
-        const toHex = (c)=> ((c=c*255|0)<16 ? '0' : '') + c.toString(16);
-        return '#' + toHex(this.r) + toHex(this.g) + toHex(this.b);
-    }
-
-    /** Returns this color expressed in hsla format
-     * @return {Array} */
-    getHSLA()
-    {
-        const r = this.r;
-        const g = this.g;
-        const b = this.b;
-        const a = this.a;
-        const max = Math.max(r, g, b);
-        const min = Math.min(r, g, b);
-        const l = (max + min) / 2;
-        
-        let h = 0, s = 0;
-        if (max != min)
-        {
-            let d = max - min;
-            s = l > .5 ? d / (2 - max - min) : d / (max + min);
-            if (r == max)
-                h = (g - b) / d + (g < b ? 6 : 0);
-            else if (g == max)
-                h = (b - r) / d + 2;
-            else if (b == max)
-                h =  (r - g) / d + 4;
-        }
-
-        return [h / 6, s, l, a];
-    }
-
     /** Set this color from a hex code
      * @param {String} hex - html hex code
      * @return {Color} */
@@ -522,6 +536,14 @@ class Color
         ASSERT(this.r>=0 && this.r<=1 && this.g>=0 && this.g<=1 && this.b>=0 && this.b<=1);
         return this;
     }
+
+    /** Returns this color expressed as a hex code
+     * @return {String} */
+    getHex()
+    {
+        const toHex = (c)=> ((c=c*255|0)<16 ? '0' : '') + c.toString(16);
+        return '#' + toHex(this.r) + toHex(this.g) + toHex(this.b);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -571,6 +593,10 @@ class Timer
     /** Returns this timer expressed as a string
      * @return {String} */
     toString() { if (debug) { return this.unset() ? 'unset' : Math.abs(this.get()) + ' seconds ' + (this.get()<0 ? 'before' : 'after' ); } }
+    
+    /** Get how long since elapsed, returns 0 if not set (returns negative if currently active)
+     * @return {Number} */
+    valueOf()               { return this.get(); }
 }
 /**
  * LittleJS Engine Settings
@@ -588,7 +614,8 @@ class Timer
  *  @memberof Settings */
 let canvasMaxSize = vec2(1920, 1200);
 
-/** Fixed size of the canvas, if enabled cavnvas size never changes
+/** Fixed size of the canvas, if enabled canvas size never changes
+ * - you may also need to set mainCanvasSize if using screen space coords in startup
  *  @type {Vector2} 
  *  @default
  *  @memberof Settings */
@@ -818,7 +845,7 @@ let medalDisplayIconSize = 50;
 const engineName = 'LittleJS';
 
 /** Version of engine */
-const engineVersion = '1.3.5';
+const engineVersion = '1.4.0';
 
 /** Frames per second to update objects
  *  @default */
@@ -909,6 +936,33 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
         timeReal += frameTimeDeltaMS / 1e3;
         frameTimeBufferMS = min(frameTimeBufferMS + !paused * frameTimeDeltaMS, 50); // clamp incase of slow framerate
 
+        if (canvasFixedSize.x)
+        {
+            // clear set fixed size
+            overlayCanvas.width  = mainCanvas.width  = canvasFixedSize.x;
+            overlayCanvas.height = mainCanvas.height = canvasFixedSize.y;
+            
+            // fit to window by adding space on top or bottom if necessary
+            const aspect = innerWidth / innerHeight;
+            const fixedAspect = mainCanvas.width / mainCanvas.height;
+            mainCanvas.style.width  = overlayCanvas.style.width  = aspect < fixedAspect ? '100%' : '';
+            mainCanvas.style.height = overlayCanvas.style.height = aspect < fixedAspect ? '' : '100%';
+            if (glCanvas)
+            {
+                glCanvas.style.width  = mainCanvas.style.width;
+                glCanvas.style.height = mainCanvas.style.height;
+            }
+        }
+        else
+        {
+            // clear and set size to same as window
+             overlayCanvas.width  = mainCanvas.width  = min(innerWidth,  canvasMaxSize.x);
+             overlayCanvas.height = mainCanvas.height = min(innerHeight, canvasMaxSize.y);
+        }
+        
+        // save canvas size
+        mainCanvasSize = vec2(mainCanvas.width, mainCanvas.height);
+
         if (paused)
         {
             // do post update even when paused
@@ -945,30 +999,6 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
             // add the time smoothing back in
             frameTimeBufferMS += deltaSmooth;
         }
-
-        if (canvasFixedSize.x)
-        {
-            // clear set fixed size
-            mainCanvas.width  = canvasFixedSize.x;
-            mainCanvas.height = canvasFixedSize.y;
-            
-            // fit to window by adding space on top or bottom if necessary
-            const aspect = innerWidth / innerHeight;
-            const fixedAspect = mainCanvas.width / mainCanvas.height;
-            mainCanvas.style.width  = overlayCanvas.style.width  = aspect < fixedAspect ? '100%' : '';
-            mainCanvas.style.height = overlayCanvas.style.height = aspect < fixedAspect ? '' : '100%';
-            if (glCanvas)
-            {
-                glCanvas.style.width  = mainCanvas.style.width;
-                glCanvas.style.height = mainCanvas.style.height;
-            }
-        }
-        else
-        {
-            // clear and set size to same as window
-            mainCanvas.width  = min(innerWidth,  canvasMaxSize.x);
-            mainCanvas.height = min(innerHeight, canvasMaxSize.y);
-        }
         
         // render sort then render while removing destroyed objects
         enginePreRender();
@@ -1008,8 +1038,8 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
 // called by engine to setup render system
 function enginePreRender()
 {
-    // save canvas size and clear canvases
-    mainCanvasSize = vec2(overlayCanvas.width = mainCanvas.width, overlayCanvas.height = mainCanvas.height);
+    // save canvas size
+    mainCanvasSize = vec2(mainCanvas.width, mainCanvas.height);
 
     // disable smoothing for pixel art
     mainContext.imageSmoothingEnabled = !cavasPixelated;
@@ -1507,18 +1537,26 @@ let overlayContext;
 let mainCanvasSize = vec2();
 
 /** Convert from screen to world space coordinates
+ *  - if calling outside of render, you may need to manually set mainCanvasSize
  *  @param {Vector2} screenPos
  *  @return {Vector2}
  *  @memberof Draw */
 const screenToWorld = (screenPos)=>
-    screenPos.add(vec2(.5)).subtract(mainCanvasSize.scale(.5)).multiply(vec2(1/cameraScale,-1/cameraScale)).add(cameraPos);
+{
+    ASSERT(mainCanvasSize.x && mainCanvasSize.y, 'mainCanvasSize is invalid');
+    return screenPos.add(vec2(.5)).subtract(mainCanvasSize.scale(.5)).multiply(vec2(1/cameraScale,-1/cameraScale)).add(cameraPos);
+}
 
 /** Convert from world to screen space coordinates
+ *  - if calling outside of render, you may need to manually set mainCanvasSize
  *  @param {Vector2} worldPos
  *  @return {Vector2}
  *  @memberof Draw */
 const worldToScreen = (worldPos)=>
-    worldPos.subtract(cameraPos).multiply(vec2(cameraScale,-cameraScale)).add(mainCanvasSize.scale(.5)).subtract(vec2(.5));
+{
+    ASSERT(mainCanvasSize.x && mainCanvasSize.y, 'mainCanvasSize is invalid');
+    return worldPos.subtract(cameraPos).multiply(vec2(cameraScale,-cameraScale)).add(mainCanvasSize.scale(.5)).subtract(vec2(.5));
+}
 
 /** Draw textured tile centered in world space, with color applied if using WebGL
  *  @param {Vector2} pos                                - Center of the tile in world space
@@ -1633,7 +1671,7 @@ function drawLine(posA, posB, thickness=.1, color, useWebGL)
 {
     const halfDelta = vec2((posB.x - posA.x)/2, (posB.y - posA.y)/2);
     const size = vec2(thickness, halfDelta.length()*2);
-    drawRect(posA.add(halfDelta), size, color, halfDelta.angle(), 0, 0, useWebGL);
+    drawRect(posA.add(halfDelta), size, color, halfDelta.angle(), useWebGL);
 }
 
 /** Draw directly to a 2d canvas context in world space
@@ -1650,7 +1688,7 @@ function drawCanvas2D(pos, size, angle, mirror, drawFunction, context = mainCont
     pos = worldToScreen(pos);
     size = size.scale(cameraScale);
     context.save();
-    context.translate(pos.x+.5|0, pos.y-.5|0);
+    context.translate(pos.x+.5|0, pos.y+.5|0);
     context.rotate(angle);
     context.scale(mirror ? -size.x : size.x, size.y);
     drawFunction(context);
@@ -1770,7 +1808,7 @@ class FontImage
         const size = this.tileSize;
         const drawSize = size.add(this.paddingSize).scale(scale);
         const cols = this.image.width / this.tileSize.x |0;
-        text.split('\n').forEach((line, i)=>
+        (text+'').split('\n').forEach((line, i)=>
         {
             const centerOffset = center ? line.length * size.x * scale / 2 |0 : 0;
             for(let j=line.length; j--;)
@@ -1996,7 +2034,7 @@ const mouseToScreen = (mousePos)=>
         return vec2(); // fix bug that can occur if user clicks before page loads
 
     const rect = mainCanvas.getBoundingClientRect();
-    return mainCanvasSize.multiply(
+    return vec2(mainCanvas.width, mainCanvas.height).multiply(
         vec2(percent(mousePos.x, rect.left, rect.right), percent(mousePos.y, rect.top, rect.bottom)));
 }
 
@@ -2196,7 +2234,7 @@ function touchGamepadRender()
         return;
     
     // fade off when not touching or paused
-    const alpha = percent(touchGamepadTimer.get(), 4, 3);
+    const alpha = percent(touchGamepadTimer, 4, 3);
     if (!alpha || paused)
         return;
 
@@ -3042,7 +3080,7 @@ constructor(pos, size=tileCollisionSize, tileSize=tileSizeDefault, scale=vec2(1)
                 const cols = tileImage.width/tileSize.x;
                 context.globalAlpha = color.a; // only alpha, no color, is supported in this mode
                 context.drawImage(tileImage, 
-                    (tileIndex%cols)*tileSize.x, (tileIndex/cols|0)*tileSize.x, 
+                    (tileIndex%cols)*tileSize.x, (tileIndex/cols|0)*tileSize.y, 
                     tileSize.x, tileSize.y, -.5, -.5, 1, 1);
             }
         });
@@ -3887,7 +3925,7 @@ function glFlush()
  *  @memberof WebGL */
 function glCopyToContext(context, forceDraw)
 {
-    if ((!glEnable || !glBatchCount) && !forceDraw) return;
+    if (!glEnable || !glBatchCount && !forceDraw) return;
     
     glFlush();
     

package/engine/engine.js

@@ -22,7 +22,7 @@
 const engineName = 'LittleJS';
 
 /** Version of engine */
-const engineVersion = '1.3.5';
+const engineVersion = '1.4.0';
 
 /** Frames per second to update objects
  *  @default */
@@ -113,6 +113,33 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
         timeReal += frameTimeDeltaMS / 1e3;
         frameTimeBufferMS = min(frameTimeBufferMS + !paused * frameTimeDeltaMS, 50); // clamp incase of slow framerate
 
+        if (canvasFixedSize.x)
+        {
+            // clear set fixed size
+            overlayCanvas.width  = mainCanvas.width  = canvasFixedSize.x;
+            overlayCanvas.height = mainCanvas.height = canvasFixedSize.y;
+            
+            // fit to window by adding space on top or bottom if necessary
+            const aspect = innerWidth / innerHeight;
+            const fixedAspect = mainCanvas.width / mainCanvas.height;
+            mainCanvas.style.width  = overlayCanvas.style.width  = aspect < fixedAspect ? '100%' : '';
+            mainCanvas.style.height = overlayCanvas.style.height = aspect < fixedAspect ? '' : '100%';
+            if (glCanvas)
+            {
+                glCanvas.style.width  = mainCanvas.style.width;
+                glCanvas.style.height = mainCanvas.style.height;
+            }
+        }
+        else
+        {
+            // clear and set size to same as window
+             overlayCanvas.width  = mainCanvas.width  = min(innerWidth,  canvasMaxSize.x);
+             overlayCanvas.height = mainCanvas.height = min(innerHeight, canvasMaxSize.y);
+        }
+        
+        // save canvas size
+        mainCanvasSize = vec2(mainCanvas.width, mainCanvas.height);
+
         if (paused)
         {
             // do post update even when paused
@@ -149,30 +176,6 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
             // add the time smoothing back in
             frameTimeBufferMS += deltaSmooth;
         }
-
-        if (canvasFixedSize.x)
-        {
-            // clear set fixed size
-            mainCanvas.width  = canvasFixedSize.x;
-            mainCanvas.height = canvasFixedSize.y;
-            
-            // fit to window by adding space on top or bottom if necessary
-            const aspect = innerWidth / innerHeight;
-            const fixedAspect = mainCanvas.width / mainCanvas.height;
-            mainCanvas.style.width  = overlayCanvas.style.width  = aspect < fixedAspect ? '100%' : '';
-            mainCanvas.style.height = overlayCanvas.style.height = aspect < fixedAspect ? '' : '100%';
-            if (glCanvas)
-            {
-                glCanvas.style.width  = mainCanvas.style.width;
-                glCanvas.style.height = mainCanvas.style.height;
-            }
-        }
-        else
-        {
-            // clear and set size to same as window
-            mainCanvas.width  = min(innerWidth,  canvasMaxSize.x);
-            mainCanvas.height = min(innerHeight, canvasMaxSize.y);
-        }
         
         // render sort then render while removing destroyed objects
         enginePreRender();
@@ -212,8 +215,8 @@ function engineInit(gameInit, gameUpdate, gameUpdatePost, gameRender, gameRender
 // called by engine to setup render system
 function enginePreRender()
 {
-    // save canvas size and clear canvases
-    mainCanvasSize = vec2(overlayCanvas.width = mainCanvas.width, overlayCanvas.height = mainCanvas.height);
+    // save canvas size
+    mainCanvasSize = vec2(mainCanvas.width, mainCanvas.height);
 
     // disable smoothing for pixel art
     mainContext.imageSmoothingEnabled = !cavasPixelated;

package/engine/engineDebug.js

@@ -332,7 +332,7 @@ const debugRender = ()=>
         });
 
         // remove expired pritives
-        debugPrimitives = debugPrimitives.filter(r=>r.time.get()<0);
+        debugPrimitives = debugPrimitives.filter(r=>r.time<0);
     }
 
     {

package/engine/engineDraw.js

@@ -53,18 +53,26 @@ let overlayContext;
 let mainCanvasSize = vec2();
 
 /** Convert from screen to world space coordinates
+ *  - if calling outside of render, you may need to manually set mainCanvasSize
  *  @param {Vector2} screenPos
  *  @return {Vector2}
  *  @memberof Draw */
 const screenToWorld = (screenPos)=>
-    screenPos.add(vec2(.5)).subtract(mainCanvasSize.scale(.5)).multiply(vec2(1/cameraScale,-1/cameraScale)).add(cameraPos);
+{
+    ASSERT(mainCanvasSize.x && mainCanvasSize.y, 'mainCanvasSize is invalid');
+    return screenPos.add(vec2(.5)).subtract(mainCanvasSize.scale(.5)).multiply(vec2(1/cameraScale,-1/cameraScale)).add(cameraPos);
+}
 
 /** Convert from world to screen space coordinates
+ *  - if calling outside of render, you may need to manually set mainCanvasSize
  *  @param {Vector2} worldPos
  *  @return {Vector2}
  *  @memberof Draw */
 const worldToScreen = (worldPos)=>
-    worldPos.subtract(cameraPos).multiply(vec2(cameraScale,-cameraScale)).add(mainCanvasSize.scale(.5)).subtract(vec2(.5));
+{
+    ASSERT(mainCanvasSize.x && mainCanvasSize.y, 'mainCanvasSize is invalid');
+    return worldPos.subtract(cameraPos).multiply(vec2(cameraScale,-cameraScale)).add(mainCanvasSize.scale(.5)).subtract(vec2(.5));
+}
 
 /** Draw textured tile centered in world space, with color applied if using WebGL
  *  @param {Vector2} pos                                - Center of the tile in world space
@@ -179,7 +187,7 @@ function drawLine(posA, posB, thickness=.1, color, useWebGL)
 {
     const halfDelta = vec2((posB.x - posA.x)/2, (posB.y - posA.y)/2);
     const size = vec2(thickness, halfDelta.length()*2);
-    drawRect(posA.add(halfDelta), size, color, halfDelta.angle(), 0, 0, useWebGL);
+    drawRect(posA.add(halfDelta), size, color, halfDelta.angle(), useWebGL);
 }
 
 /** Draw directly to a 2d canvas context in world space
@@ -196,7 +204,7 @@ function drawCanvas2D(pos, size, angle, mirror, drawFunction, context = mainCont
     pos = worldToScreen(pos);
     size = size.scale(cameraScale);
     context.save();
-    context.translate(pos.x+.5|0, pos.y-.5|0);
+    context.translate(pos.x+.5|0, pos.y+.5|0);
     context.rotate(angle);
     context.scale(mirror ? -size.x : size.x, size.y);
     drawFunction(context);
@@ -316,7 +324,7 @@ class FontImage
         const size = this.tileSize;
         const drawSize = size.add(this.paddingSize).scale(scale);
         const cols = this.image.width / this.tileSize.x |0;
-        text.split('\n').forEach((line, i)=>
+        (text+'').split('\n').forEach((line, i)=>
         {
             const centerOffset = center ? line.length * size.x * scale / 2 |0 : 0;
             for(let j=line.length; j--;)

package/engine/engineInput.js

@@ -162,7 +162,7 @@ const mouseToScreen = (mousePos)=>
         return vec2(); // fix bug that can occur if user clicks before page loads
 
     const rect = mainCanvas.getBoundingClientRect();
-    return mainCanvasSize.multiply(
+    return vec2(mainCanvas.width, mainCanvas.height).multiply(
         vec2(percent(mousePos.x, rect.left, rect.right), percent(mousePos.y, rect.top, rect.bottom)));
 }
 
@@ -362,7 +362,7 @@ function touchGamepadRender()
         return;
     
     // fade off when not touching or paused
-    const alpha = percent(touchGamepadTimer.get(), 4, 3);
+    const alpha = percent(touchGamepadTimer, 4, 3);
     if (!alpha || paused)
         return;
 

package/engine/engineRelease.js

@@ -8,9 +8,9 @@
 
 'use strict';
 
+let showWatermark = 0;
+let godMode = 0;
 const debug = 0;
-const showWatermark = 0;
-const godMode = 0;
 const debugOverlay = 0;
 const debugPhysics = 0;
 const debugParticles = 0;

package/engine/engineSettings.js

@@ -14,7 +14,8 @@
  *  @memberof Settings */
 let canvasMaxSize = vec2(1920, 1200);
 
-/** Fixed size of the canvas, if enabled cavnvas size never changes
+/** Fixed size of the canvas, if enabled canvas size never changes
+ * - you may also need to set mainCanvasSize if using screen space coords in startup
  *  @type {Vector2} 
  *  @default
  *  @memberof Settings */

package/engine/engineTileLayer.js

@@ -328,7 +328,7 @@ constructor(pos, size=tileCollisionSize, tileSize=tileSizeDefault, scale=vec2(1)
                 const cols = tileImage.width/tileSize.x;
                 context.globalAlpha = color.a; // only alpha, no color, is supported in this mode
                 context.drawImage(tileImage, 
-                    (tileIndex%cols)*tileSize.x, (tileIndex/cols|0)*tileSize.x, 
+                    (tileIndex%cols)*tileSize.x, (tileIndex/cols|0)*tileSize.y, 
                     tileSize.x, tileSize.y, -.5, -.5, 1, 1);
             }
         });

package/engine/engineUtilities.js

@@ -322,6 +322,28 @@ class Vector2
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/** 
+ * Create a color object with RGBA values
+ * @param {Number} [r=1]
+ * @param {Number} [g=1]
+ * @param {Number} [b=1]
+ * @param {Number} [a=1]
+ * @return {Color}
+ * @memberof Utilities
+ */
+const colorRGBA = (r, g, b, a)=> new Color(r, g, b, a);
+
+/** 
+ * Create a color object with HSLA values
+ * @param {Number} [h=0]
+ * @param {Number} [s=0]
+ * @param {Number} [l=1]
+ * @param {Number} [a=1]
+ * @return {Color}
+ * @memberof Utilities
+ */
+const colorHSLA = (h, s, l, a)=> new Color().setHSLA(h, s, l, a);
+
 /** 
  * Color object (red, green, blue, alpha) with some helpful functions
  * @example
@@ -409,6 +431,34 @@ class Color
         return this;
     }
 
+    /** Returns this color expressed in hsla format
+     * @return {Array} */
+    getHSLA()
+    {
+        const r = this.r;
+        const g = this.g;
+        const b = this.b;
+        const a = this.a;
+        const max = Math.max(r, g, b);
+        const min = Math.min(r, g, b);
+        const l = (max + min) / 2;
+        
+        let h = 0, s = 0;
+        if (max != min)
+        {
+            let d = max - min;
+            s = l > .5 ? d / (2 - max - min) : d / (max + min);
+            if (r == max)
+                h = (g - b) / d + (g < b ? 6 : 0);
+            else if (g == max)
+                h = (b - r) / d + 2;
+            else if (b == max)
+                h =  (r - g) / d + 4;
+        }
+
+        return [h / 6, s, l, a];
+    }
+
     /** Returns a new color that has each component randomly adjusted
      * @param {Number} [amount=.05]
      * @param {Number} [alphaAmount=0]
@@ -440,42 +490,6 @@ class Color
         return (this.r*255|0) + (this.g*255<<8) + (this.b*255<<16) + (this.a*255<<24); 
     }
 
-    /** Returns this color expressed as a hex code
-     * @return {String} */
-    hex()
-    {
-        const toHex = (c)=> ((c=c*255|0)<16 ? '0' : '') + c.toString(16);
-        return '#' + toHex(this.r) + toHex(this.g) + toHex(this.b);
-    }
-
-    /** Returns this color expressed in hsla format
-     * @return {Array} */
-    getHSLA()
-    {
-        const r = this.r;
-        const g = this.g;
-        const b = this.b;
-        const a = this.a;
-        const max = Math.max(r, g, b);
-        const min = Math.min(r, g, b);
-        const l = (max + min) / 2;
-        
-        let h = 0, s = 0;
-        if (max != min)
-        {
-            let d = max - min;
-            s = l > .5 ? d / (2 - max - min) : d / (max + min);
-            if (r == max)
-                h = (g - b) / d + (g < b ? 6 : 0);
-            else if (g == max)
-                h = (b - r) / d + 2;
-            else if (b == max)
-                h =  (r - g) / d + 4;
-        }
-
-        return [h / 6, s, l, a];
-    }
-
     /** Set this color from a hex code
      * @param {String} hex - html hex code
      * @return {Color} */
@@ -489,6 +503,14 @@ class Color
         ASSERT(this.r>=0 && this.r<=1 && this.g>=0 && this.g<=1 && this.b>=0 && this.b<=1);
         return this;
     }
+
+    /** Returns this color expressed as a hex code
+     * @return {String} */
+    getHex()
+    {
+        const toHex = (c)=> ((c=c*255|0)<16 ? '0' : '') + c.toString(16);
+        return '#' + toHex(this.r) + toHex(this.g) + toHex(this.b);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -538,4 +560,8 @@ class Timer
     /** Returns this timer expressed as a string
      * @return {String} */
     toString() { if (debug) { return this.unset() ? 'unset' : Math.abs(this.get()) + ' seconds ' + (this.get()<0 ? 'before' : 'after' ); } }
+    
+    /** Get how long since elapsed, returns 0 if not set (returns negative if currently active)
+     * @return {Number} */
+    valueOf()               { return this.get(); }
 }

package/engine/engineWebGL.js

@@ -244,7 +244,7 @@ function glFlush()
  *  @memberof WebGL */
 function glCopyToContext(context, forceDraw)
 {
-    if ((!glEnable || !glBatchCount) && !forceDraw) return;
+    if (!glEnable || !glBatchCount && !forceDraw) return;
     
     glFlush();