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

package/dist/node/index.mjs

@@ -1116,6 +1116,7 @@ var init_Materials = __esm({
       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
@@ -1138,7 +1139,7 @@ var init_Materials = __esm({
             void main()
             {
 
-                if (SHADE) {
+                if (SHADE && shade > 0.5) {
 
                     #ifdef USE_INSTANCING
                         vec3 N = vec3( modelMatrix * instanceMatrix * vec4(normal, 0.0) );
@@ -1247,7 +1248,7 @@ var init_Materials = __esm({
             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 (e) {
           console.warn(e);
@@ -10229,6 +10230,10 @@ var init_ModelObject = __esm({
             this.atlas.model.elements?.forEach((el) => {
               const elGeo = this._getBoxGeometryFromElement(el).clone();
               this.geometries.add(elGeo);
+              elGeo.setAttribute("shade", new BufferAttribute5(
+                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((_, index) => {
@@ -17822,9 +17827,9 @@ function cached(map, key, load) {
 function compactQuads(geometry, keep) {
   const quads = keep.flatMap((kept, index) => kept ? [index] : []);
   const compact = new BufferGeometry8();
-  for (const [name, size] of Object.entries({ position: 3, normal: 3, uv: 2, uvBounds: 4, color: 3 })) {
+  for (const [name, size] of Object.entries({ position: 3, normal: 3, uv: 2, uvBounds: 4, color: 3, shade: 1 })) {
     const source2 = geometry.getAttribute(name);
-    const defaults = name === "uvBounds" ? [0, 0, 1, 1] : name === "color" ? [1, 1, 1] : void 0;
+    const defaults = name === "uvBounds" ? [0, 0, 1, 1] : name === "color" ? [1, 1, 1] : name === "shade" ? [1] : void 0;
     const values = new Float32Array(quads.length * 4 * size);
     for (let q = 0; q < quads.length; q++) {
       for (let vertex = 0; vertex < 4; vertex++) {
@@ -19090,7 +19095,7 @@ function buildSectionGeometry(input) {
   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");
     }
   }
@@ -19181,6 +19186,7 @@ function buildSectionGeometry(input) {
     }
     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 vertex = 0, indexOffset = 0;
@@ -19210,6 +19216,7 @@ function buildSectionGeometry(input) {
           normals[vertex * 3] = template.normals[source * 3];
           normals[vertex * 3 + 1] = template.normals[source * 3 + 1];
           normals[vertex * 3 + 2] = template.normals[source * 3 + 2];
+          shade[vertex] = template.shade?.[source] ?? 1;
           uvs[vertex * 2] = mapU(template.uvs[source * 2]);
           uvs[vertex * 2 + 1] = mapV(template.uvs[source * 2 + 1]);
           uvBounds[vertex * 4] = mapU(template.uvBounds[source * 4]);
@@ -19262,11 +19269,11 @@ function buildSectionGeometry(input) {
         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
@@ -19370,6 +19377,7 @@ function toInput(entries, maxAtlasSize, fluids, lighting) {
           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,
@@ -19381,6 +19389,7 @@ function toInput(entries, maxAtlasSize, fluids, lighting) {
         const uv = template.geometry.getAttribute("uv");
         const bounds = template.geometry.getAttribute("uvBounds");
         const color2 = template.geometry.getAttribute("color");
+        const shade = template.geometry.getAttribute("shade");
         for (let vertex = 0; vertex < quads * 4; vertex++) {
           data.positions.set([position.getX(vertex), position.getY(vertex), position.getZ(vertex)], vertex * 3);
           data.normals.set([normal.getX(vertex), normal.getY(vertex), normal.getZ(vertex)], vertex * 3);
@@ -19392,6 +19401,7 @@ function toInput(entries, maxAtlasSize, fluids, lighting) {
             bounds?.getW(vertex) ?? 1
           ], vertex * 4);
           data.colors.set([color2?.getX(vertex) ?? 1, color2?.getY(vertex) ?? 1, color2?.getZ(vertex) ?? 1], vertex * 3);
+          data.shade[vertex] = shade?.getX(vertex) ?? 1;
         }
         for (let i2 = 0; i2 < data.indices.length; i2++) data.indices[i2] = indices.getX(i2) - 4 * Math.floor(i2 / 6);
         templateCache.set(template, data);
@@ -19463,6 +19473,7 @@ var SectionMesh = class _SectionMesh extends Group3 {
       geometry.setAttribute("uv", new Float32BufferAttribute10(page.uvs.buffer, 2));
       geometry.setAttribute("uvBounds", new Float32BufferAttribute10(page.uvBounds.buffer, 4));
       geometry.setAttribute("color", new Float32BufferAttribute10(page.colors.buffer, 3));
+      geometry.setAttribute("shade", new Float32BufferAttribute10(page.shade.buffer, 1));
       geometry.setIndex(new Uint32BufferAttribute(page.indices.buffer, 1));
       geometry.computeBoundingBox();
       geometry.computeBoundingSphere();