SkinnedMeshRenderer support immediate initialization of rootBone and bones
#1672
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* dev/1.1: (43 commits) fix: skin mesh error (galacean#1675) fix: test error (galacean#1674) test: fix github test (galacean#1669) test: fix ci not work (galacean#1670) glTF support basisu (galacean#1662) fix: `EventDispatcher` static pool bug fix: eventdispatcher bug (galacean#1671) fix: animation event bug (galacean#1666) Fix parse glTF texture wrap & filterMode bug (galacean#1659) Fix text wrap bug (galacean#1644) chore: use strict error msg and type (galacean#1647) Fix text error for set text to "" and set enableWrapping to true (galacean#1634) "v1.0.0-beta.17" Process GLTFBufferParser and GLTFTextureParser pipelines in parallel (galacean#1638) Fix animation clip loader, clip change promise to assetPromise, controller json parse (galacean#1506) fix: the layer is not cloned when the node is cloned (galacean#1636) Fix glTF texture mipmap bug (galacean#1637) "v1.0.0-beta.16" Adjust main light to directional lights first (galacean#1635) Fix `AmbientLight` can't destroy bug (galacean#1633) ...
zhuxudong
reviewed
Aug 3, 2023
| @@ -173,10 +182,10 @@ export class SkinnedMeshRenderer extends MeshRenderer { | |||
| const blendShapeManager = mesh._blendShapeManager; | |||
| blendShapeManager._updateShaderData(shaderData, this); | |||
|
|
|||
| const skin = this._skin; | |||
| if (skin) { | |||
| const bones = this.bones; | |||
zhuxudong
reviewed
Aug 3, 2023
| * @internal | ||
| */ | ||
| private _getEntityByHierarchyPath(rootEntity: Entity, inversePath: number[]): Entity { | ||
| let sprite = rootEntity; |
zhuxudong
reviewed
Aug 3, 2023
Comment on lines
351
to
362
| private _skin: Skin; | ||
|
|
||
| /** | ||
| * @deprecated | ||
| * Skin Object. | ||
| */ | ||
| get skin(): Skin { | ||
| return this._skin; | ||
| } | ||
|
|
||
| set skin(value: Skin) { | ||
| this._skin = value; |
There was a problem hiding this comment.
you should set renderer's bones and rootBond if you want adapter deprecated method
zhuxudong
reviewed
Aug 3, 2023
Comment on lines
325
to
338
| private _getEntityHierarchyPath(rootEntity: Entity, searchEntity: Entity, inversePath: number[]): boolean { | ||
| inversePath.length = 0; | ||
| let entity = searchEntity; | ||
| while (entity !== rootEntity) { | ||
| const parent = entity.parent; | ||
| if (parent) { | ||
| inversePath.push(entity.siblingIndex); | ||
| } else { | ||
| return false; | ||
| } | ||
| entity = parent; | ||
| } | ||
| return true; | ||
| } |
There was a problem hiding this comment.
private _getEntityHierarchyPath(rootEntity: Entity, searchEntity: Entity, inversePath: number[]): boolean {
inversePath.length = 0;
while (searchEntity !== rootEntity) {
if (!searchEntity.parent) {
return false;
}
inversePath.push(searchEntity.siblingIndex);
searchEntity = searchEntity.parent;
}
return true;
}
zhuxudong
reviewed
Aug 3, 2023
| @@ -244,8 +253,25 @@ export class SkinnedMeshRenderer extends MeshRenderer { | |||
| /** | |||
| * @internal | |||
| */ | |||
| override _cloneTo(target: SkinnedMeshRenderer): void { | |||
| super._cloneTo(target); | |||
| override _cloneTo(target: SkinnedMeshRenderer, srcRoot: Entity, targetRoot: Entity): void { | |||
There was a problem hiding this comment.
merge error, if(this._jointEntities) -> if(this._bones)
zhuxudong
reviewed
Aug 3, 2023
Comment on lines
10
to
11
| public joints: string[]; | ||
| public skeleton: string; |
There was a problem hiding this comment.
joints and skeleton are not used now
| skin.skeleton = entities[skeleton].name; | ||
| const rootBone = entities[skeleton]; | ||
| skin.rootBone = rootBone; | ||
| skin.skeleton = rootBone.name; |
| } else { | ||
| const rootBone = this._findSkeletonRootBone(joints, entities); | ||
| if (rootBone) { | ||
| skin.rootBone = rootBone; | ||
| skin.skeleton = rootBone.name; |
tests/src/loader/GLTFLoader.test.ts
Outdated
| @@ -420,5 +420,12 @@ describe("glTF Loader test", function () { | |||
| const renderer = entities[1].getComponent(SkinnedMeshRenderer); | |||
| expect(renderer).to.exist; | |||
| expect(renderer.blendShapeWeights).to.deep.include([1, 1]); | |||
| // expect(renderer.rootBone).to.equal(); | |||
| // expect(renderer.bones).to.equal(); | |||
tests/src/loader/GLTFLoader.test.ts
Outdated
| glTFResource.destroy(); | ||
| expect(glTFResource.materials).to.be.null; | ||
| expect(glTFResource.textures).to.be.null; | ||
| expect(glTFResource.entities).to.be.null; |
…ine into PR/fix-skin-lazy
…ine into PR/fix-skin-lazy
GuoLei1990
changed the title
SkinnedMeshRenderer support immediate initializationSkinnedMeshRenderer support immediate initialization(rootBone, bones)
GuoLei1990
changed the title
SkinnedMeshRenderer support immediate initialization(rootBone, bones)SkinnedMeshRenderer support immediate initialization of rootBone and bones
zhuxudong
approved these changes
Aug 4, 2023
GuoLei1990
added a commit
to GuoLei1990/galacean-engine
that referenced
this pull request
Aug 4, 2023
* dev/1.1: `SkinnedMeshRenderer` support immediate initialization of `rootBone` and `bones` (galacean#1672) Support camera depth texture (galacean#1658)
zhuxudong
added a commit
to zhuxudong/engine
that referenced
this pull request
Aug 17, 2023
* dev/1.1: (66 commits) build: fix pnpm lock file build: fix pnpm-lock file build: fix pnpm-lock file build: fix build error `ResourceManager` support `findResourcesByType` (galacean#1700) fix: memory leak of Transform (galacean#1701) fix: file name error "v1.1.0-alpha.1" test(RenderTarget): fix `getColorTexture` error Fix ktx2 loader can't throw error (galacean#1699) Enhance type for `LoadItem` & `Entity.getComponent` (galacean#1696) types: opt getComponent return type types: fix lint Fix ci test (galacean#1677) Shader Lab support `RenderState` (galacean#1664) feat: enhance type for `LoadItem` & `Entity.getComponent` fix: variable error (galacean#1693) `SkinnedMeshRenderer` support immediate initialization of `rootBone` and `bones` (galacean#1672) Support camera depth texture (galacean#1658) "v1.0.0-beta.18" ... # Conflicts: # packages/loader/src/gltf/parser/GLTFSceneParser.ts # packages/loader/src/gltf/parser/GLTFSkinParser.ts # tests/src/loader/GLTFLoader.test.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
Feat:
rootBoneat anytimeSkinnedMeshRenderersupport custombones