diff --git a/renderer/playground/baseScene.ts b/renderer/playground/baseScene.ts index b9e7791da..94e06dfad 100644 --- a/renderer/playground/baseScene.ts +++ b/renderer/playground/baseScene.ts @@ -14,7 +14,7 @@ import { OrbitControls } from 'three/addons/controls/OrbitControls.js' import GUI from 'lil-gui' import _ from 'lodash' import { toMajorVersion } from '../../src/utils' -import { WorldDataEmitter } from '../viewer' +import { WorldView } from '../viewer/lib/WorldView' import { Viewer } from '../viewer/lib/viewer' import { BlockNames } from '../../src/mcDataTypes' import { initWithRenderer, statsEnd, statsStart } from '../../src/topRightStats' @@ -178,7 +178,7 @@ export class BasePlaygroundScene { this.initGui() - const worldView = new WorldDataEmitter(world, this.viewDistance, this.targetPos) + const worldView = new WorldView(world, this.viewDistance, this.targetPos) worldView.addWaitTime = 0 window.worldView = worldView diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/WorldView.ts similarity index 98% rename from renderer/viewer/lib/worldDataEmitter.ts rename to renderer/viewer/lib/WorldView.ts index 78da96d9e..f9eb9cb82 100644 --- a/renderer/viewer/lib/worldDataEmitter.ts +++ b/renderer/viewer/lib/WorldView.ts @@ -34,11 +34,11 @@ export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmit static readonly restorerName = 'WorldDataEmitterWorker' } -export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter) { +export class WorldView extends (EventEmitter as new () => TypedEmitter) { loadedChunks: Record readonly lastPos: Vec3 private eventListeners: Record = {} - private readonly emitter: WorldDataEmitter + private readonly emitter: WorldView debugChunksInfo: Record TypedEmitter> resourcesManager = new ResourcesManager() - worldView: WorldDataEmitter | undefined + worldView: WorldView | undefined readonly config: GraphicsBackendConfig = { ...defaultGraphicsBackendConfig, powerPreference: options.gpuPreference === 'default' ? undefined : options.gpuPreference @@ -184,7 +184,7 @@ export class AppViewer { if (this.currentDisplay === 'world') throw new Error('World already started') this.currentDisplay = 'world' const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0) - this.worldView = new WorldDataEmitter(world, renderDistance, startPosition) + this.worldView = new WorldView(world, renderDistance, startPosition) window.worldView = this.worldView watchOptionsAfterWorldViewInit(this.worldView) diff --git a/src/globals.d.ts b/src/globals.d.ts index 7a2c6f1f1..71caf128e 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -12,7 +12,7 @@ declare const bot: Omit & { } declare const __type_bot: typeof bot declare const appViewer: import('./appViewer').AppViewer -declare const worldView: import('renderer/viewer/lib/worldDataEmitter').WorldDataEmitter | undefined +declare const worldView: import('renderer/viewer/lib/WorldView').WorldView | undefined declare const addStatPerSec: (name: string) => void declare const localServer: import('flying-squid/dist/index').FullServer & { options } | undefined /** all currently loaded mc data */ diff --git a/src/watchOptions.ts b/src/watchOptions.ts index 478da4fb1..63f2746f8 100644 --- a/src/watchOptions.ts +++ b/src/watchOptions.ts @@ -2,7 +2,7 @@ import { subscribeKey } from 'valtio/utils' import { isMobile } from 'renderer/viewer/lib/simpleUtils' -import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter' +import { WorldView } from 'renderer/viewer/lib/WorldView' import { options, watchValue } from './optionsStorage' import { reloadChunks } from './utils' import { miscUiState } from './globalState' @@ -117,7 +117,7 @@ export const watchOptionsAfterViewerInit = () => { }) } -export const watchOptionsAfterWorldViewInit = (worldView: WorldDataEmitter) => { +export const watchOptionsAfterWorldViewInit = (worldView: WorldView) => { watchValue(options, o => { if (!worldView) return worldView.keepChunksDistance = o.keepChunksDistance