mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-20 01:15:29 +02:00
Code Releases Activity

wip

Browse Source
This commit is contained in:
syuilo
2026-04-02 17:06:09 +09:00
parent 7a939dc5b3
commit 913e35442c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/frontend/src/utility/room/engine.ts
View File

@@ -228,15 +228,24 @@ class ModelManager {
const toMerge = [] as BABYLON.Mesh[]; const toMerge = [] as BABYLON.Mesh[];
for (const mesh of _toMerge) { for (const mesh of _toMerge) {
const newMesh = mesh.clone(mesh.name + '_bakeMerged'); const newMesh = mesh.clone(mesh.name + '_bakeMerged');
mesh.makeGeometryUnique(); newMesh.makeGeometryUnique();
applyMorphTargetsToMesh(newMesh); applyMorphTargetsToMesh(newMesh);
if (newMesh.parent === this.root) {
newMesh.parent = null;
} else {
newMesh.setParent(this.root);
//newMesh.bakeCurrentTransformIntoVertices();
newMesh.parent = null;
}
//newMesh.bakeCurrentTransformIntoVertices(); //newMesh.bakeCurrentTransformIntoVertices();
toMerge.push(newMesh); toMerge.push(newMesh);
} }
const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, true, undefined, false, true); const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, true, undefined, false, true);
merged.setParent(this.root); //merged.bakeCurrentTransformIntoVertices();
merged.parent = this.root;
this.bakedMeshes = [merged]; this.bakedMeshes = [merged];
} catch (err) { } catch (err) {

12
packages/frontend/src/utility/room/utility.ts
View File

@@ -532,12 +532,12 @@ export function applyMorphTargetsToMesh(mesh: BABYLON.Mesh) {
// Update the mesh with the morphed positions // Update the mesh with the morphed positions
mesh.setVerticesData(BABYLON.VertexBuffer.PositionKind, finalPositions); mesh.setVerticesData(BABYLON.VertexBuffer.PositionKind, finalPositions);
// Update normals if available //// Update normals if available
const normals = mesh.getVerticesData(BABYLON.VertexBuffer.NormalKind); //const normals = mesh.getVerticesData(BABYLON.VertexBuffer.NormalKind);
if (normals) { //if (normals) {
// For simplicity, we'll just recompute the normals // // For simplicity, we'll just recompute the normals
mesh.createNormals(true); // mesh.createNormals(true);
} //}
// Refresh the mesh // Refresh the mesh
mesh.refreshBoundingInfo(); mesh.refreshBoundingInfo();