diff --git a/packages/frontend/assets/room/objects/cactus-s/cactus-s.blend b/packages/frontend/assets/room/objects/cactus-s/cactus-s.blend new file mode 100644 index 0000000000..2dc6e90a3c Binary files /dev/null and b/packages/frontend/assets/room/objects/cactus-s/cactus-s.blend differ diff --git a/packages/frontend/assets/room/objects/cactus-s/cactus-s.glb b/packages/frontend/assets/room/objects/cactus-s/cactus-s.glb new file mode 100644 index 0000000000..3abb9b97c3 Binary files /dev/null and b/packages/frontend/assets/room/objects/cactus-s/cactus-s.glb differ diff --git a/packages/frontend/assets/room/objects/monstera/monstera.blend b/packages/frontend/assets/room/objects/monstera/monstera.blend index fe727d0b43..40e16e5136 100644 Binary files a/packages/frontend/assets/room/objects/monstera/monstera.blend and b/packages/frontend/assets/room/objects/monstera/monstera.blend differ diff --git a/packages/frontend/assets/room/objects/monstera/monstera.glb b/packages/frontend/assets/room/objects/monstera/monstera.glb index 06ef94bbf3..ba6621dc7f 100644 Binary files a/packages/frontend/assets/room/objects/monstera/monstera.glb and b/packages/frontend/assets/room/objects/monstera/monstera.glb differ diff --git a/packages/frontend/assets/room/objects/pachira/pachira.blend b/packages/frontend/assets/room/objects/pachira/pachira.blend index daf5764149..972a619702 100644 Binary files a/packages/frontend/assets/room/objects/pachira/pachira.blend and b/packages/frontend/assets/room/objects/pachira/pachira.blend differ diff --git a/packages/frontend/assets/room/objects/pachira/pachira.glb b/packages/frontend/assets/room/objects/pachira/pachira.glb index 9bd382b98a..a7a9724b74 100644 Binary files a/packages/frontend/assets/room/objects/pachira/pachira.glb and b/packages/frontend/assets/room/objects/pachira/pachira.glb differ diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue index 6cbef6613e..242a15ec4c 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -128,6 +128,12 @@ onMounted(() => { position: [40, 90, 170], rotation: [0, 0, 0], options: {}, + }, { + id: 'f4', + type: 'cactusS', + position: [50, 90, 155], + rotation: [0, 0, 0], + options: {}, }, { id: 'g', type: 'mug', diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index 407bb910d5..4bb164ec26 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -9,6 +9,7 @@ import { banknote } from './objects/banknote.js'; import { bed } from './objects/bed.js'; import { blind } from './objects/blind.js'; import { book } from './objects/book.js'; +import { cactusS } from './objects/cactusS.js'; import { cardboardBox } from './objects/cardboardBox.js'; import { ceilingFanLight } from './objects/ceilingFanLight.js'; import { chair } from './objects/chair.js'; @@ -42,6 +43,7 @@ export const OBJECT_DEFS = [ bed, blind, book, + cactusS, cardboardBox, ceilingFanLight, chair, diff --git a/packages/frontend/src/utility/room/objects/cactusS.ts b/packages/frontend/src/utility/room/objects/cactusS.ts new file mode 100644 index 0000000000..6ca0b14ece --- /dev/null +++ b/packages/frontend/src/utility/room/objects/cactusS.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 cactusS = defineObject({ + id: 'cactusS', + defaultOptions: {}, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +});