minerender 2.1.0-alpha.50 → 2.1.0-alpha.51

package/dist/bundle.js

@@ -78088,27 +78088,66 @@ ${key}` : key;
       init_dirname();
       init_buffer2();
       init_process2();
+      init_CubeFace();
       ModelGenerator = class {
+        /**
+         * Front and back faces plus one zero-thickness side face per run of texels that border a transparent texel,
+         * like vanilla's ItemModelGenerator. Pass the pixels of a single (first) animation frame.
+         */
         static generateItemModel(imageData, layer) {
           const tintindex = this.ITEM_LAYERS.indexOf(layer);
+          const texture = `#${layer}`;
           const mainElement = {
             from: [0, 0, 7.5],
             to: [16, 16, 8.5],
             faces: {
               "south": {
                 uv: [0, 0, 16, 16],
-                texture: `#${layer}`,
+                texture,
                 tintindex
               },
               "north": {
                 uv: [16, 0, 0, 16],
-                texture: `#${layer}`,
+                texture,
                 tintindex
               }
             },
             shade: true
           };
-          return [mainElement];
+          const elements = [mainElement];
+          const { width, height, data } = imageData;
+          const opaque = (x4, y5) => x4 >= 0 && y5 >= 0 && x4 < width && y5 < height && data[(y5 * width + x4) * 4 + 3] !== 0;
+          const sx = 16 / width;
+          const sy = 16 / height;
+          const sides = [["up" /* UP */, 0, -1], ["down" /* DOWN */, 0, 1], ["west" /* WEST */, -1, 0], ["east" /* EAST */, 1, 0]];
+          for (const [face, dx, dy] of sides) {
+            const horizontal = dx === 0;
+            const lines = horizontal ? height : width;
+            const length = horizontal ? width : height;
+            for (let line = 0; line < lines; line++) {
+              for (let start = 0; start < length; start++) {
+                const exposed = (i4) => horizontal ? opaque(i4, line) && !opaque(i4, line + dy) : opaque(line, i4) && !opaque(line + dx, i4);
+                if (!exposed(start)) continue;
+                let end = start + 1;
+                while (end < length && exposed(end)) end++;
+                let uv, from, to;
+                if (horizontal) {
+                  const y5 = 16 - (line + (dy > 0 ? 1 : 0)) * sy;
+                  uv = [start * sx, line * sy, end * sx, (line + 1) * sy];
+                  from = [start * sx, y5, 7.5];
+                  to = [end * sx, y5, 8.5];
+                } else {
+                  const x4 = (line + (dx > 0 ? 1 : 0)) * sx;
+                  uv = [line * sx, start * sy, (line + 1) * sx, end * sy];
+                  from = [x4, 16 - end * sy, 7.5];
+                  to = [x4, 16 - start * sy, 8.5];
+                }
+                elements.push({ from, to, faces: { [face]: { uv, texture, tintindex } }, shade: true });
+                start = end;
+              }
+            }
+          }
+          return elements;
         }
       };
       ModelGenerator.ITEM_LAYERS = ["layer0", "layer1", "layer2", "layer3", "layer4"];
@@ -78479,7 +78518,15 @@ ${key}` : key;
               for (let layerName of ModelGenerator.ITEM_LAYERS) {
                 const textureImage = textureMap[layerName];
                 if (textureImage) {
-                  model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName));
+                  const [width, height] = sizes[layerName];
+                  const frame = frames[layerName]?.[0].index ?? 0;
+                  const columns = textureImage.width / width;
+                  model.elements.push(...ModelGenerator.generateItemModel(textureImage.getSectionData(
+                    frame % columns * width,
+                    Math.floor(frame / columns) * height,
+                    width,
+                    height
+                  ), layerName));
                 }
               }
               console.debug(p8, "Item model elements", model.elements);
@@ -79703,7 +79750,6 @@ ${key}` : key;
           if (this.options.tints) this.options.tints = { ...this.options.tints };
           this.addEventListener("added", () => this.updateAnimationSubscription());
           this.addEventListener("removed", () => this.updateAnimationSubscription());
