-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
150 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 0 additions & 76 deletions
76
src/js/screen/application/DisplayObject/service/ScreenDisplayObjectGetMaskStyleService.ts
This file was deleted.
Oops, something went wrong.
94 changes: 94 additions & 0 deletions
94
src/js/screen/application/DisplayObject/service/ScreenDisplayObjectUpdateMaskStyleService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { $getCacheCanvas, $setCacheCanvas } from "@/cache/CacheUtil"; | ||
| import { $getCurrentWorkSpace } from "@/core/application/CoreUtil"; | ||
| import type { Layer } from "@/core/domain/model/Layer"; | ||
|
|
||
| /** | ||
| * @description マスクスタイルを取得 | ||
| * Get mask style | ||
| * | ||
| * @param {HTMLElement} element | ||
| * @param {Layer} layer | ||
| * @param {number} x | ||
| * @param {number} y | ||
| * @return {Promise} | ||
| * @method | ||
| * @public | ||
| */ | ||
| export const execute = async ( | ||
| element: HTMLElement, | ||
| layer: Layer, | ||
| x: number, | ||
| y: number | ||
| ): Promise<void> => { | ||
|
|
||
| // styleを初期化 | ||
| const style = element.style; | ||
| style.mask = ""; | ||
| style.webkitMask = ""; | ||
| style.maskSize = ""; | ||
| style.webkitMaskSize = ""; | ||
| style.maskRepeat = ""; | ||
| style.webkitMaskRepeat = ""; | ||
| style.maskPosition = ""; | ||
| style.webkitMaskPosition = ""; | ||
|
|
||
| if (layer.parentId === -1) { | ||
| return ; | ||
| } | ||
|
|
||
| const workSpace = $getCurrentWorkSpace(); | ||
| const movieClip = workSpace.scene; | ||
|
|
||
| const maskLayer = movieClip.getLayerById(layer.parentId); | ||
| if (!maskLayer || !maskLayer.lock) { | ||
| return ; | ||
| } | ||
|
|
||
| const activeCharacters = maskLayer.getActiveCharacters(movieClip.currentFrame); | ||
| if (!activeCharacters.length) { | ||
| return ; | ||
| } | ||
|
|
||
| const maskCharacter = activeCharacters[0]; | ||
| if (!maskCharacter) { | ||
| return ; | ||
| } | ||
|
|
||
| const instance = workSpace.getLibrary(maskCharacter.libraryId); | ||
| if (!instance) { | ||
| return ; | ||
| } | ||
|
|
||
| const cacheKey = maskCharacter.cacheKey; | ||
|
|
||
| let canvas = $getCacheCanvas(workSpace.id, instance.id, cacheKey); | ||
| if (!canvas) { | ||
| canvas = await instance.getHTMLElement(); | ||
| if (!canvas) { | ||
| return ; | ||
| } | ||
|
|
||
| // キャッシュに保存 | ||
| $setCacheCanvas(workSpace.id, instance.id, cacheKey, canvas); | ||
| } | ||
|
|
||
| if (!canvas.dataset.base64) { | ||
| canvas.dataset.base64 = canvas.toDataURL(); | ||
| } | ||
|
|
||
| const base64 = canvas.dataset.base64; | ||
| const scale = window.devicePixelRatio; | ||
| const width = canvas.width / scale; | ||
| const height = canvas.height / scale; | ||
| const dx = maskCharacter.x - x; | ||
| const dy = maskCharacter.y - y; | ||
|
|
||
| style.mask = `url(${base64}), none`; | ||
| style.webkitMask = `url(${base64}), none`; | ||
| style.maskSize = `${width}px ${height}px`; | ||
| style.webkitMaskSize = `${width}px ${height}px`; | ||
| style.maskRepeat = "no-repeat"; | ||
| style.webkitMaskRepeat = "no-repeat"; | ||
| style.maskPosition = `${dx}px ${dy}px`; | ||
| style.webkitMaskPosition = `${dx}px ${dy}px`; | ||
| }; |
Oops, something went wrong.