mirrors/misskey
2
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-06-25 17:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update utility.ts

Browse source
This commit is contained in:
syuilo 2026-05-18 10:43:46 +09:00
commit dc6ac2529f
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/frontend/src/world/room/utility.ts
View file

@ -182,7 +182,7 @@ export function initTv(scene: BABYLON.Scene, screenMesh: BABYLON.Mesh, timer: Ti
};
}
export function findMaterial(rootMesh: BABYLON.AbstractMesh, keyword: string, allowMultiMaterial = false): BABYLON.PBRMaterial {
export function findMaterial(rootMesh: BABYLON.AbstractMesh | BABYLON.TransformNode, keyword: string, allowMultiMaterial = false): BABYLON.PBRMaterial {
for (const m of rootMesh.getChildMeshes()) {
if (m.material == null) continue;
if (m.material instanceof BABYLON.MultiMaterial) {
@ -208,7 +208,7 @@ export function findMaterial(rootMesh: BABYLON.AbstractMesh, keyword: string, al
}
export class ModelManager {
public root: BABYLON.Mesh;
public root: BABYLON.TransformNode;
public bakedCallback: ((meshes: (BABYLON.Mesh | BABYLON.AbstractMesh)[]) => void) | null = null;
public updatedCallback: (() => void) | null = null;
public bakeExcludeMeshes: BABYLON.Mesh[] = [];
@ -343,12 +343,13 @@ export class ModelManager {
//merged.morphTargetManager = null;
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();
}
}
// instancedMeshを持つオブジェクトに対してfreezeするとアニメーションさせたあとunbakeしたとき(mesh.setEnabled(true)したとき)エラーが出る
//merged.material!.freeze();
//if (merged.material instanceof BABYLON.MultiMaterial) {
// for (const subMat of merged.material.subMaterials) {
// (subMat as BABYLON.PBRMaterial).freeze();
// }
//}
}
merged.freezeWorldMatrix();