Support glTF progress #1835

zhuxudong · 2023-10-24T10:44:15Z

Please check if the PR fulfills these requirements

support #1651

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

codecov · 2023-10-24T10:47:54Z

Codecov Report

Attention: 38 lines in your changes are missing coverage. Please review.

Comparison is base (8484abb) 66.92% compared to head (d1d5d7b) 66.93%.

❗ Current head d1d5d7b differs from pull request most recent head 198b6f7. Consider uploading reports for the commit 198b6f7 to get more accurate results

Files	Patch %	Lines
packages/core/src/asset/request.ts	22.72%	14 Missing and 3 partials ⚠️
packages/loader/src/ktx2/KTX2Loader.ts	0.00%	5 Missing ⚠️
...ackages/loader/src/gltf/parser/GLTFBufferParser.ts	0.00%	4 Missing ⚠️
...er/src/gltf/extensions/GALACEAN_materials_remap.ts	0.00%	3 Missing ⚠️
...s/loader/src/gltf/extensions/KHR_texture_basisu.ts	0.00%	3 Missing ⚠️
packages/loader/src/Texture2DLoader.ts	0.00%	2 Missing ⚠️
...ckages/loader/src/gltf/parser/GLTFTextureParser.ts	0.00%	2 Missing ⚠️
packages/core/src/asset/ResourceManager.ts	0.00%	1 Missing ⚠️
...ackages/loader/src/gltf/parser/GLTFSchemaParser.ts	50.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           dev/1.2    #1835      +/-   ##
===========================================
+ Coverage    66.92%   66.93%   +0.01%     
===========================================
  Files          471      471              
  Lines        23834    23860      +26     
  Branches      3399     3403       +4     
===========================================
+ Hits         15950    15971      +21     
- Misses        6694     6696       +2     
- Partials      1190     1193       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

