minecraft-renderer 0.1.81 → 0.1.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-renderer",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "The most Modular Minecraft world renderer with Three.js WebGL backend",
   "type": "module",
   "main": "./dist/index.js",

package/src/mesher-shared/models.ts

@@ -4,7 +4,7 @@ import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBloc
 import moreBlockDataGeneratedJson from '../lib/moreBlockDataGenerated.json'
 import { BlockType } from '../playground/shared'
 import { World, BlockModelPartsResolved, WorldBlock as Block, WorldBlock, worldColumnKey } from './world'
-import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
+import { BlockElement, buildElementRotation, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
 import { getSideShading } from './vertexShading'
 import { INVISIBLE_BLOCKS } from './worldConstants'
 import { MesherGeometryOutput, HighestBlockInfo } from './shared'
@@ -342,35 +342,7 @@ function renderElement(
     let localShift = null as any
 
     if (element.rotation && !needTiles) {
-      // Rescale support for block model rotations
-      localMatrix = buildRotationMatrix(element.rotation.axis, element.rotation.angle)
-
-      localShift = vecsub3(element.rotation.origin, matmul3(localMatrix, element.rotation.origin))
-
-      // Apply rescale if specified
-      if (element.rotation.rescale) {
-        const FIT_TO_BLOCK_SCALE_MULTIPLIER = 2 - Math.sqrt(2)
-        const angleRad = (element.rotation.angle * Math.PI) / 180
-        const scale = Math.abs(Math.sin(angleRad)) * FIT_TO_BLOCK_SCALE_MULTIPLIER
-
-        // Get axis vector components (1 for the rotation axis, 0 for others)
-        const axisX = element.rotation.axis === 'x' ? 1 : 0
-        const axisY = element.rotation.axis === 'y' ? 1 : 0
-        const axisZ = element.rotation.axis === 'z' ? 1 : 0
-
-        // Create scale matrix: scale = (1 - axisComponent) * scaleFactor + 1
-        const scaleMatrix = [
-          [(1 - axisX) * scale + 1, 0, 0],
-          [0, (1 - axisY) * scale + 1, 0],
-          [0, 0, (1 - axisZ) * scale + 1]
-        ]
-
-        // Apply scaling to the transformation matrix
-        localMatrix = matmulmat3(localMatrix, scaleMatrix)
-
-        // Recalculate shift with the new matrix
-        localShift = vecsub3(element.rotation.origin, matmul3(localMatrix, element.rotation.origin))
-      }
+      ;({ localMatrix, localShift } = buildElementRotation(element.rotation))
     }
 
     const aos: number[] = []

package/src/mesher-shared/modelsGeometryCommon.ts

@@ -88,6 +88,28 @@ export function matmulmat3(a, b) {
   return te
 }
 
+export function buildElementRotation(rotation) {
+  let localMatrix = buildRotationMatrix(rotation.axis, rotation.angle)
+  let localShift = vecsub3(rotation.origin, matmul3(localMatrix, rotation.origin))
+
+  if (rotation.rescale) {
+    const FIT_TO_BLOCK_SCALE_MULTIPLIER = 2 - Math.sqrt(2)
+    const angleRad = (rotation.angle * Math.PI) / 180
+    const scale = Math.abs(Math.sin(angleRad)) * FIT_TO_BLOCK_SCALE_MULTIPLIER
+    const axisX = rotation.axis === 'x' ? 1 : 0
+    const axisY = rotation.axis === 'y' ? 1 : 0
+    const axisZ = rotation.axis === 'z' ? 1 : 0
+    const scaleMatrix = [
+      [(1 - axisX) * scale + 1, 0, 0],
+      [0, (1 - axisY) * scale + 1, 0],
+      [0, 0, (1 - axisZ) * scale + 1]
+    ]
+    localMatrix = matmulmat3(localMatrix, scaleMatrix)
+    localShift = vecsub3(rotation.origin, matmul3(localMatrix, rotation.origin))
+  }
+  return { localMatrix, localShift }
+}
+
 export const elemFaces = {
   up: {
     dir: [0, 1, 0],

package/src/mesher-shared/standaloneRenderer.ts

@@ -5,7 +5,7 @@ import { Block } from 'prismarine-block'
 import { IndexedData } from 'minecraft-data'
 import * as THREE from 'three'
 import { BlockModelPartsResolved } from './world'
-import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
+import { BlockElement, buildElementRotation, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
 
 type NeighborSide = 'up' | 'down' | 'east' | 'west' | 'north' | 'south'
 
@@ -78,10 +78,7 @@ function renderElement(element: BlockElement, doAO: boolean, attr, globalMatrix,
     let localShift = null as any
 
     if (element.rotation) {
-      // todo do we support rescale?
-      localMatrix = buildRotationMatrix(element.rotation.axis, element.rotation.angle)
-
-      localShift = vecsub3(element.rotation.origin, matmul3(localMatrix, element.rotation.origin))
+      ;({ localMatrix, localShift } = buildElementRotation(element.rotation))
     }
 
     const aos: number[] = []

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

@@ -9,7 +9,7 @@ import blockStatesModels from 'mc-assets/dist/blockStatesModels.json'
 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 { elemFaces, buildElementRotation, buildRotationMatrix, matmul3, matmulmat3, vecadd3, vecsub3 } from '../../mesher-shared/modelsGeometryCommon'
 import type { ExportedWorldGeometry, ExportedSection } from '../../mesher-shared/exportedGeometryTypes'
 import type { MesherGeometryOutput } from '../../mesher-shared/shared'
 import { bakeLegacyVertexColors } from '../../lib/bakeLegacyLight'
@@ -290,8 +290,7 @@ function getCachedBlockModel(
             let localMatrix = null as any
             let localShift = null as any
             if (element.rotation) {
-              localMatrix = buildRotationMatrix(element.rotation.axis, element.rotation.angle)
-              localShift = vecsub3(element.rotation.origin, matmul3(localMatrix, element.rotation.origin))
+              ;({ localMatrix, localShift } = buildElementRotation(element.rotation))
             }
             return { element, localMatrix, localShift }
           })
@@ -755,8 +754,7 @@ export function renderWasmOutputToGeometry(
         let localMatrix = null as any
         let localShift = null as any
         if (element.rotation) {
-          localMatrix = buildRotationMatrix(element.rotation.axis, element.rotation.angle)
-          localShift = vecsub3(element.rotation.origin, matmul3(localMatrix, element.rotation.origin))
+          ;({ localMatrix, localShift } = buildElementRotation(element.rotation))
         }
 
         // eslint-disable-next-line guard-for-in