Compare commits

..

33 Commits

Author SHA1 Message Date
昌敦伟 32478c1a9c fix(assets): update default cubemap resources (#152) 2026-06-04 09:56:43 +08:00
hyde zhou 74e632a3d6 bump version to 4.0.0-alpha.21 (#153) 2026-06-04 09:55:11 +08:00
orchid-world 26883ba6f4 fix(physics-2d): correct circle collider world position (#142) 2026-06-03 14:29:15 +08:00
orchid-world 055c70f8d2 fix(physics-2d): avoid debug draw crash when toggling flags (#139)
Clear cached debug graphics instead of detaching the debug draw node when
debugDrawFlags is set to None. This keeps the cached node in a valid scene
state and prevents null parent access when debug draw is enabled again.

Add a regression test for toggling Box2D debug draw flags.
2026-06-03 14:28:19 +08:00
bofeng-song 99f6db401c Fix the issue where cli class-registered does not receive messages. (#150) 2026-06-03 14:15:15 +08:00
hyde zhou 9390ee6bc0 Revert "fix codegen (#148)" (#149)
This reverts commit 7f258dac58.
2026-06-02 19:26:13 +08:00
hyde zhou 7f258dac58 fix codegen (#148) 2026-06-02 18:59:58 +08:00
orchid-world 5c99570616 feat(2d): support rounded rect mask radius (#140) 2026-06-02 18:26:55 +08:00
hyde zhou 821928733b bump version to 4.0.0-alpha.20 (#145) 2026-06-01 18:03:01 +08:00
hyde zhou f567861ff6 bump version to 4.0.0-alpha.19 (#143) 2026-05-25 14:33:54 +08:00
hyde zhou a7a20b64ab bump version to 4.0.0-alpha.18 (#137) 2026-05-19 23:40:06 +08:00
hyde zhou 7c75834010 bump version to 4.0.0-alpha.17 (#135) 2026-05-11 23:18:35 +08:00
hyde zhou 8fd985af75 bump version to 4.0.0-alpha.16 (#134) 2026-05-07 15:35:41 +08:00
qiuguohua cc97bc8af4 V4.0.0 fix get window info cache (#123) 2026-05-07 15:16:18 +08:00
tangkai 92124590fe update (#131) 2026-04-29 16:10:42 +08:00
tangkai 822ac6026c update assets.js (#129) 2026-04-29 13:04:48 +08:00
hyde zhou 4a6f83bd6d Revert "refactor platforms (#126)" (#128) 2026-04-28 23:12:10 +08:00
tangkai 04f063eb2b add key value to assets.js (#127) 2026-04-28 23:09:53 +08:00
hyde zhou 910865bd8b refactor platforms (#126) 2026-04-28 18:53:46 +08:00
hyde zhou e384f54ed2 bump version to 4.0.0-alpha.15 (#125) 2026-04-28 16:46:44 +08:00
hyde zhou 5964835c83 bump version to 4.0.0-alpha.14 (#122) 2026-04-22 15:36:07 +08:00
tangkai f4ae16247c overrideClips_experimental error handle (#121) 2026-04-22 15:30:17 +08:00
qiuguohua 4b4a3ca13f Fix the issue where getWindowInfo does not have a cache, which causes lag. (#120) 2026-04-22 15:29:46 +08:00
hyde zhou f1c5d21be6 bump version to 4.0.0-alpha.13 (#119) 2026-04-15 14:09:42 +08:00
bofeng-song da75e89f4a export interface for CLI (#118) 2026-04-15 10:07:46 +08:00
hyde zhou aba27a715d bump version to 4.0.0-alpha.12 (#116) 2026-04-08 16:41:15 +08:00
hyde zhou 62c1eb58c3 bump version to 4.0.0-alpha.11 (#112) 2026-04-01 15:15:56 +08:00
hyde zhou 5b09978eb1 bump version to 4.0.0-alpha.10 (#108) 2026-03-25 15:59:52 +08:00
hyde zhou 1b8da1df9b fix HarmonyOS Next file size error. ((port from https://github.com/cocos/cocos-engine/pull/19100) (#106) 2026-03-25 14:23:12 +08:00
Raz ea6ff53aad [Spine] Complete spine 4.2 PhysicsConstraint wasm binding (#98) 2026-03-25 14:22:44 +08:00
tangkai b7ba9f76bb 1.适配DirectorEvent.RESET后调用physicscontactmanager.clear. (#99)
* 1.适配DirectorEvent.RESET后调用physicscontactmanager.clear. 2.根据1来调整,box2d, box2d-jsb, box2d-wam

* add empty clearContacts

* add clearContacts interface
2026-03-18 14:18:49 +08:00
hyde zhou ab670c4f99 bump version to 4.0.0-alpha.9 (#101) 2026-03-13 13:28:08 +08:00
tangkai ba0a042ef5 add SUDV2 platform (#100) 2026-03-13 12:06:51 +08:00
43 changed files with 545 additions and 157 deletions
+8 -1
View File
@@ -659,6 +659,13 @@
"ccGlobal": true,
"internal": false
},
"SUDV2": {
"comment": "Running in the sud v2's quick game.",
"type": "boolean",
"value": false,
"ccGlobal": true,
"internal": false
},
"NODEJS": {
"comment": "Running in the Node.js environment.",
"type": "boolean",
@@ -738,7 +745,7 @@
"RUNTIME_BASED": {
"comment": "Running in runtime based environment.",
"type": "boolean",
"value": "$OPPO || $VIVO || $HUAWEI || $MIGU || $HONOR || $COCOS_RUNTIME || $SUD",
"value": "$OPPO || $VIVO || $HUAWEI || $MIGU || $HONOR || $COCOS_RUNTIME || $SUD || $SUDV2",
"ccGlobal": true,
"internal": false
},
+56 -4
View File
@@ -64,10 +64,10 @@ function _calculateCircle (center: Vec3, radius: Vec3, segments: number): Vec3[]
*/
export enum MaskType {
/**
* @en Rect mask.
* @en Rect mask, supports rounded corners by setting radius.
*
* @zh
* 使用矩形作为遮罩。
* 使用矩形作为遮罩,可通过 radius 设置圆角。
*/
GRAPHICS_RECT = 0,
@@ -215,6 +215,32 @@ export class Mask extends Component {
this._updateGraphics();
}
/**
* @en
* The radius for rounded corners of rect mask.
*
* @zh
* 矩形遮罩的圆角半径。
*/
@visible(function (this: Mask) {
return this.type === MaskType.GRAPHICS_RECT;
})
@tooltip('i18n:mask.radius')
@range([0, Number.POSITIVE_INFINITY])
get radius (): number {
return this._radius;
}
set radius (value) {
const radius = clamp(value, 0, Number.POSITIVE_INFINITY);
if (this._radius === radius) {
return;
}
this._radius = radius;
this._updateGraphics();
}
/**
* @en
* The mask image.
@@ -289,6 +315,9 @@ export class Mask extends Component {
@serializable
protected _segments = 64;
@serializable
protected _radius = 0;
@serializable
protected _alphaThreshold = 0.1;
@@ -350,7 +379,25 @@ export class Mask extends Component {
testPt.y += ap.y * h;
let result = false;
if (this.type === MaskType.GRAPHICS_RECT || this.type === MaskType.GRAPHICS_STENCIL || this.type === MaskType.SPRITE_STENCIL) {
if (this.type === MaskType.GRAPHICS_RECT) {
result = testPt.x >= 0 && testPt.y >= 0 && testPt.x <= w && testPt.y <= h;
const radius = Math.min(this._radius, w / 2, h / 2);
if (result && radius > 0) {
let dx = 0;
let dy = 0;
if (testPt.x < radius) {
dx = testPt.x - radius;
} else if (testPt.x > w - radius) {
dx = testPt.x - (w - radius);
}
if (testPt.y < radius) {
dy = testPt.y - radius;
} else if (testPt.y > h - radius) {
dy = testPt.y - (h - radius);
}
result = dx * dx + dy * dy <= radius * radius;
}
} else if (this.type === MaskType.GRAPHICS_STENCIL || this.type === MaskType.SPRITE_STENCIL) {
result = testPt.x >= 0 && testPt.y >= 0 && testPt.x <= w && testPt.y <= h;
} else if (this.type === MaskType.GRAPHICS_ELLIPSE) {
const rx = w / 2;
@@ -423,7 +470,12 @@ export class Mask extends Component {
const x = -width * ap.x;
const y = -height * ap.y;
if (this._type === MaskType.GRAPHICS_RECT) {
graphics.rect(x, y, width, height);
const radius = Math.min(this._radius, width / 2, height / 2);
if (radius > 0) {
graphics.roundRect(x, y, width, height, radius);
} else {
graphics.rect(x, y, width, height);
}
} else if (this._type === MaskType.GRAPHICS_ELLIPSE) {
const center = new Vec3(x + width / 2, y + height / 2, 0);
const radius = new Vec3(width / 2, height / 2, 0);
@@ -160,7 +160,8 @@ class ClipMotionEval implements MotionEval {
public overrideClips (context: AnimationGraphBindingContext): void {
const { _originalClip: originalClip } = this;
const overriding = context.clipOverrides?.get(originalClip);
const clipOverrides: any = context.clipOverrides;
const overriding: AnimationClip | null = clipOverrides && clipOverrides.get ? clipOverrides.get(originalClip) : null;
if (overriding) {
this._setClip(overriding, context);
}
+10 -3
View File
@@ -195,15 +195,22 @@ function define (className, baseClass, options): any {
renderName = 'render_stage';
}
// 增加了 hidden: 开头标识,使它最终不会显示在 Editor inspector 的添加组件列表里
window.EditorExtends && window.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
if (globalThis.EditorExtends) {
globalThis.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
}
}
// Note: `options.ctor` should be the same as `cls` except if
// cc-class is defined by `cc.Class({/* ... */})`.
// In such case, `options.ctor` may be `undefined`.
// So we can not use `options.ctor`. Instead, we should use `cls` which is the "real" registered cc-class.
EditorExtends.emit('class-registered', cls, frame, className);
// Emit via globalThis.EditorExtends to ensure the event reaches
// both the engine-internal and the scene-bundle event systems.
if (globalThis.EditorExtends) {
globalThis.EditorExtends.emit('class-registered', cls, frame, className);
} else {
EditorExtends.emit('class-registered', cls, frame, className);
}
}
if (frame) {
+4 -1
View File
@@ -141,7 +141,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
if (!v) {
if (this._debugGraphics) {
this._debugGraphics.node.parent = null;
this._debugGraphics.clear();
}
}
@@ -479,4 +479,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
c.emit(Contact2DType.POST_SOLVE);
c._setImpulse(null);
}
clearContacts (): void {
PhysicsContactManager.clear();
}
}
@@ -34,8 +34,8 @@ export class b2CircleShape extends b2Shape2D implements ICircleShape {
_worldPosition = new Vec2();
get worldPosition (): Vec2 {
const p = (this._shapes[0] as b2jsb.CircleShape).m_p;
return this._worldPosition.set(p.x * PHYSICS_2D_PTM_RATIO, p.y * PHYSICS_2D_PTM_RATIO);
const comp = this.collider as CircleCollider2D;
return Vec2.transformMat4(this._worldPosition, comp.offset, comp.node.worldMatrix);
}
_createShapes (scaleX: number, scaleY: number, relativePositionX: number, relativePositionY: number): any[] {
@@ -0,0 +1,34 @@
/*
Copyright (c) 2024 Xiamen Yaji Software Co., Ltd.
https://www.cocos.com/
*/
import { B2ObjectType, getTSObjectFromWASMObjectPtr } from './instantiated';
import { PhysicsContact } from './physics-contact';
const pools: PhysicsContact[] = [];
export class PhysicsContactManager {
static get (b2contact: number): PhysicsContact {
let c = pools.pop();
if (!c) {
c = new PhysicsContact();
}
c.init(b2contact);
return c;
}
static find (b2contact: number): PhysicsContact | null {
return getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
}
static put (b2contact: number): void {
const c = getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
if (!c) return;
pools.push(c);
c.reset();
}
static clear (): void {
pools.length = 0;
}
}
+2 -19
View File
@@ -29,7 +29,7 @@ import { Collider2D, Contact2DType, PhysicsSystem2D } from '../framework';
import { B2Shape2D } from './shapes/shape-2d';
import { IPhysics2DContact, IPhysics2DImpulse, IPhysics2DManifoldPoint, IPhysics2DWorldManifold } from '../spec/i-physics-contact';
const pools: PhysicsContact[] = [];
/* pools moved to PhysicsContactManager */
// temp world manifold
const pointCache = [new Vec2(), new Vec2()];
@@ -62,24 +62,7 @@ const impulse: IPhysics2DImpulse = {
/** @mangle */
export class PhysicsContact implements IPhysics2DContact {
static get (b2contact: number): PhysicsContact {
let c = pools.pop();
if (!c) {
c = new PhysicsContact();
}
c.init(b2contact);
return c;
}
static put (b2contact: number): void {
const c = getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
if (!c) return;
pools.push(c);
c.reset();
}
/* static get/put/clear moved to PhysicsContactManager */
colliderA: Collider2D | null = null;
colliderB: Collider2D | null = null;
+11 -7
View File
@@ -35,7 +35,7 @@ import { B2RigidBody2D } from './rigid-body';
import { PhysicsContactListener } from './platform/physics-contact-listener';
import { PhysicsAABBQueryCallback } from './platform/physics-aabb-query-callback';
import { PhysicsRayCastCallback } from './platform/physics-ray-cast-callback';
import { PhysicsContact } from './physics-contact';
import { PhysicsContactManager } from './physics-contact-manager';
import { Contact2DType, Collider2D, RaycastResult2D } from '../framework';
import { B2Shape2D } from './shapes/shape-2d';
import { PhysicsDebugDraw } from './platform/physics-debug-draw';
@@ -114,7 +114,7 @@ export class B2PhysicsWorld implements IPhysicsWorld {
if (!v) {
if (this._debugGraphics) {
this._debugGraphics.node.parent = null;
this._debugGraphics.clear();
}
}
@@ -437,22 +437,22 @@ export class B2PhysicsWorld implements IPhysicsWorld {
}
_onBeginContact (b2contact: number): void {
const c = PhysicsContact.get(b2contact);
const c = PhysicsContactManager.get(b2contact);
c.emit(Contact2DType.BEGIN_CONTACT);
}
_onEndContact (b2contact: number): void {
const c = getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
c.emit(Contact2DType.END_CONTACT);
PhysicsContact.put(b2contact);
PhysicsContactManager.put(b2contact);
}
_onPreSolve (b2contact: number): void {
const c = getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
@@ -461,7 +461,7 @@ export class B2PhysicsWorld implements IPhysicsWorld {
}
_onPostSolve (b2contact: number, impulse: number): void {
const c = getTSObjectFromWASMObjectPtr<PhysicsContact>(B2ObjectType.Contact, b2contact);
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
@@ -471,4 +471,8 @@ export class B2PhysicsWorld implements IPhysicsWorld {
c.emit(Contact2DType.POST_SOLVE);
c._setImpulse(0);
}
clearContacts (): void {
PhysicsContactManager.clear();
}
}
@@ -37,8 +37,8 @@ export class B2CircleShape extends B2Shape2D implements ICircleShape {
_worldPosition = new Vec2();
get worldPosition (): Vec2 {
const p = B2.CircleShapeGetPosition(this._shapes[0]) as B2.Vec2;
return this._worldPosition.set(p.x * PHYSICS_2D_PTM_RATIO, p.y * PHYSICS_2D_PTM_RATIO);
const comp = this.collider as CircleCollider2D;
return Vec2.transformMat4(this._worldPosition, comp.offset, comp.node.worldMatrix);
}
_createShapes (scaleX: number, scaleY: number, relativePositionX: number, relativePositionY: number): number[] { //B2.CircleShape[]
@@ -0,0 +1,56 @@
/*
Copyright (c) 2024 Xiamen Yaji Software Co., Ltd.
https://www.cocos.com/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { PhysicsContact, b2ContactExtends } from './physics-contact';
const contactMap = new Map<b2ContactExtends, PhysicsContact>();
const pools: PhysicsContact[] = [];
export class PhysicsContactManager {
static get (b2contact: b2ContactExtends): PhysicsContact {
let c = pools.pop();
if (!c) {
c = new PhysicsContact();
}
c.init(b2contact);
contactMap.set(b2contact, c);
return c;
}
static find (b2contact: b2ContactExtends): PhysicsContact | null {
return contactMap.get(b2contact) ?? null;
}
static put (b2contact: b2ContactExtends): void {
const c = contactMap.get(b2contact);
if (!c) return;
pools.push(c);
c.reset();
contactMap.delete(b2contact);
}
static clear (): void {
contactMap.clear();
pools.length = 0;
}
}
-23
View File
@@ -33,8 +33,6 @@ export type b2ContactExtends = b2.Contact & {
m_userData: any;
}
const pools: PhysicsContact[] = [];
// temp world manifold
const pointCache = [new Vec2(), new Vec2()];
@@ -68,25 +66,6 @@ const impulse: IPhysics2DImpulse = {
/** @mangle */
export class PhysicsContact implements IPhysics2DContact {
static get (b2contact: b2ContactExtends): PhysicsContact {
let c = pools.pop();
if (!c) {
c = new PhysicsContact();
}
c.init(b2contact);
return c;
}
static put (b2contact: b2ContactExtends): void {
const c: PhysicsContact = b2contact.m_userData as PhysicsContact;
if (!c) return;
pools.push(c);
c.reset();
}
colliderA: Collider2D | null = null;
colliderB: Collider2D | null = null;
@@ -111,7 +90,6 @@ export class PhysicsContact implements IPhysics2DContact {
this._inverted = false;
this._b2contact = b2contact;
b2contact.m_userData = this;
}
reset (): void {
@@ -124,7 +102,6 @@ export class PhysicsContact implements IPhysics2DContact {
this.disabled = false;
this._impulse = null;
this._b2contact!.m_userData = null;
this._b2contact = null;
}
+10 -6
View File
@@ -39,6 +39,7 @@ import { PhysicsDebugDraw } from './platform/physics-debug-draw';
import { Node, find, Layers } from '../../scene-graph';
import { director } from '../../game';
import type { Graphics } from '../../2d/components/graphics';
import { PhysicsContactManager } from './physics-contact-manager';
const tempVec3 = new Vec3();
const tempVec2_1 = new Vec2();
@@ -99,7 +100,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
if (!v) {
if (this._debugGraphics) {
this._debugGraphics.node.parent = null;
this._debugGraphics.clear();
}
}
@@ -414,22 +415,22 @@ export class b2PhysicsWorld implements IPhysicsWorld {
}
_onBeginContact (b2contact: b2ContactExtends): void {
const c = PhysicsContact.get(b2contact);
const c = PhysicsContactManager.get(b2contact);
c.emit(Contact2DType.BEGIN_CONTACT);
}
_onEndContact (b2contact: b2ContactExtends): void {
const c = b2contact.m_userData as PhysicsContact;
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
c.emit(Contact2DType.END_CONTACT);
PhysicsContact.put(b2contact);
PhysicsContactManager.put(b2contact);
}
_onPreSolve (b2contact: b2ContactExtends): void {
const c = b2contact.m_userData as PhysicsContact;
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
@@ -438,7 +439,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
}
_onPostSolve (b2contact: b2ContactExtends, impulse: b2.ContactImpulse): void {
const c: PhysicsContact = b2contact.m_userData as PhysicsContact;
const c = PhysicsContactManager.find(b2contact);
if (!c) {
return;
}
@@ -448,4 +449,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
c.emit(Contact2DType.POST_SOLVE);
c._setImpulse(null);
}
clearContacts (): void {
PhysicsContactManager.clear();
}
}
@@ -37,8 +37,8 @@ export class b2CircleShape extends b2Shape2D implements ICircleShape {
_worldPosition = new Vec2();
get worldPosition (): Vec2 {
const p = (this._shapes[0] as b2.CircleShape).m_p;
return this._worldPosition.set(p.x * PHYSICS_2D_PTM_RATIO, p.y * PHYSICS_2D_PTM_RATIO);
const comp = this.collider as CircleCollider2D;
return Vec2.transformMat4(this._worldPosition, comp.offset, comp.node.worldMatrix);
}
_createShapes (scaleX: number, scaleY: number, relativePositionX: number, relativePositionY: number): any[] {
@@ -285,4 +285,6 @@ export class BuiltinPhysicsWorld implements IPhysicsWorld {
raycast (p1: IVec2Like, p2: IVec2Like, type: ERaycast2DType): RaycastResult2D[] {
return [];
}
clearContacts (): void {
}
}
@@ -165,6 +165,7 @@ const ENTIRE_WORLD: IPhysicsWorld = {
testPoint: FUNC,
testAABB: FUNC,
drawDebug: FUNC,
clearContacts: FUNC,
};
export function checkPhysicsModule (obj: any): boolean {
@@ -381,8 +381,12 @@ export class PhysicsSystem2D extends Eventify(System) {
static constructAndRegister (): void {
director.registerSystem(PhysicsSystem2D.ID, PhysicsSystem2D.instance, SystemPriority.LOW);
}
clearContacts (): void {
this.physicsWorld.clearContacts();
}
}
if (!BUILD || !LOAD_BOX2D_MANUALLY) {
director.once(DirectorEvent.INIT, (): void => { PhysicsSystem2D.constructAndRegister(); });
director.once(DirectorEvent.RESET, (): void => { PhysicsSystem2D.instance.clearContacts(); });
}
+1
View File
@@ -38,4 +38,5 @@ export interface IPhysicsWorld {
testPoint (p: Vec2): readonly Collider2D[];
testAABB (rect: Rect): readonly Collider2D[];
drawDebug (): void;
clearContacts (): void;
}
+14 -12
View File
@@ -33,16 +33,16 @@ const MAGIC = 0x4E4F4343;
const CHUNK_ALIGN_AS = 8;
export class CCON {
constructor (document: unknown, chunks: Uint8Array[]) {
constructor(document: unknown, chunks: Uint8Array[]) {
this._document = document;
this._chunks = chunks;
}
get document (): unknown {
get document(): unknown {
return this._document;
}
get chunks (): Uint8Array[] {
get chunks(): Uint8Array[] {
return this._chunks;
}
@@ -50,7 +50,7 @@ export class CCON {
private declare _chunks: Uint8Array[];
}
export function encodeCCONBinary (ccon: CCON): Uint8Array {
export function encodeCCONBinary(ccon: CCON): Uint8Array {
const { document, chunks } = ccon;
const jsonBytes = new Uint8Array(notepackEncode(document));
@@ -75,7 +75,7 @@ export function encodeCCONBinary (ccon: CCON): Uint8Array {
headerView.setUint32(8, ccobBuilder.byteLength, true);
return ccobBuilder.get();
function uint32Bytes (value: number): ArrayBufferView {
function uint32Bytes(value: number): ArrayBufferView {
const bytes = new ArrayBuffer(4);
const view = new DataView(bytes);
view.setUint32(0, value, true);
@@ -83,7 +83,7 @@ export function encodeCCONBinary (ccon: CCON): Uint8Array {
}
}
export function decodeCCONBinary (bytes: Uint8Array): CCON {
export function decodeCCONBinary(bytes: Uint8Array): CCON {
if (bytes.length < 16) {
throw new InvalidCCONError(getError(13102));
}
@@ -159,7 +159,7 @@ interface BufferConstructor {
from(buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): Buffer;
}
function decodeJson (data: Uint8Array): string {
function decodeJson(data: Uint8Array): string {
if (typeof TextDecoder !== 'undefined') {
return new TextDecoder().decode(data);
} else if ('Buffer' in globalThis) {
@@ -177,13 +177,13 @@ export class BufferBuilder {
private _viewOrPaddings: (ArrayBufferView | number)[] = [];
private _length = 0;
constructor () {}
constructor() { }
get byteLength (): number {
get byteLength(): number {
return this._length;
}
public alignAs (align: number): number {
public alignAs(align: number): number {
if (align !== 0) {
const remainder = this._length % align;
if (remainder !== 0) {
@@ -196,14 +196,14 @@ export class BufferBuilder {
return 0;
}
public append (view: ArrayBufferView): number {
public append(view: ArrayBufferView): number {
const result = this._length;
this._viewOrPaddings.push(view);
this._length += view.byteLength;
return result;
}
public get (): Uint8Array {
public get(): Uint8Array {
const result = new Uint8Array(this._length);
let counter = 0;
this._viewOrPaddings.forEach((viewOrPadding) => {
@@ -219,4 +219,6 @@ export class BufferBuilder {
}
cclegacy.internal.decodeCCONBinary = decodeCCONBinary;
cclegacy.internal.encodeCCONBinary = encodeCCONBinary;
cclegacy.internal.CCON = CCON;
cclegacy.internal.BufferBuilder = BufferBuilder;
+126
View File
@@ -42,6 +42,24 @@ declare namespace spine {
delete();
}
/**
* @version 4.2
*/
class SPVectorPhysicsConstraintPtr {
size(): number;
get(index: number): PhysicsConstraint;
delete();
}
/**
* @version 4.2
*/
class SPVectorPhysicsConstraintDataPtr {
size(): number;
get(index: number): PhysicsConstraintData;
delete();
}
class Animation {
constructor(name: string, timelines: Array<Timeline>, duration: number);
duration: number;
@@ -708,6 +726,10 @@ declare namespace spine {
ikConstraints: Array<IkConstraint>;
transformConstraints: Array<TransformConstraint>;
pathConstraints: Array<PathConstraint>;
/**
* @version 4.2
*/
physicsConstraints: Array<PhysicsConstraint>;
_updateCache: Updatable[];
skin: Skin;
color: Color;
@@ -735,8 +757,24 @@ declare namespace spine {
findIkConstraint(constraintName: string): IkConstraint;
findTransformConstraint(constraintName: string): TransformConstraint;
findPathConstraint(constraintName: string): PathConstraint;
/**
* @version 4.2
*/
findPhysicsConstraint(constraintName: string): PhysicsConstraint;
/**
* @version 4.2
*/
getPhysicsConstraints(): SPVectorPhysicsConstraintPtr;
//getBounds(offset: Vector2, size: Vector2, temp?: Array<number>): void;
update(delta: number): void;
/**
* @version 4.2
*/
updateWorldTransform(physics: Physics): void;
/**
* @version 4.2
*/
updateWorldTransform(physics: Physics, parent: Bone): void;
}
class SkeletonBinary {
static AttachmentTypeValues: number[];
@@ -812,6 +850,10 @@ declare namespace spine {
ikConstraints: IkConstraintData[];
transformConstraints: TransformConstraintData[];
pathConstraints: PathConstraintData[];
/**
* @version 4.2
*/
physicsConstraints: PhysicsConstraintData[];
x: number;
y: number;
width: number;
@@ -835,6 +877,14 @@ declare namespace spine {
findTransformConstraint(constraintName: string): TransformConstraintData;
findPathConstraint(constraintName: string): PathConstraintData;
findPathConstraintIndex(pathConstraintName: string): number;
/**
* @version 4.2
*/
findPhysicsConstraint(constraintName: string): PhysicsConstraintData;
/**
* @version 4.2
*/
getPhysicsConstraints(): SPVectorPhysicsConstraintDataPtr;
}
class SkeletonJson {
attachmentLoader: AttachmentLoader;
@@ -1005,6 +1055,82 @@ declare namespace spine {
local: boolean;
constructor(name: string);
}
/**
* @version 4.2
*/
enum Physics {
none = 0,
reset = 1,
update = 2,
pose = 3
}
/**
* @version 4.2
*/
class PhysicsConstraint implements Updatable {
data: PhysicsConstraintData;
bone: Bone;
inertia: number;
strength: number;
damping: number;
massInverse: number;
wind: number;
gravity: number;
mix: number;
_reset: boolean;
ux: number;
uy: number;
cx: number;
cy: number;
tx: number;
ty: number;
xOffset: number;
xVelocity: number;
yOffset: number;
yVelocity: number;
rotateOffset: number;
rotateVelocity: number;
scaleOffset: number;
scaleVelocity: number;
remaining: number;
lastTime: number;
active: boolean;
constructor(data: PhysicsConstraintData, skeleton: Skeleton);
isActive(): boolean;
reset(): void;
setToSetupPose(): void;
update(): void;
translate(x: number, y: number): void;
rotate(x: number, y: number, degrees: number): void;
}
/**
* @version 4.2
*/
class PhysicsConstraintData extends ConstraintData {
bone: BoneData;
x: number;
y: number;
rotate: number;
scaleX: number;
shearX: number;
limit: number;
step: number;
inertia: number;
strength: number;
damping: number;
massInverse: number;
wind: number;
gravity: number;
mix: number;
inertiaGlobal: boolean;
strengthGlobal: boolean;
dampingGlobal: boolean;
massGlobal: boolean;
windGlobal: boolean;
gravityGlobal: boolean;
mixGlobal: boolean;
constructor(name: string);
}
class Triangulator {
private convexPolygons;
private convexPolygonsIndices;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 945 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "6ef37a33-5db9-4231-9855-f72b8428f6fa",
"files": [],
"subMetas": {},
"userData": {}
}
@@ -0,0 +1,19 @@
{
"ver": "1.0.4",
"importer": "texture-cube",
"imported": true,
"uuid": "a4063d6c-c46e-482a-bf84-99eb9fbb2789",
"files": [
".json"
],
"subMetas": {},
"userData": {
"wrapModeS": "repeat",
"wrapModeT": "repeat",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isRGBE": false
}
}
+5
View File
@@ -38,6 +38,11 @@ module.exports = {
newCubeMap: 'CubeMap',
newRenderTexture: 'Render Texture',
newScene: 'Scene',
newScene:{
'2d': '2D Scene',
'3d': '3D Scene',
quality: 'High Quality Scene',
},
newPrefab: 'Node Prefab',
newMaterial: 'Material',
newPhysicsMaterial: 'Physics Material',
+1
View File
@@ -779,6 +779,7 @@ module.exports = link(mixin({
},
mask: {
type: 'The mask type',
radius: 'The radius for rounded corners of rect mask',
spriteFrame: 'The mask image',
inverted: 'The Reverse mask (Not supported Canvas Mode)',
alphaThreshold:
+5
View File
@@ -37,6 +37,11 @@ module.exports = {
newTypeScript: '脚本 (TypeScript)',
newCubeMap: '立方体贴图',
newScene: '场景',
newScene:{
'2d': '2D 场景',
'3d': '3D 场景',
quality: '高质量场景',
},
newPrefab: '预制 (Prefab)',
newRenderTexture: '渲染纹理 (Render Texture)',
newMaterial: '材质',
+1
View File
@@ -760,6 +760,7 @@ module.exports = link(mixin({
},
mask: {
type: '遮罩类型',
radius: '矩形遮罩的圆角半径',
spriteFrame: '遮罩所需要的贴图',
inverted: '反向遮罩(不支持 Canvas 模式)',
alphaThreshold: 'Alpha 阈值,只有当模板的像素的 Alpha 大于 Alpha Threshold 时,才会绘制内容(不支持 Canvas 模式)',
@@ -33,6 +33,7 @@ using SPVectorIkConstraintPtr = Vector<IkConstraint*>;
using SPVectorIkConstraintDataPtr = Vector<IkConstraintData*>;
using SPVectorTransformConstraintPtr = Vector<TransformConstraint*>;
using SPVectorPathConstraintPtr = Vector<PathConstraint*>;
using SPVectorPhysicsConstraintPtr = Vector<PhysicsConstraint*>;
using SPVectorTimelinePtr = Vector<Timeline*>;
using SPVectorTrackEntryPtr = Vector<TrackEntry*>;
using SPVectorUpdatablePtr = Vector<Updatable*>;
@@ -207,6 +208,8 @@ DEFINE_ALLOW_RAW_POINTER(TrackEntry)
DEFINE_ALLOW_RAW_POINTER(IkConstraintData)
DEFINE_ALLOW_RAW_POINTER(PathConstraintData)
DEFINE_ALLOW_RAW_POINTER(TransformConstraintData)
DEFINE_ALLOW_RAW_POINTER(PhysicsConstraintData)
DEFINE_ALLOW_RAW_POINTER(PhysicsConstraint)
DEFINE_ALLOW_RAW_POINTER(SPVectorUnsignedShort)
DEFINE_ALLOW_RAW_POINTER(SPVectorFloat)
DEFINE_ALLOW_RAW_POINTER(SPVectorEventPtr)
@@ -516,7 +519,7 @@ EMSCRIPTEN_BINDINGS(spine) {
REGISTER_SPINE_ENUM(TextureFilter);
REGISTER_SPINE_ENUM(TextureWrap);
REGISTER_SPINE_ENUM(AttachmentType);
REGISTER_SPINE_ENUM(Physics);
REGISTER_SPINE_VECTOR(SPVectorDebugShape, false);
@@ -544,7 +547,9 @@ EMSCRIPTEN_BINDINGS(spine) {
REGISTER_SPINE_VECTOR(SPVectorIkConstraintDataPtr, false);
REGISTER_SPINE_VECTOR(SPVectorTransformConstraintPtr, false);
REGISTER_SPINE_VECTOR(SPVectorPathConstraintPtr, false);
REGISTER_SPINE_VECTOR(SPVectorTimelinePtr, true); // .set used in Animation constructor
REGISTER_SPINE_VECTOR(SPVectorTimelinePtr, true); // .set used in Animation constructor
REGISTER_SPINE_VECTOR(SPVectorPhysicsConstraintDataPtr, false);
REGISTER_SPINE_VECTOR(SPVectorPhysicsConstraintPtr, false);
REGISTER_SPINE_VECTOR(SPVectorTrackEntryPtr, false);
REGISTER_SPINE_VECTOR(SPVectorUpdatablePtr, false);
REGISTER_SPINE_VECTOR(SPVectorSkinEntryPtr, false);
@@ -879,6 +884,64 @@ EMSCRIPTEN_BINDINGS(spine) {
.property("mixScaleY", &TransformConstraint::getMixScaleY)
.property("mixShearY", &TransformConstraint::getMixShearY);
class_<PhysicsConstraintData, base<ConstraintData>>("PhysicsConstraintData")
.constructor<const String &>()
.property("bone", &PhysicsConstraintData::getBone)
.property("x", &PhysicsConstraintData::getX, &PhysicsConstraintData::setX)
.property("y", &PhysicsConstraintData::getY, &PhysicsConstraintData::setY)
.property("rotate", &PhysicsConstraintData::getRotate, &PhysicsConstraintData::setRotate)
.property("scaleX", &PhysicsConstraintData::getScaleX, &PhysicsConstraintData::setScaleX)
.property("shearX", &PhysicsConstraintData::getShearX, &PhysicsConstraintData::setShearX)
.property("limit", &PhysicsConstraintData::getLimit, &PhysicsConstraintData::setLimit)
.property("step", &PhysicsConstraintData::getStep, &PhysicsConstraintData::setStep)
.property("inertia", &PhysicsConstraintData::getInertia, &PhysicsConstraintData::setInertia)
.property("strength", &PhysicsConstraintData::getStrength, &PhysicsConstraintData::setStrength)
.property("damping", &PhysicsConstraintData::getDamping, &PhysicsConstraintData::setDamping)
.property("massInverse", &PhysicsConstraintData::getMassInverse, &PhysicsConstraintData::setMassInverse)
.property("wind", &PhysicsConstraintData::getWind, &PhysicsConstraintData::setWind)
.property("gravity", &PhysicsConstraintData::getGravity, &PhysicsConstraintData::setGravity)
.property("mix", &PhysicsConstraintData::getMix, &PhysicsConstraintData::setMix)
.property("inertiaGlobal", &PhysicsConstraintData::isInertiaGlobal, &PhysicsConstraintData::setInertiaGlobal)
.property("strengthGlobal", &PhysicsConstraintData::isStrengthGlobal, &PhysicsConstraintData::setStrengthGlobal)
.property("dampingGlobal", &PhysicsConstraintData::isDampingGlobal, &PhysicsConstraintData::setDampingGlobal)
.property("massGlobal", &PhysicsConstraintData::isMassGlobal, &PhysicsConstraintData::setMassGlobal)
.property("windGlobal", &PhysicsConstraintData::isWindGlobal, &PhysicsConstraintData::setWindGlobal)
.property("gravityGlobal", &PhysicsConstraintData::isGravityGlobal, &PhysicsConstraintData::setGravityGlobal)
.property("mixGlobal", &PhysicsConstraintData::isMixGlobal, &PhysicsConstraintData::setMixGlobal);
class_<PhysicsConstraint, base<Updatable>>("PhysicsConstraint")
.constructor<PhysicsConstraintData &, Skeleton &>()
.property("data", GETTER_RVAL_TO_PTR(PhysicsConstraint, getData, PhysicsConstraintData*))
.property("bone", &PhysicsConstraint::getBone, &PhysicsConstraint::setBone)
.property("inertia", &PhysicsConstraint::getInertia, &PhysicsConstraint::setInertia)
.property("strength", &PhysicsConstraint::getStrength, &PhysicsConstraint::setStrength)
.property("damping", &PhysicsConstraint::getDamping, &PhysicsConstraint::setDamping)
.property("massInverse", &PhysicsConstraint::getMassInverse, &PhysicsConstraint::setMassInverse)
.property("wind", &PhysicsConstraint::getWind, &PhysicsConstraint::setWind)
.property("gravity", &PhysicsConstraint::getGravity, &PhysicsConstraint::setGravity)
.property("mix", &PhysicsConstraint::getMix, &PhysicsConstraint::setMix)
.property("_reset", &PhysicsConstraint::getReset, &PhysicsConstraint::setReset)
.property("ux", &PhysicsConstraint::getUx, &PhysicsConstraint::setUx)
.property("uy", &PhysicsConstraint::getUy, &PhysicsConstraint::setUy)
.property("cx", &PhysicsConstraint::getCx, &PhysicsConstraint::setCx)
.property("cy", &PhysicsConstraint::getCy, &PhysicsConstraint::setCy)
.property("tx", &PhysicsConstraint::getTx, &PhysicsConstraint::setTx)
.property("ty", &PhysicsConstraint::getTy, &PhysicsConstraint::setTy)
.property("xOffset", &PhysicsConstraint::getXOffset, &PhysicsConstraint::setXOffset)
.property("xVelocity", &PhysicsConstraint::getXVelocity, &PhysicsConstraint::setXVelocity)
.property("yOffset", &PhysicsConstraint::getYOffset, &PhysicsConstraint::setYOffset)
.property("yVelocity", &PhysicsConstraint::getYVelocity, &PhysicsConstraint::setYVelocity)
.property("rotateOffset", &PhysicsConstraint::getRotateOffset, &PhysicsConstraint::setRotateOffset)
.property("rotateVelocity", &PhysicsConstraint::getRotateVelocity, &PhysicsConstraint::setRotateVelocity)
.property("scaleOffset", &PhysicsConstraint::getScaleOffset, &PhysicsConstraint::setScaleOffset)
.property("scaleVelocity", &PhysicsConstraint::getScaleVelocity, &PhysicsConstraint::setScaleVelocity)
.property("remaining", &PhysicsConstraint::getRemaining, &PhysicsConstraint::setRemaining)
.property("lastTime", &PhysicsConstraint::getLastTime, &PhysicsConstraint::setLastTime)
.function("reset", &PhysicsConstraint::reset)
.function("setToSetupPose", &PhysicsConstraint::setToSetupPose)
.function("translate", &PhysicsConstraint::translate)
.function("rotate", &PhysicsConstraint::rotate);
class_<Bone, base<Updatable>>("Bone")
.constructor<BoneData &, Skeleton &, Bone *>()
.property("data", GETTER_RVAL_TO_PTR(Bone, getData, BoneData*))
@@ -1058,7 +1121,7 @@ EMSCRIPTEN_BINDINGS(spine) {
.function("findAnimation", &SkeletonData::findAnimation, allow_raw_pointers())
.function("findIkConstraint", &SkeletonData::findIkConstraint, allow_raw_pointers())
.function("findTransformConstraint", &SkeletonData::findTransformConstraint, allow_raw_pointers())
.function("findPhysicsConstraint", &SkeletonData::findPathConstraint, allow_raw_pointers())
.function("findPhysicsConstraint", &SkeletonData::findPhysicsConstraint, allow_raw_pointers())
.function("findPathConstraint", &SkeletonData::findPathConstraint, allow_raw_pointers());
class_<Animation>("Animation")
@@ -1295,6 +1358,8 @@ EMSCRIPTEN_BINDINGS(spine) {
return &obj.getTransformConstraints(); }), allow_raw_pointer<SPVectorTransformConstraintPtr>())
.function("getPathConstraints", optional_override([](Skeleton &obj){
return &obj.getPathConstraints(); }), allow_raw_pointer<SPVectorPathConstraintPtr>())
.function("getPhysicsConstraints", optional_override([](Skeleton &obj){
return &obj.getPhysicsConstraints(); }), allow_raw_pointer<SPVectorPhysicsConstraintPtr>())
.function("getUpdateCacheList", optional_override([](Skeleton &obj){
return &obj.getUpdateCacheList(); }), allow_raw_pointer<SPVectorUpdatablePtr>())
.property("skin", &Skeleton::_skin)
@@ -1322,6 +1387,7 @@ EMSCRIPTEN_BINDINGS(spine) {
.function("findIkConstraint", &Skeleton::findIkConstraint, allow_raw_pointers())
.function("findTransformConstraint", &Skeleton::findTransformConstraint, allow_raw_pointers())
.function("findPathConstraint", &Skeleton::findPathConstraint, allow_raw_pointers())
.function("findPhysicsConstraint", &Skeleton::findPhysicsConstraint, allow_raw_pointers())
//.function("getBounds", optional_override([](Skeleton &obj, &outX, ) {}), allow_raw_pointers())
.function("update", &Skeleton::update);
@@ -178,6 +178,11 @@ long FileUtilsOpenHarmony::getFileSize(const std::string &filepath) {
if (fullPath.empty()) {
return 0;
}
if(fullPath[0] == '/') {
return FileUtils::getFileSize(fullPath);
}
if (nullptr == _nativeResourceManager) {
CC_LOG_ERROR("nativeResourceManager is nullptr");
return 0;
@@ -201,11 +206,11 @@ bool FileUtilsOpenHarmony::isFileExistInternal(const std::string &strFilePath) c
return false;
}
if (strFilePath[0] != '/') {
if (strFilePath[0] != '/') {
const char *s = strFilePath.c_str();
// Found "@assets/" at the beginning of the path and we don't want it
if (strFilePath.find(ASSETS_FOLDER_NAME) == 0) s += strlen(ASSETS_FOLDER_NAME);
if (nullptr == _nativeResourceManager) {
CC_LOG_ERROR("nativeResourceManager is nullptr");
return false;
@@ -217,7 +222,7 @@ bool FileUtilsOpenHarmony::isFileExistInternal(const std::string &strFilePath) c
return true;
}
return false;
}
}
FILE *fp = fopen(strFilePath.c_str(), "r");
if (fp) {
fclose(fp);
+1 -1
View File
@@ -3,6 +3,6 @@
"type": "github",
"owner": "cocos",
"name": "cocos-engine-external",
"checkout": "v4.0.0-3"
"checkout": "v4.0.0-4"
}
}
+2 -62
View File
@@ -1,12 +1,12 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.8",
"version": "4.0.0-alpha.21",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cocos-creator",
"version": "4.0.0-alpha.8",
"version": "4.0.0-alpha.21",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@@ -9532,14 +9532,6 @@
"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
"dev": true
},
"node_modules/growly": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
"integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
"dev": true,
"optional": true,
"peer": true
},
"node_modules/gulp": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
@@ -14590,39 +14582,6 @@
"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
"dev": true
},
"node_modules/node-notifier": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
"integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"growly": "^1.3.0",
"is-wsl": "^2.2.0",
"semver": "^7.3.2",
"shellwords": "^0.1.1",
"uuid": "^8.3.0",
"which": "^2.0.2"
}
},
"node_modules/node-notifier/node_modules/semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"optional": true,
"peer": true,
"dependencies": {
"lru-cache": "^6.0.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/node-releases": {
"version": "2.0.13",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
@@ -16490,14 +16449,6 @@
"integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
"dev": true
},
"node_modules/shellwords": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
"dev": true,
"optional": true,
"peer": true
},
"node_modules/side-channel": {
"version": "1.0.4",
"resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
@@ -18165,17 +18116,6 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"node_modules/uuid": {
"version": "8.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
"dev": true,
"optional": true,
"peer": true,
"bin": {
"uuid": "dist/bin/uuid"
}
},
"node_modules/v8-to-istanbul": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.8",
"version": "4.0.0-alpha.21",
"description": "Cocos Creator is a cross-platform 2D & 3D game engine written in C++ and TypeScript, licensed under MIT.",
"homepage": "http://www.cocos.com",
"license": "MIT",
+1
View File
@@ -52,4 +52,5 @@ export enum Platform {
MIGU_MINI_GAME = 'MIGU_MINI_GAME',
HONOR_MINI_GAME = 'HONOR_MINI_GAME',
SUD_MINI_GAME = 'SUD_MINI_GAME',
SUDV2_MINI_GAME = 'SUDV2_MINI_GAME',
}
+14 -2
View File
@@ -23,8 +23,8 @@
THE SOFTWARE.
*/
import { ALIPAY, BYTEDANCE, HUAWEI, OPPO, RUNTIME_BASED, SUD, VIVO, MIGU, HONOR, WECHAT, XIAOMI, DEBUG, TEST, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants';
import { minigame, SystemInfo as MinigameSystemInfo } from 'pal/minigame';
import { ALIPAY, BYTEDANCE, HUAWEI, OPPO, RUNTIME_BASED, SUD, SUDV2, VIVO, MIGU, HONOR, WECHAT, XIAOMI, DEBUG, TEST, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants';
import { minigame, SystemInfo as MinigameSystemInfo, WindowInfo } from 'pal/minigame';
import { IFeatureMap } from 'pal/system-info';
import { EventTarget } from '../../../cocos/core/event';
import { checkPalIntegrity, withImpl } from '../../integrity-check';
@@ -60,6 +60,8 @@ if (WECHAT) {
currentPlatform = Platform.HONOR_MINI_GAME;
} else if (SUD) {
currentPlatform = Platform.SUD_MINI_GAME;
} else if (SUDV2) {
currentPlatform = Platform.SUDV2_MINI_GAME;
}
let isVersionGreaterOrEqualTo;
@@ -98,7 +100,10 @@ if (BYTEDANCE) {
}
const originalGetSystemInfoSync = minigame.getSystemInfoSync;
// Some platforms may not have this interface(getWindowInfo).
const originalGetWindowInfo = minigame.getWindowInfo;
let _cachedSystemInfo: MinigameSystemInfo = originalGetSystemInfoSync.call(minigame);
let _cachedWindowInfo: WindowInfo | undefined = originalGetWindowInfo?.call(minigame);
function testAndUpdateSystemInfoCache (testAmount: number, testInterval: number): void {
let successfullyTestTimes = 0;
@@ -125,12 +130,19 @@ if (WECHAT && versionCompare(minigame.getAppBaseInfo().SDKVersion, '2.25.3') < 0
minigame.onWindowResize?.(() => {
// update cached system info
_cachedSystemInfo = originalGetSystemInfoSync.call(minigame);
_cachedWindowInfo = originalGetWindowInfo?.call(minigame);
});
minigame.getSystemInfoSync = function (): MinigameSystemInfo {
return _cachedSystemInfo;
};
if (originalGetWindowInfo !== undefined) {
minigame.getWindowInfo = function (): WindowInfo {
return _cachedWindowInfo!;
};
}
class SystemInfo extends EventTarget {
public declare readonly networkType: NetworkType;
public declare readonly isNative: boolean;
+20 -1
View File
@@ -1,3 +1,5 @@
/// <reference types="jest" />
import { EPSILON, Quat, Vec2, Vec3 } from "../../cocos/core";
import { director } from "../../cocos/game";
import { Node } from "../../cocos/scene-graph";
@@ -40,4 +42,21 @@ export default function (parent: Node, _steps = 0) {
parent.removeAllChildren();
}
}
// circle worldPosition
{
const nodeCollider = new Node('CircleCollider2D');
parent.addChild(nodeCollider);
nodeCollider.worldPosition = new Vec3(10, 20, 0);
nodeCollider.addComponent(physics2d.RigidBody2D);
const collider = nodeCollider.addComponent(physics2d.CircleCollider2D) as physics2d.CircleCollider2D;
collider.offset = new Vec2(2, -3);
collider.apply();
expect(Vec2.equals(collider.worldPosition, new Vec2(12, 17))).toBe(true);
parent.destroyAllChildren();
parent.removeAllChildren();
}
}
+37
View File
@@ -0,0 +1,37 @@
import * as physics2d from "../../exports/physics-2d-framework";
/**
* 验证 Box2D 后端关闭调试绘制时保留调试节点,避免再次开启时父节点为空。
*/
export default function DebugDrawTest (): void {
if (physics2d.selector.id === 'builtin') {
return;
}
const parent = {};
const clear = jest.fn();
const debugGraphics = {
clear,
node: {
parent,
},
};
const physicsWorld = physics2d.PhysicsSystem2D.instance.physicsWorld as unknown as {
_debugGraphics: typeof debugGraphics | null;
};
physicsWorld._debugGraphics = debugGraphics;
try {
physics2d.PhysicsSystem2D.instance.debugDrawFlags = physics2d.EPhysics2DDrawFlags.Shape;
physics2d.PhysicsSystem2D.instance.debugDrawFlags = physics2d.EPhysics2DDrawFlags.None;
expect(clear).toHaveBeenCalledTimes(1);
expect(debugGraphics.node.parent).toBe(parent);
physics2d.PhysicsSystem2D.instance.debugDrawFlags = physics2d.EPhysics2DDrawFlags.Shape;
expect(debugGraphics.node.parent).toBe(parent);
} finally {
physics2d.PhysicsSystem2D.instance.debugDrawFlags = physics2d.EPhysics2DDrawFlags.None;
physicsWorld._debugGraphics = null;
}
}
+5 -1
View File
@@ -12,6 +12,7 @@ import RigidBodyTest from "./rigid-body";
import ColliderTest from "./collider";
import SceneQueryTest from "./scene-query";
import EventTest from "./events";
import DebugDrawTest from "./debug-draw";
game.emit(Game.EVENT_PRE_SUBSYSTEM_INIT);
physics2d.PhysicsSystem2D.constructAndRegister();
@@ -50,10 +51,13 @@ for (const id in physics2d.selector.backend) {
//test events
EventTest(temp0);
//test debug draw
DebugDrawTest();
// destroy test scene
temp0.destroy();
scene.destroy();
// all works done
done();
})
}
}