Compare commits

..

39 Commits

Author SHA1 Message Date
hyde zhou 3aeb193d42 bump version to 4.0.0-alpha.28 (#226) 2026-07-24 17:30:01 +08:00
Cocos Robot c4e4790ee6 [ci skip][AUTO]: Automated code generating update: 8e77b19f89 (#218) (#219) 2026-07-24 16:49:29 +08:00
troublemaker52025 143af30cf2 feat(legacy): optmize render-additive-light-queue.ts code (#212) 2026-07-21 16:56:11 +08:00
hyde zhou d6ff23fed4 Revert "fix: use PR_TOKEN for create-pull-request fork collab permission (#216)" (#218) 2026-07-21 16:41:03 +08:00
Copilot 84e8d4ebf7 fix: use PR_TOKEN for create-pull-request fork collab permission (#216) 2026-07-21 16:01:42 +08:00
Copilot f2b9936033 fix: replace fish9167/create-pull-request@v3 to resolve token permission error in autogen-code job (#215) 2026-07-21 14:48:19 +08:00
troublemaker52025 129eb437ad fix(legacy): GPU Instancec memory leak in C++ (#211) 2026-07-21 10:56:43 +08:00
hyde zhou c58c893334 bump version to 4.0.0-alpha.27 (#210) 2026-07-20 16:38:33 +08:00
zxx43 ab982aec68 fix index buffer access bug (#205) 2026-07-20 14:14:38 +08:00
徐兵 2d2bbe6731 Use TONE_MAPPING_ACES constant for CC_TONE_MAPPING_TYPE check, skip ACESToneMap in linear mode. (#196) 2026-07-20 14:13:02 +08:00
hyde zhou 187387b03f fix eventWebGLContextLost (#206) 2026-07-20 10:04:57 +08:00
zxx43 661253a521 fix particle trail crash bug (#201) 2026-07-20 09:55:24 +08:00
troublemaker52025 b6d0f02e88 fix(SRP): use lightIdx instead of loop index l in GPU instancing forw… (#198) 2026-07-20 09:52:57 +08:00
troublemaker52025 dd1b155d3a fix(legacy): custom attribute that set format error (#207) 2026-07-20 09:49:10 +08:00
troublemaker52025 df96ee85f3 fix(SRP): crash when native OpenAL is unavailable (#195) 2026-07-15 16:45:36 +08:00
hyde zhou 708a343ce8 bump version to 4.0.0-alpha.26 (#199) 2026-07-13 16:23:49 +08:00
troublemaker52025 393203c2f8 fix(SRP): render-data.ts eslint error (#192) 2026-07-10 15:02:04 +08:00
troublemaker52025 f3d11f017b fix(SRP): A Summary of the Usage Guidelines for 65535 and 65536 (#190) 2026-07-10 14:59:03 +08:00
troublemaker52025 09c201017c fix(standard): spelling errors (#188) 2026-07-08 17:52:23 +08:00
zxx43 ce6107d930 set material parent then set materialInstance to remove error message (#187) 2026-07-08 17:50:44 +08:00
bofeng-song ab8792686b feat(spine): support runtime-selectable spine version for editor/preview (#184) 2026-07-07 14:59:24 +08:00
hyde zhou 44ef76855b bump version to 4.0.0-alpha.25 (#183) 2026-07-06 21:52:51 +08:00
bofeng-song 8878e7aade fix(assets): guard Material/Texture event callbacks against teardown/GC crash (#170) 2026-07-06 20:53:29 +08:00
zxx43 621880a123 use default trail material to fix native particle case crash (#180) 2026-07-06 20:52:48 +08:00
troublemaker52025 2eb268bf9a fix(standard): V8 crash in app shutdown (#178) 2026-07-06 19:09:10 +08:00
troublemaker52025 2e6cc9b127 fix(custom-pipeline): Creates a blit descriptor bug (#169) 2026-07-03 18:25:21 +08:00
hyde zhou 98917ff2a7 Revert "删除多余的构建模板 (#177)" (#179)
This reverts commit dc29d2f8f8.
2026-07-02 18:06:57 +08:00
tangkai dc29d2f8f8 删除多余的构建模板 (#177) 2026-07-02 11:30:59 +08:00
hyde zhou eec2a1693b bump version to 4.0.0-alpha.24 (#175) 2026-06-29 19:14:44 +08:00
hyde zhou 632f9b442f Revert "fix(ci): globally install @cctest/scheduler in Windows test jobs (#173)" (#174)
This reverts commit 8ce19b658e.
2026-06-29 19:07:53 +08:00
Copilot 8ce19b658e fix(ci): globally install @cctest/scheduler in Windows test jobs (#173) 2026-06-29 18:21:05 +08:00
troublemaker52025 07f2c5fb43 fix(custom-pipeline) addLight() func, return byte offset error (#167) 2026-06-26 10:05:22 +08:00
Knox 9b17fd6165 update primitives.fbx.meta (#166) 2026-06-24 14:30:59 +08:00
hyde zhou e2795f9ecd bump version to 4.0.0-alpha.23 (#163) 2026-06-22 17:16:44 +08:00
Leslie Leigh (李的序) 89a412e0d6 supress logs (#154) 2026-06-22 17:11:38 +08:00
qiuguohua aef31099d8 refactor: reorganize cache-manager and asset-manager modules (#159) 2026-06-22 16:02:14 +08:00
bofeng-song 89f8768e57 refine (#144)
(cherry picked from commit 18228e220290fe457e9c05227b32b05cff10a3f8)
2026-06-16 14:06:16 +08:00
bofeng-song 424be5d0b2 Revert "Fix the issue where cli class-registered does not receive messages. (#150)" (#151) 2026-06-16 13:06:16 +08:00
hyde zhou e5183b796a bump version to 4.0.0-alpha.22 (#155) 2026-06-15 16:14:03 +08:00
55 changed files with 695 additions and 302 deletions
+10 -2
View File
@@ -470,7 +470,15 @@
}
},
{
"test": "context.buildTimeConstants.SPINE_3_8",
"test": "context.buildTimeConstants.SPINE_3_8 && context.buildTimeConstants.SPINE_4_2",
"isVirtualModule": false,
"overrides": {
"cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-dynamic.ts",
"cocos/spine/lib/spine-instantiate.ts": "cocos/spine/lib/spine-instantiate-dynamic.ts"
}
},
{
"test": "context.buildTimeConstants.SPINE_3_8 && !context.buildTimeConstants.SPINE_4_2",
"isVirtualModule": false,
"overrides": {
"cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-3.8.ts",
@@ -478,7 +486,7 @@
}
},
{
"test": "context.buildTimeConstants.SPINE_4_2",
"test": "context.buildTimeConstants.SPINE_4_2 && !context.buildTimeConstants.SPINE_3_8",
"isVirtualModule": false,
"overrides": {
"cocos/spine/lib/spine-version.ts": "cocos/spine/lib/spine-version-4.2.ts",
+2 -2
View File
@@ -637,13 +637,13 @@ export class Graphics extends UIRenderer {
const vertexBuffer = gfxDevice.createBuffer(new BufferInfo(
BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST,
MemoryUsageBit.DEVICE,
65535 * stride,
65536 * stride, // Uint16 can address 65536 vertices (indices 0–65535)
stride,
));
const indexBuffer = gfxDevice.createBuffer(new BufferInfo(
BufferUsageBit.INDEX | BufferUsageBit.TRANSFER_DST,
MemoryUsageBit.DEVICE,
65535 * Uint16Array.BYTES_PER_ELEMENT * 2,
65536 * Uint16Array.BYTES_PER_ELEMENT * 2, // Uint16 can address 65536 vertices (indices 0–65535)
Uint16Array.BYTES_PER_ELEMENT,
));
+1 -1
View File
@@ -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);
+12 -4
View File
@@ -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;
+5 -6
View File
@@ -23,7 +23,7 @@
*/
import { JSB } from 'internal:constants';
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature, API } from '../../gfx';
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature } from '../../gfx';
import { getAttributeStride } from './vertex-format';
import { sys, getError, warnID, assertIsTrue } from '../../core';
import { NativeUIMeshBuffer } from './native-2d';
@@ -251,11 +251,10 @@ export class MeshBuffer {
this.floatsPerVertex = getAttributeStride(attrs) >> 2;
var vDataCountLimit = 65536; // 2^16 - 1
const glApi = device.gfxAPI;
if (glApi === API.WEBGPU || glApi === API.WEBGL2 || glApi === API.WEBGL && device.hasFeature(Feature.ELEMENT_INDEX_UINT)) {
vDataCountLimit = 4294967295; // 2^32 - 1
}
// Use the GPU's actual reported capability to determine max addressable vertex count.
// Feature.ELEMENT_INDEX_UINT is set to true in: WebGL2, WebGPU, Vulkan, Metal, GLES3, GLES2+ext.
// vDataCountLimit is a vertex COUNT limit (max index value + 1), not the max index value itself.
const vDataCountLimit = device.hasFeature(Feature.ELEMENT_INDEX_UINT) ? 4294967296 : 65536; // Uint32 or Uint16 can address 2^32 or 2^16 vertices (indices 0–2^32-1 or 0–2^16-1)
assertIsTrue(this._initVDataCount / this._floatsPerVertex < vDataCountLimit, getError(9005));
if (!this.vData || !this.iData) {
+3 -3
View File
@@ -634,7 +634,7 @@ export class MeshRenderData extends BaseRenderData {
const newVBytes = this._byteLength + vertexCount * this.stride;
const newICount = this.indexCount + indexCount;
if (vertexCount + this.vertexCount > 65535) {
if (vertexCount + this.vertexCount > 65536) { // Uint16 can address 65536 vertices (indices 0–65535)
return false;
}
@@ -697,13 +697,13 @@ export class MeshRenderData extends BaseRenderData {
if (this._byteLength > vertexBuffer.size) {
vertexBuffer.resize(this._byteLength);
}
vertexBuffer.update(verticesData);
vertexBuffer.update(verticesData.buffer as ArrayBuffer, this._byteLength);
const indexBytes = indexCount << 1;
if (indexBytes > this._indexBuffer.size) {
this._indexBuffer.resize(indexBytes);
}
this._indexBuffer.update(indicesData);
this._indexBuffer.update(indicesData.buffer as ArrayBuffer, indexBytes);
}
public freeIAPool (): void {
+8 -2
View File
@@ -165,6 +165,10 @@ export class StaticVBAccessor extends BufferAccessor {
errorID(9004, byteLength);
return null;
}
if (vertexCount > 65536) { // Vertex count must less than 65536 for index is uint16 (0 to 65535)
errorID(9004, byteLength);
return null;
}
let buf: MeshBuffer = null!;
let freeList: IFreeEntry[];
let bid = 0;
@@ -176,9 +180,11 @@ export class StaticVBAccessor extends BufferAccessor {
freeList = this._freeLists[i];
// Loop entries
for (let e = 0; e < freeList.length; ++e) {
const freeEntry = freeList[e];
const vertexOffset: number = freeEntry.offset / this.vertexFormatBytes;
// Found suitable free entry
if (freeList[e].length >= byteLength) {
entry = freeList[e];
if (freeEntry.length >= byteLength && vertexOffset + (vertexCount - 1) <= 65535) {
entry = freeEntry;
bid = i;
eid = e;
break;
+1 -1
View File
@@ -508,7 +508,7 @@ export class Mesh extends Asset {
let dstSize = idxView.length;
if (dstStride === 4 && !gfxDevice.hasFeature(Feature.ELEMENT_INDEX_UINT)) {
const vertexCount = this._struct.vertexBundles[prim.vertexBundelIndices[0]].view.count;
if (vertexCount >= 65536) {
if (vertexCount > 65536) { // Uint16 can address 65536 vertices (indices 0–65535)
warnID(10001, vertexCount, 65536);
continue; // Ignore this primitive
} else {
+3 -3
View File
@@ -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);
});
}
+3 -9
View File
@@ -195,8 +195,8 @@ function define (className, baseClass, options): any {
renderName = 'render_stage';
}
// 增加了 hidden: 开头标识,使它最终不会显示在 Editor inspector 的添加组件列表里
if (globalThis.EditorExtends) {
globalThis.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
if (window.EditorExtends) {
window.EditorExtends.Component.addMenu(cls, `hidden:${renderName}/${className}`, -1);
}
}
@@ -204,13 +204,7 @@ function define (className, baseClass, options): any {
// 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.
// 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);
}
EditorExtends.emit('class-registered', cls, frame, className);
}
if (frame) {
+1 -1
View File
@@ -185,7 +185,7 @@ export class WebGL2Swapchain extends Swapchain {
self._canvas = info.windowHandle;
self._webGL2ContextLostHandler = self._onWebGLContextLost.bind(self);
self._canvas.addEventListener(eventWebGLContextLost, self._onWebGLContextLost);
self._canvas.addEventListener(eventWebGLContextLost, self._webGL2ContextLostHandler);
const { instance } = WebGL2DeviceManager;
const { gl, capabilities } = instance;
+2 -2
View File
@@ -233,8 +233,8 @@ export class ParticleSystem extends ModelRenderer {
public startLifetime = new CurveRange();
/**
* @en Particle system duration time.
* @zh 粒子系统运行时间。
* @en Particle system emitter duration time.
* @zh 粒子系统发射器运行时间。
*/
@serializable
@displayOrder(0)
@@ -776,6 +776,13 @@ 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.parent, 1); // set material[1] as trail material for ui-mesh-renderer to use
ps.setMaterialInstance(mat, 1);
}
const texture = mat.getProperty('mainTexture', 0) as Texture2D | null;
if (texture && texture.isAlphaAtlas) {
this._trailDefines[CC_USE_EMBEDDED_ALPHA] = true;
+4 -1
View File
@@ -377,7 +377,10 @@ export default class TrailModule {
if (this.lifeTime.getMax() < 1.0) {
warnID(6036);
}
this._trailNum = Math.ceil(psTime * Math.ceil(this.lifeTime.getMax()) * 60 * (psRate * duration + burstCount));
let pCount: number = psRate * duration; // potential particle count
pCount = ps.prewarm ? pCount * 2 : pCount; // if prewarm we need double space
pCount = pCount > ps.capacity ? ps.capacity : pCount; // max particle count is less/equal than capacity
this._trailNum = Math.ceil(psTime * Math.ceil(this.lifeTime.getMax()) * 60 * (pCount + burstCount));
this._trailSegments = new Pool(
(): TrailSegment => new TrailSegment(10),
Math.ceil(psRate * duration),
+3 -3
View File
@@ -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)));
});
@@ -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();
}
}
+3 -3
View File
@@ -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 {
+5 -5
View File
@@ -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);
+7
View File
@@ -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();
}
+10 -1
View File
@@ -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) {
+29 -26
View File
@@ -126,7 +126,7 @@ export class RenderAdditiveLightQueue {
private declare _lightBuffer: Buffer;
private declare _firstLightBufferView: Buffer;
private declare _lightBufferData: Float32Array;
private _instancedQueues: RenderInstancedQueue[] = [];
private _instancedQueues: (RenderInstancedQueue | undefined)[] = [];
private _lightMeterScale = 10000.0;
constructor (pipeline: PipelineRuntime) {
@@ -151,7 +151,9 @@ export class RenderAdditiveLightQueue {
public clear (): void {
this._instancedQueues.forEach((instancedQueue) => {
instancedQueue.clear();
if (instancedQueue) {
instancedQueue.clear();
}
});
this._instancedQueues.length = 0;
@@ -196,7 +198,7 @@ export class RenderAdditiveLightQueue {
this._lightCulling(model, validPunctualLights);
if (!_lightIndices.length && validPunctualLights.length > 0) { continue; }
if (!_lightIndices.length) { continue; }
for (let j = 0; j < subModels.length; j++) {
const lightPassIdx = _lightPassIndices[j];
@@ -219,15 +221,14 @@ export class RenderAdditiveLightQueue {
public gatherLightPasses (camera: Camera, cmdBuff: CommandBuffer, passLayout = 'default'): void {
this.clear();
const validPunctualLights = this._pipeline.pipelineSceneData.validPunctualLights;
if (!validPunctualLights.length) {
this._bindForwardAddLight(validPunctualLights, passLayout);
return;
}
this._updateUBOs(camera, cmdBuff);
this._updateLightDescriptorSet(camera, cmdBuff);
const validPunctualLights = this._pipeline.pipelineSceneData.validPunctualLights;
if (!validPunctualLights.length) { return; }
this._bindForwardAddLight(validPunctualLights, passLayout);
// only for instanced and batched, no light culling applied
for (let l = 0; l < validPunctualLights.length; l++) {
const light = validPunctualLights[l];
@@ -236,17 +237,21 @@ export class RenderAdditiveLightQueue {
}
this._instancedQueues.forEach((instancedQueue) => {
instancedQueue.uploadBuffers(cmdBuff);
if (instancedQueue) {
instancedQueue.uploadBuffers(cmdBuff);
}
});
}
public recordCommandBuffer (device: Device, renderPass: RenderPass, cmdBuff: CommandBuffer): void {
const globalDSManager: GlobalDSManager = this._pipeline.globalDSManager;
for (let j = 0; j < this._instancedQueues.length; ++j) {
const queue = this._instancedQueues[j];
if (!queue) { continue; }
const light = this._instancedLightPassPool.lights[j];
_dynamicOffsets[0] = this._instancedLightPassPool.dynamicOffsets[j];
const descriptorSet = globalDSManager.getOrCreateDescriptorSet(light);
this._instancedQueues[j].recordCommandBuffer(device, renderPass, cmdBuff, descriptorSet, _dynamicOffsets);
queue.recordCommandBuffer(device, renderPass, cmdBuff, descriptorSet, _dynamicOffsets);
}
for (let i = 0; i < this._lightPasses.length; i++) {
@@ -318,11 +323,14 @@ export class RenderAdditiveLightQueue {
if (((visibility & model.node.layer) === model.node.layer)) {
switch (batchingScheme) {
case BatchingSchemes.INSTANCING: {
const buffer = pass.getInstancedBuffer(l);
const buffer = pass.getInstancedBuffer(lightIdx);
buffer.merge(subModel, lightPassIdx);
buffer.dynamicOffsets[0] = this._lightBufferStride;
if (!this._instancedQueues[l]) { this._instancedQueues[l] = new RenderInstancedQueue(); }
this._instancedQueues[l].queue.add(buffer);
buffer.dynamicOffsets[0] = this._lightBufferStride * lightIdx;
if (this._instancedQueues.length <= lightIdx || !this._instancedQueues[lightIdx]) {
this._instancedQueues.length = lightIdx + 1;
this._instancedQueues[lightIdx] = new RenderInstancedQueue();
}
this._instancedQueues[lightIdx]!.queue.add(buffer);
} break;
default:
lp!.lights.push(light);
@@ -370,9 +378,6 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0;
// Reserve sphere light shadow interface
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
break;
}
case LightType.SPOT: {
@@ -437,8 +442,6 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_PROJ_INFO_OFFSET + 2] = 1.0 / matShadowProj.m00;
this._shadowUBO[UBOShadowEnum.SHADOW_PROJ_INFO_OFFSET + 3] = 1.0 / matShadowProj.m05;
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
// Spot light sampler binding
if (shadowFrameBufferMap.has(light)) {
const texture = shadowFrameBufferMap.get(light)?.colorTextures[0];
@@ -463,15 +466,15 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0;
// Reserve point light shadow interface
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
break;
}
default:
}
globalDSManager.update();
cmdBuff.updateBuffer(descriptorSet.getBuffer(UBOShadow.BINDING)!, this._shadowUBO);
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
descriptorSet.update();
cmdBuff.updateBuffer(descriptorSet.getBuffer(UBOShadow.BINDING)!, this._shadowUBO.buffer, this._shadowUBO.byteLength);
}
}
@@ -627,6 +630,6 @@ export class RenderAdditiveLightQueue {
}
}
cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData);
cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData.buffer as ArrayBuffer, this._lightBufferData.byteLength);
}
}
+2 -2
View File
@@ -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) {
+3 -3
View File
@@ -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;
@@ -0,0 +1,90 @@
/*
Copyright (c) 2025 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.
*/
// Runtime-selectable spine instantiation. Used only when both spine-3.8 and spine-4.2 are compiled into
// the engine (editor/preview): cc.config.json's moduleOverrides then replaces spine-instantiate.ts with
// this file. Unlike the fixed-version files (spine-instantiate-3.8.ts / -4.2.ts), both the 3.8 and 4.2
// external references are kept here (so both wasm/asm binaries are bundled), and the matching one is
// executed at runtime according to the selected version.
// The version comes from the preview boot (game-boot.js / engine-bootstrap.ts), which reads it from
// cocos.config.json before engine init and writes globalThis._CC_SPINE_VERSION.
import { ensureWasmModuleReady } from 'pal/wasm';
import { error } from '../../core';
import { shouldUseWasmModule, initWasm, initAsmJS } from './spine-wasm-utils';
// Import setSpineVersion through the overridden './spine-version' (= spine-version-dynamic) so it is the
// same module instance whose SPINE_VERSION live binding is read by the shared spine-define.ts.
import { setSpineVersion } from './spine-version';
function getSelectedSpineVersion (): string {
const v = (globalThis as any)._CC_SPINE_VERSION;
return v === '4.2' ? '4.2' : '3.8';
}
export function waitForSpineWasmInstantiation (): Promise<void> {
const errorReport = (msg: any): void => { error(msg); };
// The version must be set before wasm instantiation and before spine-define patches prototypes.
const version = getSelectedSpineVersion();
setSpineVersion(version);
return ensureWasmModuleReady().then((): Promise<void> => {
//We should use static code here, import operation will cause file copy to cache folder.
if (version === '4.2') {
if (shouldUseWasmModule()) {
return Promise.all([
import('external:emscripten/spine/4.2/spine.wasm.js'),
import('external:emscripten/spine/4.2/spine.wasm'),
]).then(([
{ default: wasmFactory },
{ default: spineWasmUrl },
]) => initWasm(wasmFactory, spineWasmUrl));
} else {
return Promise.all([
import('external:emscripten/spine/4.2/spine.asm.js'),
import('external:emscripten/spine/4.2/spine.js.mem'),
]).then(([
{ default: asmFactory },
{ default: asmJsMemUrl },
]) => initAsmJS(asmFactory, asmJsMemUrl));
}
} else {
if (shouldUseWasmModule()) {
return Promise.all([
import('external:emscripten/spine/3.8/spine.wasm.js'),
import('external:emscripten/spine/3.8/spine.wasm'),
]).then(([
{ default: wasmFactory },
{ default: spineWasmUrl },
]) => initWasm(wasmFactory, spineWasmUrl));
} else {
return Promise.all([
import('external:emscripten/spine/3.8/spine.asm.js'),
import('external:emscripten/spine/3.8/spine.js.mem'),
]).then(([
{ default: asmFactory },
{ default: asmJsMemUrl },
]) => initAsmJS(asmFactory, asmJsMemUrl));
}
}
}).catch(errorReport);
}
+88
View File
@@ -0,0 +1,88 @@
/*
Copyright (c) 2025 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.
*/
// Runtime-selectable spine version. Used only when both spine-3.8 and spine-4.2 are compiled into the
// engine (editor/preview): cc.config.json's moduleOverrides then replaces spine-version.ts with this file.
// Unlike the fixed-version files (spine-version-3.8.ts / -4.2.ts), SPINE_VERSION is a mutable `let`
// (a live ES binding), so the shared layer (spine-define.ts / skeleton.ts) reads the runtime value and
// keeps both `SPINE_VERSION === '3.8' / '4.2'` branches instead of tree-shaking to a single one.
// The version is set by spine-instantiate-dynamic.ts before instantiation, sourced from the host-provided
// globalThis._CC_SPINE_VERSION (injected by the preview boot from cocos.config.json).
import { DataInput, SkeletonBinary } from './spine-binary';
import { BUILD } from 'internal:constants';
// Typed as string so comparisons in the shared layer against the other version literal are not flagged by TS.
export let SPINE_VERSION: string = '3.8';
/**
* Sets the current spine version. Must be called before spine wasm instantiation and before spine-define runs.
*/
export function setSpineVersion (version: string): void {
SPINE_VERSION = version === '4.2' ? '4.2' : '3.8';
}
function isVersionCompatible (version: string | null): boolean {
if (!BUILD) {
if (SPINE_VERSION === '3.8') {
if (!version || version === '3.8.75' || !version.startsWith('3.8.')) {
return false;
}
} else {
if (!version || !version.startsWith('4.2.')) {
return false;
}
}
}
return true;
}
/**
* @internal Used only by editor.
*/
export function isBinaryCompatible (buffer: Uint8Array): boolean {
if (!BUILD) {
const input = new DataInput(buffer);
// The binary hash header differs between versions: 3.8 uses one string, 4.2 uses two ints.
if (SPINE_VERSION === '3.8') {
SkeletonBinary.readString(input); // read hash
} else {
SkeletonBinary.readInt(input); // read hash
SkeletonBinary.readInt(input); // read hash
}
const version = SkeletonBinary.readString(input);
return isVersionCompatible(version);
}
return false;
}
/**
* @internal Used only by editor.
*/
export function isJsonCompatible (json: JSON): boolean {
if (!BUILD) {
return isVersionCompatible(json['skeleton']['spine']);
}
return false;
}
+6
View File
@@ -24,6 +24,12 @@
export const SPINE_VERSION = '3.8';
// Placeholder so spine-instantiate-dynamic.ts can import setSpineVersion from './spine-version' and type-check.
// When building the engine with runtime-selectable spine, moduleOverrides replaces this file with
// spine-version-dynamic.ts (the real implementation). In fixed single-version builds (spine-3.8 / spine-4.2)
// spine-instantiate-dynamic is not used, so this no-op is never called.
export function setSpineVersion (version: string): void {}
export function isBinaryCompatible (buffer: Uint8Array): boolean {
return false;
}
+4 -4
View File
@@ -878,7 +878,7 @@ export class TiledLayer extends UIRenderer {
const axis = this._staggerAxis;
switch (this._layerOrientation) {
// left top to right dowm
// left top to right down
case Orientation.ORTHO:
col = Math.floor(x / maptw);
row = Math.floor(y / mapth);
@@ -889,7 +889,7 @@ export class TiledLayer extends UIRenderer {
col = Math.floor(x / maptw2);
row = Math.floor(y / mapth2);
break;
// left top to right dowm
// left top to right down
case Orientation.HEX:
if (axis === StaggerAxis.STAGGERAXIS_Y) {
row = Math.floor(y / (mapth - this._diffY1!));
@@ -1017,7 +1017,7 @@ export class TiledLayer extends UIRenderer {
}
switch (layerOrientation) {
// left top to right dowm
// left top to right down
case Orientation.ORTHO:
cullingCol = col;
cullingRow = rows - row - 1;
@@ -1039,7 +1039,7 @@ export class TiledLayer extends UIRenderer {
left = maptw2 * cullingCol;
bottom = mapth2 * cullingRow;
break;
// left top to right dowm
// left top to right down
case Orientation.HEX:
diffX2 = (axis! === StaggerAxis.STAGGERAXIS_Y && row % 2 === 1) ? maptw2 * odd_even! : 0;
diffY2 = (axis! === StaggerAxis.STAGGERAXIS_X && col % 2 === 1) ? mapth2 * -odd_even! : 0;
@@ -10,7 +10,7 @@ vec3 HDRToLDR(vec3 color)
#endif
{
// linear exposure has already applied to light intensity
#if CC_TONE_MAPPING_TYPE == HDR_TONE_MAPPING_ACES
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color.rgb = ACESToneMap(color.rgb);
#endif
}
@@ -79,8 +79,12 @@ vec4 saturate(vec4 value) { return clamp(value, vec4(0.0), vec4(1.0)); }
#define IS_RANGED_DIRECTIONAL_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_RANGED_DIRECTIONAL)
// CC_TONE_MAPPING_TYPE Values
#define TONE_MAPPING_ACES 0
#define TONE_MAPPING_LINEAR 1
#ifndef TONE_MAPPING_ACES
#define TONE_MAPPING_ACES 0
#endif
#ifndef TONE_MAPPING_LINEAR
#define TONE_MAPPING_LINEAR 1
#endif
// Material
#define SURFACES_MAX_TRANSMIT_DEPTH_VALUE 999999.0
@@ -7,7 +7,7 @@ vec4 CCFragOutput (vec4 color) {
#if CC_USE_RGBE_OUTPUT
color = packRGBE(color.rgb);
#elif !CC_USE_FLOAT_OUTPUT
#if CC_USE_HDR && CC_TONE_MAPPING_TYPE == HDR_TONE_MAPPING_ACES
#if CC_USE_HDR && CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color.rgb = ACESToneMap(color.rgb);
#endif
color.rgb = LinearToSRGB(color.rgb);
+3 -1
View File
@@ -70,7 +70,9 @@ CCProgram smaa-edge-fs %{
vec3 ToLDR(vec3 color) {
#if CC_USE_HDR
color *= cc_exposure.x * FP_SCALE_INV;
color = ACESToneMap(color);
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color = ACESToneMap(color);
#endif
color = LinearToSRGB(color);
#endif
return color;
@@ -55,7 +55,9 @@ CCProgram tonemap-fs %{
vec3 ToLDR(vec3 color) {
#if CC_USE_HDR
color *= cc_exposure.x * FP_SCALE_INV;
color = ACESToneMap(color);
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color = ACESToneMap(color);
#endif
color = LinearToSRGB(color);
#endif
return color;
+14
View File
@@ -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
}
}
}
}
+2 -2
View File
@@ -58,13 +58,13 @@ void UIModelProxy::activeSubModels() {
auto* vertexBuffer = _device->createBuffer({
gfx::BufferUsageBit::VERTEX | gfx::BufferUsageBit::TRANSFER_DST,
gfx::MemoryUsageBit::DEVICE,
65535 * _stride,
65536 * _stride, // Uint16 can address 65536 vertices (indices 0–65535)
_stride,
});
auto* indexBuffer = _device->createBuffer({
gfx::BufferUsageBit::INDEX | gfx::BufferUsageBit::TRANSFER_DST,
gfx::MemoryUsageBit::DEVICE,
65535 * sizeof(uint16_t) * 2,
65536 * sizeof(uint16_t) * 2, // Uint16 can address 65536 vertices (indices 0–65535)
sizeof(uint16_t),
});
gfx::BufferList vbReference;
+2 -2
View File
@@ -530,7 +530,7 @@ void Mesh::initialize() {
if (dstStride == 4) {
uint32_t vertexCount = _struct.vertexBundles[prim.vertexBundelIndices[0]].view.count;
#if CC_OPTIMIZE_MESH_DATA
if (vertexCount < 65536) {
if (vertexCount <= 65536) { // Uint16 can address 65536 vertices (indices 0–65535)
dstStride >>= 1; // Reduce to short.
dstSize >>= 1;
} else if (!gfxDevice->hasFeature(gfx::Feature::ELEMENT_INDEX_UINT)) {
@@ -538,7 +538,7 @@ void Mesh::initialize() {
}
#else
if (!gfxDevice->hasFeature(gfx::Feature::ELEMENT_INDEX_UINT)) {
if (vertexCount >= 65536) {
if (vertexCount > 65536) { // Uint16 can address 65536 vertices (indices 0–65535)
CC_LOG_WARNING("Device does not support UINT element index type and vertexCount (%u) is larger than ushort", vertexCount);
continue;
}
+5 -1
View File
@@ -185,7 +185,11 @@ Mesh::ICreateInfo MeshUtils::createMeshInfo(const IGeometry &geometry, const ccs
if (geometry.customAttributes.has_value()) {
for (const auto &ca : geometry.customAttributes.value()) {
const auto &info = gfx::GFX_FORMAT_INFOS[static_cast<uint32_t>(attr->format)];
if (ca.values.empty()) {
CC_LOG_WARNING("Custom attribute %s has no values, skipped.", ca.attr.name.c_str());
continue;
}
const auto &info = gfx::GFX_FORMAT_INFOS[static_cast<uint32_t>(ca.attr.format)];
attributes.emplace_back(ca.attr);
vertCount = std::max(vertCount, static_cast<uint32_t>(std::floor(ca.values.size() / info.count)));
channels.emplace_back(Channel{stride, ca.values, ca.attr});
+47 -5
View File
@@ -68,6 +68,9 @@ unsigned int AudioEngine::sMaxInstances = MAX_AUDIOINSTANCES;
AudioEngine::ProfileHelper *AudioEngine::sDefaultProfileHelper = nullptr;
ccstd::unordered_map<int, AudioEngine::AudioInfo> AudioEngine::sAudioIDInfoMap;
AudioEngineImpl *AudioEngine::sAudioEngineImpl = nullptr;
// Decoder-only fallback instance, defined here to keep AudioDecoderManager
// initialization separate from OpenAL initialization.
AudioEngineImpl *AudioEngine::sDecoderImpl = nullptr;
float AudioEngine::sVolumeFactor = 1.0F;
events::EnterBackground::Listener AudioEngine::sOnPauseListenerID;
@@ -156,6 +159,9 @@ void AudioEngine::end() {
delete sAudioEngineImpl;
sAudioEngineImpl = nullptr;
delete sDecoderImpl;
sDecoderImpl = nullptr;
delete sDefaultProfileHelper;
sDefaultProfileHelper = nullptr;
@@ -587,12 +593,48 @@ bool AudioEngine::isEnabled() {
return sIsEnabled;
}
PCMHeader AudioEngine::getPCMHeader(const char *url) {
lazyInit();
return sAudioEngineImpl->getPCMHeader(url);
AudioEngineImpl *AudioEngine::getDecoderImpl() {
if (AudioEngine::sAudioEngineImpl != nullptr) {
return AudioEngine::sAudioEngineImpl;
}
// Try full init first; if it succeeds we get OpenAL + decoder.
AudioEngine::lazyInit();
if (AudioEngine::sAudioEngineImpl != nullptr) {
return AudioEngine::sAudioEngineImpl;
}
// On oalsoft platforms, PCM decoding via AudioDecoderManager works
// independently of OpenAL — create a decoder-only fallback instance.
// On Android/OpenHarmony and Apple, AudioEngineImpl::getPCMHeader/
// getOriginalPCMBuffer dereferences _audioPlayerProvider/_engineEngine
// which are only set up by init(). Returning nullptr here lets callers
// fail gracefully instead of crashing.
#if CC_PLATFORM == CC_PLATFORM_WINDOWS || CC_PLATFORM == CC_PLATFORM_OHOS || \
CC_PLATFORM == CC_PLATFORM_LINUX || CC_PLATFORM == CC_PLATFORM_QNX
if (AudioEngine::sDecoderImpl == nullptr) {
AudioEngine::sDecoderImpl = ccnew AudioEngineImpl();
AudioEngineImpl::initDecoder();
}
return AudioEngine::sDecoderImpl;
#else
return nullptr;
#endif
}
PCMHeader AudioEngine::getPCMHeader(const char *url) {
AudioEngineImpl *impl = AudioEngine::getDecoderImpl();
if (impl == nullptr) {
CC_LOG_WARNING("AudioEngine::getPCMHeader: audio engine unavailable, url: %s", url);
return {};
}
return impl->getPCMHeader(url);
}
ccstd::vector<uint8_t> AudioEngine::getOriginalPCMBuffer(const char *url, uint32_t channelID) {
lazyInit();
return sAudioEngineImpl->getOriginalPCMBuffer(url, channelID);
AudioEngineImpl *impl = AudioEngine::getDecoderImpl();
if (impl == nullptr) {
CC_LOG_WARNING("AudioEngine::getOriginalPCMBuffer: audio engine unavailable, url: %s", url);
return {};
}
return impl->getOriginalPCMBuffer(url, channelID);
}
} // namespace cc
@@ -426,6 +426,12 @@ void AudioEngineImpl::onResume() {
}
}
bool AudioEngineImpl::initDecoder() {
// On Android the decoder infrastructure is set up by init().
// This method exists so AudioEngine.cpp compiles uniformly across all platforms.
return true;
}
PCMHeader AudioEngineImpl::getPCMHeader(const char *url) {
PCMHeader header{};
ccstd::string fileFullPath = FileUtils::getInstance()->fullPathForFilename(url);
@@ -55,6 +55,7 @@ public:
~AudioEngineImpl() override;
bool init();
static bool initDecoder();
int play2d(const ccstd::string &filePath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -43,6 +43,7 @@ public:
~AudioEngineImpl();
bool init();
static bool initDecoder();
int play2d(const ccstd::string &fileFullPath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -632,6 +632,12 @@ bool AudioEngineImpl::checkAudioIdValid(int audioID) {
return _audioPlayers.find(audioID) != _audioPlayers.end();
}
bool AudioEngineImpl::initDecoder() {
// On Apple the decoder infrastructure is set up by init().
// This method exists so AudioEngine.cpp compiles uniformly across all platforms.
return true;
}
PCMHeader AudioEngineImpl::getPCMHeader(const char *url){
PCMHeader header {};
auto itr = _audioCaches.find(url);
+17
View File
@@ -339,6 +339,19 @@ protected:
static void pauseAll(ccstd::vector<int> *pausedAudioIDs);
static void resumeAll(ccstd::vector<int> *pausedAudioIDs);
/**
* @brief Get Audio Decoder
*
* Strategy:
* 1. If the full impl (with OpenAL) is already alive, reuse it (cache + decoder both available).
* 2. If OpenAL init has not been attempted yet, try lazyInit() so that a successful OpenAL
* environment still gets the full impl (keeps _audioCaches coherent with play2d).
* 3. Only fall back to the decoder-only sDecoderImpl when lazyInit() has failed
* (alcOpenDevice returned null, headless / OHOS / CI environments).
* @return The impl instance to use for PCM decoding.
*/
static AudioEngineImpl *getDecoderImpl();
struct ProfileHelper {
AudioProfile profile;
@@ -382,6 +395,10 @@ protected:
static ProfileHelper *sDefaultProfileHelper;
static AudioEngineImpl *sAudioEngineImpl;
// Decoder-only fallback instance used when OpenAL is unavailable.
// getPCMHeader / getOriginalPCMBuffer do not depend on OpenAL and use this
// instance directly instead of going through lazyInit().
static AudioEngineImpl *sDecoderImpl;
class AudioEngineThreadPool;
static AudioEngineThreadPool *sThreadPool;
+41 -22
View File
@@ -62,7 +62,7 @@
// log, CC_LOG_DEBUG aren't threadsafe, since we uses sub threads for parsing pcm data, threadsafe log output
// is needed. Define the following macros (ALOGV, ALOGD, ALOGI, ALOGW, ALOGE) for threadsafe log output.
//IDEA: Move _winLog, winLog to a separated file
// IDEA: Move _winLog, winLog to a separate file
static void _winLog(const char *format, va_list args) {
static const int MAX_LOG_LENGTH = 16 * 1024;
int bufferSize = MAX_LOG_LENGTH;
@@ -153,31 +153,50 @@ AudioEngineImpl::~AudioEngineImpl() {
AudioDecoderManager::destroy();
}
bool AudioEngineImpl::initDecoder() {
return AudioDecoderManager::init();
}
bool AudioEngineImpl::init() {
bool ret = false;
do {
sALDevice = alcOpenDevice(nullptr);
if (sALDevice) {
alGetError();
sALContext = alcCreateContext(sALDevice, nullptr);
alcMakeContextCurrent(sALContext);
alGenSources(MAX_AUDIOINSTANCES, _alSources);
auto alError = alGetError();
if (alError != AL_NO_ERROR) {
CC_LOG_ERROR("%s:generating sources failed! error = %x\n", __FUNCTION__, alError);
break;
}
for (unsigned int src : _alSources) {
_alSourceUsed[src] = false;
}
_scheduler = CC_CURRENT_ENGINE()->getScheduler();
ret = AudioDecoderManager::init();
CC_LOG_DEBUG("OpenAL was initialized successfully!");
if (sALDevice == nullptr) {
// alcGetError(nullptr) is valid when no device is open
ALCenum alcErr = alcGetError(nullptr);
CC_LOG_ERROR("%s: alcOpenDevice failed, ALC error = 0x%x", __FUNCTION__, alcErr);
break;
}
alGetError();
sALContext = alcCreateContext(sALDevice, nullptr);
if (sALContext == nullptr) {
ALCenum alcErr = alcGetError(sALDevice);
CC_LOG_ERROR("%s: alcCreateContext failed, ALC error = 0x%x", __FUNCTION__, alcErr);
break;
}
alcMakeContextCurrent(sALContext);
std::fill(std::begin(_alSources), std::end(_alSources), 0);
alGenSources(MAX_AUDIOINSTANCES, _alSources);
auto alError = alGetError();
if (alError != AL_NO_ERROR) {
CC_LOG_ERROR("%s:generating sources failed! error = %x\n", __FUNCTION__, alError);
alcMakeContextCurrent(nullptr);
alcDestroyContext(sALContext);
sALContext = nullptr;
break;
}
for (unsigned int src : _alSources) {
_alSourceUsed[src] = false;
}
_scheduler = CC_CURRENT_ENGINE()->getScheduler();
ret = initDecoder();
CC_LOG_DEBUG("OpenAL was initialized successfully!");
} while (false);
return ret;
@@ -264,7 +283,7 @@ int AudioEngineImpl::play2d(const ccstd::string &filePath, bool loop, float volu
}
void AudioEngineImpl::play2dImpl(AudioCache *cache, int audioID) {
//Note: It may bn in sub thread or main thread :(
// Note: It may be in sub thread or main thread :(
if (!*cache->_isDestroyed && cache->_state == AudioCache::State::READY) {
_threadMutex.lock();
auto playerIt = _audioPlayers.find(audioID);
@@ -45,6 +45,9 @@ public:
~AudioEngineImpl() override;
bool init();
// Initialize only the PCM decoder subsystem (AudioDecoderManager).
// Does not require an OpenAL device. Safe to call when init() failed.
static bool initDecoder();
int play2d(const ccstd::string &filePath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -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);
@@ -699,7 +699,7 @@ static bool js_Model_setInstancedAttribute(se::State &s) // NOLINT(readability-i
value[i] = dataVal.toFloat();
}
cobj->setInstancedAttribute(name, value);
cobj->setInstancedAttribute(name, std::move(value));
return true;
}
+7 -7
View File
@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2022-2025 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022-2026 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -23,11 +23,11 @@ THE SOFTWARE.
****************************************************************************/
#pragma once
#define COCOS_MAJOR_VERSION 3
#define COCOS_MINJOR_VERSION 8
#define COCOS_PATCH_VERSION 8
#define COCOS_VERSION_STRING "3.8.8"
#define COCOS_MAJOR_VERSION 4
#define COCOS_MINJOR_VERSION 0
#define COCOS_PATCH_VERSION 0
#define COCOS_VERSION_STRING "4.0.0"
#define COCOS_VERSION_DEFINED 1
#define COCOS_VERSION 30808
#define COCOS_VERSION 40000
// #define COCOS_PRE_RELEASE "release"
// #define COCOS_PRE_RELEASE "alpha"
@@ -68,6 +68,7 @@ RenderAdditiveLightQueue::RenderAdditiveLightQueue(RenderPipeline *pipeline) : _
void RenderAdditiveLightQueue::recordCommandBuffer(gfx::Device *device, scene::Camera *camera, gfx::RenderPass *renderPass, gfx::CommandBuffer *cmdBuffer) {
const uint32_t offset = _pipeline->getPipelineUBO()->getCurrentCameraUBOOffset();
for (uint32_t i = 0; i < _instancedQueues.size(); ++i) {
if (!this->_instancedQueues[i]) { continue; }
const auto *light = _instancedLightPass.lights[i];
_dynamicOffsets[0] = _instancedLightPass.dynamicOffsets[i];
auto *globalDescriptorSet = _pipeline->getGlobalDSManager()->getOrCreateDescriptorSet(light);
@@ -109,13 +110,12 @@ void RenderAdditiveLightQueue::gatherLightPasses(const scene::Camera *camera, gf
clear();
_validPunctualLights = _pipeline->getPipelineSceneData()->getValidPunctualLights();
if (_validPunctualLights.empty()) return;
updateUBOs(camera, cmdBuffer);
updateLightDescriptorSet(camera, cmdBuffer);
_validPunctualLights = _pipeline->getPipelineSceneData()->getValidPunctualLights();
if (_validPunctualLights.empty()) return;
const auto &renderObjects = _pipeline->getPipelineSceneData()->getRenderObjects();
for (const auto &renderObject : renderObjects) {
const auto *const model = renderObject.model;
@@ -154,20 +154,19 @@ void RenderAdditiveLightQueue::gatherLightPasses(const scene::Camera *camera, gf
_instancedLightPass.dynamicOffsets.emplace_back(_lightBufferStride * l);
}
for (const auto &instancedQueue : _instancedQueues) {
instancedQueue->uploadBuffers(cmdBuffer);
if (instancedQueue) {
instancedQueue->uploadBuffers(cmdBuffer);
}
}
}
void RenderAdditiveLightQueue::clear() {
for (const auto &instancedQueue : _instancedQueues) {
instancedQueue->clear();
if (instancedQueue) {
instancedQueue->clear();
}
}
_instancedQueues.clear();
for (auto lightPass : _lightPasses) {
lightPass.dynamicOffsets.clear();
lightPass.lights.clear();
}
_lightPasses.clear();
_instancedLightPass.dynamicOffsets.clear();
@@ -212,13 +211,14 @@ void RenderAdditiveLightQueue::addRenderQueue(scene::SubModel *subModel, const s
if ((visibility & model->getNode()->getLayer()) == model->getNode()->getLayer()) {
switch (batchingScheme) {
case scene::BatchingSchemes::INSTANCING: {
auto *buffer = pass->getInstancedBuffer(i);
auto *buffer = pass->getInstancedBuffer(lightIdx);
buffer->merge(subModel, lightPassIdx);
buffer->setDynamicOffset(0, _lightBufferStride);
if (i >= _instancedQueues.size()) {
_instancedQueues.emplace_back(ccnew RenderInstancedQueue());
buffer->setDynamicOffset(0, _lightBufferStride * lightIdx);
if (_instancedQueues.size() <= lightIdx || !_instancedQueues[lightIdx]) {
_instancedQueues.resize(lightIdx + 1);
_instancedQueues[lightIdx] = ccnew RenderInstancedQueue();
}
_instancedQueues[i]->add(buffer);
_instancedQueues[lightIdx]->add(buffer);
} break;
case scene::BatchingSchemes::NONE: {
lightPass.lights.emplace_back(light);
@@ -243,6 +243,7 @@ void RenderAdditiveLightQueue::updateUBOs(const scene::Camera *camera, gfx::Comm
size_t offset = 0;
if (validLightCount > _lightBufferCount) {
_firstLightBufferView->destroy();
_lightBufferCount = nextPow2(static_cast<uint32_t>(validLightCount));
_lightBuffer->resize(utils::toUint(_lightBufferStride * _lightBufferCount));
_lightBufferData.resize(static_cast<size_t>(_lightBufferElementCount) * _lightBufferCount);
@@ -432,7 +433,7 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const scene::Camera *cam
memcpy(_shadowUBO.data() + UBOShadow::MAT_LIGHT_VIEW_PROJ_OFFSET, matShadowViewProj.m, sizeof(matShadowViewProj));
// shadow info
float shadowNFLSInfos[4] = {0.1F, spotLight->getRange(), 0.0F, 0.0F};
float shadowNFLSInfos[4] = {0.01F, spotLight->getRange(), 0.0F, 0.0F};
memcpy(_shadowUBO.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos));
const auto &shadowSize = shadowInfo->getSize();
@@ -491,15 +492,17 @@ bool RenderAdditiveLightQueue::getLightPassIndex(const scene::Model *model, ccst
bool hasValidLightPass = false;
for (const auto &subModel : model->getSubModels()) {
int lightPassIndex = 0;
int lightPassIndex = -1; // use -1 to indicate no valid light pass found
int k = 0;
for (const auto &pass : *(subModel->getPasses())) {
if (pass->getPhase() == _phaseID) {
lightPassIndex = k;
hasValidLightPass = true;
break;
}
++lightPassIndex;
++k;
}
lightPassIndices->push_back(lightPassIndex);
lightPassIndices->push_back(static_cast<uint32_t>(lightPassIndex));
}
return hasValidLightPass;
@@ -517,7 +520,7 @@ void RenderAdditiveLightQueue::lightCulling(const scene::Model *model) {
isCulled = cullSpotLight(static_cast<const scene::SpotLight *>(light), model);
break;
case scene::LightType::POINT:
isCulled = cullSphereLight(static_cast<const scene::SphereLight *>(light), model);
isCulled = cullPointLight(static_cast<const scene::PointLight *>(light), model);
break;
case scene::LightType::RANGED_DIRECTIONAL:
isCulled = cullRangedDirLight(static_cast<const scene::RangedDirectionalLight *>(light), model);
@@ -753,7 +753,7 @@ uint32_t LightResource::addLight(
// already added
auto iter = lightIndex.find(light);
if (iter != lightIndex.end()) {
return iter->second;
return iter->second * elementSize;
}
// resize buffer
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.21",
"version": "4.0.0-alpha.28",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cocos-creator",
"version": "4.0.0-alpha.21",
"version": "4.0.0-alpha.28",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.21",
"version": "4.0.0-alpha.28",
"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",
+42 -37
View File
@@ -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();
};
+30 -53
View File
@@ -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;
+40 -36
View File
@@ -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');
},
};