New VFX System

.eslintrc.yaml

@@ -76,7 +76,7 @@ rules:
     lines-between-class-members: off # be more lenient on member declarations
     max-classes-per-file: off # helper classes are common
     max-len: [warn, 150] # more lenient on max length per line
-    no-console: off # this is just too much work, cc.warn is still too much pain to use
+    no-console: error # prefer the uniform logging methods
     no-plusplus: off # allow increment/decrement operators
     no-continue: off # allow unlabeled continues
     no-mixed-operators: off # this is just cumbersome

.github/workflows/native-bindings.yml

@@ -3,13 +3,6 @@ name: <Native> Generate Code
 on:
   pull_request_target:
     types: [closed]
-  # pull_request:
-    paths:
-    - 'templates/**'
-    - 'native/**'
-    - 'cocos/**'
-    - 'package.json'
-    - '.github/workflows/native-bindings.yml'
 
 jobs:
   autogen-code:

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

@@ -5,6 +5,7 @@ on:
     paths:
     - 'templates/**'
     - 'native/**'
+    - '.github/workflows/native-compile-platforms.yml'
 
 # github.head_ref is only defined on pull_request events
 concurrency:
@@ -25,8 +26,11 @@ jobs:
           EXT_VERSION=`node ./.github/workflows/get-native-external-version.js`
           git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos/cocos-engine-external native/external
       - name: Install deps
-        run: |
-          choco install --forcex86 vulkan-sdk
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.2.189.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
       - name: Compile win64
         shell: bash
         env:
@@ -96,6 +100,13 @@ jobs:
           echo "set(COCOS_X_PATH $NATIVE_ROOT)" >> build-android/proj/cfg.cmake
           echo "set(CC_EXECUTABLE_NAME \"\")" >> build-android/proj/cfg.cmake
 
+          mkdir -p build-android/proj/res/values
+          cat << EOF > build-android/proj/res/values/strings.xml
+          <resources>
+              <string name="app_name" translatable="false">CocosGame</string>
+          </resources>
+          EOF
+
           mkdir -p build-android/assets
 
           ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/
@@ -112,7 +123,8 @@ jobs:
 
           echo "Compile Android - cmake ..."
           echo "ANDORID_NDK ${ANDROID_NDK} or ${ANDROID_NDK_HOME}"
-          ./gradlew :CocosGame:assembleDebug --quiet
+          # ./gradlew :CocosGame:assembleDebug --quiet
+          ./gradlew :CocosGame:assembleRelease --quiet
           echo "Compile Android Debug Done!"
 
   compile_android:
@@ -162,6 +174,13 @@ jobs:
           echo "set(COCOS_X_PATH $NATIVE_ROOT)" >> build-android/proj/cfg.cmake
           echo "set(CC_EXECUTABLE_NAME \"\")" >> build-android/proj/cfg.cmake
 
+          mkdir -p build-android/proj/res/values
+          cat << EOF > build-android/proj/res/values/strings.xml
+          <resources>
+              <string name="app_name" translatable="false">CocosGame</string>
+          </resources>
+          EOF
+
           mkdir -p build-android/assets
 
           ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/

.github/workflows/native-simulator.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     paths:
     - 'native/**'
+    - '.github\workflows\native-simulator.yml'
 
 # github.head_ref is only defined on pull_request events
 concurrency:
@@ -32,9 +33,12 @@ jobs:
           EXT_VERSION=`node ../.github/workflows/get-native-external-version.js`
           git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos/cocos-engine-external external
 
-      - name: install vulkan-sdk
-        run: |
-          choco install vulkan-sdk
+      - name: Install deps
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.2.189.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
       - name: gen simulator
         run: |
           gulp gen-simulator

.vscode/settings.json

@@ -19,7 +19,8 @@
         "source.fixAll": true,
     },
     "files.associations": {
-        "iterator": "cpp"
+        "iterator": "cpp",
+        "*.ipp": "c"
     },
     "cmake.configureOnOpen": false,
 }

