@next2d/core 1.14.24 → 1.16.0

package/dist/Player.d.ts

@@ -1,9 +1,9 @@
-import { CacheStore } from "@next2d/share";
 import { Stage, MovieClip } from "@next2d/display";
 import { Event as Next2DEvent } from "@next2d/events";
 import { Video, Sound } from "@next2d/media";
 import { CanvasToWebGLContext } from "@next2d/webgl";
 import { PlayerOptionsImpl, PlayerModeImpl, AttachmentImpl, EventListenerImpl, EventDispatcherImpl } from "@next2d/interface";
+import { CacheStore } from "@next2d/share";
 /**
  * 描画のイベントや設定やコントロールの管理クラス
  * Management classes for drawing events, settings and controls
@@ -12,7 +12,6 @@ import { PlayerOptionsImpl, PlayerModeImpl, AttachmentImpl, EventListenerImpl, E
  */
 export declare class Player {
     private readonly _$stage;
-    private readonly _$cacheStore;
     private _$mode;
     _$actionOffset: number;
     _$actions: MovieClip[];
@@ -26,7 +25,6 @@ export declare class Player {
     _$stopFlag: boolean;
     private _$startTime;
     private _$fps;
-    private _$isLoad;
     _$loadStatus: number;
     _$width: number;
     _$height: number;
@@ -80,24 +78,23 @@ export declare class Player {
      */
     static get LOAD_END(): number;
     /**
-     * @type {HTMLCanvasElement}
+     * @return {CacheStore}
      * @readonly
      * @public
      */
-    get canvas(): HTMLCanvasElement;
+    get cacheStore(): CacheStore;
     /**
-     * @return {Map}
+     * @type {HTMLCanvasElement}
      * @readonly
      * @public
      */
-    get broadcastEvents(): Map<string, EventListenerImpl[]>;
+    get canvas(): HTMLCanvasElement;
     /**
-     * @member {CacheStore}
-     * @return {CacheStore}
+     * @return {Map}
      * @readonly
      * @public
      */
-    get cacheStore(): CacheStore;
+    get broadcastEvents(): Map<string, EventListenerImpl[]>;
     /**
      * @member {CanvasToWebGLContext|null}
      * @default null

package/dist/Player.js

@@ -1,10 +1,9 @@
-import { CacheStore } from "@next2d/share";
 import { Stage } from "@next2d/display";
 import { Event as Next2DEvent, MouseEvent as Next2DMouseEvent, EventPhase } from "@next2d/events";
 import { SoundMixer } from "@next2d/media";
 import { CanvasToWebGLContext } from "@next2d/webgl";
-import { $devicePixelRatio, $document, $window, $rendererWorker, $PREFIX, $audioContext, $TOUCH_START, $TOUCH_MOVE, $TOUCH_END, $MOUSE_DOWN, $MOUSE_MOVE, $MOUSE_UP, $MOUSE_WHEEL, $DOUBLE_CLICK, $MOUSE_LEAVE, $loadAudioData, $MATRIX_HIT_ARRAY_IDENTITY, $hitContext, $isTouch, $dropTarget, $dragRules, $isSafari, $getEvent, $setEvent, $setEventType, $setCurrentLoaderInfo, $getEventType } from "@next2d/util";
-import { $Math, $performance, $COLOR_ARRAY_IDENTITY, $doUpdated, $isUpdated, $getArray, $getFloat32Array6, $getMap, $uintToRGBA, $toColorInt, $requestAnimationFrame, $cancelAnimationFrame, $poolArray, $clamp } from "@next2d/share";
+import { $document, $window, $rendererWorker, $PREFIX, $audioContext, $TOUCH_START, $TOUCH_MOVE, $TOUCH_END, $MOUSE_DOWN, $MOUSE_MOVE, $MOUSE_UP, $MOUSE_WHEEL, $DOUBLE_CLICK, $MOUSE_LEAVE, $loadAudioData, $MATRIX_HIT_ARRAY_IDENTITY, $hitContext, $isTouch, $dropTarget, $dragRules, $isSafari, $getEvent, $setEvent, $setEventType, $setCurrentLoaderInfo, $getEventType } from "@next2d/util";
+import { $Math, $performance, $COLOR_ARRAY_IDENTITY, $doUpdated, $isUpdated, $getArray, $getFloat32Array6, $getMap, $uintToRGBA, $toColorInt, $requestAnimationFrame, $cancelAnimationFrame, $poolArray, $clamp, $devicePixelRatio, $setDevicePixelRatio, $cacheStore } from "@next2d/share";
 /**
  * 描画のイベントや設定やコントロールの管理クラス
  * Management classes for drawing events, settings and controls
@@ -17,17 +16,14 @@ export class Player {
      * @public
      */
     constructor() {
+        // init
+        $setDevicePixelRatio(window.devicePixelRatio);
         /**
          * @type {Stage}
          * @private
          */
         this._$stage = new Stage();
         this._$stage._$player = this;
-        /**
-         * @type {CacheStore}
-         * @private
-         */
-        this._$cacheStore = new CacheStore();
         /**
          * @type {string}
          * @private
@@ -98,12 +94,6 @@ export class Player {
          * @private
          */
         this._$fps = 16;
-        /**
-         * @type {boolean}
-         * @default false
-         * @private
-         */
-        this._$isLoad = false;
         /**
          * @type {number}
          * @default 0
@@ -322,6 +312,14 @@ export class Player {
     static get LOAD_END() {
         return 2;
     }
+    /**
+     * @return {CacheStore}
+     * @readonly
+     * @public
+     */
+    get cacheStore() {
+        return $cacheStore;
+    }
     /**
      * @type {HTMLCanvasElement}
      * @readonly
@@ -338,15 +336,6 @@ export class Player {
     get broadcastEvents() {
         return this._$broadcastEvents;
     }
-    /**
-     * @member {CacheStore}
-     * @return {CacheStore}
-     * @readonly
-     * @public
-     */
-    get cacheStore() {
-        return this._$cacheStore;
-    }
     /**
      * @member {CanvasToWebGLContext|null}
      * @default null
@@ -507,7 +496,7 @@ export class Player {
         this._$stopFlag = true;
         this._$timerId = -1;
         SoundMixer.stopAll();
-        this._$cacheStore.reset();
+        $cacheStore.reset();
         if ($rendererWorker) {
             $rendererWorker.postMessage({
                 "command": "stop"
@@ -521,7 +510,7 @@ export class Player {
      * @public
      */
     removeCache(id) {
-        this._$cacheStore.removeCache(id);
+        $cacheStore.removeCache(id);
         if ($rendererWorker) {
             $rendererWorker.postMessage({
                 "command": "removeCache",
@@ -819,7 +808,7 @@ export class Player {
             });
             if (gl) {
                 this._$context = new CanvasToWebGLContext(gl, this._$getSamples());
-                this._$cacheStore.context = this._$context;
+                $cacheStore.context = this._$context;
             }
             else {
                 alert("WebGL setting is off. Please turn the setting on.");
@@ -941,9 +930,6 @@ export class Player {
         const div = $document
             .getElementById(this.contentElementId);
         if (div) {
-            // cache reset
-            this._$stage._$doChanged();
-            this._$cacheStore.reset();
             const parent = div.parentElement;
             if (!parent) {
                 throw new Error("the parentElement is null.");
@@ -982,6 +968,13 @@ export class Player {
                 : `${screenWidth / 2 - width / 2}px`;
             width *= $devicePixelRatio;
             height *= $devicePixelRatio;
+            // no resize
+            if (this._$width === width && this._$height === height) {
+                return;
+            }
+            // cache reset
+            this._$stage._$doChanged();
+            $cacheStore.reset();
             // params
             this._$scale = scale;
             this._$width = width;
@@ -1067,6 +1060,7 @@ export class Player {
             if (!context) { // unit test
                 return;
             }
+            context.clearInstacedArray();
             this._$canvas.width = width;
             this._$canvas.height = height;
             context._$gl.viewport(0, 0, width, height);
@@ -1076,9 +1070,10 @@ export class Player {
                 manager.releaseAttachment(this._$attachment, true);
             }
             this._$attachment = manager
-                .createCacheAttachment(width, height, false);
+                .createCacheAttachment(width, height, true);
             // update cache max size
             context.setMaxSize(width, height);
+            context._$bind(this._$attachment);
         }
     }
     /**
@@ -1424,7 +1419,6 @@ export class Player {
         if (!context) {
             return;
         }
-        context._$bind(this._$attachment);
         // reset
         context.reset();
         context.setTransform(1, 0, 0, 1, 0, 0);
@@ -1433,17 +1427,10 @@ export class Player {
         this._$stage._$draw(context, this._$matrix, $COLOR_ARRAY_IDENTITY);
         // stage end
         this._$stage._$updated = false;
-        const manager = context.frameBuffer;
-        const texture = manager
-            .getTextureFromCurrentAttachment();
-        manager.unbind();
-        // reset and draw to main canvas
-        context.reset();
-        context.setTransform(1, 0, 0, 1, 0, 0);
-        context.clearRect(0, 0, this._$width, this._$height);
-        context.drawImage(texture, 0, 0, this._$width, this._$height);
-        // re bind
-        context._$bind(this._$attachment);
+        context.drawInstacedArray();
+        context
+            .frameBuffer
+            .transferToMainTexture();
     }
     /**
      * @return {void}

package/package.json

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