Skip to content

develop #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ienaga merged 4 commits into from
Jun 21, 2025
Merged

develop #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c5a6ad
#196 update packages
ienaga Jun 19, 2025
37e1c7a
#196 表示領域内にDisplayObjectが含まれているかの判定処理を改修
ienaga Jun 21, 2025
ade553d
#196 バージョン情報を更新
ienaga Jun 21, 2025
1efa5df
#196 update packages
ienaga Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
925 changes: 473 additions & 452 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next2d/player",
"version": "2.3.1",
"version": "2.4.0",
"description": "Experience the fast and beautiful anti-aliased rendering of WebGL. You can create rich, interactive graphics, cross-platform applications and games without worrying about browser or device compatibility.",
"author": "Toshiyuki Ienaga<ienaga@next2d.app> (https://github.com/ienaga/)",
"license": "MIT",
Expand Down Expand Up @@ -46,24 +46,24 @@
},
"devDependencies": {
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.28.0",
"@rollup/plugin-commonjs": "^28.0.3",
"@eslint/js": "^9.29.0",
"@rollup/plugin-commonjs": "^28.0.6",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.2",
"@types/node": "^22.15.30",
"@typescript-eslint/eslint-plugin": "^8.33.1",
"@typescript-eslint/parser": "^8.33.1",
"@vitest/web-worker": "^3.2.2",
"eslint": "^9.28.0",
"@rollup/plugin-typescript": "^12.1.3",
"@types/node": "^24.0.3",
"@typescript-eslint/eslint-plugin": "^8.34.1",
"@typescript-eslint/parser": "^8.34.1",
"@vitest/web-worker": "^3.2.4",
"eslint": "^9.29.0",
"eslint-plugin-unused-imports": "^4.1.4",
"globals": "^16.2.0",
"jsdom": "^26.1.0",
"rollup": "^4.41.1",
"rollup": "^4.44.0",
"tslib": "^2.8.1",
"typescript": "^5.8.3",
"vite": "^6.3.5",
"vitest": "^3.2.2",
"vitest": "^3.2.4",
"vitest-webgl-canvas-mock": "^1.1.0"
},
"peerDependencies": {
Expand Down
8 changes: 3 additions & 5 deletions packages/display/src/DisplayObject/usecase/DisplayObjectIsMaskReflectedInDisplayUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ export const execute = <D extends DisplayObject>(
display_object: D,
matrix: Float32Array,
renderer_width: number,
renderer_height: number,
point_x: number,
point_y: number
renderer_height: number
): Float32Array | null => {

let bounds: Float32Array | null = null;
Expand Down Expand Up @@ -81,8 +79,8 @@ export const execute = <D extends DisplayObject>(
return null;
}

if (point_x > xMin + width
|| point_y > yMin + height
if (0 > xMin + width
|| 0 > yMin + height
|| xMin > renderer_width
|| yMin > renderer_height
) {
Expand Down
30 changes: 7 additions & 23 deletions ...ay/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import {
* @param {Float32Array} color_transform
* @param {number} renderer_width
* @param {number} renderer_height
* @param {number} point_x
* @param {number} point_y
* @return {void}
* @method
* @private
Expand All @@ -43,9 +41,7 @@ export const execute = <P extends DisplayObjectContainer>(
matrix: Float32Array,
color_transform: Float32Array,
renderer_width: number,
renderer_height: number,
point_x: number,
point_y: number
renderer_height: number
): void => {

if (!display_object_container.visible) {
Expand Down Expand Up @@ -107,9 +103,7 @@ export const execute = <P extends DisplayObjectContainer>(
maskDisplayObject,
tMatrix,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);

if (!bounds) {
Expand Down Expand Up @@ -175,9 +169,7 @@ export const execute = <P extends DisplayObjectContainer>(
child,
tMatrix,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);

canRenderMask = bounds ? true : false;
Expand Down Expand Up @@ -222,9 +214,7 @@ export const execute = <P extends DisplayObjectContainer>(
tMatrix,
tColorTransform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -234,9 +224,7 @@ export const execute = <P extends DisplayObjectContainer>(
tMatrix,
tColorTransform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -246,9 +234,7 @@ export const execute = <P extends DisplayObjectContainer>(
tMatrix,
tColorTransform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -259,9 +245,7 @@ export const execute = <P extends DisplayObjectContainer>(
tMatrix,
tColorTransform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand Down
10 changes: 3 additions & 7 deletions packages/display/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ import {
* @param {Float32Array} color_transform
* @param {number} renderer_width
* @param {number} renderer_height
* @param {number} point_x
* @param {number} point_y
* @return {void}
* @method
* @protected
Expand All @@ -45,9 +43,7 @@ export const execute = (
matrix: Float32Array,
color_transform: Float32Array,
renderer_width: number,
renderer_height: number,
point_x: number,
point_y: number
renderer_height: number
): void => {

if (!shape.visible) {
Expand Down Expand Up @@ -120,8 +116,8 @@ export const execute = (

}

if (point_x > xMin + width
|| point_y > yMin + height
if (0 > xMin + width
|| 0 > yMin + height
|| xMin > renderer_width
|| yMin > renderer_height
) {
Expand Down
4 changes: 1 addition & 3 deletions packages/display/src/Stage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,7 @@ export class Stage extends DisplayObjectContainer
matrix,
color_transform,
this.rendererWidth,
this.rendererHeight,
-matrix[4],
-matrix[5]
this.rendererHeight
);
}

Expand Down
22 changes: 5 additions & 17 deletions packages/display/src/Stage/usecase/StageGenerateRenderQueueUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import { execute as textFieldGenerateRenderQueueUseCase } from "../../TextField/
* @param {Float32Array} color_transform
* @param {number} renderer_width
* @param {number} renderer_height
* @param {number} point_x
* @param {number} point_y
* @return {void}
* @method
* @protected
Expand All @@ -32,9 +30,7 @@ export const execute = <D extends DisplayObject> (
matrix: Float32Array,
color_transform: Float32Array,
renderer_width: number,
renderer_height: number,
point_x: number,
point_y: number
renderer_height: number
): void => {

renderQueue.push(stage.backgroundColor);
Expand All @@ -48,9 +44,7 @@ export const execute = <D extends DisplayObject> (
matrix,
color_transform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -60,9 +54,7 @@ export const execute = <D extends DisplayObject> (
matrix,
color_transform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -72,9 +64,7 @@ export const execute = <D extends DisplayObject> (
matrix,
color_transform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand All @@ -85,9 +75,7 @@ export const execute = <D extends DisplayObject> (
matrix,
color_transform,
renderer_width,
renderer_height,
point_x,
point_y
renderer_height
);
break;

Expand Down
8 changes: 2 additions & 6 deletions packages/display/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
* @param {Float32Array} color_transform
* @param {number} renderer_width
* @param {number} renderer_height
* @param {number} point_x
* @param {number} point_y
* @return {void}
* @method
* @protected
Expand All @@ -45,9 +43,7 @@
matrix: Float32Array,
color_transform: Float32Array,
renderer_width: number,
renderer_height: number,

Check warning on line 46 in packages/display/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.ts

View workflow job for this annotation

GitHub Actions / macos-browser-test 

Unexpected trailing comma

Check warning on line 46 in packages/display/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.ts

View workflow job for this annotation

GitHub Actions / windows-browser-test 

Unexpected trailing comma

Check warning on line 46 in packages/display/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.ts

View workflow job for this annotation

GitHub Actions / macos-browser-test 

Unexpected trailing comma

Check warning on line 46 in packages/display/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.ts

View workflow job for this annotation

GitHub Actions / windows-browser-test 

Unexpected trailing comma
point_x: number,
point_y: number
): void => {

if (!text_field.visible) {
Expand Down Expand Up @@ -113,8 +109,8 @@

}

if (point_x > xMin + width
|| point_y > yMin + height
if (0 > xMin + width
|| 0 > yMin + height
|| xMin > renderer_width
|| yMin > renderer_height
) {
Expand Down
10 changes: 3 additions & 7 deletions packages/display/src/Video/usecase/VideoGenerateRenderQueueUseCase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ import {
* @param {Float32Array} color_transform
* @param {number} renderer_width
* @param {number} renderer_height
* @param {number} point_x
* @param {number} point_y
* @return {void}
* @method
* @protected
Expand All @@ -41,9 +39,7 @@ export const execute = (
matrix: Float32Array,
color_transform: Float32Array,
renderer_width: number,
renderer_height: number,
point_x: number,
point_y: number
renderer_height: number
): void => {

if (!video.visible
Expand Down Expand Up @@ -113,8 +109,8 @@ export const execute = (

}

if (point_x > xMin + width
|| point_y > yMin + height
if (0 > xMin + width
|| 0 > yMin + height
|| xMin > renderer_width
|| yMin > renderer_height
) {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Next2D } from "@next2d/core";

if (!("next2d" in window)) {
console.log("%c Next2D Player %c 2.3.1 %c https://next2d.app",
console.log("%c Next2D Player %c 2.4.0 %c https://next2d.app",
"color: #fff; background: #5f5f5f",
"color: #fff; background: #4bc729",
"");
Expand Down