minecraft-renderer 0.1.79 → 0.1.80

package/src/three/world/cursorBlock.ts

@@ -29,7 +29,7 @@ export class CursorBlock {
   }
 
   cursorLineMaterial!: LineMaterial
-  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group, shapePositions: BlocksShapes | undefined } = null
+  interactionLines: null | { blockPos: Vec3; mesh: THREE.Group; shapePositions: BlocksShapes | undefined } = null
   prevColor: string | undefined
   blockBreakMesh: THREE.Mesh
   breakTextures: THREE.Texture[] = []
@@ -37,12 +37,20 @@ export class CursorBlock {
   constructor(public readonly worldRenderer: WorldRendererThree) {
     // Initialize break mesh and textures
     const destroyStagesImages = [
-      destroyStage0, destroyStage1, destroyStage2, destroyStage3, destroyStage4,
-      destroyStage5, destroyStage6, destroyStage7, destroyStage8, destroyStage9
+      destroyStage0,
+      destroyStage1,
+      destroyStage2,
+      destroyStage3,
+      destroyStage4,
+      destroyStage5,
+      destroyStage6,
+      destroyStage7,
+      destroyStage8,
+      destroyStage9
     ]
 
     for (let i = 0; i < 10; i++) {
-      void loadThreeJsTextureFromUrl(destroyStagesImages[i]).then((texture) => {
+      void loadThreeJsTextureFromUrl(destroyStagesImages[i]).then(texture => {
         texture.magFilter = THREE.NearestFilter
         texture.minFilter = THREE.NearestFilter
         this.breakTextures.push(texture)
@@ -53,7 +61,7 @@ export class CursorBlock {
       transparent: true,
       blending: THREE.MultiplyBlending,
       premultipliedAlpha: true,
-      alphaTest: 0.5,
+      alphaTest: 0.5
     })
     this.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial)
     this.blockBreakMesh.visible = false
@@ -92,14 +100,14 @@ export class CursorBlock {
             return inCreative ? 0x40_80_ff : 0x00_00_00
         }
       })(),
-      linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
+      linewidth: Math.max(pixelRatio * 0.7, 1) * 2
       // dashed: true,
       // dashSize: 5,
     })
     this.prevColor = this.worldRenderer.worldRendererConfig.highlightBlockColor
   }
 
