minerender 2.1.0-alpha.52 → 2.1.0-alpha.53

package/dist/node/index.mjs

@@ -3533,48 +3533,6 @@ var init_SceneObject = __esm({
   }
 });
 
-// src/model/ModelCulling.ts
-import { Vector3 as Vector39 } from "three";
-var ModelCulling;
-var init_ModelCulling = __esm({
-  "src/model/ModelCulling.ts"() {
-    init_CubeFace();
-    ModelCulling = class {
-      static toLocalMask(worldMask, rotation) {
-        let localMask = 0;
-        for (const [localFace, offset] of CUBE_FACE_OFFSETS.entries()) {
-          const normal = new Vector39(...offset).applyEuler(rotation);
-          const worldFace = CUBE_FACE_OFFSETS.findIndex(([x, y, z]) => Math.abs(normal.x - x) < 1e-6 && Math.abs(normal.y - y) < 1e-6 && Math.abs(normal.z - z) < 1e-6);
-          if (worldFace < 0) return 0;
-          if (worldMask & 1 << worldFace) localMask |= 1 << localFace;
-        }
-        return localMask;
-      }
-      static isOpaqueFullCube(atlas) {
-        if (!atlas || atlas.hasTransparency !== false || atlas.model.elements?.length !== 1) return false;
-        const element = atlas.model.elements[0];
-        if (element.from.length !== 3 || !element.from.every((value) => value === 0) || element.to.length !== 3 || !element.to.every((value) => value === 16) || element.rotation && element.rotation.angle !== 0 || element.mappedUv?.length !== 48 || !element.mappedUv.every(Number.isFinite)) return false;
-        if (!(atlas.image.width > 0 && atlas.image.height > 0)) return false;
-        return CUBE_FACES.every((face, faceIndex) => {
-          const texture = element.faces[face]?.texture;
-          if (!texture?.startsWith("#")) return false;
-          const key = texture.slice(1);
-          const position = atlas.positions[key];
-          const size = atlas.sizes[key];
-          if (position?.length !== 2 || !position.every(Number.isFinite) || size?.length !== 2 || !size.every((value) => value > 0 && Number.isFinite(value))) return false;
-          for (let vertex = 0; vertex < 4; vertex++) {
-            const uvIndex = (faceIndex * 4 + vertex) * 2;
-            const x = element.mappedUv[uvIndex] * atlas.image.width;
-            const y = (1 - element.mappedUv[uvIndex + 1]) * atlas.image.height;
-            if (x < position[0] - 1e-6 || x > position[0] + size[0] + 1e-6 || y < position[1] - 1e-6 || y > position[1] + size[1] + 1e-6) return false;
-          }
-          return true;
-        });
-      }
-    };
-  }
-});
-
 // src/three/BufferGeometryUtils.js
 import {
   BufferAttribute as BufferAttribute4,
@@ -3585,7 +3543,7 @@ import {
   TriangleFanDrawMode,
   TriangleStripDrawMode,
   TrianglesDrawMode,
-  Vector3 as Vector310
+  Vector3 as Vector39
 } from "three";
 function computeTangents(geometry) {
   geometry.computeTangents();
@@ -3904,15 +3862,15 @@ function computeMorphedAttributes(object) {
     console.error("THREE.BufferGeometryUtils: Geometry is not of type BufferGeometry.");
     return null;
   }
-  const _vA = new Vector310();
-  const _vB = new Vector310();
-  const _vC = new Vector310();
-  const _tempA = new Vector310();
-  const _tempB = new Vector310();
-  const _tempC = new Vector310();
-  const _morphA = new Vector310();
-  const _morphB = new Vector310();
-  const _morphC = new Vector310();
+  const _vA = new Vector39();
+  const _vB = new Vector39();
+  const _vC = new Vector39();
+  const _tempA = new Vector39();
+  const _tempB = new Vector39();
+  const _tempC = new Vector39();
+  const _morphA = new Vector39();
+  const _morphB = new Vector39();
+  const _morphC = new Vector39();
   function _calculateMorphedAttributeData(object2, material2, attribute, morphAttribute, morphTargetsRelative2, a2, b2, c2, modifiedAttributeArray) {
     _vA.fromBufferAttribute(attribute, a2);
     _vB.fromBufferAttribute(attribute, b2);
@@ -4121,12 +4079,54 @@ var init_BufferGeometryUtils = __esm({
   }
 });
 
+// src/model/ModelCulling.ts
+import { Vector3 as Vector310 } from "three";
+var ModelCulling;
+var init_ModelCulling = __esm({
+  "src/model/ModelCulling.ts"() {
+    init_CubeFace();
+    ModelCulling = class {
+      static toLocalMask(worldMask, rotation) {
+        let localMask = 0;
+        for (const [localFace, offset] of CUBE_FACE_OFFSETS.entries()) {
+          const normal = new Vector310(...offset).applyEuler(rotation);
+          const worldFace = CUBE_FACE_OFFSETS.findIndex(([x, y, z]) => Math.abs(normal.x - x) < 1e-6 && Math.abs(normal.y - y) < 1e-6 && Math.abs(normal.z - z) < 1e-6);
+          if (worldFace < 0) return 0;
+          if (worldMask & 1 << worldFace) localMask |= 1 << localFace;
+        }
+        return localMask;
+      }
+      static isOpaqueFullCube(atlas) {
+        if (!atlas || atlas.hasTransparency !== false || atlas.model.elements?.length !== 1) return false;
+        const element = atlas.model.elements[0];
+        if (element.from.length !== 3 || !element.from.every((value) => value === 0) || element.to.length !== 3 || !element.to.every((value) => value === 16) || element.rotation && element.rotation.angle !== 0 || element.mappedUv?.length !== 48 || !element.mappedUv.every(Number.isFinite)) return false;
+        if (!(atlas.image.width > 0 && atlas.image.height > 0)) return false;
+        return CUBE_FACES.every((face, faceIndex) => {
+          const texture = element.faces[face]?.texture;
+          if (!texture?.startsWith("#")) return false;
+          const key = texture.slice(1);
+          const position = atlas.positions[key];
+          const size = atlas.sizes[key];
+          if (position?.length !== 2 || !position.every(Number.isFinite) || size?.length !== 2 || !size.every((value) => value > 0 && Number.isFinite(value))) return false;
+          for (let vertex = 0; vertex < 4; vertex++) {
+            const uvIndex = (faceIndex * 4 + vertex) * 2;
+            const x = element.mappedUv[uvIndex] * atlas.image.width;
+            const y = (1 - element.mappedUv[uvIndex + 1]) * atlas.image.height;
+            if (x < position[0] - 1e-6 || x > position[0] + size[0] + 1e-6 || y < position[1] - 1e-6 || y > position[1] + size[1] + 1e-6) return false;
+          }
+          return true;
+        });
+      }
+    };
+  }
+});
+
 // src/model/scene/ModelObject.ts
-import { BoxGeometry as BoxGeometry5, BufferAttribute as BufferAttribute5, Color as Color7, Euler as Euler6, Matrix4 as Matrix46 } from "three";
+import { BoxGeometry as BoxGeometry5, BufferAttribute as BufferAttribute5, Color as Color7, Euler as Euler5, Matrix4 as Matrix46 } from "three";
 function isModelObject(obj) {
   return obj.isModelObject;
 }
-var import_ts_deepmerge5, p9, ModelObject;
+var import_ts_deepmerge5, p7, ModelObject;
 var init_ModelObject = __esm({
   "src/model/scene/ModelObject.ts"() {
     init_SceneObject();
@@ -4139,7 +4139,7 @@ var init_ModelObject = __esm({
     init_CubeFace();
     init_DisplayTransforms();
     init_ModelCulling();
-    p9 = prefix("ModelObject");
+    p7 = prefix("ModelObject");
     ModelObject = class _ModelObject extends SceneObject {
       constructor(originalModel, options) {
         super(options);
@@ -4188,7 +4188,7 @@ var init_ModelObject = __esm({
                 elGeo.clearGroups();
               }
               if (this.options.uvLockRotation) {
-                UVMapper.lockUvs(elGeo, el.faces, this.atlas, new Euler6(...this.options.uvLockRotation));
+                UVMapper.lockUvs(elGeo, el.faces, this.atlas, new Euler5(...this.options.uvLockRotation));
               }
               if (this.options.tints) {
                 const colors = new Float32Array(elGeo.getAttribute("position").count * 3).fill(1);
@@ -4221,10 +4221,10 @@ var init_ModelObject = __esm({
               }
             });
           } else {
-            console.debug(p9, this.atlas.model, "has no elements");
+            console.debug(p7, this.atlas.model, "has no elements");
           }
         } else {
-          console.debug(p9, "Missing atlas for", this);
+          console.debug(p7, "Missing atlas for", this);
         }
         if (this.options.mergeMeshes) {
           let combinedGeo;
@@ -4322,7 +4322,7 @@ var init_fluidBlocks = __esm({
 });
 
 // src/model/fluid/FluidGeometry.ts
-import { BufferGeometry as BufferGeometry3, Float32BufferAttribute as Float32BufferAttribute5 } from "three";
+import { BufferGeometry as BufferGeometry4, Float32BufferAttribute as Float32BufferAttribute5 } from "three";
 function getBlockFluidState(key, state) {
   const rule = key && fluidRules[key.toNamespacedString()];
   if (rule) return {
@@ -4340,7 +4340,7 @@ function ownHeight(sample) {
   return (level === 0 || level >= 8 ? 8 : 8 - level) / 9;
 }
 function createFluidGeometry(kind, sample) {
-  const geometry = new BufferGeometry3();
+  const geometry = new BufferGeometry4();
   const positions = [], normals = [], uvs = [], indices = [];
   const self = sample(0, 0, 0);
   const height = (x, z) => {
@@ -7598,10 +7598,22 @@ var GuiHelper = class {
 // src/gui/scene/GuiObject.ts
 init_AssetKey();
 init_ModelTextures();
+init_Models();
 init_Caching();
 init_SceneObject();
 init_Materials();
-import { Box2, Mesh as Mesh6, PlaneGeometry as PlaneGeometry2, Vector2 as Vector23 } from "three";
+init_ModelObject();
+init_DisplayPosition();
+import { Box2, Box3 as Box32, Mesh as Mesh7, PlaneGeometry as PlaneGeometry2, Vector2 as Vector23 } from "three";
+
+// src/model/GuiLight.ts
+var GuiLight = /* @__PURE__ */ ((GuiLight2) => {
+  GuiLight2["FRONT"] = "front";
+  GuiLight2["SIDE"] = "side";
+  return GuiLight2;
+})(GuiLight || {});
+
+// src/gui/scene/GuiObject.ts
 var GuiObject = class extends SceneObject {
   constructor(textureLayers, options) {
     super({ ...options, instanceMeshes: false, mergeMeshes: false });
@@ -7616,13 +7628,34 @@ var GuiObject = class extends SceneObject {
   async init() {
     if (this.initialized) return;
     try {
+      let depth = 0;
       for (const [index, layer] of this.textureLayers.entries()) {
+        const [x, y] = layer.position ?? [0, 0];
+        if ("item" in layer) {
+          const [width2, height2] = layer.size ?? [16, 16];
+          const item = await this.createItem(layer, index);
+          item.position.set(x + width2 / 2, -y - height2 / 2, 0);
+          item.scale.set(width2 / 16, height2 / 16, width2 / 16);
+          item.updateMatrix();
+          const bounds = new Box32();
+          item.iterateAllMeshes((mesh2) => {
+            mesh2.geometry.computeBoundingBox();
+            bounds.union(mesh2.geometry.boundingBox);
+          });
+          bounds.applyMatrix4(item.matrix);
+          item.position.z = depth - bounds.min.z;
+          depth += bounds.max.z - bounds.min.z + 0.01;
+          this.bounds.expandByPoint(new Vector23(x, y));
+          this.bounds.expandByPoint(new Vector23(x + width2, y + height2));
+          this.bounds.expandByPoint(new Vector23(bounds.min.x, -bounds.max.y));
+          this.bounds.expandByPoint(new Vector23(bounds.max.x, -bounds.min.y));
+          continue;
+        }
         const key = typeof layer.texture === "string" ? AssetKey.parse("textures", layer.texture) : layer.texture;
         const material = await this.loadMaterial(key);
         const image = material.map.image;
         const [cropX, cropY, cropWidth, cropHeight] = layer.crop ?? [0, 0, image.width, image.height];
         const [width, height] = layer.size ?? [cropWidth, cropHeight];
-        const [x, y] = layer.position ?? [0, 0];
         const geometry = new PlaneGeometry2(width, height);
         this.geometries.add(geometry);
         const uv = geometry.getAttribute("uv");
@@ -7633,14 +7666,16 @@ var GuiObject = class extends SceneObject {
             1 - (cropY + (1 - uv.getY(i)) * cropHeight) / image.height
           );
         }
-        const mesh = new Mesh6(geometry, material);
+        const mesh = new Mesh7(geometry, material);
         mesh.name = `mesh:${layer.name ?? index}`;
-        mesh.position.set(x + width / 2, -y - height / 2, 0);
+        mesh.position.set(x + width / 2, -y - height / 2, depth);
         mesh.renderOrder = index;
         this.add(mesh);
         this.bounds.expandByPoint(new Vector23(x, y));
         this.bounds.expandByPoint(new Vector23(x + width, y + height));
+        depth += 0.01;
       }
+      for (const child of this.children) child.position.z -= depth - 0.01;
       this.initialized = true;
       this.notifyDirty();
     } catch (error) {
@@ -7648,6 +7683,32 @@ var GuiObject = class extends SceneObject {
       throw error;
     }
   }
+  async createItem(layer, index) {
+    const key = typeof layer.item === "string" ? AssetKey.parse("models", layer.item) : layer.item;
+    const model = await Models.getMerged(key);
+    if (!model) throw new Error(`Could not load GUI item ${key.toNamespacedString()}`);
+    const item = new ModelObject(model, {
+      displayPosition: "gui" /* GUI */,
+      tints: layer.tints,
+      instanceMeshes: false,
+      mergeMeshes: true
+    });
+    item.name = `group:${layer.name ?? index}`;
+    this.add(item);
+    await item.init();
+    item.iterateAllMeshes((mesh) => {
+      this.geometries.add(mesh.geometry);
+      mesh.name = `mesh:${layer.name ?? index}`;
+      mesh.renderOrder = index;
+      for (const material of Array.isArray(mesh.material) ? mesh.material : [mesh.material]) {
+        material.transparent = true;
+        if (model.gui_light === "front" /* FRONT */ && material.uniforms?.SHADE) {
+          material.uniforms.SHADE.value = false;
+        }
+      }
+    });
+    return item;
+  }
   async loadMaterial(key) {
     const assetKey = key.serialize();
     const materialKey = `gui:${assetKey}`;
@@ -7691,7 +7752,7 @@ init_util();
 import { Raycaster, Vector2 as Vector24 } from "three";
 init_log();
 init_three();
-var p7 = prefix("SceneInspector");
+var p8 = prefix("SceneInspector");
 var help = "<span>Ctrl/Cmd+Click to Select<br/></span><br/>";
 var SceneInspector = class {
   constructor(renderer) {
@@ -7785,7 +7846,7 @@ var SceneInspector = class {
   }
   selectObject(targetObject, targetIntersection, instance = this.getIntersectionInstance(targetIntersection)) {
     this.selectedObject = targetObject;
-    console.log(p7, "selected", targetObject);
+    console.log(p8, "selected", targetObject);
     this.redraw(targetObject, targetIntersection, instance);
   }
   redraw(targetObject, targetIntersection, instance) {
@@ -8044,7 +8105,7 @@ var SceneStatsDisplay = class {
 
 // src/instance/InstanceManager.ts
 init_log();
-var p8 = prefix("InstanceManager");
+var p9 = prefix("InstanceManager");
 var InstanceManager = class {
   constructor() {
     this.isInstanceManager = true;
@@ -8052,7 +8113,7 @@ var InstanceManager = class {
   }
   async get(key) {
     if (key in this.instanceCache) {
-      console.debug(p8, "key in cache", key);
+      console.debug(p9, "key in cache", key);
       return (await this.instanceCache[key]).nextInstance();
     }
     return void 0;
@@ -8061,7 +8122,7 @@ var InstanceManager = class {
     if (key in this.instanceCache) {
       return await this.get(key);
     }
-    console.debug(p8, "key not in cache", key);
+    console.debug(p9, "key not in cache", key);
     const pending = Promise.resolve().then(supplier).then((obj) => obj.nextInstance());
     this.instanceCache[key] = pending;
     try {
@@ -8095,13 +8156,6 @@ function isInstanceable(obj) {
 init_DisplayPosition();
 init_DisplayTransforms();
 
-// src/model/GuiLight.ts
-var GuiLight = /* @__PURE__ */ ((GuiLight2) => {
-  GuiLight2["FRONT"] = "front";
-  GuiLight2["SIDE"] = "side";
-  return GuiLight2;
-})(GuiLight || {});
-
 // src/model/Model.ts
 var ITEM_GENERATED = "item/generated";
 var BUILTIN_GENERATED = "builtin/generated";
@@ -8126,7 +8180,7 @@ init_ModelMerger();
 init_BlockStates();
 init_MineRenderError();
 init_util();
-import { Euler as Euler5 } from "three";
+import { Euler as Euler6 } from "three";
 function matchesCondition(condition, state) {
   return Object.entries(condition).every(([key, value]) => {
     if (Array.isArray(value)) {
@@ -8201,7 +8255,7 @@ var BlockStateResolver = class {
     return variants[variants.length - 1];
   }
   static rotation(variant) {
-    const rotation = new Euler5();
+    const rotation = new Euler6();
     if (typeof variant.x !== "undefined") {
       rotation.x = toRadians(clampRotationDegrees(variant.x));
     }
@@ -13450,7 +13504,7 @@ var MineRenderWorld = class {
 // src/world/SectionMesh.ts
 init_CanvasCompat();
 init_Materials();
-import { BufferGeometry as BufferGeometry5, Float32BufferAttribute as Float32BufferAttribute6, Group, Mesh as Mesh10 } from "three";
+import { BufferGeometry as BufferGeometry6, Float32BufferAttribute as Float32BufferAttribute6, Group, Mesh as Mesh10 } from "three";
 var SectionMesh = class _SectionMesh extends Group {
   constructor() {
     super(...arguments);
@@ -13524,7 +13578,7 @@ var SectionMesh = class _SectionMesh extends Group {
           for (let corner = 0; corner < 6; corner++) indices.push(start + sourceIndices.getX(face * 6 + corner) - face * 4);
         }
       }
-      const geometry = new BufferGeometry5();
+      const geometry = new BufferGeometry6();
       geometry.setAttribute("position", new Float32BufferAttribute6(positions, 3));
       geometry.setAttribute("normal", new Float32BufferAttribute6(normals, 3));
       geometry.setAttribute("uv", new Float32BufferAttribute6(uvs, 2));