mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-23 09:54:06 +02:00
Code Releases Activity

wip

Browse Source
This commit is contained in:
syuilo
2026-05-01 11:54:52 +09:00
parent 7df4b729e9
commit d1eda166de
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/frontend/src/pages/room.vue
View File

@@ -94,7 +94,7 @@ import { ensureSignin } from '@/i';
import MkButton from '@/components/MkButton.vue'; import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { RoomController } from '@/world/room/controller.js'; import { RoomController } from '@/world/room/controller.js';
import { cm, getHex, getRgb } from '@/world/utility.js'; import { cm, getHex, getRgb, WORLD_SCALE } from '@/world/utility.js';
import { deepClone } from '@/utility/clone.js'; import { deepClone } from '@/utility/clone.js';
import { GRAPHICS_QUALITY_HIGH, GRAPHICS_QUALITY_LOW, GRAPHICS_QUALITY_MEDIUM } from '@/world/room/engine.js'; import { GRAPHICS_QUALITY_HIGH, GRAPHICS_QUALITY_LOW, GRAPHICS_QUALITY_MEDIUM } from '@/world/room/engine.js';
import { deviceKind } from '@/utility/device-kind.js'; import { deviceKind } from '@/utility/device-kind.js';
@@ -224,8 +224,14 @@ const data = localStorage.getItem('roomData') != null ? JSON.parse(localStorage.
}, },
roomLightColor: [1.0, 0.9, 0.8], roomLightColor: [1.0, 0.9, 0.8],
installedObjects: [], installedObjects: [],
worldScale: WORLD_SCALE,
}; };
// 後方互換性のため
if (data.worldScale == null) {
data.worldScale = 1;
}
console.log('installedObjects:', data.installedObjects.length); console.log('installedObjects:', data.installedObjects.length);
let latestData = deepClone(data); let latestData = deepClone(data);
@@ -270,6 +276,7 @@ onMounted(async () => {
window.addEventListener('resize', resize); window.addEventListener('resize', resize);
watch(controller.roomState, () => { watch(controller.roomState, () => {
controller.roomState.value.worldScale = WORLD_SCALE;
isModified.value = true; isModified.value = true;
}); });

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

@@ -15,7 +15,7 @@
import * as BABYLON from '@babylonjs/core'; import * as BABYLON from '@babylonjs/core';
import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic'; import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic';
import { EventEmitter } from 'eventemitter3'; import { EventEmitter } from 'eventemitter3';
import { TIME_MAP, scaleMorph, camelToKebab, cm, WORLD_SCALE, getMeshesBoundingBox, Timer, getYRotationDirection, FreeCameraManualInput } from '../utility.js'; import { TIME_MAP, scaleMorph, camelToKebab, cm, WORLD_SCALE, getMeshesBoundingBox, Timer, getYRotationDirection, FreeCameraManualInput, remap } from '../utility.js';
import { getObjectDef } from './object-defs.js'; import { getObjectDef } from './object-defs.js';
import { findMaterial, ModelManager, SYSTEM_HEYA_MESH_NAMES, SYSTEM_MESH_NAMES } from './utility.js'; import { findMaterial, ModelManager, SYSTEM_HEYA_MESH_NAMES, SYSTEM_MESH_NAMES } from './utility.js';
import { SimpleHeyaManager } from './heya.js'; import { SimpleHeyaManager } from './heya.js';
@@ -40,6 +40,7 @@ export type RoomState = {
}; };
roomLightColor: [number, number, number]; roomLightColor: [number, number, number];
installedObjects: RoomStateObject<any>[]; installedObjects: RoomStateObject<any>[];
worldScale: number;
}; };
function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) { function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) {
@@ -454,7 +455,7 @@ export class RoomEngine extends EventEmitter {
await Promise.all(objects.map(o => this.loadObject({ await Promise.all(objects.map(o => this.loadObject({
id: o.id, id: o.id,
type: o.type, type: o.type,
position: new BABYLON.Vector3(...o.position), position: this.roomState.worldScale !== WORLD_SCALE ? new BABYLON.Vector3(remap(o.position[0], 0, this.roomState.worldScale, 0, WORLD_SCALE), remap(o.position[1], 0, this.roomState.worldScale, 0, WORLD_SCALE), remap(o.position[2], 0, this.roomState.worldScale, 0, WORLD_SCALE)) : new BABYLON.Vector3(...o.position),
rotation: new BABYLON.Vector3(o.rotation[0], o.rotation[1], o.rotation[2]), rotation: new BABYLON.Vector3(o.rotation[0], o.rotation[1], o.rotation[2]),
options: o.options, options: o.options,
}).then(() => { }).then(() => {

9
packages/frontend/src/world/utility.ts
View File

@@ -5,10 +5,13 @@
import * as BABYLON from '@babylonjs/core'; import * as BABYLON from '@babylonjs/core';
export const WORLD_SCALE = 1; // ベクトルが小さいと動きが不自然になったりするので大きくする
// https://forum.babylonjs.com/t/the-camera-isnt-moving-correctly-in-my-custom-input/63286/2
export const WORLD_SCALE = 100;
// cm to meter. 二重に適用しないように注意すること。 //// cm to meter. 二重に適用しないように注意すること。
export const cm = (value: number) => value / 100; //export const cm = (value: number) => value / 100;
export const cm = (value: number) => value;
export const TIME_MAP = { export const TIME_MAP = {
0: 2, 0: 2,