@next2d/display 2.3.0 → 2.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +9 -9
- package/src/DisplayObject/usecase/DisplayObjectIsMaskReflectedInDisplayUseCase.d.ts +1 -1
- package/src/DisplayObject/usecase/DisplayObjectIsMaskReflectedInDisplayUseCase.js +3 -3
- package/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.d.ts +1 -3
- package/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.js +7 -9
- package/src/Loader/worker/unzip.worker.inline.js +1 -1
- package/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.d.ts +1 -3
- package/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.js +3 -5
- package/src/Stage/usecase/StageGenerateRenderQueueUseCase.d.ts +1 -3
- package/src/Stage/usecase/StageGenerateRenderQueueUseCase.js +5 -7
- package/src/Stage.js +1 -1
- package/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.d.ts +1 -3
- package/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.js +3 -5
- package/src/Video/usecase/VideoGenerateRenderQueueUseCase.d.ts +1 -3
- package/src/Video/usecase/VideoGenerateRenderQueueUseCase.js +3 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next2d/display",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"description": "Next2D Display Package",
|
|
5
5
|
"author": "Toshiyuki Ienaga<ienaga@next2d.app> (https://github.com/ienaga/)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
"url": "git+https://github.com/Next2D/Player.git"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@next2d/ui": "2.
|
|
28
|
-
"@next2d/text": "2.
|
|
29
|
-
"@next2d/geom": "2.
|
|
30
|
-
"@next2d/media": "2.
|
|
31
|
-
"@next2d/net": "2.
|
|
32
|
-
"@next2d/events": "2.
|
|
33
|
-
"@next2d/filters": "2.
|
|
34
|
-
"@next2d/render-queue": "2.
|
|
27
|
+
"@next2d/ui": "2.4.0",
|
|
28
|
+
"@next2d/text": "2.4.0",
|
|
29
|
+
"@next2d/geom": "2.4.0",
|
|
30
|
+
"@next2d/media": "2.4.0",
|
|
31
|
+
"@next2d/net": "2.4.0",
|
|
32
|
+
"@next2d/events": "2.4.0",
|
|
33
|
+
"@next2d/filters": "2.4.0",
|
|
34
|
+
"@next2d/render-queue": "2.4.0"
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -13,4 +13,4 @@ import type { DisplayObject } from "../../DisplayObject";
|
|
|
13
13
|
* @method
|
|
14
14
|
* @protected
|
|
15
15
|
*/
|
|
16
|
-
export declare const execute: <D extends DisplayObject>(display_object: D, matrix: Float32Array, renderer_width: number, renderer_height: number
|
|
16
|
+
export declare const execute: <D extends DisplayObject>(display_object: D, matrix: Float32Array, renderer_width: number, renderer_height: number) => Float32Array | null;
|
|
@@ -16,7 +16,7 @@ import { execute as displayObjectContainerCalcBoundsMatrixUseCase } from "../../
|
|
|
16
16
|
* @method
|
|
17
17
|
* @protected
|
|
18
18
|
*/
|
|
19
|
-
export const execute = (display_object, matrix, renderer_width, renderer_height
|
|
19
|
+
export const execute = (display_object, matrix, renderer_width, renderer_height) => {
|
|
20
20
|
let bounds = null;
|
|
21
21
|
switch (true) {
|
|
22
22
|
case display_object.isContainerEnabled:
|
|
@@ -49,8 +49,8 @@ export const execute = (display_object, matrix, renderer_width, renderer_height,
|
|
|
49
49
|
if (!height) {
|
|
50
50
|
return null;
|
|
51
51
|
}
|
|
52
|
-
if (
|
|
53
|
-
||
|
|
52
|
+
if (0 > xMin + width
|
|
53
|
+
|| 0 > yMin + height
|
|
54
54
|
|| xMin > renderer_width
|
|
55
55
|
|| yMin > renderer_height) {
|
|
56
56
|
return null;
|
package/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.d.ts
CHANGED
|
@@ -9,10 +9,8 @@ import type { DisplayObjectContainer } from "../../DisplayObjectContainer";
|
|
|
9
9
|
* @param {Float32Array} color_transform
|
|
10
10
|
* @param {number} renderer_width
|
|
11
11
|
* @param {number} renderer_height
|
|
12
|
-
* @param {number} point_x
|
|
13
|
-
* @param {number} point_y
|
|
14
12
|
* @return {void}
|
|
15
13
|
* @method
|
|
16
14
|
* @private
|
|
17
15
|
*/
|
|
18
|
-
export declare const execute: <P extends DisplayObjectContainer>(display_object_container: P, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number
|
|
16
|
+
export declare const execute: <P extends DisplayObjectContainer>(display_object_container: P, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number) => void;
|
package/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.js
CHANGED
|
@@ -19,13 +19,11 @@ import { ColorTransform, Matrix } from "@next2d/geom";
|
|
|
19
19
|
* @param {Float32Array} color_transform
|
|
20
20
|
* @param {number} renderer_width
|
|
21
21
|
* @param {number} renderer_height
|
|
22
|
-
* @param {number} point_x
|
|
23
|
-
* @param {number} point_y
|
|
24
22
|
* @return {void}
|
|
25
23
|
* @method
|
|
26
24
|
* @private
|
|
27
25
|
*/
|
|
28
|
-
export const execute = (display_object_container, image_bitmaps, matrix, color_transform, renderer_width, renderer_height
|
|
26
|
+
export const execute = (display_object_container, image_bitmaps, matrix, color_transform, renderer_width, renderer_height) => {
|
|
29
27
|
if (!display_object_container.visible) {
|
|
30
28
|
renderQueue.push(0);
|
|
31
29
|
return;
|
|
@@ -72,7 +70,7 @@ export const execute = (display_object_container, image_bitmaps, matrix, color_t
|
|
|
72
70
|
// mask
|
|
73
71
|
const maskDisplayObject = display_object_container.mask;
|
|
74
72
|
if (maskDisplayObject) {
|
|
75
|
-
const bounds = displayObjectIsMaskReflectedInDisplayUseCase(maskDisplayObject, tMatrix, renderer_width, renderer_height
|
|
73
|
+
const bounds = displayObjectIsMaskReflectedInDisplayUseCase(maskDisplayObject, tMatrix, renderer_width, renderer_height);
|
|
76
74
|
if (!bounds) {
|
|
77
75
|
renderQueue.push(0);
|
|
78
76
|
}
|
|
@@ -115,7 +113,7 @@ export const execute = (display_object_container, image_bitmaps, matrix, color_t
|
|
|
115
113
|
if (child.clipDepth) {
|
|
116
114
|
clipDepth = child.clipDepth;
|
|
117
115
|
// マスクの描画開始判定
|
|
118
|
-
const bounds = displayObjectIsMaskReflectedInDisplayUseCase(child, tMatrix, renderer_width, renderer_height
|
|
116
|
+
const bounds = displayObjectIsMaskReflectedInDisplayUseCase(child, tMatrix, renderer_width, renderer_height);
|
|
119
117
|
canRenderMask = bounds ? true : false;
|
|
120
118
|
renderQueue.push(+canRenderMask);
|
|
121
119
|
if (!bounds) {
|
|
@@ -138,16 +136,16 @@ export const execute = (display_object_container, image_bitmaps, matrix, color_t
|
|
|
138
136
|
}
|
|
139
137
|
switch (true) {
|
|
140
138
|
case child.isContainerEnabled: // 0x00
|
|
141
|
-
execute(child, image_bitmaps, tMatrix, tColorTransform, renderer_width, renderer_height
|
|
139
|
+
execute(child, image_bitmaps, tMatrix, tColorTransform, renderer_width, renderer_height);
|
|
142
140
|
break;
|
|
143
141
|
case child.isShape: // 0x01
|
|
144
|
-
shapeGenerateRenderQueueUseCase(child, tMatrix, tColorTransform, renderer_width, renderer_height
|
|
142
|
+
shapeGenerateRenderQueueUseCase(child, tMatrix, tColorTransform, renderer_width, renderer_height);
|
|
145
143
|
break;
|
|
146
144
|
case child.isText: // 0x02
|
|
147
|
-
textFieldGenerateRenderQueueUseCase(child, tMatrix, tColorTransform, renderer_width, renderer_height
|
|
145
|
+
textFieldGenerateRenderQueueUseCase(child, tMatrix, tColorTransform, renderer_width, renderer_height);
|
|
148
146
|
break;
|
|
149
147
|
case child.isVideo: // 0x03
|
|
150
|
-
videoGenerateRenderQueueUseCase(child, image_bitmaps, tMatrix, tColorTransform, renderer_width, renderer_height
|
|
148
|
+
videoGenerateRenderQueueUseCase(child, image_bitmaps, tMatrix, tColorTransform, renderer_width, renderer_height);
|
|
151
149
|
break;
|
|
152
150
|
default:
|
|
153
151
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export const workerInlineUrl = 'data:application/javascript;base64,
|
|
1
|
+
export const workerInlineUrl = 'data:application/javascript;base64,IWZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciByPVVpbnQ4QXJyYXksbj1VaW50MTZBcnJheSxlPUludDMyQXJyYXksYT1uZXcgcihbMCwwLDAsMCwwLDAsMCwwLDEsMSwxLDEsMiwyLDIsMiwzLDMsMywzLDQsNCw0LDQsNSw1LDUsNSwwLDAsMCwwXSksdD1uZXcgcihbMCwwLDAsMCwxLDEsMiwyLDMsMyw0LDQsNSw1LDYsNiw3LDcsOCw4LDksOSwxMCwxMCwxMSwxMSwxMiwxMiwxMywxMywwLDBdKSxpPW5ldyByKFsxNiwxNywxOCwwLDgsNyw5LDYsMTAsNSwxMSw0LDEyLDMsMTMsMiwxNCwxLDE1XSksZj1mdW5jdGlvbihyLGEpe2Zvcih2YXIgdD1uZXcgbigzMSksaT0wO2k8MzE7KytpKXRbaV09YSs9MTw8cltpLTFdO3ZhciBmPW5ldyBlKHRbMzBdKTtmb3IoaT0xO2k8MzA7KytpKWZvcih2YXIgbz10W2ldO288dFtpKzFdOysrbylmW29dPW8tdFtpXTw8NXxpO3JldHVybntiOnQscjpmfX0sbz1mKGEsMiksdj1vLmIsbD1vLnI7dlsyOF09MjU4LGxbMjU4XT0yODtmb3IodmFyIHU9Zih0LDApLmIsZD1uZXcgbigzMjc2OCksYz0wO2M8MzI3Njg7KytjKXt2YXIgcz0oNDM2OTAmYyk+PjF8KDIxODQ1JmMpPDwxO3M9KDYxNjgwJihzPSg1MjQyOCZzKT4+MnwoMTMxMDcmcyk8PDIpKT4+NHwoMzg1NSZzKTw8NCxkW2NdPSgoNjUyODAmcyk+Pjh8KDI1NSZzKTw8OCk+PjF9dmFyIHc9ZnVuY3Rpb24ocixlLGEpe2Zvcih2YXIgdD1yLmxlbmd0aCxpPTAsZj1uZXcgbihlKTtpPHQ7KytpKXJbaV0mJisrZltyW2ldLTFdO3ZhciBvLHY9bmV3IG4oZSk7Zm9yKGk9MTtpPGU7KytpKXZbaV09dltpLTFdK2ZbaS0xXTw8MTtpZihhKXtvPW5ldyBuKDE8PGUpO3ZhciBsPTE1LWU7Zm9yKGk9MDtpPHQ7KytpKWlmKHJbaV0pZm9yKHZhciB1PWk8PDR8cltpXSxjPWUtcltpXSxzPXZbcltpXS0xXSsrPDxjLHc9c3woMTw8YyktMTtzPD13OysrcylvW2Rbc10+PmxdPXV9ZWxzZSBmb3Iobz1uZXcgbih0KSxpPTA7aTx0OysraSlyW2ldJiYob1tpXT1kW3ZbcltpXS0xXSsrXT4+MTUtcltpXSk7cmV0dXJuIG99LGI9bmV3IHIoMjg4KTtmb3IoYz0wO2M8MTQ0OysrYyliW2NdPTg7Zm9yKGM9MTQ0O2M8MjU2OysrYyliW2NdPTk7Zm9yKGM9MjU2O2M8MjgwOysrYyliW2NdPTc7Zm9yKGM9MjgwO2M8Mjg4OysrYyliW2NdPTg7dmFyIGc9bmV3IHIoMzIpO2ZvcihjPTA7YzwzMjsrK2MpZ1tjXT01O3ZhciBoPXcoYiw5LDEpLHA9dyhnLDUsMSkseT1mdW5jdGlvbihyKXtmb3IodmFyIG49clswXSxlPTE7ZTxyLmxlbmd0aDsrK2UpcltlXT5uJiYobj1yW2VdKTtyZXR1cm4gbn0sbT1mdW5jdGlvbihyLG4sZSl7dmFyIGE9bi84fDA7cmV0dXJuKHJbYV18clthKzFdPDw4KT4+KDcmbikmZX0saz1mdW5jdGlvbihyLG4pe3ZhciBlPW4vOHwwO3JldHVybihyW2VdfHJbZSsxXTw8OHxyW2UrMl08PDE2KT4+KDcmbil9LHg9ZnVuY3Rpb24ocil7cmV0dXJuKHIrNykvOHwwfSx6PVsidW5leHBlY3RlZCBFT0YiLCJpbnZhbGlkIGJsb2NrIHR5cGUiLCJpbnZhbGlkIGxlbmd0aC9saXRlcmFsIiwiaW52YWxpZCBkaXN0YW5jZSIsInN0cmVhbSBmaW5pc2hlZCIsIm5vIHN0cmVhbSBoYW5kbGVyIiwsIm5vIGNhbGxiYWNrIiwiaW52YWxpZCBVVEYtOCBkYXRhIiwiZXh0cmEgZmllbGQgdG9vIGxvbmciLCJkYXRlIG5vdCBpbiByYW5nZSAxOTgwLTIwOTkiLCJmaWxlbmFtZSB0b28gbG9uZyIsInN0cmVhbSBmaW5pc2hpbmciLCJpbnZhbGlkIHppcCBkYXRhIl0sRT1mdW5jdGlvbihyLG4sZSl7dmFyIGE9bmV3IEVycm9yKG58fHpbcl0pO2lmKGEuY29kZT1yLEVycm9yLmNhcHR1cmVTdGFja1RyYWNlJiZFcnJvci5jYXB0dXJlU3RhY2tUcmFjZShhLEUpLCFlKXRocm93IGE7cmV0dXJuIGF9LFQ9ZnVuY3Rpb24obixlLGYsbyl7dmFyIGw9bi5sZW5ndGg7aWYoIWx8fGUuZiYmIWUubClyZXR1cm4gZnx8bmV3IHIoMCk7dmFyIGQ9IWYsYz1kfHwyIT1lLmkscz1lLmk7ZCYmKGY9bmV3IHIoMypsKSk7dmFyIGI9ZnVuY3Rpb24obil7dmFyIGU9Zi5sZW5ndGg7aWYobj5lKXt2YXIgYT1uZXcgcihNYXRoLm1heCgyKmUsbikpO2Euc2V0KGYpLGY9YX19LGc9ZS5mfHwwLHo9ZS5wfHwwLFQ9ZS5ifHwwLFM9ZS5sLFU9ZS5kLEE9ZS5tLEM9ZS5uLE09OCpsO2Rve2lmKCFTKXtnPW0obix6LDEpO3ZhciBEPW0obix6KzEsMyk7aWYoeis9MywhRCl7dmFyIEY9blsoSD14KHopKzQpLTRdfG5bSC0zXTw8OCxJPUgrRjtpZihJPmwpe3MmJkUoMCk7YnJlYWt9YyYmYihUK0YpLGYuc2V0KG4uc3ViYXJyYXkoSCxJKSxUKSxlLmI9VCs9RixlLnA9ej04KkksZS5mPWc7Y29udGludWV9aWYoMT09RClTPWgsVT1wLEE9OSxDPTU7ZWxzZSBpZigyPT1EKXt2YXIgTz1tKG4seiwzMSkrMjU3LEo9bShuLHorMTAsMTUpKzQsTD1PK20obix6KzUsMzEpKzE7eis9MTQ7Zm9yKHZhciBOPW5ldyByKEwpLFI9bmV3IHIoMTkpLGo9MDtqPEo7KytqKVJbaVtqXV09bShuLHorMypqLDcpO3orPTMqSjt2YXIgcT15KFIpLEI9KDE8PHEpLTEsRz13KFIscSwxKTtmb3Ioaj0wO2o8TDspe3ZhciBILEs9R1ttKG4seixCKV07aWYoeis9MTUmSywoSD1LPj40KTwxNilOW2orK109SDtlbHNle3ZhciBQPTAsUT0wO2ZvcigxNj09SD8oUT0zK20obix6LDMpLHorPTIsUD1OW2otMV0pOjE3PT1IPyhRPTMrbShuLHosNykseis9Myk6MTg9PUgmJihRPTExK20obix6LDEyNykseis9Nyk7US0tOylOW2orK109UH19dmFyIFY9Ti5zdWJhcnJheSgwLE8pLFc9Ti5zdWJhcnJheShPKTtBPXkoViksQz15KFcpLFM9dyhWLEEsMSksVT13KFcsQywxKX1lbHNlIEUoMSk7aWYoej5NKXtzJiZFKDApO2JyZWFrfX1jJiZiKFQrMTMxMDcyKTtmb3IodmFyIFg9KDE8PEEpLTEsWT0oMTw8QyktMSxaPXo7O1o9eil7dmFyICQ9KFA9U1trKG4seikmWF0pPj40O2lmKCh6Kz0xNSZQKT5NKXtzJiZFKDApO2JyZWFrfWlmKFB8fEUoMiksJDwyNTYpZltUKytdPSQ7ZWxzZXtpZigyNTY9PSQpe1o9eixTPW51bGw7YnJlYWt9dmFyIF89JC0yNTQ7aWYoJD4yNjQpe3ZhciBycj1hW2o9JC0yNTddO189bShuLHosKDE8PHJyKS0xKSt2W2pdLHorPXJyfXZhciBucj1VW2sobix6KSZZXSxlcj1ucj4+NDtucnx8RSgzKSx6Kz0xNSZucjtXPXVbZXJdO2lmKGVyPjMpe3JyPXRbZXJdO1crPWsobix6KSYoMTw8cnIpLTEseis9cnJ9aWYoej5NKXtzJiZFKDApO2JyZWFrfWMmJmIoVCsxMzEwNzIpO3ZhciBhcj1UK187aWYoVDxXKXt2YXIgdHI9MC1XLGlyPU1hdGgubWluKFcsYXIpO2Zvcih0citUPDAmJkUoMyk7VDxpcjsrK1QpZltUXT1vW3RyK1RdfWZvcig7VDxhcjsrK1QpZltUXT1mW1QtV119fWUubD1TLGUucD1aLGUuYj1ULGUuZj1nLFMmJihnPTEsZS5tPUEsZS5kPVUsZS5uPUMpfXdoaWxlKCFnKTtyZXR1cm4gVCE9Zi5sZW5ndGgmJmQ/ZnVuY3Rpb24obixlLGEpe3JldHVybihudWxsPT1hfHxhPm4ubGVuZ3RoKSYmKGE9bi5sZW5ndGgpLG5ldyByKG4uc3ViYXJyYXkoZSxhKSl9KGYsMCxUKTpmLnN1YmFycmF5KDAsVCl9LFM9bmV3IHIoMCk7ZnVuY3Rpb24gVShuLGUpe3ZhciBhLHQsaT1mdW5jdGlvbihyKXszMT09clswXSYmMTM5PT1yWzFdJiY4PT1yWzJdfHxFKDYsImludmFsaWQgZ3ppcCBkYXRhIik7dmFyIG49clszXSxlPTEwOzQmbiYmKGUrPTIrKHJbMTBdfHJbMTFdPDw4KSk7Zm9yKHZhciBhPShuPj4zJjEpKyhuPj40JjEpO2E+MDthLT0hcltlKytdKTtyZXR1cm4gZSsoMiZuKX0obik7cmV0dXJuIGkrOD5uLmxlbmd0aCYmRSg2LCJpbnZhbGlkIGd6aXAgZGF0YSIpLFQobi5zdWJhcnJheShpLC04KSx7aToyfSxuZXcgcigodD0oYT1uKS5sZW5ndGgsKGFbdC00XXxhW3QtM108PDh8YVt0LTJdPDwxNnxhW3QtMV08PDI0KT4+PjApKSxlKX1mdW5jdGlvbiBBKHIsbil7cmV0dXJuIFQoci5zdWJhcnJheSgoKDghPSgxNSYoZT1yKVswXSl8fGVbMF0+PjQ+N3x8KGVbMF08PDh8ZVsxXSklMzEpJiZFKDYsImludmFsaWQgemxpYiBkYXRhIiksMT09KGVbMV0+PjUmMSkmJkUoNiwiaW52YWxpZCB6bGliIGRhdGE6ICIrKDMyJmVbMV0/Im5lZWQiOiJ1bmV4cGVjdGVkIikrIiBkaWN0aW9uYXJ5IiksMisoZVsxXT4+MyY0KSksLTQpLHtpOjJ9LG4sbik7dmFyIGV9ZnVuY3Rpb24gQyhyLG4pe3JldHVybiAzMT09clswXSYmMTM5PT1yWzFdJiY4PT1yWzJdP1UocixuKTo4IT0oMTUmclswXSl8fHJbMF0+PjQ+N3x8KHJbMF08PDh8clsxXSklMzE/ZnVuY3Rpb24ocixuKXtyZXR1cm4gVChyLHtpOjJ9LG4sbil9KHIsbik6QShyLG4pfXZhciBNPSJ1bmRlZmluZWQiIT10eXBlb2YgVGV4dERlY29kZXImJm5ldyBUZXh0RGVjb2Rlcjt0cnl7TS5kZWNvZGUoUyx7c3RyZWFtOiEwfSl9Y2F0Y2gocil7fXNlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIscj0+e2NvbnN0IG49QyhyLmRhdGEpO2xldCBlPSIiO2ZvcihsZXQgcj0wO3I8bi5sZW5ndGg7cis9NDA5NillKz1TdHJpbmcuZnJvbUNoYXJDb2RlKC4uLm4uc3ViYXJyYXkocixyKzQwOTYpKTtzZWxmLnBvc3RNZXNzYWdlKEpTT04ucGFyc2UoZGVjb2RlVVJJQ29tcG9uZW50KGUpKSl9KX0oKTsK';
|
|
@@ -8,10 +8,8 @@ import type { Shape } from "../../Shape";
|
|
|
8
8
|
* @param {Float32Array} color_transform
|
|
9
9
|
* @param {number} renderer_width
|
|
10
10
|
* @param {number} renderer_height
|
|
11
|
-
* @param {number} point_x
|
|
12
|
-
* @param {number} point_y
|
|
13
11
|
* @return {void}
|
|
14
12
|
* @method
|
|
15
13
|
* @protected
|
|
16
14
|
*/
|
|
17
|
-
export declare const execute: (shape: Shape, matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number
|
|
15
|
+
export declare const execute: (shape: Shape, matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number) => void;
|
|
@@ -17,13 +17,11 @@ import { ColorTransform, Matrix } from "@next2d/geom";
|
|
|
17
17
|
* @param {Float32Array} color_transform
|
|
18
18
|
* @param {number} renderer_width
|
|
19
19
|
* @param {number} renderer_height
|
|
20
|
-
* @param {number} point_x
|
|
21
|
-
* @param {number} point_y
|
|
22
20
|
* @return {void}
|
|
23
21
|
* @method
|
|
24
22
|
* @protected
|
|
25
23
|
*/
|
|
26
|
-
export const execute = (shape, matrix, color_transform, renderer_width, renderer_height
|
|
24
|
+
export const execute = (shape, matrix, color_transform, renderer_width, renderer_height) => {
|
|
27
25
|
if (!shape.visible) {
|
|
28
26
|
renderQueue.push(0);
|
|
29
27
|
return;
|
|
@@ -79,8 +77,8 @@ export const execute = (shape, matrix, color_transform, renderer_width, renderer
|
|
|
79
77
|
default:
|
|
80
78
|
break;
|
|
81
79
|
}
|
|
82
|
-
if (
|
|
83
|
-
||
|
|
80
|
+
if (0 > xMin + width
|
|
81
|
+
|| 0 > yMin + height
|
|
84
82
|
|| xMin > renderer_width
|
|
85
83
|
|| yMin > renderer_height) {
|
|
86
84
|
if (tColorTransform !== color_transform) {
|
|
@@ -9,10 +9,8 @@ import type { DisplayObject } from "../../DisplayObject";
|
|
|
9
9
|
* @param {Float32Array} color_transform
|
|
10
10
|
* @param {number} renderer_width
|
|
11
11
|
* @param {number} renderer_height
|
|
12
|
-
* @param {number} point_x
|
|
13
|
-
* @param {number} point_y
|
|
14
12
|
* @return {void}
|
|
15
13
|
* @method
|
|
16
14
|
* @protected
|
|
17
15
|
*/
|
|
18
|
-
export declare const execute: <D extends DisplayObject>(display_object: D, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number
|
|
16
|
+
export declare const execute: <D extends DisplayObject>(display_object: D, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number) => void;
|
|
@@ -14,26 +14,24 @@ import { execute as textFieldGenerateRenderQueueUseCase } from "../../TextField/
|
|
|
14
14
|
* @param {Float32Array} color_transform
|
|
15
15
|
* @param {number} renderer_width
|
|
16
16
|
* @param {number} renderer_height
|
|
17
|
-
* @param {number} point_x
|
|
18
|
-
* @param {number} point_y
|
|
19
17
|
* @return {void}
|
|
20
18
|
* @method
|
|
21
19
|
* @protected
|
|
22
20
|
*/
|
|
23
|
-
export const execute = (display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height
|
|
21
|
+
export const execute = (display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height) => {
|
|
24
22
|
renderQueue.push(stage.backgroundColor);
|
|
25
23
|
switch (true) {
|
|
26
24
|
case display_object.isContainerEnabled: // 0x00
|
|
27
|
-
displayObjectContainerGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height
|
|
25
|
+
displayObjectContainerGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height);
|
|
28
26
|
break;
|
|
29
27
|
case display_object.isShape: // 0x01
|
|
30
|
-
shapeGenerateRenderQueueUseCase(display_object, matrix, color_transform, renderer_width, renderer_height
|
|
28
|
+
shapeGenerateRenderQueueUseCase(display_object, matrix, color_transform, renderer_width, renderer_height);
|
|
31
29
|
break;
|
|
32
30
|
case display_object.isText: // 0x02
|
|
33
|
-
textFieldGenerateRenderQueueUseCase(display_object, matrix, color_transform, renderer_width, renderer_height
|
|
31
|
+
textFieldGenerateRenderQueueUseCase(display_object, matrix, color_transform, renderer_width, renderer_height);
|
|
34
32
|
break;
|
|
35
33
|
case display_object.isVideo: // 0x03
|
|
36
|
-
videoGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height
|
|
34
|
+
videoGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, renderer_width, renderer_height);
|
|
37
35
|
break;
|
|
38
36
|
default:
|
|
39
37
|
break;
|
package/src/Stage.js
CHANGED
|
@@ -215,7 +215,7 @@ export class Stage extends DisplayObjectContainer {
|
|
|
215
215
|
* @protected
|
|
216
216
|
*/
|
|
217
217
|
$generateRenderQueue(display_object, image_bitmaps, matrix, color_transform) {
|
|
218
|
-
stageGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, this.rendererWidth, this.rendererHeight
|
|
218
|
+
stageGenerateRenderQueueUseCase(display_object, image_bitmaps, matrix, color_transform, this.rendererWidth, this.rendererHeight);
|
|
219
219
|
}
|
|
220
220
|
/**
|
|
221
221
|
* @description タップポイントの当たり判定
|
|
@@ -8,10 +8,8 @@ import type { TextField } from "@next2d/text";
|
|
|
8
8
|
* @param {Float32Array} color_transform
|
|
9
9
|
* @param {number} renderer_width
|
|
10
10
|
* @param {number} renderer_height
|
|
11
|
-
* @param {number} point_x
|
|
12
|
-
* @param {number} point_y
|
|
13
11
|
* @return {void}
|
|
14
12
|
* @method
|
|
15
13
|
* @protected
|
|
16
14
|
*/
|
|
17
|
-
export declare const execute: (text_field: TextField, matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number
|
|
15
|
+
export declare const execute: (text_field: TextField, matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number) => void;
|
|
@@ -21,13 +21,11 @@ const $textEncoder = new TextEncoder();
|
|
|
21
21
|
* @param {Float32Array} color_transform
|
|
22
22
|
* @param {number} renderer_width
|
|
23
23
|
* @param {number} renderer_height
|
|
24
|
-
* @param {number} point_x
|
|
25
|
-
* @param {number} point_y
|
|
26
24
|
* @return {void}
|
|
27
25
|
* @method
|
|
28
26
|
* @protected
|
|
29
27
|
*/
|
|
30
|
-
export const execute = (text_field, matrix, color_transform, renderer_width, renderer_height
|
|
28
|
+
export const execute = (text_field, matrix, color_transform, renderer_width, renderer_height) => {
|
|
31
29
|
if (!text_field.visible) {
|
|
32
30
|
renderQueue.push(0);
|
|
33
31
|
return;
|
|
@@ -77,8 +75,8 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
|
|
|
77
75
|
default:
|
|
78
76
|
break;
|
|
79
77
|
}
|
|
80
|
-
if (
|
|
81
|
-
||
|
|
78
|
+
if (0 > xMin + width
|
|
79
|
+
|| 0 > yMin + height
|
|
82
80
|
|| xMin > renderer_width
|
|
83
81
|
|| yMin > renderer_height) {
|
|
84
82
|
if (tColorTransform !== color_transform) {
|
|
@@ -9,10 +9,8 @@ import type { Video } from "@next2d/media";
|
|
|
9
9
|
* @param {Float32Array} color_transform
|
|
10
10
|
* @param {number} renderer_width
|
|
11
11
|
* @param {number} renderer_height
|
|
12
|
-
* @param {number} point_x
|
|
13
|
-
* @param {number} point_y
|
|
14
12
|
* @return {void}
|
|
15
13
|
* @method
|
|
16
14
|
* @protected
|
|
17
15
|
*/
|
|
18
|
-
export declare const execute: (video: Video, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number
|
|
16
|
+
export declare const execute: (video: Video, image_bitmaps: ImageBitmap[], matrix: Float32Array, color_transform: Float32Array, renderer_width: number, renderer_height: number) => void;
|
|
@@ -17,13 +17,11 @@ import { ColorTransform, Matrix } from "@next2d/geom";
|
|
|
17
17
|
* @param {Float32Array} color_transform
|
|
18
18
|
* @param {number} renderer_width
|
|
19
19
|
* @param {number} renderer_height
|
|
20
|
-
* @param {number} point_x
|
|
21
|
-
* @param {number} point_y
|
|
22
20
|
* @return {void}
|
|
23
21
|
* @method
|
|
24
22
|
* @protected
|
|
25
23
|
*/
|
|
26
|
-
export const execute = (video, image_bitmaps, matrix, color_transform, renderer_width, renderer_height
|
|
24
|
+
export const execute = (video, image_bitmaps, matrix, color_transform, renderer_width, renderer_height) => {
|
|
27
25
|
if (!video.visible
|
|
28
26
|
|| !video.$videoElement
|
|
29
27
|
|| !video.$offscreenCanvas
|
|
@@ -76,8 +74,8 @@ export const execute = (video, image_bitmaps, matrix, color_transform, renderer_
|
|
|
76
74
|
default:
|
|
77
75
|
break;
|
|
78
76
|
}
|
|
79
|
-
if (
|
|
80
|
-
||
|
|
77
|
+
if (0 > xMin + width
|
|
78
|
+
|| 0 > yMin + height
|
|
81
79
|
|| xMin > renderer_width
|
|
82
80
|
|| yMin > renderer_height) {
|
|
83
81
|
if (tColorTransform !== color_transform) {
|