minerender 2.1.0-alpha.133 → 2.1.0-alpha.134

package/dist/bundle.js

@@ -36798,6 +36798,7 @@ void main() {
         static createShadedCanvasMaterial(canvas, transparent = false, shade = false, boundUvs = false) {
           const vertShader = `
             uniform bool SHADE;
+            attribute float shade;
             
             // Keep MSAA edge pixels from sampling outside the face's atlas region.
             #if __VERSION__ >= 300
@@ -36820,7 +36821,7 @@ void main() {
             void main()
             {
 
-                if (SHADE) {
+                if (SHADE && shade > 0.5) {
 
                     #ifdef USE_INSTANCING
                         vec3 N = vec3( modelMatrix * instanceMatrix * vec4(normal, 0.0) );
@@ -36929,7 +36930,7 @@ void main() {
               side: transparent ? DoubleSide : FrontSide,
               alphaTest: 0.5
             });
-            Object.assign(material.defaultAttributeValues, { uvBounds: [0, 0, 1, 1] });
+            Object.assign(material.defaultAttributeValues, { shade: [1], uvBounds: [0, 0, 1, 1] });
             return material;
           } catch (e6) {
             console.warn(e6);
@@ -92843,6 +92844,10 @@ ${shader.fragmentShader}`.replace(
               this.atlas.model.elements?.forEach((el) => {
                 const elGeo = this._getBoxGeometryFromElement(el).clone();
                 this.geometries.add(elGeo);
+                elGeo.setAttribute("shade", new BufferAttribute(
+                  new Float32Array(elGeo.getAttribute("position").count).fill(!this.originalModel.itemId && el.shade === false ? 0 : 1),
+                  1
+                ));
                 if (this.options.cullMask) {
                   const indices = Array.from(elGeo.getIndex().array);
                   elGeo.setIndex(indices.filter((_4, index) => {
@@ -103135,9 +103140,9 @@ gl_FragDepth=readDepth(vUv);
   function compactQuads(geometry, keep) {
     const quads = keep.flatMap((kept, index) => kept ? [index] : []);
     const compact = new BufferGeometry();
-    for (const [name2, size] of Object.entries({ position: 3, normal: 3, uv: 2, uvBounds: 4, color: 3 })) {
+    for (const [name2, size] of Object.entries({ position: 3, normal: 3, uv: 2, uvBounds: 4, color: 3, shade: 1 })) {
       const source2 = geometry.getAttribute(name2);
-      const defaults = name2 === "uvBounds" ? [0, 0, 1, 1] : name2 === "color" ? [1, 1, 1] : void 0;
+      const defaults = name2 === "uvBounds" ? [0, 0, 1, 1] : name2 === "color" ? [1, 1, 1] : name2 === "shade" ? [1] : void 0;
       const values = new Float32Array(quads.length * 4 * size);
       for (let q3 = 0; q3 < quads.length; q3++) {
         for (let vertex2 = 0; vertex2 < 4; vertex2++) {
@@ -104433,7 +104438,7 @@ gl_FragDepth=readDepth(vUv);
     const cornerBrightness2 = ambientOcclusion ? new Float32Array(4) : void 0;
     for (const template of templateData) {
       const { quads } = template;
-      if (template.positions.length !== quads * 12 || template.normals.length !== quads * 12 || template.uvs.length !== quads * 8 || template.uvBounds.length !== quads * 16 || template.colors.length !== quads * 12 || template.indices.length !== quads * 6 || template.cullFaces.length !== quads || template.biomeTint && template.biomeTint.length !== quads) {
+      if (template.positions.length !== quads * 12 || template.normals.length !== quads * 12 || template.uvs.length !== quads * 8 || template.uvBounds.length !== quads * 16 || template.colors.length !== quads * 12 || template.indices.length !== quads * 6 || template.cullFaces.length !== quads || template.shade && template.shade.length !== quads * 4 || template.biomeTint && template.biomeTint.length !== quads) {
         throw new RangeError("Section template arrays do not match its quad count");
       }
     }
@@ -104524,6 +104529,7 @@ gl_FragDepth=readDepth(vUv);
       }
       const positions = new Float32Array(faces * 12), normals = new Float32Array(faces * 12);
       const uvs = new Float32Array(faces * 8), uvBounds = new Float32Array(faces * 16), colors = new Float32Array(faces * 12);
+      const shade = new Float32Array(faces * 4).fill(1);
       const outputIndices = new Uint32Array(faces * 6);
       const blockIndices = new Uint16Array(faces);
       let vertex2 = 0, indexOffset = 0;
@@ -104553,6 +104559,7 @@ gl_FragDepth=readDepth(vUv);
             normals[vertex2 * 3] = template.normals[source * 3];
             normals[vertex2 * 3 + 1] = template.normals[source * 3 + 1];
             normals[vertex2 * 3 + 2] = template.normals[source * 3 + 2];
+            shade[vertex2] = template.shade?.[source] ?? 1;
             uvs[vertex2 * 2] = mapU(template.uvs[source * 2]);
             uvs[vertex2 * 2 + 1] = mapV(template.uvs[source * 2 + 1]);
             uvBounds[vertex2 * 4] = mapU(template.uvBounds[source * 4]);
@@ -104605,11 +104612,11 @@ gl_FragDepth=readDepth(vUv);
           indexOffset += 6;
         }
       }
-      return { layer: page.layer, width: page.width, height: page.height, placements: page.placements, positions, normals, uvs, uvBounds, colors, indices: outputIndices, blockIndices };
+      return { layer: page.layer, width: page.width, height: page.height, placements: page.placements, positions, normals, uvs, uvBounds, colors, shade, indices: outputIndices, blockIndices };
     });
   }
   function sectionGeometryTransferables(pages) {
-    return pages.flatMap((page) => [page.positions.buffer, page.normals.buffer, page.uvs.buffer, page.uvBounds.buffer, page.colors.buffer, page.indices.buffer, page.blockIndices.buffer]);
+    return pages.flatMap((page) => [page.positions.buffer, page.normals.buffer, page.uvs.buffer, page.uvBounds.buffer, page.colors.buffer, page.shade.buffer, page.indices.buffer, page.blockIndices.buffer]);
   }
 
   // src/world/SectionWorker.ts
@@ -104715,6 +104722,7 @@ gl_FragDepth=readDepth(vUv);
             uvs: new Float32Array(quads * 8),
             uvBounds: new Float32Array(quads * 16),
             colors: new Float32Array(quads * 12),
+            shade: new Float32Array(quads * 4),
             indices: new Uint16Array(quads * 6),
             cullFaces: new Uint8Array(template.cullFaces),
             biomeTint: template.biomeTint ? new Uint8Array(template.biomeTint) : void 0,
@@ -104726,6 +104734,7 @@ gl_FragDepth=readDepth(vUv);
           const uv = template.geometry.getAttribute("uv");
           const bounds = template.geometry.getAttribute("uvBounds");
           const color3 = template.geometry.getAttribute("color");
+          const shade = template.geometry.getAttribute("shade");
           for (let vertex2 = 0; vertex2 < quads * 4; vertex2++) {
             data.positions.set([position.getX(vertex2), position.getY(vertex2), position.getZ(vertex2)], vertex2 * 3);
             data.normals.set([normal.getX(vertex2), normal.getY(vertex2), normal.getZ(vertex2)], vertex2 * 3);
@@ -104737,6 +104746,7 @@ gl_FragDepth=readDepth(vUv);
               bounds?.getW(vertex2) ?? 1
             ], vertex2 * 4);
             data.colors.set([color3?.getX(vertex2) ?? 1, color3?.getY(vertex2) ?? 1, color3?.getZ(vertex2) ?? 1], vertex2 * 3);
+            data.shade[vertex2] = shade?.getX(vertex2) ?? 1;
           }
           for (let i5 = 0; i5 < data.indices.length; i5++) data.indices[i5] = indices.getX(i5) - 4 * Math.floor(i5 / 6);
           templateCache.set(template, data);
@@ -104808,6 +104818,7 @@ gl_FragDepth=readDepth(vUv);
         geometry.setAttribute("uv", new Float32BufferAttribute(page.uvs.buffer, 2));
         geometry.setAttribute("uvBounds", new Float32BufferAttribute(page.uvBounds.buffer, 4));
         geometry.setAttribute("color", new Float32BufferAttribute(page.colors.buffer, 3));
+        geometry.setAttribute("shade", new Float32BufferAttribute(page.shade.buffer, 1));
         geometry.setIndex(new Uint32BufferAttribute(page.indices.buffer, 1));
         geometry.computeBoundingBox();
         geometry.computeBoundingSphere();