#147 feat: canvasのキャッシュキーの生成ロジックを変更

Next2D · Jul 16, 2024 · 4c065eb · 4c065eb
1 parent 9e4ec8d
commit 4c065eb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/js/core/application/MovieClip/usecase/MovieClipCreateDisplayObjectElementUseCase.ts b/src/js/core/application/MovieClip/usecase/MovieClipCreateDisplayObjectElementUseCase.ts
@@ -4,7 +4,7 @@ import type { Layer } from "@/core/domain/model/Layer";
 import type { MovieClip } from "@/core/domain/model/MovieClip";
 import { execute as movieClipRegisterEventUseCase } from "@/core/application/MovieClip/usecase/MovieClipRegisterEventUseCase";
 import { execute as movieClipDisplayObjectComponent } from "../component/MovieClipDisplayObjectComponent";
-import { $getCacheCanvas } from "@/cache/CacheUtil";
+import { $getCacheCanvas, $setCacheCanvas } from "@/cache/CacheUtil";
 import { execute as instanceUpdateBlendModeService } from "@/core/application/Instance/service/InstanceUpdateBlendModeService";
 import { execute as screenAreaHierarchyAdjustmentService } from "@/screen/application/ScreenArea/service/ScreenAreaHierarchyAdjustmentService";
 import { $getDeactivated, $getReDrawState } from "@/screen/application/ScreenArea/ScreenAreaUtil";
@@ -40,7 +40,7 @@ export const execute = async (
         canvas = await instance.getHTMLElement();
 
         // キャッシュに保存
-        // $setCacheCanvas(work_space_id, instance.id, cacheKey, canvas);
+        $setCacheCanvas(work_space_id, instance.id, cacheKey, canvas);
     }
 
     // ブレンドモードを設定

diff --git a/src/js/core/application/Shape/usecase/ShapeCreateDisplayObjectElementUseCase.ts b/src/js/core/application/Shape/usecase/ShapeCreateDisplayObjectElementUseCase.ts
@@ -4,7 +4,7 @@ import type { Layer } from "@/core/domain/model/Layer";
 import type { Shape } from "@/core/domain/model/Shape";
 import { execute as shapeRegisterEventUseCase } from "@/core/application/Shape/usecase/ShapeRegisterEventUseCase";
 import { execute as shapeDisplayObjectComponent } from "../component/ShapeDisplayObjectComponent";
-import { $getCacheCanvas } from "@/cache/CacheUtil";
+import { $getCacheCanvas, $setCacheCanvas } from "@/cache/CacheUtil";
 import { execute as screenAreaHierarchyAdjustmentService } from "@/screen/application/ScreenArea/service/ScreenAreaHierarchyAdjustmentService";
 import { execute as screenAreaReadOnlyElementService } from "@/screen/application/ScreenArea/service/ScreenAreaReadOnlyElementService";
 import { execute as instanceUpdateBlendModeService } from "@/core/application/Instance/service/InstanceUpdateBlendModeService";
@@ -40,7 +40,7 @@ export const execute = async (
         canvas = await instance.getHTMLElement(character);
 
         // キャッシュに保存
-        // $setCacheCanvas(work_space_id, instance.id, cacheKey, canvas);
+        $setCacheCanvas(work_space_id, instance.id, cacheKey, canvas);
     }
 
     // ブレンドモードを設定

diff --git a/src/js/core/domain/model/Character.ts b/src/js/core/domain/model/Character.ts
@@ -14,6 +14,7 @@ import { execute as characterCalcGetBoundsService } from "@/core/application/Cha
 import { execute as characterCalcGetRectService } from "@/core/application/Character/service/CharacterCalcGetRectService";
 import { PositionImpl } from "@/interface/PositionImpl";
 import { $getCurrentWorkSpace } from "@/core/application/CoreUtil";
+import { $BITMAP_TYPE } from "@/config/InstanceConfig";
 
 /**
  * @description DisplayObjectのユニークID
@@ -229,6 +230,13 @@ export class Character
 
         }
 
+        const workSpace = $getCurrentWorkSpace();
+        const instance = workSpace.getLibrary(this._$libraryId);
+        if (instance && instance.type !== $BITMAP_TYPE) {
+            const scale = workSpace.scale;
+            cacheKey += `_${this.scaleX * scale}_${this.scaleY * scale}`;
+        }
+
         // TODO filters
 
         return cacheKey;

diff --git a/src/js/screen/application/DisplayObject/service/ScreenDisplayObjectUpdateMaskStyleService.ts b/src/js/screen/application/DisplayObject/service/ScreenDisplayObjectUpdateMaskStyleService.ts
@@ -66,7 +66,7 @@ export const execute = async (
         }
 
         // キャッシュに保存
-        // $setCacheCanvas(workSpace.id, instance.id, cacheKey, canvas);
+        $setCacheCanvas(workSpace.id, instance.id, cacheKey, canvas);
     }
 
     if (!canvas.dataset.base64) {