Merge pull request #50 from MassiveHeights/v0.6.x-dev

v0.5.8-stable

Author: 62316e

CHANGELOG.md

@@ -1,6 +1,30 @@
 Black Engine: Changelog
 =======================
 
+# v0.5.8
+### New features
+- Added `useHiDPR` property to control render quality on high DPI screens
+- Added ability to draw rounded rectangle
+- Added ability to load custom asset in AssetManager using CustomAsset
+- Added gradient and pattern support for Graphics
+
+### Changes
+- Changed empty clip rectangle to clip everything instead of nothing
+- Improved anchor performance
+
+### Bug Fixes
+- Fixed Orientation Lock still works when disabled
+- Fixed many GCC comments
+- Fixed bug causing colored sprite to render incorrectly
+- Fixed slice9grid not working as expected on colored sprites
+- Fixed bug causing Arcade physics to not cleanup colliders after removing objects from stage
+- Fixed Arcade physics units to be always within stage
+- Fixed clip rect not working on TextField
+- Fixed `getTextures` returning null for backed vectors
+- Fixed BVG quadratic curve math
+- Fixed many BVG rendering bugs and glitches
+- Fixed anchors not working in some cases
+
 # v0.5.7
 ### Changes
 - Changed license to Simplified BSD!!!

build.json

@@ -53,6 +53,7 @@
     "src/assets/loaders/FontFaceAssetLoader.js",
 
     "src/assets/Asset.js",
+    "src/assets/CustomAsset.js",
     "src/assets/TextureAsset.js",
     "src/assets/JSONAsset.js",
     "src/assets/XMLAsset.js",
@@ -88,6 +89,10 @@
     "src/display/DisplayObject.js",
     "src/display/GraphicsData.js",
     "src/display/Graphics.js",
+    "src/display/GraphicsPath.js",
+    "src/display/GraphicsGradient.js",
+    "src/display/GraphicsLinearGradient.js",
+    "src/display/GraphicsPattern.js",
     "src/display/GraphicsCommand.js",
     "src/display/GraphicsCommandType.js",
     "src/display/CapsStyle.js",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "black",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "",
   "main": "dist/black-es6-module.js",
   "directories": {},

src/Black.js

