diff --git a/packages/frontend/assets/room/objects/tabletop-calendar/calendar.af b/packages/frontend/assets/room/objects/tabletop-calendar/calendar.af new file mode 100644 index 0000000000..62b8c53e41 Binary files /dev/null and b/packages/frontend/assets/room/objects/tabletop-calendar/calendar.af differ diff --git a/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.blend b/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.blend new file mode 100644 index 0000000000..b398e51688 Binary files /dev/null and b/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.blend differ diff --git a/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.glb b/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.glb new file mode 100644 index 0000000000..4a8ed94f8b Binary files /dev/null and b/packages/frontend/assets/room/objects/tabletop-calendar/tabletop-calendar.glb differ diff --git a/packages/frontend/assets/room/objects/tabletop-calendar/textures/calendar.png b/packages/frontend/assets/room/objects/tabletop-calendar/textures/calendar.png new file mode 100644 index 0000000000..bd4ce9ae71 Binary files /dev/null and b/packages/frontend/assets/room/objects/tabletop-calendar/textures/calendar.png differ diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue index adec3629a4..a585033e76 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -281,6 +281,13 @@ onMounted(() => { rotation: [0, -2, 0], sticky: 'c', options: {}, + }, { + id: 'k2', + type: 'tabletopCalendar', + position: [-130, 70, 40], + rotation: [0, -Math.PI / 2, 0], + sticky: 'c', + options: {}, }, { id: 'l', type: 'banknote', diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index bdc6910be8..5fe534b4e6 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -33,6 +33,7 @@ import { powerStrip } from './objects/powerStrip.js'; import { roundRug } from './objects/roundRug.js'; import { snakeplant } from './objects/snakeplant.js'; import { steelRack } from './objects/steelRack.js'; +import { tabletopCalendar } from './objects/tabletopCalendar.js'; import { tabletopDigitalClock } from './objects/tabletopDigitalClock.js'; import { tv } from './objects/tv.js'; import { wallClock } from './objects/wallClock.js'; @@ -69,6 +70,7 @@ export const OBJECT_DEFS = [ roundRug, snakeplant, steelRack, + tabletopCalendar, tabletopDigitalClock, tv, wallClock, diff --git a/packages/frontend/src/utility/room/objects/tabletopCalendar.ts b/packages/frontend/src/utility/room/objects/tabletopCalendar.ts new file mode 100644 index 0000000000..f8a13716d1 --- /dev/null +++ b/packages/frontend/src/utility/room/objects/tabletopCalendar.ts @@ -0,0 +1,17 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { defineObject } from '../engine.js'; + +export const tabletopCalendar = defineObject({ + id: 'tabletopCalendar', + defaultOptions: {}, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +});