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

package/dist/node/index.mjs

@@ -945,6 +945,7 @@ var Materials = class _Materials {
             uniform bool SHADE;
             
             varying vec2 vUv;
+            varying vec3 vTint;
             varying float light;
             varying float lift;
 
@@ -979,6 +980,7 @@ var Materials = class _Materials {
                 }
                 
                 vUv = uv;
+                vTint = color;
                
                 #ifdef USE_INSTANCING
                     gl_Position = projectionMatrix * viewMatrix * modelMatrix * instanceMatrix * vec4(position, 1.0);
@@ -1000,12 +1002,14 @@ var Materials = class _Materials {
             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;
 
@@ -2066,17 +2070,20 @@ var ModelGenerator = class {
     this.ITEM_LAYERS = ["layer0", "layer1", "layer2", "layer3", "layer4"];
   }
   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
@@ -3655,7 +3662,7 @@ function isQuadArray(obj) {
 }
 
 // src/model/scene/ModelObject.ts
-import { BoxGeometry as BoxGeometry5, Euler as Euler4, Matrix4 as Matrix45 } from "three";
+import { BoxGeometry as BoxGeometry5, BufferAttribute as BufferAttribute4, Color as Color3, Euler as Euler4, Matrix4 as Matrix45 } from "three";
 
 // src/three/BufferGeometryUtils.js
 import {
@@ -4209,6 +4216,7 @@ var ModelObject = class _ModelObject extends SceneObject {
     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);
   }
   static {
@@ -4241,6 +4249,20 @@ var ModelObject = class _ModelObject extends SceneObject {
           if (this.options.uvLockRotation) {
             UVMapper.lockUvs(elGeo, el.faces, this.atlas, new Euler4(...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 color = new Color3(tint);
+              for (let vertex = 0; vertex < 4; vertex++) {
+                color.toArray(colors, (faceIndex * 4 + vertex) * 3);
+              }
+            }
+            elGeo.setAttribute("color", new BufferAttribute4(colors, 3));
+          }
           elGeo.applyMatrix4(new Matrix45().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 Matrix45().makeTranslation(el.from[0], el.from[1], el.from[2]));
           if (el.rotation) {
@@ -4297,6 +4319,7 @@ var ModelObject = class _ModelObject extends SceneObject {
         /*TODO: get this from render options*/
       );
       this.iterateAllMeshes((mesh) => {
+        if (mesh.geometry.hasAttribute("color")) mat.vertexColors = true;
         mesh.material = mat;
       });
       if (this.atlas.hasAnimation) {
@@ -5557,8 +5580,13 @@ var MineRenderScene = class _MineRenderScene extends Scene2 {
     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(([a], [b]) => Number(a) - Number(b));
+        if (palette.length) key += `|tints:${JSON.stringify(palette)}`;
+      }
       return this.instanceManager.getOrCreate(key, async () => {
         obj.scene = this;
         await obj.init();