mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-06-05 10:34:09 +02:00
Update engine.ts
This commit is contained in:
@@ -441,7 +441,6 @@ export class RoomEngine extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ev<K extends keyof RoomEngineEvents>(type: K, ctx: Parameters<RoomEngineEvents[K]>[0]) {
|
private ev<K extends keyof RoomEngineEvents>(type: K, ctx: Parameters<RoomEngineEvents[K]>[0]) {
|
||||||
console.log(type, ctx);
|
|
||||||
this.emit('ev', { type, ctx });
|
this.emit('ev', { type, ctx });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,10 +451,22 @@ export class RoomEngine extends EventEmitter {
|
|||||||
const objects = this.roomState.installedObjects.filter(o => !IGNORE_OBJECTS.includes(o.type));
|
const objects = this.roomState.installedObjects.filter(o => !IGNORE_OBJECTS.includes(o.type));
|
||||||
let loadedCount = 0;
|
let loadedCount = 0;
|
||||||
|
|
||||||
|
if (this.roomState.worldScale !== WORLD_SCALE) {
|
||||||
|
for (const o of objects) {
|
||||||
|
o.position = [
|
||||||
|
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),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
this.roomState.worldScale = WORLD_SCALE;
|
||||||
|
this.ev('changeRoomState', { roomState: this.roomState });
|
||||||
|
}
|
||||||
|
|
||||||
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: 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),
|
position: 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(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user