@types/jsb.d.ts

@@ -119,6 +119,7 @@ declare namespace jsb {
         repeat: boolean;
         keyCode: number;
         windowId: number;
+        code: string;
     }
     type KeyboardEventCallback = (keyboardEvent: KeyboardEvent) => void;
     export let onKeyDown: KeyboardEventCallback | undefined;

@types/pal/minigame.d.ts

@@ -34,6 +34,7 @@ declare module 'pal/minigame' {
 
         // file system
         getFileSystemManager(): FileSystemManager;
+        loadSubpackage? (option: LoadSubpackageOption): LoadSubpackageTask;
 
         // input
         onTouchStart: IEventManager<TouchEvent>;
@@ -249,3 +250,21 @@ declare class InnerAudioContext {
     seek(position:number): any;
     stop(): any;
 }
+
+interface LoadSubpackageOption {
+    name: string;
+    fail?: (...args: unknown[]) => void;
+    success?: (...args: unknown[]) => void;
+    complete?: (...args: unknown[]) => void;
+}
+interface LoadSubpackageTask {
+    onProgressUpdate(
+        listener: LoadSubpackageTaskOnProgressUpdateCallback
+    ): void;
+}
+type LoadSubpackageTaskOnProgressUpdateCallback = (result: LoadSubpackageTaskOnProgressUpdateListenerResult) => void;
+interface LoadSubpackageTaskOnProgressUpdateListenerResult {
+    progress: number;
+    totalBytesExpectedToWrite: number;
+    totalBytesWritten: number;
+}

@types/pal/wasm.d.ts

@@ -8,4 +8,21 @@ declare module 'pal/wasm' {
      * @param importObject the standard `WebAssembly.Imports` instance
      */
     export function instantiateWasm (wasmUrl: string, importObject: WebAssembly.Imports): Promise<any>;
+
+    /**
+     * Fetch binary data from wasm url or js mem url.
+     * NOTE: This method should only use to instantiate asm.js compiled with `-O2` options,
+     * because not all platforms support instantiate wasm by wasm binary.
+     * eg. WeChat can only instantiate wasm by wasm url.
+     *
+     * @param binaryUrl the url of wasm or js mem, this should be a url relative from build output chunk.
+     */
+    export function fetchBuffer (binaryUrl: string): Promise<ArrayBuffer>;
+
+    /**
+     * Sometimes we need to put wasm modules in subpackage to reduce code size.
+     * In this case we need to ensure that the wasm modules is ready before we import them.
+     * Please remember to invoke this method before we import wasm modules.
+     */
+    export function ensureWasmModuleReady (): Promise<void>;
 }

EngineErrorMap.md

@@ -1975,6 +1975,10 @@ Graphics: There is no model in %s.
 
 Script attached to '%s' is missing or invalid.
 
+### 4601
+
+Failed to load wasm module, WebAssembly is not supported on this platform, but as a fallback Asm.js module is culled by mistake.
+
 ### 4700
 
 The dom control is not created!
@@ -3137,6 +3141,10 @@ Since v3.6, Because mask changes the inheritance relationship, you can directly
 
 texture size exceeds current device limits %d/%d
 
+### 9101
+
+The length of the TypedArrayBuffer must be an integer.
+
 ### 9200
 
 <!-- DEPRECATED -->
@@ -3263,6 +3271,34 @@ The font size is too big to be fitted into texture atlas. Please switch to other
 
 The asset %s has been destroyed!
 
+### 12102
+
+Base pass cannot override states, please use pass instance instead.
+
+### 12103
+
+Custom pipeline create shader %s failed. Please restart editor.
+
+### 12104
+
+Create shader %s failed.
+
+### 12105
+
+Pass resources incomplete.
+
+### 12106
+
+Cannot patch non-builtin macros.
+
+### 12107
+
+Custom pipeline invalid render pass, program: %s. Please restart editor.
+
+### 12108
+
+Custom pipeline invalid render phase, program: %s. Please restart editor.
+
 ### 13100
 
 Incorrect CCON magic.
@@ -3367,4 +3403,12 @@ node '%s' doesn't have any ModelRenderer component, this component will not work
 
 ### 16302
 
-There is no reflection probe in the scene or no probe is near the current object. No reflection probe will take effect on this object. Please create a new reflection probe or move existing ones closer.
+There is no reflection probe in the scene or no probe is near the current object. No reflection probe will take effect on this object. Please create a new reflection probe or move existing ones closer.
+
+### 16303
+
+Skin material needs floating-point render target, please check ENABLE_FLOAT_OUTPUT define in Project Settings--Macro
+
+### 16304
+
+Skin material may need more accurate calculations, please select a head model of standard size, check the isGlobalStandardSkinObject option in the MeshRender component.

cc.config.json

@@ -8,9 +8,7 @@
                 "970b0598-bcb0-4714-91fb-2e81440dccd8",
                 "bcd64cc6-2dd9-43f6-abbe-66318d332032",
                 "d930590d-bb92-4cc8-8bd1-23cd027f9edf",
-                "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
-                "5c601d96-e4c7-4698-991b-7ee674b11079",
-                "9361fd90-ba52-4f84-aa93-6e878fd576ca"
+                "a3cd009f-0ab0-420d-9278-b9fdab939bbc"
             ]
         },
         "gfx-webgl": {
@@ -25,17 +23,9 @@
         "3d": {
             "modules": ["3d"],
             "dependentAssets": [
-                "1baf0fc9-befa-459c-8bdd-af1a450a0319",
                 "511d2633-09a7-4bdd-ac42-f778032124b3",
                 "5d45aa00-e064-4938-b314-4265f0c2258c",
-                "28d6d6b8-3f66-4a73-9795-17a0852ba2d4",
-                "ec8106fe-05bf-4e94-943c-e0d3b7bb5e45",
-                "620b6bf3-0369-4560-837f-2a2c00b73c26",
-                "2df0a40b-26c2-47ce-be0d-4d3cd4164737",
-                "39f74202-ead5-4a45-b966-273d526adbf1",
-                "8f6ac413-2f1e-4b88-b26f-54556b5dd510",
-                "45e7c0c8-2699-4912-b45f-d42bb8384189",
-                "84ac6f69-3086-455a-86a4-561da8ee710b"
+                "9361fd90-ba52-4f84-aa93-6e878fd576ca"
             ]
         },
         "animation": {
@@ -76,6 +66,10 @@
                 "78e0584a-4343-4727-8f37-e14e65c2a2db"
             ]
         },
