1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-25 16:44:05 +02:00
This commit is contained in:
syuilo
2026-04-23 13:45:50 +09:00
parent 924c517bb5
commit 8d3a5a6503
2 changed files with 18 additions and 7 deletions

View File

@@ -269,11 +269,18 @@ export class ModelManager {
_toMerge.push(fixedMesh);
}
let hasMorphTarget = false;
const toMerge = [] as BABYLON.Mesh[];
for (const mesh of _toMerge) {
const newMesh = mesh.name.endsWith('_realized') ? mesh : mesh.clone(mesh.name + '_bakeMerged', null, true);
newMesh.makeGeometryUnique();
applyMorphTargetsToMesh(newMesh);
if (newMesh.morphTargetManager != null && newMesh.morphTargetManager.numTargets > 0) {
hasMorphTarget = true;
applyMorphTargetsToMesh(newMesh);
newMesh.morphTargetManager?.dispose();
newMesh.morphTargetManager = null;
}
if (newMesh.parent === this.root) {
newMesh.parent = null;
} else {
@@ -306,11 +313,15 @@ export class ModelManager {
const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, false, undefined, false, true);
merged.parent = this.root;
merged.morphTargetManager?.dispose();
merged.morphTargetManager = null;
merged.material.freeze();
if (merged.material instanceof BABYLON.MultiMaterial) {
for (const subMat of merged.material.subMaterials) {
(subMat as BABYLON.PBRMaterial).freeze();
if (!hasMorphTarget) { // https://forum.babylonjs.com/t/is-it-intentional-that-morph-targets-do-not-work-on-meshes-with-frozen-materials/63252
merged.material.freeze();
if (merged.material instanceof BABYLON.MultiMaterial) {
for (const subMat of merged.material.subMaterials) {
(subMat as BABYLON.PBRMaterial).freeze();
}
}
}