minerender 2.1.0-alpha.19 → 2.1.0-alpha.20

package/dist/bundle.js

@@ -66934,6 +66934,7 @@ return ${compiler2.callType("value", tagType)}
             uniform bool SHADE;
             
             varying vec2 vUv;
+            varying vec3 vTint;
             varying float light;
             varying float lift;
 
@@ -66968,6 +66969,7 @@ return ${compiler2.callType("value", tagType)}
                 }
                 
                 vUv = uv;
+                vTint = color;
                
                 #ifdef USE_INSTANCING
                     gl_Position = projectionMatrix * viewMatrix * modelMatrix * instanceMatrix * vec4(position, 1.0);
@@ -66989,12 +66991,14 @@ return ${compiler2.callType("value", tagType)}
             uniform float BRIGHTNESS;
 
             varying vec2 vUv;
+            varying vec3 vTint;
             varying float light;
             varying float lift;
 
             void main(void)
             {
                 vec4 color = texture2D(map, vUv);
+                color.rgb *= vTint;
                 
                 if (color.a < 0.01) discard;
 
@@ -77596,17 +77600,20 @@ return ${compiler2.callType("value", tagType)}
   init_process2();
   var ModelGenerator = class {
     static generateItemModel(imageData, layer) {
+      const tintindex = this.ITEM_LAYERS.indexOf(layer);
       const mainElement = {
         from: [0, 0, 7.5],
         to: [16, 16, 8.5],
         faces: {
           "south": {
             uv: [0, 0, 16, 16],
-            texture: `#${layer}`
+            texture: `#${layer}`,
+            tintindex
           },
           "north": {
             uv: [16, 0, 0, 16],
-            texture: `#${layer}`
+            texture: `#${layer}`,
+            tintindex
           }
         },
         shade: true
@@ -79920,6 +79927,7 @@ return ${compiler2.callType("value", tagType)}
       this.isModelObject = true;
       this.meshesCreated = false;
       this.options = (0, import_ts_deepmerge5.default)({}, _ModelObject.DEFAULT_OPTIONS, options ?? {});
+      if (this.options.tints) this.options.tints = { ...this.options.tints };
       console.log("ModelObject options", this.options);
     }
     async init() {
@@ -79949,6 +79957,20 @@ return ${compiler2.callType("value", tagType)}
             if (this.options.uvLockRotation) {
               UVMapper.lockUvs(elGeo, el.faces, this.atlas, new Euler(...this.options.uvLockRotation));
             }
+            if (this.options.tints) {
+              const colors = new Float32Array(elGeo.getAttribute("position").count * 3).fill(1);
+              for (const [faceIndex, faceName] of CUBE_FACES.entries()) {
+                const tintIndex = el.faces[faceName]?.tintindex;
+                if (tintIndex === void 0 || tintIndex < 0) continue;
+                const tint = this.options.tints[tintIndex];
+                if (tint === void 0) continue;
+                const color2 = new Color(tint);
+                for (let vertex2 = 0; vertex2 < 4; vertex2++) {
+                  color2.toArray(colors, (faceIndex * 4 + vertex2) * 3);
+                }
+              }
+              elGeo.setAttribute("color", new BufferAttribute(colors, 3));
+            }
             elGeo.applyMatrix4(new Matrix4().makeTranslation((el.to[0] - el.from[0]) / 2, (el.to[1] - el.from[1]) / 2, (el.to[2] - el.from[2]) / 2));
             elGeo.applyMatrix4(new Matrix4().makeTranslation(el.from[0], el.from[1], el.from[2]));
             if (el.rotation) {
@@ -80005,6 +80027,7 @@ return ${compiler2.callType("value", tagType)}
           /*TODO: get this from render options*/
         );
         this.iterateAllMeshes((mesh) => {
+          if (mesh.geometry.hasAttribute("color")) mat.vertexColors = true;
           mesh.material = mat;
         });
         if (this.atlas.hasAnimation) {
@@ -81304,8 +81327,13 @@ return ${compiler2.callType("value", tagType)}
       const obj = await objectSupplier();
       if (obj?.options?.instanceMeshes && asset.key && asset.key?.assetType === "models") {
         console.log("instanceMeshes + key");
-        const uvLockRotation = isModelObject(obj) ? obj.options.uvLockRotation : void 0;
-        const key = asset.key.serialize() + (uvLockRotation ? `|uvlock:${uvLockRotation.join(",")}` : "");
+        let key = asset.key.serialize();
+        if (isModelObject(obj)) {
+          const { uvLockRotation, tints } = obj.options;
+          if (uvLockRotation) key += `|uvlock:${uvLockRotation.join(",")}`;
+          const palette = Object.entries(tints ?? {}).sort(([a4], [b4]) => Number(a4) - Number(b4));
+          if (palette.length) key += `|tints:${JSON.stringify(palette)}`;
+        }
         return this.instanceManager.getOrCreate(key, async () => {
           obj.scene = this;
           await obj.init();