Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 44ef76855b | |||
| 8878e7aade | |||
| 621880a123 | |||
| 2eb268bf9a | |||
| 2e6cc9b127 | |||
| 98917ff2a7 | |||
| dc29d2f8f8 | |||
| eec2a1693b | |||
| 632f9b442f | |||
| 8ce19b658e | |||
| 07f2c5fb43 | |||
| 9b17fd6165 | |||
| e2795f9ecd | |||
| 89a412e0d6 | |||
| aef31099d8 | |||
| 89f8768e57 | |||
| 424be5d0b2 | |||
| e5183b796a | |||
| 32478c1a9c | |||
| 74e632a3d6 | |||
| 26883ba6f4 | |||
| 055c70f8d2 | |||
| 99f6db401c | |||
| 9390ee6bc0 | |||
| 7f258dac58 | |||
| 5c99570616 | |||
| 821928733b | |||
| f567861ff6 | |||
| a7a20b64ab | |||
| 7c75834010 | |||
| 8fd985af75 | |||
| cc97bc8af4 | |||
| 92124590fe | |||
| 822ac6026c | |||
| 4a6f83bd6d | |||
| 04f063eb2b | |||
| 910865bd8b | |||
| e384f54ed2 | |||
| 5964835c83 | |||
| f4ae16247c | |||
| 4b4a3ca13f | |||
| f1c5d21be6 | |||
| da75e89f4a | |||
| aba27a715d | |||
| 62c1eb58c3 |
@@ -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);
|
||||
|
||||
@@ -567,7 +567,7 @@ export class Sprite extends UIRenderer {
|
||||
if (this.spriteFrame && this.spriteFrame.texture instanceof RenderTexture) {
|
||||
const rtMatName = `rt-${mat.name}`;
|
||||
let rtMat = builtinResMgr.get(rtMatName) as Material | null;
|
||||
if (!rtMat) {
|
||||
if (!rtMat || !rtMat.passes.length) {
|
||||
rtMat = new Material(rtMatName);
|
||||
rtMat.copy(mat, { defines: { SAMPLE_FROM_RT: true } });
|
||||
builtinResMgr.addAsset(rtMatName, rtMat);
|
||||
|
||||
@@ -536,7 +536,7 @@ export class UIRenderer extends Renderer {
|
||||
const mat = this._updateBuiltinMaterial();
|
||||
this.setSharedMaterial(mat, 0);
|
||||
if (this.stencilStage === Stage.ENTER_LEVEL || this.stencilStage === Stage.ENTER_LEVEL_INVERTED) {
|
||||
this.getMaterialInstance(0)!.recompileShaders({ USE_ALPHA_TEST: true });
|
||||
this.getMaterialInstance(0)?.recompileShaders({ USE_ALPHA_TEST: true });
|
||||
}
|
||||
this._updateBlendFunc();
|
||||
}
|
||||
@@ -600,16 +600,24 @@ export class UIRenderer extends Renderer {
|
||||
*/
|
||||
public _updateBlendFunc (): void {
|
||||
// todo: Not only Pass[0].target[0]
|
||||
let target = this.getRenderMaterial(0)!.passes[0].blendState.targets[0];
|
||||
const renderMat = this.getRenderMaterial(0);
|
||||
if (!renderMat || !renderMat.passes[0]) {
|
||||
return;
|
||||
}
|
||||
let target = renderMat.passes[0].blendState.targets[0];
|
||||
this._dstBlendFactorCache = target.blendDst;
|
||||
this._srcBlendFactorCache = target.blendSrc;
|
||||
if (this._dstBlendFactorCache !== this._dstBlendFactor || this._srcBlendFactorCache !== this._srcBlendFactor) {
|
||||
target = this.getMaterialInstance(0)!.passes[0].blendState.targets[0];
|
||||
const matInstance = this.getMaterialInstance(0);
|
||||
if (!matInstance || !matInstance.passes[0]) {
|
||||
return;
|
||||
}
|
||||
target = matInstance.passes[0].blendState.targets[0];
|
||||
target.blend = true;
|
||||
target.blendDstAlpha = BlendFactor.ONE_MINUS_SRC_ALPHA;
|
||||
target.blendDst = this._dstBlendFactor;
|
||||
target.blendSrc = this._srcBlendFactor;
|
||||
const targetPass = this.getMaterialInstance(0)!.passes[0];
|
||||
const targetPass = matInstance.passes[0];
|
||||
targetPass.blendState.setTarget(0, target);
|
||||
targetPass._updatePassHash();
|
||||
this._dstBlendFactorCache = this._dstBlendFactor;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
import { CULL_MESHOPT, NATIVE_CODE_BUNDLE_MODE } from 'internal:constants';
|
||||
import { ensureWasmModuleReady, instantiateWasm } from 'pal/wasm';
|
||||
|
||||
import { sys, logID, error } from '../../core';
|
||||
import { sys, error, debugID } from '../../core';
|
||||
|
||||
import { game } from '../../game';
|
||||
import { NativeCodeBundleMode } from '../../misc/webassembly-support';
|
||||
@@ -53,7 +53,7 @@ function initDecoderASM (asm_factory: any): Promise<void> {
|
||||
MeshoptDecoder.decodeGltfBuffer = asm_factory.decodeGltfBuffer;
|
||||
MeshoptDecoder.useWorkers = asm_factory.useWorkers;
|
||||
MeshoptDecoder.decodeGltfBufferAsync = asm_factory.decodeGltfBufferAsync;
|
||||
logID(14202);
|
||||
debugID(14202);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ function initDecoderWASM (wasm_factory: any, wasm_url: string): Promise<void> {
|
||||
MeshoptDecoder.decodeGltfBuffer = wasm_factory.decodeGltfBuffer;
|
||||
MeshoptDecoder.useWorkers = wasm_factory.useWorkers;
|
||||
MeshoptDecoder.decodeGltfBufferAsync = wasm_factory.decodeGltfBufferAsync;
|
||||
logID(14203);
|
||||
debugID(14203);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -195,8 +195,9 @@ function define (className, baseClass, options): any {
|
||||
renderName = 'render_stage';
|
||||
}
|
||||
// 增加了 hidden: 开头标识,使它最终不会显示在 Editor inspector 的添加组件列表里
|
||||
|
||||
window.EditorExtends && window.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
|
||||
if (window.EditorExtends) {
|
||||
window.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
|
||||
}
|
||||
}
|
||||
|
||||
// Note: `options.ctor` should be the same as `cls` except if
|
||||
|
||||
@@ -776,6 +776,12 @@ export default class ParticleSystemRendererCPU extends ParticleSystemRendererBas
|
||||
_matInsInfo.subModelIdx = 0;
|
||||
}
|
||||
mat = mat || this._defaultTrailMat!;
|
||||
|
||||
const matIns: MaterialInstance | null = ps.getMaterialInstance(1);
|
||||
if (matIns === null || matIns === undefined) {
|
||||
ps.setSharedMaterial(mat, 1); // set material[1] as trail material for ui-mesh-renderer to use
|
||||
}
|
||||
|
||||
const texture = mat.getProperty('mainTexture', 0) as Texture2D | null;
|
||||
if (texture && texture.isAlphaAtlas) {
|
||||
this._trailDefines[CC_USE_EMBEDDED_ALPHA] = true;
|
||||
|
||||
@@ -141,7 +141,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
|
||||
|
||||
if (!v) {
|
||||
if (this._debugGraphics) {
|
||||
this._debugGraphics.node.parent = null;
|
||||
this._debugGraphics.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[] {
|
||||
|
||||
@@ -26,7 +26,7 @@ import { instantiateWasm, ensureWasmModuleReady } from 'pal/wasm';
|
||||
import { BUILD, LOAD_BOX2D_MANUALLY, NATIVE_CODE_BUNDLE_MODE } from 'internal:constants';
|
||||
|
||||
import { game } from '../../game';
|
||||
import { error, sys, IVec2Like, log } from '../../core';
|
||||
import { error, sys, IVec2Like, log, debug } from '../../core';
|
||||
import { NativeCodeBundleMode } from '../../misc/webassembly-support';
|
||||
|
||||
// eslint-disable-next-line import/no-mutable-exports
|
||||
@@ -148,7 +148,7 @@ function initWasm (wasmFactory, wasmUrl: string): Promise<void> {
|
||||
}).catch((err) => reject(errorMessage(err)));
|
||||
},
|
||||
}).then((Instance: any) => {
|
||||
log('[box2d]:box2d wasm lib loaded.');
|
||||
debug('[box2d]:box2d wasm lib loaded.');
|
||||
B2 = Instance;
|
||||
}).then(resolve).catch((err: any) => reject(errorMessage(err)));
|
||||
});
|
||||
@@ -158,7 +158,7 @@ function initAsm (asmFactory): Promise<void> {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
const errorMessage = (err: any): string => `[box2d]: box2d asm lib load failed: ${err}`;
|
||||
asmFactory().then((instance: any) => {
|
||||
log('[box2d]:box2d asm lib loaded.');
|
||||
debug('[box2d]:box2d asm lib loaded.');
|
||||
B2 = instance;
|
||||
}).then(resolve).catch((err: any) => reject(errorMessage(err)));
|
||||
});
|
||||
|
||||
@@ -114,7 +114,7 @@ export class B2PhysicsWorld implements IPhysicsWorld {
|
||||
|
||||
if (!v) {
|
||||
if (this._debugGraphics) {
|
||||
this._debugGraphics.node.parent = null;
|
||||
this._debugGraphics.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[]
|
||||
|
||||
@@ -100,7 +100,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
|
||||
|
||||
if (!v) {
|
||||
if (this._debugGraphics) {
|
||||
this._debugGraphics.node.parent = null;
|
||||
this._debugGraphics.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[] {
|
||||
|
||||
@@ -27,7 +27,7 @@ import { EDITOR, DEBUG, TEST, EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
|
||||
import { IRigidBody2D } from '../spec/i-rigid-body';
|
||||
import { IBoxShape, ICircleShape, IPolygonShape, IBaseShape } from '../spec/i-physics-shape';
|
||||
import { IPhysicsWorld } from '../spec/i-physics-world';
|
||||
import { errorID, log } from '../../core';
|
||||
import { debug, errorID, log } from '../../core';
|
||||
import { ECollider2DType, EJoint2DType } from './physics-types';
|
||||
import { IJoint2D, IDistanceJoint, ISpringJoint, IFixedJoint, IMouseJoint,
|
||||
IRelativeJoint, ISliderJoint, IWheelJoint, IHingeJoint } from '../spec/i-physics-joint';
|
||||
@@ -110,7 +110,7 @@ export interface IPhysicsSelector {
|
||||
}
|
||||
|
||||
function register (id: IPhysicsEngineId, wrapper: IPhysicsWrapperObject): void {
|
||||
if (!EDITOR && !TEST) log(`[PHYSICS2D]: register ${id}.`);
|
||||
if (!EDITOR && !TEST) debug(`[PHYSICS2D]: register ${id}.`);
|
||||
selector.backend[id] = wrapper;
|
||||
if (!selector.physicsWorld || selector.id === id) {
|
||||
const mutableSelector = selector as Mutable<IPhysicsSelector>;
|
||||
@@ -124,12 +124,12 @@ function switchTo (id: IPhysicsEngineId): void {
|
||||
const mutableSelector = selector as Mutable<IPhysicsSelector>;
|
||||
if (selector.physicsWorld && id !== selector.id && selector.backend[id] != null) {
|
||||
//selector.physicsWorld.destroy();//todo
|
||||
if (!TEST) log(`[PHYSICS2D]: switch from ${selector.id} to ${id}.`);
|
||||
if (!TEST) debug(`[PHYSICS2D]: switch from ${selector.id} to ${id}.`);
|
||||
mutableSelector.id = id;
|
||||
mutableSelector.wrapper = selector.backend[id];
|
||||
mutableSelector.physicsWorld = createPhysicsWorld();
|
||||
} else {
|
||||
if (!EDITOR && !TEST) log(`[PHYSICS2D]: using ${mutableSelector.id}.`);
|
||||
if (!EDITOR && !TEST) debug(`[PHYSICS2D]: using ${mutableSelector.id}.`);
|
||||
mutableSelector.physicsWorld = createPhysicsWorld();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
import { ensureWasmModuleReady, instantiateWasm } from 'pal/wasm';
|
||||
import { BUILD, LOAD_BULLET_MANUALLY, NATIVE_CODE_BUNDLE_MODE } from 'internal:constants';
|
||||
import { game } from '../../game';
|
||||
import { error, log, sys } from '../../core';
|
||||
import { debug, error, sys } from '../../core';
|
||||
import { NativeCodeBundleMode } from '../../misc/webassembly-support';
|
||||
import type { BulletCache } from './bullet-cache';
|
||||
|
||||
@@ -106,7 +106,7 @@ function initWASM (wasmFactory, wasmUrl: string): Promise<void> {
|
||||
}).catch((err) => reject(errorMessage(err)));
|
||||
},
|
||||
}).then((instance: any) => {
|
||||
log('[bullet]:bullet wasm lib loaded.');
|
||||
debug('[bullet]:bullet wasm lib loaded.');
|
||||
bt = instance as Bullet.instance;
|
||||
globalThis.Bullet = bt as any;
|
||||
}).then(resolve).catch((err: any) => reject(errorMessage(err)));
|
||||
@@ -117,7 +117,7 @@ function initASM (asmFactory): Promise<void> {
|
||||
if (asmFactory != null) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
||||
return asmFactory().then((instance: any) => {
|
||||
log('[bullet]:bullet asm lib loaded.');
|
||||
debug('[bullet]:bullet asm lib loaded.');
|
||||
bt = instance as Bullet.instance;
|
||||
});
|
||||
} else {
|
||||
|
||||
@@ -35,7 +35,7 @@ import {
|
||||
import { IPhysicsWorld } from '../spec/i-physics-world';
|
||||
import { IRigidBody } from '../spec/i-rigid-body';
|
||||
import { IBoxCharacterController, ICapsuleCharacterController } from '../spec/i-character-controller';
|
||||
import { errorID, IVec3Like, warn, cclegacy, log } from '../../core';
|
||||
import { errorID, IVec3Like, warn, cclegacy, debug } from '../../core';
|
||||
import { EColliderType, EConstraintType, ECharacterControllerType } from './physics-enum';
|
||||
import { PhysicsMaterial } from '.';
|
||||
|
||||
@@ -125,7 +125,7 @@ function updateLegacyMacro (id: string): void {
|
||||
}
|
||||
|
||||
function register (id: IPhysicsEngineId, wrapper: IPhysicsWrapperObject): void {
|
||||
if (!EDITOR && !TEST) log(`[PHYSICS]: register ${id}.`);
|
||||
if (!EDITOR && !TEST) debug(`[PHYSICS]: register ${id}.`);
|
||||
selector.backend[id] = wrapper;
|
||||
if (!selector.physicsWorld || selector.id === id) {
|
||||
updateLegacyMacro(id);
|
||||
@@ -147,13 +147,13 @@ function switchTo (id: IPhysicsEngineId): void {
|
||||
const mutableSelector = selector as Mutable<IPhysicsSelector>;
|
||||
if (selector.physicsWorld && id !== selector.id && selector.backend[id] != null) {
|
||||
selector.physicsWorld.destroy();
|
||||
if (!TEST) log(`[PHYSICS]: switch from ${selector.id} to ${id}.`);
|
||||
if (!TEST) debug(`[PHYSICS]: switch from ${selector.id} to ${id}.`);
|
||||
updateLegacyMacro(id);
|
||||
mutableSelector.id = id;
|
||||
mutableSelector.wrapper = selector.backend[id];
|
||||
mutableSelector.physicsWorld = createPhysicsWorld();
|
||||
} else {
|
||||
if (!EDITOR && !TEST) log(`[PHYSICS]: using ${id}.`);
|
||||
if (!EDITOR && !TEST) debug(`[PHYSICS]: using ${id}.`);
|
||||
mutableSelector.physicsWorld = createPhysicsWorld();
|
||||
}
|
||||
if (worldInitData) {
|
||||
@@ -185,7 +185,7 @@ export function constructDefaultWorld (data: IWorldInitData): void {
|
||||
if (!worldInitData) worldInitData = data;
|
||||
if (!selector.runInEditor) return;
|
||||
if (!selector.physicsWorld) {
|
||||
if (!TEST) log(`[PHYSICS]: using ${selector.id}.`);
|
||||
if (!TEST) debug(`[PHYSICS]: using ${selector.id}.`);
|
||||
const mutableSelector = selector as Mutable<IPhysicsSelector>;
|
||||
const world = mutableSelector.physicsWorld = createPhysicsWorld();
|
||||
world.setGravity(worldInitData.gravity);
|
||||
|
||||
@@ -615,10 +615,17 @@ class DeviceRenderQueue implements RecordingInterface {
|
||||
this._devicePass = devicePass;
|
||||
this._phaseID = cclegacy.rendering.getPhaseID(devicePass.passID, context.renderGraph.getLayout(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* @en Creates a blit descriptor for the given blit operation.
|
||||
* @zh 为给定的 blit 操作创建一个 blit 描述符。
|
||||
* @param blit @en The blit operation to create a descriptor for. @zh 要为其创建描述符的 blit 操作。
|
||||
*/
|
||||
createBlitDesc (blit: Blit): void {
|
||||
if (!this._blitDesc) {
|
||||
this._blitDesc = new BlitDesc(blit);
|
||||
}
|
||||
this._blitDesc.blit = blit;
|
||||
this._blitDesc.createScreenQuad();
|
||||
this._blitDesc.createStageDescriptor();
|
||||
}
|
||||
|
||||
@@ -817,11 +817,20 @@ export class LightResource {
|
||||
this.lightIndex.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* @en Adds a light to the light buffer and returns its byte offset.
|
||||
* @zh 将光源添加到光源缓冲区,并返回其字节偏移量。
|
||||
* @param light @en The light to add. @zh 要添加的光源。
|
||||
* @param bHDR @en Whether HDR rendering is enabled. @zh 是否启用 HDR 渲染。
|
||||
* @param exposure @en The camera exposure value. @zh 相机曝光值。
|
||||
* @param shadowInfo @en The shadow settings, or null if shadows are disabled. @zh 阴影设置,若禁用阴影则为 null。
|
||||
* @returns @en The byte offset of the light in the light buffer. @zh 光源在光源缓冲区中的字节偏移量。
|
||||
*/
|
||||
addLight (light: Light, bHDR: boolean, exposure: number, shadowInfo: Shadows | null): number {
|
||||
// Already added
|
||||
const existingLightID = this.lightIndex.get(light);
|
||||
if (existingLightID !== undefined) {
|
||||
return existingLightID;
|
||||
return existingLightID * this.elementSize;
|
||||
}
|
||||
|
||||
if (!this.lightBuffer) {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
import { cclegacy } from './core/global-exports';
|
||||
import { DataPoolManager } from './3d/skeletal-animation/data-pool-manager';
|
||||
import { Device, deviceManager } from './gfx';
|
||||
import { settings, Settings, warnID, Pool, macro, log } from './core';
|
||||
import { settings, Settings, warnID, Pool, macro, log, debug } from './core';
|
||||
import { PipelineEventProcessor } from './rendering/pipeline-event';
|
||||
import type { Root as JsbRoot } from './root';
|
||||
|
||||
@@ -242,7 +242,7 @@ rootProto.setRenderPipeline = function (customPipeline: boolean) {
|
||||
if (customPipeline) {
|
||||
cclegacy.rendering.createCustomPipeline();
|
||||
ppl = oldSetPipeline.call(this, null);
|
||||
log(`Using custom pipeline: ${macro.CUSTOM_PIPELINE_NAME}`);
|
||||
debug(`Using custom pipeline: ${macro.CUSTOM_PIPELINE_NAME}`);
|
||||
} else {
|
||||
// pipeline should not be created in C++, ._ctor need to be triggered
|
||||
if (cclegacy.legacy_rendering) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
import { USE_XR } from 'internal:constants';
|
||||
import { Pool, cclegacy, warnID, settings, macro, log, errorID, SettingsCategory } from './core';
|
||||
import { Pool, cclegacy, warnID, settings, macro, log, errorID, SettingsCategory, debug } from './core';
|
||||
import { DebugView } from './rendering/debug-view';
|
||||
import { Camera, CameraType, Light, Model, TrackingType } from './render-scene/scene';
|
||||
import type { DataPoolManager } from './3d/skeletal-animation/data-pool-manager';
|
||||
@@ -380,11 +380,11 @@ export class Root {
|
||||
isCreateDefaultPipeline = true;
|
||||
this._pipeline = this._customPipeline!;
|
||||
// Use default _pipelineEvent
|
||||
log(`Using custom pipeline: ${macro.CUSTOM_PIPELINE_NAME}`);
|
||||
debug(`Using custom pipeline: ${macro.CUSTOM_PIPELINE_NAME}`);
|
||||
} else {
|
||||
const rppl: (PipelineRuntime & IPipelineEvent) = legacy_rendering.createDefaultPipeline();
|
||||
isCreateDefaultPipeline = true;
|
||||
log(`Using legacy pipeline`);
|
||||
debug(`Using legacy pipeline`);
|
||||
|
||||
this._classicPipeline = rppl!;
|
||||
this._pipeline = this._classicPipeline;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 945 B |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 6.0 KiB |
|
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
|
||||
}
|
||||
}
|
||||
@@ -244,6 +244,20 @@
|
||||
"faceCount": 0.1
|
||||
}
|
||||
]
|
||||
},
|
||||
"legacyFbxImporter": false,
|
||||
"allowMeshDataAccess": true,
|
||||
"addVertexColor": false,
|
||||
"generateLightmapUVNode": false,
|
||||
"meshOptimizer": {
|
||||
"enable": false,
|
||||
"algorithm": "simplify",
|
||||
"simplifyOptions": {
|
||||
"targetRatio": 1,
|
||||
"enableSmartLink": true,
|
||||
"agressiveness": 7,
|
||||
"maxIterationCount": 100
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -37,6 +37,11 @@ module.exports = {
|
||||
newTypeScript: '脚本 (TypeScript)',
|
||||
newCubeMap: '立方体贴图',
|
||||
newScene: '场景',
|
||||
newScene:{
|
||||
'2d': '2D 场景',
|
||||
'3d': '3D 场景',
|
||||
quality: '高质量场景',
|
||||
},
|
||||
newPrefab: '预制 (Prefab)',
|
||||
newRenderTexture: '渲染纹理 (Render Texture)',
|
||||
newMaterial: '材质',
|
||||
|
||||
@@ -760,6 +760,7 @@ module.exports = link(mixin({
|
||||
},
|
||||
mask: {
|
||||
type: '遮罩类型',
|
||||
radius: '矩形遮罩的圆角半径',
|
||||
spriteFrame: '遮罩所需要的贴图',
|
||||
inverted: '反向遮罩(不支持 Canvas 模式)',
|
||||
alphaThreshold: 'Alpha 阈值,只有当模板的像素的 Alpha 大于 Alpha Threshold 时,才会绘制内容(不支持 Canvas 模式)',
|
||||
|
||||
@@ -70,20 +70,37 @@ static bool js_assets_SimpleTexture_registerListeners(se::State &s) // NOLINT(re
|
||||
{
|
||||
auto *cobj = SE_THIS_OBJECT<cc::SimpleTexture>(s);
|
||||
SE_PRECONDITION2(cobj, false, "Invalid Native Object");
|
||||
auto *thisObj = s.thisObject();
|
||||
|
||||
cobj->on<cc::SimpleTexture::TextureUpdated>([thisObj](cc::SimpleTexture * /*emitter*/, cc::gfx::Texture *texture) {
|
||||
// NOTE: resolve the live JS wrapper from the native pointer at emit time instead of capturing
|
||||
// `s.thisObject()`. A native texture can outlive its JS wrapper (e.g. builtin textures kept alive
|
||||
// by builtinResMgr), so a captured raw se::Object* would dangle and a later event would call into a
|
||||
// dead object. Skip when no live wrapper exists. See registerPassesUpdatedListener below for details.
|
||||
cobj->on<cc::SimpleTexture::TextureUpdated>([](cc::SimpleTexture *emitter, cc::gfx::Texture *texture) {
|
||||
auto *se = se::ScriptEngine::getInstance();
|
||||
if (se == nullptr || !se->isValid() || se->isInCleanup() || se->isGarbageCollecting()) {
|
||||
return;
|
||||
}
|
||||
se::AutoHandleScope hs;
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(texture, arg0, nullptr);
|
||||
se::ScriptEngine::getInstance()->callFunction(thisObj, "_onGFXTextureUpdated", 1, &arg0);
|
||||
se::Object *jsObject = se::NativePtrToObjectMap::findFirst(emitter);
|
||||
if (jsObject != nullptr) {
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(texture, arg0, nullptr);
|
||||
se->callFunction(jsObject, "_onGFXTextureUpdated", 1, &arg0);
|
||||
}
|
||||
});
|
||||
|
||||
cobj->on<cc::SimpleTexture::AfterAssignImage>([thisObj](cc::SimpleTexture * /*emitter*/, cc::ImageAsset *image) {
|
||||
cobj->on<cc::SimpleTexture::AfterAssignImage>([](cc::SimpleTexture *emitter, cc::ImageAsset *image) {
|
||||
auto *se = se::ScriptEngine::getInstance();
|
||||
if (se == nullptr || !se->isValid() || se->isInCleanup() || se->isGarbageCollecting()) {
|
||||
return;
|
||||
}
|
||||
se::AutoHandleScope hs;
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(image, arg0, nullptr);
|
||||
se::ScriptEngine::getInstance()->callFunction(thisObj, "_onAfterAssignImage", 1, &arg0);
|
||||
se::Object *jsObject = se::NativePtrToObjectMap::findFirst(emitter);
|
||||
if (jsObject != nullptr) {
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(image, arg0, nullptr);
|
||||
se->callFunction(jsObject, "_onAfterAssignImage", 1, &arg0);
|
||||
}
|
||||
});
|
||||
|
||||
return true;
|
||||
@@ -94,12 +111,20 @@ static bool js_assets_TextureBase_registerGFXSamplerUpdatedListener(se::State &s
|
||||
{
|
||||
auto *cobj = SE_THIS_OBJECT<cc::TextureBase>(s);
|
||||
SE_PRECONDITION2(cobj, false, "Invalid Native Object");
|
||||
auto *thisObj = s.thisObject();
|
||||
cobj->on<cc::TextureBase::SamplerUpdated>([thisObj](cc::TextureBase * /*emitter*/, cc::gfx::Sampler *sampler) {
|
||||
// Resolve the live JS wrapper at emit time (see SimpleTexture/Material listeners above) so the
|
||||
// callback never targets a wrapper that has already been GC'd while the native object lives on.
|
||||
cobj->on<cc::TextureBase::SamplerUpdated>([](cc::TextureBase *emitter, cc::gfx::Sampler *sampler) {
|
||||
auto *se = se::ScriptEngine::getInstance();
|
||||
if (se == nullptr || !se->isValid() || se->isInCleanup() || se->isGarbageCollecting()) {
|
||||
return;
|
||||
}
|
||||
se::AutoHandleScope hs;
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(sampler, arg0, nullptr);
|
||||
se::ScriptEngine::getInstance()->callFunction(thisObj, "_onGFXSamplerUpdated", 1, &arg0);
|
||||
se::Object *jsObject = se::NativePtrToObjectMap::findFirst(emitter);
|
||||
if (jsObject != nullptr) {
|
||||
se::Value arg0;
|
||||
nativevalue_to_se(sampler, arg0, nullptr);
|
||||
se->callFunction(jsObject, "_onGFXSamplerUpdated", 1, &arg0);
|
||||
}
|
||||
});
|
||||
|
||||
return true;
|
||||
@@ -110,10 +135,31 @@ static bool js_assets_Material_registerPassesUpdatedListener(se::State &s) // NO
|
||||
{
|
||||
auto *cobj = SE_THIS_OBJECT<cc::Material>(s);
|
||||
SE_PRECONDITION2(cobj, false, "Invalid Native Object");
|
||||
auto *thisObj = s.thisObject();
|
||||
cobj->on<cc::Material::PassesUpdated>([thisObj](cc::Material * /*emitter*/) {
|
||||
// NOTE: Do NOT capture the JS wrapper (`s.thisObject()`) here. A native Material can outlive
|
||||
// its JS wrapper -- e.g. builtin "rt-*" materials are kept alive by builtinResMgr's IntrusivePtr
|
||||
// while their JS wrapper is GC'd after the owning sprite is destroyed. A captured raw se::Object*
|
||||
// would then dangle, and a later PassesUpdated (emitted from Material::update()/doDestroy()) would
|
||||
// invoke `_onPassesUpdated` on a dead object, producing:
|
||||
// [SE_ERROR] _onPassesUpdated is not a function: undefined
|
||||
// Instead resolve the *current* live JS wrapper from the native pointer at emit time, and skip
|
||||
// when none exists (a freshly recreated wrapper syncs passes lazily via its `passes` getter).
|
||||
//
|
||||
// The engine-state guard below is also mandatory: PassesUpdated can be emitted from
|
||||
// Material::update()/copy()/doDestroy() while the script engine is being torn down (editor
|
||||
// engine restart / scene reload) or while a GC is in progress. In those windows `findFirst`
|
||||
// may still return an se::Object whose V8 persistent now points at a freed object, and calling
|
||||
// into it crashes inside ObjectWrap::handle() (`Local<Object>::New` on a dangling handle).
|
||||
// Never touch JS during cleanup or GC -- see native/cocos/bindings/docs/JSB2.0-learning.
|
||||
cobj->on<cc::Material::PassesUpdated>([](cc::Material *emitter) {
|
||||
auto *se = se::ScriptEngine::getInstance();
|
||||
if (se == nullptr || !se->isValid() || se->isInCleanup() || se->isGarbageCollecting()) {
|
||||
return;
|
||||
}
|
||||
se::AutoHandleScope hs;
|
||||
se::ScriptEngine::getInstance()->callFunction(thisObj, "_onPassesUpdated", 0, nullptr);
|
||||
se::Object *jsObject = se::NativePtrToObjectMap::findFirst(emitter);
|
||||
if (jsObject != nullptr) {
|
||||
se->callFunction(jsObject, "_onPassesUpdated", 0, nullptr);
|
||||
}
|
||||
});
|
||||
|
||||
return true;
|
||||
|
||||
@@ -146,10 +146,19 @@ bool jsb_register_all_modules() {
|
||||
se::ScriptEngine *se = se::ScriptEngine::getInstance();
|
||||
|
||||
se->addBeforeCleanupHook([se]() {
|
||||
#if (CC_PLATFORM == CC_PLATFORM_IOS || CC_PLATFORM == CC_PLATFORM_MACOS || CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_OHOS)
|
||||
// REMOVED: se->garbageCollect()
|
||||
// Reason: Calling GC before Object::cleanup() causes MarkCompact to traverse
|
||||
// live JSTypedArrays whose external BackingStore data has already been freed
|
||||
// by AudioEngine::end(). The safe GC in ScriptEngine::cleanup() (step 5,
|
||||
// after Object::cleanup() releases all persistent handles) is sufficient.
|
||||
cc::DeferredReleasePool::clear();
|
||||
#else
|
||||
se->garbageCollect();
|
||||
cc::DeferredReleasePool::clear();
|
||||
se->garbageCollect();
|
||||
cc::DeferredReleasePool::clear();
|
||||
#endif // (CC_PLATFORM == CC_PLATFORM_IOS || CC_PLATFORM == CC_PLATFORM_MACOS || CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_OHOS)
|
||||
});
|
||||
|
||||
se->addRegisterCallback(jsb_register_global_variables);
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "cocos-creator",
|
||||
"version": "4.0.0-alpha.10",
|
||||
"version": "4.0.0-alpha.25",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "cocos-creator",
|
||||
"version": "4.0.0-alpha.10",
|
||||
"version": "4.0.0-alpha.25",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "cocos-creator",
|
||||
"version": "4.0.0-alpha.10",
|
||||
"version": "4.0.0-alpha.25",
|
||||
"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",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
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 } from 'pal/minigame';
|
||||
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';
|
||||
@@ -100,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;
|
||||
@@ -127,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;
|
||||
|
||||
@@ -1,30 +1,31 @@
|
||||
const cacheManager = require('./cache-manager');
|
||||
const { readText, readArrayBuffer, readJson, loadSubpackage, getUserDataPath, _subpackagesPath } = require('./fs-utils');
|
||||
|
||||
//cc.assetManager.fsUtils = ral.fsUtils;
|
||||
const { readText, readArrayBuffer, readJson, getUserDataPath } = require('./fs-utils');
|
||||
|
||||
const REGEX = /^https?:\/\/.*/;
|
||||
|
||||
const downloader = cc.assetManager.downloader;
|
||||
const parser = cc.assetManager.parser;
|
||||
const presets = cc.assetManager.presets;
|
||||
downloader.maxConcurrency = 12;
|
||||
downloader.maxRequestsPerFrame = 64;
|
||||
presets.scene.maxConcurrency = 12;
|
||||
downloader.maxConcurrency = 30;
|
||||
downloader.maxRequestsPerFrame = 60;
|
||||
presets.preload.maxConcurrency = 15;
|
||||
presets.preload.maxRequestsPerFrame = 30;
|
||||
presets.scene.maxConcurrency = 32;
|
||||
presets.scene.maxRequestsPerFrame = 64;
|
||||
presets.bundle.maxConcurrency = 32;
|
||||
presets.bundle.maxRequestsPerFrame = 64;
|
||||
|
||||
const subpackages = {};
|
||||
const loadedScripts = {};
|
||||
|
||||
function downloadScript (url, options, onComplete) {
|
||||
if (typeof options === 'function') {
|
||||
onComplete = options;
|
||||
options = null;
|
||||
options = {};
|
||||
}
|
||||
|
||||
if (loadedScripts[url]) {
|
||||
onComplete && onComplete();
|
||||
return;
|
||||
onComplete && onComplete();
|
||||
return;
|
||||
}
|
||||
|
||||
download(url, (src, options, onComplete) => {
|
||||
@@ -97,19 +98,14 @@ function downloadJson (url, options, onComplete) {
|
||||
download(url, parseJson, options, options.onFileProgress, onComplete);
|
||||
}
|
||||
|
||||
function downloadArrayBuffer (url, options, onComplete) {
|
||||
download(url, parseArrayBuffer, options, options.onFileProgress, onComplete);
|
||||
}
|
||||
|
||||
function loadFont (url, options, onComplete) {
|
||||
// nodejs 环境没有 document/FontFace API,不支持字体加载
|
||||
const fontFamilyName = _getFontFamily(url);
|
||||
|
||||
const fontFace = new FontFace(fontFamilyName, `url('${url}')`);
|
||||
document.fonts.add(fontFace);
|
||||
|
||||
fontFace.load();
|
||||
fontFace.loaded.then(() => {
|
||||
onComplete(null, fontFamilyName);
|
||||
}, () => {
|
||||
cc.warnID(4933, fontFamilyName);
|
||||
onComplete(null, fontFamilyName);
|
||||
});
|
||||
onComplete(null, fontFamilyName);
|
||||
}
|
||||
|
||||
function _getFontFamily (fontHandle) {
|
||||
@@ -126,6 +122,9 @@ function _getFontFamily (fontHandle) {
|
||||
} else {
|
||||
fontFamilyName = `${fontHandle.substring(slashPos + 1, ttfIndex)}_LABEL`;
|
||||
}
|
||||
if (fontFamilyName.indexOf(' ') !== -1) {
|
||||
fontFamilyName = `"${fontFamilyName}"`;
|
||||
}
|
||||
return fontFamilyName;
|
||||
}
|
||||
|
||||
@@ -143,11 +142,11 @@ function downloadBundle (nameOrUrl, options, onComplete) {
|
||||
url = nameOrUrl;
|
||||
cacheManager.makeBundleFolder(bundleName);
|
||||
} else if (downloader.remoteBundles.indexOf(bundleName) !== -1) {
|
||||
url = `${downloader.remoteServerAddress}remote/${bundleName}`;
|
||||
cacheManager.makeBundleFolder(bundleName);
|
||||
} else {
|
||||
url = `assets/${bundleName}`;
|
||||
}
|
||||
url = `${downloader.remoteServerAddress}remote/${bundleName}`;
|
||||
cacheManager.makeBundleFolder(bundleName);
|
||||
} else {
|
||||
url = `assets/${bundleName}`;
|
||||
}
|
||||
const config = `${url}/cc.config.${version ? `${version}.` : ''}json`;
|
||||
options.__cacheBundleRoot__ = bundleName;
|
||||
downloadJson(config, options, (err, response) => {
|
||||
@@ -159,7 +158,7 @@ function downloadBundle (nameOrUrl, options, onComplete) {
|
||||
out && (out.base = `${url}/`);
|
||||
|
||||
if (out.hasPreloadScript) {
|
||||
const js = `${url}/index.${version ? `${version}.` : ''}${out.encrypted ? 'jsc' : `js`}`;
|
||||
const js = `${url}/index.${version ? `${version}.` : ''}${out.encrypted ? 'jsc' : 'js'}`;
|
||||
downloadScript(js, options, (err) => {
|
||||
if (err) {
|
||||
onComplete(err, null);
|
||||
@@ -173,10 +172,6 @@ function downloadBundle (nameOrUrl, options, onComplete) {
|
||||
});
|
||||
}
|
||||
|
||||
function downloadArrayBuffer (url, options, onComplete) {
|
||||
download(url, parseArrayBuffer, options, options.onFileProgress, onComplete);
|
||||
}
|
||||
|
||||
const originParsePVRTex = parser.parsePVRTex;
|
||||
const parsePVRTex = function (file, options, onComplete) {
|
||||
readArrayBuffer(file, (err, data) => {
|
||||
@@ -240,6 +235,7 @@ downloader.register({
|
||||
'.pkm': downloadAsset,
|
||||
'.astc': downloadAsset,
|
||||
|
||||
// Font
|
||||
'.font': downloadAsset,
|
||||
'.eot': downloadAsset,
|
||||
'.ttf': downloadAsset,
|
||||
@@ -267,6 +263,7 @@ downloader.register({
|
||||
'.dbbin': downloadAsset,
|
||||
'.skel': downloadAsset,
|
||||
|
||||
// Video
|
||||
'.mp4': downloadAsset,
|
||||
'.avi': downloadAsset,
|
||||
'.mov': downloadAsset,
|
||||
@@ -281,6 +278,7 @@ downloader.register({
|
||||
});
|
||||
|
||||
parser.register({
|
||||
// Image
|
||||
'.png': downloader.downloadDomImage,
|
||||
'.jpg': downloader.downloadDomImage,
|
||||
'.bmp': downloader.downloadDomImage,
|
||||
@@ -290,10 +288,13 @@ parser.register({
|
||||
'.tiff': downloader.downloadDomImage,
|
||||
'.image': downloader.downloadDomImage,
|
||||
'.webp': downloader.downloadDomImage,
|
||||
|
||||
// Compressed texture
|
||||
'.pvr': parsePVRTex,
|
||||
'.pkm': parsePKMTex,
|
||||
'.astc': parseASTCTex,
|
||||
|
||||
// Font
|
||||
'.font': loadFont,
|
||||
'.eot': loadFont,
|
||||
'.ttf': loadFont,
|
||||
@@ -319,6 +320,7 @@ parser.register({
|
||||
'.fnt': parseText,
|
||||
'.plist': parsePlist,
|
||||
|
||||
// Binary
|
||||
'.binary': parseArrayBuffer,
|
||||
'.bin': parseArrayBuffer,
|
||||
'.dbbin': parseArrayBuffer,
|
||||
@@ -327,10 +329,9 @@ parser.register({
|
||||
'.ExportJson': parseJson,
|
||||
});
|
||||
|
||||
var transformUrl = function (url, options) {
|
||||
function transformUrl (url, options) {
|
||||
let inLocal = false;
|
||||
let inCache = false;
|
||||
|
||||
if (REGEX.test(url) && !url.startsWith('file://')) {
|
||||
if (options.reload) {
|
||||
return { url };
|
||||
@@ -339,16 +340,22 @@ var transformUrl = function (url, options) {
|
||||
if (cache) {
|
||||
inCache = true;
|
||||
url = cache;
|
||||
} else {
|
||||
const tempUrl = cacheManager.getTemp(url);
|
||||
if (tempUrl) {
|
||||
inLocal = true;
|
||||
url = tempUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
inLocal = true;
|
||||
if(url.startsWith('file://')) {
|
||||
if (url.startsWith('file://')) {
|
||||
url = globalThis.nodeEnv.require('url').fileURLToPath(url);
|
||||
}
|
||||
}
|
||||
return { url, inLocal, inCache };
|
||||
};
|
||||
}
|
||||
|
||||
cc.assetManager.transformPipeline.append((task) => {
|
||||
const input = task.output = task.input;
|
||||
@@ -372,7 +379,5 @@ cc.assetManager.transformPipeline.append((task) => {
|
||||
const originInit = cc.assetManager.init;
|
||||
cc.assetManager.init = function (options) {
|
||||
originInit.call(cc.assetManager, options);
|
||||
const subpacks = cc.settings.querySettings('assets', 'subpackages');
|
||||
subpacks && subpacks.forEach((x) => subpackages[x] = `${_subpackagesPath}${x}`);
|
||||
cacheManager.init();
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
const { makeDirSync, copyFile, downloadFile, deleteFile, rmdirSync, getUserDataPath } = require('./fs-utils');
|
||||
const { makeDirSync, copyFile, deleteFile, readJsonSync, writeFileSync, rmdirSync, getUserDataPath, isOutOfStorage } = require('./fs-utils');
|
||||
|
||||
let checkNextPeriod = false;
|
||||
let writeCacheFileList = null;
|
||||
@@ -65,9 +65,17 @@ const cacheManager = {
|
||||
},
|
||||
|
||||
init () {
|
||||
//TODO(qgh): Read the configuration file
|
||||
this.cacheDir = `${getUserDataPath()}/${this.cacheDir}`;
|
||||
this.cachedFiles = new cc.AssetManager.Cache();
|
||||
const cacheFilePath = `${this.cacheDir}/${this.cachedFileName}`;
|
||||
const result = readJsonSync(cacheFilePath);
|
||||
if (result instanceof Error || !result.version) {
|
||||
if (!(result instanceof Error)) rmdirSync(this.cacheDir, true);
|
||||
this.cachedFiles = new cc.AssetManager.Cache();
|
||||
makeDirSync(this.cacheDir, true);
|
||||
writeFileSync(cacheFilePath, JSON.stringify({ files: this.cachedFiles._map, version: this.version }), 'utf8');
|
||||
} else {
|
||||
this.cachedFiles = new cc.AssetManager.Cache(result.files);
|
||||
}
|
||||
this.tempFiles = new cc.AssetManager.Cache();
|
||||
},
|
||||
|
||||
@@ -80,7 +88,7 @@ const cacheManager = {
|
||||
|
||||
_write () {
|
||||
writeCacheFileList = null;
|
||||
//TODO(qgh): Write to the configuration file
|
||||
writeFileSync(`${this.cacheDir}/${this.cachedFileName}`, JSON.stringify({ files: this.cachedFiles._map, version: this.version }), 'utf8');
|
||||
},
|
||||
|
||||
writeCacheFile () {
|
||||
@@ -102,22 +110,20 @@ const cacheManager = {
|
||||
const { srcUrl, isCopy, cacheBundleRoot } = this.cacheQueue[id];
|
||||
const time = Date.now().toString();
|
||||
|
||||
let localPath = '';
|
||||
|
||||
if (cacheBundleRoot) {
|
||||
localPath = `${this.cacheDir}/${cacheBundleRoot}/${time}${suffix++}${cc.path.extname(id)}`;
|
||||
} else {
|
||||
localPath = `${this.cacheDir}/${time}${suffix++}${cc.path.extname(id)}`;
|
||||
}
|
||||
|
||||
const localPath = cacheBundleRoot
|
||||
? `${this.cacheDir}/${cacheBundleRoot}/${time}${suffix++}${cc.path.extname(id)}`
|
||||
: `${this.cacheDir}/${time}${suffix++}${cc.path.extname(id)}`;
|
||||
function callback (err) {
|
||||
if (err) {
|
||||
console.log('cannot support');
|
||||
// if (isOutOfStorage(err.message)) {
|
||||
// self.outOfStorage = true;
|
||||
// self.autoClear && self.clearLRU();
|
||||
// return;
|
||||
// }
|
||||
if (err) {
|
||||
// 不确定错误是否和runtime一致,得测试下
|
||||
if (isOutOfStorage(err.message)) {
|
||||
self.outOfStorage = true;
|
||||
self.autoClear && self.clearLRU();
|
||||
return;
|
||||
} else {
|
||||
// 打印出错信息
|
||||
console.warn(err);
|
||||
}
|
||||
} else {
|
||||
self.cachedFiles.add(id, { bundle: cacheBundleRoot, url: localPath, lastTime: time });
|
||||
self.writeCacheFile();
|
||||
@@ -138,7 +144,6 @@ const cacheManager = {
|
||||
cacheFile (id, srcUrl, cacheEnabled, cacheBundleRoot, isCopy) {
|
||||
cacheEnabled = cacheEnabled !== undefined ? cacheEnabled : this.cacheEnabled;
|
||||
if (!cacheEnabled || this.cacheQueue[id] || this.cachedFiles.has(id)) return;
|
||||
|
||||
this.cacheQueue[id] = { srcUrl, cacheBundleRoot, isCopy };
|
||||
if (!checkNextPeriod && !this.outOfStorage) {
|
||||
checkNextPeriod = true;
|
||||
@@ -164,28 +169,25 @@ const cacheManager = {
|
||||
const caches = [];
|
||||
const self = this;
|
||||
this.cachedFiles.forEach((val, key) => {
|
||||
if (self._isZipFile(key) && cc.assetManager.bundles.find((bundle) => bundle.base.indexOf(val.url) !== -1)) return;
|
||||
if (val.bundle === 'internal') return;
|
||||
caches.push({ originUrl: key, url: val.url, lastTime: val.lastTime });
|
||||
});
|
||||
caches.sort((a, b) => a.lastTime - b.lastTime);
|
||||
caches.length = Math.floor(caches.length / 3);
|
||||
// cache length above 3 then clear 1/3, or clear all caches
|
||||
if (caches.length < 3) {
|
||||
console.warn('Insufficient storage, cleaning now');
|
||||
} else {
|
||||
caches.length = Math.floor(caches.length / 3);
|
||||
if (caches.length === 0) {
|
||||
cleaning = false;
|
||||
return;
|
||||
}
|
||||
for (let i = 0, l = caches.length; i < l; i++) {
|
||||
const cacheKey = `${cc.assetManager.utils.getUuidFromURL(caches[i].originUrl)}@native`;
|
||||
cc.assetManager.files.remove(cacheKey);
|
||||
this.cachedFiles.remove(caches[i].originUrl);
|
||||
}
|
||||
|
||||
clearTimeout(writeCacheFileList);
|
||||
this._write();
|
||||
function deferredDelete () {
|
||||
const item = caches.pop();
|
||||
self._removePathOrFile(item.originUrl, item.url);
|
||||
deleteFile(item.url, self._deleteFileCB.bind(self));
|
||||
if (caches.length > 0) {
|
||||
setTimeout(deferredDelete, self.deleteInterval);
|
||||
} else {
|
||||
@@ -200,19 +202,6 @@ const cacheManager = {
|
||||
const path = this.cachedFiles.remove(url).url;
|
||||
clearTimeout(writeCacheFileList);
|
||||
this._write();
|
||||
this._removePathOrFile(url, path);
|
||||
}
|
||||
},
|
||||
|
||||
_removePathOrFile (url, path) {
|
||||
if (this._isZipFile(url)) {
|
||||
if (this._isZipFile(path)) {
|
||||
deleteFile(path, this._deleteFileCB.bind(this));
|
||||
} else {
|
||||
rmdirSync(path, true);
|
||||
this._deleteFileCB();
|
||||
}
|
||||
} else {
|
||||
deleteFile(path, this._deleteFileCB.bind(this));
|
||||
}
|
||||
},
|
||||
@@ -225,18 +214,6 @@ const cacheManager = {
|
||||
makeDirSync(`${this.cacheDir}/${bundleName}`, true);
|
||||
},
|
||||
|
||||
unzipAndCacheBundle (id, zipFilePath, cacheBundleRoot, onComplete) {
|
||||
const time = Date.now().toString();
|
||||
const targetPath = `${this.cacheDir}/${cacheBundleRoot}/${time}${suffix++}`;
|
||||
const self = this;
|
||||
makeDirSync(targetPath, true);
|
||||
console.log('cannot support');
|
||||
},
|
||||
|
||||
_isZipFile (url) {
|
||||
return url.slice(-4) === '.zip';
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
cc.assetManager.cacheManager = module.exports = cacheManager;
|
||||
|
||||
@@ -26,15 +26,19 @@ const fsUtils = {
|
||||
|
||||
fs,
|
||||
|
||||
initJsbDownloader(jsbDownloaderMaxTasks, jsbDownloaderTimeout) {
|
||||
console.log("initJsbDownloader: nodejs does not support")
|
||||
isOutOfStorage (errMsg) {
|
||||
return errMsg.indexOf('ENOSPC') !== -1;
|
||||
},
|
||||
|
||||
getUserDataPath() {
|
||||
return path.join(globalThis.nodeEnv.userDataPath, "writablePath");
|
||||
initJsbDownloader (jsbDownloaderMaxTasks, jsbDownloaderTimeout) {
|
||||
console.log('initJsbDownloader: nodejs does not support');
|
||||
},
|
||||
|
||||
checkFsValid() {
|
||||
getUserDataPath () {
|
||||
return path.join(globalThis.nodeEnv.userDataPath, 'writablePath');
|
||||
},
|
||||
|
||||
checkFsValid () {
|
||||
if (!fs) {
|
||||
cc.warn('can not get the file system!');
|
||||
return false;
|
||||
@@ -42,7 +46,7 @@ const fsUtils = {
|
||||
return true;
|
||||
},
|
||||
|
||||
deleteFile(filePath, onComplete) {
|
||||
deleteFile (filePath, onComplete) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath);
|
||||
fs.unlink(fullFilePath, (e) => {
|
||||
if (e) {
|
||||
@@ -54,24 +58,24 @@ const fsUtils = {
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
fullPathForFilename(filename, forceReturnFullpath = false) {
|
||||
if(filename.length <= 0){
|
||||
return "";
|
||||
|
||||
fullPathForFilename (filename, forceReturnFullpath = false) {
|
||||
if (filename.length <= 0) {
|
||||
return '';
|
||||
}
|
||||
if(path.isAbsolute(filename)) {
|
||||
if (path.isAbsolute(filename)) {
|
||||
return filename;
|
||||
}
|
||||
const newFilename = path.normalize(filename);
|
||||
const projectPath = '';
|
||||
const fullpath = path.join(projectPath, newFilename);
|
||||
if(fs.pathExistsSync(fullpath) || forceReturnFullpath) {
|
||||
if (fs.pathExistsSync(fullpath) || forceReturnFullpath) {
|
||||
return fullpath;
|
||||
}
|
||||
return "";
|
||||
return '';
|
||||
},
|
||||
|
||||
saveFile(srcPath, destPath, onComplete) {
|
||||
saveFile (srcPath, destPath, onComplete) {
|
||||
const fullSrcPath = fsUtils.fullPathForFilename(srcPath);
|
||||
const fullDestPath = fsUtils.fullPathForFilename(destPath, true);
|
||||
fs.ensureDirSync(path.dirname(fullDestPath));
|
||||
@@ -89,7 +93,7 @@ const fsUtils = {
|
||||
});
|
||||
},
|
||||
|
||||
copyFile(srcPath, destPath, onComplete) {
|
||||
copyFile (srcPath, destPath, onComplete) {
|
||||
const fullSrcPath = fsUtils.fullPathForFilename(srcPath);
|
||||
const fullDestPath = fsUtils.fullPathForFilename(destPath, true);
|
||||
fs.ensureDirSync(path.dirname(fullDestPath));
|
||||
@@ -106,7 +110,7 @@ const fsUtils = {
|
||||
});
|
||||
},
|
||||
|
||||
writeFile(filePath, data, encoding, onComplete) {
|
||||
writeFile (filePath, data, encoding, onComplete) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath, true);
|
||||
fs.writeFile(fullFilePath, data, encoding, (e) => {
|
||||
if (e) {
|
||||
@@ -116,13 +120,13 @@ const fsUtils = {
|
||||
} else {
|
||||
onComplete && onComplete(null);
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
writeFileSync(filePath, data, encoding) {
|
||||
writeFileSync (filePath, data, encoding) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath, true);
|
||||
try {
|
||||
fs.writeFile(fullFilePath, data, encoding);
|
||||
fs.writeFileSync(fullFilePath, data, encoding);
|
||||
return null;
|
||||
} catch (e) {
|
||||
const err = new Error(`Failed to write file synchronously: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`);
|
||||
@@ -131,7 +135,7 @@ const fsUtils = {
|
||||
}
|
||||
},
|
||||
|
||||
readFile(filePath, encoding, onComplete) {
|
||||
readFile (filePath, encoding, onComplete) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath);
|
||||
fs.readFile(fullFilePath, encoding, (e, data) => {
|
||||
if (e) {
|
||||
@@ -141,10 +145,10 @@ const fsUtils = {
|
||||
} else {
|
||||
onComplete && onComplete(null, data);
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
readDir(dirPath, onComplete) {
|
||||
readDir (dirPath, onComplete) {
|
||||
const fullDirPath = fsUtils.fullPathForFilename(dirPath);
|
||||
fs.readdir(fullDirPath, (e, files) => {
|
||||
if (e) {
|
||||
@@ -154,18 +158,18 @@ const fsUtils = {
|
||||
} else {
|
||||
onComplete && onComplete(null, files);
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
readText(filePath, onComplete) {
|
||||
readText (filePath, onComplete) {
|
||||
fsUtils.readFile(filePath, 'utf8', onComplete);
|
||||
},
|
||||
|
||||
readArrayBuffer(filePath, onComplete) {
|
||||
readArrayBuffer (filePath, onComplete) {
|
||||
fsUtils.readFile(filePath, '', onComplete);
|
||||
},
|
||||
|
||||
readJson(filePath, onComplete) {
|
||||
readJson (filePath, onComplete) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath);
|
||||
fs.readJson(fullFilePath, (e, jsonObj) => {
|
||||
if (e) {
|
||||
@@ -175,10 +179,10 @@ const fsUtils = {
|
||||
} else {
|
||||
onComplete && onComplete(null, jsonObj);
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
readJsonSync(filePath) {
|
||||
readJsonSync (filePath) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath);
|
||||
try {
|
||||
return fs.readJsonSync(fullFilePath);
|
||||
@@ -189,10 +193,10 @@ const fsUtils = {
|
||||
}
|
||||
},
|
||||
|
||||
makeDirSync(dirPath, recursive) {
|
||||
makeDirSync (dirPath, recursive) {
|
||||
const fullDirPath = fsUtils.fullPathForFilename(dirPath, true);
|
||||
try {
|
||||
fs.mkdirSync(fullDirPath, { recursive: recursive });
|
||||
fs.mkdirSync(fullDirPath, { recursive });
|
||||
return null;
|
||||
} catch (e) {
|
||||
const err = new Error(`Make directory failed: "${dirPath}" (resolved: "${fullDirPath}") - ${e.message}`);
|
||||
@@ -201,10 +205,10 @@ const fsUtils = {
|
||||
}
|
||||
},
|
||||
|
||||
rmdirSync(dirPath, recursive) {
|
||||
rmdirSync (dirPath, recursive) {
|
||||
const fullDirPath = fsUtils.fullPathForFilename(dirPath);
|
||||
try {
|
||||
fs.rmSync(fullDirPath, { recursive: recursive });
|
||||
fs.rmSync(fullDirPath, { recursive });
|
||||
return null;
|
||||
} catch (e) {
|
||||
const err = new Error(`Remove directory failed: "${dirPath}" (resolved: "${fullDirPath}") - ${e.message}`);
|
||||
@@ -213,10 +217,10 @@ const fsUtils = {
|
||||
}
|
||||
},
|
||||
|
||||
exists(filePath, onComplete) {
|
||||
exists (filePath, onComplete) {
|
||||
const fullFilePath = fsUtils.fullPathForFilename(filePath);
|
||||
fs.pathExists(fullFilePath, function (e, exists) {
|
||||
if(e) {
|
||||
fs.pathExists(fullFilePath, (e, exists) => {
|
||||
if (e) {
|
||||
const err = new Error(`File existence check failed: "${filePath}" (resolved: "${fullFilePath}") - ${e.message}`);
|
||||
cc.warn(err.message);
|
||||
return err;
|
||||
@@ -225,7 +229,7 @@ const fsUtils = {
|
||||
});
|
||||
},
|
||||
|
||||
loadSubpackage(name, onProgress, onComplete) {
|
||||
loadSubpackage (name, onProgress, onComplete) {
|
||||
throw new Error('nodejs not implement');
|
||||
},
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||