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

wip

Browse Source
This commit is contained in:
syuilo
2026-04-03 17:21:21 +09:00
parent df092dd120
commit 3873eb0cd7
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,6 +149,7 @@ type GetOptionsSchemaValues<T extends OptionsSchema> = {
class ModelManager { class ModelManager {
public root: BABYLON.Mesh; public root: BABYLON.Mesh;
public bakedCallback: (() => void) | null = null; public bakedCallback: (() => void) | null = null;
public bakeExcludeMeshes: BABYLON.Mesh[] = [];
private originalMeshes: BABYLON.Mesh[] = []; private originalMeshes: BABYLON.Mesh[] = [];
private bakedMeshes: BABYLON.Mesh[] = []; private bakedMeshes: BABYLON.Mesh[] = [];
@@ -194,7 +195,7 @@ class ModelManager {
} }
this.bakedMeshes = []; this.bakedMeshes = [];
const childMeshes = this.root.getChildMeshes().filter(m => m.isVisible && !m.name.includes('__TOP__') && !m.name.includes('__SIDE__') && !m.name.includes('__COLLISION__')); const childMeshes = this.root.getChildMeshes().filter(m => !this.bakeExcludeMeshes.some(x => x === m) && m.isVisible && !m.name.includes('__TOP__') && !m.name.includes('__SIDE__') && !m.name.includes('__COLLISION__'));
const _toMerge = [] as BABYLON.Mesh[]; const _toMerge = [] as BABYLON.Mesh[];
for (const mesh of childMeshes) { for (const mesh of childMeshes) {
@@ -246,7 +247,7 @@ class ModelManager {
this.bakedMeshes = [merged]; this.bakedMeshes = [merged];
this.bakedCallback?.(this.bakedMeshes); this.bakedCallback?.([...this.bakedMeshes, ...this.bakeExcludeMeshes]);
} catch (err) { } catch (err) {
console.error('Failed to bake mesh for object', this.root.metadata?.objectType, err); console.error('Failed to bake mesh for object', this.root.metadata?.objectType, err);
} }
@@ -1051,6 +1052,8 @@ export class RoomEngine {
} }
} }
} }
this.scene.addMesh(mesh);
} }
}); });
@@ -1573,7 +1576,7 @@ export class RoomObjectPreviewEngine {
const root = new BABYLON.Mesh(`object_${args.type}`, this.scene); const root = new BABYLON.Mesh(`object_${args.type}`, this.scene);
const loaderResult = await BABYLON.ImportMeshAsync(`/client-assets/room/objects/${camelToKebab(args.type)}/${camelToKebab(args.type)}.glb`, this.scene); const loaderResult = await BABYLON.LoadAssetContainerAsync(`/client-assets/room/objects/${camelToKebab(args.type)}/${camelToKebab(args.type)}.glb`, this.scene);
// babylonによって自動で追加される右手系変換用ノード // babylonによって自動で追加される右手系変換用ノード
const subRoot = loaderResult.meshes[0]; const subRoot = loaderResult.meshes[0];
@@ -1628,6 +1631,8 @@ export class RoomObjectPreviewEngine {
} }
} }
} }
this.scene.addMesh(mesh);
} }
}), }),
}); });

4
packages/frontend/src/utility/room/objects/ceilingFanLight.ts
View File

@@ -17,9 +17,11 @@ export const ceilingFanLight = defineObject({
receiveShadows: false, receiveShadows: false,
castShadows: false, castShadows: false,
createInstance: ({ scene, model }) => { createInstance: ({ scene, model }) => {
const rotor = model.findMesh('Rotor');
model.bakeExcludeMeshes = [rotor, rotor.parent, ...rotor.getChildMeshes()];
return { return {
onInited: () => { onInited: () => {
const rotor = model.findMesh('Rotor');
rotor.rotation = rotor.rotationQuaternion != null ? rotor.rotationQuaternion.toEulerAngles() : rotor.rotation; rotor.rotation = rotor.rotationQuaternion != null ? rotor.rotationQuaternion.toEulerAngles() : rotor.rotation;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE); const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([ anim.setKeys([