add a way to to disable neighbor chunk updates and all the UI (needed…

… for perf testing)
zardoy · Sep 7, 2024 · 1c7fdc2 · 1c7fdc2
1 parent a301063
commit 1c7fdc2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -100,6 +100,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     x: number
     z: number
   }
+  neighborChunkUpdates = true
 
   abstract outputFormat: 'threeJs' | 'webgpu'
 
@@ -321,7 +322,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
       this.setSectionDirty(loc)
-      if (!isLightUpdate || this.mesherConfig.smoothLighting) {
+      if (this.neighborChunkUpdates && (!isLightUpdate || this.mesherConfig.smoothLighting)) {
         this.setSectionDirty(loc.offset(-16, 0, 0))
         this.setSectionDirty(loc.offset(16, 0, 0))
         this.setSectionDirty(loc.offset(0, 0, -16))
@@ -357,12 +358,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       worker.postMessage({ type: 'blockUpdate', pos, stateId })
     }
     this.setSectionDirty(pos)
-    if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0))
-    if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0))
-    if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0))
-    if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0))
-    if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16))
-    if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16))
+    if (this.neighborChunkUpdates) {
+      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0))
+      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0))
+      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0))
+      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0))
+      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16))
+      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16))
+    }
   }
 
   queueAwaited = false

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
@@ -91,6 +91,7 @@ export const guiOptionsScheme: {
         tooltip: 'Additional distance to keep the chunks loading before unloading them by marking them as too far',
       },
       handDisplay: {},
+      neighborChunkUpdates: {},
     },
   ],
   main: [
@@ -429,15 +430,15 @@ const Category = ({ children }) => <div style={{
 const UiToggleButton = ({ name, addUiText = false, label = noCase(name) }) => {
   const { disabledUiParts } = useSnapshot(options)
 
-  const currentlyEnabled = disabledUiParts.includes(name)
+  const currentlyDisabled = disabledUiParts.includes(name)
   if (addUiText) label = `${label} UI`
   return <Button
     inScreen
     onClick={() => {
-      const newDisabledUiParts = currentlyEnabled ? disabledUiParts.filter(x => x !== name) : [...disabledUiParts, name]
+      const newDisabledUiParts = currentlyDisabled ? disabledUiParts.filter(x => x !== name) : [...disabledUiParts, name]
       options.disabledUiParts = newDisabledUiParts
     }}
-  >{currentlyEnabled ? 'Disable' : 'Enable'} {label}</Button>
+  >{currentlyDisabled ? 'Enable' : 'Disable'} {label}</Button>
 }
 
 export const tryFindOptionConfig = (option: keyof AppOptions) => {

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
@@ -84,6 +84,7 @@ const defaultOptions = {
   wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
   displayBossBars: false, // boss bar overlay was removed for some reason, enable safely
   disabledUiParts: [] as string[],
+  neighborChunkUpdates: true
 }
 
 function getDefaultTouchControlsPositions () {

diff --git a/src/reactUi.tsx b/src/reactUi.tsx
@@ -104,7 +104,7 @@ const InGameUi = () => {
   const { disabledUiParts, displayBossBars } = useSnapshot(options)
   const hasModals = useSnapshot(activeModalStack).length > 0
   const showUI = showUIRaw || hasModals
-  if (!gameLoaded || !bot) return
+  if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
 
   return <>
     <RobustPortal to={document.querySelector('#ui-root')}>

diff --git a/src/watchOptions.ts b/src/watchOptions.ts
@@ -62,6 +62,10 @@ export const watchOptionsAfterViewerInit = () => {
     if (!(viewer.world instanceof WorldRendererThree)) return
     viewer.world.starField.enabled = o.starfieldRendering
   })
+
+  watchValue(options, o => {
+    viewer.world.neighborChunkUpdates = o.neighborChunkUpdates
+  })
 }
 
 let viewWatched = false