minecraft-renderer 0.1.46 → 0.1.48

package/src/three/menuBackground/defaultOptions.ts

@@ -22,6 +22,19 @@ export type RendererOptionMeta = {
 
 export type RendererDefaultOptionKey = keyof typeof RENDERER_DEFAULT_OPTIONS
 
+export type RendererMesherPipeline = 'wasm' | 'legacy-js'
+
+export type RendererGpuPreference = 'default' | 'high-performance' | 'low-power'
+
+/** Maps stored `gpuPreference` to WebGL `powerPreference` (undefined = browser default). */
+export function gpuPreferenceToWebGLPowerPreference(
+  preference: RendererGpuPreference
+): 'high-performance' | 'low-power' | undefined {
+  if (preference === 'high-performance') return 'high-performance'
+  if (preference === 'low-power') return 'low-power'
+  return undefined
+}
+
 const MB = MENU_BACKGROUND_OPTION_DEFAULTS
 
 /** Default values for options owned by minecraft-renderer (spread into app `defaultOptions`). */
@@ -39,9 +52,53 @@ export const RENDERER_DEFAULT_OPTIONS = {
   menuBackgroundFuturisticBlockSpeed: MB.futuristicBlockSpeedPercent,
   rendererFuturisticReveal: false,
   rendererPerfDebugOverlay: false,
-  disableBlockEntityTextures: false
+  disableBlockEntityTextures: false,
+  rendererMesher: 'wasm' as RendererMesherPipeline,
+  showChunkBorders: false,
+  renderEntities: true,
+  renderDebug: 'basic' as 'none' | 'basic' | 'advanced',
+  frameLimit: false as number | false,
+  backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
+  vanillaLook: false,
+  smoothLighting: true,
+  newVersionsLighting: false,
+  vrSupport: true,
+  vrPageGameRendering: false,
+  clipWorldBelowY: undefined as number | undefined,
+  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
+  loadPlayerSkins: true,
+  renderEars: true,
+  showHand: true,
+  viewBobbing: true,
+  dayCycleAndLighting: true,
+  keepChunksDistance: 1,
+  gpuPreference: 'default' as RendererGpuPreference,
+  fov: 75
 } as const
 
+/** App options storage shape for renderer-owned keys. */
+export type RendererStorageOptions = typeof RENDERER_DEFAULT_OPTIONS
+
+/**
+ * Migrate persisted / legacy option keys into current {@link RENDERER_DEFAULT_OPTIONS} shape.
+ * Call when loading saved settings (safe to run on every load).
+ */
+export function migrateRendererOptions(saved: Record<string, unknown>): void {
+  if (saved.highPerformanceGpu) {
+    saved.gpuPreference = 'high-performance'
+    delete saved.highPerformanceGpu
+  }
+  if (saved.rendererMesher !== 'wasm' && saved.rendererMesher !== 'legacy-js') {
+    if (typeof saved.rendererWasmMesher === 'boolean') {
+      saved.rendererMesher = saved.rendererWasmMesher ? 'wasm' : 'legacy-js'
+    } else if (typeof saved.wasmExperimentalMesher === 'boolean') {
+      saved.rendererMesher = saved.wasmExperimentalMesher ? 'wasm' : 'legacy-js'
+    }
+  }
+  delete saved.wasmExperimentalMesher
+  delete saved.rendererWasmMesher
+}
+
 /** Settings UI metadata for {@link RENDERER_DEFAULT_OPTIONS} keys. */
 export const RENDERER_OPTIONS_META: Partial<Record<RendererDefaultOptionKey, RendererOptionMeta>> = {
   menuBackgroundMode: {
@@ -102,6 +159,89 @@ export const RENDERER_OPTIONS_META: Partial<Record<RendererDefaultOptionKey, Ren
   disableBlockEntityTextures: {
     text: 'Disable block entity textures',
     tooltip: 'Skips signs, banners, heads, maps, etc.'
+  },
+  rendererMesher: {
+    possibleValues: [['wasm', 'WASM'], ['legacy-js', 'Legacy JS']],
+    text: 'Mesher pipeline',
+    tooltip: 'WASM is faster. Use JS if WASM is not working. Requires reload.',
+    requiresRestart: true
+  },
+  showChunkBorders: {
+    text: 'Chunk borders'
+  },
+  renderEntities: {
+    text: 'Render entities'
+  },
+  renderDebug: {
+    possibleValues: ['advanced', 'basic', 'none']
+  },
+  frameLimit: {
+    text: 'Frame limit',
+    tooltip: 'false = VSync / unlimited when focused'
+  },
+  backgroundRendering: {
+    text: 'Background FPS limit',
+    possibleValues: [
+      ['full', 'NO'],
+      ['5fps', '5 FPS'],
+      ['20fps', '20 FPS']
+    ]
+  },
+  vanillaLook: {
+    text: 'Vanilla shading',
+    tooltip: 'On: Minecraft-style face shading. Off: higher-contrast client shading.'
+  },
+  smoothLighting: {},
+  newVersionsLighting: {
+    text: 'Lighting in newer versions'
+  },
+  vrSupport: {
+    text: 'VR support',
+    tooltip: 'Shows VR entry; does not force VR on.'
+  },
+  vrPageGameRendering: {
+    text: 'VR page game rendering'
+  },
+  clipWorldBelowY: {
+    text: 'Clip world below Y'
+  },
+  highlightBlockColor: {
+    possibleValues: [
+      ['auto', 'Auto'],
+      ['blue', 'Blue'],
+      ['classic', 'Classic']
+    ]
+  },
+  loadPlayerSkins: {},
+  renderEars: {
+    tooltip: 'Deadmau5 ears when the skin texture includes them'
+  },
+  showHand: {},
+  viewBobbing: {},
+  dayCycleAndLighting: {
+    text: 'Day cycle'
+  },
+  keepChunksDistance: {
+    text: 'Keep chunks distance',
+    tooltip: 'Extra distance before unloading chunks',
+    max: 5,
+    unit: ''
+  },
+  fov: {
+    min: 30,
+    max: 110,
+    unit: '°',
+    text: 'Field of view'
+  },
+  gpuPreference: {
+    text: 'GPU preference',
+    tooltip: 'WebGL power preference. Requires reload / backend restart to apply.',
+    requiresRestart: true,
+    possibleValues: [
+      ['default', 'Auto'],
+      ['high-performance', 'Dedicated'],
+      ['low-power', 'Low power']
+    ]
   }
 }
 
@@ -110,32 +250,58 @@ export const RENDERER_RENDER_GUI_SECTIONS: ReadonlyArray<{
   title: string
   keys: readonly RendererDefaultOptionKey[]
 }> = [
-  {
-    title: 'Menu background',
-    keys: [
-      'menuBackgroundMode',
-      'menuBackgroundMinecraftTextures',
-      'menuBackgroundFuturisticScene',
-      'menuBackgroundFuturisticCamera',
-      'menuBackgroundFuturisticBlockGroup',
-      'menuBackgroundFuturisticCameraSpeed',
-      'menuBackgroundFuturisticBlockSpeed'
-    ]
-  },
-  {
-    title: 'World rendering',
-    keys: [
-      'rendererWorldPerformance',
-      'starfieldRendering',
-      'defaultSkybox',
-      'disableBlockEntityTextures'
-    ]
-  },
-  {
-    title: 'Renderer debug',
-    keys: [
-      'rendererFuturisticReveal',
-      'rendererPerfDebugOverlay'
-    ]
-  }
-]
+    {
+      title: 'World rendering',
+      keys: [
+        'rendererWorldPerformance',
+        'starfieldRendering',
+        'defaultSkybox',
+        'disableBlockEntityTextures',
+        'showChunkBorders',
+        'renderEntities',
+        'smoothLighting',
+        'vanillaLook',
+        'newVersionsLighting',
+        'dayCycleAndLighting',
+        'loadPlayerSkins',
+        'renderEars',
+        'showHand',
+        'viewBobbing',
+        'fov',
+        'keepChunksDistance',
+        'highlightBlockColor',
+        'clipWorldBelowY'
+      ]
+    },
+    {
+      title: 'Frame pacing',
+      keys: ['frameLimit', 'backgroundRendering', 'renderDebug', 'gpuPreference']
+    },
+    {
+      title: 'VR',
+      keys: ['vrSupport', 'vrPageGameRendering']
+    },
+    {
+      title: 'Menu background',
+      keys: [
+        'menuBackgroundMode',
+        'menuBackgroundMinecraftTextures',
+        'menuBackgroundFuturisticScene',
+        'menuBackgroundFuturisticCamera',
+        'menuBackgroundFuturisticBlockGroup',
+        'menuBackgroundFuturisticCameraSpeed',
+        'menuBackgroundFuturisticBlockSpeed'
+      ]
+    },
+    {
+      title: 'Mesher',
+      keys: ['rendererMesher']
+    },
+    {
+      title: 'Renderer debug',
+      keys: [
+        'rendererFuturisticReveal',
+        'rendererPerfDebugOverlay'
+      ]
+    }
+  ]

package/src/three/menuBackground/index.ts

@@ -31,6 +31,14 @@ export {
 export {
   RENDERER_DEFAULT_OPTIONS,
   RENDERER_OPTIONS_META,
-  RENDERER_RENDER_GUI_SECTIONS
+  RENDERER_RENDER_GUI_SECTIONS,
+  migrateRendererOptions
 } from './defaultOptions'
-export type { RendererDefaultOptionKey, RendererOptionMeta } from './defaultOptions'
+export type {
+  RendererDefaultOptionKey,
+  RendererGpuPreference,
+  RendererMesherPipeline,
+  RendererOptionMeta,
+  RendererStorageOptions
+} from './defaultOptions'
+export { gpuPreferenceToWebGLPowerPreference } from './defaultOptions'

package/src/three/worldGeometryExport.ts

@@ -1,32 +1,11 @@
 //@ts-nocheck
 import * as THREE from 'three'
 import type { WorldRendererThree } from './worldRendererThree'
+import type { ExportedSection, ExportedWorldGeometry } from '../mesher-shared/exportedGeometryTypes'
 
-const GEOMETRY_EXPORT_GROUP_NAME = 'geometry-export-root'
-
-// Format for exported world geometry
-export interface ExportedWorldGeometry {
-  version: string
-  exportedAt: string
-  camera: {
-    position: { x: number, y: number, z: number }
-    rotation: { pitch: number, yaw: number }
-  }
-  sections: ExportedSection[]
-  textureAtlasDataUrl?: string
-}
+export type { ExportedSection, ExportedWorldGeometry } from '../mesher-shared/exportedGeometryTypes'
 
-export interface ExportedSection {
-  key: string
-  position: { x: number, y: number, z: number }
-  geometry: {
-    positions: number[]
-    normals: number[]
-    colors: number[]
-    uvs: number[]
-    indices: number[]
-  }
-}
+const GEOMETRY_EXPORT_GROUP_NAME = 'geometry-export-root'
 
 /**
  * Export world geometry to a downloadable file

package/src/three/worldRendererThree.ts

@@ -65,6 +65,9 @@ export class WorldRendererThree extends WorldRendererCommon {
   cursorBlock: CursorBlock
   onRender: Array<(deltaTime: number) => void> = []
   private lastRenderTime = 0
+  private animatedFov = 0
+  private lastFovAnimTime = 0
+  private static readonly FOV_TRANSITION_MS = 200
   cameraShake: CameraShake
   cameraContainer!: THREE.Object3D
   media: ThreeJsMedia
@@ -1055,10 +1058,42 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   setCinimaticFov(fov: number): void {
+    this.animatedFov = fov
     this.camera.fov = fov
     this.camera.updateProjectionMatrix()
   }
 
+  private updateSmoothFov(): void {
+    if (this.cinimaticScript.running) return
+
+    const baseFov = this.displayOptions.inWorldRenderingConfig.fov
+    const mult = this.playerStateReactive.fovMultiplier
+    const targetFov = baseFov * (Number.isFinite(mult) ? mult : 1)
+
+    const now = performance.now()
+    if (this.animatedFov === 0) {
+      this.animatedFov = targetFov
+    }
+
+    if (Math.abs(this.animatedFov - targetFov) >= 0.01) {
+      const elapsed = now - this.lastFovAnimTime
+      const progress = Math.min(elapsed / WorldRendererThree.FOV_TRANSITION_MS, 1)
+      const easeOutCubic = (t: number) => 1 - (1 - t) ** 3
+      this.animatedFov += (targetFov - this.animatedFov) * easeOutCubic(progress)
+      if (Math.abs(this.animatedFov - targetFov) < 0.01) {
+        this.animatedFov = targetFov
+      }
+    } else {
+      this.animatedFov = targetFov
+    }
+    this.lastFovAnimTime = now
+
+    if (this.camera.fov !== this.animatedFov) {
+      this.camera.fov = this.animatedFov
+      this.camera.updateProjectionMatrix()
+    }
+  }
+
   updateCamera(pos: Vec3 | null, yaw: number, pitch: number): void {
     // Skip position/rotation updates if cinematic script is running
     if (this.cinimaticScript.running) {
@@ -1200,11 +1235,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cameraPos = this.getCameraPosition()
     this.skyboxRenderer.update(cameraPos, this.viewDistance)
 
-    const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
-    if (sizeOrFovChanged) {
+    this.updateSmoothFov()
+    if (sizeChanged) {
       const size = this.renderer.getSize(new THREE.Vector2())
       this.camera.aspect = size.width / size.height
-      this.camera.fov = this.displayOptions.inWorldRenderingConfig.fov
       this.camera.updateProjectionMatrix()
     }
 

package/src/wasm-mesher/bridge/render-from-wasm.ts

@@ -10,11 +10,12 @@ import MinecraftData from 'minecraft-data'
 import PrismarineBlockLoader from 'prismarine-block'
 import { Vec3 } from 'vec3'
 import { elemFaces, buildRotationMatrix, matmul3, matmulmat3, vecadd3, vecsub3 } from '../../mesher-shared/modelsGeometryCommon'
-import type { ExportedWorldGeometry, ExportedSection } from '../../three/worldGeometryExport'
+import type { ExportedWorldGeometry, ExportedSection } from '../../mesher-shared/exportedGeometryTypes'
 import type { MesherGeometryOutput } from '../../mesher-shared/shared'
 import type { World } from '../../mesher-shared/world'
-import { resolveBlockPropertiesForMeshing } from '../../mesher-shared/models'
+import { resolveBlockPropertiesForMeshing } from '../../mesher-shared/blockPropertiesForMeshing'
 import { getSideShading, vertexLightFromAo } from '../../mesher-shared/vertexShading'
+import tintsJson from 'minecraft-data/minecraft-data/data/pc/1.16.2/tints.json'
 
 // Handle both default and named export
 const worldBlockProvider = (worldBlockProviderModule as any).default || worldBlockProviderModule
@@ -25,14 +26,8 @@ let tintsInitialized = false
 
 function initializeTints() {
   if (tintsInitialized) return
-  let tintsData
-  try {
-    tintsData = require('esbuild-data').tints
-  } catch (err) {
-    tintsData = require('minecraft-data/minecraft-data/data/pc/1.16.2/tints.json')
-  }
-  for (const key of Object.keys(tintsData)) {
-    tints[key] = prepareTints(tintsData[key])
+  for (const key of Object.keys(tintsJson as Record<string, unknown>)) {
+    tints[key] = prepareTints((tintsJson as Record<string, unknown>)[key])
   }
   tintsInitialized = true
 }