diff --git a/packages/backend/src/core/WorldRoomService.ts b/packages/backend/src/core/WorldRoomService.ts index d6a3f0d1f8..0fdd451c41 100644 --- a/packages/backend/src/core/WorldRoomService.ts +++ b/packages/backend/src/core/WorldRoomService.ts @@ -159,7 +159,8 @@ export class WorldRoomService { @bindThis public collectReferencedDriveFileIds(roomState: MiWorldRoom['def']): Set { const fileIds = new Set(); - for (const o of roomState.installedFurnitures) { + const installedFurnitures = roomState.installedFurnitures ?? roomState.installedObjects; // 後方互換性のため + for (const o of installedFurnitures) { const def = driveFileReferencingOptions[o.type]; if (def == null) continue; for (const key of def) { diff --git a/packages/frontend-misskey-world-engine/src/room/ObjectContainer.ts b/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts similarity index 98% rename from packages/frontend-misskey-world-engine/src/room/ObjectContainer.ts rename to packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts index 522b2e3fde..270489e114 100644 --- a/packages/frontend-misskey-world-engine/src/room/ObjectContainer.ts +++ b/packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts @@ -7,9 +7,9 @@ import * as BABYLON from '@babylonjs/core'; import { camelToKebab, WORLD_SCALE } from 'misskey-world/src/utility.js'; import { scaleMorph, Timer } from '../utility.js'; import { convertRawOptions, type ConvertedOptions, type RawOptions } from '../mono.js'; -import { getFurnitureDef } from './object-defs.js'; +import { getFurnitureDef } from './furniture-defs.js'; import { ModelManager, SYSTEM_MESH_NAMES } from './utility.js'; -import type { RoomFunitureInstance } from './object.js'; +import type { RoomFunitureInstance } from './furniture.js'; import type { RoomAttachments } from 'misskey-world/src/room/type.js'; function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) { diff --git a/packages/frontend-misskey-world-engine/src/room/engine.ts b/packages/frontend-misskey-world-engine/src/room/engine.ts index 3094d51306..27976e6ee7 100644 --- a/packages/frontend-misskey-world-engine/src/room/engine.ts +++ b/packages/frontend-misskey-world-engine/src/room/engine.ts @@ -24,11 +24,11 @@ import { EngineBase } from '../EngineBase.js'; import { genId } from '../id.js'; import { deepClone } from '../clone.js'; import { PlayerContainer, type PlayerProfile, type PlayerState } from '../PlayerContainer.js'; -import { getFurnitureDef } from './object-defs.js'; +import { getFurnitureDef } from './furniture-defs.js'; import { SYSTEM_HEYA_MESH_NAMES, SYSTEM_MESH_NAMES } from './utility.js'; import { JapaneseEnvManager, MuseumEnvManager, SimpleEnvManager } from './env.js'; import { FurnitureContainer } from './FurnitureContainer.js'; -import type { FurnitureDef, RawOptions } from './object.js'; +import type { FurnitureDef, RawOptions } from './furniture.js'; import type { GridMaterial } from '@babylonjs/materials'; import type { EnvManager } from './env.js'; import type { RoomState_InstalledFurniture } from 'misskey-world/src/room/object.js'; diff --git a/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts b/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts new file mode 100644 index 0000000000..f4d5167a63 --- /dev/null +++ b/packages/frontend-misskey-world-engine/src/room/furniture-defs.ts @@ -0,0 +1,236 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { a4Case } from './furnitures/a4Case.js'; +import { aircon } from './furnitures/aircon.js'; +import { allInOnePc } from './furnitures/allInOnePc.js'; +import { aquarium } from './furnitures/aquarium.js'; +import { aromaReedDiffuser } from './furnitures/aromaReedDiffuser.js'; +import { banknote } from './furnitures/banknote.js'; +import { beamLamp } from './furnitures/beamLamp.js'; +import { bed } from './furnitures/bed.js'; +import { blind } from './furnitures/blind.js'; +import { book } from './furnitures/book.js'; +import { books } from './furnitures/books.js'; +import { boxWallShelf } from './furnitures/boxWallShelf.js'; +import { cactusS } from './furnitures/cactusS.js'; +import { cardboardBox } from './furnitures/cardboardBox.js'; +import { ceilingFanLight } from './furnitures/ceilingFanLight.js'; +import { chair } from './furnitures/chair.js'; +import { clippedPicture } from './furnitures/clippedPicture.js'; +import { coffeeCup } from './furnitures/coffeeCup.js'; +import { colorBox } from './furnitures/colorBox.js'; +import { cuboid } from './furnitures/cuboid.js'; +import { cupNoodle } from './furnitures/cupNoodle.js'; +import { curtain } from './furnitures/curtain.js'; +import { custardPudding } from './furnitures/custardPudding.js'; +import { debugHipoly } from './furnitures/debugHipoly.js'; +import { debugMetal } from './furnitures/debugMetal.js'; +import { descriptionPlate } from './furnitures/descriptionPlate.js'; +import { desk } from './furnitures/desk.js'; +import { desktopPc } from './furnitures/desktopPc.js'; +import { djMixer } from './furnitures/djMixer.js'; +import { djPlayer } from './furnitures/djPlayer.js'; +import { ductRailSpotLights } from './furnitures/ductRailSpotLights.js'; +import { ductTape } from './furnitures/ductTape.js'; +import { electronicDisplayBoard } from './furnitures/electronicDisplayBoard.js'; +import { emptyBento } from './furnitures/emptyBento.js'; +import { energyDrink } from './furnitures/energyDrink.js'; +import { envelope } from './furnitures/envelope.js'; +import { facialTissue } from './furnitures/facialTissue.js'; +import { glassCylinderPotPlant } from './furnitures/glassCylinderPotPlant.js'; +import { handheldGameConsole } from './furnitures/handheldGameConsole.js'; +import { hangingDuctRail } from './furnitures/hangingDuctRail.js'; +import { hangingTShirt } from './furnitures/hangingTShirt.js'; +import { icosahedron } from './furnitures/icosahedron.js'; +import { ironFrameShelf } from './furnitures/ironFrameShelf.js'; +import { ironFrameTable } from './furnitures/ironFrameTable.js'; +import { issyoubin } from './furnitures/issyoubin.js'; +import { keyboard } from './furnitures/keyboard.js'; +import { laptopPc } from './furnitures/laptopPc.js'; +import { largeMousepad } from './furnitures/largeMousepad.js'; +import { lavaLamp } from './furnitures/lavaLamp.js'; +import { letterCase } from './furnitures/letterCase.js'; +import { lowPartitionBar } from './furnitures/lowPartitionBar.js'; +import { miObjet } from './furnitures/miObjet.js'; +import { milk } from './furnitures/milk.js'; +import { miPlate } from './furnitures/miPlate.js'; +import { miPlateDisplayed } from './furnitures/miPlateDisplayed.js'; +import { mixer } from './furnitures/mixer.js'; +import { monitor } from './furnitures/monitor.js'; +import { monitorSpeaker } from './furnitures/monitorSpeaker.js'; +import { monstera } from './furnitures/monstera.js'; +import { mug } from './furnitures/mug.js'; +import { newtonsCradle } from './furnitures/newtonsCradle.js'; +import { openedCardboardBox } from './furnitures/openedCardboardBox.js'; +import { pachira } from './furnitures/pachira.js'; +import { petBottle } from './furnitures/petBottle.js'; +import { piano } from './furnitures/piano.js'; +import { pictureFrame } from './furnitures/pictureFrame.js'; +import { pizza } from './furnitures/pizza.js'; +import { plant } from './furnitures/plant.js'; +import { plant2 } from './furnitures/plant2.js'; +import { poster } from './furnitures/poster.js'; +import { powerStrip } from './furnitures/powerStrip.js'; +import { radiometer } from './furnitures/radiometer.js'; +import { randomBooks } from './furnitures/randomBooks.js'; +import { recordPlayer } from './furnitures/recordPlayer.js'; +import { rolledUpPoster } from './furnitures/rolledUpPoster.js'; +import { roundRug } from './furnitures/roundRug.js'; +import { router } from './furnitures/router.js'; +import { siphon } from './furnitures/siphon.js'; +import { snakeplant } from './furnitures/snakeplant.js'; +import { sofa } from './furnitures/sofa.js'; +import { speaker } from './furnitures/speaker.js'; +import { speakerStand } from './furnitures/speakerStand.js'; +import { spotLight } from './furnitures/spotLight.js'; +import { sprayer } from './furnitures/sprayer.js'; +import { stanchionPole } from './furnitures/stanchionPole.js'; +import { steelRack } from './furnitures/steelRack.js'; +import { stormGlass } from './furnitures/stormGlass.js'; +import { tableSalt } from './furnitures/tableSalt.js'; +import { tabletopCalendar } from './furnitures/tabletopCalendar.js'; +import { tabletopDigitalClock } from './furnitures/tabletopDigitalClock.js'; +import { tabletopFlag } from './furnitures/tabletopFlag.js'; +import { tabletopGlassPictureFrame } from './furnitures/tabletopGlassPictureFrame.js'; +import { tabletopIronFrameStand } from './furnitures/tabletopIronFrameStand.js'; +import { tabletopLcdButtonsController } from './furnitures/tabletopLcdButtonsController.js'; +import { tabletopPictureFrame } from './furnitures/tabletopPictureFrame.js'; +import { tapestry } from './furnitures/tapestry.js'; +import { tetrapod } from './furnitures/tetrapod.js'; +import { tv } from './furnitures/tv.js'; +import { twistedCubeObjet } from './furnitures/twistedCubeObjet.js'; +import { usedTissue } from './furnitures/usedTissue.js'; +import { wallCanvas } from './furnitures/wallCanvas.js'; +import { wallClock } from './furnitures/wallClock.js'; +import { wallGlassPictureFrame } from './furnitures/wallGlassPictureFrame.js'; +import { wallMirror } from './furnitures/wallMirror.js'; +import { wallMountSpotLight } from './furnitures/wallMountSpotLight.js'; +import { wallShelf } from './furnitures/wallShelf.js'; +import { wireBasket } from './furnitures/wireBasket.js'; +import { wireNet } from './furnitures/wireNet.js'; +import { woodRingFloorLamp } from './furnitures/woodRingFloorLamp.js'; +import { woodRingsPendantLight } from './furnitures/woodRingsPendantLight.js'; +import { woodSoundAbsorbingPanel } from './furnitures/woodSoundAbsorbingPanel.js'; + +export const FUNITURE_DEFS = [ + a4Case, + aircon, + allInOnePc, + aquarium, + aromaReedDiffuser, + banknote, + beamLamp, + bed, + blind, + books, + boxWallShelf, + cactusS, + cardboardBox, + ceilingFanLight, + chair, + coffeeCup, + colorBox, + cuboid, + cupNoodle, + custardPudding, + desk, + desktopPc, + djMixer, + djPlayer, + ductRailSpotLights, + ductTape, + electronicDisplayBoard, + emptyBento, + energyDrink, + envelope, + facialTissue, + glassCylinderPotPlant, + hangingTShirt, + icosahedron, + ironFrameShelf, + ironFrameTable, + issyoubin, + keyboard, + laptopPc, + largeMousepad, + lavaLamp, + letterCase, + miObjet, + milk, + miPlate, + miPlateDisplayed, + mixer, + monitor, + monitorSpeaker, + monstera, + mug, + newtonsCradle, + openedCardboardBox, + pachira, + petBottle, + piano, + pictureFrame, + pizza, + plant, + plant2, + poster, + powerStrip, + radiometer, + randomBooks, + recordPlayer, + rolledUpPoster, + roundRug, + router, + siphon, + snakeplant, + sofa, + speaker, + speakerStand, + sprayer, + steelRack, + stormGlass, + tableSalt, + tabletopCalendar, + tabletopDigitalClock, + tabletopFlag, + tabletopGlassPictureFrame, + tabletopIronFrameStand, + tabletopPictureFrame, + tabletopLcdButtonsController, + tapestry, + tetrapod, + tv, + twistedCubeObjet, + usedTissue, + wallCanvas, + wallClock, + wallGlassPictureFrame, + wallMirror, + wallMountSpotLight, + wallShelf, + woodRingFloorLamp, + woodRingsPendantLight, + woodSoundAbsorbingPanel, + hangingDuctRail, + spotLight, + lowPartitionBar, + descriptionPlate, + stanchionPole, + handheldGameConsole, + debugMetal, + curtain, + wireNet, + clippedPicture, + wireBasket, +] as FurnitureDef[]; + +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}`); + } + return def; +} diff --git a/packages/frontend-misskey-world-engine/src/room/object.ts b/packages/frontend-misskey-world-engine/src/room/furniture.ts similarity index 100% rename from packages/frontend-misskey-world-engine/src/room/object.ts rename to packages/frontend-misskey-world-engine/src/room/furniture.ts diff --git a/packages/frontend-misskey-world-engine/src/room/objects/a4Case.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/a4Case.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts index 937c8004a2..7f5b5f7ae8 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/a4Case.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { a4Case_schema } from 'misskey-world/src/room/objects/a4Case.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { a4Case_schema } from 'misskey-world/src/room/furnitures/a4Case.schema.js'; export const a4Case = defineFuniture(a4Case_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/aircon.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/aircon.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts index 6e7037ee57..411d84de0a 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/aircon.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { aircon_schema } from 'misskey-world/src/room/objects/aircon.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { aircon_schema } from 'misskey-world/src/room/furnitures/aircon.schema.js'; export const aircon = defineFuniture(aircon_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/allInOnePc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/allInOnePc.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts index a8a0ef4f68..68453883b6 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/allInOnePc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts @@ -5,8 +5,8 @@ import * as BABYLON from '@babylonjs/core'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { allInOnePc_schema } from 'misskey-world/src/room/objects/allInOnePc.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { allInOnePc_schema } from 'misskey-world/src/room/furnitures/allInOnePc.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; export const allInOnePc = defineFuniture(allInOnePc_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/aquarium.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts similarity index 92% rename from packages/frontend-misskey-world-engine/src/room/objects/aquarium.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts index 3b6f648a5f..0a94c9e919 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/aquarium.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; -import { aquarium_schema } from 'misskey-world/src/room/objects/aquarium.schema.js'; +import { aquarium_schema } from 'misskey-world/src/room/furnitures/aquarium.schema.js'; export const aquarium = defineFuniture(aquarium_schema, { createInstance: ({ scene, root }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/aromaReedDiffuser.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts similarity index 92% rename from packages/frontend-misskey-world-engine/src/room/objects/aromaReedDiffuser.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts index 01c658d790..717708d95a 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/aromaReedDiffuser.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { aromaReedDiffuser_schema } from 'misskey-world/src/room/objects/aromaReedDiffuser.schema.js'; -import { defineFuniture } from '../object.js'; +import { aromaReedDiffuser_schema } from 'misskey-world/src/room/furnitures/aromaReedDiffuser.schema.js'; +import { defineFuniture } from '../furniture.js'; export const aromaReedDiffuser = defineFuniture(aromaReedDiffuser_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/banknote.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/banknote.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts index 6dc18e5601..1806a4664d 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/banknote.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { banknote_schema } from 'misskey-world/src/room/objects/banknote.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { banknote_schema } from 'misskey-world/src/room/furnitures/banknote.schema.js'; export const banknote = defineFuniture(banknote_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/beamLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts similarity index 88% rename from packages/frontend-misskey-world-engine/src/room/objects/beamLamp.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts index 7514c9e6cc..52c830745f 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/beamLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/beamLamp.schema.js'; +import { beamLamp_schema } from 'misskey-world/src/room/furnitures/beamLamp.schema.js'; export const beamLamp = defineFuniture(beamLamp_schema, { createInstance: ({ lc, root, scene, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/bed.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts similarity index 86% rename from packages/frontend-misskey-world-engine/src/room/objects/bed.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts index 00ead72c75..f6068f5cc5 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/bed.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { bed_schema } from 'misskey-world/src/room/objects/bed.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { bed_schema } from 'misskey-world/src/room/furnitures/bed.schema.js'; export const bed = defineFuniture(bed_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/blind.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/blind.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts index f9b7e14264..f4b6dee1b4 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/blind.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/blind.schema.js'; +import { blind_schema } from 'misskey-world/src/room/furnitures/blind.schema.js'; export const blind = defineFuniture(blind_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/book.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts similarity index 87% rename from packages/frontend-misskey-world-engine/src/room/objects/book.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/book.ts index 059cccdec2..ce2bf77878 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/book.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/book.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { book_schema } from 'misskey-world/src/room/objects/book.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { book_schema } from 'misskey-world/src/room/furnitures/book.schema.js'; export const book = defineFuniture(book_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/books.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/books.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/books.ts index adb43ce890..e583b22669 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/books.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/books.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; -import { books_schema } from 'misskey-world/src/room/objects/books.schema.js'; +import { books_schema } from 'misskey-world/src/room/furnitures/books.schema.js'; export const books = defineFuniture(books_schema, { createInstance: ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/boxWallShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/boxWallShelf.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts index a24ad4c16f..2521075a07 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/boxWallShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { boxWallShelf_schema } from 'misskey-world/src/room/objects/boxWallShelf.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { boxWallShelf_schema } from 'misskey-world/src/room/furnitures/boxWallShelf.schema.js'; export const boxWallShelf = defineFuniture(boxWallShelf_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/cactusS.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts similarity index 83% rename from packages/frontend-misskey-world-engine/src/room/objects/cactusS.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts index fe0d9b7861..280f909b2b 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/cactusS.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { cactusS_schema } from 'misskey-world/src/room/objects/cactusS.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { cactusS_schema } from 'misskey-world/src/room/furnitures/cactusS.schema.js'; export const cactusS = defineFuniture(cactusS_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/cardboardBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts similarity index 89% rename from packages/frontend-misskey-world-engine/src/room/objects/cardboardBox.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts index 477412a5e1..a7d488fc6b 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/cardboardBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { cardboardBox_schema } from 'misskey-world/src/room/objects/cardboardBox.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { cardboardBox_schema } from 'misskey-world/src/room/furnitures/cardboardBox.schema.js'; export const cardboardBox = defineFuniture(cardboardBox_schema, { createInstance: ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/ceilingFanLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/ceilingFanLight.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts index 0e7b72f7d3..aa7d519160 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/ceilingFanLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { ceilingFanLight_schema } from 'misskey-world/src/room/objects/ceilingFanLight.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { ceilingFanLight_schema } from 'misskey-world/src/room/furnitures/ceilingFanLight.schema.js'; export const ceilingFanLight = defineFuniture(ceilingFanLight_schema, { createInstance: ({ options, sr, scene, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/chair.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/chair.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts index d919116f7f..0218011700 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/chair.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { chair_schema } from 'misskey-world/src/room/objects/chair.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { chair_schema } from 'misskey-world/src/room/furnitures/chair.schema.js'; export const chair = defineFuniture(chair_schema, { createInstance: ({ model, options, sitChair }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/clippedPicture.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/clippedPicture.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts index 3400e7f426..7c614a537a 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/clippedPicture.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; -import { clippedPicture_schema } from 'misskey-world/src/room/objects/clippedPicture.schema.js'; +import { clippedPicture_schema } from 'misskey-world/src/room/furnitures/clippedPicture.schema.js'; export const clippedPicture = defineFuniture(clippedPicture_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/coffeeCup.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/coffeeCup.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts index 7c10371907..af7b0fce06 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/coffeeCup.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { coffeeCup_schema } from 'misskey-world/src/room/objects/coffeeCup.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { coffeeCup_schema } from 'misskey-world/src/room/furnitures/coffeeCup.schema.js'; export const coffeeCup = defineFuniture(coffeeCup_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/colorBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts similarity index 83% rename from packages/frontend-misskey-world-engine/src/room/objects/colorBox.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts index e3b0a07a79..00a4f095e5 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/colorBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { colorBox_schema } from 'misskey-world/src/room/objects/colorBox.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { colorBox_schema } from 'misskey-world/src/room/furnitures/colorBox.schema.js'; export const colorBox = defineFuniture(colorBox_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/cuboid.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts similarity index 89% rename from packages/frontend-misskey-world-engine/src/room/objects/cuboid.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts index c28b75a453..9cebdc51fd 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/cuboid.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { cuboid_schema } from 'misskey-world/src/room/objects/cuboid.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { cuboid_schema } from 'misskey-world/src/room/furnitures/cuboid.schema.js'; export const cuboid = defineFuniture(cuboid_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/cupNoodle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts similarity index 80% rename from packages/frontend-misskey-world-engine/src/room/objects/cupNoodle.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts index 4478dfdec1..5bbad1ec50 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/cupNoodle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } from '../furniture.js'; import { cm } from 'misskey-world/src/utility.js'; import { yuge } from '../utility.js'; -import { cupNoodle_schema } from 'misskey-world/src/room/objects/cupNoodle.schema.js'; +import { cupNoodle_schema } from 'misskey-world/src/room/furnitures/cupNoodle.schema.js'; export const cupNoodle = defineFuniture(cupNoodle_schema, { createInstance: ({ scene, root, sr }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/curtain.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/curtain.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts index d48ed876b8..bacdc41841 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/curtain.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { curtain_schema } from 'misskey-world/src/room/objects/curtain.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { curtain_schema } from 'misskey-world/src/room/furnitures/curtain.schema.js'; export const curtain = defineFuniture(curtain_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/custardPudding.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/custardPudding.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts index c4e8f7881c..55ce48b5f5 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/custardPudding.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { custardPudding_schema } from 'misskey-world/src/room/objects/custardPudding.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { custardPudding_schema } from 'misskey-world/src/room/furnitures/custardPudding.schema.js'; export const custardPudding = defineFuniture(custardPudding_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/debugHipoly.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/debugHipoly.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts index c0d02ce523..f8e03c73ba 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/debugHipoly.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { debugHipoly_schema } from 'misskey-world/src/room/objects/debugHipoly.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { debugHipoly_schema } from 'misskey-world/src/room/furnitures/debugHipoly.schema.js'; export const debugHipoly = defineFuniture(debugHipoly_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/debugMetal.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/debugMetal.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts index d71514b3aa..fc231cca4e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/debugMetal.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { debugMetal_schema } from 'misskey-world/src/room/objects/debugMetal.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { debugMetal_schema } from 'misskey-world/src/room/furnitures/debugMetal.schema.js'; export const debugMetal = defineFuniture(debugMetal_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/descriptionPlate.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts similarity index 78% rename from packages/frontend-misskey-world-engine/src/room/objects/descriptionPlate.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts index 727e32fb81..430d0b4e76 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/descriptionPlate.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { descriptionPlate_schema } from 'misskey-world/src/room/objects/descriptionPlate.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { descriptionPlate_schema } from 'misskey-world/src/room/furnitures/descriptionPlate.schema.js'; export const descriptionPlate = defineFuniture(descriptionPlate_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/desk.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/desk.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts index 195a35ac5b..93d03bff21 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/desk.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { desk_schema } from 'misskey-world/src/room/objects/desk.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { desk_schema } from 'misskey-world/src/room/furnitures/desk.schema.js'; export const desk = defineFuniture(desk_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/desktopPc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/desktopPc.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts index d38f815c07..cd82c8e7b9 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/desktopPc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/desktopPc.schema.js'; +import { desktopPc_schema } from 'misskey-world/src/room/furnitures/desktopPc.schema.js'; export const desktopPc = defineFuniture(desktopPc_schema, { createInstance: ({ options, model, root, scene, lc, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/djMixer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/djMixer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts index 86c8a8ccb0..504c330a26 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/djMixer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { djMixer_schema } from 'misskey-world/src/room/objects/djMixer.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { djMixer_schema } from 'misskey-world/src/room/furnitures/djMixer.schema.js'; export const djMixer = defineFuniture(djMixer_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/djPlayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts similarity index 90% rename from packages/frontend-misskey-world-engine/src/room/objects/djPlayer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts index f00469a128..699ab62369 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/djPlayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { djPlayer_schema } from 'misskey-world/src/room/objects/djPlayer.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { djPlayer_schema } from 'misskey-world/src/room/furnitures/djPlayer.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { normalizeUvToSquare } from '../../utility.js'; export const djPlayer = defineFuniture(djPlayer_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/ductRailSpotLights.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/ductRailSpotLights.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts index 487734ac29..cba97be922 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/ductRailSpotLights.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/ductRailSpotLights.schema.js'; +import { ductRailSpotLights_schema } from 'misskey-world/src/room/furnitures/ductRailSpotLights.schema.js'; export const ductRailSpotLights = defineFuniture(ductRailSpotLights_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/ductTape.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/ductTape.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts index f593161a25..17bf6c4586 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/ductTape.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { ductTape_schema } from 'misskey-world/src/room/objects/ductTape.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { ductTape_schema } from 'misskey-world/src/room/furnitures/ductTape.schema.js'; export const ductTape = defineFuniture(ductTape_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/electronicDisplayBoard.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/electronicDisplayBoard.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts index 473b04a1a5..a5bf3b0010 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/electronicDisplayBoard.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { electronicDisplayBoard_schema } from 'misskey-world/src/room/objects/electronicDisplayBoard.schema.js'; -import { defineFuniture } from '../object.js'; +import { electronicDisplayBoard_schema } from 'misskey-world/src/room/furnitures/electronicDisplayBoard.schema.js'; +import { defineFuniture } from '../furniture.js'; import { RecyvlingTextGrid } from '../../utility.js'; export const electronicDisplayBoard = defineFuniture(electronicDisplayBoard_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/emptyBento.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/emptyBento.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts index 0212b885b6..0bb9887696 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/emptyBento.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { emptyBento_schema } from 'misskey-world/src/room/objects/emptyBento.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { emptyBento_schema } from 'misskey-world/src/room/furnitures/emptyBento.schema.js'; export const emptyBento = defineFuniture(emptyBento_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/energyDrink.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/energyDrink.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts index 7a184cd742..a4cafeae0f 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/energyDrink.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { energyDrink_schema } from 'misskey-world/src/room/objects/energyDrink.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { energyDrink_schema } from 'misskey-world/src/room/furnitures/energyDrink.schema.js'; export const energyDrink = defineFuniture(energyDrink_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/envelope.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/envelope.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts index 1528accddb..c8b209ed80 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/envelope.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { envelope_schema } from 'misskey-world/src/room/objects/envelope.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { envelope_schema } from 'misskey-world/src/room/furnitures/envelope.schema.js'; export const envelope = defineFuniture(envelope_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/facialTissue.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/facialTissue.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts index 2d0e8e3949..b965d92790 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/facialTissue.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { facialTissue_schema } from 'misskey-world/src/room/objects/facialTissue.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { facialTissue_schema } from 'misskey-world/src/room/furnitures/facialTissue.schema.js'; export const facialTissue = defineFuniture(facialTissue_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/glassCylinderPotPlant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts similarity index 77% rename from packages/frontend-misskey-world-engine/src/room/objects/glassCylinderPotPlant.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts index a8ded59045..3defee3360 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/glassCylinderPotPlant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { glassCylinderPotPlant_schema } from 'misskey-world/src/room/objects/glassCylinderPotPlant.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { glassCylinderPotPlant_schema } from 'misskey-world/src/room/furnitures/glassCylinderPotPlant.schema.js'; export const glassCylinderPotPlant = defineFuniture(glassCylinderPotPlant_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/handheldGameConsole.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts similarity index 94% rename from packages/frontend-misskey-world-engine/src/room/objects/handheldGameConsole.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts index fc94a7f53e..85d61bca49 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/handheldGameConsole.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { handheldGameConsole_schema } from 'misskey-world/src/room/objects/handheldGameConsole.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { handheldGameConsole_schema } from 'misskey-world/src/room/furnitures/handheldGameConsole.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; export const handheldGameConsole = defineFuniture(handheldGameConsole_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/hangingDuctRail.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts similarity index 90% rename from packages/frontend-misskey-world-engine/src/room/objects/hangingDuctRail.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts index e7c724f621..0c4a09c438 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/hangingDuctRail.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { hangingDuctRail_schema } from 'misskey-world/src/room/objects/hangingDuctRail.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { hangingDuctRail_schema } from 'misskey-world/src/room/furnitures/hangingDuctRail.schema.js'; export const hangingDuctRail = defineFuniture(hangingDuctRail_schema, { createInstance: async ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/hangingTShirt.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/hangingTShirt.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts index 67b8288352..5f51b66c0a 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/hangingTShirt.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { hangingTShirt_schema } from 'misskey-world/src/room/objects/hangingTShirt.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { hangingTShirt_schema } from 'misskey-world/src/room/furnitures/hangingTShirt.schema.js'; export const hangingTShirt = defineFuniture(hangingTShirt_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/icosahedron.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts similarity index 83% rename from packages/frontend-misskey-world-engine/src/room/objects/icosahedron.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts index 81f427b2a5..07c8cd39f4 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/icosahedron.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { icosahedron_schema } from 'misskey-world/src/room/objects/icosahedron.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { icosahedron_schema } from 'misskey-world/src/room/furnitures/icosahedron.schema.js'; export const icosahedron = defineFuniture(icosahedron_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/ironFrameShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts similarity index 92% rename from packages/frontend-misskey-world-engine/src/room/objects/ironFrameShelf.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts index dc11ced227..9c51bf6b07 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/ironFrameShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { ironFrameShelf_schema } from 'misskey-world/src/room/objects/ironFrameShelf.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { ironFrameShelf_schema } from 'misskey-world/src/room/furnitures/ironFrameShelf.schema.js'; export const ironFrameShelf = defineFuniture(ironFrameShelf_schema, { path: (options) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/ironFrameTable.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/ironFrameTable.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts index 100440e7f1..382ba3c8ee 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/ironFrameTable.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { ironFrameTable_schema } from 'misskey-world/src/room/objects/ironFrameTable.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { ironFrameTable_schema } from 'misskey-world/src/room/furnitures/ironFrameTable.schema.js'; export const ironFrameTable = defineFuniture(ironFrameTable_schema, { createInstance: ({ options, model, stickyMarkerMeshUpdated }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/issyoubin.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/issyoubin.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts index 17d84c184d..34a14150c1 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/issyoubin.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { issyoubin_schema } from 'misskey-world/src/room/objects/issyoubin.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { issyoubin_schema } from 'misskey-world/src/room/furnitures/issyoubin.schema.js'; export const issyoubin = defineFuniture(issyoubin_schema, { createInstance: ({ model, options, scene }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/keyboard.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts similarity index 89% rename from packages/frontend-misskey-world-engine/src/room/objects/keyboard.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts index 2fb90d8ab4..d8f7d8d3d6 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/keyboard.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { keyboard_schema } from 'misskey-world/src/room/objects/keyboard.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { keyboard_schema } from 'misskey-world/src/room/furnitures/keyboard.schema.js'; export const keyboard = defineFuniture(keyboard_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/laptopPc.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/laptopPc.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts index 5ae158a888..ea666bc07c 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/laptopPc.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts @@ -5,8 +5,8 @@ import * as BABYLON from '@babylonjs/core'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { laptopPc_schema } from 'misskey-world/src/room/objects/laptopPc.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { laptopPc_schema } from 'misskey-world/src/room/furnitures/laptopPc.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; export const laptopPc = defineFuniture(laptopPc_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/largeMousepad.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts similarity index 86% rename from packages/frontend-misskey-world-engine/src/room/objects/largeMousepad.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts index fedd9c2b0d..a5a8b438af 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/largeMousepad.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; -import { largeMousepad_schema } from 'misskey-world/src/room/objects/largeMousepad.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; +import { largeMousepad_schema } from 'misskey-world/src/room/furnitures/largeMousepad.schema.js'; export const largeMousepad = defineFuniture(largeMousepad_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/lavaLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts similarity index 97% rename from packages/frontend-misskey-world-engine/src/room/objects/lavaLamp.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts index c64fcd3882..9b3c852127 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/lavaLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import * as BABYLON from '@babylonjs/core'; -import { lavaLamp_schema } from 'misskey-world/src/room/objects/lavaLamp.schema.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 '../object.js'; +import { defineFuniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; export const lavaLamp = defineFuniture(lavaLamp_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/letterCase.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/letterCase.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts index ae9d240b24..b75f633c7d 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/letterCase.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { letterCase_schema } from 'misskey-world/src/room/objects/letterCase.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { letterCase_schema } from 'misskey-world/src/room/furnitures/letterCase.schema.js'; export const letterCase = defineFuniture(letterCase_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/lowPartitionBar.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts similarity index 87% rename from packages/frontend-misskey-world-engine/src/room/objects/lowPartitionBar.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts index 14811b53b3..b81e318df8 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/lowPartitionBar.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { lowPartitionBar_schema } from 'misskey-world/src/room/objects/lowPartitionBar.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { lowPartitionBar_schema } from 'misskey-world/src/room/furnitures/lowPartitionBar.schema.js'; export const lowPartitionBar = defineFuniture(lowPartitionBar_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/miObjet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/miObjet.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts index 2c39eda58c..58fb16bbe3 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/miObjet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { miObjet_schema } from 'misskey-world/src/room/objects/miObjet.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { miObjet_schema } from 'misskey-world/src/room/furnitures/miObjet.schema.js'; export const miObjet = defineFuniture(miObjet_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/miPlate.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/miPlate.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts index 51734aca99..e11f681ba9 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/miPlate.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { miPlate_schema } from 'misskey-world/src/room/objects/miPlate.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { miPlate_schema } from 'misskey-world/src/room/furnitures/miPlate.schema.js'; export const miPlate = defineFuniture(miPlate_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/miPlateDisplayed.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts similarity index 78% rename from packages/frontend-misskey-world-engine/src/room/objects/miPlateDisplayed.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts index 56c07a36db..7a2e265431 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/miPlateDisplayed.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { miPlateDisplayed_schema } from 'misskey-world/src/room/objects/miPlateDisplayed.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { miPlateDisplayed_schema } from 'misskey-world/src/room/furnitures/miPlateDisplayed.schema.js'; export const miPlateDisplayed = defineFuniture(miPlateDisplayed_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/milk.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/milk.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts index 264072b76c..b8cb44b54c 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/milk.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { milk_schema } from 'misskey-world/src/room/objects/milk.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { milk_schema } from 'misskey-world/src/room/furnitures/milk.schema.js'; export const milk = defineFuniture(milk_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/mixer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/mixer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts index db56e19c62..ba75cb374b 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/mixer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { mixer_schema } from 'misskey-world/src/room/objects/mixer.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { mixer_schema } from 'misskey-world/src/room/furnitures/mixer.schema.js'; export const mixer = defineFuniture(mixer_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/monitor.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts similarity index 94% rename from packages/frontend-misskey-world-engine/src/room/objects/monitor.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts index 28387adf30..c51e0ad808 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/monitor.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts @@ -5,8 +5,8 @@ import * as BABYLON from '@babylonjs/core'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { monitor_schema } from 'misskey-world/src/room/objects/monitor.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { monitor_schema } from 'misskey-world/src/room/furnitures/monitor.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { getLightRangeFactorByGraphicsQuality } from '../utility.js'; import { normalizeUvToSquare } from '../../utility.js'; diff --git a/packages/frontend-misskey-world-engine/src/room/objects/monitorSpeaker.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts similarity index 82% rename from packages/frontend-misskey-world-engine/src/room/objects/monitorSpeaker.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts index ad084c78be..147ae944a1 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/monitorSpeaker.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { monitorSpeaker_schema } from 'misskey-world/src/room/objects/monitorSpeaker.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { monitorSpeaker_schema } from 'misskey-world/src/room/furnitures/monitorSpeaker.schema.js'; export const monitorSpeaker = defineFuniture(monitorSpeaker_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/monstera.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/monstera.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts index 8a444cc5bc..a5b355e889 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/monstera.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { monstera_schema } from 'misskey-world/src/room/objects/monstera.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { monstera_schema } from 'misskey-world/src/room/furnitures/monstera.schema.js'; export const monstera = defineFuniture(monstera_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/mug.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/mug.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts index d3d95484cf..74e89d3b29 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/mug.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts @@ -5,8 +5,8 @@ import * as BABYLON from '@babylonjs/core'; import { cm } from 'misskey-world/src/utility.js'; -import { mug_schema } from 'misskey-world/src/room/objects/mug.schema.js'; -import { defineFuniture } from '../object.js'; +import { mug_schema } from 'misskey-world/src/room/furnitures/mug.schema.js'; +import { defineFuniture } from '../furniture.js'; import { yuge } from '../utility.js'; export const mug = defineFuniture(mug_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/newtonsCradle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/newtonsCradle.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts index 67bd93243d..fe87e66dc1 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/newtonsCradle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { newtonsCradle_schema } from 'misskey-world/src/room/objects/newtonsCradle.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { newtonsCradle_schema } from 'misskey-world/src/room/furnitures/newtonsCradle.schema.js'; export const newtonsCradle = defineFuniture(newtonsCradle_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/openedCardboardBox.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts similarity index 78% rename from packages/frontend-misskey-world-engine/src/room/objects/openedCardboardBox.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts index 2837268c25..a6b565286f 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/openedCardboardBox.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { openedCardboardBox_schema } from 'misskey-world/src/room/objects/openedCardboardBox.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { openedCardboardBox_schema } from 'misskey-world/src/room/furnitures/openedCardboardBox.schema.js'; export const openedCardboardBox = defineFuniture(openedCardboardBox_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/pachira.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/pachira.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts index f2dba2810a..0ec7664228 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/pachira.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { pachira_schema } from 'misskey-world/src/room/objects/pachira.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { pachira_schema } from 'misskey-world/src/room/furnitures/pachira.schema.js'; export const pachira = defineFuniture(pachira_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/petBottle.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/petBottle.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts index 29d60fae9f..00abe175dc 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/petBottle.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { petBottle_schema } from 'misskey-world/src/room/objects/petBottle.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { petBottle_schema } from 'misskey-world/src/room/furnitures/petBottle.schema.js'; export const petBottle = defineFuniture(petBottle_schema, { createInstance: ({ model, options, scene }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/piano.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/piano.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts index 2827e9294d..400ca23a7d 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/piano.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { piano_schema } from 'misskey-world/src/room/objects/piano.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { piano_schema } from 'misskey-world/src/room/furnitures/piano.schema.js'; export const piano = defineFuniture(piano_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/pictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/pictureFrame.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts index cc95adfa70..f869249939 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/pictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; -import { pictureFrame_schema } from 'misskey-world/src/room/objects/pictureFrame.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; +import { pictureFrame_schema } from 'misskey-world/src/room/furnitures/pictureFrame.schema.js'; // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする diff --git a/packages/frontend-misskey-world-engine/src/room/objects/pizza.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/pizza.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts index 8bae382bfa..b9130ee659 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/pizza.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { pizza_schema } from 'misskey-world/src/room/objects/pizza.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { pizza_schema } from 'misskey-world/src/room/furnitures/pizza.schema.js'; export const pizza = defineFuniture(pizza_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/plant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/plant.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts index 06f489cfe3..ec6cc30454 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/plant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { plant_schema } from 'misskey-world/src/room/objects/plant.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { plant_schema } from 'misskey-world/src/room/furnitures/plant.schema.js'; export const plant = defineFuniture(plant_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/plant2.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/plant2.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts index ac2e0f9e4f..502bd7983e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/plant2.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { plant2_schema } from 'misskey-world/src/room/objects/plant2.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { plant2_schema } from 'misskey-world/src/room/furnitures/plant2.schema.js'; export const plant2 = defineFuniture(plant2_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/poster.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts similarity index 94% rename from packages/frontend-misskey-world-engine/src/room/objects/poster.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts index 41df19e2dc..31e3631a13 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/poster.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; -import { poster_schema } from 'misskey-world/src/room/objects/poster.schema.js'; +import { poster_schema } from 'misskey-world/src/room/furnitures/poster.schema.js'; export const poster = defineFuniture(poster_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/powerStrip.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/powerStrip.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts index cee1426ca9..0046f75d01 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/powerStrip.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { powerStrip_schema } from 'misskey-world/src/room/objects/powerStrip.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { powerStrip_schema } from 'misskey-world/src/room/furnitures/powerStrip.schema.js'; export const powerStrip = defineFuniture(powerStrip_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/radiometer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts similarity index 89% rename from packages/frontend-misskey-world-engine/src/room/objects/radiometer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts index 09c6c6aef1..b81a61aada 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/radiometer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { radiometer_schema } from 'misskey-world/src/room/objects/radiometer.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { radiometer_schema } from 'misskey-world/src/room/furnitures/radiometer.schema.js'; export const radiometer = defineFuniture(radiometer_schema, { createInstance: ({ sr, scene, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/randomBooks.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/randomBooks.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts index 3f3fe900e0..76dc16cfaf 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/randomBooks.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts @@ -5,9 +5,9 @@ import * as BABYLON from '@babylonjs/core'; import seedrandom from 'seedrandom'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } from '../furniture.js'; import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { randomBooks_schema } from 'misskey-world/src/room/objects/randomBooks.schema.js'; +import { randomBooks_schema } from 'misskey-world/src/room/furnitures/randomBooks.schema.js'; export const randomBooks = defineFuniture(randomBooks_schema, { createInstance: ({ options, model, scene }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/recordPlayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/recordPlayer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts index 76f3865809..655799e93c 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/recordPlayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { recordPlayer_schema } from 'misskey-world/src/room/objects/recordPlayer.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { recordPlayer_schema } from 'misskey-world/src/room/furnitures/recordPlayer.schema.js'; export const recordPlayer = defineFuniture(recordPlayer_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/rolledUpPoster.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/rolledUpPoster.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts index 30748aadc4..c95c624ed2 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/rolledUpPoster.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { rolledUpPoster_schema } from 'misskey-world/src/room/objects/rolledUpPoster.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { rolledUpPoster_schema } from 'misskey-world/src/room/furnitures/rolledUpPoster.schema.js'; export const rolledUpPoster = defineFuniture(rolledUpPoster_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/roundRug.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/roundRug.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts index 6a27d7ba20..2ce8a55159 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/roundRug.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { roundRug_schema } from 'misskey-world/src/room/objects/roundRug.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { roundRug_schema } from 'misskey-world/src/room/furnitures/roundRug.schema.js'; export const roundRug = defineFuniture(roundRug_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/router.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/router.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/router.ts index 9960322727..044389f112 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/router.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/router.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { router_schema } from 'misskey-world/src/room/objects/router.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { router_schema } from 'misskey-world/src/room/furnitures/router.schema.js'; export const router = defineFuniture(router_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/siphon.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/siphon.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts index 11cc0068a6..f1e3f7f395 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/siphon.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { siphon_schema } from 'misskey-world/src/room/objects/siphon.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { siphon_schema } from 'misskey-world/src/room/furnitures/siphon.schema.js'; export const siphon = defineFuniture(siphon_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/snakeplant.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/snakeplant.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts index 58eaa35547..1e384b6acc 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/snakeplant.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { snakeplant_schema } from 'misskey-world/src/room/objects/snakeplant.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { snakeplant_schema } from 'misskey-world/src/room/furnitures/snakeplant.schema.js'; export const snakeplant = defineFuniture(snakeplant_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/sofa.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/sofa.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts index 3fcda5fe28..5d670fd4fc 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/sofa.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { sofa_schema } from 'misskey-world/src/room/objects/sofa.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { sofa_schema } from 'misskey-world/src/room/furnitures/sofa.schema.js'; export const sofa = defineFuniture(sofa_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/speaker.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts similarity index 89% rename from packages/frontend-misskey-world-engine/src/room/objects/speaker.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts index 6f5489a00a..f6040bc4c1 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/speaker.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { speaker_schema } from 'misskey-world/src/room/objects/speaker.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { speaker_schema } from 'misskey-world/src/room/furnitures/speaker.schema.js'; export const speaker = defineFuniture(speaker_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/speakerStand.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts similarity index 88% rename from packages/frontend-misskey-world-engine/src/room/objects/speakerStand.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts index 287700335b..20b84d4860 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/speakerStand.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { speakerStand_schema } from 'misskey-world/src/room/objects/speakerStand.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { speakerStand_schema } from 'misskey-world/src/room/furnitures/speakerStand.schema.js'; export const speakerStand = defineFuniture(speakerStand_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/spotLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts similarity index 94% rename from packages/frontend-misskey-world-engine/src/room/objects/spotLight.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts index cce3ac271e..95ab081b91 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/spotLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/spotLight.schema.js'; +import { spotLight_schema } from 'misskey-world/src/room/furnitures/spotLight.schema.js'; export const spotLight = defineFuniture(spotLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/sprayer.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts similarity index 65% rename from packages/frontend-misskey-world-engine/src/room/objects/sprayer.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts index deccef43fb..a1a2be1ad8 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/sprayer.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { sprayer_schema } from 'misskey-world/src/room/objects/sprayer.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { sprayer_schema } from 'misskey-world/src/room/furnitures/sprayer.schema.js'; export const sprayer = defineFuniture(sprayer_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/stanchionPole.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts similarity index 88% rename from packages/frontend-misskey-world-engine/src/room/objects/stanchionPole.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts index 38cc691811..378a0953dc 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/stanchionPole.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { stanchionPole_schema } from 'misskey-world/src/room/objects/stanchionPole.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { stanchionPole_schema } from 'misskey-world/src/room/furnitures/stanchionPole.schema.js'; export const stanchionPole = defineFuniture(stanchionPole_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/steelRack.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/steelRack.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts index 0c21f2bdfe..513e64c92e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/steelRack.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { steelRack_schema } from 'misskey-world/src/room/objects/steelRack.schema.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 '../object.js'; +import { defineFuniture } from '../furniture.js'; export const steelRack = defineFuniture(steelRack_schema, { path: (options) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/stormGlass.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/stormGlass.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts index c66b45fcb8..5fd9e9256d 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/stormGlass.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { stormGlass_schema } from 'misskey-world/src/room/objects/stormGlass.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { stormGlass_schema } from 'misskey-world/src/room/furnitures/stormGlass.schema.js'; export const stormGlass = defineFuniture(stormGlass_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tableSalt.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/tableSalt.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts index 5d4ac2d3d1..bf1ffd7d2e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tableSalt.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { tableSalt_schema } from 'misskey-world/src/room/objects/tableSalt.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { tableSalt_schema } from 'misskey-world/src/room/furnitures/tableSalt.schema.js'; export const tableSalt = defineFuniture(tableSalt_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopCalendar.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts similarity index 78% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopCalendar.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts index c29daf9358..d1e25f1028 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopCalendar.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { tabletopCalendar_schema } from 'misskey-world/src/room/objects/tabletopCalendar.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { tabletopCalendar_schema } from 'misskey-world/src/room/furnitures/tabletopCalendar.schema.js'; export const tabletopCalendar = defineFuniture(tabletopCalendar_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopDigitalClock.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts similarity index 97% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopDigitalClock.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts index 506cf63777..e49b2fffa0 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopDigitalClock.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts @@ -5,8 +5,8 @@ import * as BABYLON from '@babylonjs/core'; import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js'; -import { tabletopDigitalClock_schema } from 'misskey-world/src/room/objects/tabletopDigitalClock.schema.js'; -import { defineFuniture } from '../object.js'; +import { tabletopDigitalClock_schema } from 'misskey-world/src/room/furnitures/tabletopDigitalClock.schema.js'; +import { defineFuniture } from '../furniture.js'; import { get7segMeshesOfCurrentTime } from '../../utility.js'; export const tabletopDigitalClock = defineFuniture(tabletopDigitalClock_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopFlag.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts similarity index 85% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopFlag.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts index c56946dc63..9ba279ecf2 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopFlag.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; -import { tabletopFlag_schema } from 'misskey-world/src/room/objects/tabletopFlag.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; +import { tabletopFlag_schema } from 'misskey-world/src/room/furnitures/tabletopFlag.schema.js'; export const tabletopFlag = defineFuniture(tabletopFlag_schema, { createInstance: async ({ model, options, scene }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopGlassPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopGlassPictureFrame.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts index 99021a2234..85afcacc32 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopGlassPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; -import { tabletopGlassPictureFrame_schema } from 'misskey-world/src/room/objects/tabletopGlassPictureFrame.schema.js'; +import { tabletopGlassPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopGlassPictureFrame.schema.js'; export const tabletopGlassPictureFrame = defineFuniture(tabletopGlassPictureFrame_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopIronFrameStand.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopIronFrameStand.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts index 4a273b4b27..80fc944f51 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopIronFrameStand.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { tabletopIronFrameStand_schema } from 'misskey-world/src/room/objects/tabletopIronFrameStand.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { tabletopIronFrameStand_schema } from 'misskey-world/src/room/furnitures/tabletopIronFrameStand.schema.js'; export const tabletopIronFrameStand = defineFuniture(tabletopIronFrameStand_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopLcdButtonsController.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts similarity index 93% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopLcdButtonsController.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts index 295c68795d..8732659664 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopLcdButtonsController.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/objects/tabletopLcdButtonsController.schema.js'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/furnitures/tabletopLcdButtonsController.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { normalizeUvToSquare } from '../../utility.js'; export const tabletopLcdButtonsController = defineFuniture(tabletopLcdButtonsController_schema, { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tabletopPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts similarity index 97% rename from packages/frontend-misskey-world-engine/src/room/objects/tabletopPictureFrame.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts index a0bedb3042..11c8287f0d 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tabletopPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; -import { tabletopPictureFrame_schema } from 'misskey-world/src/room/objects/tabletopPictureFrame.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; +import { tabletopPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopPictureFrame.schema.js'; // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tapestry.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts similarity index 94% rename from packages/frontend-misskey-world-engine/src/room/objects/tapestry.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts index 750bd4a2ee..054a971d74 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tapestry.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tapestry.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; -import { tapestry_schema } from 'misskey-world/src/room/objects/tapestry.schema.js'; +import { tapestry_schema } from 'misskey-world/src/room/furnitures/tapestry.schema.js'; export const tapestry = defineFuniture(tapestry_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tetrapod.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/tetrapod.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts index 935ffc9276..8e5af6a684 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tetrapod.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tetrapod.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { tetrapod_schema } from 'misskey-world/src/room/objects/tetrapod.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { tetrapod_schema } from 'misskey-world/src/room/furnitures/tetrapod.schema.js'; export const tetrapod = defineFuniture(tetrapod_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/tv.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/tv.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts index 06923a5030..f08b2ecf79 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/tv.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/tv.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/tv.schema.js'; +import { tv_schema } from 'misskey-world/src/room/furnitures/tv.schema.js'; export const tv = defineFuniture(tv_schema, { createInstance: ({ options, lc, model, scene, timer, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/twistedCubeObjet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts similarity index 78% rename from packages/frontend-misskey-world-engine/src/room/objects/twistedCubeObjet.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts index 0084c1720d..2e48611670 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/twistedCubeObjet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/twistedCubeObjet.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { twistedCubeObjet_schema } from 'misskey-world/src/room/objects/twistedCubeObjet.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { twistedCubeObjet_schema } from 'misskey-world/src/room/furnitures/twistedCubeObjet.schema.js'; export const twistedCubeObjet = defineFuniture(twistedCubeObjet_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/usedTissue.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts similarity index 64% rename from packages/frontend-misskey-world-engine/src/room/objects/usedTissue.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts index d056c6014f..30db290218 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/usedTissue.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/usedTissue.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { usedTissue_schema } from 'misskey-world/src/room/objects/usedTissue.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { usedTissue_schema } from 'misskey-world/src/room/furnitures/usedTissue.schema.js'; export const usedTissue = defineFuniture(usedTissue_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallCanvas.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts similarity index 90% rename from packages/frontend-misskey-world-engine/src/room/objects/wallCanvas.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts index 485a949c51..08420616f8 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallCanvas.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallCanvas.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; -import { wallCanvas_schema } from 'misskey-world/src/room/objects/wallCanvas.schema.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; +import { wallCanvas_schema } from 'misskey-world/src/room/furnitures/wallCanvas.schema.js'; export const wallCanvas = defineFuniture(wallCanvas_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallClock.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/wallClock.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts index e8b6652058..d1f05fc1ac 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallClock.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallClock.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { wallClock_schema } from 'misskey-world/src/room/objects/wallClock.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { wallClock_schema } from 'misskey-world/src/room/furnitures/wallClock.schema.js'; export const wallClock = defineFuniture(wallClock_schema, { createInstance: ({ sr, timer, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallGlassPictureFrame.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts similarity index 95% rename from packages/frontend-misskey-world-engine/src/room/objects/wallGlassPictureFrame.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts index cd3a4b218e..d8f2b48f4e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallGlassPictureFrame.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallGlassPictureFrame.ts @@ -4,9 +4,9 @@ */ import * as BABYLON from '@babylonjs/core'; -import { createTextureManager, defineFuniture } from '../object.js'; +import { createTextureManager, defineFuniture } from '../furniture.js'; import { remap } from 'misskey-world/src/utility.js'; -import { wallGlassPictureFrame_schema } from 'misskey-world/src/room/objects/wallGlassPictureFrame.schema.js'; +import { wallGlassPictureFrame_schema } from 'misskey-world/src/room/furnitures/wallGlassPictureFrame.schema.js'; export const wallGlassPictureFrame = defineFuniture(wallGlassPictureFrame_schema, { createInstance: async ({ scene, options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallMirror.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/wallMirror.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts index 4f063fa907..938a8fd61c 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallMirror.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMirror.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { wallMirror_schema } from 'misskey-world/src/room/objects/wallMirror.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { wallMirror_schema } from 'misskey-world/src/room/furnitures/wallMirror.schema.js'; export const wallMirror = defineFuniture(wallMirror_schema, { createInstance: async ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallMountSpotLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/wallMountSpotLight.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts index a139ec7283..2b06d07ff4 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallMountSpotLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallMountSpotLight.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/wallMountSpotLight.schema.js'; +import { wallMountSpotLight_schema } from 'misskey-world/src/room/furnitures/wallMountSpotLight.schema.js'; export const wallMountSpotLight = defineFuniture(wallMountSpotLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wallShelf.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts similarity index 91% rename from packages/frontend-misskey-world-engine/src/room/objects/wallShelf.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts index 859063895d..2f66888d5a 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wallShelf.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wallShelf.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { wallShelf_schema } from 'misskey-world/src/room/objects/wallShelf.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { wallShelf_schema } from 'misskey-world/src/room/furnitures/wallShelf.schema.js'; export const wallShelf = defineFuniture(wallShelf_schema, { createInstance: ({ model, options }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wireBasket.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts similarity index 83% rename from packages/frontend-misskey-world-engine/src/room/objects/wireBasket.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts index 325cee85d5..f0f3a0f48e 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wireBasket.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wireBasket.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { wireBasket_schema } from 'misskey-world/src/room/objects/wireBasket.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { wireBasket_schema } from 'misskey-world/src/room/furnitures/wireBasket.schema.js'; export const wireBasket = defineFuniture(wireBasket_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/wireNet.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts similarity index 84% rename from packages/frontend-misskey-world-engine/src/room/objects/wireNet.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts index 7cf526b6cd..f3b90a5759 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/wireNet.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/wireNet.ts @@ -4,8 +4,8 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; -import { wireNet_schema } from 'misskey-world/src/room/objects/wireNet.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { wireNet_schema } from 'misskey-world/src/room/furnitures/wireNet.schema.js'; export const wireNet = defineFuniture(wireNet_schema, { createInstance: ({ options, model }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/woodRingFloorLamp.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts similarity index 96% rename from packages/frontend-misskey-world-engine/src/room/objects/woodRingFloorLamp.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts index 77b28d84fe..92afac1fc2 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/woodRingFloorLamp.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingFloorLamp.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/woodRingFloorLamp.schema.js'; +import { woodRingFloorLamp_schema } from 'misskey-world/src/room/furnitures/woodRingFloorLamp.schema.js'; export const woodRingFloorLamp = defineFuniture(woodRingFloorLamp_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/woodRingsPendantLight.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts similarity index 97% rename from packages/frontend-misskey-world-engine/src/room/objects/woodRingsPendantLight.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts index 006b631671..68eac39f0b 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/woodRingsPendantLight.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodRingsPendantLight.ts @@ -4,10 +4,10 @@ */ import * as BABYLON from '@babylonjs/core'; -import { defineFuniture } from '../object.js'; +import { defineFuniture } 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/objects/woodRingsPendantLight.schema.js'; +import { woodRingsPendantLight_schema } from 'misskey-world/src/room/furnitures/woodRingsPendantLight.schema.js'; export const woodRingsPendantLight = defineFuniture(woodRingsPendantLight_schema, { createInstance: ({ lc, scene, options, model, graphicsQuality }) => { diff --git a/packages/frontend-misskey-world-engine/src/room/objects/woodSoundAbsorbingPanel.ts b/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts similarity index 77% rename from packages/frontend-misskey-world-engine/src/room/objects/woodSoundAbsorbingPanel.ts rename to packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts index 00fa1715ec..7f621b7efd 100644 --- a/packages/frontend-misskey-world-engine/src/room/objects/woodSoundAbsorbingPanel.ts +++ b/packages/frontend-misskey-world-engine/src/room/furnitures/woodSoundAbsorbingPanel.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { defineFuniture } from '../object.js'; -import { woodSoundAbsorbingPanel_schema } from 'misskey-world/src/room/objects/woodSoundAbsorbingPanel.schema.js'; +import { defineFuniture } from '../furniture.js'; +import { woodSoundAbsorbingPanel_schema } from 'misskey-world/src/room/furnitures/woodSoundAbsorbingPanel.schema.js'; export const woodSoundAbsorbingPanel = defineFuniture(woodSoundAbsorbingPanel_schema, { createInstance: () => { diff --git a/packages/frontend-misskey-world-engine/src/room/object-defs.ts b/packages/frontend-misskey-world-engine/src/room/object-defs.ts deleted file mode 100644 index 28fbae83bf..0000000000 --- a/packages/frontend-misskey-world-engine/src/room/object-defs.ts +++ /dev/null @@ -1,236 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { a4Case } from './objects/a4Case.js'; -import { aircon } from './objects/aircon.js'; -import { allInOnePc } from './objects/allInOnePc.js'; -import { aquarium } from './objects/aquarium.js'; -import { aromaReedDiffuser } from './objects/aromaReedDiffuser.js'; -import { banknote } from './objects/banknote.js'; -import { beamLamp } from './objects/beamLamp.js'; -import { bed } from './objects/bed.js'; -import { blind } from './objects/blind.js'; -import { book } from './objects/book.js'; -import { books } from './objects/books.js'; -import { boxWallShelf } from './objects/boxWallShelf.js'; -import { cactusS } from './objects/cactusS.js'; -import { cardboardBox } from './objects/cardboardBox.js'; -import { ceilingFanLight } from './objects/ceilingFanLight.js'; -import { chair } from './objects/chair.js'; -import { clippedPicture } from './objects/clippedPicture.js'; -import { coffeeCup } from './objects/coffeeCup.js'; -import { colorBox } from './objects/colorBox.js'; -import { cuboid } from './objects/cuboid.js'; -import { cupNoodle } from './objects/cupNoodle.js'; -import { curtain } from './objects/curtain.js'; -import { custardPudding } from './objects/custardPudding.js'; -import { debugHipoly } from './objects/debugHipoly.js'; -import { debugMetal } from './objects/debugMetal.js'; -import { descriptionPlate } from './objects/descriptionPlate.js'; -import { desk } from './objects/desk.js'; -import { desktopPc } from './objects/desktopPc.js'; -import { djMixer } from './objects/djMixer.js'; -import { djPlayer } from './objects/djPlayer.js'; -import { ductRailSpotLights } from './objects/ductRailSpotLights.js'; -import { ductTape } from './objects/ductTape.js'; -import { electronicDisplayBoard } from './objects/electronicDisplayBoard.js'; -import { emptyBento } from './objects/emptyBento.js'; -import { energyDrink } from './objects/energyDrink.js'; -import { envelope } from './objects/envelope.js'; -import { facialTissue } from './objects/facialTissue.js'; -import { glassCylinderPotPlant } from './objects/glassCylinderPotPlant.js'; -import { handheldGameConsole } from './objects/handheldGameConsole.js'; -import { hangingDuctRail } from './objects/hangingDuctRail.js'; -import { hangingTShirt } from './objects/hangingTShirt.js'; -import { icosahedron } from './objects/icosahedron.js'; -import { ironFrameShelf } from './objects/ironFrameShelf.js'; -import { ironFrameTable } from './objects/ironFrameTable.js'; -import { issyoubin } from './objects/issyoubin.js'; -import { keyboard } from './objects/keyboard.js'; -import { laptopPc } from './objects/laptopPc.js'; -import { largeMousepad } from './objects/largeMousepad.js'; -import { lavaLamp } from './objects/lavaLamp.js'; -import { letterCase } from './objects/letterCase.js'; -import { lowPartitionBar } from './objects/lowPartitionBar.js'; -import { miObjet } from './objects/miObjet.js'; -import { milk } from './objects/milk.js'; -import { miPlate } from './objects/miPlate.js'; -import { miPlateDisplayed } from './objects/miPlateDisplayed.js'; -import { mixer } from './objects/mixer.js'; -import { monitor } from './objects/monitor.js'; -import { monitorSpeaker } from './objects/monitorSpeaker.js'; -import { monstera } from './objects/monstera.js'; -import { mug } from './objects/mug.js'; -import { newtonsCradle } from './objects/newtonsCradle.js'; -import { openedCardboardBox } from './objects/openedCardboardBox.js'; -import { pachira } from './objects/pachira.js'; -import { petBottle } from './objects/petBottle.js'; -import { piano } from './objects/piano.js'; -import { pictureFrame } from './objects/pictureFrame.js'; -import { pizza } from './objects/pizza.js'; -import { plant } from './objects/plant.js'; -import { plant2 } from './objects/plant2.js'; -import { poster } from './objects/poster.js'; -import { powerStrip } from './objects/powerStrip.js'; -import { radiometer } from './objects/radiometer.js'; -import { randomBooks } from './objects/randomBooks.js'; -import { recordPlayer } from './objects/recordPlayer.js'; -import { rolledUpPoster } from './objects/rolledUpPoster.js'; -import { roundRug } from './objects/roundRug.js'; -import { router } from './objects/router.js'; -import { siphon } from './objects/siphon.js'; -import { snakeplant } from './objects/snakeplant.js'; -import { sofa } from './objects/sofa.js'; -import { speaker } from './objects/speaker.js'; -import { speakerStand } from './objects/speakerStand.js'; -import { spotLight } from './objects/spotLight.js'; -import { sprayer } from './objects/sprayer.js'; -import { stanchionPole } from './objects/stanchionPole.js'; -import { steelRack } from './objects/steelRack.js'; -import { stormGlass } from './objects/stormGlass.js'; -import { tableSalt } from './objects/tableSalt.js'; -import { tabletopCalendar } from './objects/tabletopCalendar.js'; -import { tabletopDigitalClock } from './objects/tabletopDigitalClock.js'; -import { tabletopFlag } from './objects/tabletopFlag.js'; -import { tabletopGlassPictureFrame } from './objects/tabletopGlassPictureFrame.js'; -import { tabletopIronFrameStand } from './objects/tabletopIronFrameStand.js'; -import { tabletopLcdButtonsController } from './objects/tabletopLcdButtonsController.js'; -import { tabletopPictureFrame } from './objects/tabletopPictureFrame.js'; -import { tapestry } from './objects/tapestry.js'; -import { tetrapod } from './objects/tetrapod.js'; -import { tv } from './objects/tv.js'; -import { twistedCubeObjet } from './objects/twistedCubeObjet.js'; -import { usedTissue } from './objects/usedTissue.js'; -import { wallCanvas } from './objects/wallCanvas.js'; -import { wallClock } from './objects/wallClock.js'; -import { wallGlassPictureFrame } from './objects/wallGlassPictureFrame.js'; -import { wallMirror } from './objects/wallMirror.js'; -import { wallMountSpotLight } from './objects/wallMountSpotLight.js'; -import { wallShelf } from './objects/wallShelf.js'; -import { wireBasket } from './objects/wireBasket.js'; -import { wireNet } from './objects/wireNet.js'; -import { woodRingFloorLamp } from './objects/woodRingFloorLamp.js'; -import { woodRingsPendantLight } from './objects/woodRingsPendantLight.js'; -import { woodSoundAbsorbingPanel } from './objects/woodSoundAbsorbingPanel.js'; - -export const FUNITURE_DEFS = [ - a4Case, - aircon, - allInOnePc, - aquarium, - aromaReedDiffuser, - banknote, - beamLamp, - bed, - blind, - books, - boxWallShelf, - cactusS, - cardboardBox, - ceilingFanLight, - chair, - coffeeCup, - colorBox, - cuboid, - cupNoodle, - custardPudding, - desk, - desktopPc, - djMixer, - djPlayer, - ductRailSpotLights, - ductTape, - electronicDisplayBoard, - emptyBento, - energyDrink, - envelope, - facialTissue, - glassCylinderPotPlant, - hangingTShirt, - icosahedron, - ironFrameShelf, - ironFrameTable, - issyoubin, - keyboard, - laptopPc, - largeMousepad, - lavaLamp, - letterCase, - miObjet, - milk, - miPlate, - miPlateDisplayed, - mixer, - monitor, - monitorSpeaker, - monstera, - mug, - newtonsCradle, - openedCardboardBox, - pachira, - petBottle, - piano, - pictureFrame, - pizza, - plant, - plant2, - poster, - powerStrip, - radiometer, - randomBooks, - recordPlayer, - rolledUpPoster, - roundRug, - router, - siphon, - snakeplant, - sofa, - speaker, - speakerStand, - sprayer, - steelRack, - stormGlass, - tableSalt, - tabletopCalendar, - tabletopDigitalClock, - tabletopFlag, - tabletopGlassPictureFrame, - tabletopIronFrameStand, - tabletopPictureFrame, - tabletopLcdButtonsController, - tapestry, - tetrapod, - tv, - twistedCubeObjet, - usedTissue, - wallCanvas, - wallClock, - wallGlassPictureFrame, - wallMirror, - wallMountSpotLight, - wallShelf, - woodRingFloorLamp, - woodRingsPendantLight, - woodSoundAbsorbingPanel, - hangingDuctRail, - spotLight, - lowPartitionBar, - descriptionPlate, - stanchionPole, - handheldGameConsole, - debugMetal, - curtain, - wireNet, - clippedPicture, - wireBasket, -] as FurnitureDef[]; - -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}`); - } - return def; -} diff --git a/packages/frontend-misskey-world-engine/src/room/previewEngine.ts b/packages/frontend-misskey-world-engine/src/room/previewEngine.ts index 869dbc1942..4b56ad3b17 100644 --- a/packages/frontend-misskey-world-engine/src/room/previewEngine.ts +++ b/packages/frontend-misskey-world-engine/src/room/previewEngine.ts @@ -12,10 +12,10 @@ import { getMeshesBoundingBox, ArcRotateCameraManualInput, GRAPHICS_QUALITY } fr import { EngineBase } from '../EngineBase.js'; import { deepClone } from '../clone.js'; import { genId } from '../id.js'; -import { getFurnitureDef } from './object-defs.js'; +import { getFurnitureDef } from './furniture-defs.js'; import { SYSTEM_MESH_NAMES } from './utility.js'; import { FurnitureContainer } from './FurnitureContainer.js'; -import type { RawOptions } from './object.js'; +import type { RawOptions } from './furniture.js'; import type { RoomAttachments } from 'misskey-world/src/room/type.js'; export class RoomFurniturePreviewEngine extends EngineBase<{ diff --git a/packages/frontend/src/pages/rooms/room.add-object-dialog.item.vue b/packages/frontend/src/pages/rooms/room.add-furniture-dialog.item.vue similarity index 87% rename from packages/frontend/src/pages/rooms/room.add-object-dialog.item.vue rename to packages/frontend/src/pages/rooms/room.add-furniture-dialog.item.vue index bf5f906cd2..56e4aac577 100644 --- a/packages/frontend/src/pages/rooms/room.add-object-dialog.item.vue +++ b/packages/frontend/src/pages/rooms/room.add-furniture-dialog.item.vue @@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only