Skip to content

Commit

Permalink
Merge branch 'main' into dev/1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
GuoLei1990 committed Sep 12, 2024
2 parents ac4a3d2 + f35a4dc commit 53f6442
Show file tree
Hide file tree
Showing 55 changed files with 4,941 additions and 3,699 deletions.
2 changes: 1 addition & 1 deletion .commitlintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
"type-enum": [
2,
"always",
["feat", "fix", "build", "ci", "docs", "perf", "refactor", "test", "types", "style", "revert"]
["feat", "fix", "build", "ci", "docs", "perf", "refactor", "test", "types", "style", "revert", "chore"]
]
}
};
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
documentation:
- changed-files:
- any-glob-to-any-file:
- docs/*
- examples/*
- docs/**
- examples/**
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 22.x
cache: pnpm

- name: Install
Expand All @@ -33,7 +33,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [22.x]
os: [ubuntu-latest, macos-latest, windows-latest]
fail-fast: false

Expand All @@ -60,7 +60,7 @@ jobs:
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 22.x
cache: pnpm

- name: Install
Expand All @@ -79,7 +79,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v3
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/release-note.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# This is a basic workflow to help you get started with Actions

name: Release Note

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "master" branch
release:
types: [published]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
message:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Dump Github context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Send notification to Dingding
if: success()
uses: mrkou47/action-dingding-webhook@main
env:
DINGDING_SECRET_TOKEN_MAP: ${{ secrets.DINGDING_SECRET_TOKEN_MAP }}
with:
title: Release Note ${{ github.event.release.tag_name }}
text: ${{ toJSON(github.event.release.body) }}

59 changes: 35 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
# This is a basic workflow to help you get started with Actions

name: Release Note
name: Release

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "master" branch
release:
types: [published]
# Allows you to run this workflow manually from the Actions tab
push:
tags:
- "v*"
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
message:
# The type of runner that the job will run on
release:
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
permissions:
contents: write
id-token: write
steps:
- name: Dump Github context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Send notification to Dingding
if: success()
uses: mrkou47/action-dingding-webhook@main
env:
DINGDING_SECRET_TOKEN_MAP: ${{ secrets.DINGDING_SECRET_TOKEN_MAP }}
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
run_install: true

# after pnpm
- name: Use Node.js LTS
uses: actions/setup-node@v4
with:
title: Release Note ${{ github.event.release.tag_name }}
text: ${{ toJSON(github.event.release.body) }}

node-version: '>=22.6.0'
registry-url: https://registry.npmjs.org/
cache: pnpm

- name: Build
run: pnpm b:all

- name: Release current monorepo
uses: gz65555/[email protected]
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NPM_CONFIG_PROVENANCE: true
OASISBE_UPLOAD_URL: https://oasisbe.alipay.com/api/file/no-auth/crypto/upload
OASISBE_REQUEST_HEADER: ${{secrets.OASISBE_REQUEST_HEADER}}
OASISBE_PUBLIC_KEY: ${{secrets.OASISBE_PUBLIC_KEY}}
2 changes: 0 additions & 2 deletions docs/en/basics/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,3 @@ In addition, **Galacean Runtime** also supports running in [Alipay/Taobao Mini P

**Galacean** is eager to collaborate with you to build an interactive engine. All development processes, including [planning](https://github.com/galacean/engine/projects?query=is%3Aopen), [milestones](https://github.com/galacean/engine/milestones), and [architecture design](https://github.com/galacean/engine/wiki/Physical-system-design), are publicly available in GitHub's project management. You can participate in the construction of the engine by [creating an issue](https://docs.github.com/zh/issues/tracking-your-work-with-issues/creating-an-issue) and [submitting a PR](https://docs.github.com/zh/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). If you have any questions or need help, you can join the DingTalk group or seek help in the [discussion area](https://github.com/orgs/galacean/discussions).
```
It seems like your message was empty. Please paste the Markdown content you want translated, and I'll handle the translation while adhering to the rules you've provided.
12 changes: 6 additions & 6 deletions docs/en/graphics/particle/renderer-animation-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ group: Particle
label: Graphics/Particle
---

[`TextureSheetAnimationModule`](/apis/core/TextureSheetAnimationModule) inherits from `ParticleGeneratorModule` and is used to control the texture sheet animation of the particle system.
[`TextureSheetAnimationModule`](/apis/core/#TextureSheetAnimationModule) inherits from `ParticleGeneratorModule` and is used to control the texture sheet animation of the particle system.

<img src="https://mdn.alipayobjects.com/huamei_qbugvr/afts/img/A*XhXmQadW8ToAAAAAAAAAAAAADtKFAQ/original" alt="avatar" style="zoom:50%;" />

## Properties

| Property | Description |
| --------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------ |
| [startFrame](/apis/core/TextureSheetAnimationModule#startFrame) | [ParticleCompositeCurve](/apis/core/ParticleCompositeCurve) object, representing the start frame of the texture sheet |
| [frameOverTime](/apis/core/TextureSheetAnimationModule#frameOverTime) | [ParticleCompositeCurve](/apis/core/ParticleCompositeCurve) object, representing the curve of the texture sheet frame over time |
| [type](/apis/core/TextureSheetAnimationModule#type) | `TextureSheetAnimationType` enum, representing the type of texture sheet animation |
| [cycleCount](/apis/core/TextureSheetAnimationModule#cycleCount) | `number` type, representing the cycle count of the texture sheet animation |
| [tiling](/apis/core/TextureSheetAnimationModule#tiling) | `Vector2` object, representing the tiling of the texture sheet. Can be accessed and modified through `get` and `set` methods |
| [startFrame](/apis/core/#TextureSheetAnimationModule-startFrame) | [ParticleCompositeCurve](/apis/core/#ParticleCompositeCurve) object, representing the start frame of the texture sheet |
| [frameOverTime](/apis/core/#TextureSheetAnimationModule-frameOverTime) | [ParticleCompositeCurve](/apis/core/#ParticleCompositeCurve) object, representing the curve of the texture sheet frame over time |
| [type](/apis/core/#TextureSheetAnimationModule-type) | `TextureSheetAnimationType` enum, representing the type of texture sheet animation |
| [cycleCount](/apis/core/#TextureSheetAnimationModule-cycleCount) | `number` type, representing the cycle count of the texture sheet animation |
| [tiling](/apis/core/#TextureSheetAnimationModule-tiling) | `Vector2` object, representing the tiling of the texture sheet. Can be accessed and modified through `get` and `set` methods |

6 changes: 3 additions & 3 deletions docs/en/graphics/particle/renderer-color-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ group: Particle
label: Graphics/Particle
---

[`ColorOverLifetimeModule`](/apis/core/ColorOverLifetimeModule) inherits from `ParticleGeneratorModule` and is used to handle color changes during the lifecycle of a particle system.
[`ColorOverLifetimeModule`](/apis/core/#ColorOverLifetimeModule) inherits from `ParticleGeneratorModule` and is used to handle color changes during the lifecycle of a particle system.

<img src="https://mdn.alipayobjects.com/huamei_qbugvr/afts/img/A*8jjgTK0-EWMAAAAAAAAAAAAADtKFAQ/original" alt="avatar" style="zoom:50%;" />

## Properties

| Property | Description |
| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
| [color](/apis/core/ColorOverLifetimeModule#color) | [ParticleCompositeGradient](/apis/core/ParticleCompositeGradient) object, representing the color gradient of particles over their lifecycle |
| [color](/apis/core/#ColorOverLifetimeModule-color) | [ParticleCompositeGradient](/apis/core/#ParticleCompositeGradient) object, representing the color gradient of particles over their lifecycle |

## Gradient Editing

For the [ParticleCompositeGradient](/apis/core/ParticleCompositeGradient) object, the editor has a built-in gradient editor. The top of the gradient bar represents color keys, and the bottom represents alpha value keys. Each key's position on the gradient bar represents its time. Double-clicking an existing key can create a new key, and long-pressing a key and dragging it downwards can delete the key.
For the [ParticleCompositeGradient](/apis/core/#ParticleCompositeGradient) object, the editor has a built-in gradient editor. The top of the gradient bar represents color keys, and the bottom represents alpha value keys. Each key's position on the gradient bar represents its time. Double-clicking an existing key can create a new key, and long-pressing a key and dragging it downwards can delete the key.

<img src="https://mdn.alipayobjects.com/huamei_qbugvr/afts/img/A*BW3dQb--WXAAAAAAAAAAAAAADtKFAQ/original" alt="avatar" style="zoom:50%;" /> <img src="https://mdn.alipayobjects.com/huamei_qbugvr/afts/img/A*NHL9RKwOFTIAAAAAAAAAAAAADtKFAQ/original" alt="avatar" style="zoom:50%;" />
26 changes: 13 additions & 13 deletions docs/en/graphics/particle/renderer-emission-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ group: Particle
label: Graphics/Particle
---

[EmissionModule](/apis/core/EmissionModule) is the emission module of `ParticleGeneratorModule`. This module is used to handle the emission behavior of the particle system, including particle emission rate, emission shape, and burst behavior.
[EmissionModule](/apis/core/#EmissionModule) is the emission module of `ParticleGeneratorModule`. This module is used to handle the emission behavior of the particle system, including particle emission rate, emission shape, and burst behavior.

<img src="https://mdn.alipayobjects.com/huamei_qbugvr/afts/img/A*G7_zS5_A3pMAAAAAAAAAAAAADtKFAQ/original" alt="avatar" style="zoom:50%;" />

## Properties

| Property | Description |
| --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
| [rateOverTime](/apis/core/EmissionModule#rateOverTime) | This is a [ParticleCompositeCurve](/apis/core/ParticleCompositeCurve) object, representing the particle emission rate. The default value is `10`. |
| [rateOverDistance](/apis/core/EmissionModule#rateOverDistance) | This is a [ParticleCompositeCurve](/apis/core/ParticleCompositeCurve) object, representing the particle distance emission rate. The default value is `0`. |
| [shape](/apis/core/EmissionModule#shape) | This is a `BaseShape` object, representing the shape of the emitter. |
| [rateOverTime](/apis/core/#EmissionModule-rateOverTime) | This is a [ParticleCompositeCurve](/apis/core/#ParticleCompositeCurve) object, representing the particle emission rate. The default value is `10`. |
| [rateOverDistance](/apis/core/#EmissionModule-rateOverDistance) | This is a [ParticleCompositeCurve](/apis/core/#ParticleCompositeCurve) object, representing the particle distance emission rate. The default value is `0`. |
| [shape](/apis/core/#EmissionModule-shape) | This is a `BaseShape` object, representing the shape of the emitter. |

## Methods

| Method | Description |
| ---------------------------------------------------------------------------------- | ------------------------- |
| [addBurst(burst: Burst)](/apis/core/EmissionModule#addBurst) | Add a burst behavior |
| [removeBurst(burst: Burst)](/apis/core/EmissionModule#removeBurst) | Remove a burst behavior |
| [removeBurstByIndex(index: number)](/apis/core/EmissionModule#removeBurstByIndex) | Remove a burst behavior by index |
| [clearBurst()](/apis/core/EmissionModule#clearBurst) | Clear all burst behaviors |
| [addBurst(burst: Burst)](/apis/core/#EmissionModule-addBurst) | Add a burst behavior |
| [removeBurst(burst: Burst)](/apis/core/#EmissionModule-removeBurst) | Remove a burst behavior |
| [removeBurstByIndex(index: number)](/apis/core/#EmissionModule-removeBurstByIndex) | Remove a burst behavior by index |
| [clearBurst()](/apis/core/#EmissionModule-clearBurst) | Clear all burst behaviors |

## Shapes

Currently, the engine has the following built-in emitter shapes, providing corresponding shape auxiliary displays when the particle component is selected.

| Emitter Shape Type | Description |
| --------------------------------------------------------------- | ------------------------------------ |
| [BoxShape](/apis/core/EmissionModule#BoxShape) | `BaseShape` object, emitter shape is a cube |
| [CircleShape](/apis/core/EmissionModule#CircleShape) | `BaseShape` object, emitter shape is a circle |
| [ConeShape](/apis/core/EmissionModule#ConeShape) | `BaseShape` object, emitter shape is a cone |
| [HemisphereShape](/apis/core/EmissionModule#HemisphereShape) | `BaseShape` object, emitter shape is a hemisphere |
| [SphereShape](/apis/core/EmissionModule#SphereShape) | `BaseShape` object, emitter shape is a sphere |
| [BoxShape](/apis/core/#EmissionModule-BoxShape) | `BaseShape` object, emitter shape is a cube |
| [CircleShape](/apis/core/#EmissionModule-CircleShape) | `BaseShape` object, emitter shape is a circle |
| [ConeShape](/apis/core/#EmissionModule-ConeShape) | `BaseShape` object, emitter shape is a cone |
| [HemisphereShape](/apis/core/#EmissionModule-HemisphereShape) | `BaseShape` object, emitter shape is a hemisphere |
| [SphereShape](/apis/core/#EmissionModule-SphereShape) | `BaseShape` object, emitter shape is a sphere |

It looks like you haven't pasted the Markdown content yet. Please provide the content you want translated, and I'll help you with the translation while adhering to the rules you've specified.
Loading

0 comments on commit 53f6442

Please sign in to comment.