diff --git a/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.blend b/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.blend new file mode 100644 index 0000000000..15897023da Binary files /dev/null and b/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.blend differ diff --git a/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.glb b/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.glb new file mode 100644 index 0000000000..be52b8969a Binary files /dev/null and b/packages/frontend/assets/room/objects/wood-ring-floor-lamp/wood-ring-floor-lamp.glb differ diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index 85be80d0d6..9fadfa0258 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -61,6 +61,7 @@ import { tetrapod } from './objects/tetrapod.js'; import { tv } from './objects/tv.js'; import { wallClock } from './objects/wallClock.js'; import { wallShelf } from './objects/wallShelf.js'; +import { woodRingFloorLamp } from './objects/woodRingFloorLamp.js'; import { woodSoundAbsorbingPanel } from './objects/woodSoundAbsorbingPanel.js'; export const OBJECT_DEFS = [ @@ -121,6 +122,7 @@ export const OBJECT_DEFS = [ tv, wallClock, wallShelf, + woodRingFloorLamp, woodSoundAbsorbingPanel, debugHipoly, ]; diff --git a/packages/frontend/src/utility/room/objects/woodRingFloorLamp.ts b/packages/frontend/src/utility/room/objects/woodRingFloorLamp.ts new file mode 100644 index 0000000000..b7766590ef --- /dev/null +++ b/packages/frontend/src/utility/room/objects/woodRingFloorLamp.ts @@ -0,0 +1,21 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { defineObject } from '../engine.js'; + +export const woodRingFloorLamp = defineObject({ + id: 'woodRingFloorLamp', + name: 'Wood Ring Floor Lamp', + options: { + schema: {}, + default: {}, + }, + placement: 'floor', + createInstance: () => { + return { + interactions: {}, + }; + }, +});