fixed incorrect graphics transform

bump to 0.5.5

Author: 62316e

CHANGELOG.md

@@ -1,15 +1,50 @@
 Black Engine: Changelog
 =======================
-v0.5.1
-------
+
+# v0.5.5
+### New features
+- Added support for Black Vector Graphics (beta)
+- Added orientation lock support
+- Added Graphics to optionally accept either string or GraphicsData instance
+- Added skew via `skewX` and `skewY` properties in the `DisplayObject`
+- Added support for 9 grid slice
+- Added sprite tiling support
+- Added sprite wrapping support
+- Added [svg2bvg](https://github.com/MassiveHeights/svg2bvg) tool which converts SVG files into BVG
+- Added [bsa-gen](https://github.com/MassiveHeights/bsa-gen) tool to generate sound atlases from multiple audio files
+- Added Timer component
+- Added `GameObject#relativeTo` method to calculates GameObject's position relative to another GameObject
+- Added `Graphics#quadraticCurveTo` method
+- Added `Graphics#setLineDash` method
+- Added optional param `isNonZero` for `Graphics#fill` method to control winding order
+- Added `GraphicsData` class. Now you can have many graphics objects inside one Graphics GameObject.
+
+### Changes
+- Graphics internally changed and now supports nested graphics via GraphicsData object
+- Changed Black Texture Atlas format to support version number (internal)
+
+### Bug Fixes
+- Fixed incorrect font bounds on different platforms by changing the way how its calculated. Now it checks font height using `pixel by pixel` method. Line height is a bit smaller from now. But overall font metrics looks good and exactly the same on different browsers.
+
+### Examples & Docs
+- Added tutorial about how to use "bsa-gen" tool to generate sound atlas
+- Added tutorial about how to use "svg2bvg" tool and vector graphics in your app
+- Added tutorial about how to use texture atlases
+- Added 3 timer examples
+- Added "Vector As a Sprite"
+- Added "Orientation Lock" example
+- Added "Texture Repeat" example
+- Added "Slice 9 Grid" example
+- Added "Skew" example
+
+# v0.5.1
 - Fixed broken `visible` property
 - Fixed broken overhearing
 - Fixed missing `Stage#onUpdate` calls
 - Added `TextField#highQuality` property to control how TextField will be rendered
 - Added many tests
 
-v0.5.0
-------
+# v0.5.0
 - Added Arcade physics system
 - Added `Black.ups` property to control number of updates per second (render goes as fast as it can)
 - Added `Time.alpha` - indicates how much time has been passed since last update in range from 0 to 1
@@ -23,8 +58,7 @@ v0.5.0
 - Fixed missing onRemoved call when removing children within onRemoved method
 - Improved `getBounds` performance for clipped objects
 
-v0.4.0
-------
+# v0.4.0
 - Graphics reworked (now it has bounds and API similar to HTML canvas)
 - `AssetManager` dramatically improved
 - TextField now posts `change` message when text is changed
@@ -41,8 +75,7 @@ v0.3.5
 - Added `Input.once` method
 - Added `Glob` class
 
-v0.3.42
--------
+# v0.3.42
 - Added `Black#hasSystem` method
 - Added `GameObject.scale` property
 - Added `GameObject.getStageBounds` helper method
@@ -67,12 +100,10 @@ v0.3.42
 - Removed `VideoNullDriver.renderResolution`
 - Minor refactoring
 
-v0.3.41
--------
+# 0.3.41
 - Fixed incorrect alignPivot and alignPivotOffset
 
-v0.3.4
-------
+# 0.3.4
 - Added BitmapTextField
 - Added Audio support (spatial, audio atlas, sound effects)
 - Added Stage, stage scale modes and orientations
@@ -97,16 +128,14 @@ v0.3.4
 - Removed pivotX/pivotY, use pivotOffsetX/pivotOffsetY instead
 - Typed 95% for GCC
 
-v0.0.12a
---------
+# v0.0.12a
 - Fixed TextField align issues caused by new pivot logic
 - Fixed DOMDriver align issues caused by new pivot logic
 - Fixed `Matrix::translate` broken logic
 - Changed `VideoDriver::DrawImage` now accepts bounds
 - Minor jsdoc fixess
 
-v0.0.11a
---------
+# v0.0.11a
 - Reworked `Input`
 - Now `Input` is single target system
 - Added `pointerIn` and `pointerOut` messages
@@ -125,8 +154,7 @@ v0.0.11a
 - Updated `Viewport`, now it will automatically add missing CSS styles on start.
 
 
-v0.0.10a
---------
+# v0.0.10a
 - Added dist folder to github
 - Added `touchable` to the `Sprite`
 - Fixed package.json version mess
@@ -135,6 +163,5 @@ v0.0.10a
 - Moved examples to external repo
 - Renamed `Assert` to `Debug`
 
-v0.0.8a
-------------------------
+# v0.0.8a
 - Initial commit

package.json

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

src/display/Graphics.js

@@ -6,7 +6,6 @@
  */
 
 /* @echo EXPORT */
-
 class Graphics extends DisplayObject {
   /**
    * Creates new Graphics instance.

src/display/Sprite.js

@@ -46,7 +46,7 @@ class Sprite extends DisplayObject {
    *
    * @protected
    * @param {Rectangle=} outRect Rectangle to be returned.
-   * @return {Rectangle} The new Rectangle or outRect with .
+   * @return {Rectangle} The new Rectangle or outRect if it was passed as a param.
    */
   onGetLocalBounds(outRect = undefined) {
     outRect = outRect || new Rectangle();

src/drivers/Renderer.js

@@ -102,6 +102,43 @@ class Renderer {
   render(driver, session) {
   }
 
+  // checkMask(driver, session) {
+  //   let gameObject = /** @type {DisplayObject} */ (this.gameObject);
+  //   return gameObject.mMask !== null && gameObject.mMask.mAdded && session.isMasking === false;
+  // }
+
+  // renderMask(driver, session) {
+  //   let gameObject = /** @type {DisplayObject} */ (this.gameObject);
+
+  //   const sf = Black.stage.scaleFactor;
+
+  //   let leftBounds = gameObject.bounds;
+  //   let left = new CanvasRenderTexture(leftBounds.width, leftBounds.height, 1);
+
+  //   let rightBounds = gameObject.mMask.bounds;
+  //   let right = new CanvasRenderTexture(rightBounds.width, rightBounds.height, 1);
+
+  //   let leftMatrix = new Matrix();
+  //   leftMatrix.set(1, 0, 0, 1, ~~(-leftBounds.x * sf - Black.stage.mX), ~~(-leftBounds.y * sf - Black.stage.mY));
+
+  //   let rightMatrix = new Matrix();
+  //   rightMatrix.set(1, 0, 0, 1, ~~(-rightBounds.x * sf - Black.stage.mX), ~~(-rightBounds.y * sf - Black.stage.mY));
+
+  //   driver.render(gameObject, left, leftMatrix, true);
+  //   driver.render(gameObject.mMask, right, rightMatrix, true);
+
+  //   let transform = gameObject.worldTransformation;
+
+  //   driver.setTransform(gameObject.mMask.worldTransformation);
+  //   driver.drawTexture(right);
+
+  //   driver.setGlobalBlendMode(BlendMode.MASK);
+
+  //   driver.setTransform(transform);
+  //   driver.drawTexture(left);
+
+  // }
+
   /**
    * Called after all children objects got rendered.
    * 

src/drivers/canvas/GraphicsRendererCanvas.js

@@ -66,8 +66,7 @@ class GraphicsRendererCanvas extends GraphicsRenderer {
     const py = node.mPivotY;
 
     transform = transform.clone().append(node.mTransform);
-    const m = transform.data;
-    ctx.setTransform(m[0], m[1], m[2], m[3], m[4], m[5]);
+    driver.setTransform(transform);
 
     for (let i = 0; i < len; i++) {
       const cmd = commands[i];

src/drivers/canvas/SpriteRendererCanvas.js

@@ -135,47 +135,42 @@ class SpriteRendererCanvas extends Renderer {
     let ctx = /** @type {CanvasDriver}*/ (driver).mCtx;
     let gameObject = /** @type {Sprite} */ (this.gameObject);
 
-    // bake left and right nodes
-    // blend them up with a source in/out bm
-    //
-
-
-    if (gameObject.mMask !== null && gameObject.mMask.mAdded && session.isMasking === false) {
-      //needRestore = true;
-      const sf = Black.stage.scaleFactor;
-
-      let leftBounds = gameObject.bounds;
-      let left = new CanvasRenderTexture(leftBounds.width, leftBounds.height, 1);
-
-      let rightBounds = gameObject.mMask.bounds;
-      let right = new CanvasRenderTexture(rightBounds.width, rightBounds.height, 1);
-
-      let leftMatrix = new Matrix();
-      leftMatrix.set(1, 0, 0, 1, ~~(-leftBounds.x * sf - Black.stage.mX), ~~(-leftBounds.y * sf - Black.stage.mY));
-
-      let rightMatrix = new Matrix();
-      rightMatrix.set(1, 0, 0, 1, ~~(-rightBounds.x * sf - Black.stage.mX), ~~(-rightBounds.y * sf - Black.stage.mY));
-
-      driver.render(gameObject, left, leftMatrix, true);
-      driver.render(gameObject.mMask, right, rightMatrix, true);
-      
-      //right.__dumpToDocument();
-      
-      // drawImage left
-      // drawImage right
-      
-      let transform = gameObject.worldTransformation;
-      
-      driver.setTransform(gameObject.mMask.worldTransformation);
-      driver.drawTexture(right);
-
-      driver.setGlobalBlendMode(BlendMode.MASK);
-      
-      driver.setTransform(transform);
-      driver.drawTexture(left);
-      
-      return;
-    }
+
+    // if (super.checkMask(driver, session)) {
+    //   super.renderMask(driver, session);
+    //   return;
+    // }
+
+    // if (gameObject.mMask !== null && gameObject.mMask.mAdded && session.isMasking === false) {
+    //   const sf = Black.stage.scaleFactor;
+
+    //   let leftBounds = gameObject.bounds;
+    //   let left = new CanvasRenderTexture(leftBounds.width, leftBounds.height, 1);
+
+    //   let rightBounds = gameObject.mMask.bounds;
+    //   let right = new CanvasRenderTexture(rightBounds.width, rightBounds.height, 1);
+
+    //   let leftMatrix = new Matrix();
+    //   leftMatrix.set(1, 0, 0, 1, ~~(-leftBounds.x * sf - Black.stage.mX), ~~(-leftBounds.y * sf - Black.stage.mY));
+
+    //   let rightMatrix = new Matrix();
+    //   rightMatrix.set(1, 0, 0, 1, ~~(-rightBounds.x * sf - Black.stage.mX), ~~(-rightBounds.y * sf - Black.stage.mY));
+
+    //   driver.render(gameObject, left, leftMatrix, true);
+    //   driver.render(gameObject.mMask, right, rightMatrix, true);
+
+    //   let transform = gameObject.worldTransformation;
+
+    //   driver.setTransform(gameObject.mMask.worldTransformation);
+    //   driver.drawTexture(right);
+
+    //   driver.setGlobalBlendMode(BlendMode.MASK);
+
+    //   driver.setTransform(transform);
+    //   driver.drawTexture(left);
+
+    //   return;
+    // }
 
 
     let texture = Renderer.getColoredTexture(gameObject.mTexture, this.color);