diff --git a/packages/frontend-misskey-world-engine/src/engine.ts b/packages/frontend-misskey-world-engine/src/engine.ts index f341b8eb39..13c8aac448 100644 --- a/packages/frontend-misskey-world-engine/src/engine.ts +++ b/packages/frontend-misskey-world-engine/src/engine.ts @@ -541,7 +541,7 @@ export class WorldEngine extends EngineBase<{ this.fixedCamera.position = new BABYLON.Vector3(0, cm(120), 0); this.fixedCamera.rotation = new BABYLON.Vector3(0, 0, 0); this.scene.activeCamera = this.fixedCamera; - this.selectFuniture(null); + this.selectFurniture(null); } public standUp() { diff --git a/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts b/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts index 6ae5bd60c8..ee6df6da2e 100644 --- a/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts +++ b/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts @@ -9,7 +9,7 @@ import { scaleMorph, Timer } from '../utility.js'; import { convertRawOptions, type ConvertedOptions, type RawOptions } from '../mono.js'; import { getFurnitureDef } from './furniture-defs.js'; import { ModelManager, SYSTEM_MESH_NAMES } from './utility.js'; -import type { RoomFunitureInstance } from './furniture.js'; +import type { RoomFurnitureInstance } from './furniture.js'; import type { RoomAttachments } from 'misskey-world/src/room/type.js'; function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) { @@ -60,7 +60,7 @@ export class FurnitureContainer { private options: ConvertedOptions; public root: BABYLON.TransformNode; private subRoot: BABYLON.TransformNode | null = null; - public instance: RoomFunitureInstance | null = null; + public instance: RoomFurnitureInstance | null = null; public model: ModelManager | null = null; private scene: BABYLON.Scene; public registerMeshes: (meshes: BABYLON.Mesh[]) => void = () => {}; @@ -203,8 +203,8 @@ export class FurnitureContainer { // mesh.unfreezeWorldMatrix(); // mesh.computeWorldMatrix(true); // const updateChildStickyObjectPosition = (furnitureId: string) => { - // const stickyFunitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === furnitureId)).map(o => o.id); - // for (const soid of stickyFunitureIds) { + // const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === furnitureId)).map(o => o.id); + // for (const soid of stickyFurnitureIds) { // const soMesh = this.objectEntities.get(soid)!.rootMesh; // soMesh.unfreezeWorldMatrix(); // for (const m of soMesh.getChildMeshes()) { diff --git a/packages/frontend-misskey-world-engine/src/room/engine.ts b/packages/frontend-misskey-world-engine/src/room/engine.ts index 9b09b7e4f6..c81bf4946d 100644 --- a/packages/frontend-misskey-world-engine/src/room/engine.ts +++ b/packages/frontend-misskey-world-engine/src/room/engine.ts @@ -43,7 +43,7 @@ const BAKE_TRANSFORM = false; // 実験的 const IGNORE_FUNITURES: string[] = ['aquarium']; // for debug const IN_WEB_WORKER = typeof window === 'undefined'; -function enableFunitureCollision(meshes: BABYLON.Mesh[]) { +function enableFurnitureCollision(meshes: BABYLON.Mesh[]) { for (const mesh of meshes) { if (mesh.name.includes('__COLLISION__')) { mesh.checkCollisions = true; @@ -66,7 +66,7 @@ export class RoomEngine extends EngineBase<{ 'changeSelectedState': (ctx: { selected: { furnitureId: string; - funitureState: RoomState_InstalledFurniture; + furnitureState: RoomState_InstalledFurniture; interacions: { id: string; label: string; @@ -102,7 +102,7 @@ export class RoomEngine extends EngineBase<{ // TODO: たぶんオブジェクト内の値のmutateはsetで検知できないので、そのような操作を実際に行うようになった & それを検知する必要性が出てきたら専用の設定関数などを新設してそれを使わせる private _grabbingCtx: { furnitureId: string; - funitureType: string; + furnitureType: string; forInstall: boolean; mesh: BABYLON.TransformNode; originalDiffOfPosition: BABYLON.Vector3; @@ -110,7 +110,7 @@ export class RoomEngine extends EngineBase<{ distance: number; rotation: number; ghost: BABYLON.TransformNode; - descendantStickyFunitureIds: string[]; + descendantStickyFurnitureIds: string[]; onMove?: (info: { position: BABYLON.Vector3; rotation: BABYLON.Vector3; stickyFurnitureId: string | null; stickyPlaneId: string | null; }) => void; onCancel?: () => void; onDone?: () => void; @@ -127,8 +127,8 @@ export class RoomEngine extends EngineBase<{ private _selected: { furnitureId: string; furnitureContainer: RoomEngine['furnitureContainers'] extends Map ? V : never; - funitureState: RoomState_InstalledFurniture; - funitureDef: FurnitureDef; + furnitureState: RoomState_InstalledFurniture; + furnitureDef: FurnitureDef; } | null = null; get selected() { return this._selected; @@ -141,7 +141,7 @@ export class RoomEngine extends EngineBase<{ } this.ev('changeSelectedState', { selected: { furnitureId: v.furnitureId, - funitureState: v.funitureState, + furnitureState: v.furnitureState, interacions: Object.entries(v.furnitureContainer.instance.interactions).map(([interactionId, interactionInfo]) => ({ id: interactionId, label: interactionInfo.label, @@ -377,11 +377,11 @@ export class RoomEngine extends EngineBase<{ public async init() { await this.loadEnv(); - const funitures = this.roomState.installedFurnitures.filter(o => !IGNORE_FUNITURES.includes(o.type)); + const furnitures = this.roomState.installedFurnitures.filter(o => !IGNORE_FUNITURES.includes(o.type)); let loadedCount = 0; if (this.roomState.worldScale !== WORLD_SCALE) { - for (const o of funitures) { + for (const o of furnitures) { o.position = [ remap(o.position[0], 0, this.roomState.worldScale, 0, WORLD_SCALE), remap(o.position[1], 0, this.roomState.worldScale, 0, WORLD_SCALE), @@ -392,7 +392,7 @@ export class RoomEngine extends EngineBase<{ this.ev('changeRoomState', { roomState: this.roomState }); } - await Promise.all(funitures.map(o => this.loadFuniture({ + await Promise.all(furnitures.map(o => this.loadFurniture({ id: o.id, type: o.type, position: new BABYLON.Vector3(...o.position), @@ -400,7 +400,7 @@ export class RoomEngine extends EngineBase<{ options: o.options, }).then(() => { loadedCount++; - this.ev('loadingProgress', { progress: loadedCount / funitures.length }); + this.ev('loadingProgress', { progress: loadedCount / furnitures.length }); }))); // 不具合のもと @@ -427,7 +427,7 @@ export class RoomEngine extends EngineBase<{ if (this.grabbingCtx != null) { this.endGrabbing(); } else { - this.beginSelectedInstalledFunitureGrabbing(); + this.beginSelectedInstalledFurnitureGrabbing(); } } else if (this.selected != null) { this.interact(this.selected.furnitureId); @@ -480,7 +480,7 @@ export class RoomEngine extends EngineBase<{ this.inputs.on('click', (ev) => { if (this.grabbingCtx != null) return; - this.selectFuniture(null); + this.selectFurniture(null); // TODO: GPUPickerを使いたいが、なぜか一部のメッシュが反応しない const pickingInfo = this.scene.pick(ev.x, ev.y, @@ -491,7 +491,7 @@ export class RoomEngine extends EngineBase<{ if (oid != null && this.furnitureContainers.has(oid)) { const o = this.furnitureContainers.get(oid)!; const boundingInfo = getMeshesBoundingBox(o.root.getChildMeshes().filter(m => m.isEnabled() && m.isVisible && !m.isDisposed()), true); - this.selectFuniture(oid); + this.selectFurniture(oid); this.look(boundingInfo.center); return; } @@ -612,7 +612,7 @@ export class RoomEngine extends EngineBase<{ await this.changeEnvType(this.roomState.env.type, this.roomState.env.options, true); } - private async loadFuniture(args: { + private async loadFurniture(args: { type: string; id: string; position: BABYLON.Vector3; @@ -622,9 +622,9 @@ export class RoomEngine extends EngineBase<{ const def = getFurnitureDef(args.type); const metadata = { - isFuniture: true, + isFurniture: true, furnitureId: args.id, - funitureType: args.type, + furnitureType: args.type, }; const container = new FurnitureContainer({ @@ -701,7 +701,7 @@ export class RoomEngine extends EngineBase<{ } if (def.hasCollisions) { - enableFunitureCollision(meshes); + enableFurnitureCollision(meshes); } /* なんかバグる @@ -719,7 +719,7 @@ export class RoomEngine extends EngineBase<{ container!.model!.bakeMesh(); if (def.hasCollisions) { - enableFunitureCollision(container.root.getChildMeshes()); + enableFurnitureCollision(container.root.getChildMeshes()); } this.furnitureContainers.set(args.id, container); @@ -735,7 +735,7 @@ export class RoomEngine extends EngineBase<{ (this.camera.inputs.attached.manual as FreeCameraManualInput).setMoveVector(vector); } - public selectFuniture(furnitureId: string | null) { + public selectFurniture(furnitureId: string | null) { this.sr.disableSnapshotRendering(); // snapshot rendering中にbake/unbakeするとエラーになる。なおこのメソッドは参照カウント方式な点に留意 const currentSelected = this.selected; @@ -754,8 +754,8 @@ export class RoomEngine extends EngineBase<{ this.selected = { furnitureId, furnitureContainer: container, - funitureState: state, - funitureDef: getFurnitureDef(state.type), + furnitureState: state, + furnitureDef: getFurnitureDef(state.type), }; } } @@ -769,7 +769,7 @@ export class RoomEngine extends EngineBase<{ if (this.grabbingCtx == null) return; const grabbing = this.grabbingCtx; - const placement = getFurnitureDef(grabbing.funitureType).placement; + const placement = getFurnitureDef(grabbing.furnitureType).placement; const dir = this.camera.getDirection(BABYLON.Axis.Z).scale(this.scene.useRightHandedSystem ? -1 : 1); let newPos = this.camera.position.add(dir.scale(grabbing.distance)).add(grabbing.originalDiffOfPosition); @@ -791,14 +791,14 @@ export class RoomEngine extends EngineBase<{ bb.min.subtractInPlace(rootPos); bb.max.subtractInPlace(rootPos); - let stickyOtherFuniture: string | null = null; + let stickyOtherFurniture: string | null = null; let stickyPlaneId: string | null = null; let sticky = false; const isCollisionTarget = (m: BABYLON.AbstractMesh) => { return m.metadata?.furnitureId !== grabbing.furnitureId && !m.metadata?.isGhost && - !grabbing.descendantStickyFunitureIds.includes(m.metadata?.furnitureId); + !grabbing.descendantStickyFurnitureIds.includes(m.metadata?.furnitureId); }; const pos = new BABYLON.Vector3(this.camera.position.x, this.camera.position.y, this.camera.position.z); @@ -820,7 +820,7 @@ export class RoomEngine extends EngineBase<{ newRotation.y = targetRotationY; newRotation.z = grabbing.originalDiffOfRotation.z + grabbing.rotation; newPos = hit.pickedPoint; - stickyOtherFuniture = hit.pickedMesh.metadata?.furnitureId ?? null; + stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null; stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null; if (this.gridSnapping.enabled) { @@ -851,7 +851,7 @@ export class RoomEngine extends EngineBase<{ if (hit != null && hit.pickedPoint != null && hit.pickedMesh != null) { sticky = true; newPos = hit.pickedPoint; - stickyOtherFuniture = hit.pickedMesh.metadata?.furnitureId ?? null; + stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null; stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null; if (this.gridSnapping.enabled) { @@ -893,7 +893,7 @@ export class RoomEngine extends EngineBase<{ sticky = true; newPos = hit.pickedPoint; - stickyOtherFuniture = hit.pickedMesh.metadata?.furnitureId ?? null; + stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null; stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null; if (this.gridSnapping.enabled) { @@ -946,7 +946,7 @@ export class RoomEngine extends EngineBase<{ grabbing.onMove?.({ position: newPos, rotation: newRotation, - stickyFurnitureId: stickyOtherFuniture, + stickyFurnitureId: stickyOtherFurniture, stickyPlaneId: stickyPlaneId, }); } @@ -997,21 +997,21 @@ export class RoomEngine extends EngineBase<{ this.sr.enableSnapshotRendering(); // このメソッドは参照カウント方式な点に留意 } - public beginSelectedInstalledFunitureGrabbing() { + public beginSelectedInstalledFurnitureGrabbing() { if (this.selected == null) return; this.sr.disableSnapshotRendering(); - const selectedFuniture = this.selected.furnitureContainer.root; + const selectedFurniture = this.selected.furnitureContainer.root; this.clearHighlight(); - const initialPosition = selectedFuniture.position.clone(); - const initialRotation = selectedFuniture.rotation.clone(); + const initialPosition = selectedFurniture.position.clone(); + const initialRotation = selectedFurniture.rotation.clone(); // 子から先に適用していく const setStickyParentRecursively = (mesh: BABYLON.AbstractMesh) => { - const stickyFunitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); - for (const soid of stickyFunitureIds) { + const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); + for (const soid of stickyFurnitureIds) { const soMesh = this.furnitureContainers.get(soid)!.root; setStickyParentRecursively(soMesh); soMesh.setParent(mesh); @@ -1021,27 +1021,27 @@ export class RoomEngine extends EngineBase<{ } } }; - setStickyParentRecursively(selectedFuniture); + setStickyParentRecursively(selectedFurniture); - const descendantStickyFunitureIds: string[] = []; - const collectDescendantStickyFunitureIds = (parentId: string) => { + const descendantStickyFurnitureIds: string[] = []; + const collectDescendantStickyFurnitureIds = (parentId: string) => { const childIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === parentId)).map(o => o.id); for (const cid of childIds) { - descendantStickyFunitureIds.push(cid); - collectDescendantStickyFunitureIds(cid); + descendantStickyFurnitureIds.push(cid); + collectDescendantStickyFurnitureIds(cid); } }; - collectDescendantStickyFunitureIds(selectedFuniture.metadata.furnitureId); + collectDescendantStickyFurnitureIds(selectedFurniture.metadata.furnitureId); - const placement = getFurnitureDef(selectedFuniture.metadata.funitureType).placement; + const placement = getFurnitureDef(selectedFurniture.metadata.furnitureType).placement; if (placement === 'top') { // stickyな場合にsticky先とのレイの距離が0になりstickyされていない初期状態でgrabbingが始まってしまうのでちょっと浮かす - selectedFuniture.position.y += cm(1); + selectedFurniture.position.y += cm(1); } - const distance = BABYLON.Vector3.Distance(this.camera.position, selectedFuniture.position); - const ghost = this.createGhost(selectedFuniture); + const distance = BABYLON.Vector3.Distance(this.camera.position, selectedFurniture.position); + const ghost = this.createGhost(selectedFurniture); const dir = this.camera.getDirection(BABYLON.Axis.Z).scale(this.scene.useRightHandedSystem ? -1 : 1); @@ -1050,16 +1050,16 @@ export class RoomEngine extends EngineBase<{ let grabbingEnded = false; this.grabbingCtx = { - furnitureId: selectedFuniture.metadata.furnitureId, - funitureType: selectedFuniture.metadata.funitureType, + furnitureId: selectedFurniture.metadata.furnitureId, + furnitureType: selectedFurniture.metadata.furnitureType, forInstall: false, - mesh: selectedFuniture, - originalDiffOfPosition: selectedFuniture.position.subtract(this.camera.position.add(dir.scale(distance))), - originalDiffOfRotation: selectedFuniture.rotation.subtract(this.camera.rotation), + mesh: selectedFurniture, + originalDiffOfPosition: selectedFurniture.position.subtract(this.camera.position.add(dir.scale(distance))), + originalDiffOfRotation: selectedFurniture.rotation.subtract(this.camera.rotation), distance: distance, rotation: 0, ghost: ghost, - descendantStickyFunitureIds, + descendantStickyFurnitureIds, onMove: (info) => { stickyFurnitureId = info.stickyFurnitureId; stickyPlaneId = info.stickyPlaneId; @@ -1067,23 +1067,23 @@ export class RoomEngine extends EngineBase<{ onCancel: () => { grabbingEnded = true; this.sr.disableSnapshotRendering(); - selectedFuniture.position = initialPosition.clone(); - selectedFuniture.rotation = initialRotation.clone(); + selectedFurniture.position = initialPosition.clone(); + selectedFurniture.rotation = initialRotation.clone(); // 親から先に外していく const removeStickyParentRecursively = (mesh: BABYLON.Mesh) => { - const stickyFunitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); - for (const soid of stickyFunitureIds) { + const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); + for (const soid of stickyFurnitureIds) { const soMesh = this.furnitureContainers.get(soid)!.root; soMesh.setParent(null); removeStickyParentRecursively(soMesh); } }; - removeStickyParentRecursively(selectedFuniture); + removeStickyParentRecursively(selectedFurniture); this.sr.enableSnapshotRendering(); - this.furnitureContainers.get(selectedFuniture.metadata.furnitureId)!.calcBoundingBox(); + this.furnitureContainers.get(selectedFurniture.metadata.furnitureId)!.calcBoundingBox(); this.envManager.renderShadow(); }, @@ -1092,7 +1092,7 @@ export class RoomEngine extends EngineBase<{ // 場合によってはなぜかSRが効かなくなる //const putParticleSystem = this.getPutParticleSystem(); - //putParticleSystem.emitter = selectedFuniture.position.clone(); + //putParticleSystem.emitter = selectedFurniture.position.clone(); //putParticleSystem.start(); this.playSfxUrl('/client-assets/room/sfx/put.mp3', { @@ -1101,12 +1101,12 @@ export class RoomEngine extends EngineBase<{ }); // put animation - selectedFuniture.animations.push(placement === 'side' || placement === 'wall' ? this.putAnimH : this.putAnimV); + selectedFurniture.animations.push(placement === 'side' || placement === 'wall' ? this.putAnimH : this.putAnimV); const animating = Promise.withResolvers(); const animationObserver = this.scene.onAfterAnimationsObservable.add(() => { - this.sr.updateMesh(selectedFuniture.getChildMeshes().filter(m => m.isEnabled()), true); + this.sr.updateMesh(selectedFurniture.getChildMeshes().filter(m => m.isEnabled()), true); }); - this.scene.beginAnimation(selectedFuniture, 0, 60, false, 3, () => { animating.resolve(); }); + this.scene.beginAnimation(selectedFurniture, 0, 60, false, 3, () => { animating.resolve(); }); // TODO: アニメーションの完了まで親子関係の解除を遅延するため、一瞬「grabbingが終わっているのに親子関係が解除されていない」状態が発生する。その間に新たにgrabbingを開始するなどの別の操作が発生すると不具合のもとになるのでそれを防止する仕組みを作る animating.promise.then(() => { @@ -1114,8 +1114,8 @@ export class RoomEngine extends EngineBase<{ // 親から先に外していく const removeStickyParentRecursively = (mesh: BABYLON.Mesh) => { - const stickyFunitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); - for (const soid of stickyFunitureIds) { + const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id); + for (const soid of stickyFurnitureIds) { const soMesh = this.furnitureContainers.get(soid)!.root; soMesh.setParent(null); @@ -1127,18 +1127,18 @@ export class RoomEngine extends EngineBase<{ removeStickyParentRecursively(soMesh); } }; - removeStickyParentRecursively(selectedFuniture); + removeStickyParentRecursively(selectedFurniture); - this.furnitureContainers.get(selectedFuniture.metadata.furnitureId)!.calcBoundingBox(); + this.furnitureContainers.get(selectedFurniture.metadata.furnitureId)!.calcBoundingBox(); this.envManager.renderShadow(); - const pos = selectedFuniture.position.clone(); - const rotation = selectedFuniture.rotation.clone(); - this.roomState.installedFurnitures.find(o => o.id === selectedFuniture.metadata.furnitureId)!.sticky = stickyFurnitureId; - this.roomState.installedFurnitures.find(o => o.id === selectedFuniture.metadata.furnitureId)!.stickyPlaneId = stickyPlaneId; - this.roomState.installedFurnitures.find(o => o.id === selectedFuniture.metadata.furnitureId)!.position = [pos.x, pos.y, pos.z]; - this.roomState.installedFurnitures.find(o => o.id === selectedFuniture.metadata.furnitureId)!.rotation = [rotation.x, rotation.y, rotation.z]; + const pos = selectedFurniture.position.clone(); + const rotation = selectedFurniture.rotation.clone(); + this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.sticky = stickyFurnitureId; + this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.stickyPlaneId = stickyPlaneId; + this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.position = [pos.x, pos.y, pos.z]; + this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.rotation = [rotation.x, rotation.y, rotation.z]; this.ev('changeRoomState', { roomState: this.roomState }); }); @@ -1211,7 +1211,7 @@ export class RoomEngine extends EngineBase<{ this.fixedCamera.position = new BABYLON.Vector3(0, cm(120), 0); this.fixedCamera.rotation = new BABYLON.Vector3(0, 0, 0); this.scene.activeCamera = this.fixedCamera; - this.selectFuniture(null); + this.selectFurniture(null); } public sit() { @@ -1284,18 +1284,18 @@ export class RoomEngine extends EngineBase<{ return root; } - public async addFuniture(type: string, _options?: RawOptions, attachments?: RoomAttachments) { + public async addFurniture(type: string, _options?: RawOptions, attachments?: RoomAttachments) { if (!this.isEditMode) return; if (this.grabbingCtx != null) return; if (attachments != null) this.roomAttachments = attachments; - this.selectFuniture(null); + this.selectFurniture(null); const id = genId(); const def = getFurnitureDef(type); const options = _options != null ? deepClone(_options) : deepClone(def.options.default); - const container = await this.loadFuniture({ + const container = await this.loadFurniture({ id: id, type, position: new BABYLON.Vector3(0, 0, 0), @@ -1318,7 +1318,7 @@ export class RoomEngine extends EngineBase<{ this.grabbingCtx = { furnitureId: id, - funitureType: type, + furnitureType: type, forInstall: true, mesh: container.root, originalDiffOfPosition: new BABYLON.Vector3(0, 0, 0), @@ -1326,7 +1326,7 @@ export class RoomEngine extends EngineBase<{ distance: distance, rotation: 0, ghost: ghost, - descendantStickyFunitureIds: [], + descendantStickyFurnitureIds: [], onMove: (info) => { stickyFurnitureId = info.stickyFurnitureId; stickyPlaneId = info.stickyPlaneId; @@ -1339,7 +1339,7 @@ export class RoomEngine extends EngineBase<{ grabbingEnded = true; if (def.hasCollisions) { - enableFunitureCollision(container.root.getChildMeshes()); + enableFurnitureCollision(container.root.getChildMeshes()); } const pos = container.root.position.clone(); @@ -1429,7 +1429,7 @@ export class RoomEngine extends EngineBase<{ } public async exitEditMode() { - this.selectFuniture(null); + this.selectFurniture(null); this.isEditMode = false; await this.envManager.renderShadow(); @@ -1464,7 +1464,7 @@ export class RoomEngine extends EngineBase<{ reflectionProbe.renderList = []; //reflectionProbe.dispose(); - for (const mesh of this.scene.meshes.filter(m => (m instanceof BABYLON.Mesh || m instanceof BABYLON.InstancedMesh) && m.isEnabled() && m.isVisible && m.material && m.metadata?.isFuniture)) { + for (const mesh of this.scene.meshes.filter(m => (m instanceof BABYLON.Mesh || m instanceof BABYLON.InstancedMesh) && m.isEnabled() && m.isVisible && m.material && m.metadata?.isFurniture)) { if (mesh.material) { mesh.material.unfreeze(); if (mesh.material instanceof BABYLON.MultiMaterial) { @@ -1482,15 +1482,15 @@ export class RoomEngine extends EngineBase<{ */ } - public duplicateSelectedFuniture() { + public duplicateSelectedFurniture() { if (this.selected == null) return; - const funitureState = this.selected.funitureState; + const furnitureState = this.selected.furnitureState; - this.addFuniture(funitureState.type, deepClone(funitureState.options)); + this.addFurniture(furnitureState.type, deepClone(furnitureState.options)); } - public removeSelectedFuniture() { + public removeSelectedFurniture() { if (this.selected == null) return; const furnitureId = this.selected.furnitureId; @@ -1581,7 +1581,7 @@ export class RoomEngine extends EngineBase<{ showUsername: this.showUsernameOnAvatar, show2dAvatar: this.show2dAvatarOnAvatar, }); - // TODO: loadFunitureのものとある程度共通化 + // TODO: loadFurnitureのものとある程度共通化 p.registerMeshes = (meshes) => { for (const mesh of meshes) { mesh.receiveShadows = false; diff --git a/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts b/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts index a8b4f8b7a5..462d94d41c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts +++ b/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts @@ -241,7 +241,7 @@ export const FUNITURE_DEFS = [ export function getFurnitureDef(type: string): FurnitureDef { const def = FUNITURE_DEFS.find(x => x.id === type) as FurnitureDef | undefined; if (def == null) { - throw new Error(`Unrecognized funiture type: ${type}`); + throw new Error(`Unrecognized furniture type: ${type}`); } return def; } diff --git a/packages/frontend-misskey-world-engine/src/room/furniture.ts b/packages/frontend-misskey-world-engine/src/room/furniture.ts index 739fe8335e..f1bc2bbc66 100644 --- a/packages/frontend-misskey-world-engine/src/room/furniture.ts +++ b/packages/frontend-misskey-world-engine/src/room/furniture.ts @@ -11,7 +11,7 @@ import type { FurnitureSchemaDef } from 'misskey-world/src/room/object.js'; import type { OptionsSchema } from 'misskey-world/src/mono.js'; import type { ConvertedOptions, GetConvertedOptionsSchemaValues } from '../mono.js'; -export type RoomFunitureInstance = { +export type RoomFurnitureInstance = { onInited?: () => void; onOptionsUpdated?: (kv: [K, V]) => void; interactions: Record stickyMarkerMeshUpdated?: (mesh: BABYLON.Mesh) => void; sitChair?: () => void; reloadModel: () => void; - }) => RoomFunitureInstance> | Promise>>; // TODO: createInstanceをasyncにするのではなく、別にreadyみたいなものを返させる + }) => RoomFurnitureInstance> | Promise>>; // TODO: createInstanceをasyncにするのではなく、別にreadyみたいなものを返させる }; export function defineFurnitureSchema(def: FurnitureSchemaDef): FurnitureSchemaDef { return def; } -export function defineFuniture>(schema: Schema, def: Pick, 'path' | 'createInstance'>): FurnitureDef { +export function defineFurniture>(schema: Schema, def: Pick, 'path' | 'createInstance'>): FurnitureDef { return { ...schema, ...def }; } diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts index 8b2605ec9b..a8d4ca81c3 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { a4Case_schema } from 'misskey-world/src/room/furnitures/a4Case.schema.js'; -export const a4Case = defineFuniture(a4Case_schema, { +export const a4Case = defineFurniture(a4Case_schema, { createInstance: ({ options, model }) => { const bodyMesh = model.findMesh('__X_BODY__'); const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts index 411d84de0a..8fbea0d1c3 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { aircon_schema } from 'misskey-world/src/room/furnitures/aircon.schema.js'; -export const aircon = defineFuniture(aircon_schema, { +export const aircon = defineFurniture(aircon_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts index b580af603a..e17eb3988f 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts @@ -6,10 +6,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { allInOnePc_schema } from 'misskey-world/src/room/furnitures/allInOnePc.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; -export const allInOnePc = defineFuniture(allInOnePc_schema, { +export const allInOnePc = defineFurniture(allInOnePc_schema, { createInstance: async ({ lc, scene, options, model, graphicsQuality }) => { const matrix = model.root.getWorldMatrix(true); const scale = new BABYLON.Vector3(); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts index 011aa3c054..82e690a291 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts @@ -4,11 +4,11 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; import { aquarium_schema } from 'misskey-world/src/room/furnitures/aquarium.schema.js'; -export const aquarium = defineFuniture(aquarium_schema, { +export const aquarium = defineFurniture(aquarium_schema, { createInstance: ({ scene, root }) => { return { onInited: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts index 4fc25c98b6..90e04c38c9 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { aromaReedDiffuser_schema } from 'misskey-world/src/room/furnitures/aromaReedDiffuser.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const aromaReedDiffuser = defineFuniture(aromaReedDiffuser_schema, { +export const aromaReedDiffuser = defineFurniture(aromaReedDiffuser_schema, { createInstance: ({ options, model }) => { const bottleMaterial = model.findMaterial('__X_BOTTLE__'); const oilMaterial = model.findMaterial('__X_OIL__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts index 1806a4664d..61dd2fc2a6 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { banknote_schema } from 'misskey-world/src/room/furnitures/banknote.schema.js'; -export const banknote = defineFuniture(banknote_schema, { +export const banknote = defineFurniture(banknote_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts index 3ec10d8b88..40d9655c41 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { beamLamp_schema } from 'misskey-world/src/room/furnitures/beamLamp.schema.js'; -export const beamLamp = defineFuniture(beamLamp_schema, { +export const beamLamp = defineFurniture(beamLamp_schema, { createInstance: ({ lc, root, scene, graphicsQuality }) => { const light = new BABYLON.PointLight('beamLampLight', new BABYLON.Vector3(0, cm(10), 0), scene, lc != null); light.parent = root; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts index 1d6e63db42..6bcb0a73e5 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { bed_schema } from 'misskey-world/src/room/furnitures/bed.schema.js'; -export const bed = defineFuniture(bed_schema, { +export const bed = defineFurniture(bed_schema, { createInstance: ({ options, model }) => { const bodyMesh = model.findMesh('__X_BODY__'); const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts index 51eeb42585..330c58b591 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm, remap } from 'misskey-world/src/utility.js'; import { createOverridedStates } from '../utility.js'; import { blind_schema } from 'misskey-world/src/room/furnitures/blind.schema.js'; -export const blind = defineFuniture(blind_schema, { +export const blind = defineFurniture(blind_schema, { createInstance: ({ options, model }) => { const temp = createOverridedStates({ angle: () => options.angle, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts index 19196d2570..117d76b1ac 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { book_schema } from 'misskey-world/src/room/furnitures/book.schema.js'; -export const book = defineFuniture(book_schema, { +export const book = defineFurniture(book_schema, { createInstance: ({ options, model }) => { const bodyMesh = model.findMesh('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts index 3698edfbae..d2f29654aa 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts @@ -4,11 +4,11 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; import { books_schema } from 'misskey-world/src/room/furnitures/books.schema.js'; -export const books = defineFuniture(books_schema, { +export const books = defineFurniture(books_schema, { createInstance: ({ scene, options, model }) => { const coverMaterial = model.findMaterial('__X_COVER__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts index 9cb90e96ad..7498b44433 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { boxWallShelf_schema } from 'misskey-world/src/room/furnitures/boxWallShelf.schema.js'; -export const boxWallShelf = defineFuniture(boxWallShelf_schema, { +export const boxWallShelf = defineFurniture(boxWallShelf_schema, { createInstance: async ({ scene, options, model }) => { const backMesh = model.findMesh('__X_BACK__'); const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts index 5537854269..2a21ba4127 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cactusS_schema } from 'misskey-world/src/room/furnitures/cactusS.schema.js'; -export const cactusS = defineFuniture(cactusS_schema, { +export const cactusS = defineFurniture(cactusS_schema, { createInstance: ({ options, model }) => { const potMaterial = model.findMaterial('__X_POT__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts index 8021ebee6c..60320d8a75 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cardboardBox_schema } from 'misskey-world/src/room/furnitures/cardboardBox.schema.js'; -export const cardboardBox = defineFuniture(cardboardBox_schema, { +export const cardboardBox = defineFurniture(cardboardBox_schema, { createInstance: ({ scene, options, model }) => { const material = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFan.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFan.ts index 1938de4227..0537190eb9 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFan.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFan.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { ceilingFan_schema } from 'misskey-world/src/room/furnitures/ceilingFan.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const ceilingFan = defineFuniture(ceilingFan_schema, { +export const ceilingFan = defineFurniture(ceilingFan_schema, { createInstance: ({ options, sr, scene, model }) => { const shadeMaterial = model.findMaterial('__X_SHADE__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts index c041cf3acb..17b5ec36db 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { ceilingFanLight_schema } from 'misskey-world/src/room/furnitures/ceilingFanLight.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const ceilingFanLight = defineFuniture(ceilingFanLight_schema, { +export const ceilingFanLight = defineFurniture(ceilingFanLight_schema, { createInstance: ({ options, sr, scene, model }) => { const shadeMaterial = model.findMaterial('__X_SHADE__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts index 6c08915e63..92648f4c7a 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { chair_schema } from 'misskey-world/src/room/furnitures/chair.schema.js'; -export const chair = defineFuniture(chair_schema, { +export const chair = defineFurniture(chair_schema, { createInstance: ({ model, options, sitChair }) => { const primaryMaterial = model.findMaterial('__X_PRIMARY__'); const secondaryMaterial = model.findMaterial('__X_SECONDARY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts index 87fe18dead..d1e00e2d4b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts @@ -4,11 +4,11 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; import { clippedPicture_schema } from 'misskey-world/src/room/furnitures/clippedPicture.schema.js'; -export const clippedPicture = defineFuniture(clippedPicture_schema, { +export const clippedPicture = defineFurniture(clippedPicture_schema, { createInstance: async ({ scene, options, model }) => { const pictureMesh = model.findMesh('__X_PICTURE__'); pictureMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts index af7b0fce06..b4ad09b9e2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { coffeeCup_schema } from 'misskey-world/src/room/furnitures/coffeeCup.schema.js'; -export const coffeeCup = defineFuniture(coffeeCup_schema, { +export const coffeeCup = defineFurniture(coffeeCup_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts index 79f7187f56..d47a458739 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { colorBox_schema } from 'misskey-world/src/room/furnitures/colorBox.schema.js'; -export const colorBox = defineFuniture(colorBox_schema, { +export const colorBox = defineFurniture(colorBox_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts index 00daa6b336..542ec3776f 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cuboid_schema } from 'misskey-world/src/room/furnitures/cuboid.schema.js'; -export const cuboid = defineFuniture(cuboid_schema, { +export const cuboid = defineFurniture(cuboid_schema, { createInstance: async ({ scene, options, model }) => { const mesh = model.findMesh('__X_BODY__'); const mat = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts index f244791475..8da7c4efb2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; import { yuge } from '../utility.js'; import { cupNoodle_schema } from 'misskey-world/src/room/furnitures/cupNoodle.schema.js'; -export const cupNoodle = defineFuniture(cupNoodle_schema, { +export const cupNoodle = defineFurniture(cupNoodle_schema, { createInstance: ({ scene, root, sr }) => { let yugeDispose: (() => void) | null = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts index bacdc41841..984ef30a0e 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { curtain_schema } from 'misskey-world/src/room/furnitures/curtain.schema.js'; -export const curtain = defineFuniture(curtain_schema, { +export const curtain = defineFurniture(curtain_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts index 55ce48b5f5..565cfbff07 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { custardPudding_schema } from 'misskey-world/src/room/furnitures/custardPudding.schema.js'; -export const custardPudding = defineFuniture(custardPudding_schema, { +export const custardPudding = defineFurniture(custardPudding_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts index f8e03c73ba..00ab31fea6 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { debugHipoly_schema } from 'misskey-world/src/room/furnitures/debugHipoly.schema.js'; -export const debugHipoly = defineFuniture(debugHipoly_schema, { +export const debugHipoly = defineFurniture(debugHipoly_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts index fc231cca4e..cd2d933694 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { debugMetal_schema } from 'misskey-world/src/room/furnitures/debugMetal.schema.js'; -export const debugMetal = defineFuniture(debugMetal_schema, { +export const debugMetal = defineFurniture(debugMetal_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts index 430d0b4e76..f29628c97e 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { descriptionPlate_schema } from 'misskey-world/src/room/furnitures/descriptionPlate.schema.js'; -export const descriptionPlate = defineFuniture(descriptionPlate_schema, { +export const descriptionPlate = defineFurniture(descriptionPlate_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts index 578da641ec..42854253e0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { desk_schema } from 'misskey-world/src/room/furnitures/desk.schema.js'; -export const desk = defineFuniture(desk_schema, { +export const desk = defineFurniture(desk_schema, { createInstance: ({ options, model }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); const boardMaterial = model.findMaterial('__X_BOARD__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts index cf53c6524c..121fd36e8d 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { desktopPc_schema } from 'misskey-world/src/room/furnitures/desktopPc.schema.js'; -export const desktopPc = defineFuniture(desktopPc_schema, { +export const desktopPc = defineFurniture(desktopPc_schema, { createInstance: ({ options, model, root, scene, lc, graphicsQuality }) => { // TODO: graphicsQualityがLOWならそもそも追加しない const light1 = new BABYLON.SpotLight('', new BABYLON.Vector3(0, cm(10), cm(22)), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, lc != null); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts index 504c330a26..06342836ed 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { djMixer_schema } from 'misskey-world/src/room/furnitures/djMixer.schema.js'; -export const djMixer = defineFuniture(djMixer_schema, { +export const djMixer = defineFurniture(djMixer_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts index 81602c6b28..ae237a0179 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts @@ -5,10 +5,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { djPlayer_schema } from 'misskey-world/src/room/furnitures/djPlayer.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { normalizeUvToSquare } from '../../utility.js'; -export const djPlayer = defineFuniture(djPlayer_schema, { +export const djPlayer = defineFurniture(djPlayer_schema, { createInstance: async ({ model, options, scene }) => { const screenMesh = model.findMesh('__X_SCREEN__'); const screenMaterial = model.findMaterial('__X_SCREEN__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/downlight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/downlight.ts index 4f43fb55a6..96ae0d3125 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/downlight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/downlight.ts @@ -6,10 +6,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { downlight_schema } from 'misskey-world/src/room/furnitures/downlight.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; -export const downlight = defineFuniture(downlight_schema, { +export const downlight = defineFurniture(downlight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); const lightMaterial = model.findMaterial('__X_LIGHT__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts index 831e2e2d72..9b9a335966 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { ductRailSpotLights_schema } from 'misskey-world/src/room/furnitures/ductRailSpotLights.schema.js'; -export const ductRailSpotLights = defineFuniture(ductRailSpotLights_schema, { +export const ductRailSpotLights = defineFurniture(ductRailSpotLights_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts index 17bf6c4586..cd962ced79 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { ductTape_schema } from 'misskey-world/src/room/furnitures/ductTape.schema.js'; -export const ductTape = defineFuniture(ductTape_schema, { +export const ductTape = defineFurniture(ductTape_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts index 4a9d46e68c..5268b1a990 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts @@ -5,10 +5,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { electronicDisplayBoard_schema } from 'misskey-world/src/room/furnitures/electronicDisplayBoard.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { RecyvlingTextGrid } from '../../utility.js'; -export const electronicDisplayBoard = defineFuniture(electronicDisplayBoard_schema, { +export const electronicDisplayBoard = defineFurniture(electronicDisplayBoard_schema, { createInstance: async ({ scene, options, model, timer }) => { const frameMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts index 0bb9887696..9c3963c8db 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { emptyBento_schema } from 'misskey-world/src/room/furnitures/emptyBento.schema.js'; -export const emptyBento = defineFuniture(emptyBento_schema, { +export const emptyBento = defineFurniture(emptyBento_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts index a4cafeae0f..92e9f04c6e 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { energyDrink_schema } from 'misskey-world/src/room/furnitures/energyDrink.schema.js'; -export const energyDrink = defineFuniture(energyDrink_schema, { +export const energyDrink = defineFurniture(energyDrink_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts index c8b209ed80..74dc5a86e0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { envelope_schema } from 'misskey-world/src/room/furnitures/envelope.schema.js'; -export const envelope = defineFuniture(envelope_schema, { +export const envelope = defineFurniture(envelope_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts index b965d92790..1d5c21bd47 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { facialTissue_schema } from 'misskey-world/src/room/furnitures/facialTissue.schema.js'; -export const facialTissue = defineFuniture(facialTissue_schema, { +export const facialTissue = defineFurniture(facialTissue_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts index 3defee3360..d0f2f43d7b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { glassCylinderPotPlant_schema } from 'misskey-world/src/room/furnitures/glassCylinderPotPlant.schema.js'; -export const glassCylinderPotPlant = defineFuniture(glassCylinderPotPlant_schema, { +export const glassCylinderPotPlant = defineFurniture(glassCylinderPotPlant_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts index b039741d40..46f96e9f2a 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { handheldGameConsole_schema } from 'misskey-world/src/room/furnitures/handheldGameConsole.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; -export const handheldGameConsole = defineFuniture(handheldGameConsole_schema, { +export const handheldGameConsole = defineFurniture(handheldGameConsole_schema, { createInstance: async ({ scene, options, model }) => { const screenMesh = model.findMesh('__X_SCREEN__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts index 6f5553bdd8..8754fe4a4b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { hangingDuctRail_schema } from 'misskey-world/src/room/furnitures/hangingDuctRail.schema.js'; -export const hangingDuctRail = defineFuniture(hangingDuctRail_schema, { +export const hangingDuctRail = defineFurniture(hangingDuctRail_schema, { createInstance: async ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts index 5f51b66c0a..99c0d30284 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { hangingTShirt_schema } from 'misskey-world/src/room/furnitures/hangingTShirt.schema.js'; -export const hangingTShirt = defineFuniture(hangingTShirt_schema, { +export const hangingTShirt = defineFurniture(hangingTShirt_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/haniwa.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/haniwa.ts index a6b14d7f40..2d13c43548 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/haniwa.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/haniwa.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { haniwa_schema } from 'misskey-world/src/room/furnitures/haniwa.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const haniwa = defineFuniture(haniwa_schema, { +export const haniwa = defineFurniture(haniwa_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); const insideMaterial = model.findMaterial('__X_INSIDE__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/herbarium.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/herbarium.ts index acc94da713..19701a59a0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/herbarium.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/herbarium.ts @@ -4,9 +4,9 @@ */ import { herbarium_schema } from 'misskey-world/src/room/furnitures/herbarium.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const herbarium = defineFuniture(herbarium_schema, { +export const herbarium = defineFurniture(herbarium_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts index 3af86c2ec5..ebd5c0ad66 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { icosahedron_schema } from 'misskey-world/src/room/furnitures/icosahedron.schema.js'; -export const icosahedron = defineFuniture(icosahedron_schema, { +export const icosahedron = defineFurniture(icosahedron_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts index b0efcec54f..dccb6edfbd 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { ironFrameShelf_schema } from 'misskey-world/src/room/furnitures/ironFrameShelf.schema.js'; -export const ironFrameShelf = defineFuniture(ironFrameShelf_schema, { +export const ironFrameShelf = defineFurniture(ironFrameShelf_schema, { path: (options) => { switch (options.height) { case '5': return 'iron-frame-shelf/iron-frame-shelf-5'; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts index b0dc9de834..48674c7439 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { ironFrameTable_schema } from 'misskey-world/src/room/furnitures/ironFrameTable.schema.js'; -export const ironFrameTable = defineFuniture(ironFrameTable_schema, { +export const ironFrameTable = defineFurniture(ironFrameTable_schema, { createInstance: ({ options, model, stickyMarkerMeshUpdated }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); const boardMaterial = model.findMaterial('__X_BOARD__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts index 3229c8560f..7c63f53fea 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { issyoubin_schema } from 'misskey-world/src/room/furnitures/issyoubin.schema.js'; -export const issyoubin = defineFuniture(issyoubin_schema, { +export const issyoubin = defineFurniture(issyoubin_schema, { createInstance: ({ model, options, scene }) => { const liquidMesh = model.findMesh('__X_LIQUID__'); const liquidMaterial = model.findMaterial('__X_LIQUID__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts index 30d2dd4ec0..01ddd75f27 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/kakejiku.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { kakejiku_schema } from 'misskey-world/src/room/furnitures/kakejiku.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; -export const kakejiku = defineFuniture(kakejiku_schema, { +export const kakejiku = defineFurniture(kakejiku_schema, { createInstance: async ({ scene, options, model }) => { const imageMesh = model.findMesh('__X_IMAGE__'); imageMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts index de9eb95e64..acaddc36fa 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { keyboard_schema } from 'misskey-world/src/room/furnitures/keyboard.schema.js'; -export const keyboard = defineFuniture(keyboard_schema, { +export const keyboard = defineFurniture(keyboard_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); const keyMaterial = model.findMaterial('__X_KEY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts index fd8f76a7fc..980c01db07 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts @@ -6,10 +6,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { laptopPc_schema } from 'misskey-world/src/room/furnitures/laptopPc.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; -export const laptopPc = defineFuniture(laptopPc_schema, { +export const laptopPc = defineFurniture(laptopPc_schema, { createInstance: async ({ lc, sr, scene, options, model, graphicsQuality }) => { const matrix = model.root.getWorldMatrix(true); const scale = new BABYLON.Vector3(); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts index 656151d858..9711ea0405 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { largeMousepad_schema } from 'misskey-world/src/room/furnitures/largeMousepad.schema.js'; -export const largeMousepad = defineFuniture(largeMousepad_schema, { +export const largeMousepad = defineFurniture(largeMousepad_schema, { createInstance: async ({ scene, options, model }) => { const padMesh = model.findMesh('__X_PAD__'); const padMaterial = model.findMaterial('__X_PAD__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts index f4934ddb2d..ff33044c80 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts @@ -5,12 +5,12 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { lavaLamp_schema } from 'misskey-world/src/room/furnitures/lavaLamp.schema.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; const mix = (a: number, b: number, t: number) => a * (1 - t) + b * t; -export const lavaLamp = defineFuniture(lavaLamp_schema, { +export const lavaLamp = defineFurniture(lavaLamp_schema, { createInstance: ({ options, lc, scene, sr, root, model, graphicsQuality }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); const glassMaterial = model.findMaterial('__X_GLASS__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts index b75f633c7d..a9768f8250 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { letterCase_schema } from 'misskey-world/src/room/furnitures/letterCase.schema.js'; -export const letterCase = defineFuniture(letterCase_schema, { +export const letterCase = defineFurniture(letterCase_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts index 7b03cabed1..fe828552c9 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { lowPartitionBar_schema } from 'misskey-world/src/room/furnitures/lowPartitionBar.schema.js'; -export const lowPartitionBar = defineFuniture(lowPartitionBar_schema, { +export const lowPartitionBar = defineFurniture(lowPartitionBar_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts index 58fb16bbe3..343d5caf80 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { miObjet_schema } from 'misskey-world/src/room/furnitures/miObjet.schema.js'; -export const miObjet = defineFuniture(miObjet_schema, { +export const miObjet = defineFurniture(miObjet_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts index e11f681ba9..e6e3c51cf0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { miPlate_schema } from 'misskey-world/src/room/furnitures/miPlate.schema.js'; -export const miPlate = defineFuniture(miPlate_schema, { +export const miPlate = defineFurniture(miPlate_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts index 7a2e265431..0750cfd0ea 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { miPlateDisplayed_schema } from 'misskey-world/src/room/furnitures/miPlateDisplayed.schema.js'; -export const miPlateDisplayed = defineFuniture(miPlateDisplayed_schema, { +export const miPlateDisplayed = defineFurniture(miPlateDisplayed_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts index b8cb44b54c..271c122fab 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { milk_schema } from 'misskey-world/src/room/furnitures/milk.schema.js'; -export const milk = defineFuniture(milk_schema, { +export const milk = defineFurniture(milk_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts index ba75cb374b..b9ad3e0813 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { mixer_schema } from 'misskey-world/src/room/furnitures/mixer.schema.js'; -export const mixer = defineFuniture(mixer_schema, { +export const mixer = defineFurniture(mixer_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts index 5d75fe10e4..6cf74401c2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts @@ -6,11 +6,11 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { monitor_schema } from 'misskey-world/src/room/furnitures/monitor.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { normalizeUvToSquare } from '../../utility.js'; -export const monitor = defineFuniture(monitor_schema, { +export const monitor = defineFurniture(monitor_schema, { createInstance: async ({ lc, scene, options, model, graphicsQuality }) => { const matrix = model.root.getWorldMatrix(true); const scale = new BABYLON.Vector3(); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts index c34dad8a1b..386ccee145 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { monitorSpeaker_schema } from 'misskey-world/src/room/furnitures/monitorSpeaker.schema.js'; -export const monitorSpeaker = defineFuniture(monitorSpeaker_schema, { +export const monitorSpeaker = defineFurniture(monitorSpeaker_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts index 32de5a9631..8eac58bc43 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { monstera_schema } from 'misskey-world/src/room/furnitures/monstera.schema.js'; -export const monstera = defineFuniture(monstera_schema, { +export const monstera = defineFurniture(monstera_schema, { createInstance: ({ options, model }) => { const potMaterial = model.findMaterial('__X_POT__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts index d7ef81a512..fa13f45651 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts @@ -6,10 +6,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm } from 'misskey-world/src/utility.js'; import { mug_schema } from 'misskey-world/src/room/furnitures/mug.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { yuge } from '../utility.js'; -export const mug = defineFuniture(mug_schema, { +export const mug = defineFurniture(mug_schema, { createInstance: ({ options, scene, root, sr, model }) => { const yugeDispose = yuge(scene, root, new BABYLON.Vector3(0, cm(5), 0), sr); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts index b590f0e9c7..5c31bda4e3 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { newtonsCradle_schema } from 'misskey-world/src/room/furnitures/newtonsCradle.schema.js'; -export const newtonsCradle = defineFuniture(newtonsCradle_schema, { +export const newtonsCradle = defineFurniture(newtonsCradle_schema, { createInstance: ({ options, model }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts index a6b565286f..f374c7324d 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { openedCardboardBox_schema } from 'misskey-world/src/room/furnitures/openedCardboardBox.schema.js'; -export const openedCardboardBox = defineFuniture(openedCardboardBox_schema, { +export const openedCardboardBox = defineFurniture(openedCardboardBox_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts index 04b86072c0..e1e191fbc1 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { pachira_schema } from 'misskey-world/src/room/furnitures/pachira.schema.js'; -export const pachira = defineFuniture(pachira_schema, { +export const pachira = defineFurniture(pachira_schema, { createInstance: ({ options, model }) => { const potMaterial = model.findMaterial('__X_POT__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts index 2219b398b7..9ba92c6845 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { petBottle_schema } from 'misskey-world/src/room/furnitures/petBottle.schema.js'; -export const petBottle = defineFuniture(petBottle_schema, { +export const petBottle = defineFurniture(petBottle_schema, { createInstance: ({ model, options, scene }) => { const capMesh = model.findMesh('__X_CAP__'); const liquidMesh = model.findMesh('__X_LIQUID__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts index 28683afc64..a78a927c47 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { piano_schema } from 'misskey-world/src/room/furnitures/piano.schema.js'; -export const piano = defineFuniture(piano_schema, { +export const piano = defineFurniture(piano_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts index 25efefb97c..e479df0f00 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { pictureFrame_schema } from 'misskey-world/src/room/furnitures/pictureFrame.schema.js'; // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする -export const pictureFrame = defineFuniture(pictureFrame_schema, { +export const pictureFrame = defineFurniture(pictureFrame_schema, { createInstance: async ({ scene, options, model }) => { const frameMesh = model.findMesh('__X_FRAME__'); frameMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts index b9130ee659..a568e4d557 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { pizza_schema } from 'misskey-world/src/room/furnitures/pizza.schema.js'; -export const pizza = defineFuniture(pizza_schema, { +export const pizza = defineFurniture(pizza_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts index ec6cc30454..5fd22c60c2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { plant_schema } from 'misskey-world/src/room/furnitures/plant.schema.js'; -export const plant = defineFuniture(plant_schema, { +export const plant = defineFurniture(plant_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts index 502bd7983e..d5e1899bda 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { plant2_schema } from 'misskey-world/src/room/furnitures/plant2.schema.js'; -export const plant2 = defineFuniture(plant2_schema, { +export const plant2 = defineFurniture(plant2_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts index 189443f55d..b2ecf2b5f1 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts @@ -4,11 +4,11 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; import { poster_schema } from 'misskey-world/src/room/furnitures/poster.schema.js'; -export const poster = defineFuniture(poster_schema, { +export const poster = defineFurniture(poster_schema, { createInstance: async ({ scene, options, model }) => { const pictureMesh = model.findMesh('__X_PICTURE__'); pictureMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts index 0046f75d01..8641371352 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { powerStrip_schema } from 'misskey-world/src/room/furnitures/powerStrip.schema.js'; -export const powerStrip = defineFuniture(powerStrip_schema, { +export const powerStrip = defineFurniture(powerStrip_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts index e50a557885..7d9a98f19f 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { radiometer_schema } from 'misskey-world/src/room/furnitures/radiometer.schema.js'; -export const radiometer = defineFuniture(radiometer_schema, { +export const radiometer = defineFurniture(radiometer_schema, { createInstance: ({ sr, scene, model }) => { const vanes = model.findTransformNode('__X_VANES__'); model.bakeExcludeMeshes = [...vanes.getChildMeshes()]; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts index 348fa3465f..134181bc4a 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts @@ -5,11 +5,11 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import seedrandom from 'seedrandom'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { randomBooks_schema } from 'misskey-world/src/room/furnitures/randomBooks.schema.js'; -export const randomBooks = defineFuniture(randomBooks_schema, { +export const randomBooks = defineFurniture(randomBooks_schema, { createInstance: ({ options, model, scene }) => { const bodyMesh = model.findMesh('__X_BODY__'); bodyMesh.isVisible = false; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts index 655799e93c..02f515e54b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { recordPlayer_schema } from 'misskey-world/src/room/furnitures/recordPlayer.schema.js'; -export const recordPlayer = defineFuniture(recordPlayer_schema, { +export const recordPlayer = defineFurniture(recordPlayer_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts index c95c624ed2..a10c71f5ac 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { rolledUpPoster_schema } from 'misskey-world/src/room/furnitures/rolledUpPoster.schema.js'; -export const rolledUpPoster = defineFuniture(rolledUpPoster_schema, { +export const rolledUpPoster = defineFurniture(rolledUpPoster_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts index 2ce8a55159..be5bde78a0 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { roundRug_schema } from 'misskey-world/src/room/furnitures/roundRug.schema.js'; -export const roundRug = defineFuniture(roundRug_schema, { +export const roundRug = defineFurniture(roundRug_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts index 044389f112..fef8974f40 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { router_schema } from 'misskey-world/src/room/furnitures/router.schema.js'; -export const router = defineFuniture(router_schema, { +export const router = defineFurniture(router_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts index f1e3f7f395..a1b243e043 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { siphon_schema } from 'misskey-world/src/room/furnitures/siphon.schema.js'; -export const siphon = defineFuniture(siphon_schema, { +export const siphon = defineFurniture(siphon_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts index c1850db50b..ecb286713e 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { snakeplant_schema } from 'misskey-world/src/room/furnitures/snakeplant.schema.js'; -export const snakeplant = defineFuniture(snakeplant_schema, { +export const snakeplant = defineFurniture(snakeplant_schema, { createInstance: ({ options, model }) => { const potMaterial = model.findMaterial('__X_POT__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts index db41347e85..63f4c682df 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { sofa_schema } from 'misskey-world/src/room/furnitures/sofa.schema.js'; -export const sofa = defineFuniture(sofa_schema, { +export const sofa = defineFurniture(sofa_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts index 9d152a3560..611a9261c4 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { speaker_schema } from 'misskey-world/src/room/furnitures/speaker.schema.js'; -export const speaker = defineFuniture(speaker_schema, { +export const speaker = defineFurniture(speaker_schema, { createInstance: ({ options, model }) => { const outerMaterial = model.findMaterial('__X_COVER__'); const innerMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts index bd0053cb7b..7a7f943793 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { speakerStand_schema } from 'misskey-world/src/room/furnitures/speakerStand.schema.js'; -export const speakerStand = defineFuniture(speakerStand_schema, { +export const speakerStand = defineFurniture(speakerStand_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts index ebd16e677a..16f7c83fe1 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { spotLight_schema } from 'misskey-world/src/room/furnitures/spotLight.schema.js'; -export const spotLight = defineFuniture(spotLight_schema, { +export const spotLight = defineFurniture(spotLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts index a1a2be1ad8..f54a576e5c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { sprayer_schema } from 'misskey-world/src/room/furnitures/sprayer.schema.js'; -export const sprayer = defineFuniture(sprayer_schema, { +export const sprayer = defineFurniture(sprayer_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts index 14b3a91c90..0f5f275de6 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { stanchionPole_schema } from 'misskey-world/src/room/furnitures/stanchionPole.schema.js'; -export const stanchionPole = defineFuniture(stanchionPole_schema, { +export const stanchionPole = defineFurniture(stanchionPole_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts index b4371da32a..6e5f2dd241 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts @@ -6,9 +6,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { steelRack_schema } from 'misskey-world/src/room/furnitures/steelRack.schema.js'; import { cm, remap } from 'misskey-world/src/utility.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const steelRack = defineFuniture(steelRack_schema, { +export const steelRack = defineFurniture(steelRack_schema, { path: (options) => { switch (options.widthAndDepthVariation) { case '60-35': return 'steel-rack/60-35'; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts index 5fd9e9256d..5984bebc7c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { stormGlass_schema } from 'misskey-world/src/room/furnitures/stormGlass.schema.js'; -export const stormGlass = defineFuniture(stormGlass_schema, { +export const stormGlass = defineFurniture(stormGlass_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts index bf1ffd7d2e..0eaf6c8266 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { tableSalt_schema } from 'misskey-world/src/room/furnitures/tableSalt.schema.js'; -export const tableSalt = defineFuniture(tableSalt_schema, { +export const tableSalt = defineFurniture(tableSalt_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts index d1e25f1028..72057296f5 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { tabletopCalendar_schema } from 'misskey-world/src/room/furnitures/tabletopCalendar.schema.js'; -export const tabletopCalendar = defineFuniture(tabletopCalendar_schema, { +export const tabletopCalendar = defineFurniture(tabletopCalendar_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts index fa6bb13795..304062baf2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts @@ -6,10 +6,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { tabletopDigitalClock_schema } from 'misskey-world/src/room/furnitures/tabletopDigitalClock.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { get7segMeshesOfCurrentTime } from '../../utility.js'; -export const tabletopDigitalClock = defineFuniture(tabletopDigitalClock_schema, { +export const tabletopDigitalClock = defineFurniture(tabletopDigitalClock_schema, { createInstance: ({ sr, options, model, timer }) => { const matrix = model.root.getWorldMatrix(true); const scale = new BABYLON.Vector3(); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts index f101ad0f2c..5078ff450c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { tabletopFlag_schema } from 'misskey-world/src/room/furnitures/tabletopFlag.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; -export const tabletopFlag = defineFuniture(tabletopFlag_schema, { +export const tabletopFlag = defineFurniture(tabletopFlag_schema, { createInstance: async ({ model, options, scene }) => { const flagMesh = model.findMesh('__X_FLAG__'); const flagMaterial = model.findMaterial('__X_FLAG__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts index b5d3344763..b406d32a34 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts @@ -4,11 +4,11 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; import { tabletopGlassPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopGlassPictureFrame.schema.js'; -export const tabletopGlassPictureFrame = defineFuniture(tabletopGlassPictureFrame_schema, { +export const tabletopGlassPictureFrame = defineFurniture(tabletopGlassPictureFrame_schema, { createInstance: async ({ scene, options, model }) => { const pictureMesh = model.findMesh('__X_PICTURE__'); const frameMesh = model.findMesh('__X_FRAME__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts index 76ef387efd..b9464b0819 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { tabletopIronFrameStand_schema } from 'misskey-world/src/room/furnitures/tabletopIronFrameStand.schema.js'; -export const tabletopIronFrameStand = defineFuniture(tabletopIronFrameStand_schema, { +export const tabletopIronFrameStand = defineFurniture(tabletopIronFrameStand_schema, { createInstance: ({ options, model }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); const boardMaterial = model.findMaterial('__X_BOARD__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts index 64082a06b1..3e8d159dc4 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts @@ -5,10 +5,10 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/furnitures/tabletopLcdButtonsController.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { normalizeUvToSquare } from '../../utility.js'; -export const tabletopLcdButtonsController = defineFuniture(tabletopLcdButtonsController_schema, { +export const tabletopLcdButtonsController = defineFurniture(tabletopLcdButtonsController_schema, { createInstance: async ({ model, options, scene }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); const screenMesh = model.findMesh('__X_SCREEN__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts index 931a451ddf..852f244bc7 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { tabletopPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopPictureFrame.schema.js'; // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする -export const tabletopPictureFrame = defineFuniture(tabletopPictureFrame_schema, { +export const tabletopPictureFrame = defineFurniture(tabletopPictureFrame_schema, { createInstance: async ({ scene, options, model }) => { const frameMesh = model.findMesh('__X_FRAME__'); frameMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts index 5e514c9570..95147c067c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts @@ -6,9 +6,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { remap } from 'misskey-world/src/utility.js'; import { tapestry_schema } from 'misskey-world/src/room/furnitures/tapestry.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; -export const tapestry = defineFuniture(tapestry_schema, { +export const tapestry = defineFurniture(tapestry_schema, { createInstance: async ({ scene, options, model }) => { const pictureMesh = model.findMesh('__X_PICTURE__'); pictureMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts index 8e5af6a684..83e829047c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { tetrapod_schema } from 'misskey-world/src/room/furnitures/tetrapod.schema.js'; -export const tetrapod = defineFuniture(tetrapod_schema, { +export const tetrapod = defineFurniture(tetrapod_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts index c32bad708f..40831cee66 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality, initTv } from '../utility.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { tv_schema } from 'misskey-world/src/room/furnitures/tv.schema.js'; -export const tv = defineFuniture(tv_schema, { +export const tv = defineFurniture(tv_schema, { createInstance: ({ options, lc, model, scene, timer, graphicsQuality }) => { const matrix = model.root.getWorldMatrix(true); const scale = new BABYLON.Vector3(); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts index 2e48611670..bbe56f5390 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { twistedCubeObjet_schema } from 'misskey-world/src/room/furnitures/twistedCubeObjet.schema.js'; -export const twistedCubeObjet = defineFuniture(twistedCubeObjet_schema, { +export const twistedCubeObjet = defineFurniture(twistedCubeObjet_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts index 30db290218..e0166a99d9 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { usedTissue_schema } from 'misskey-world/src/room/furnitures/usedTissue.schema.js'; -export const usedTissue = defineFuniture(usedTissue_schema, { +export const usedTissue = defineFurniture(usedTissue_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts index a5b7ad7a99..00ac1ecfcc 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; import { wallCanvas_schema } from 'misskey-world/src/room/furnitures/wallCanvas.schema.js'; -export const wallCanvas = defineFuniture(wallCanvas_schema, { +export const wallCanvas = defineFurniture(wallCanvas_schema, { createInstance: async ({ scene, options, model }) => { const canvasMesh = model.findMesh('__X_CANVAS__'); canvasMesh.rotationQuaternion = null; diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts index e16aa13f1d..d07cbfa4e4 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { wallClock_schema } from 'misskey-world/src/room/furnitures/wallClock.schema.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; -export const wallClock = defineFuniture(wallClock_schema, { +export const wallClock = defineFurniture(wallClock_schema, { createInstance: ({ sr, timer, options, model }) => { const hourHand = model.findMesh('__X_HAND_H__'); const minuteHand = model.findMesh('__X_HAND_M__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts index 52f7731d77..fc0bdeb35c 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts @@ -6,9 +6,9 @@ import * as BABYLON from '@babylonjs/core/pure.js'; import { remap } from 'misskey-world/src/utility.js'; import { wallGlassPictureFrame_schema } from 'misskey-world/src/room/furnitures/wallGlassPictureFrame.schema.js'; -import { createTextureManager, defineFuniture } from '../furniture.js'; +import { createTextureManager, defineFurniture } from '../furniture.js'; -export const wallGlassPictureFrame = defineFuniture(wallGlassPictureFrame_schema, { +export const wallGlassPictureFrame = defineFurniture(wallGlassPictureFrame_schema, { createInstance: async ({ scene, options, model }) => { const pictureMesh = model.findMesh('__X_PICTURE__'); const frameMesh = model.findMesh('__X_FRAME__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts index c8cb44c5df..f9f3c17694 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { wallMirror_schema } from 'misskey-world/src/room/furnitures/wallMirror.schema.js'; -export const wallMirror = defineFuniture(wallMirror_schema, { +export const wallMirror = defineFurniture(wallMirror_schema, { createInstance: async ({ options, model }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); const frameMesh = model.findMesh('__X_FRAME__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts index efa376da02..32e955c85b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { wallMountSpotLight_schema } from 'misskey-world/src/room/furnitures/wallMountSpotLight.schema.js'; -export const wallMountSpotLight = defineFuniture(wallMountSpotLight_schema, { +export const wallMountSpotLight = defineFurniture(wallMountSpotLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const bodyMesh = model.findMesh('__X_BODY__'); const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts index 73dcd09169..e5b44cebd4 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { wallShelf_schema } from 'misskey-world/src/room/furnitures/wallShelf.schema.js'; -export const wallShelf = defineFuniture(wallShelf_schema, { +export const wallShelf = defineFurniture(wallShelf_schema, { createInstance: ({ model, options }) => { const applyStyle = () => { const aMeshes = model.findMeshes('__X_VARIATION_A__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts index cf8ba1319a..1186e48317 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { wireBasket_schema } from 'misskey-world/src/room/furnitures/wireBasket.schema.js'; -export const wireBasket = defineFuniture(wireBasket_schema, { +export const wireBasket = defineFurniture(wireBasket_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts index 936aada026..7b68c8e5b6 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { wireNet_schema } from 'misskey-world/src/room/furnitures/wireNet.schema.js'; -export const wireNet = defineFuniture(wireNet_schema, { +export const wireNet = defineFurniture(wireNet_schema, { createInstance: ({ options, model }) => { const bodyMaterial = model.findMaterial('__X_BODY__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts index 82e78997d9..180d5eff93 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { woodRingFloorLamp_schema } from 'misskey-world/src/room/furnitures/woodRingFloorLamp.schema.js'; -export const woodRingFloorLamp = defineFuniture(woodRingFloorLamp_schema, { +export const woodRingFloorLamp = defineFurniture(woodRingFloorLamp_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const shadeMaterial = model.findMaterial('__X_SHADE__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts index fc379ee8a9..b2908404d2 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts @@ -4,12 +4,12 @@ */ import * as BABYLON from '@babylonjs/core/pure.js'; -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { woodRingsPendantLight_schema } from 'misskey-world/src/room/furnitures/woodRingsPendantLight.schema.js'; -export const woodRingsPendantLight = defineFuniture(woodRingsPendantLight_schema, { +export const woodRingsPendantLight = defineFurniture(woodRingsPendantLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { const shadeMaterial = model.findMaterial('__X_SHADE__'); diff --git a/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts index 7f621b7efd..57ad62053b 100644 --- a/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts @@ -3,10 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../furniture.js'; +import { defineFurniture } from '../furniture.js'; import { woodSoundAbsorbingPanel_schema } from 'misskey-world/src/room/furnitures/woodSoundAbsorbingPanel.schema.js'; -export const woodSoundAbsorbingPanel = defineFuniture(woodSoundAbsorbingPanel_schema, { +export const woodSoundAbsorbingPanel = defineFurniture(woodSoundAbsorbingPanel_schema, { createInstance: () => { return { interactions: {}, diff --git a/packages/frontend-misskey-world-engine/src/room/previewEngine.ts b/packages/frontend-misskey-world-engine/src/room/previewEngine.ts index c805918e14..eea4f84118 100644 --- a/packages/frontend-misskey-world-engine/src/room/previewEngine.ts +++ b/packages/frontend-misskey-world-engine/src/room/previewEngine.ts @@ -172,7 +172,7 @@ export class RoomFurniturePreviewEngine extends EngineBase<{ //} } - public async loadFuniture(type: string) { + public async loadFurniture(type: string) { this.sr.disableSnapshotRendering(); this.clearFurniture(); diff --git a/packages/frontend-misskey-world-engine/src/room/utility.ts b/packages/frontend-misskey-world-engine/src/room/utility.ts index 54c89d274f..faf89bca3a 100644 --- a/packages/frontend-misskey-world-engine/src/room/utility.ts +++ b/packages/frontend-misskey-world-engine/src/room/utility.ts @@ -190,7 +190,7 @@ export class ModelManager { public findMesh(keyword: string) { const mesh = this.root.getChildMeshes().find(m => m.name.includes(keyword)); if (mesh == null) { - throw new Error(`Mesh with keyword "${keyword}" not found for furniture ${this.root.metadata?.funitureType}`); + throw new Error(`Mesh with keyword "${keyword}" not found for furniture ${this.root.metadata?.furnitureType}`); } return mesh as BABYLON.Mesh; } @@ -207,7 +207,7 @@ export class ModelManager { public findTransformNode(keyword: string) { const node = this.root.getChildTransformNodes().find(n => n.name.includes(keyword)); if (node == null) { - throw new Error(`TransformNode with keyword "${keyword}" not found for furniture ${this.root.metadata?.funitureType}`); + throw new Error(`TransformNode with keyword "${keyword}" not found for furniture ${this.root.metadata?.furnitureType}`); } return node; } diff --git a/packages/frontend/src/world/room/controller.ts b/packages/frontend/src/world/room/controller.ts index 5b3aea548c..3308ed07a2 100644 --- a/packages/frontend/src/world/room/controller.ts +++ b/packages/frontend/src/world/room/controller.ts @@ -38,7 +38,7 @@ export class RoomController extends EngineControllerBase