-  updateBreakAnimation(blockPosition: { x: number, y: number, z: number } | undefined, stage: number | null, mergedShape?: BlockShape) {
+  updateBreakAnimation(blockPosition: { x: number; y: number; z: number } | undefined, stage: number | null, mergedShape?: BlockShape) {
     this.hideBreakAnimation()
     if (stage === null || !blockPosition || !mergedShape) return
 
@@ -108,10 +116,9 @@ export class CursorBlock {
     this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
     position.add(new Vec3(blockPosition.x, blockPosition.y, blockPosition.z))
     this.blockBreakMesh.position.set(position.x, position.y, position.z)
-    this.blockBreakMesh.visible = true;
-
-    (this.blockBreakMesh.material as THREE.MeshBasicMaterial).map = this.breakTextures[stage] ?? this.breakTextures.at(-1);
-    (this.blockBreakMesh.material as THREE.MeshBasicMaterial).needsUpdate = true
+    this.blockBreakMesh.visible = true
+    ;(this.blockBreakMesh.material as THREE.MeshBasicMaterial).map = this.breakTextures[stage] ?? this.breakTextures.at(-1)
+    ;(this.blockBreakMesh.material as THREE.MeshBasicMaterial).needsUpdate = true
   }
 
   hideBreakAnimation() {
@@ -129,7 +136,13 @@ export class CursorBlock {
   }
 
   setHighlightCursorBlock(blockPos: Vec3 | null, shapePositions?: BlocksShapes, force = false): void {
-    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos) && sameArray(shapePositions ?? [], this.interactionLines.shapePositions ?? []) && !force) {
+    if (
+      blockPos &&
+      this.interactionLines &&
+      blockPos.equals(this.interactionLines.blockPos) &&
+      sameArray(shapePositions ?? [], this.interactionLines.shapePositions ?? []) &&
+      !force
+    ) {
       return
     }
     if (this.interactionLines !== null) {

package/src/three/world/vr.ts

@@ -63,7 +63,7 @@ export async function initVR(worldRenderer: WorldRendererThree, documentRenderer
       display: 'flex',
       justifyContent: 'center',
       zIndex: '8',
-      gap: '8px',
+      gap: '8px'
     })
   }
 
@@ -79,7 +79,7 @@ export async function initVR(worldRenderer: WorldRendererThree, documentRenderer
       background: 'transparent',
       border: '1px solid rgb(255, 255, 255)',
       borderRadius: '4px',
-      opacity: '0.7',
+      opacity: '0.7'
     })
 
     closeButton.addEventListener('click', () => {
@@ -90,7 +90,6 @@ export async function initVR(worldRenderer: WorldRendererThree, documentRenderer
     return closeButton
   }
 
-
   async function checkVRSupport() {
     try {
       const supported = await navigator.xr?.isSessionSupported('immersive-vr')
@@ -122,16 +121,16 @@ export async function initVR(worldRenderer: WorldRendererThree, documentRenderer
     }
   }
   let hand1: any = controllerModelFactory.createControllerModel(controller1)
-  controller1.addEventListener('connected', (event) => {
+  controller1.addEventListener('connected', event => {
     hand1.xrInputSource = event.data
-    manageXrInputSource(event.data as { gamepad: Gamepad | undefined, handedness?: string }, 'left')
+    manageXrInputSource(event.data as { gamepad: Gamepad | undefined; handedness?: string }, 'left')
     user.add(controller1)
   })
   controller1.add(hand1)
   let hand2: any = controllerModelFactory.createControllerModel(controller2)
-  controller2.addEventListener('connected', (event) => {
+  controller2.addEventListener('connected', event => {
     hand2.xrInputSource = event.data
-    manageXrInputSource(event.data as { gamepad: Gamepad | undefined, handedness?: string }, 'right')
+    manageXrInputSource(event.data as { gamepad: Gamepad | undefined; handedness?: string }, 'right')
     user.add(controller2)
   })
   controller2.add(hand2)
@@ -184,7 +183,7 @@ export async function initVR(worldRenderer: WorldRendererThree, documentRenderer
 
     if (rotSnapReset) {
       if (Math.abs(hand1.xAxis) > 0.8) {
-        yawOffset -= Math.PI / 4 * Math.sign(hand1.xAxis)
+        yawOffset -= (Math.PI / 4) * Math.sign(hand1.xAxis)
         rotSnapReset = false
       }
     } else if (Math.abs(hand1.xAxis) < 0.1) {
@@ -220,7 +219,7 @@ const xrStandardRightButtonsMap = [
   // need to think of a way to support touchpad input
   [3 /* Thumbstick Press */, 'Right Stick'],
   [4 /* A */, 'A'],
-  [5 /* B */, 'B'],
+  [5 /* B */, 'B']
 ]
 const xrStandardLeftButtonsMap = [
   [0 /* trigger */, 'Left Trigger'],
@@ -228,14 +227,14 @@ const xrStandardLeftButtonsMap = [
   // need to think of a way to support touchpad input
   [3 /* Thumbstick Press */, 'Left Stick'],
   [4 /* A */, 'X'],
-  [5 /* B */, 'Y'],
+  [5 /* B */, 'Y']
 ]
 const remapButtons = (rightButtons: any[], leftButtons: any[]) => {
   // return remapped buttons
   const remapped = [] as string[]
   const remapWithMap = (buttons, map) => {
     for (const [index, standardName] of map) {
-      const standardMappingIndex = standardButtonsMap.findIndex((aliases) => aliases.find(alias => standardName === alias))
+      const standardMappingIndex = standardButtonsMap.findIndex(aliases => aliases.find(alias => standardName === alias))
       remapped[standardMappingIndex] = buttons[index]
     }
   }
@@ -245,12 +244,7 @@ const remapButtons = (rightButtons: any[], leftButtons: any[]) => {
 }
 const remapAxes = (axesRight, axesLeft) => {
   // 0, 1 are reserved for touch
-  return [
-    axesLeft[2],
-    axesLeft[3],
-    axesRight[2],
-    axesRight[3]
-  ]
+  return [axesLeft[2], axesLeft[3], axesRight[2], axesRight[3]]
 }
 
 function typedAssign<T extends Record<string, any>>(target: T, source: Partial<T>) {

package/src/three/worldGeometryExport.ts

@@ -17,8 +17,8 @@ const GEOMETRY_EXPORT_GROUP_NAME = 'geometry-export-root'
  */
 export function exportWorldGeometry(
   worldRenderer: WorldRendererThree,
-  cameraPosition: { x: number, y: number, z: number },
-  cameraRotation: { pitch: number, yaw: number },
+  cameraPosition: { x: number; y: number; z: number },
+  cameraRotation: { pitch: number; yaw: number },
   includeTexture = false
 ): ExportedWorldGeometry {
   const sections: ExportedSection[] = []
@@ -59,12 +59,8 @@ export function exportWorldGeometry(
         const vertOffset = positions.length / 3
         const vertCount = positionAttr.count
         const rawColors = Array.from(colorAttr.array as Float32Array)
-        const rawSky = skyAttr
-          ? Array.from(skyAttr.array as Float32Array)
-          : new Array(vertCount).fill(1)
-        const rawBlock = blockAttr
-          ? Array.from(blockAttr.array as Float32Array)
-          : new Array(vertCount).fill(0)
+        const rawSky = skyAttr ? Array.from(skyAttr.array as Float32Array) : new Array(vertCount).fill(1)
+        const rawBlock = blockAttr ? Array.from(blockAttr.array as Float32Array) : new Array(vertCount).fill(0)
         positions.push(...Array.from(positionAttr.array))
         if (normalAttr) normals.push(...Array.from(normalAttr.array))
         colors.push(...bakeLegacyVertexColors(rawColors, rawSky, rawBlock, skyLevel))
@@ -84,7 +80,7 @@ export function exportWorldGeometry(
       position: {
         x: sectionObject.worldX ?? 0,
         y: sectionObject.worldY ?? 0,
-        z: sectionObject.worldZ ?? 0,
+        z: sectionObject.worldZ ?? 0
       },
       geometry: {
         positions,
@@ -93,8 +89,8 @@ export function exportWorldGeometry(
         skyLights,
         blockLights,
         uvs,
-        indices,
-      },
+        indices
+      }
     })
   }
 
@@ -130,8 +126,8 @@ export function exportWorldGeometry(
  */
 export function downloadWorldGeometry(
   worldRenderer: WorldRendererThree,
-  cameraPosition: { x: number, y: number, z: number },
-  cameraRotation: { pitch: number, yaw: number },
+  cameraPosition: { x: number; y: number; z: number },
+  cameraRotation: { pitch: number; yaw: number },
   filename = 'world-geometry.json',
   includeTexture = false
 ) {
@@ -164,8 +160,7 @@ export async function loadWorldGeometryFromUrl(url: string): Promise<ExportedWor
  * Returns an array of mesh groups that can be added to a scene
  */
 function shaderMaterialForExport(legacyMaterial: THREE.Material, skyLevel: number): THREE.ShaderMaterial | null {
-  const atlas = (legacyMaterial as THREE.MeshBasicMaterial).map
-    ?? (legacyMaterial as THREE.MeshLambertMaterial).map
+  const atlas = (legacyMaterial as THREE.MeshBasicMaterial).map ?? (legacyMaterial as THREE.MeshLambertMaterial).map
   if (!atlas) return null
   const shaderMat = createCubeBlockMaterial()
   shaderMat.uniforms.u_atlas.value = atlas
@@ -182,7 +177,7 @@ export function createMeshesFromExport(
   exportData: ExportedWorldGeometry,
   material: THREE.Material,
   shaderMaterial?: THREE.ShaderMaterial | null,
-  skyLevel = 1,
+  skyLevel = 1
 ): THREE.Group[] {
   const groups: THREE.Group[] = []
   const resolvedShaderMat = shaderMaterial ?? shaderMaterialForExport(material, skyLevel)
@@ -200,12 +195,7 @@ export function createMeshesFromExport(
       }
       if (section.geometry.colors.length) {
         const baked = section.geometry.skyLights?.length
-          ? bakeLegacyVertexColors(
-            section.geometry.colors,
-            section.geometry.skyLights,
-            section.geometry.blockLights,
-            skyLevel,
-          )
+          ? bakeLegacyVertexColors(section.geometry.colors, section.geometry.skyLights, section.geometry.blockLights, skyLevel)
           : section.geometry.colors
         geometry.setAttribute('color', new THREE.Float32BufferAttribute(baked, 3))
       }
@@ -275,15 +265,8 @@ const disposeGeometryExportGroup = (group: THREE.Object3D) => {
  * Apply exported geometry to an existing WorldRenderer instance.
  * Replaces any previously imported geometry export group.
  */
-export async function applyWorldGeometryExport(
-  worldRenderer: WorldRendererThree,
-  exportData: ExportedWorldGeometry
-): Promise<number> {
-  const {
-    scene,
-    renderUpdateEmitter,
-    material: rendererMaterial
-  } = worldRenderer
+export async function applyWorldGeometryExport(worldRenderer: WorldRendererThree, exportData: ExportedWorldGeometry): Promise<number> {
+  const { scene, renderUpdateEmitter, material: rendererMaterial } = worldRenderer
   const existingGroup = scene.getObjectByName(GEOMETRY_EXPORT_GROUP_NAME)
   if (existingGroup) {
     scene.remove(existingGroup)
@@ -306,9 +289,7 @@ export async function applyWorldGeometryExport(
   }
 
   const skyLevel = calculateSkyLightSimple(worldRenderer.timeOfTheDay) / 15
-  const shaderMat = exportData.sections.some(s => (s.shaderCubes?.count ?? 0) > 0)
-    ? shaderMaterialForExport(material, skyLevel)
-    : null
+  const shaderMat = exportData.sections.some(s => (s.shaderCubes?.count ?? 0) > 0) ? shaderMaterialForExport(material, skyLevel) : null
   const groups = createMeshesFromExport(exportData, material, shaderMat, skyLevel)
   const container = new THREE.Group()
   container.name = GEOMETRY_EXPORT_GROUP_NAME