Skip to content
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.

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

Develop #166

Merged
merged 6 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion next2d.js

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next2d/player",
"version": "1.18.11",
"version": "1.18.12",
"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 @@ -33,27 +33,27 @@
"url": "https://github.com/sponsors/Next2D"
},
"dependencies": {
"htmlparser2": "^9.0.0"
"htmlparser2": "^9.1.0"
},
"devDependencies": {
"@babel/core": "^7.23.2",
"@babel/plugin-transform-modules-commonjs": "^7.23.0",
"@babel/preset-env": "^7.23.2",
"@types/jest": "^29.5.7",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@babel/core": "^7.24.8",
"@babel/plugin-transform-modules-commonjs": "^7.24.8",
"@babel/preset-env": "^7.24.8",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"eslint": "^8.52.0",
"eslint-webpack-plugin": "^4.0.1",
"fflate": "^0.8.1",
"eslint-webpack-plugin": "^4.2.0",
"fflate": "^0.8.2",
"jest": "^29.7.0",
"jsdoc": "^4.0.2",
"ts-jest": "^29.1.1",
"ts-loader": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "^5.2.2",
"webpack": "^5.89.0",
"jsdoc": "^4.0.3",
"ts-jest": "^29.2.2",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"typescript": "^5.5.3",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
"webpack-dev-server": "^5.0.4"
},
"peerDependencies": {
"@next2d/core": "file:packages/core",
Expand Down
1 change: 1 addition & 0 deletions packages/display/src/BitmapData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ export class BitmapData
// reset
context.reset();
context.setTransform(1, 0, 0, 1, 0, 0);
context._$setColor(0, 0, 0, 0);
context.clearRect(0, 0, player._$width, player._$height);
context.beginPath();

Expand Down
17 changes: 11 additions & 6 deletions packages/display/src/DisplayObjectContainer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,12 @@ export class DisplayObjectContainer extends InteractiveObject

for (let idx: number = 0; idx < controller.length; ++idx) {

const instance: DisplayObjectImpl<any> = this._$createInstance(controller[idx]);
const dictionaryId = controller[idx];
if (typeof dictionaryId !== "number") {
continue;
}

const instance: DisplayObjectImpl<any> = this._$createInstance(dictionaryId);
instance._$placeId = idx;

const loopConfig: LoopConfigImpl | null = instance.loopConfig;
Expand Down Expand Up @@ -852,14 +857,14 @@ export class DisplayObjectContainer extends InteractiveObject

for (let idx: number = 0; idx < controller.length; ++idx) {

const id: number = controller[idx];
if (skipIds.has(id)) {
const dictionaryId: number = controller[idx];
if (typeof dictionaryId !== "number" || skipIds.has(dictionaryId)) {
continue;
}

const instance: DisplayObjectImpl<any> = poolInstances.has(id)
? poolInstances.get(id)
: this._$createInstance(id);
const instance: DisplayObjectImpl<any> = poolInstances.has(dictionaryId)
? poolInstances.get(dictionaryId)
: this._$createInstance(dictionaryId);

instance._$placeId = idx;

Expand Down
2 changes: 1 addition & 1 deletion packages/media/src/Video.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ export class Video extends DisplayObject
* @method
* @public
*/
play ()
play (): void
{
if (this._$video && this._$stop) {

Expand Down
28 changes: 14 additions & 14 deletions packages/webgl/src/CanvasToWebGLContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ export class CanvasToWebGLContext
* @return {boolean}
* @public
*/
get isLayer ()
get isLayer (): boolean
{
return this._$isLayer;
}
Expand All @@ -349,7 +349,7 @@ export class CanvasToWebGLContext
* @return {HTMLCanvasElement}
* @public
*/
get canvas ()
get canvas (): HTMLCanvasElement | OffscreenCanvas
{
return this._$gl.canvas;
}
Expand Down Expand Up @@ -591,7 +591,7 @@ export class CanvasToWebGLContext
*/
drawInstacedArray (): void
{
this.blend.drawInstacedArray();
this._$blend.drawInstacedArray();
}

/**
Expand All @@ -601,7 +601,7 @@ export class CanvasToWebGLContext
*/
clearInstacedArray (): void
{
this.blend.clearInstacedArray();
this._$blend.clearInstacedArray();
}

/**
Expand Down Expand Up @@ -705,7 +705,7 @@ export class CanvasToWebGLContext
.textureManager
.bind0(texture, this._$imageSmoothingEnabled);

this.blend.toOperation("normal");
this._$blend.toOperation("normal");
shader._$drawImage();
}

Expand Down Expand Up @@ -964,7 +964,7 @@ export class CanvasToWebGLContext
case "alpha":
case "erase":
case "copy":
this.blend.drawInstance(
this._$blend.drawInstance(
position,
ct0, ct1, ct2, ct3, ct4, ct5, ct6, ct7,
this._$globalCompositeOperation,
Expand All @@ -981,7 +981,7 @@ export class CanvasToWebGLContext
.textureManager
.getAtlasTexture(position.index);

this.blend.drawInstanceBlend(
this._$blend.drawInstanceBlend(
atlasTexture, x_min, y_min, x_max, y_max,
ct0, ct1, ct2, ct3, ct4, ct5, ct6, ct7,
position,
Expand Down Expand Up @@ -1033,7 +1033,7 @@ export class CanvasToWebGLContext
ct6 = color_transform[6] / 255;
}

this.blend.drawImage(
this._$blend.drawImage(
image, x, y, w, h,
ct0, ct1, ct2, ct3, ct4, ct5, ct6, ct7,
this._$globalCompositeOperation,
Expand Down Expand Up @@ -2055,15 +2055,15 @@ export class CanvasToWebGLContext

if (!isInner) {

this.blend.toOneZero();
this._$blend.toOneZero();

} else if (knockout) {

this.blend.toSourceIn();
this._$blend.toSourceIn();

} else {

this.blend.toSourceAtop();
this._$blend.toSourceAtop();

}

Expand Down Expand Up @@ -2104,7 +2104,7 @@ export class CanvasToWebGLContext
shader.uniform, matrix
);

this.blend.reset();
this._$blend.reset();

shader._$drawImage();
}
Expand Down Expand Up @@ -2165,7 +2165,7 @@ export class CanvasToWebGLContext
color_r, color_g, color_b, color_a
);

this.blend.reset();
this._$blend.reset();

shader._$drawImage();
}
Expand Down Expand Up @@ -2238,7 +2238,7 @@ export class CanvasToWebGLContext
color_r, color_g, color_b, color_a
);

this.blend.reset();
this._$blend.reset();

shader._$drawImage();

Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Next2D } from "@next2d/core";

if (!("next2d" in window)) {

console.log("%c Next2D Player %c 1.18.11 %c https://next2d.app",
console.log("%c Next2D Player %c 1.18.12 %c https://next2d.app",
"color: #fff; background: #5f5f5f",
"color: #fff; background: #4bc729",
"");
Expand Down
2 changes: 1 addition & 1 deletion worker/renderer/RendererWorker.min.js

Large diffs are not rendered by default.

Loading