minerender 2.1.0-alpha.44 → 2.1.0-alpha.45

package/dist/bundle.js

@@ -79707,9 +79707,9 @@ ${key}` : key;
   });
 
   // src/model/fluid/FluidGeometry.ts
-  function getFluidKind(key) {
-    if (key?.namespace !== "minecraft" || key.type) return void 0;
-    return key.path === "water" || key.path === "lava" ? key.path : void 0;
+  function getFluidKind(key, state) {
+    if (key?.namespace === "minecraft" && !key.type && (key.path === "water" || key.path === "lava")) return key.path;
+    return state?.waterlogged === "true" ? "water" : void 0;
   }
   function ownHeight(sample) {
     const level = sample.level ?? 0;
@@ -79868,7 +79868,7 @@ ${key}` : key;
       FluidModelObject = class extends ModelObject {
         constructor(kind, sample, origin, options) {
           super({
-            key: new AssetKey("minecraft", kind, "models", "fluid", "assets", ".json", origin.root),
+            key: new AssetKey("minecraft", kind, "models", "fluid", "assets", ".json", origin?.root),
             textures: { still: `minecraft:block/${kind}_still`, flow: `minecraft:block/${kind}_flow` },
             elements: []
           }, options);
@@ -84283,6 +84283,7 @@ ${key}` : key;
     clearModels() {
       this.removeModels(this._models.splice(0));
       this._fluidKey = void 0;
+      this._fluidModel = void 0;
       this._isInstanced = false;
       this._instanceCounter = 0;
     }
@@ -84314,11 +84315,14 @@ ${key}` : key;
       return ModelCulling.toLocalMask(worldMask, new Euler().setFromQuaternion(rotation));
     }
     async setCullMask(worldMask) {
-      if (this.fluidKind) return;
       worldMask &= 63;
       const replacements = [];
       try {
         for (const model of this._models) {
+          if (model === this._fluidModel) {
+            replacements.push(model);
+            continue;
+          }
           const object = isInstanceReference(model) ? model.instanceable : model;
           const cullMask = this.getModelCullMask(model, worldMask);
           if (cullMask === (object.options.cullMask ?? 0)) {
@@ -84351,7 +84355,10 @@ ${key}` : key;
       return this._state;
     }
     get fluidKind() {
-      return getFluidKind(this.blockState.key);
+      return getFluidKind(this.blockState.key, this.state);
+    }
+    get fluidLevel() {
+      return getFluidKind(this.blockState.key) ? Number(this.state.level ?? 0) : 0;
     }
     /** Refreshes fluid surfaces from relative neighbors; standalone previews use air around the block. */
     async updateFluid(sample) {
@@ -84359,22 +84366,24 @@ ${key}` : key;
       if (!kind) return;
       const { FluidModelObject: FluidModelObject2, sampleFluid: sampleFluid2 } = await Promise.resolve().then(() => (init_FluidModelObject(), FluidModelObject_exports));
       this._fluidSampler = sample;
-      const surface = sampleFluid2(kind, (x4, y5, z4) => x4 === 0 && y5 === 0 && z4 === 0 ? { fluid: kind, level: Number(this.state.level ?? 0) } : sample?.(x4, y5, z4) ?? {});
+      const surface = sampleFluid2(kind, (x4, y5, z4) => x4 === 0 && y5 === 0 && z4 === 0 ? { fluid: kind, level: this.fluidLevel } : sample?.(x4, y5, z4) ?? {});
       if (this._fluidKey === surface.key) return;
-      const key = new AssetKey("minecraft", `${kind}/${surface.key}`, "models", "fluid", "assets", ".json", this.blockState.key.root);
+      const key = new AssetKey("minecraft", `${kind}/${surface.key}`, "models", "fluid", "assets", ".json", this.blockState.key?.root);
       const replacement = await this.scene.addSceneObject(
         { key },
         () => new FluidModelObject2(kind, surface.sample, this.blockState.key, this.options)
       );
-      const previous = this._models;
-      const matrix = previous.length ? this.getModelMatrix(previous[0]) : new Matrix4().makeTranslation(...this.position.toArray());
+      const previous = this._fluidModel;
+      const matrix = previous ? this.getModelMatrix(previous) : new Matrix4().makeTranslation(...this.position.toArray());
       if (isInstanceReference(replacement)) replacement.setMatrix(matrix);
       else matrix.decompose(replacement.position, replacement.quaternion, replacement.scale);
-      this._models = [replacement];
+      this._models = this._models.filter((model) => model !== previous);
+      this._models.push(replacement);
+      this._fluidModel = replacement;
       this._fluidKey = surface.key;
-      this._isInstanced = isInstanceReference(replacement);
+      this._isInstanced || (this._isInstanced = isInstanceReference(replacement));
       this._instanceCounter = this._isInstanced ? 1 : 0;
-      this.removeModels(previous);
+      if (previous) this.removeModels([previous]);
       this.notifyDirty();
     }
     nextInstance() {
@@ -84391,7 +84400,7 @@ ${key}` : key;
     }
     async recreateModels() {
       this.clearModels();
-      if (this.fluidKind) {
+      if (getFluidKind(this.blockState.key)) {
         await this.updateFluid(this._fluidSampler);
         return;
       }
@@ -84400,6 +84409,7 @@ ${key}` : key;
       for (let blockStateVariant of variantsToCreate) {
         this._models.push(await this.createVariant(blockStateVariant));
       }
+      await this.updateFluid(this._fluidSampler);
     }
     getSingleVariant(variants) {
       return BlockStateResolver.choose(variants);
@@ -91096,11 +91106,10 @@ uniform float opacity;varying vec2 vUv;void main(){vec4 texel=texture2D(inputBuf
                   const object = section?.getBlockAt(neighbor)?.object;
                   return {
                     fluid: object?.fluidKind,
-                    level: Number(object?.state.level ?? 0),
+                    level: object?.fluidLevel,
                     solid: section?.isOccludingAt(neighbor) ?? false
                   };
                 });
-                continue;
               }
               let mask = 0;
               for (const [face, offset] of CUBE_FACE_OFFSETS.entries()) {
@@ -91332,7 +91341,7 @@ uniform float opacity;varying vec2 vUv;void main(){vec4 texel=texture2D(inputBuf
           this.data.set(index, void 0);
           return void 0;
         }
-        const template = getFluidKind(blockState.key) ? void 0 : await this.sectionModels?.get(blockState, stored.properties);
+        const template = getFluidKind(blockState.key, stored.properties) ? void 0 : await this.sectionModels?.get(blockState, stored.properties);
         if (template) {
           this.sectionBlocks.set(index, { index, template, cullMask: 0 });
           this.meshDirty = true;