-          console.log("ModelObject options", this.options);
         }
         async init() {
           await this.loadTextures();
@@ -83704,6 +83750,10 @@ ${key}` : key;
           uv
         ).clone();
         geometry.translate(cube.origin[0] + width / 2, cube.origin[1] + height / 2, cube.origin[2] + depth / 2);
+        if (Math.min(width + growX * 2, height + growY * 2, depth + growZ * 2) > 0) {
+          const index = Array.from(geometry.getIndex().array);
+          geometry.setIndex(index.concat(index.slice().reverse()));
+        }
         const mesh = this.createMesh(name2, geometry, material);
         mesh.renderOrder = renderOrder;
         anchor.add(mesh);
@@ -89282,7 +89332,7 @@ property list uchar int vertex_index
   init_process2();
   var baseSkinCoordinates = {
     head: {
-      east: {
+      west: {
         // left
         uv: [
           0,
@@ -89291,7 +89341,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      west: {
+      east: {
         // right
         uv: [
           16,
@@ -89300,7 +89350,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      north: {
+      south: {
         // front
         uv: [
           8,
@@ -89309,7 +89359,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      south: {
+      north: {
         // back
         uv: [
           24,
@@ -89321,24 +89371,24 @@ property list uchar int vertex_index
       up: {
         // top
         uv: [
-          16,
           8,
-          8,
-          0
+          0,
+          16,
+          8
         ]
       },
       down: {
         // bottom
         uv: [
-          24,
-          0,
           16,
-          8
+          8,
+          24,
+          0
         ]
       }
     },
     body: {
-      east: {
+      west: {
         uv: [
           16,
           20,
@@ -89346,7 +89396,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      west: {
+      east: {
         uv: [
           28,
           20,
@@ -89354,7 +89404,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      north: {
+      south: {
         uv: [
           20,
           20,
@@ -89362,7 +89412,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      south: {
+      north: {
         uv: [
           32,
           20,
@@ -89372,23 +89422,23 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          28,
           20,
-          20,
-          16
+          16,
+          28,
+          20
         ]
       },
       down: {
         uv: [
-          36,
-          16,
           28,
-          20
+          20,
+          36,
+          16
         ]
       }
     },
     leftArm: {
-      east: {
+      west: {
         uv: [
           32,
           52,
@@ -89396,7 +89446,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      west: {
+      east: {
         uv: [
           40,
           52,
@@ -89404,7 +89454,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      north: {
+      south: {
         uv: [
           36,
           52,
@@ -89412,7 +89462,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      south: {
+      north: {
         uv: [
           44,
           52,
@@ -89422,23 +89472,23 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          40,
-          52,
           36,
-          48
+          48,
+          40,
+          52
         ]
       },
       down: {
         uv: [
-          44,
-          48,
           40,
-          52
+          52,
+          44,
+          48
         ]
       }
     },
     rightArm: {
-      east: {
+      west: {
         uv: [
           40,
           20,
@@ -89446,7 +89496,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      west: {
+      east: {
         uv: [
           48,
           20,
@@ -89454,7 +89504,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      north: {
+      south: {
         uv: [
           44,
           20,
@@ -89462,7 +89512,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      south: {
+      north: {
         uv: [
           52,
           20,
@@ -89472,23 +89522,23 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          48,
-          20,
           44,
-          16
+          16,
+          48,
+          20
         ]
       },
       down: {
         uv: [
-          52,
-          16,
           48,
-          20
+          20,
+          52,
+          16
         ]
       }
     },
     leftLeg: {
-      east: {
+      west: {
         uv: [
           16,
           52,
@@ -89496,7 +89546,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      west: {
+      east: {
         uv: [
           24,
           52,
@@ -89504,7 +89554,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      north: {
+      south: {
         uv: [
           20,
           52,
@@ -89512,7 +89562,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      south: {
+      north: {
         uv: [
           28,
           52,
@@ -89522,24 +89572,24 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          24,
-          52,
           20,
-          48
+          48,
+          24,
+          52
         ]
       },
       down: {
         uv: [
-          28,
-          48,
           24,
-          52
+          52,
+          28,
+          48
         ],
         rotation: 180
       }
     },
     rightLeg: {
-      east: {
+      west: {
         uv: [
           0,
           20,
@@ -89547,7 +89597,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      west: {
+      east: {
         uv: [
           8,
           20,
@@ -89555,7 +89605,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      north: {
+      south: {
         uv: [
           4,
           20,
@@ -89563,7 +89613,7 @@ property list uchar int vertex_index
           32
         ]
       },
-      south: {
+      north: {
         uv: [
           12,
           20,
@@ -89573,23 +89623,23 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          8,
-          20,
           4,
-          16
+          16,
+          8,
+          20
         ]
       },
       down: {
         uv: [
-          12,
-          16,
           8,
-          20
+          20,
+          12,
+          16
         ]
       }
     },
     hat: {
-      east: {
+      west: {
         uv: [
           32,
           8,
@@ -89597,7 +89647,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      west: {
+      east: {
         uv: [
           48,
           8,
@@ -89605,7 +89655,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      north: {
+      south: {
         uv: [
           40,
           8,
@@ -89613,7 +89663,7 @@ property list uchar int vertex_index
           16
         ]
       },
-      south: {
+      north: {
         uv: [
           56,
           8,
@@ -89623,24 +89673,24 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          48,
-          8,
           40,
-          0
+          0,
+          48,
+          8
         ]
       },
       down: {
         uv: [
-          56,
-          0,
           48,
-          8
+          8,
+          56,
+          0
         ],
         rotation: 180
       }
     },
     jacket: {
-      east: {
+      west: {
         uv: [
           16,
           36,
@@ -89648,7 +89698,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      west: {
+      east: {
         uv: [
           28,
           36,
@@ -89656,7 +89706,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      north: {
+      south: {
         uv: [
           20,
           36,
@@ -89664,7 +89714,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      south: {
+      north: {
         uv: [
           32,
           36,
@@ -89674,24 +89724,24 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          28,
-          36,
           20,
-          32
+          32,
+          28,
+          36
         ]
       },
       down: {
         uv: [
-          36,
-          32,
           28,
-          36
+          36,
+          36,
+          32
         ],
         rotation: 180
       }
     },
     leftSleeve: {
-      east: {
+      west: {
         uv: [
           48,
           52,
@@ -89699,7 +89749,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      west: {
+      east: {
         uv: [
           56,
           52,
@@ -89707,7 +89757,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      north: {
+      south: {
         uv: [
           52,
           52,
@@ -89715,7 +89765,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      south: {
+      north: {
         uv: [
           60,
           52,
@@ -89725,24 +89775,24 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          56,
           52,
-          52,
-          48
+          48,
+          56,
+          52
         ]
       },
       down: {
         uv: [
-          60,
-          48,
           56,
-          52
+          52,
+          60,
+          48
         ],
         rotation: 180
       }
     },
     rightSleeve: {
-      east: {
+      west: {
         uv: [
           40,
           36,
@@ -89750,7 +89800,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      west: {
+      east: {
         uv: [
           48,
           36,
@@ -89758,7 +89808,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      north: {
+      south: {
         uv: [
           44,
           36,
@@ -89766,7 +89816,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      south: {
+      north: {
         uv: [
           52,
           36,
@@ -89776,24 +89826,24 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          48,
-          36,
           44,
-          32
+          32,
+          48,
+          36
         ]
       },
       down: {
         uv: [
-          52,
-          32,
           48,
-          36
+          36,
+          52,
+          32
         ],
         rotation: 180
       }
     },
     leftTrousers: {
-      east: {
+      west: {
         uv: [
           0,
           52,
@@ -89801,7 +89851,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      west: {
+      east: {
         uv: [
           8,
           52,
@@ -89809,7 +89859,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      north: {
+      south: {
         uv: [
           4,
           52,
@@ -89817,7 +89867,7 @@ property list uchar int vertex_index
           64
         ]
       },
-      south: {
+      north: {
         uv: [
           12,
           52,
@@ -89827,23 +89877,23 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          8,
-          52,
           4,
-          48
+          48,
+          8,
+          52
         ]
       },
       down: {
         uv: [
-          12,
-          48,
           8,
-          52
+          52,
+          12,
+          48
         ]
       }
     },
     rightTrousers: {
-      east: {
+      west: {
         uv: [
           0,
           36,
@@ -89851,7 +89901,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      west: {
+      east: {
         uv: [
           8,
           36,
@@ -89859,7 +89909,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      north: {
+      south: {
         uv: [
           4,
           36,
@@ -89867,7 +89917,7 @@ property list uchar int vertex_index
           48
         ]
       },
-      south: {
+      north: {
         uv: [
           12,
           36,
@@ -89877,18 +89927,18 @@ property list uchar int vertex_index
       },
       up: {
         uv: [
-          8,
-          36,
           4,
-          32
+          32,
+          8,
+          36
         ]
       },
       down: {
         uv: [
-          12,
-          32,
           8,
-          36
+          36,
+          12,
+          32
         ],
         rotation: 180
       }
@@ -89909,35 +89959,35 @@ property list uchar int vertex_index
     ...baseSkinCoordinates,
     leftArm: {
       ...baseSkinCoordinates.leftArm,
-      west: { uv: [39, 52, 43, 64] },
-      north: { uv: [36, 52, 39, 64] },
-      south: { uv: [43, 52, 46, 64] },
-      up: { uv: [39, 52, 36, 48] },
-      down: { uv: [42, 48, 39, 52] }
+      east: { uv: [39, 52, 43, 64] },
+      south: { uv: [36, 52, 39, 64] },
+      north: { uv: [43, 52, 46, 64] },
+      up: { uv: [36, 48, 39, 52] },
+      down: { uv: [39, 52, 42, 48] }
     },
     rightArm: {
       ...baseSkinCoordinates.rightArm,
-      west: { uv: [47, 20, 51, 32] },
-      north: { uv: [44, 20, 47, 32] },
-      south: { uv: [51, 20, 54, 32] },
-      up: { uv: [47, 20, 44, 16] },
-      down: { uv: [50, 16, 47, 20] }
+      east: { uv: [47, 20, 51, 32] },
+      south: { uv: [44, 20, 47, 32] },
+      north: { uv: [51, 20, 54, 32] },
+      up: { uv: [44, 16, 47, 20] },
+      down: { uv: [47, 20, 50, 16] }
     },
     leftSleeve: {
       ...baseSkinCoordinates.leftSleeve,
-      west: { uv: [55, 52, 59, 64] },
-      north: { uv: [52, 52, 55, 64] },
-      south: { uv: [59, 52, 62, 64] },
-      up: { uv: [55, 52, 52, 48] },
-      down: { uv: [58, 48, 55, 52], rotation: 180 }
+      east: { uv: [55, 52, 59, 64] },
+      south: { uv: [52, 52, 55, 64] },
+      north: { uv: [59, 52, 62, 64] },
+      up: { uv: [52, 48, 55, 52] },
+      down: { uv: [55, 52, 58, 48], rotation: 180 }
     },
     rightSleeve: {
       ...baseSkinCoordinates.rightSleeve,
-      west: { uv: [47, 36, 51, 48] },
-      north: { uv: [44, 36, 47, 48] },
-      south: { uv: [51, 36, 54, 48] },
-      up: { uv: [47, 36, 44, 32] },
-      down: { uv: [50, 32, 47, 36], rotation: 180 }
+      east: { uv: [47, 36, 51, 48] },
+      south: { uv: [44, 36, 47, 48] },
+      north: { uv: [51, 36, 54, 48] },
+      up: { uv: [44, 32, 47, 36] },
+      down: { uv: [47, 36, 50, 32], rotation: 180 }
     }
   };
 
@@ -90189,34 +90239,34 @@ property list uchar int vertex_index
       }
       {
         {
-          const leftArmGroup = this.createAndAddGroup("leftArm", -5, 22, 0);
+          const leftArmGroup = this.createAndAddGroup("leftArm", 5, 22, 0);
           const leftArmGeo = this.getBoxGeometry("leftArm" /* LEFT_ARM */);
           const leftArm = this.createAndAddMesh("leftArm", leftArmGroup, leftArmGeo, mat, "y" /* Y */, -4);
-          leftArm.position.x = this.slim ? -0.5 : -1;
+          leftArm.position.x = this.slim ? 0.5 : 1;
           const leftSleeveGeo = this.getBoxGeometry("leftSleeve" /* LEFT_SLEEVE */);
           const leftSleeve = this.createAndAddMesh("leftSleeve", leftArmGroup, leftSleeveGeo, mat, "y" /* Y */, -4);
-          leftSleeve.position.x = this.slim ? -0.5 : -1;
+          leftSleeve.position.x = this.slim ? 0.5 : 1;
         }
         {
-          const rightArmGroup = this.createAndAddGroup("rightArm", 5, 22, 0);
+          const rightArmGroup = this.createAndAddGroup("rightArm", -5, 22, 0);
           const rightArmGeo = this.getBoxGeometry("rightArm" /* RIGHT_ARM */);
           const rightArm = this.createAndAddMesh("rightArm", rightArmGroup, rightArmGeo, mat, "y" /* Y */, -4);
-          rightArm.position.x = this.slim ? 0.5 : 1;
+          rightArm.position.x = this.slim ? -0.5 : -1;
           const rightSleeveGeo = this.getBoxGeometry("rightSleeve" /* RIGHT_SLEEVE */);
           const rightSleeve = this.createAndAddMesh("rightSleeve", rightArmGroup, rightSleeveGeo, mat, "y" /* Y */, -4);
-          rightSleeve.position.x = this.slim ? 0.5 : 1;
+          rightSleeve.position.x = this.slim ? -0.5 : -1;
         }
       }
       {
         {
-          const leftLegGroup = this.createAndAddGroup("leftLeg", -1.9, 12, 0);
+          const leftLegGroup = this.createAndAddGroup("leftLeg", 1.9, 12, 0);
           const leftLegGeo = this.getBoxGeometry("leftLeg" /* LEFT_LEG */);
           const leftLeg = this.createAndAddMesh("leftLeg", leftLegGroup, leftLegGeo, mat, "y" /* Y */, -6);
           const leftTrousersGeo = this.getBoxGeometry("leftTrousers" /* LEFT_TROUSERS */);
           const leftTrousers = this.createAndAddMesh("leftTrousers", leftLegGroup, leftTrousersGeo, mat, "y" /* Y */, -6);
         }
         {
-          const rightLegGroup = this.createAndAddGroup("rightLeg", 1.9, 12, 0);
+          const rightLegGroup = this.createAndAddGroup("rightLeg", -1.9, 12, 0);
           const rightLegGeo = this.getBoxGeometry("rightLeg" /* RIGHT_LEG */);
           const rightLeg = this.createAndAddMesh("rightLeg", rightLegGroup, rightLegGeo, mat, "y" /* Y */, -6);
           const rightTrousersGeo = this.getBoxGeometry("rightTrousers" /* RIGHT_TROUSERS */);
@@ -90266,9 +90316,10 @@ property list uchar int vertex_index
         mesh.geometry = geometry;
       } else {
         const body = this.getGroupByName("body" /* BODY */);
-        const group = this.createGroup("cape" /* CAPE */, 0, body ? 0 : 24, 2);
+        const group = this.createGroup("cape" /* CAPE */);
+        group.position.set(0, body ? 0 : 24, -2);
         (body ?? this).add(group);
-        group.rotation.set(toRadians(-6), Math.PI, 0);
+        group.rotation.x = toRadians(6);
         const cape = this.createAndAddMesh("cape" /* CAPE */, group, geometry, material);
         cape.position.set(0, -8, -0.5);
       }
@@ -90282,7 +90333,7 @@ property list uchar int vertex_index
     updateSlim(slim) {
       if (slim === this.slim) return;
       this.slim = slim;
-      const offset = slim ? 0.5 : -0.5;
+      const offset = slim ? -0.5 : 0.5;
       for (const part of ["leftArm" /* LEFT_ARM */, "leftSleeve" /* LEFT_SLEEVE */, "rightArm" /* RIGHT_ARM */, "rightSleeve" /* RIGHT_SLEEVE */]) {
         const mesh = this.getMeshByName(part);
         if (mesh) {
@@ -90376,13 +90427,9 @@ property list uchar int vertex_index
       return this.add(...object);
     }
     async addSceneObject(asset, objectSupplier, _options, parent = this) {
-      console.log("addSceneObject", asset);
-      console.log("parent", parent);
-      console.log(_options);
       this.dirty = true;
       const obj = await objectSupplier();
       if (obj?.options?.instanceMeshes && asset.key && asset.key?.assetType === "models") {
-        console.log("instanceMeshes + key");
         let key = asset.key.serialize();
         if (isModelObject(obj)) {
           const { displayPosition, uvLockRotation, tints, cullMask } = obj.options;
@@ -90399,7 +90446,6 @@ property list uchar int vertex_index
           return obj;
         });
       } else {
-        console.log("!instanceMeshes | !key");
         obj.scene = this;
         await obj.init();
         if (!isBlockObject(obj)) {