diff --git a/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.blend b/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.blend new file mode 100644 index 0000000000..3a79171e48 Binary files /dev/null and b/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.blend differ diff --git a/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.glb b/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.glb new file mode 100644 index 0000000000..c9016a0633 Binary files /dev/null and b/packages/frontend/assets/room/objects/newtons-cradle/newtons-cradle.glb differ diff --git a/packages/frontend/src/utility/room/object-defs.ts b/packages/frontend/src/utility/room/object-defs.ts index 37f738a6c4..6fd44dc742 100644 --- a/packages/frontend/src/utility/room/object-defs.ts +++ b/packages/frontend/src/utility/room/object-defs.ts @@ -49,6 +49,7 @@ import { monitor } from './objects/monitor.js'; import { monitorSpeaker } from './objects/monitorSpeaker.js'; import { monstera } from './objects/monstera.js'; import { mug } from './objects/mug.js'; +import { newtonsCradle } from './objects/newtonsCradle.js'; import { openedCardboardBox } from './objects/openedCardboardBox.js'; import { pachira } from './objects/pachira.js'; import { pc } from './objects/pc.js'; @@ -138,6 +139,7 @@ export const OBJECT_DEFS = [ monitorSpeaker, monstera, mug, + newtonsCradle, openedCardboardBox, pachira, pc, diff --git a/packages/frontend/src/utility/room/objects/newtonsCradle.ts b/packages/frontend/src/utility/room/objects/newtonsCradle.ts new file mode 100644 index 0000000000..9ce7514b8d --- /dev/null +++ b/packages/frontend/src/utility/room/objects/newtonsCradle.ts @@ -0,0 +1,43 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import * as BABYLON from '@babylonjs/core'; +import { defineObject } from '../engine.js'; + +export const newtonsCradle = defineObject({ + id: 'newtonsCradle', + name: 'newtonsCradle', + options: { + schema: { + frameColor: { + type: 'color', + label: 'Frame color', + }, + }, + default: { + frameColor: [0.15, 0.15, 0.15], + }, + }, + placement: 'top', + createInstance: ({ options, model }) => { + const frameMaterial = model.findMaterial('__X_FRAME__'); + + const applyFrameColor = () => { + const [r, g, b] = options.frameColor; + frameMaterial.albedoColor = new BABYLON.Color3(r, g, b); + }; + + applyFrameColor(); + + return { + onOptionsUpdated: ([k, v]) => { + switch (k) { + case 'frameColor': applyFrameColor(); break; + } + }, + interactions: {}, + }; + }, +});