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.

Sign up for GitHub

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

Fix glTF SkinnedMeshRenderer default local bounds #1405

Merged
merged 2 commits into from
Mar 14, 2023
Merged

Fix glTF SkinnedMeshRenderer default local bounds #1405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a832f
fix: glTF SkinnedMeshRenderer default local bounds
GuoLei1990 Mar 13, 2023
ea8f68d
refactor: opt code
GuoLei1990 Mar 13, 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
44 changes: 34 additions & 10 deletions packages/core/src/mesh/SkinnedMeshRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,17 +276,14 @@ export class SkinnedMeshRenderer extends MeshRenderer {
} else {
// Root bone is not in joints list, we can only compute approximate inverse bind matrix
// Average all root bone's children inverse bind matrix
let subRootBoneCount = 0;
const approximateBindMatrix = new Matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
const inverseBindMatrices = skin.inverseBindMatrices;
const rootBoneChildren = rootBone.children;
for (let i = 0; i < jointCount; i++) {
const index = jointEntities.indexOf(rootBoneChildren[i]);
if (index !== -1) {
Matrix.add(approximateBindMatrix, inverseBindMatrices[index], approximateBindMatrix);
subRootBoneCount++;
}
}
let subRootBoneCount = this._computeApproximateBindMatrix(
jointEntities,
skin.inverseBindMatrices,
rootBone,
approximateBindMatrix
);

if (subRootBoneCount !== 0) {
Matrix.multiplyScalar(approximateBindMatrix, 1.0 / subRootBoneCount, approximateBindMatrix);
BoundingBox.transform(this._mesh.bounds, approximateBindMatrix, this._localBounds);
Expand All @@ -304,6 +301,33 @@ export class SkinnedMeshRenderer extends MeshRenderer {
}
}

private _computeApproximateBindMatrix(
jointEntities: Entity[],
inverseBindMatrices: Matrix[],
rootEntity: Entity,
approximateBindMatrix: Matrix
): number {
let subRootBoneCount = 0;
const children = rootEntity.children;
for (let i = 0, n = children.length; i < n; i++) {
const rootChild = children[i];
const index = jointEntities.indexOf(rootChild);
if (index !== -1) {
Matrix.add(approximateBindMatrix, inverseBindMatrices[index], approximateBindMatrix);
subRootBoneCount++;
} else {
subRootBoneCount += this._computeApproximateBindMatrix(
jointEntities,
inverseBindMatrices,
rootChild,
approximateBindMatrix
);
}
}

return subRootBoneCount;
}

private _findByEntityName(rootEntity: Entity, name: string): Entity {
if (!rootEntity) {
return null;
Expand Down