mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-13 14:05:35 +02:00
Code Releases Activity

fix

Browse Source
This commit is contained in:
syuilo
2026-04-19 20:23:07 +09:00
parent e402057d3b
commit c2428ca3cc
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/frontend/src/world/room/engine.ts
View File

@@ -1090,6 +1090,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
options: args.options,
model,
id: args.id,
timer: this.timer, // TODO: 家具が撤去された後も動作し続けるのをどうにかする
stickyMarkerMeshUpdated: (mesh) => {
// TODO
//// stickyな子の位置を更新

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

@@ -6,6 +6,7 @@
import * as BABYLON from '@babylonjs/core';
import type { RoomEngine } from './engine.js';
import type { ModelManager } from './utility.js';
import type { Timer } from '../utility.js';
// babylonのドメイン知識は持たない
export type RoomStateObject<Options = any> = {
@@ -105,6 +106,7 @@ export type ObjectDef<OpSc extends OptionsSchema = OptionsSchema> = {
options: Readonly<GetOptionsSchemaValues<OpSc>>;
model: ModelManager;
id: string;
timer: Timer;
stickyMarkerMeshUpdated?: (mesh: BABYLON.Mesh) => void;
}) => RoomObjectInstance<GetOptionsSchemaValues<OpSc>> | Promise<RoomObjectInstance<GetOptionsSchemaValues<OpSc>>>; // TODO: createInstanceをasyncにするのではなく、別にreadyみたいなものを返させる
};

5
packages/frontend/src/world/room/objects/tabletopDigitalClock.ts
View File

@@ -34,7 +34,7 @@ export const tabletopDigitalClock = defineObject({
},
placement: 'top',
hasCollisions: false,
createInstance: ({ root, room, options, model, scene }) => {
createInstance: ({ root, room, options, model, scene, timer }) => {
const light = new BABYLON.SpotLight('', new BABYLON.Vector3(0, cm(3), cm(1)), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, room?.lightContainer != null);
light.parent = root;
light.intensity = 0.01 * WORLD_SCALE * WORLD_SCALE;
@@ -100,7 +100,8 @@ export const tabletopDigitalClock = defineObject({
applyBodyColor();
applyLcdColor();
room.timer.setInterval(() => {
// TODO: 家具が撤去された後も呼ばれ続けるのをどうにかする
timer.setInterval(() => {
const onMeshes = get7segMeshesOfCurrentTime(segmentMeshes);
for (const mesh of Object.values(segmentMeshes)) {

5
packages/frontend/src/world/room/objects/wallClock.ts
View File

@@ -22,7 +22,7 @@ export const wallClock = defineObject({
},
placement: 'side',
hasCollisions: false,
createInstance: ({ room, root, options, model }) => {
createInstance: ({ room, timer, options, model }) => {
const hourHand = model.findMesh('HandH');
const minuteHand = model.findMesh('HandM');
@@ -39,7 +39,8 @@ export const wallClock = defineObject({
return {
onInited: () => {
room.timer.setInterval(() => {
// TODO: 家具が撤去された後も呼ばれ続けるのをどうにかする
timer.setInterval(() => {
const now = new Date();
const hours = now.getHours() % 12;
const minutes = now.getMinutes();

12
packages/frontend/src/world/room/previewEngine.ts
View File

@@ -6,7 +6,7 @@
import * as BABYLON from '@babylonjs/core';
import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic.js';
import { GridMaterial } from '@babylonjs/materials';
import { camelToKebab, WORLD_SCALE, cm, getMeshesBoundingBox } from '../utility.js';
import { camelToKebab, WORLD_SCALE, cm, getMeshesBoundingBox, Timer } from '../utility.js';
import { getObjectDef } from './object-defs.js';
import { SYSTEM_MESH_NAMES, ModelManager } from './utility.js';
import type { RoomObjectInstance } from './object.js';
@@ -32,6 +32,7 @@ export class RoomObjectPreviewEngine {
private envMapIndoor: BABYLON.CubeTexture;
private roomLight: BABYLON.SpotLight;
private zGridPreviewPlane: BABYLON.Mesh;
private timerForEachObject: Timer | null = null;
private fps = 60;
constructor(options: {
@@ -219,6 +220,11 @@ export class RoomObjectPreviewEngine {
}
});
if (this.timerForEachObject != null) {
this.timerForEachObject.dispose();
}
this.timerForEachObject = new Timer();
const objectInstance = await def.createInstance({
room: null,
scene: this.scene,
@@ -226,6 +232,7 @@ export class RoomObjectPreviewEngine {
options: args.options,
model,
id: args.id,
timer: this.timerForEachObject,
});
objectInstance.onInited?.();
@@ -245,6 +252,9 @@ export class RoomObjectPreviewEngine {
}
public destroy() {
if (this.timerForEachObject != null) {
this.timerForEachObject.dispose();
}
this.engine.dispose();
}
}