diff --git a/packages/frontend/assets/room/object-thumbs/table-salt.png b/packages/frontend/assets/room/object-thumbs/table-salt.png new file mode 100644 index 0000000000..6da5297a86 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/table-salt.png differ diff --git a/packages/frontend/assets/room/objects/table-salt/table-salt.blend b/packages/frontend/assets/room/objects/table-salt/table-salt.blend new file mode 100644 index 0000000000..b3dd4074da Binary files /dev/null and b/packages/frontend/assets/room/objects/table-salt/table-salt.blend differ diff --git a/packages/frontend/assets/room/objects/table-salt/table-salt.glb b/packages/frontend/assets/room/objects/table-salt/table-salt.glb new file mode 100644 index 0000000000..49777863c9 Binary files /dev/null and b/packages/frontend/assets/room/objects/table-salt/table-salt.glb differ diff --git a/packages/frontend/src/world/room/object-defs.ts b/packages/frontend/src/world/room/object-defs.ts index 4cc5c1c25d..46cd20492a 100644 --- a/packages/frontend/src/world/room/object-defs.ts +++ b/packages/frontend/src/world/room/object-defs.ts @@ -76,6 +76,7 @@ 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 { tableSalt } from './objects/tableSalt.js'; import { tabletopCalendar } from './objects/tabletopCalendar.js'; import { tabletopDigitalClock } from './objects/tabletopDigitalClock.js'; import { tabletopFlag } from './objects/tabletopFlag.js'; @@ -172,6 +173,7 @@ export const OBJECT_DEFS = [ sprayer, steelRack, stormGlass, + tableSalt, tabletopCalendar, tabletopDigitalClock, tabletopFlag, diff --git a/packages/frontend/src/world/room/objects/tableSalt.ts b/packages/frontend/src/world/room/objects/tableSalt.ts new file mode 100644 index 0000000000..55eceb9359 --- /dev/null +++ b/packages/frontend/src/world/room/objects/tableSalt.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 tableSalt = defineObject({ + id: 'tableSalt', + name: 'tableSalt', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + hasCollisions: false, + hasTexture: true, + canPreMeshesMerging: true, + createInstance: () => { + return { + interactions: {}, + }; + }, +});