+        "vfx": {
+            "modules": ["vfx"],
+            "dependentAssets": []
+        },
         "particle-2d": {
             "modules": ["particle-2d"],
             "dependentModules": ["2d"]
@@ -199,7 +193,13 @@
                 "cafd95c9-c558-46f9-9812-1224b65c09ee",
                 "28d6d6b8-3f66-4a73-9795-17a0852ba2d4",
                 "2df0a40b-26c2-47ce-be0d-4d3cd4164737",
-                "dace6a58-1705-48c7-a275-70afc9534e88"
+                "dace6a58-1705-48c7-a275-70afc9534e88",
+                "ec8106fe-05bf-4e94-943c-e0d3b7bb5e45",
+                "39f74202-ead5-4a45-b966-273d526adbf1",
+                "8f6ac413-2f1e-4b88-b26f-54556b5dd510",
+                "45e7c0c8-2699-4912-b45f-d42bb8384189",
+                "84ac6f69-3086-455a-86a4-561da8ee710b",
+                "5c601d96-e4c7-4698-991b-7ee674b11079"
             ]
         },
         "websocket": {
@@ -546,6 +546,14 @@
             "internal": false,
             "dynamic": true
         },
+        "EDITOR_NOT_IN_PREVIEW" : {
+            "comment": "Run in editor but not in editor preview.",
+            "type": "boolean",
+            "value": false,
+            "ccGlobal": false,
+            "internal": false,
+            "dynamic": true
+        },
         "PREVIEW": {
             "comment": "Preview in browser or simulator.",
             "type": "boolean",
@@ -644,7 +652,25 @@
         "WASM_SUPPORT_MODE": {
             "comment": "Whether support wasm, here we provide 3 options:\n0: The platform doesn't support WASM\n1: The platform supports WASM\n2: The platform may support WASM, especially on Web platform",
             "type": "number",
-            "value": "$HTML5 ? 2 : ($NATIVE ? (($OPEN_HARMONY||$IOS)?0:1): ($MINIGAME? ($WECHAT||$BYTEDANCE?1:0) :0))",
+            "value": "$HTML5 ? 2 : ($NATIVE ? (($OPEN_HARMONY||$IOS)?0:1): ($MINIGAME? ($WECHAT?1:0) :0))",
+            "internal": true
+        },
+        "FORCE_BANNING_BULLET_WASM": {
+            "comment": "Whether force banning using bullet wasm and use asmjs instead.\nThis is an internal constant to be compatible with the editor's physical build option.",
+            "type": "boolean",
+            "value": false,
+            "internal": true
+        },
+        "CULL_ASM_JS_MODULE": {
+            "comment": "Whether cull the asm js module.\nThe external modules ending with '.asm.js'. or '.js.mem' is culled if this constant is true.",
+            "type": "boolean",
+            "value": false,
+            "internal": true
+        },
+        "WASM_SUBPACKAGE": {
+            "comment": "An internal constant to indicate whether we use wasm assets as minigame subpackage.\nThis is useful when we need to reduce code size.",
+            "type": "boolean",
+            "value": false,
             "internal": true
         }
     },

cocos/2d/assembler/label/bmfontUtils.ts

@@ -34,6 +34,7 @@ import { TextProcessing } from './text-processing';
 import { TextOutputLayoutData, TextOutputRenderData } from './text-output-data';
 import { TextStyle } from './text-style';
 import { TextLayout } from './text-layout';
+import { view } from '../../../ui/view';
 
 const _defaultLetterAtlas = new LetterAtlas(64, 64);
 const _defaultFontAtlas = new FontAtlas(null);
@@ -48,7 +49,8 @@ let QUAD_INDICES;
 export const bmfontUtils = {
 
     updateProcessingData (style: TextStyle, layout: TextLayout,
-        outputLayoutData: TextOutputLayoutData, comp: Label, trans: UITransform) {
+        outputLayoutData: TextOutputLayoutData, outputRenderData: TextOutputRenderData,
+        comp: Label, trans: UITransform) {
         style.fontSize = comp.fontSize;
         style.actualFontSize = comp.fontSize;
         style.originFontSize = _fntConfig ? _fntConfig.fontSize : comp.fontSize;
@@ -73,6 +75,8 @@ export const bmfontUtils = {
         } else {
             layout.wrapping = comp.enableWrapText;
         }
+        outputRenderData.uiTransAnchorX = trans.anchorX;
+        outputRenderData.uiTransAnchorY = trans.anchorY;
 
         shareLabelInfo.lineHeight = comp.lineHeight;
         shareLabelInfo.fontSize = comp.fontSize;
@@ -101,9 +105,10 @@ export const bmfontUtils = {
             const layout = comp.textLayout;
             const outputLayoutData = comp.textLayoutData;
             const outputRenderData = comp.textRenderData;
+            style.fontScale = view.getScaleX();
             this._updateFontFamily(comp);
 
-            this.updateProcessingData(style, layout, outputLayoutData, comp, _uiTrans);
+            this.updateProcessingData(style, layout, outputLayoutData, outputRenderData, comp, _uiTrans);
 
             this._updateLabelInfo(comp);