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

Merge origin/main into origin/dev #32

Merged
merged 44 commits into from
Dec 12, 2023
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3cd9c82
feat: 支持直接解析和播放预合成,统一数学库
yiiqii Nov 27, 2023
064e6b9
build: 支持 CHANGELOG 生成脚本
yiiqii Nov 27, 2023
c5088a8
Merge pull request #4 from galacean/build/github-changelog-print
yiiqii Nov 27, 2023
8672574
feat: 完善预合成元素的 transform 设置
RGCHN Nov 27, 2023
9318300
fix: 修复拖拽问题
liuxi150 Nov 28, 2023
af5647f
fix: 增加预合成元素的id处理
RGCHN Nov 28, 2023
92995c6
Merge pull request #5 from galacean/fix/pre-comp
yiiqii Nov 28, 2023
5a450ee
Merge pull request #8 from galacean/fix/drag
yiiqii Nov 28, 2023
0660b6b
fix: 修复预合成上碰撞测试问题
RGCHN Nov 29, 2023
3977d73
feat: add refId to CompVFXItem to recognize original id
RGCHN Nov 29, 2023
196f326
perf: 优化代码
yiiqii Nov 30, 2023
db01450
Merge pull request #9 from galacean/fix/pre-comp
yiiqii Nov 30, 2023
4d800e5
fix: merge issue
yiiqii Dec 4, 2023
bfda65e
Merge pull request #20 from galacean/fix/merge-issue
yiiqii Dec 4, 2023
8f684d5
chore: auto tigger bot review for specific branches
zheeeng Dec 6, 2023
7771e94
Merge pull request #23 from galacean/chore/config-coderabbit
yiiqii Dec 7, 2023
0df5ccb
fix: correct the mean of visible
RGCHN Dec 6, 2023
dd10e77
fix: destroyed spine item is visible when clicked in editor
RGCHN Dec 6, 2023
4a5cffd
feat: add setRotation、setScale and setPosition method in class Compos…
RGCHN Dec 6, 2023
54cd071
fix: setScale error in spine item
RGCHN Dec 6, 2023
4ae460f
chore: detail annotation about setPosition method
RGCHN Dec 6, 2023
a4e79b0
chore: modify annotation
RGCHN Dec 7, 2023
aae672e
Merge pull request #25 from galacean/fix/visible1
yiiqii Dec 7, 2023
be3a501
test: fix case test problem
liuxi150 Dec 7, 2023
7a48aee
test: fix case test problem
liuxi150 Dec 7, 2023
26ad523
test: fix spine test case problem
RGCHN Dec 7, 2023
2830f9c
test: update case test time stamp
liuxi150 Dec 7, 2023
4180437
test: delete useless spine case
RGCHN Dec 7, 2023
ebe258e
test: fix sprite unit test case
RGCHN Dec 7, 2023
37f07c9
test: fix unit test problem
liuxi150 Dec 7, 2023
2c4be05
Merge branch 'test/fix-case' of https://github.com/galacean/effects-r…
liuxi150 Dec 7, 2023
3985d94
fix: solve pre composition problem in 3D plugin
liuxi150 Dec 7, 2023
02c949b
Merge pull request #27 from galacean/fix/3d-pre
yiiqii Dec 7, 2023
7ffc379
Merge pull request #26 from galacean/test/fix-case
yiiqii Dec 7, 2023
f22c633
test: update plugin unit test
liuxi150 Dec 8, 2023
38683cb
Merge pull request #28 from galacean/test/fix-test
yiiqii Dec 8, 2023
c0c487b
build: add vite legacy polyfill
yiiqii Dec 9, 2023
667d65d
Merge pull request #29 from galacean/build/add-legacy-polyfill
yiiqii Dec 11, 2023
6631f66
Merge pull request #30 from galacean/feat/1.1
yiiqii Dec 11, 2023
ffac305
docs: changelog 1.1.0
yiiqii Dec 11, 2023
2322e9f
docs: update changelog
yiiqii Dec 11, 2023
7c523f0
Merge pull request #31 from galacean/docs/changelog-1.1.0
yiiqii Dec 11, 2023
e84718c
Update packages/effects-core/src/plugins/text/text-vfx-item.ts
yiiqii Dec 12, 2023
8e9ddac
Update packages/effects-core/src/plugins/text/text-vfx-item.ts
yiiqii Dec 12, 2023
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
1 change: 1 addition & 0 deletions packages/effects-core/src/plugins/text/text-vfx-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export class TextVFXItem extends VFXItem<TextItem> {
override onLifetimeBegin (composition: Composition, content: TextItem) {
content.active = true;
this.content?.mesh!.setItems([this.content]);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
this.content?.mesh!.setItems([this.content]);

this.content?.mesh?.setItems([this.content]);
this.content.updateTexture();
}

Expand Down