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

Animator editor #463

Merged
merged 201 commits into from
Aug 31, 2021
Merged
Changes from all commits
Commits
Show all changes
201 commits
Select commit Hold shift + click to select a range
358f344
refactor: refactor animator #35
luzhuang Mar 2, 2021
4b589db
refactor: animator
luzhuang Apr 6, 2021
75a312c
refactor: animator
luzhuang Apr 6, 2021
61c80a4
refactor: animator
luzhuang Apr 7, 2021
171340a
refactor: animator
luzhuang Apr 21, 2021
aa3d5b6
refactor: animator
luzhuang Apr 21, 2021
fb61ae4
style: rm package-lock.json
luzhuang Apr 21, 2021
d6c3e5e
refactor: animator
luzhuang Apr 21, 2021
c405551
refactor: animator
luzhuang Apr 21, 2021
1e10cbc
refactor: animator
luzhuang Apr 21, 2021
dbc8fc0
refactor: animator
luzhuang Apr 21, 2021
5f8806d
refactor: animator
luzhuang Apr 22, 2021
83d844f
refactor: animator, add comment
luzhuang Apr 22, 2021
5717def
style: fix code style
luzhuang Apr 24, 2021
d7cd49b
refactor: animator merge new code
luzhuang Apr 24, 2021
1edcb24
style: update code style
luzhuang Apr 24, 2021
b41c1b4
style: fix code style
luzhuang Apr 25, 2021
060b3b6
style: fix code style
luzhuang Apr 25, 2021
5474fc1
style: animator优化
luzhuang May 25, 2021
40e614c
feat: add comment
luzhuang May 25, 2021
bf51de2
feat: merge gltf
luzhuang May 25, 2021
c5edefa
feat: remove recorderMode
luzhuang May 26, 2021
8c82081
refactor: revert `SkinnedMeshRenderer`
GuoLei1990 May 26, 2021
b9caaad
Merge branch 'dev/0.4' of https://github.com/oasis-engine/engine into…
GuoLei1990 May 28, 2021
8fb0270
Merge branch 'dev/0.4' into Animator
GuoLei1990 May 31, 2021
46edbd9
fix: enum name
GuoLei1990 May 31, 2021
194b2b9
Merge pull request #1 from GuoLei1990/Animator
luzhuang May 31, 2021
4a7b58f
feat: merge dev/0.4
luzhuang May 31, 2021
71a451b
feat: merge dev/0.4
luzhuang May 31, 2021
785d6ff
feat: add animator
luzhuang May 31, 2021
c41d93d
feat: fix to run
luzhuang May 31, 2021
dfd481d
refactor: opt code
GuoLei1990 Jun 1, 2021
f478b4a
refactor: opt code
GuoLei1990 Jun 1, 2021
b6ace20
refatcor: opt code
GuoLei1990 Jun 1, 2021
beda108
refactor: opt code
GuoLei1990 Jun 1, 2021
fac2299
Merge pull request #2 from GuoLei1990/Animator
luzhuang Jun 1, 2021
3931aed
refactor: opt code
luzhuang Jun 1, 2021
7ded764
Merge branch 'animator' of github.com:luzhuang/engine into animator
luzhuang Jun 1, 2021
4ca95b0
refactor: opt code
luzhuang Jun 2, 2021
43276a4
refactor: opt code
luzhuang Jun 2, 2021
7f729fd
refactor: opt code
GuoLei1990 Jun 2, 2021
94f2a13
refactor: opt code
GuoLei1990 Jun 2, 2021
1aeb483
Merge pull request #3 from GuoLei1990/Animator
luzhuang Jun 2, 2021
feff7ae
refactor: opt code
luzhuang Jun 2, 2021
bb5a292
refactor: opt code
luzhuang Jun 2, 2021
271a74a
refactor: use new addChannel api
Jun 2, 2021
2c019e4
style: format code
Jun 2, 2021
c62603b
feat: opt code
luzhuang Jun 2, 2021
5ae17dd
Merge pull request #4 from zhuxudong/animator
luzhuang Jun 2, 2021
4f733a8
Merge branch 'animator' of github.com:luzhuang/engine into animator
luzhuang Jun 2, 2021
a70be49
feat: merge gltf animation parser
luzhuang Jun 2, 2021
c350e22
feat: opt code
luzhuang Jun 2, 2021
047beb0
fix:opt code
GuoLei1990 Jun 2, 2021
e0f3496
refator: opt code
GuoLei1990 Jun 2, 2021
aa0c099
refactor: opt code
GuoLei1990 Jun 2, 2021
fe16bdf
Merge pull request #5 from GuoLei1990/Animator
luzhuang Jun 3, 2021
d8fa371
refactor: clear imports
GuoLei1990 Jun 3, 2021
edd13a7
refactor:fix bug
GuoLei1990 Jun 3, 2021
0be4688
Merge pull request #6 from GuoLei1990/Animator
luzhuang Jun 3, 2021
7d1346f
refactor: opt code
GuoLei1990 Jun 3, 2021
72ddb00
refactor: opt code
GuoLei1990 Jun 3, 2021
407a01a
Merge pull request #7 from GuoLei1990/Animator
luzhuang Jun 3, 2021
dbd9759
feat: fix tsc
luzhuang Jun 3, 2021
a4afb03
Merge branch 'animator' of github.com:luzhuang/engine into animator
luzhuang Jun 3, 2021
e4d3576
feat: opt code
luzhuang Jun 6, 2021
366ac64
feat: opt crossfade performance
luzhuang Jun 6, 2021
3d0244b
feat: opt crossfade performance
luzhuang Jun 6, 2021
92a4f61
feat: opt crossfade
luzhuang Jun 6, 2021
c236080
feat: opt crossfade
luzhuang Jun 6, 2021
fdab1df
refactor: opt code
GuoLei1990 Jun 7, 2021
74de55f
refactor: opt code
GuoLei1990 Jun 7, 2021
e262333
refactor: opt code
GuoLei1990 Jun 7, 2021
b2892f5
refactor: opt code
GuoLei1990 Jun 7, 2021
902df06
Merge pull request #10 from GuoLei1990/Animator
luzhuang Jun 7, 2021
4585c12
feat: opt mergedCurveIndexList
luzhuang Jun 7, 2021
ff24537
feat: opt mergedCurveIndexList
luzhuang Jun 7, 2021
75f0f78
feat: add revert
luzhuang Jun 7, 2021
55f5c53
refactor: opt code
GuoLei1990 Jun 8, 2021
1e4eb48
refactor: opt code
GuoLei1990 Jun 8, 2021
87b59fb
Merge pull request #11 from GuoLei1990/Animator
luzhuang Jun 8, 2021
8d7e92a
refactor: opt code
GuoLei1990 Jun 8, 2021
93039a1
refactor: opt code
GuoLei1990 Jun 8, 2021
811188f
feat: opt corssfade from pose
luzhuang Jun 8, 2021
2031f5f
feat: resolve conflict from cm
luzhuang Jun 8, 2021
cf6163c
Merge branch 'animator' into Animator
luzhuang Jun 8, 2021
51174b6
Merge pull request #12 from GuoLei1990/Animator
luzhuang Jun 8, 2021
af1b5db
refactor: opt code
GuoLei1990 Jun 8, 2021
9b93b75
Merge pull request #13 from GuoLei1990/Animator
luzhuang Jun 8, 2021
7e46ef1
feat: fix type
luzhuang Jun 8, 2021
4c720ca
fix: fix additive
luzhuang Jun 9, 2021
002f52c
refactor: opt code
GuoLei1990 Jun 9, 2021
48d6c66
refactor: opt struct of Animation Node data
GuoLei1990 Jun 9, 2021
554a89c
feat: fix comment
luzhuang Jun 9, 2021
2a72642
feat: clear import
luzhuang Jun 9, 2021
8777e21
refactor: add CM
GuoLei1990 Jun 9, 2021
b301357
Merge branch 'animator' of https://github.com/luzhuang/engine into An…
GuoLei1990 Jun 9, 2021
0e75d2b
refactor: opt code
GuoLei1990 Jun 9, 2021
61ade7b
refactor: opt crossFade code
GuoLei1990 Jun 9, 2021
3c02717
refactor: opt code
GuoLei1990 Jun 9, 2021
653534e
refactor: opt code
GuoLei1990 Jun 9, 2021
dba5873
refactor: opt Animator code
GuoLei1990 Jun 9, 2021
40530f9
refactor: opt code
GuoLei1990 Jun 9, 2021
11770e7
Delete package-lock.json
luzhuang Jun 10, 2021
80f3bc6
Merge pull request #14 from GuoLei1990/Animator
luzhuang Jun 15, 2021
7a01753
Merge branch 'dev/0.5' into animator
luzhuang Jun 15, 2021
0722227
Merge branch 'dev/0.5' into animator
luzhuang Jun 21, 2021
6e12969
refactor: opt code
GuoLei1990 Jun 22, 2021
5ad86c6
refactor: opt code
GuoLei1990 Jun 22, 2021
a06c12c
refactor: improve play API
GuoLei1990 Jun 22, 2021
8934a0a
refactor: opt code
GuoLei1990 Jun 22, 2021
8c06ef2
refactor: opt code
GuoLei1990 Jun 22, 2021
18be5f8
refactor: fix code
GuoLei1990 Jun 22, 2021
1943a8e
refactor: opt code
GuoLei1990 Jun 22, 2021
7686684
refactor: move internal class to internal folder
GuoLei1990 Jun 22, 2021
178d50d
refactor: remove generic
GuoLei1990 Jun 22, 2021
efcd7e9
refactor: save code
GuoLei1990 Jun 22, 2021
b405cdc
refactor: opt code
GuoLei1990 Jun 23, 2021
0b5f77f
refactor: opt Layer update
GuoLei1990 Jun 23, 2021
6992116
refactor: opt code
GuoLei1990 Jun 23, 2021
467d3f7
refactor: reduce GC
GuoLei1990 Jun 23, 2021
e68b7ec
refactor: opt code
GuoLei1990 Jun 23, 2021
8c09dac
refactor: opt code
GuoLei1990 Jun 23, 2021
46b7eac
refactor: opt code
GuoLei1990 Jun 23, 2021
493fc2a
refactor: opt code
GuoLei1990 Jun 23, 2021
d52fe5f
refactor: opt code
GuoLei1990 Jun 23, 2021
f3ffb18
refactor: opt code
GuoLei1990 Jun 23, 2021
745b0b8
refactor: opt code
GuoLei1990 Jun 24, 2021
db26d1b
refactor: opt code
GuoLei1990 Jun 24, 2021
8bcec4a
refactor: remove playState
GuoLei1990 Jun 24, 2021
cd9bbca
refactor: solve CM
GuoLei1990 Jun 24, 2021
6471e7d
refactor: opt code
GuoLei1990 Jun 24, 2021
dc343d1
refactor: opt code
GuoLei1990 Jun 24, 2021
7f238de
refactor: opt code
GuoLei1990 Jun 24, 2021
4c2be8c
refactor: opt code
GuoLei1990 Jun 25, 2021
a47743e
refactor: opt code
GuoLei1990 Jun 25, 2021
2210171
refactor: opt code
GuoLei1990 Jun 25, 2021
3d8de38
refactor: add layer opt
GuoLei1990 Jun 28, 2021
9903879
refactor: opt code
GuoLei1990 Jun 28, 2021
7f07b69
refactor: opt code
GuoLei1990 Jun 28, 2021
135fefb
refactor: opt code
GuoLei1990 Jun 28, 2021
cc245b9
refactor: opt code
GuoLei1990 Jun 28, 2021
368a511
refactor: opt interface design
GuoLei1990 Jun 28, 2021
c778f7f
refactor: opt code
GuoLei1990 Jun 28, 2021
3fcbf94
refactor: opt code
GuoLei1990 Jun 28, 2021
f116fbe
refactor: clear imports
GuoLei1990 Jun 28, 2021
0c33273
Merge commit 'df05fd7c6cb3dca00870e8e239c167647c22c161' into Animator
GuoLei1990 Jun 29, 2021
2c4b0f9
Merge branch 'animator' into Animator
luzhuang Jun 29, 2021
ae3958a
Merge pull request #16 from GuoLei1990/Animator
luzhuang Jun 29, 2021
b1670ed
feat: add animator-event
luzhuang Jul 6, 2021
e9cd171
feat: add animator-event
luzhuang Jul 6, 2021
2a8144d
feat: opt event code
luzhuang Jul 8, 2021
3878890
feat: add animator-event
luzhuang Jul 6, 2021
f5d66d2
Merge branch 'animator-event' of github.com:luzhuang/engine into anim…
luzhuang Jul 8, 2021
cfc178e
feat: opt code
luzhuang Jul 8, 2021
2dec842
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
luzhuang Jul 8, 2021
30ca171
feat: merge oasis dev/0,5
luzhuang Jul 8, 2021
7ff7713
feat: opt code
luzhuang Jul 14, 2021
10ef7c3
refactor: opt code
GuoLei1990 Jul 15, 2021
fa7ac11
refactor: opt code
GuoLei1990 Jul 15, 2021
ede5c99
refactor: opt code
GuoLei1990 Jul 15, 2021
13d0960
refactor: clear imports
GuoLei1990 Jul 15, 2021
9e8cc06
Merge pull request #17 from GuoLei1990/AnimatorEvent
luzhuang Jul 15, 2021
189b632
feat: opt code
luzhuang Jul 15, 2021
24f2cf9
feat: opt code
luzhuang Jul 15, 2021
9887df4
feat: opt code
luzhuang Jul 15, 2021
3841c90
feat: opt code
luzhuang Jul 15, 2021
1c694f3
feat: opt code
luzhuang Jul 15, 2021
c493f10
feat: opt code
luzhuang Jul 15, 2021
ccfecdb
feat: opt code
luzhuang Jul 15, 2021
0c8c29a
feat: opt code
luzhuang Jul 15, 2021
97a0619
refactor: opt code
GuoLei1990 Jul 15, 2021
d5e7a9d
refactor: opt code
GuoLei1990 Jul 15, 2021
bde2ba8
Merge pull request #18 from GuoLei1990/AnimatorEvent
luzhuang Jul 16, 2021
18dd657
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
luzhuang Jul 16, 2021
bd06f9f
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
luzhuang Aug 21, 2021
5a3099e
feat: adapt to editor
luzhuang Aug 25, 2021
5f424ae
feat: adapt to editor
luzhuang Aug 25, 2021
59d8d1a
feat: adapt to editor
luzhuang Aug 25, 2021
9776c84
feat: adapt to editor
luzhuang Aug 25, 2021
44e4a27
feat: adapt to editor
luzhuang Aug 25, 2021
aae3069
feat: adapt to editor
luzhuang Aug 25, 2021
2668aa9
refactor: opt animator
GuoLei1990 Aug 25, 2021
7332d5e
refactor: opt code
GuoLei1990 Aug 25, 2021
8eca418
Merge branch 'animator-editor' of https://github.com/luzhuang/engine …
GuoLei1990 Aug 25, 2021
e66d091
feat: update
luzhuang Aug 25, 2021
53caa5b
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
luzhuang Aug 25, 2021
041cc00
refactor: opt code
GuoLei1990 Aug 25, 2021
b2bca01
fix: gltf no animation bug
luzhuang Aug 25, 2021
c3ab186
refactor: opt code
GuoLei1990 Aug 25, 2021
c119f17
refactor: oopt code
GuoLei1990 Aug 25, 2021
1b3cb33
refactor: opt code
GuoLei1990 Aug 25, 2021
8791547
refactor: opt code
GuoLei1990 Aug 25, 2021
9620ca2
Merge branch 'animator-editor' of https://github.com/luzhuang/engine …
GuoLei1990 Aug 25, 2021
0ec3784
Merge pull request #19 from GuoLei1990/AnimatorEditor
luzhuang Aug 25, 2021
ffb1efc
feat: opt animator editor
luzhuang Aug 26, 2021
97f4b8c
feat: opt animator editor
luzhuang Aug 26, 2021
0aeb48e
feat: opt animator editor
luzhuang Aug 30, 2021
928c8be
fix: bugfix
luzhuang Aug 30, 2021
34a9e64
feat: remove log
luzhuang Aug 30, 2021
f271f36
feat: remove log
luzhuang Aug 31, 2021
7d2f2fd
feat: merge dev0.5
luzhuang Aug 31, 2021
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
Original file line number Diff line number Diff line change
@@ -55,7 +55,6 @@ export class AnimationClipResource extends SchemaResource {
event.parameter = eventData.parameter;
assetObj.addEvent(event);
}
console.log("AnimationClipResource load", assetConfig, assetObj);
this._resource = assetObj;
this.setMeta();
resolve(this);
@@ -70,13 +69,11 @@ export class AnimationClipResource extends SchemaResource {
let loadPromise;
if (assetConfig.resource instanceof AnimationClip) {
loadPromise = new Promise((resolve) => {
console.log("AnimationClipResource loadWithAttachedResources AnimationClip");
this._resource = assetConfig.resource;
this.setMeta();
resolve(this);
});
} else if (assetConfig.props) {
console.log("AnimationClipResource loadWithAttachedResources props");
loadPromise = this.load(resourceManager, assetConfig);
} else {
reject("Load AnimationClip Error");
@@ -120,7 +117,6 @@ export class AnimationClipResource extends SchemaResource {
};
});
result.events = clip.events;
console.log("AnimationClipResource getProps", this.resource, result);
return result;
}