Merge branch 'SpineFix' of https://github.com/zxx43/cocos4 into SpineFix

Author: zxx43

.github/workflows/native-compile-platforms.yml

@@ -483,8 +483,8 @@ jobs:
           echo "set(CC_USE_GLES3 OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-mac/proj/cfg.cmake
           # Test JSVM v8 backend on macOS.
-          echo "set(USE_SE_V8 OFF)" >> build-mac/proj/cfg.cmake
-          echo "set(USE_SE_JSVM ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_V8 ON)" >> build-mac/proj/cfg.cmake
+          echo "set(USE_SE_JSVM OFF)" >> build-mac/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-mac/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-mac/proj/cfg.cmake
           echo "set(CC_EXECUTABLE_NAME \"\")" >> build-mac/proj/cfg.cmake
@@ -493,7 +493,6 @@ jobs:
           RES_DIR=$GITHUB_WORKSPACE/templates/mac/build-mac
           cd build-mac
           cmake ../ -GXcode -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           cmake --build . --config Release -- -jobs $NUM_OF_CORES -arch ${{ matrix.config.arch }}
           echo "Compile MacOSX Release Done!"
 
@@ -534,7 +533,7 @@ jobs:
           echo "set(CC_USE_VULKAN OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_GLES2 OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CC_USE_METAL ON)" >> build-ios/proj/cfg.cmake
-          echo "set(TARGET_IOS_VERSION 12.0)" >> build-ios/proj/cfg.cmake
+          echo "set(TARGET_IOS_VERSION 13.0)" >> build-ios/proj/cfg.cmake
           echo "set(USE_WEBSOCKET_SERVER OFF)" >> build-ios/proj/cfg.cmake
           echo "set(USE_DRAGONBONES OFF)" >> build-ios/proj/cfg.cmake
           echo "set(CMAKE_CXX_STANDARD_REQUIRED OFF)" >> build-ios/proj/cfg.cmake
@@ -548,7 +547,6 @@ jobs:
               -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.arch }} \
               -DRES_DIR=$RES_DIR \
               -DCOCOS_X_PATH=$NATIVE_ROOT
-          set +e
           #cmake --build . --config Debug -- -quiet -jobs $NUM_OF_CORES -allowProvisioningUpdates CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           cmake --build . --config Debug -- -jobs $NUM_OF_CORES CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           echo "Compile iOS Done!"

EngineErrorMap.md

@@ -3980,3 +3980,7 @@ Debug bones or slots is invalid in cached mode.
 ### 16419
 
 Spine version not supported.
+
+### 16420
+
+Start time must bigger than end time.

cocos/2d/components/graphics.ts

@@ -266,6 +266,15 @@ export class Graphics extends UIRenderer {
         this._updateMtlForGraphics();
     }
 
+    protected override get _keepRenderData (): boolean {
+        // Graphics is a retained-mode renderer: its MeshRenderData is the result of the
+        // user's previous fill()/stroke() calls. Destroying it here would leave Impl's
+        // render-data list pointing at cleared geometry, so re-enabling the node on native
+        // platforms would require the user to draw the paths again. Keep it attached to the
+        // disabled RenderEntity; clear() and onDestroy() remain the owning release points.
+        return true;
+    }
+
     public onDestroy (): void {
         this._sceneGetter = null;
         if (JSB) {

cocos/2d/framework/ui-renderer.ts

@@ -398,12 +398,23 @@ export class UIRenderer extends Renderer {
         this.node.off(NodeEventType.ANCHOR_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.SIZE_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.PARENT_CHANGED, this._colorDirty, this);
-        this.destroyRenderData();
+        if (!this._keepRenderData) {
+            this.destroyRenderData();
+        }
         uiRendererManager.removeRenderer(this);
         this._renderFlag = false;
         this._renderEntity.enabled = false;
     }
 
+    /**
+     * Whether to keep render data when the component leaves the active hierarchy.
+     * Retained-mode renderers may override this policy and keep their render data until
+     * the content is explicitly cleared or the component is destroyed.
+     */
+    protected get _keepRenderData (): boolean {
+        return false;
+    }
+
     public onDestroy (): void {
         this._renderEntity.setNode(null);
         if (this.node._uiProps.uiComp === this) {

cocos/2d/renderer/static-vb-accessor.ts

@@ -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;

cocos/gfx/webgl2/webgl2-swapchain.ts

@@ -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;

cocos/particle/particle-system.ts

@@ -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)

cocos/particle/renderer/trail.ts

@@ -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),

cocos/rendering/planar-shadow-queue.ts

@@ -29,7 +29,6 @@ import { PipelineStateManager } from './pipeline-state-manager';
 import { Model, Camera, SubModel } from '../render-scene/scene';
 import { RenderInstancedQueue } from './render-instanced-queue';
 import { ShadowType } from '../render-scene/scene/shadows';
-import { Layers } from '../scene-graph/layers';
 import { PipelineRuntime } from './custom/pipeline';
 import { BatchingSchemes, Pass } from '../render-scene/core/pass';
 import { getPhaseID } from './pass-phase';
@@ -83,18 +82,16 @@ export class PlanarShadowQueue {
 
         const scene = camera.scene!;
         const frustum = camera.frustum;
-        const shadowVisible =  (camera.visibility & Layers.BitMask.DEFAULT) !== 0;
+        const shadowVisible = camera.visibility !== 0;
         if (!scene.mainLight || !shadowVisible) { return; }
 
         const models = scene.models;
-        const visibility = camera.visibility;
         for (let i = 0; i < models.length; i++) {
             const model = models[i];
             if (scene.isCulledByLod(camera, model)) {
                 continue;
             }
-            if (model.enabled && model.node && model.castShadow
-                && (model.node && ((visibility & model.node.layer) === model.node.layer))) {
+            if (model.enabled && model.node && model.castShadow) {
                 this._castModels.push(model);
             }
         }

cocos/rendering/render-additive-light-queue.ts

@@ -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++) {
@@ -315,14 +320,18 @@ export class RenderAdditiveLightQueue {
             const lightIdx = _lightIndices[l];
             const light = validPunctualLights[lightIdx];
             const visibility = light.visibility;
-            if (((visibility & model.node.layer) === model.node.layer)) {
+            if (((visibility & model.node.layer) === model.node.layer)
+                || (visibility & model.visFlags)) {
                 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 +379,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 +443,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 +467,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 +631,6 @@ export class RenderAdditiveLightQueue {
             }
         }
 
-        cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData);
+        cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData.buffer as ArrayBuffer, this._lightBufferData.byteLength);
     }
 }