Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add transition condition #676

Closed
wants to merge 138 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
1feed59
feat: add transition condition
Mar 4, 2022
1c77e2c
feat: add transition condition
Mar 4, 2022
88c15f1
feat: merge dev0.7
Mar 4, 2022
c49b576
Fix `AmbientLight` share bug (#910)
GuoLei1990 Aug 2, 2022
cbd271b
fix: miniprogram adapter (#913)
zhuxudong Aug 2, 2022
1c144ea
fix: miniprogram cannot recognize htmlcanvaselement (#914)
cptbtptpbcptdtptp Aug 2, 2022
3f83b69
v0.8.0-beta.3
GuoLei1990 Aug 2, 2022
5003e75
fix: miniprogram cannot recognize htmlcanvaselement (#915)
cptbtptpbcptdtptp Aug 2, 2022
0ca84a3
v0.8.0-beta.4
GuoLei1990 Aug 2, 2022
2d11e00
v0.8.0-beta.5
GuoLei1990 Aug 2, 2022
cf23808
fix: build error cause by physics package (#921)
GuoLei1990 Aug 4, 2022
d2f1f94
Fix use canvas as the main body to listen for keyboard events (#917)
cptbtptpbcptdtptp Aug 4, 2022
1228a9c
v0.8.0-beta.6
GuoLei1990 Aug 4, 2022
ee6d11a
fix test missmatch bug (#922)
yangfengzzz Aug 4, 2022
7124e03
v0.8.0-beta.7
GuoLei1990 Aug 4, 2022
c3a97a8
Fix `ResourceManager.cancelNotLoaded` Error when load env (#923)
gz65555 Aug 4, 2022
5bd95b9
v0.8.0-beta.8
GuoLei1990 Aug 4, 2022
314cefa
v0.8.0-beta.9
GuoLei1990 Aug 4, 2022
04926fa
fix: peer dependencies bunble (#926)
gz65555 Aug 4, 2022
7d1a61d
Delete jest.config.js
GuoLei1990 Aug 6, 2022
c4fc1e7
Fix InputManager need to stop the default touch behavior of canvas (#…
cptbtptpbcptdtptp Aug 8, 2022
c355856
Create package.json
GuoLei1990 Aug 9, 2022
c9b883b
Update package.json
GuoLei1990 Aug 9, 2022
e15f2f8
fix: `blendShapeWeights` is never set (#941)
GuoLei1990 Aug 11, 2022
2d4ea29
fix: model mesh missing tangent w (#944)
yangfengzzz Aug 12, 2022
6cf91ca
fix: scene parser error (#946)
zhuxudong Aug 12, 2022
88cd521
physx missing collision callback (#950)
yangfengzzz Aug 16, 2022
d7403ec
v0.8.0-beta.10
GuoLei1990 Aug 16, 2022
4a8f4b8
Update package.json
GuoLei1990 Aug 16, 2022
f3eda7d
Update package.json
GuoLei1990 Aug 16, 2022
4872b01
v0.8.0-beta.11
GuoLei1990 Aug 16, 2022
66344b8
v0.8.0-beta.12
GuoLei1990 Aug 16, 2022
491ebdf
Fix `Transform` `worldMatrix` set bug (#951)
cptbtptpbcptdtptp Aug 16, 2022
76c1cab
Fix frame picker not valid for sprite renderer (#952)
singlecoder Aug 17, 2022
74ee7f8
build: compile error
GuoLei1990 Aug 17, 2022
600190c
v0.8.0-beta.13
GuoLei1990 Aug 17, 2022
1fff4c1
v0.8.0-beta.14
GuoLei1990 Aug 17, 2022
bedf577
Optimization TextRenderer memory (#964)
GuoLei1990 Aug 19, 2022
dd05cbf
Optmization TextRender performance cause by sort (#966)
GuoLei1990 Aug 22, 2022
80c4c16
Add `siblingIndex` and `addChild()` insert ability for `Entity` (#961)
GuoLei1990 Aug 22, 2022
55d2921
Add `siblingIndex` and `addChild()` insert ability for `Entity` (#961)
GuoLei1990 Aug 22, 2022
43f249b
Add `siblingIndex` and `addChild()` insert ability for `Entity` (#961…
GuoLei1990 Aug 22, 2022
a40b0bd
Merge branch 'main' of github.com:oasis-engine/engine
GuoLei1990 Aug 22, 2022
4e2a753
v0.8.0-beta.15
GuoLei1990 Aug 22, 2022
b1d82ec
Fix blendShape clone error (#968)
zhuxudong Aug 22, 2022
0bd92b6
v0.8.0-beta.16
GuoLei1990 Aug 22, 2022
6bb5bf0
Fix blendShape clone error (#970)
zhuxudong Aug 22, 2022
b03d75e
v0.8.0-beta.17
GuoLei1990 Aug 22, 2022
59d2919
refactor: opt code
GuoLei1990 Aug 22, 2022
e902e63
refactor: opt code
GuoLei1990 Aug 22, 2022
a5001f5
refactor: opt code
GuoLei1990 Aug 22, 2022
06fcf35
fix: `InputManager` keyboard events could not be listened to (#972)
cptbtptpbcptdtptp Aug 22, 2022
8b8a572
Enhance entity `siblingIndex` robustness (#971)
GuoLei1990 Aug 22, 2022
ec48ef3
Merge branch 'main' of github.com:oasis-engine/engine
GuoLei1990 Aug 22, 2022
b2faaba
v0.8.0-beta.18
GuoLei1990 Aug 22, 2022
d76a083
refactor shadow and light and delete feature system (#908)
yangfengzzz Aug 23, 2022
e7cfcf4
Fix blend shape error (#979)
luzhuang Aug 25, 2022
3a06d38
v0.8.0-beta.19
GuoLei1990 Aug 25, 2022
97c9576
types(Transform): fix spell error
GuoLei1990 Aug 29, 2022
b9f2c50
types(Transform): fix spell error (#980)
GuoLei1990 Aug 29, 2022
c7e3e3d
Refactor asset promise with interface (#978)
gz65555 Aug 29, 2022
456c496
Add depth `depthCompareFunction` for Texture (#974)
GuoLei1990 Aug 29, 2022
b0eeae8
Shader support graphic API macro (#982)
GuoLei1990 Aug 30, 2022
5da3f4a
Merge branch 'main' of github.com:oasis-engine/engine
GuoLei1990 Aug 30, 2022
11466c2
v0.9.0-alpha.0
GuoLei1990 Aug 30, 2022
7ea65a0
v0.9.0-alpha.1
GuoLei1990 Aug 30, 2022
6879e36
Update README.md
GuoLei1990 Aug 30, 2022
2c32b4f
fix: shader compile bug cause by graphicAPI macro (#995)
GuoLei1990 Sep 1, 2022
1b6b66c
fix: physics lite raycast bug (#999)
yangfengzzz Sep 2, 2022
a170704
Update .commitlintrc.js
GuoLei1990 Sep 6, 2022
e33ad85
refactor: add reflect get property in asset parse (#1003)
gz65555 Sep 7, 2022
15acc49
refactor: add reflect get property in asset parse (#1003)
gz65555 Sep 7, 2022
f1bbb95
cherry-pick #1003 (#1013)
GuoLei1990 Sep 7, 2022
956ef62
Merge branch 'main' of github.com:oasis-engine/engine
GuoLei1990 Sep 7, 2022
117dfd2
v0.8.0-beta.20
GuoLei1990 Sep 7, 2022
11e257a
Update Refer in ResourceManager (#1014)
gz65555 Sep 7, 2022
bedd928
fix: update Refer in ResourceManager
GuoLei1990 Sep 7, 2022
63d49a3
v0.8.0-beta.21
GuoLei1990 Sep 7, 2022
9c84eb6
fix Scene load resolve bug (#1018)
gz65555 Sep 7, 2022
71eb8cb
Add cascaded shadow map (#985)
yangfengzzz Sep 7, 2022
8eefad2
Remove Default Timeout for Request (#1021)
gz65555 Sep 8, 2022
c8abb62
fix: add protected when material or texture destroy
GuoLei1990 Sep 8, 2022
5724559
fix: add protected when material or texture destroy (#1022)
GuoLei1990 Sep 8, 2022
f853d38
Merge branch 'main' of github.com:oasis-engine/engine
GuoLei1990 Sep 8, 2022
1101dd5
v0.8.0-beta.22
GuoLei1990 Sep 8, 2022
769e064
refactor: merge main
GuoLei1990 Sep 8, 2022
9bdf7a6
refactor: opt code
GuoLei1990 Sep 8, 2022
f7189f1
Fix set font size not valid error (#1019)
singlecoder Sep 9, 2022
323aa74
Merge commit 'f7189f1ecf0e2a2a553212bcbc85786fabbcf9bb' into dev/0.9-…
GuoLei1990 Sep 9, 2022
ddb08f8
Merge pull request #1023 from GuoLei1990/dev/0.9-merge-main
GuoLei1990 Sep 9, 2022
1df85fb
fix: blendShape compatibility bug
GuoLei1990 Sep 9, 2022
78cb1c1
Merge pull request #1026 from GuoLei1990/pr/improve-blendShape-compat…
GuoLei1990 Sep 9, 2022
baeee9c
Merge commit '78cb1c1dabcfc4a83f965fa7a199fb5d6b7d7672' into dev/0.9
GuoLei1990 Sep 9, 2022
1ccd639
Merge pull request #1027 from GuoLei1990/dev/0.9
GuoLei1990 Sep 9, 2022
269ab02
v0.9.0-alpha.2
GuoLei1990 Sep 9, 2022
62e75f9
Fix `SkinnedMeshRenderer` clone bug (#1028)
GuoLei1990 Sep 10, 2022
1c630a0
Merge commit '62e75f9a0c2881fef1c27279725eeae838a3d9f1' into pr/merge…
GuoLei1990 Sep 10, 2022
83e9dd9
Merge pull request #1031 from GuoLei1990/pr/merge-main
GuoLei1990 Sep 10, 2022
6f8934f
shadowMap using color texture when platform not support depthTexture …
yangfengzzz Sep 10, 2022
1bc314f
v0.9.0-alpha.3
GuoLei1990 Sep 10, 2022
3e1428c
v0.8.0-beta.23
GuoLei1990 Sep 10, 2022
f6567e6
fix: use rgba8 as downgrade shadow texture (#1033)
yangfengzzz Sep 11, 2022
fbe5ecc
v0.9.0-alpha.4
GuoLei1990 Sep 11, 2022
69ee14a
Fix `TextRenderer` render error (#1040)
singlecoder Sep 14, 2022
a69f9e4
Shader support multi shader pass (#948)
GuoLei1990 Sep 14, 2022
f34d3ac
Fix text renderer element not render state (#1043)
singlecoder Sep 14, 2022
83112fb
v0.8.0-beta.24
GuoLei1990 Sep 14, 2022
0dcf39e
shaderData add get shader properties ability (#1030)
GuoLei1990 Sep 14, 2022
3cca4ab
Fix skin normal transform bug(#1045)
yangfengzzz Sep 15, 2022
343e067
Use pnpm workspace instead of lerna (#1032)
gz65555 Sep 15, 2022
4063c44
Update README.md
GuoLei1990 Sep 15, 2022
aebd861
Update README.md
GuoLei1990 Sep 15, 2022
deb5acd
Update README.md
GuoLei1990 Sep 15, 2022
51b17fb
Update README.md
GuoLei1990 Sep 15, 2022
29757cc
Update README.md
GuoLei1990 Sep 15, 2022
71e8969
feat: remove throw (#1052)
yangfengzzz Sep 15, 2022
a0ea9d7
fix: sprite transform error when rotates (#1053)
cptbtptpbcptdtptp Sep 16, 2022
48d1776
fix: skinning need inverse (#1051)
yangfengzzz Sep 16, 2022
e961134
Fix script onDisable() error call bug (#1055)
GuoLei1990 Sep 16, 2022
5982faf
v0.8.0-beta.25
GuoLei1990 Sep 16, 2022
bff5f74
Fix physics system stablity (#1047)
yangfengzzz Sep 19, 2022
cb369c6
Fix call `engine.destroy()` crash in `Script` (#1059)
GuoLei1990 Sep 19, 2022
c3b2d6f
Fix scene root entity destroy bug (#1062)
GuoLei1990 Sep 19, 2022
d728444
"v0.9.0-alpha.5"
GuoLei1990 Sep 19, 2022
6e127ce
"v0.9.0-alpha.6"
GuoLei1990 Sep 19, 2022
6b8b696
Refactor skybox using infinity matrix (#1048)
yangfengzzz Sep 20, 2022
239f76b
feat: shader add properties get ability (#1060)
GuoLei1990 Sep 21, 2022
8bceb30
v0.8.0-beta.26
GuoLei1990 Sep 21, 2022
5121f7e
Merge branch 'main' into dev/0.9
GuoLei1990 Sep 22, 2022
ae29af0
fix: compile bug
GuoLei1990 Sep 22, 2022
b40f07c
Merge pull request #1068 from GuoLei1990/dev/0.9
GuoLei1990 Sep 22, 2022
d978caa
Add loader params(Texture, Mesh) (#890)
gz65555 Sep 23, 2022
5a5407b
"v0.9.0-alpha.7"
GuoLei1990 Oct 6, 2022
58b5d74
`AnimationClip` support any target (#1009)
luzhuang Oct 10, 2022
b2cf413
Add `findAnimatorState` in `Animator` (#1089)
luzhuang Oct 11, 2022
385485a
Fix get state bug (#1090)
luzhuang Oct 11, 2022
d81d6cb
feat: add get state API (#1091)
luzhuang Oct 11, 2022
7c8ae75
feat: add transition condition
luzhuang Oct 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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", "feat", "fix", "perf", "refactor", "test", "types", "style", "revert"]
["feat", "fix", "build", "ci", "docs", "perf", "refactor", "test", "types", "style", "revert"]
]
}
};
29 changes: 26 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,40 @@ jobs:

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

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install

- uses: pnpm/[email protected]
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"

- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-

- name: Install dependencies
run: pnpm install

- run: npm run ci
- run: npm install codecov
- run: pnpm install codecov -w
- name: Upload coverage to Codecov
run: ./node_modules/.bin/codecov
- run: curl -s https://codecov.io/bash
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ AUTHORS
stats.html
tsconfig.tsbuildinfo
oasis-npm
api
api
pnpm-lock.yaml
yarn.lock
5 changes: 3 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
registry=https://registry.npm.taobao.org
chromedriver_cdnurl=https://npmmirror.com/mirrors/chromedriver/
electron_mirror=http://npm.taobao.org/mirrors/electron/
electron_mirror=http://npm.taobao.org/mirrors/electron/
hoist=true
auto-install-peers=true
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This is a **web-first** and **mobile-first** high-performance real-time interact
- 🔮  **Graphics** - Advanced 2D + 3D graphics engine
- 🏃  **Animation** - Powerful animation system
- 🧱  **Physics** - Powerful and easy-to-use physical features
- 👆  **Input** - Easy-to-use interactive capabilities
- 📑  **Scripts** - Use TypeScript to write logic efficiently

## Usage
Expand Down Expand Up @@ -76,10 +77,15 @@ Make sure to read the [Contributing Guide](.github/HOW_TO_CONTRIBUTE.md) / [贡

## Build

If you don't already have [Node.js v15.0.0+](https://nodejs.org/en/) and NPM, go install them. Then, in the folder where you have cloned the repository, install the build dependencies using npm:
Prerequisites:

- [Node.js v15.0.0+](https://nodejs.org/en/) and NPM (Install by official website)
- [PNPM](https://pnpm.io/) (Install globally by `npm install -g pnpm`)

In the folder where you have cloned the repository, install the build dependencies using pnpm:

```sh
npm run bootstrap
pnpm install
```

Then, to build the source, using npm:
Expand All @@ -97,4 +103,5 @@ npm run b:all


## License

The engine is released under the [MIT](https://opensource.org/licenses/MIT) license. See LICENSE file.
195 changes: 0 additions & 195 deletions jest.config.js

This file was deleted.

12 changes: 0 additions & 12 deletions lerna.json

This file was deleted.

18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
{
"name": "oasis-root",
"name": "oasis-engine-root",
"version": "1.0.0",
"private": true,
"workspaces": [
"packages/*"
],
"scripts": {
"bootstrap": "npm i && lerna bootstrap",
"preinstall": "npx only-allow pnpm",
"test": "cross-env TS_NODE_PROJECT=tsconfig.tests.json floss --path tests -r ts-node/register",
"test-debug": "cross-env TS_NODE_PROJECT=tsconfig.tests.json floss --path tests -r ts-node/register --debug",
"test-cov": "cross-env TS_NODE_PROJECT=tsconfig.tests.json nyc --reporter=lcov floss --path tests -r ts-node/register",
"ci": "lerna bootstrap && npm run b:module && npm run b:types && npm run test-cov",
"ci": "pnpm install && npm run b:module && npm run b:types && npm run test-cov",
"lint": "eslint packages/*/src --ext .ts",
"watch": "cross-env NODE_ENV=development BUILD_TYPE=MODULE rollup -cw -m inline",
"watch:umd": "cross-env NODE_ENV=development BUILD_TYPE=UMD rollup -cw -m inline",
"b:types": "lerna run b:types",
"b:types": "pnpm -r --filter='./packages/*' run b:types",
"b:module": "cross-env BUILD_TYPE=MODULE rollup -c",
"b:umd": "cross-env BUILD_TYPE=UMD rollup -c",
"b:miniprogram": "cross-env BUILD_TYPE=MINI rollup -c",
"b:all": "npm run b:types && cross-env BUILD_TYPE=ALL rollup -c",
"clean": "lerna exec -- rm -rf dist && lerna clean"
"clean": "pnpm -r exec rm -rf dist && pnpm -r exec rm -rf types"
},
"devDependencies": {
"@babel/core": "^7.12.10",
Expand All @@ -38,20 +35,21 @@
"@rollup/plugin-node-resolve": "^11.0.1",
"@rollup/plugin-replace": "^2.3.4",
"@types/chai": "^4.3.1",
"@types/chai-spies": "^1.0.3",
"@types/mocha": "^8.0.0",
"@types/node": "^18.7.16",
"@types/offscreencanvas": "^2019.6.4",
"@typescript-eslint/eslint-plugin": "^4.12.0",
"@typescript-eslint/parser": "^4.12.0",
"babel-loader": "^8.2.2",
"chai": "^4.3.6",
"chai-spies": "^1.0.0",
"cross-env": "^5.2.0",
"electron": "^13",
"eslint": "^7.17.0",
"eslint-config-prettier": "^7.1.0",
"eslint-plugin-prettier": "^3.1.1",
"floss": "^5.0.1",
"husky": "^4.3.7",
"lerna": "^3.22.1",
"lint-staged": "^10.5.3",
"nyc": "^15.1.0",
"prettier": "^2.2.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oasis-engine/core",
"version": "0.8.0-beta.2",
"version": "0.9.0-alpha.7",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -18,9 +18,9 @@
"types/**/*"
],
"dependencies": {
"@oasis-engine/math": "0.8.0-beta.2"
"@oasis-engine/math": "workspace:*"
},
"devDependencies": {
"@oasis-engine/design": "0.8.0-beta.2"
"@oasis-engine/design": "workspace:*"
}
}
Loading