Confirm task completion

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
 

renderer/viewer/lib/worldDataEmitter.ts → renderer/viewer/lib/WorldView.ts

@@ -34,11 +34,11 @@
   static readonly restorerName = 'WorldDataEmitterWorker'
 }
 
-export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
+export class WorldView extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
   loadedChunks: Record<ChunkPosKey, boolean>
   readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
-  private readonly emitter: WorldDataEmitter
+  private readonly emitter: WorldView
   debugChunksInfo: Record<ChunkPosKey, {
     loads: Array<{
       dataLength: number
@@ -355,4 +355,4 @@
       this.lastPos.update(pos)
     }
   }
-}
+}

renderer/viewer/lib/worldrendererCommon.ts

@@ -15,7 +15,7 @@ import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, updatePanesVisibility, updateStatText } from './ui/newStats'
-import { WorldDataEmitterWorker } from './worldDataEmitter'
+import { WorldDataEmitterWorker } from './WorldView'
 import { getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from './basePlayerState'
 import { MesherLogReader } from './mesherlogReader'
 import { setSkinsConfig } from './utils/skins'

renderer/viewer/three/panorama.ts

@@ -4,7 +4,7 @@ import { getSyncWorld } from 'renderer/playground/shared'
 import { Vec3 } from 'vec3'
 import * as tweenJs from '@tweenjs/tween.js'
 import type { GraphicsInitOptions } from '../../../src/appViewer'
-import { WorldDataEmitter } from '../lib/worldDataEmitter'
+import { WorldView } from '../lib/WorldView'
 import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
 import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../lib/utils/skins'
@@ -186,7 +186,7 @@ export class PanoramaRenderer {
     this.camera.position.set(0.5, sizeY / 2 + 0.5, 0.5)
     this.camera.rotation.set(0, 0, 0)
     const initPos = new Vec3(...this.camera.position.toArray())
-    const worldView = new WorldDataEmitter(world, 2, initPos)
+    const worldView = new WorldView(world, 2, initPos)
     // worldView.addWaitTime = 0
     if (this.abortController.signal.aborted) return
 

src/appViewer.ts

@@ -1,4 +1,4 @@
-import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter'
+import { WorldView, WorldDataEmitterWorker } from 'renderer/viewer/lib/WorldView'
 import { getInitialPlayerState, PlayerStateRenderer, PlayerStateReactive } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
@@ -97,7 +97,7 @@
   waitBackendLoadPromises = [] as Array<Promise<void>>
 
   resourcesManager = new ResourcesManager()
-  worldView: WorldDataEmitter | undefined
+      worldView: WorldView | undefined
   readonly config: GraphicsBackendConfig = {
     ...defaultGraphicsBackendConfig,
     powerPreference: options.gpuPreference === 'default' ? undefined : options.gpuPreference
@@ -184,7 +184,7 @@
     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)
 

src/globals.d.ts

@@ -12,7 +12,7 @@ declare const bot: Omit<import('mineflayer').Bot, 'world' | '_client'> & {
 }
 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 */

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