mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-06-04 12:24:10 +02:00
Code Releases Activity

wip

Browse Source
This commit is contained in:
syuilo
2026-05-05 20:29:10 +09:00
parent a1cb4b8304
commit db1b5e9ce9
8 changed files with 170 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/frontend/assets/room/objects/stanchion-pole/stanchion-pole.blend Normal file
View File

Binary file not shown.

BIN
packages/frontend/assets/room/objects/stanchion-pole/stanchion-pole.glb Normal file
View File

Binary file not shown.

8
packages/frontend/package.json
View File

@@ -17,10 +17,10 @@
}, },
"dependencies": { "dependencies": {
"@analytics/google-analytics": "1.1.0", "@analytics/google-analytics": "1.1.0",
"@babylonjs/core": "9.5.0", "@babylonjs/core": "9.5.1",
"@babylonjs/inspector": "9.5.0", "@babylonjs/inspector": "9.5.1",
"@babylonjs/loaders": "9.5.0", "@babylonjs/loaders": "9.5.1",
"@babylonjs/materials": "9.5.0", "@babylonjs/materials": "9.5.1",
"@discordapp/twemoji": "16.0.1", "@discordapp/twemoji": "16.0.1",
"@github/webauthn-json": "2.1.1", "@github/webauthn-json": "2.1.1",
"@mcaptcha/core-glue": "0.1.0-alpha-5", "@mcaptcha/core-glue": "0.1.0-alpha-5",

2
packages/frontend/src/world/room/object-defs.ts
View File

@@ -83,6 +83,7 @@ import { speaker } from './objects/speaker.js';
import { speakerStand } from './objects/speakerStand.js'; import { speakerStand } from './objects/speakerStand.js';
import { spotLight } from './objects/spotLight.js'; import { spotLight } from './objects/spotLight.js';
import { sprayer } from './objects/sprayer.js'; import { sprayer } from './objects/sprayer.js';
import { stanchionPole } from './objects/stanchionPole.js';
import { steelRack } from './objects/steelRack.js'; import { steelRack } from './objects/steelRack.js';
import { stormGlass } from './objects/stormGlass.js'; import { stormGlass } from './objects/stormGlass.js';
import { tableSalt } from './objects/tableSalt.js'; import { tableSalt } from './objects/tableSalt.js';
@@ -213,6 +214,7 @@ export const OBJECT_DEFS = [
spotLight, spotLight,
lowPartitionBar, lowPartitionBar,
descriptionPlate, descriptionPlate,
stanchionPole,
]; ];
export function getObjectDef(type: string): typeof OBJECT_DEFS[number] { export function getObjectDef(type: string): typeof OBJECT_DEFS[number] {

8
packages/frontend/src/world/room/objects/lavaLamp.ts
View File

@@ -98,8 +98,6 @@ export const lavaLamp = defineObject({
let animationObserver: BABYLON.Observer<BABYLON.Scene>; let animationObserver: BABYLON.Observer<BABYLON.Scene>;
return {
onInited: () => {
const anim = new BABYLON.Animation('lavaLampLightAnim', 'position.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE); const anim = new BABYLON.Animation('lavaLampLightAnim', 'position.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([ anim.setKeys([
{ frame: 0, value: cm(11) }, { frame: 0, value: cm(11) },
@@ -140,6 +138,12 @@ export const lavaLamp = defineObject({
ps.colorDead = new BABYLON.Color4(1, 1, 1, 0); ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
ps.preWarmCycles = 100; ps.preWarmCycles = 100;
ps.start(); ps.start();
room?.sr.fixParticleSystem(ps);
return {
onInited: () => {
}, },
interactions: {}, interactions: {},
onOptionsUpdated: ([k, v]) => { onOptionsUpdated: ([k, v]) => {

43
packages/frontend/src/world/room/objects/pictureFrame.ts
View File

@@ -60,6 +60,10 @@ export const pictureFrame = defineObject({
max: 1, max: 1,
step: 0.01, step: 0.01,
}, },
withCover: {
type: 'boolean',
label: 'With cover',
},
customPicture: { customPicture: {
type: 'image', type: 'image',
label: 'Custom picture', label: 'Custom picture',
@@ -78,6 +82,7 @@ export const pictureFrame = defineObject({
depth: 0, depth: 0,
matHThickness: 0.35, matHThickness: 0.35,
matVThickness: 0.35, matVThickness: 0.35,
withCover: true,
customPicture: null, customPicture: null,
fit: 'cover', fit: 'cover',
}, },
@@ -160,6 +165,13 @@ export const pictureFrame = defineObject({
applyDepth(); applyDepth();
const applyWithCover = () => {
coverMesh.isVisible = options.withCover;
model.updated();
};
applyWithCover();
const applyCustomPicture = () => new Promise<void>((resolve) => { const applyCustomPicture = () => new Promise<void>((resolve) => {
if (options.customPicture != null) { if (options.customPicture != null) {
pictureMaterial.unfreeze(); pictureMaterial.unfreeze();
@@ -199,26 +211,17 @@ export const pictureFrame = defineObject({
}, },
onOptionsUpdated: ([k, v]) => { onOptionsUpdated: ([k, v]) => {
if (k === 'frameColor') { switch (k) {
applyFrameColor(); case 'frameColor': applyFrameColor(); break;
} case 'width':
if (k === 'width' || k === 'height') { case 'height': applySize(); break;
applySize(); case 'frameThickness': applyFrameThickness(); break;
} case 'matHThickness':
if (k === 'frameThickness') { case 'matVThickness': applyMatThickness(); break;
applyFrameThickness(); case 'depth': applyDepth(); break;
} case 'withCover': applyWithCover(); break;
if (k === 'depth') { case 'customPicture':
applyDepth(); case 'fit': applyCustomPicture(); break;
}
if (k === 'matHThickness' || k === 'matVThickness') {
applyMatThickness();
}
if (k === 'customPicture') {
applyCustomPicture();
}
if (k === 'fit') {
applyFit();
} }
}, },
interactions: {}, interactions: {},

60
packages/frontend/src/world/room/objects/stanchionPole.ts Normal file
View File

@@ -0,0 +1,60 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core';
import { defineObject } from '../object.js';
export const stanchionPole = defineObject({
id: 'stanchionPole',
name: 'stanchionPole',
options: {
schema: {
bodyColor: {
type: 'color',
label: 'Body color',
},
ropeColor: {
type: 'color',
label: 'Rope color',
},
},
default: {
bodyColor: [0.8, 0.39, 0.1],
ropeColor: [0.21, 0.0, 0.0],
},
},
placement: 'floor',
hasCollisions: false,
hasTexture: false,
createInstance: ({ options, model }) => {
const bodyMaterial = model.findMaterial('__X_BODY__');
const applyBodyColor = () => {
const [r, g, b] = options.bodyColor;
bodyMaterial.albedoColor = new BABYLON.Color3(r, g, b);
};
applyBodyColor();
const ropeMaterial = model.findMaterial('__X_ROPE__');
const applyRopeColor = () => {
const [r, g, b] = options.ropeColor;
ropeMaterial.albedoColor = new BABYLON.Color3(r, g, b);
};
applyRopeColor();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'bodyColor': applyBodyColor(); break;
case 'ropeColor': applyRopeColor(); break;
}
},
interactions: {},
};
},
});

76
pnpm-lock.yaml generated
View File

@@ -612,17 +612,17 @@ importers:
specifier: 1.1.0 specifier: 1.1.0
version: 1.1.0 version: 1.1.0
'@babylonjs/core': '@babylonjs/core':
specifier: 9.5.0 specifier: 9.5.1
version: 9.5.0 version: 9.5.1
'@babylonjs/inspector': '@babylonjs/inspector':
specifier: 9.5.0 specifier: 9.5.1
version: 9.5.0(ff8a1bb88ff981e3db6a2e8a0a3f9750) version: 9.5.1(160203920591168ac4221ec379e95c1a)
'@babylonjs/loaders': '@babylonjs/loaders':
specifier: 9.5.0 specifier: 9.5.1
version: 9.5.0(@babylonjs/core@9.5.0)(babylonjs-gltf2interface@8.51.2) version: 9.5.1(@babylonjs/core@9.5.1)(babylonjs-gltf2interface@8.51.2)
'@babylonjs/materials': '@babylonjs/materials':
specifier: 9.5.0 specifier: 9.5.1
version: 9.5.0(@babylonjs/core@9.5.0) version: 9.5.1(@babylonjs/core@9.5.1)
'@discordapp/twemoji': '@discordapp/twemoji':
specifier: 16.0.1 specifier: 16.0.1
version: 16.0.1 version: 16.0.1
@@ -1735,8 +1735,8 @@ packages:
peerDependencies: peerDependencies:
'@babylonjs/core': ^8.0.0 '@babylonjs/core': ^8.0.0
'@babylonjs/core@9.5.0': '@babylonjs/core@9.5.1':
resolution: {integrity: sha512-DTqkOTueTp/xSw/VTVzrxLpBWjamVIKXbAbgqDHRR/V3Am5F5LRGscaWjWgPc5INv7HD2zTln/lyWdm47KQkgQ==} resolution: {integrity: sha512-T3qzihiGqwKZitQgLxqjLhNDRmaQe/Fp8lxinw1ZMaZeErSdWNDgmHtReuxG1/X2XZ0cbYkJkZF/99flNzlX4Q==}
'@babylonjs/gui-editor@8.51.2': '@babylonjs/gui-editor@8.51.2':
resolution: {integrity: sha512-+kG9551b0iPK/BcPhdK3QUlaA+BJ9pt3LGiWkhyEMKYfZ0dJRjjmoFZuCAehlYU9sxEiWf1C/y96BrPt2QodIA==} resolution: {integrity: sha512-+kG9551b0iPK/BcPhdK3QUlaA+BJ9pt3LGiWkhyEMKYfZ0dJRjjmoFZuCAehlYU9sxEiWf1C/y96BrPt2QodIA==}
@@ -1751,8 +1751,8 @@ packages:
peerDependencies: peerDependencies:
'@babylonjs/core': ^8.0.0 '@babylonjs/core': ^8.0.0
'@babylonjs/inspector@9.5.0': '@babylonjs/inspector@9.5.1':
resolution: {integrity: sha512-YP6LgiUJShwotk7t9iYQdU3qVfWmIiwZ3zJi0Ci3A4T0enulaf6dM1eK31gImp1mH01N3ZcnvTJ5y0UZ34mVog==} resolution: {integrity: sha512-J5gASGTJ66wC2iHf1KWH74vTIPYEEy0UoWFh+YHRvJk9dl8ncV4EtVdW6GfUZNZlSs0fBpLPYG4D9T9YicT2Xg==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
'@babylonjs/addons': ^9.0.0 '@babylonjs/addons': ^9.0.0
@@ -1770,14 +1770,14 @@ packages:
react-dom: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0'
usehooks-ts: ^3.1.1 usehooks-ts: ^3.1.1
'@babylonjs/loaders@9.5.0': '@babylonjs/loaders@9.5.1':
resolution: {integrity: sha512-e2PqqPQ2A6xCJ6yW2NtcCzCKfN7neJjpxCUWBXqVUc268QnC1DNV49PM6bVpzNzTqzYjapMR9u5apcvAWo2iYQ==} resolution: {integrity: sha512-Si22HIUlWyP5EuzN1MIEOLSY6K07yjEvFeO3GwZA5v+nGzU/MbVCPKtIKasQ72D0WLABfFHEO6cu24XhjkPGHQ==}
peerDependencies: peerDependencies:
'@babylonjs/core': ^9.0.0 '@babylonjs/core': ^9.0.0
babylonjs-gltf2interface: ^9.0.0 babylonjs-gltf2interface: ^9.0.0
'@babylonjs/materials@9.5.0': '@babylonjs/materials@9.5.1':
resolution: {integrity: sha512-zKXs5UBqMGhDcpGhlIKvOuMPd77Pm6myAv0xEi0d7UL4dGk0u86bs4dQO2kqXGstf3bwzR3fNvljAuhOrDYflg==} resolution: {integrity: sha512-jVtuZxKP7PGolJiC3REKEK/1dFz+Qf8y7YWOuQ//GlWYYBCXwz+3C6asCCvmuLOA6aRIRWEm8oElj/8pqE8+PQ==}
peerDependencies: peerDependencies:
'@babylonjs/core': ^9.0.0 '@babylonjs/core': ^9.0.0
@@ -11866,32 +11866,32 @@ snapshots:
'@babel/helper-string-parser': 7.27.1 '@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.28.5 '@babel/helper-validator-identifier': 7.28.5
'@babylonjs/addons@8.51.2(@babylonjs/core@9.5.0)': '@babylonjs/addons@8.51.2(@babylonjs/core@9.5.1)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
'@babylonjs/core@9.5.0': {} '@babylonjs/core@9.5.1': {}
'@babylonjs/gui-editor@8.51.2(@babylonjs/core@9.5.0)(@babylonjs/gui@8.51.2(@babylonjs/core@9.5.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)': '@babylonjs/gui-editor@8.51.2(@babylonjs/core@9.5.1)(@babylonjs/gui@8.51.2(@babylonjs/core@9.5.1))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
'@babylonjs/gui': 8.51.2(@babylonjs/core@9.5.0) '@babylonjs/gui': 8.51.2(@babylonjs/core@9.5.1)
'@types/react': 19.2.2 '@types/react': 19.2.2
'@types/react-dom': 19.2.3(@types/react@19.2.2) '@types/react-dom': 19.2.3(@types/react@19.2.2)
'@babylonjs/gui@8.51.2(@babylonjs/core@9.5.0)': '@babylonjs/gui@8.51.2(@babylonjs/core@9.5.1)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
'@babylonjs/inspector@9.5.0(ff8a1bb88ff981e3db6a2e8a0a3f9750)': '@babylonjs/inspector@9.5.1(160203920591168ac4221ec379e95c1a)':
dependencies: dependencies:
'@babylonjs/addons': 8.51.2(@babylonjs/core@9.5.0) '@babylonjs/addons': 8.51.2(@babylonjs/core@9.5.1)
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
'@babylonjs/gui': 8.51.2(@babylonjs/core@9.5.0) '@babylonjs/gui': 8.51.2(@babylonjs/core@9.5.1)
'@babylonjs/gui-editor': 8.51.2(@babylonjs/core@9.5.0)(@babylonjs/gui@8.51.2(@babylonjs/core@9.5.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2) '@babylonjs/gui-editor': 8.51.2(@babylonjs/core@9.5.1)(@babylonjs/gui@8.51.2(@babylonjs/core@9.5.1))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)
'@babylonjs/loaders': 9.5.0(@babylonjs/core@9.5.0)(babylonjs-gltf2interface@8.51.2) '@babylonjs/loaders': 9.5.1(@babylonjs/core@9.5.1)(babylonjs-gltf2interface@8.51.2)
'@babylonjs/materials': 9.5.0(@babylonjs/core@9.5.0) '@babylonjs/materials': 9.5.1(@babylonjs/core@9.5.1)
'@babylonjs/serializers': 8.51.2(@babylonjs/core@9.5.0)(babylonjs-gltf2interface@8.51.2) '@babylonjs/serializers': 8.51.2(@babylonjs/core@9.5.1)(babylonjs-gltf2interface@8.51.2)
'@fluentui-contrib/react-resize-handle': 0.8.4(@fluentui/react-components@9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@fluentui-contrib/react-resize-handle': 0.8.4(@fluentui/react-components@9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
'@fluentui-contrib/react-virtualizer': 0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@fluentui-contrib/react-virtualizer': 0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
'@fluentui/react-components': 9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0) '@fluentui/react-components': 9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0)
@@ -11900,18 +11900,18 @@ snapshots:
react-dom: 19.2.5(react@19.2.5) react-dom: 19.2.5(react@19.2.5)
usehooks-ts: 3.1.1(react@19.2.5) usehooks-ts: 3.1.1(react@19.2.5)
'@babylonjs/loaders@9.5.0(@babylonjs/core@9.5.0)(babylonjs-gltf2interface@8.51.2)': '@babylonjs/loaders@9.5.1(@babylonjs/core@9.5.1)(babylonjs-gltf2interface@8.51.2)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
babylonjs-gltf2interface: 8.51.2 babylonjs-gltf2interface: 8.51.2
'@babylonjs/materials@9.5.0(@babylonjs/core@9.5.0)': '@babylonjs/materials@9.5.1(@babylonjs/core@9.5.1)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
'@babylonjs/serializers@8.51.2(@babylonjs/core@9.5.0)(babylonjs-gltf2interface@8.51.2)': '@babylonjs/serializers@8.51.2(@babylonjs/core@9.5.1)(babylonjs-gltf2interface@8.51.2)':
dependencies: dependencies:
'@babylonjs/core': 9.5.0 '@babylonjs/core': 9.5.1
babylonjs-gltf2interface: 8.51.2 babylonjs-gltf2interface: 8.51.2
'@bcoe/v8-coverage@1.0.2': {} '@bcoe/v8-coverage@1.0.2': {}