mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-06-04 00:44:22 +02:00
Code Releases Activity

morph

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/world/room/objects/randomBooks.ts
View File

@@ -50,6 +50,7 @@ export const randomBooks = defineObject({
placement: 'top', placement: 'top',
hasCollisions: false, hasCollisions: false,
hasTexture: true, hasTexture: true,
canPreMeshesMerging: false,
createInstance: ({ options, model, scene, id }) => { createInstance: ({ options, model, scene, id }) => {
const bodyMesh = model.findMesh('__X_BODY__'); const bodyMesh = model.findMesh('__X_BODY__');
const tex = new BABYLON.Texture('/client-assets/room/objects/random-books/texture.png', scene, { const tex = new BABYLON.Texture('/client-assets/room/objects/random-books/texture.png', scene, {
@@ -57,6 +58,7 @@ export const randomBooks = defineObject({
samplingMode: BABYLON.Texture.NEAREST_SAMPLINGMODE, samplingMode: BABYLON.Texture.NEAREST_SAMPLINGMODE,
}); });
bodyMesh.material.albedoTexture = tex; bodyMesh.material.albedoTexture = tex;
bodyMesh.isVisible = false;
const TEXTURE_DIVISION = 8; const TEXTURE_DIVISION = 8;
let bookMeshes: BABYLON.Mesh[] = []; let bookMeshes: BABYLON.Mesh[] = [];
@@ -127,8 +129,6 @@ export const randomBooks = defineObject({
} }
} }
bodyMesh.isVisible = false;
model.updated(); model.updated();
}; };

11
packages/frontend/src/world/room/utility.ts
View File

@@ -269,11 +269,18 @@ export class ModelManager {
_toMerge.push(fixedMesh); _toMerge.push(fixedMesh);
} }
let hasMorphTarget = false;
const toMerge = [] as BABYLON.Mesh[]; const toMerge = [] as BABYLON.Mesh[];
for (const mesh of _toMerge) { for (const mesh of _toMerge) {
const newMesh = mesh.name.endsWith('_realized') ? mesh : mesh.clone(mesh.name + '_bakeMerged', null, true); const newMesh = mesh.name.endsWith('_realized') ? mesh : mesh.clone(mesh.name + '_bakeMerged', null, true);
newMesh.makeGeometryUnique(); newMesh.makeGeometryUnique();
if (newMesh.morphTargetManager != null && newMesh.morphTargetManager.numTargets > 0) {
hasMorphTarget = true;
applyMorphTargetsToMesh(newMesh); applyMorphTargetsToMesh(newMesh);
newMesh.morphTargetManager?.dispose();
newMesh.morphTargetManager = null;
}
if (newMesh.parent === this.root) { if (newMesh.parent === this.root) {
newMesh.parent = null; newMesh.parent = null;
} else { } else {
@@ -306,13 +313,17 @@ export class ModelManager {
const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, false, undefined, false, true); const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, false, undefined, false, true);
merged.parent = this.root; merged.parent = this.root;
merged.morphTargetManager?.dispose();
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(); merged.material.freeze();
if (merged.material instanceof BABYLON.MultiMaterial) { if (merged.material instanceof BABYLON.MultiMaterial) {
for (const subMat of merged.material.subMaterials) { for (const subMat of merged.material.subMaterials) {
(subMat as BABYLON.PBRMaterial).freeze(); (subMat as BABYLON.PBRMaterial).freeze();
} }
} }
}
merged.freezeWorldMatrix(); merged.freezeWorldMatrix();
merged.metadata = { ...this.root.metadata }; merged.metadata = { ...this.root.metadata };