* dev/1.2: (31 commits) Add sunSource (galacean#1823) Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (galacean#1855) feat: ParticleGenerator support simulationSpeed (galacean#1854) fix: sprite destroy (galacean#1852) "v1.1.0-beta.18" Fix quaternion to euler bug (galacean#1851) Fix ColorOverLifetimeModule mode invalid bug (galacean#1850) fix: no autoplay when set animatorController after enable (galacean#1843) Refactor `glTFResource` (galacean#1831) Fix material destoroy bug (galacean#1847) Fix Sprite can't batch bug caused by material instance (galacean#1830) "v1.1.0-beta.17" fix: glTF animation parse bug (galacean#1845) fix: mesh decoder (galacean#1844) "v1.1.0-beta.16" Fix blendShape crossFade bug (galacean#1841) fix: ignore ambient in 2d template (galacean#1836) "v1.1.0-beta.15" Fix blendShapeAnimation crossFade bug (galacean#1840) fix: ignore case of asset url (galacean#1809) ... # Conflicts: # packages/loader/src/gltf/parser/GLTFParserContext.ts

GuoLei1990

Example crash

…/glTF-progress

packages/loader/src/gltf/parser/GLTFParserContext.ts

GuoLei1990 · 2023-11-08T08:56:50Z

First，You can ignore synchronized things, such as entity
Also you didn’t consider schema（You should never miss any HTTP request）

GuoLei1990 · 2023-11-09T03:14:54Z

glTF: progress = (json[D]+buffer[D]+texture[D+L]+animation[L]+skin[L]+scene[L])/ totalCount
glb: progress = (buffer[D]+texture[L]+animation[L]+skin[L]+scene[L])/ totalCount

# Conflicts: # packages/core/src/asset/AssetPromise.ts # tests/src/core/AssetPromise.test.ts

package.json

packages/design/src/IProgress.ts

packages/loader/src/gltf/parser/GLTFParserContext.ts

packages/design/src/IProgress.ts

package.json

packages/core/src/asset/AssetPromise.ts

packages/loader/src/gltf/parser/GLTFParserContext.ts

GuoLei1990 · 2023-11-20T03:24:01Z

packages/core/src/asset/AssetPromise.ts

@@ -71,29 +74,44 @@ export class AssetPromise<T> implements PromiseLike<T> {
        if (this._state === PromiseState.Pending) {
          resolve(value);
          this._state = PromiseState.Fulfilled;
-          this._onProgressCallback = undefined;
+          this._onProgressItemsCallback = undefined;
+          this._onProgressDetailsCallback = undefined;


To prevent memory leaks?

packages/core/src/asset/AssetPromise.ts

packages/loader/src/gltf/parser/GLTFParserContext.ts

packages/core/src/asset/AssetPromise.ts

packages/core/src/asset/request.ts

feat: support glTF progress

242a962

zhuxudong added the enhancement New feature or request label Oct 24, 2023

zhuxudong added this to the 1.2 milestone Oct 24, 2023

zhuxudong requested a review from GuoLei1990 October 24, 2023 10:44

zhuxudong self-assigned this Oct 24, 2023

zhuxudong changed the base branch from main to dev/1.2 October 24, 2023 10:44

zhuxudong added 3 commits October 25, 2023 16:47

fix: ensure progress only increase before finished

5737fc6

chore: revert bug to another PR

2ef4b60

GuoLei1990 added the glTF label Nov 8, 2023

GuoLei1990 requested a review from gz65555 November 8, 2023 06:46

GuoLei1990 requested changes Nov 8, 2023

View reviewed changes

Merge branch 'dev/1.2' of github.com:galacean/engine into shensi/feat…

5444d19

…/glTF-progress

GuoLei1990 reviewed Nov 8, 2023

View reviewed changes

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

GuoLei1990 approved these changes Nov 8, 2023

View reviewed changes

zhuxudong added 8 commits November 13, 2023 17:03

refactor: use ProgressEvent

4f7bbbf

chore: rename

f11d5f9

refactor: rename

13aa1a3

refactor: add json progress

4450835

feat: add ktx2 progress

2d03774

refactor: use internal IProgress design

f51ebc1

Merge branch 'dev/1.2' into feat/glTF-progress

b71a6dc

# Conflicts: # packages/core/src/asset/AssetPromise.ts # tests/src/core/AssetPromise.test.ts

chore: upload lock.yaml

198b6f7

GuoLei1990 reviewed Nov 16, 2023

View reviewed changes

package.json Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 16, 2023

View reviewed changes

packages/design/src/IProgress.ts Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/design/src/IProgress.ts Outdated Show resolved Hide resolved

zhuxudong added 2 commits November 17, 2023 14:20

refactor: rename

44ec261

refactor: move to core package

e9af33f

gz65555 reviewed Nov 17, 2023

View reviewed changes

package.json Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

chore: change comment

fcea64a

GuoLei1990 reviewed Nov 17, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

gz65555 reviewed Nov 17, 2023

View reviewed changes

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

zhuxudong added 3 commits November 17, 2023 19:54

refactor: use two progress event

c8cb91b

Merge branch 'dev/1.2' into feat/glTF-progress

b512943

chore: remove

d7e1c50

zhuxudong requested review from GuoLei1990 and gz65555 November 17, 2023 12:02

GuoLei1990 reviewed Nov 20, 2023

View reviewed changes

GuoLei1990 requested changes Nov 20, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

GuoLei1990 requested changes Nov 20, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

GuoLei1990 reviewed Nov 20, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

GuoLei1990 requested changes Nov 20, 2023

View reviewed changes

packages/loader/src/gltf/parser/GLTFParserContext.ts Outdated Show resolved Hide resolved

GuoLei1990 requested changes Nov 20, 2023

View reviewed changes

packages/core/src/asset/AssetPromise.ts Outdated Show resolved Hide resolved

zhuxudong added 2 commits November 21, 2023 11:25

refactor: rename

d1d65b5

chore: rename

dc92cb6

GuoLei1990 approved these changes Nov 22, 2023

View reviewed changes

gz65555 reviewed Nov 22, 2023

View reviewed changes

packages/core/src/asset/request.ts Outdated Show resolved Hide resolved

gz65555 reviewed Nov 22, 2023

View reviewed changes

packages/core/src/asset/request.ts Outdated Show resolved Hide resolved

GuoLei1990 and others added 2 commits November 22, 2023 11:43

Update AssetPromise.ts comments

78b43c3

chore: format code

24784be

GuoLei1990 merged commit ff73e6d into galacean:dev/1.2 Nov 22, 2023
5 checks passed

GuoLei1990 linked an issue Nov 22, 2023 that may be closed by this pull request

glTF loader return more detailed progress #1651

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support glTF progress #1835

Support glTF progress #1835

zhuxudong commented Oct 24, 2023

codecov bot commented Oct 24, 2023 •

edited

GuoLei1990 left a comment

GuoLei1990 commented Nov 8, 2023 •

edited

GuoLei1990 commented Nov 9, 2023

GuoLei1990 Nov 20, 2023

Support glTF progress #1835

Support glTF progress #1835

Conversation

zhuxudong commented Oct 24, 2023

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

codecov bot commented Oct 24, 2023 • edited

Codecov Report

GuoLei1990 left a comment

Choose a reason for hiding this comment

GuoLei1990 commented Nov 8, 2023 • edited

GuoLei1990 commented Nov 9, 2023

GuoLei1990 Nov 20, 2023

Choose a reason for hiding this comment

codecov bot commented Oct 24, 2023 •

edited

GuoLei1990 commented Nov 8, 2023 •

edited