From 168dcee67e475edb622bc79ee24bf2d342c4e85c Mon Sep 17 00:00:00 2001 From: ChenMo Date: Tue, 24 Sep 2024 19:05:14 +0800 Subject: [PATCH 1/9] fix(particle): particle velocity over lifetime bug (#2387) --- .../src/shaderlib/particle/velocity_over_lifetime_module.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/shaderlib/particle/velocity_over_lifetime_module.glsl b/packages/core/src/shaderlib/particle/velocity_over_lifetime_module.glsl index dbcb7d4f4..bd3cdb16b 100644 --- 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)); From 73c2cb7d0354bb94c87399b2da05f1e707f19c56 Mon Sep 17 00:00:00 2001 From: GuoLei1990 Date: Tue, 24 Sep 2024 19:10:19 +0800 Subject: [PATCH 2/9] chore: release v1.3.12 --- e2e/package.json | 2 +- package.json | 2 +- packages/core/package.json | 2 +- packages/design/package.json | 2 +- packages/galacean/package.json | 2 +- packages/loader/package.json | 2 +- packages/math/package.json | 2 +- packages/physics-lite/package.json | 2 +- packages/physics-physx/package.json | 2 +- packages/rhi-webgl/package.json | 2 +- packages/shader-lab/package.json | 2 +- packages/xr-webxr/package.json | 2 +- packages/xr/package.json | 2 +- tests/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index 247408ebb..f521a1fe0 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -1,7 +1,7 @@ { "name": "@galacean/engine-e2e", "private": true, - "version": "1.3.11", + "version": "1.3.12", "license": "MIT", "scripts": { "case": "vite serve .dev --config .dev/vite.config.js", diff --git a/package.json b/package.json index f4d6d6cf7..0b299846b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-root", - "version": "1.3.11", + "version": "1.3.12", "packageManager": "pnpm@9.3.0", "private": true, "scripts": { diff --git a/packages/core/package.json b/packages/core/package.json index cb25c34cc..e35e4841f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-core", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/design/package.json b/packages/design/package.json index bde10fec9..7440929b9 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-design", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/galacean/package.json b/packages/galacean/package.json index a4ed9b0d7..ca2640005 100644 --- a/packages/galacean/package.json +++ b/packages/galacean/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/loader/package.json b/packages/loader/package.json index 211be0d0d..f0097f9c8 100644 --- a/packages/loader/package.json +++ b/packages/loader/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-loader", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/math/package.json b/packages/math/package.json index 706ac9120..0fd703780 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-math", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/physics-lite/package.json b/packages/physics-lite/package.json index 0c66d9478..e0a1d59e8 100644 --- 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": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/physics-physx/package.json b/packages/physics-physx/package.json index 5fdefa25f..9b736775b 100644 --- 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": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/rhi-webgl/package.json b/packages/rhi-webgl/package.json index 788b5ca1e..63b89d588 100644 --- 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": "1.3.12", "repository": { "url": "https://github.com/galacean/engine.git" }, diff --git a/packages/shader-lab/package.json b/packages/shader-lab/package.json index 9ff3d0a37..4cc93c082 100644 --- 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": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/xr-webxr/package.json b/packages/xr-webxr/package.json index a8fdf4f84..44245daea 100644 --- 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": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/xr/package.json b/packages/xr/package.json index d7f89e869..589529e8e 100644 --- a/packages/xr/package.json +++ b/packages/xr/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-xr", - "version": "1.3.11", + "version": "1.3.12", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/tests/package.json b/tests/package.json index f650d1db2..2237141ba 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,7 +1,7 @@ { "name": "@galacean/engine-tests", "private": true, - "version": "1.3.11", + "version": "1.3.12", "license": "MIT", "main": "dist/main.js", "module": "dist/module.js", From ec4a457eb0fa328ca4a1613897e091bc94129971 Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 16:17:09 +0800 Subject: [PATCH 3/9] ci: support report codecov --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e1c41380..4be8e193b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,8 @@ jobs: run: npm run build:editor - name: Test run: npm run test-cov + - name: Report + run: nyc report --reporter=lcov - run: pnpm install codecov -w - name: Upload coverage to Codecov run: ./node_modules/.bin/codecov From d4e0d5d0bc52c8ec6f5b5854b38202b380e44b80 Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 16:28:57 +0800 Subject: [PATCH 4/9] ci: use the right nyc --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4be8e193b..2e1e9bf85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: - name: Test run: npm run test-cov - name: Report - run: nyc report --reporter=lcov + run: ./node_modules/.bin/nyc report --reporter=lcov - run: pnpm install codecov -w - name: Upload coverage to Codecov run: ./node_modules/.bin/codecov From 432b75c49b870e323033c23787efcd2bb0143dca Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 16:38:23 +0800 Subject: [PATCH 5/9] ci: use the new coverage action --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e1e9bf85..1be2567fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,13 +69,13 @@ jobs: run: npm run build:editor - name: Test run: npm run test-cov - - name: Report - run: ./node_modules/.bin/nyc report --reporter=lcov - - 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: + directory: ./coverage/lcov-report/ + fail_ci_if_error: true + flags: unittests + e2e: runs-on: macos-latest From b55549df0adc69b5bc472dd90e378960b651c83d Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 16:44:16 +0800 Subject: [PATCH 6/9] ci: add code cov token --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1be2567fa..1c16f2d58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,10 +72,11 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: + token: ${{secrets.CODECOV_TOKEN}} directory: ./coverage/lcov-report/ fail_ci_if_error: true flags: unittests - + e2e: runs-on: macos-latest From e6ea0571c458afde89a24aab5b441fc305203ded Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 16:49:56 +0800 Subject: [PATCH 7/9] ci: remove directory --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c16f2d58..bebda6f94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,6 @@ jobs: uses: codecov/codecov-action@v4 with: token: ${{secrets.CODECOV_TOKEN}} - directory: ./coverage/lcov-report/ fail_ci_if_error: true flags: unittests From fc39d5d15e8b3dbd9eeae96699efcf84e6fb91db Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 17:08:29 +0800 Subject: [PATCH 8/9] ci: update publish --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e99c79ee2..69d0a6279 100644 --- 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 From 214b8e6fb148e92eb27cfa021576b32014fbdd9c Mon Sep 17 00:00:00 2001 From: gz65555 Date: Wed, 25 Sep 2024 17:09:49 +0800 Subject: [PATCH 9/9] chore: release v0.0.0-experimental-1.3-xr.10 --- e2e/package.json | 2 +- package.json | 2 +- packages/core/package.json | 2 +- packages/design/package.json | 2 +- packages/galacean/package.json | 2 +- packages/loader/package.json | 2 +- packages/math/package.json | 2 +- packages/physics-lite/package.json | 2 +- packages/physics-physx/package.json | 2 +- packages/rhi-webgl/package.json | 2 +- packages/shader-lab/package.json | 2 +- packages/xr-webxr/package.json | 2 +- packages/xr/package.json | 2 +- tests/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index f521a1fe0..558ab7609 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -1,7 +1,7 @@ { "name": "@galacean/engine-e2e", "private": true, - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "license": "MIT", "scripts": { "case": "vite serve .dev --config .dev/vite.config.js", diff --git a/package.json b/package.json index 0b299846b..d24acdbc6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-root", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "packageManager": "pnpm@9.3.0", "private": true, "scripts": { diff --git a/packages/core/package.json b/packages/core/package.json index e35e4841f..05e2fa4fb 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-core", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/design/package.json b/packages/design/package.json index 7440929b9..9d2ed720e 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-design", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/galacean/package.json b/packages/galacean/package.json index ca2640005..6df3490c8 100644 --- a/packages/galacean/package.json +++ b/packages/galacean/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/loader/package.json b/packages/loader/package.json index f0097f9c8..c982e85d4 100644 --- a/packages/loader/package.json +++ b/packages/loader/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-loader", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/math/package.json b/packages/math/package.json index 0fd703780..edf7447ad 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-math", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/physics-lite/package.json b/packages/physics-lite/package.json index e0a1d59e8..4a875f32b 100644 --- a/packages/physics-lite/package.json +++ b/packages/physics-lite/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-physics-lite", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/physics-physx/package.json b/packages/physics-physx/package.json index 9b736775b..b0ffc690c 100644 --- a/packages/physics-physx/package.json +++ b/packages/physics-physx/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-physics-physx", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/rhi-webgl/package.json b/packages/rhi-webgl/package.json index 63b89d588..2196b5bbe 100644 --- a/packages/rhi-webgl/package.json +++ b/packages/rhi-webgl/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-rhi-webgl", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "repository": { "url": "https://github.com/galacean/engine.git" }, diff --git a/packages/shader-lab/package.json b/packages/shader-lab/package.json index 4cc93c082..2ef71cc99 100644 --- a/packages/shader-lab/package.json +++ b/packages/shader-lab/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-shader-lab", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/xr-webxr/package.json b/packages/xr-webxr/package.json index 44245daea..1db2717c7 100644 --- a/packages/xr-webxr/package.json +++ b/packages/xr-webxr/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-xr-webxr", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/packages/xr/package.json b/packages/xr/package.json index 589529e8e..e1593b5d0 100644 --- a/packages/xr/package.json +++ b/packages/xr/package.json @@ -1,6 +1,6 @@ { "name": "@galacean/engine-xr", - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/tests/package.json b/tests/package.json index 2237141ba..1682d6492 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,7 +1,7 @@ { "name": "@galacean/engine-tests", "private": true, - "version": "1.3.12", + "version": "0.0.0-experimental-1.3-xr.10", "license": "MIT", "main": "dist/main.js", "module": "dist/module.js",