@@ -119,6 +119,9 @@ class Black extends MessageDispatcher {
     /** @private @type {Array<number>} */
     this.mFrameTimes = [];
 
+    /** @private @type {boolean} */
+    this.mUseHiDPR = Device.isMobile;
+
     this.__bootViewport();
 
     this.__update = this.__update.bind(this);
@@ -331,6 +334,7 @@ class Black extends MessageDispatcher {
   /**
    * @private
    * @param {number} timestamp
+   * @param {boolean} forceUpdate
    * @return {void}
    */
   __update(timestamp, forceUpdate) {
@@ -703,6 +707,26 @@ class Black extends MessageDispatcher {
     return this.mSplashScreen;
   }
 
+  
+  /**
+   * Gets/sets whenever driver should be created with high DPR support. 
+   * NOTE: Cannot be changed at runtime.
+   * 
+   * @returns {boolean}
+   */
+  get useHiDPR() {
+    return this.mUseHiDPR;
+  }
+  
+  /**
+   * @ignore
+   * @param {boolean} value
+   * @returns {void}
+   */
+  set useHiDPR(value) {
+    this.mUseHiDPR = value;
+  }
+
   /**
    * `Black.magic`! Got it? Got it?!?! Same as `Math.random()` but much cooler.
    * 

src/animation/Interpolation.js

@@ -12,6 +12,7 @@ class Interpolation {
    *
    * @param {Array}  v The input array of values to interpolate between.
    * @param {number} k The percentage of interpolation, between 0 and 1.
+   * @param {function(number):number} lerpFunction Interpolation function.
    * @return {number}  The interpolated value
    */
   static linear(v, k, lerpFunction = null) {

src/animation/Tween.js

@@ -17,6 +17,7 @@ class Tween extends Component {
    * @param {Object}        values            The values to tween.
    * @param {number}        [duration=0.25]   Duraction in seconds.
    * @param {Object|null}   [properties=null] Tween properties Object.
+   * @param {Object|null}   [plugins=null]    Interpolation plugins object
    */
   constructor(values, duration = 0.250, properties = null, plugins = null) {
     super();

src/assets/AssetManager.js

@@ -72,6 +72,9 @@ class AssetManager extends MessageDispatcher {
     /** @private @type {Object.<string, BitmapFontData>} */
     this.mBitmapFonts = {};
 
+    /** @private @type {Object.<string, CustomAsset>} */
+    this.mCustomAssets = {};
+
     /** @private @type {AssetManagerState} */
     this.mState = AssetManagerState.NONE;
 
@@ -226,6 +229,16 @@ class AssetManager extends MessageDispatcher {
     this.mQueue.push(new FontAsset(name, '', false));
   }
 
+  /**
+   * Adds custom asset to the loading queue.
+   * 
+   * @param {Asset} asset
+   */
+  enqueueCustomAsset(asset) {
+    this.__validateState();
+    this.mQueue.push(asset);
+  }
+
   /**
    * Starts loading all enqueued assets.
    *
@@ -287,11 +300,17 @@ class AssetManager extends MessageDispatcher {
     else if (item.constructor === BVGAsset) {
       this.mGraphicsData[item.name] = item.data;
 
-      const bakedTextures = item.bakeTextures();
-      Object.keys(bakedTextures).forEach(name => name !== item.name && this.__validateName(name));
-      Object.assign(this.mVectorTextures, bakedTextures);
-    }
-    else {
+      const bakedTextures = /** @type {BVGAsset} */ (item).bakeTextures();
+
+      for (let name in bakedTextures) {
+        if (!bakedTextures.hasOwnProperty(name)) continue;
+
+        name !== item.name && this.__validateName(name);
+        this.mVectorTextures[name] = bakedTextures[name];
+      }
+    } else if (item instanceof CustomAsset) {
+      this.mCustomAssets[item.name] = item.data;
+    } else {
       Debug.error(`[AssetManager] Unable to handle asset type ${item}.`);
     }
 
@@ -423,24 +442,32 @@ class AssetManager extends MessageDispatcher {
     // collect single textures
     for (let key in this.mTextures)
       if (re.test(key))
-        names.push({name: key, atlas: null});
+        names.push({ name: key, atlas: null, isBakedVector: false });
+
+    for (let key in this.mVectorTextures)
+      if (re.test(key))
+        names.push({ name: key, atlas: null, isBakedVector: true });
 
     // collect textures from all atlases
     for (let key in this.mAtlases) {
       let atlas = this.mAtlases[key];
 
       for (let key2 in atlas.subTextures)
         if (re.test(key2))
-          names.push({name: key2, atlas: atlas});
+          names.push({ name: key2, atlas: atlas, isBakedVector: false });
     }
 
     AtlasTexture.naturalSort(names, 'name');
 
     for (let i = 0; i < names.length; i++) {
       let ao = names[i];
 
-      if (ao.atlas == null)
-        out.push(this.mTextures[ao.name]);
+      if (ao.atlas === null) {
+        if (ao.isBakedVector === true)
+          out.push(this.mVectorTextures[ao.name]);
+        else
+          out.push(this.mTextures[ao.name]);
+      }
       else
         out.push(ao.atlas.mSubTextures[ao.name]);
     }
@@ -508,6 +535,16 @@ class AssetManager extends MessageDispatcher {
     return this.mJsons[name];
   }
 
+  /**
+   * Returns Object parsed from `CutsomAsset` by given name.
+   *
+   * @param {string} name The name of the asset.
+   * @return {Object} Returns object or null.
+   */
+  getCustomAsset(name) {
+    return this.mCustomAssets[name];
+  }
+
   __validateState() {
     Debug.assert(this.mState === AssetManagerState.NONE || this.mState === AssetManagerState.FINISHED, 'Illegal state.');
   }

src/assets/BVGAsset.js

@@ -63,14 +63,16 @@ class BVGAsset extends Asset {
 
     if (this.mBakeChildren && namesToBake.length === 0) {
       const traverse = nodes => {
+        nodes = /** @type {Array<GraphicsData>} */(nodes);
+
         if (nodes.length === 0) return;
 
         for (let i = 0, l = nodes.length; i < l; i++) {
           if (nodes[i].name) {
             namesToBake.push(nodes[i].name);
           }
 
-          traverse(nodes[i].mNodes);
+          traverse(/** @type {Array<GraphicsData>} */(nodes[i].mNodes));
         }
       };
 
@@ -90,9 +92,10 @@ class BVGAsset extends Asset {
       }
 
       const graphics = new Graphics(node, name !== this.mGraphicsData.name);
-      const renderTexture = new CanvasRenderTexture(graphics.width, graphics.height, Black.driver.renderScaleFactor);
+      const dpr = 1 / Black.driver.renderScaleFactor;
+      const renderTexture = new CanvasRenderTexture(graphics.width, graphics.height, 1);
 
-      Black.driver.render(graphics, renderTexture, new Matrix());
+      Black.driver.render(graphics, renderTexture, new Matrix().scale(dpr, dpr));
 
       textures[name] = renderTexture;
     }

src/assets/CustomAsset.js

@@ -0,0 +1,11 @@
+/**
+ * This is abstract class for custom user assets. For example CustomAsset can be used to load video or other data files.
+ *
+ * @fires Asset#error
+ * @fires Asset#complete
+ * 
+ * @cat assets
+ * @extends Asset
+ */
+/* @echo EXPORT */
+class CustomAsset extends Asset { }

src/assets/loaders/ImageAssetLoader.js

@@ -23,8 +23,8 @@ class ImageAssetLoader extends AssetLoader {
    */
   load() {
     this.mImageElement.src = this.mUrl;
-    this.mImageElement.onload = () => { this.onLoad(); }
-    this.mImageElement.onerror = () => { this.onError(); }
+    this.mImageElement.onload = () => this.onLoad();
+    this.mImageElement.onerror = () => this.onError();
     this.mData = this.mImageElement;
   }