diff --git a/packages/frontend/assets/room/object-thumbs/glass-cylinder-pot-plant.png b/packages/frontend/assets/room/object-thumbs/glass-cylinder-pot-plant.png new file mode 100644 index 0000000000..d0c77fcff2 Binary files /dev/null and b/packages/frontend/assets/room/object-thumbs/glass-cylinder-pot-plant.png differ diff --git a/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.blend b/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.blend new file mode 100644 index 0000000000..acdc1d334d Binary files /dev/null and b/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.blend differ diff --git a/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.glb b/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.glb new file mode 100644 index 0000000000..285a8ca6e6 Binary files /dev/null and b/packages/frontend/assets/room/objects/glass-cylinder-pot-plant/glass-cylinder-pot-plant.glb differ diff --git a/packages/frontend/src/world/room/object-defs.ts b/packages/frontend/src/world/room/object-defs.ts index c4c5a35516..bf1b677f55 100644 --- a/packages/frontend/src/world/room/object-defs.ts +++ b/packages/frontend/src/world/room/object-defs.ts @@ -34,6 +34,7 @@ import { emptyBento } from './objects/emptyBento.js'; import { energyDrink } from './objects/energyDrink.js'; import { envelope } from './objects/envelope.js'; import { facialTissue } from './objects/facialTissue.js'; +import { glassCylinderPotPlant } from './objects/glassCylinderPotPlant.js'; import { hangingTShirt } from './objects/hangingTShirt.js'; import { icosahedron } from './objects/icosahedron.js'; import { ironFrameShelf5, ironFrameShelf4, ironFrameShelf3 } from './objects/ironFrameShelf.js'; @@ -124,6 +125,7 @@ export const OBJECT_DEFS = [ energyDrink, envelope, facialTissue, + glassCylinderPotPlant, hangingTShirt, icosahedron, ironFrameShelf5, diff --git a/packages/frontend/src/world/room/objects/glassCylinderPotPlant.ts b/packages/frontend/src/world/room/objects/glassCylinderPotPlant.ts new file mode 100644 index 0000000000..b76c5ede23 --- /dev/null +++ b/packages/frontend/src/world/room/objects/glassCylinderPotPlant.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 glassCylinderPotPlant = defineObject({ + id: 'glassCylinderPotPlant', + name: 'glassCylinderPotPlant', + options: { + schema: {}, + default: {}, + }, + placement: 'top', + hasCollisions: false, + hasTexture: true, + canPreMeshesMerging: true, + createInstance: () => { + return { + interactions: {}, + }; + }, +});