diff --git a/packages/frontend/assets/room/objects/storm-glass/storm-glass.blend b/packages/frontend/assets/room/objects/storm-glass/storm-glass.blend new file mode 100644 index 0000000000..ccda7eb9c9 Binary files /dev/null and b/packages/frontend/assets/room/objects/storm-glass/storm-glass.blend differ diff --git a/packages/frontend/assets/room/objects/storm-glass/storm-glass.glb b/packages/frontend/assets/room/objects/storm-glass/storm-glass.glb new file mode 100644 index 0000000000..0b3d38a2b6 Binary files /dev/null and b/packages/frontend/assets/room/objects/storm-glass/storm-glass.glb differ diff --git a/packages/frontend/src/world/room/object-defs.ts b/packages/frontend/src/world/room/object-defs.ts index bf1b677f55..44ee1dbed1 100644 --- a/packages/frontend/src/world/room/object-defs.ts +++ b/packages/frontend/src/world/room/object-defs.ts @@ -75,6 +75,7 @@ import { speaker } from './objects/speaker.js'; import { speakerStand } from './objects/speakerStand.js'; import { sprayer } from './objects/sprayer.js'; import { steelRack } from './objects/steelRack.js'; +import { stormGlass } from './objects/stormGlass.js'; import { tabletopCalendar } from './objects/tabletopCalendar.js'; import { tabletopDigitalClock } from './objects/tabletopDigitalClock.js'; import { tabletopFlag } from './objects/tabletopFlag.js'; @@ -168,6 +169,7 @@ export const OBJECT_DEFS = [ speakerStand, sprayer, steelRack, + stormGlass, tabletopCalendar, tabletopDigitalClock, tabletopFlag, diff --git a/packages/frontend/src/world/room/objects/stormGlass.ts b/packages/frontend/src/world/room/objects/stormGlass.ts new file mode 100644 index 0000000000..c0b9b31d57 --- /dev/null +++ b/packages/frontend/src/world/room/objects/stormGlass.ts @@ -0,0 +1,24 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { defineObject } from '../object.js'; + +export const stormGlass = defineObject({ + id: 'stormGlass', + name: 'stormGlass', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + hasCollisions: false, + hasTexture: false, + canPreMeshesMerging: true, + createInstance: () => { + return { + interactions: {}, + }; + }, +});