Compare commits

..

12 Commits

Author SHA1 Message Date
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
8 changed files with 112 additions and 21 deletions
@@ -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;
+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) {
+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
}
}
}
}
@@ -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);
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.23",
"version": "4.0.0-alpha.25",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cocos-creator",
"version": "4.0.0-alpha.23",
"version": "4.0.0-alpha.25",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.23",
"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",