@next2d/display 1.15.0 → 1.16.0

package/dist/Shape.js

@@ -28,18 +28,6 @@ export class Shape extends DisplayObject {
          * @private
          */
         this._$graphics = null;
-        /**
-         * @type {object}
-         * @default null
-         * @private
-         */
-        this._$bounds = null;
-        /**
-         * @type {number}
-         * @default 0
-         * @private
-         */
-        this._$bitmapId = 0;
         /**
          * @type {string}
          * @default ""
@@ -122,6 +110,9 @@ export class Shape extends DisplayObject {
         return this._$src;
     }
     set src(src) {
+        if (!src) {
+            return;
+        }
         const image = new Image();
         image.addEventListener("load", () => {
             const width = image.width;
@@ -137,6 +128,7 @@ export class Shape extends DisplayObject {
             }
         });
         this._$src = image.src = src;
+        this.graphics._$mode = "bitmap";
     }
     /**
      * @param  {object} character
@@ -154,7 +146,6 @@ export class Shape extends DisplayObject {
             switch (true) {
                 case character.bitmapId > 0:
                     {
-                        this._$bitmapId = character.bitmapId;
                         const bitmap = loaderInfo
                             ._$data
                             .characters[character.bitmapId];
@@ -172,6 +163,11 @@ export class Shape extends DisplayObject {
                         bitmapData.buffer = bitmap._$buffer.slice();
                         // setup
                         graphics._$recode = $getArray();
+                        if (width === character.bounds.xMax - character.bounds.xMin
+                            && height === character.bounds.yMax - character.bounds.yMin) {
+                            graphics._$bitmapId = character.bitmapId;
+                            graphics._$mode = "bitmap";
+                        }
                         // clone
                         const recodes = character.recodes;
                         if (recodes[recodes.length - 1] === Graphics.END_FILL) {
@@ -214,6 +210,11 @@ export class Shape extends DisplayObject {
                             graphics._$recode[idx++] = bitmapData;
                             const matrix = recodes[idx];
                             graphics._$recode[idx] = $getFloat32Array6(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
+                            if (value.width === character.bounds.xMax - character.bounds.xMin
+                                && value.height === character.bounds.yMax - character.bounds.yMin) {
+                                graphics._$bitmapId = character.bitmapId;
+                                graphics._$mode = "bitmap";
+                            }
                         }
                     }
                     break;
@@ -223,6 +224,7 @@ export class Shape extends DisplayObject {
             }
         }
         else {
+            graphics._$mode = "bitmap";
             const width = $Math.abs(character.bounds.xMax - character.bounds.xMin);
             const height = $Math.abs(character.bounds.yMax - character.bounds.yMin);
             const bitmapData = new BitmapData(width, height);

package/dist/Stage.js

@@ -1,6 +1,5 @@
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
-import { $devicePixelRatio } from "@next2d/util";
-import { $clamp, $toColorInt, $uintToRGBA } from "@next2d/share";
+import { $clamp, $toColorInt, $uintToRGBA, $devicePixelRatio } from "@next2d/share";
 /**
  * Stage クラスはメイン描画領域を表します。
  * The Stage class represents the main drawing area.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/display",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "Next2D Display Packages",
   "author": "Toshiyuki Ienaga<ienaga@tvon.jp> (https://github.com/ienaga/)",
   "license": "MIT",
@@ -32,14 +32,14 @@
     "url": "git+https://github.com/Next2D/Player.git"
   },
   "peerDependencies": {
-    "@next2d/interface": "1.15.0",
-    "@next2d/core": "1.15.0",
-    "@next2d/geom": "1.15.0",
-    "@next2d/util": "1.15.0",
-    "@next2d/share": "1.15.0",
-    "@next2d/webgl": "1.15.0",
-    "@next2d/media": "1.15.0",
-    "@next2d/net": "1.15.0",
-    "@next2d/events": "1.15.0"
+    "@next2d/interface": "1.16.0",
+    "@next2d/core": "1.16.0",
+    "@next2d/geom": "1.16.0",
+    "@next2d/util": "1.16.0",
+    "@next2d/share": "1.16.0",
+    "@next2d/webgl": "1.16.0",
+    "@next2d/media": "1.16.0",
+    "@next2d/net": "1.16.0",
+    "@next2d/events": "1.16.0"
   }
 }