diff --git a/packages/frontend/assets/room/objects/dj-mixer/dj-mixer.glb b/packages/frontend/assets/room/objects/dj-mixer/dj-mixer.glb new file mode 100644 index 0000000000..a7925b957a Binary files /dev/null and b/packages/frontend/assets/room/objects/dj-mixer/dj-mixer.glb differ diff --git a/packages/frontend/assets/room/objects/dj-player/dj-player.glb b/packages/frontend/assets/room/objects/dj-player/dj-player.glb new file mode 100644 index 0000000000..481581eba1 Binary files /dev/null and b/packages/frontend/assets/room/objects/dj-player/dj-player.glb differ diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index d98adafed3..fe84547bb1 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -25,6 +25,8 @@ import { custardPudding } from './objects/custardPudding.js'; import { debugHipoly } from './objects/debugHipoly.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 { ductTape } from './objects/ductTape.js'; import { emptyBento } from './objects/emptyBento.js'; import { energyDrink } from './objects/energyDrink.js'; @@ -100,6 +102,8 @@ export const OBJECT_DEFS = [ custardPudding, desk, desktopPc, + djMixer, + djPlayer, ductTape, emptyBento, energyDrink, diff --git a/packages/frontend/src/utility/room/objects/djMixer.ts b/packages/frontend/src/utility/room/objects/djMixer.ts new file mode 100644 index 0000000000..86ad166397 --- /dev/null +++ b/packages/frontend/src/utility/room/objects/djMixer.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 djMixer = defineObject({ + id: 'djMixer', + name: 'djMixer', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +}); diff --git a/packages/frontend/src/utility/room/objects/djPlayer.ts b/packages/frontend/src/utility/room/objects/djPlayer.ts new file mode 100644 index 0000000000..b990d76c15 --- /dev/null +++ b/packages/frontend/src/utility/room/objects/djPlayer.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 djPlayer = defineObject({ + id: 'djPlayer', + name: 'djPlayer', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +});