minerender 2.1.0-alpha.143 → 2.1.0-alpha.145

package/dist/node/index.d.mts

@@ -4024,6 +4024,8 @@ declare class SectionModels {
         pick(position?: Readonly<TripleArray>): SectionMeshTemplate[];
         biomeTint?: boolean;
     } | undefined>;
+    /** Starts loading the state's models and atlases so a later `prepareState` with the same properties finds them loaded. */
+    preload(blockState: BlockState, properties?: BlockStateProperties): Promise<void>;
     private state;
     /** Returns the shared still/flow atlas used by per-block fluid objects. */
     fluidAtlas(kind: FluidKind, root?: string): Promise<TextureAtlas>;
@@ -4138,6 +4140,7 @@ declare class Chunk<SectionMeshing extends boolean = false> {
     /** Replaces every cell from parsed section data. The caller refreshes neighbor culling. */
     placeSection(data: ChunkData): Promise<void>;
     private replaceSection;
+    private createBlockObject;
     private positionAt;
     /** Refreshes saved lighting after adjacent columns load or unload, including columns with only light data. */
     refreshLight(indices?: Iterable<number>): Promise<void>;
@@ -4325,7 +4328,7 @@ declare class MineRenderWorld<SectionMeshing extends boolean = false> {
 interface MineRenderWorldOptions<SectionMeshing extends boolean = boolean> {
     /** Render supported saved mobs at their position and yaw, including supported appearance fields. Defaults to false. */
     renderEntities?: boolean;
-    /** Merge static opaque cubes into section meshes. Merged blocks have no individual object. */
+    /** Merge block models of any shape and fluid surfaces into per-section meshes; block entities keep individual objects. Merged blocks have no individual object. */
     sectionMeshing?: SectionMeshing;
     /** Shade blocks and fluids with saved sky/block light. Missing or invalid data keeps preview brightness. Defaults to false. Requires `sectionMeshing`. */
     savedLighting?: boolean;
@@ -4335,7 +4338,7 @@ interface MineRenderWorldOptions<SectionMeshing extends boolean = boolean> {
     ambientOcclusion?: boolean;
     /** Average neighboring biome colors within this horizontal radius, from 0 to 7 blocks. Defaults to 0 (off). Requires `sectionMeshing`. */
     biomeBlendRadius?: number;
-    /** Maximum width and height of each section atlas page, in pixels. */
+    /** Maximum width and height of each section atlas page, in pixels. Defaults to 2048. */
     maxAtlasSize?: number;
 }
 

package/dist/node/index.d.ts

@@ -4024,6 +4024,8 @@ declare class SectionModels {
         pick(position?: Readonly<TripleArray>): SectionMeshTemplate[];
         biomeTint?: boolean;
     } | undefined>;
+    /** Starts loading the state's models and atlases so a later `prepareState` with the same properties finds them loaded. */
+    preload(blockState: BlockState, properties?: BlockStateProperties): Promise<void>;
     private state;
     /** Returns the shared still/flow atlas used by per-block fluid objects. */
     fluidAtlas(kind: FluidKind, root?: string): Promise<TextureAtlas>;
@@ -4138,6 +4140,7 @@ declare class Chunk<SectionMeshing extends boolean = false> {
     /** Replaces every cell from parsed section data. The caller refreshes neighbor culling. */
     placeSection(data: ChunkData): Promise<void>;
     private replaceSection;
+    private createBlockObject;
     private positionAt;
     /** Refreshes saved lighting after adjacent columns load or unload, including columns with only light data. */
     refreshLight(indices?: Iterable<number>): Promise<void>;
@@ -4325,7 +4328,7 @@ declare class MineRenderWorld<SectionMeshing extends boolean = false> {
 interface MineRenderWorldOptions<SectionMeshing extends boolean = boolean> {
     /** Render supported saved mobs at their position and yaw, including supported appearance fields. Defaults to false. */
     renderEntities?: boolean;
-    /** Merge static opaque cubes into section meshes. Merged blocks have no individual object. */
+    /** Merge block models of any shape and fluid surfaces into per-section meshes; block entities keep individual objects. Merged blocks have no individual object. */
     sectionMeshing?: SectionMeshing;
     /** Shade blocks and fluids with saved sky/block light. Missing or invalid data keeps preview brightness. Defaults to false. Requires `sectionMeshing`. */
     savedLighting?: boolean;
@@ -4335,7 +4338,7 @@ interface MineRenderWorldOptions<SectionMeshing extends boolean = boolean> {
     ambientOcclusion?: boolean;
     /** Average neighboring biome colors within this horizontal radius, from 0 to 7 blocks. Defaults to 0 (off). Requires `sectionMeshing`. */
     biomeBlendRadius?: number;
-    /** Maximum width and height of each section atlas page, in pixels. */
+    /** Maximum width and height of each section atlas page, in pixels. Defaults to 2048. */
     maxAtlasSize?: number;
 }
 

package/dist/node/index.js

@@ -18090,6 +18090,7 @@ var AnvilWorldSource = class {
 };
 
 // src/world/Chunk.ts
+init_BlockObject();
 var import_three47 = require("three");
 init_BlockStates();
 init_AssetKey();
@@ -18100,6 +18101,7 @@ init_Model();
 init_util();
 init_AssetKey();
 init_BlockStates();
+init_BlockEntities();
 init_CubeFace();
 
 // src/world/SectionModels.ts
@@ -18197,6 +18199,10 @@ var SectionModels = class {
       biomeTint: source ? [...templates.values()].some((template) => template.biomeTint?.some((value) => value === 1)) || void 0 : void 0
     };
   }
+  /** Starts loading the state's models and atlases so a later `prepareState` with the same properties finds them loaded. */
+  async preload(blockState3, properties = {}) {
+    await this.state(blockState3, properties);
+  }
   async state(blockState3, properties) {
     let states = this.states.get(blockState3);
     if (!states) this.states.set(blockState3, states = /* @__PURE__ */ new Map());
@@ -18219,22 +18225,24 @@ var SectionModels = class {
   async prepare(blockState3, properties) {
     const state = { ...await BlockStateResolver.defaults(blockState3), ...properties };
     const groups = BlockStateResolver.matching(blockState3, state);
-    if (!groups.length) return void 0;
+    if (!groups.length || groups.some((group) => Array.isArray(group) && !group.length)) return void 0;
+    const variants = groups.flatMap((group) => Array.isArray(group) ? group : [group]);
+    if (variants.some((variant) => !variant.model)) return void 0;
+    const settled = await Promise.allSettled(variants.map(async (variant) => {
+      const modelKey = AssetKey.parse("models", variant.model);
+      modelKey.root = blockState3.key?.root;
+      const model = await Models.getMerged(modelKey);
+      if (!model?.elements?.length) return void 0;
+      const atlas = await UVMapper.getAtlas(model);
+      const rotation = BlockStateResolver.rotation(variant);
+      if (!atlas || atlas.image.width > this.maxAtlasSize || atlas.image.height > this.maxAtlasSize) return void 0;
+      return { model, atlas, rotation };
+    }));
     const prepared = /* @__PURE__ */ new Map();
-    for (const group of groups) {
-      const choices = Array.isArray(group) ? group : [group];
-      if (!choices.length) return void 0;
-      for (const variant of choices) {
-        if (!variant.model) return void 0;
-        const modelKey = AssetKey.parse("models", variant.model);
-        modelKey.root = blockState3.key?.root;
-        const model = await Models.getMerged(modelKey);
-        if (!model?.elements?.length) return void 0;
-        const atlas = await UVMapper.getAtlas(model);
-        const rotation = BlockStateResolver.rotation(variant);
-        if (!atlas || atlas.image.width > this.maxAtlasSize || atlas.image.height > this.maxAtlasSize) return void 0;
-        prepared.set(variant, { model, atlas, rotation });
-      }
+    for (const [i, result] of settled.entries()) {
+      if (result.status === "rejected") throw result.reason;
+      if (!result.value) return void 0;
+      prepared.set(variants[i], result.value);
     }
     return { state, groups, choices: prepared };
   }
@@ -18909,15 +18917,18 @@ var MineRenderWorld = class {
       const key = AssetKey.parse("blockstates", block.type);
       keys.set(key.serialize(), key);
     }
-    await BlockStates.getAll(keys.values());
+    const loaded = await BlockStates.getAll(keys.values());
+    const states = new Map([...keys.keys()].map((key, i) => [key, loaded[i]]));
     if (!useBatches) {
       for (const block of multiblock.blocks) await place(block);
       return;
     }
     if (!executor) {
       const groups2 = /* @__PURE__ */ new Map();
+      const distinct = /* @__PURE__ */ new Map();
       const position = new import_three45.Vector3();
       for (const block of multiblock.blocks) {
+        if (this.sectionModels && !Chunk.isAir(block)) distinct.set(ChunkData.paletteKey(block), block);
         const [x, y, z] = block.position;
         this.validatePosBounds(position.set(x, y, z));
         const cx = Math.floor(x / 16), cy = Math.floor(y / 16), cz = Math.floor(z / 16);
@@ -18928,6 +18939,16 @@ var MineRenderWorld = class {
         if (!group) groups2.set(chunk, group = []);
         group.push({ index: (y - cy * 16) * 256 + (z - cz * 16) * 16 + x - cx * 16, block });
       }
+      if (this.sectionModels) {
+        for (const block of distinct.values()) {
+          const state = states.get(AssetKey.parse("blockstates", block.type).serialize());
+          if (!state) continue;
+          void (async () => {
+            if (state.key && BlockEntities.entry(await BlockEntities.getIndex(state.key.root), state.key.toNamespacedString())) return;
+            await this.sectionModels.preload(state, block.properties);
+          })().catch(() => void 0);
+        }
+      }
       await this.placeChunkGroups(groups2, changes);
       return;
     }
@@ -19695,6 +19716,8 @@ function sectionGeometryTransferables(pages) {
 
 // src/world/SectionWorker.ts
 init_Env();
+init_log();
+var log19 = logger("SectionWorker");
 var SectionWorker = class _SectionWorker {
   constructor(worker) {
     this.worker = worker;
@@ -19708,8 +19731,12 @@ var SectionWorker = class _SectionWorker {
       if (reply.type === "pages") pending.resolve(reply.pages);
       else pending.reject(new Error(reply.message));
     });
-    worker.addEventListener("error", (event) => this.fail(event.message || "Section worker failed"));
-    worker.addEventListener("messageerror", () => this.fail("Section worker message could not be deserialized"));
+    const fallBack = (message) => {
+      log19.warn(`${message}, so sections build on the main thread`);
+      this.fail(message);
+    };
+    worker.addEventListener("error", (event) => fallBack(event.message || "Section worker failed"));
+    worker.addEventListener("messageerror", () => fallBack("Section worker message could not be deserialized"));
   }
   static {
     this.initialized = false;
@@ -20255,8 +20282,10 @@ var Chunk = class _Chunk {
       if (rejected?.status === "rejected") throw rejected.reason;
     }
     const positions = [];
-    let failed = false, failure;
-    for (const { index, key, block } of placements) {
+    const jobs = /* @__PURE__ */ new Map();
+    let failureOrder = Infinity, failure;
+    for (const [order, { index, key, block }] of placements.entries()) {
+      jobs.delete(index);
       this.hiddenBlocks.delete(index);
       this.data.assign(index, this.data.intern(block), block?.nbt);
       const readBlock = this.data.snapshot(index);
@@ -20272,7 +20301,6 @@ var Chunk = class _Chunk {
         this.z * 16 + Math.floor(index / 16) % 16
       );
       positions.push(worldPos);
-      let object4;
       try {
         if (!readBlock) continue;
         const resolved = resolutions.get(key);
@@ -20294,7 +20322,7 @@ var Chunk = class _Chunk {
           this.sectionBlocks.set(index, templates.map((template) => ({ index, template, cullMask: 0, biomeTint: context?.tint })));
           this.meshDirty = true;
         } else {
-          object4 = await this.scene.addBlock(blockState3, {
+          jobs.set(index, { order, readBlock, blockState: blockState3, position: MineRenderWorld.worldToScenePosition(worldPos), options: {
             mergeMeshes: true,
             instanceMeshes: true,
             maxInstanceCount: 2e3,
@@ -20302,13 +20330,12 @@ var Chunk = class _Chunk {
             variantPosition,
             biome: context?.biome,
             biomePosition: this.biomePosition(index, blockState3, stored)
-          });
-          object4.setPosition(MineRenderWorld.worldToScenePosition(worldPos));
+          } });
+          continue;
         }
         this.renderedBlocks.set(index, { get block() {
           return readBlock();
-        }, object: object4 });
-        if (object4) this.objectBlocks.add(index);
+        }, object: void 0 });
       } catch (error) {
         if (preserveDataOnFailure && readBlock) {
           this.renderedBlocks.set(index, { get block() {
@@ -20316,12 +20343,35 @@ var Chunk = class _Chunk {
           }, object: void 0 });
         } else this.data.assign(index, 0);
         this.fluidCells[index] = 0;
-        object4?.removeFromScene();
-        if (!failed) failure = error;
-        failed = true;
+        if (order < failureOrder) {
+          failureOrder = order;
+          failure = error;
+        }
       }
     }
-    if (failed) throw failure;
+    const pending = [...jobs];
+    const objects = await Promise.allSettled(pending.map(([, job]) => this.createBlockObject(job.blockState, job.position, job.options)));
+    for (const [i, [index, { order, readBlock }]] of pending.entries()) {
+      const result = objects[i];
+      if (result.status === "fulfilled") {
+        this.renderedBlocks.set(index, { get block() {
+          return readBlock();
+        }, object: result.value });
+        this.objectBlocks.add(index);
+      } else {
+        if (preserveDataOnFailure) {
+          this.renderedBlocks.set(index, { get block() {
+            return readBlock();
+          }, object: void 0 });
+        } else this.data.assign(index, 0);
+        this.fluidCells[index] = 0;
+        if (order < failureOrder) {
+          failureOrder = order;
+          failure = result.reason;
+        }
+      }
+    }
+    if (failureOrder < Infinity) throw failure;
     return positions;
   }
   /** Replaces every cell from parsed section data. The caller refreshes neighbor culling. */
@@ -20392,37 +20442,42 @@ var Chunk = class _Chunk {
         failed = true;
       }
     }
-    for (const { index, blockState: blockState3, biome } of perBlocks) {
-      let object4;
-      try {
-        object4 = await this.scene.addBlock(blockState3, {
-          mergeMeshes: true,
-          instanceMeshes: true,
-          maxInstanceCount: 2e3,
-          initialState: this.data.stateAt(this.data.idAt(index)).properties,
-          variantPosition: this.positionAt(index),
-          biome,
-          biomePosition: this.biomePosition(index, blockState3, this.data.stateAt(this.data.idAt(index)))
-        });
-        object4.setPosition(new import_three47.Vector3(
-          this.x * 256 + index % 16 * 16,
-          this.y * 256 + Math.floor(index / 256) * 16,
-          this.z * 256 + Math.floor(index / 16) % 16 * 16
-        ));
-        this.renderedBlocks.get(index).object = object4;
+    const objects = await Promise.allSettled(perBlocks.map(({ index, blockState: blockState3, biome }) => this.createBlockObject(blockState3, new import_three47.Vector3(
+      this.x * 256 + index % 16 * 16,
+      this.y * 256 + Math.floor(index / 256) * 16,
+      this.z * 256 + Math.floor(index / 16) % 16 * 16
+    ), {
+      mergeMeshes: true,
+      instanceMeshes: true,
+      maxInstanceCount: 2e3,
+      initialState: this.data.stateAt(this.data.idAt(index)).properties,
+      variantPosition: this.positionAt(index),
+      biome,
+      biomePosition: this.biomePosition(index, blockState3, this.data.stateAt(this.data.idAt(index)))
+    })));
+    for (const [i, { index }] of perBlocks.entries()) {
+      const result = objects[i];
+      if (result.status === "fulfilled") {
+        this.renderedBlocks.get(index).object = result.value;
         this.objectBlocks.add(index);
-      } catch (error) {
+      } else {
         this.data.assign(index, 0);
         this.fluidCells[index] = 0;
         this.renderedBlocks.delete(index);
         this.objectBlocks.delete(index);
-        object4?.removeFromScene();
-        if (!failed) failure = error;
+        if (!failed) failure = result.reason;
         failed = true;
       }
     }
     if (failed) throw failure;
   }
+  createBlockObject(blockState3, position, options) {
+    return this.scene.addSceneObject(blockState3, () => {
+      const object4 = new BlockObject(blockState3, options);
+      object4.position.copy(position);
+      return object4;
+    }, options);
+  }
   positionAt(index) {
     return [this.x * 16 + index % 16, this.y * 16 + Math.floor(index / 256), this.z * 16 + Math.floor(index / 16) % 16];
   }