Merge branch 'main' of https://github.com/galacean/engine into dev/1.4

2026-05-30 23:35:16 +08:00 · 2024-09-26 14:50:08 +08:00
parent afb74231f3 214b8e6fb1
commit d1c8ce4205
17 changed files with 21 additions and 19 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,10 +69,12 @@ jobs:
        run: npm run build:editor
      - name: Test
        run: npm run test-cov
-      - run: pnpm install codecov -w
      - name: Upload coverage to Codecov
-        run: ./node_modules/.bin/codecov
-      - run: curl -s https://codecov.io/bash
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          fail_ci_if_error: true
+          flags: unittests

  e2e:
    runs-on: macos-latest
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
        run: pnpm b:all

      - name: Release current monorepo
-        uses: gz65555/publish@v0.1.3
+        uses: gz65555/publish@v0.1.9
        env:
          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
          NPM_CONFIG_PROVENANCE: true
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@galacean/engine-e2e",
  "private": true,
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "license": "MIT",
  "scripts": {
    "case": "vite serve .dev --config .dev/vite.config.js",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-root",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "packageManager": "pnpm@9.3.0",
  "private": true,
  "scripts": {
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-core",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/core/src/shaderlib/particle/velocity_over_lifetime_module.glsl
+++ b/packages/core/src/shaderlib/particle/velocity_over_lifetime_module.glsl
@@ -66,7 +66,7 @@ vec3 computeParticlePosition(in vec3 startVelocity, in vec3 lifeVelocity, in flo

        #if defined(RENDERER_VOL_CURVE) || defined(RENDERER_VOL_RANDOM_CURVE)
            lifePosition = vec3(
-            evaluateParticleCurveCumulative(renderer_VOLMaxGradientX, normalizedAge)
+            evaluateParticleCurveCumulative(renderer_VOLMaxGradientX, normalizedAge),
            evaluateParticleCurveCumulative(renderer_VOLMaxGradientY, normalizedAge),
            evaluateParticleCurveCumulative(renderer_VOLMaxGradientZ, normalizedAge));

--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-design",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/galacean/package.json
+++ b/packages/galacean/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/loader/package.json
+++ b/packages/loader/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-loader",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/math/package.json
+++ b/packages/math/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-math",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/physics-lite/package.json
+++ b/packages/physics-lite/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-physics-lite",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/physics-physx/package.json
+++ b/packages/physics-physx/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-physics-physx",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/rhi-webgl/package.json
+++ b/packages/rhi-webgl/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-rhi-webgl",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "repository": {
    "url": "https://github.com/galacean/engine.git"
  },
--- a/packages/shader-lab/package.json
+++ b/packages/shader-lab/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-shader-lab",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/xr-webxr/package.json
+++ b/packages/xr-webxr/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-xr-webxr",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/packages/xr/package.json
+++ b/packages/xr/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@galacean/engine-xr",
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "publishConfig": {
    "access": "public",
    "registry": "https://registry.npmjs.org"
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@galacean/engine-tests",
  "private": true,
-  "version": "1.3.11",
+  "version": "0.0.0-experimental-1.3-xr.10",
  "license": "MIT",
  "main": "dist/main.js",
  "module": "dist/module.js",