diff --git a/packages/frontend/assets/room/objects/pachira/pachira.blend b/packages/frontend/assets/room/objects/pachira/pachira.blend index 5ef98fabf0..daf5764149 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 5996f7f87b..9bd382b98a 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 4a812fdafd..9ed68640a7 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -213,7 +213,7 @@ onMounted(() => { options: {}, }, { id: 'r', - type: 'plant2', + type: 'pachira', position: [135, 0, -135], rotation: [0, 0, 0], options: {}, diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index 6378ae35f0..407bb910d5 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -24,6 +24,7 @@ import { monitor } from './objects/monitor.js'; import { monstera } from './objects/monstera.js'; import { mug } from './objects/mug.js'; import { openedCardboardBox } from './objects/openedCardboardBox.js'; +import { pachira } from './objects/pachira.js'; import { plant } from './objects/plant.js'; import { plant2 } from './objects/plant2.js'; import { powerStrip } from './objects/powerStrip.js'; @@ -56,6 +57,7 @@ export const OBJECT_DEFS = [ monstera, mug, openedCardboardBox, + pachira, plant, plant2, powerStrip, diff --git a/packages/frontend/src/utility/room/objects/pachira.ts b/packages/frontend/src/utility/room/objects/pachira.ts new file mode 100644 index 0000000000..87abc1ea73 --- /dev/null +++ b/packages/frontend/src/utility/room/objects/pachira.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 pachira = defineObject({ + id: 'pachira', + defaultOptions: {}, + placement: 'top', + createInstance: () => { + return { + interactions: {}, + }; + }, +});