minerender 2.1.0-alpha.20 → 2.1.0-alpha.22

package/dist/bundle.js

@@ -25869,17 +25869,17 @@ var MineRender = (() => {
         expr = expr.replace(/\$/g, "$$$$");
         return str.replace(new RegExp(dataVar, "g"), expr + "$1");
       }
-      function schemaHasRules(schema, rules) {
+      function schemaHasRules(schema, rules2) {
         if (typeof schema == "boolean") return !schema;
-        for (var key in schema) if (rules[key]) return true;
+        for (var key in schema) if (rules2[key]) return true;
       }
-      function schemaHasRulesExcept(schema, rules, exceptKeyword) {
+      function schemaHasRulesExcept(schema, rules2, exceptKeyword) {
         if (typeof schema == "boolean") return !schema && exceptKeyword != "not";
-        for (var key in schema) if (key != exceptKeyword && rules[key]) return true;
+        for (var key in schema) if (key != exceptKeyword && rules2[key]) return true;
       }
-      function schemaUnknownRules(schema, rules) {
+      function schemaUnknownRules(schema, rules2) {
         if (typeof schema == "boolean") return;
-        for (var key in schema) if (!rules[key]) return key;
+        for (var key in schema) if (!rules2[key]) return key;
       }
       function toQuotedString(str) {
         return "'" + escapeQuotes(str) + "'";
@@ -26806,9 +26806,9 @@ var MineRender = (() => {
           out += " var " + $valid + " = errors === errs_" + $lvl + ";";
         }
         function $shouldUseGroup($rulesGroup2) {
-          var rules = $rulesGroup2.rules;
-          for (var i4 = 0; i4 < rules.length; i4++)
-            if ($shouldUseRule(rules[i4])) return true;
+          var rules2 = $rulesGroup2.rules;
+          for (var i4 = 0; i4 < rules2.length; i4++)
+            if ($shouldUseRule(rules2[i4])) return true;
         }
         function $shouldUseRule($rule2) {
           return it.schema[$rule2.keyword] !== void 0 || $rule2.implements && $ruleImplementsSomeKeyword($rule2);
@@ -29887,7 +29887,7 @@ var MineRender = (() => {
       init_process2();
       var ruleModules = require_dotjs();
       var toHash = require_util().toHash;
-      module2.exports = function rules() {
+      module2.exports = function rules2() {
         var RULES = [
           {
             type: "number",
@@ -30624,10 +30624,10 @@ var MineRender = (() => {
         delete RULES.all[keyword];
         delete RULES.custom[keyword];
         for (var i4 = 0; i4 < RULES.length; i4++) {
-          var rules = RULES[i4].rules;
-          for (var j4 = 0; j4 < rules.length; j4++) {
-            if (rules[j4].keyword == keyword) {
-              rules.splice(j4, 1);
+          var rules2 = RULES[i4].rules;
+          for (var j4 = 0; j4 < rules2.length; j4++) {
+            if (rules2[j4].keyword == keyword) {
+              rules2.splice(j4, 1);
               break;
             }
           }
@@ -30683,7 +30683,7 @@ var MineRender = (() => {
       var SchemaObject = require_schema_obj();
       var stableStringify = require_fast_json_stable_stringify();
       var formats = require_formats();
-      var rules = require_rules();
+      var rules2 = require_rules();
       var $dataMetaSchema = require_data();
       var util = require_util();
       module2.exports = Ajv;
@@ -30722,7 +30722,7 @@ var MineRender = (() => {
         this._cache = opts.cache || new Cache();
         this._loadingSchemas = {};
         this._compilations = [];
-        this.RULES = rules();
+        this.RULES = rules2();
         this._getId = chooseGetId(opts);
         opts.loopRequired = opts.loopRequired || Infinity;
         if (opts.errorDataPath == "property") opts._errorDataPathProperty = true;
@@ -45356,6 +45356,7 @@ return ${compiler2.callType("value", tagType)}
     BlockEntityModels: () => BlockEntityModels,
     BlockObject: () => BlockObject,
     BlockStates: () => BlockStates,
+    BlockTints: () => BlockTints,
     BrowserArchiveProxy: () => BrowserArchiveProxy,
     BrowserCache: () => BrowserCache,
     BrowserEnv: () => BrowserEnv,
@@ -45372,6 +45373,7 @@ return ${compiler2.callType("value", tagType)}
     DISPLAY_POSITIONS: () => DISPLAY_POSITIONS,
     DefaultBlockStates: () => DefaultBlockStates,
     DisplayPosition: () => DisplayPosition,
+    DisplayTransforms: () => DisplayTransforms,
     Entities: () => Entities,
     EntityModels: () => EntityModels,
     EntityObject: () => EntityObject,
@@ -66380,6 +66382,7 @@ return ${compiler2.callType("value", tagType)}
         this.blockStateCache,
         this.listAssetCache,
         this.defaultBlockStatesCache,
+        this.blockTintCache,
         this.entityModelsCache
       ];
     }
@@ -66422,6 +66425,7 @@ return ${compiler2.callType("value", tagType)}
   _Caching.blockStateCache = Caches.builder().expireAfterWrite(Time.minutes(10)).expireAfterAccess(Time.minutes(5)).expirationInterval(Time.seconds(30)).buildAsync();
   _Caching.listAssetCache = _Caching.createAssetCache();
   _Caching.defaultBlockStatesCache = _Caching.createAssetCache();
+  _Caching.blockTintCache = _Caching.createAssetCache();
   _Caching.entityModelsCache = _Caching.createAssetCache();
   var Caching = _Caching;
 
@@ -67216,15 +67220,82 @@ return ${compiler2.callType("value", tagType)}
     return isBasicAssetKey(obj) && obj.isAssetKey === true;
   }
 
+  // src/model/DisplayTransforms.ts
+  init_dirname();
+  init_buffer2();
+  init_process2();
+
+  // src/model/DisplayPosition.ts
+  init_dirname();
+  init_buffer2();
+  init_process2();
+  var DisplayPosition = /* @__PURE__ */ ((DisplayPosition2) => {
+    DisplayPosition2["THIRDPERSON_RIGHTHAND"] = "thirdperson_righthand";
+    DisplayPosition2["THIRDPERSON_LEFTHAND"] = "thirdperson_lefthand";
+    DisplayPosition2["FIRSTPERSON_RIGHTHAND"] = "firstperson_righthand";
+    DisplayPosition2["FIRSTPERSON_LEFTHAND"] = "firstperson_lefthand";
+    DisplayPosition2["GUI"] = "gui";
+    DisplayPosition2["HEAD"] = "head";
+    DisplayPosition2["GROUND"] = "ground";
+    DisplayPosition2["FIXED"] = "fixed";
+    DisplayPosition2["ON_SHELF"] = "on_shelf";
+    return DisplayPosition2;
+  })(DisplayPosition || {});
+  var DISPLAY_POSITIONS = Object.values(DisplayPosition);
+
+  // src/model/DisplayTransforms.ts
+  var DisplayTransforms = class {
+    /** Resolve hand fallbacks within one model, before inheriting parent display entries. */
+    static withHandFallbacks(display) {
+      if (!display) return void 0;
+      const resolved = { ...display };
+      for (const [left, right] of [
+        ["thirdperson_lefthand" /* THIRDPERSON_LEFTHAND */, "thirdperson_righthand" /* THIRDPERSON_RIGHTHAND */],
+        ["firstperson_lefthand" /* FIRSTPERSON_LEFTHAND */, "firstperson_righthand" /* FIRSTPERSON_RIGHTHAND */]
+      ]) {
+        if (resolved[left] === void 0 && resolved[right] !== void 0) resolved[left] = resolved[right];
+      }
+      return resolved;
+    }
+    /** Build a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
+    static getMatrix(display, position) {
+      const transform = this.withHandFallbacks(display)?.[position] ?? {};
+      const left = position === "firstperson_lefthand" /* FIRSTPERSON_LEFTHAND */ || position === "thirdperson_lefthand" /* THIRDPERSON_LEFTHAND */;
+      const sign = left ? -1 : 1;
+      const [x4, y5, z4] = transform.rotation ?? [0, 0, 0];
+      const rotation = new Quaternion().setFromEuler(new Euler(toRadians(x4), sign * toRadians(y5), sign * toRadians(z4), "XYZ"));
+      const translation = new Vector3(...transform.translation ?? [0, 0, 0]).clampScalar(-80, 80);
+      translation.x *= sign;
+      const scale = new Vector3(...transform.scale ?? [1, 1, 1]).clampScalar(-4, 4);
+      return new Matrix4().compose(translation, rotation, scale);
+    }
+    static apply(geometry, matrix) {
+      geometry.applyMatrix4(matrix);
+      if (matrix.determinant() < 0) {
+        if (!geometry.index) geometry.setIndex(Array.from({ length: geometry.getAttribute("position").count }, (_4, i4) => i4));
+        const index = geometry.index;
+        for (let i4 = 0; i4 < index.count; i4 += 3) {
+          const second = index.getX(i4 + 1);
+          index.setX(i4 + 1, index.getX(i4 + 2));
+          index.setX(i4 + 2, second);
+        }
+        index.needsUpdate = true;
+      }
+    }
+  };
+
   // src/model/ModelMerger.ts
   var ModelMerger = class {
     static async mergeWithParents(model) {
       const models = await this.collectAllParents(model);
       let merged = {};
-      for (let parentModel of models) {
-        merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, parentModel);
+      for (const source of [...models, model]) {
+        const inheritedDisplay = merged.display;
+        merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, source);
+        if (source.display) {
+          merged.display = { ...inheritedDisplay, ...DisplayTransforms.withHandFallbacks(source.display) };
+        }
       }
-      merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, model);
       merged.hierarchy = models.map((m4) => m4.parent).filter((p15) => `${p15}`);
       merged.hierarchy.push(`${merged.parent}`);
       return merged;
@@ -79288,23 +79359,6 @@ return ${compiler2.callType("value", tagType)}
   init_buffer2();
   init_process2();
 
-  // src/model/DisplayPosition.ts
-  init_dirname();
-  init_buffer2();
-  init_process2();
-  var DisplayPosition = /* @__PURE__ */ ((DisplayPosition2) => {
-    DisplayPosition2["THIRDPERSON_RIGHTHAND"] = "thirdperson_righthand";
-    DisplayPosition2["THIRDPERSON_LEFTHAND"] = "thirdperson_lefthand";
-    DisplayPosition2["FIRSTPERSON_RIGHTHAND"] = "firstperson_righthand";
-    DisplayPosition2["FIRSTPERSON_LEFTHAND"] = "firstperson_lefthand";
-    DisplayPosition2["GUI"] = "gui";
-    DisplayPosition2["HEAD"] = "head";
-    DisplayPosition2["GROUND"] = "ground";
-    DisplayPosition2["FIXED"] = "fixed";
-    return DisplayPosition2;
-  })(DisplayPosition || {});
-  var DISPLAY_POSITIONS = Object.values(DisplayPosition);
-
   // src/model/ElementFace.ts
   init_dirname();
   init_buffer2();
@@ -79368,6 +79422,96 @@ return ${compiler2.callType("value", tagType)}
   init_buffer2();
   init_process2();
 
+  // src/model/block/BlockTints.ts
+  init_dirname();
+  init_buffer2();
+  init_process2();
+
+  // src/model/block/blockTints.json
+  var blockTints_default = {
+    "minecraft:large_fern": { source: "grass" },
+    "minecraft:tall_grass": { source: "grass" },
+    "minecraft:grass_block": { source: "grass" },
+    "minecraft:fern": { source: "grass" },
+    "minecraft:grass": { source: "grass" },
+    "minecraft:short_grass": { source: "grass" },
+    "minecraft:potted_fern": { source: "grass" },
+    "minecraft:bush": { source: "grass" },
+    "minecraft:pink_petals": { source: "grass", untinted: [0] },
+    "minecraft:wildflowers": { source: "grass", untinted: [0] },
+    "minecraft:spruce_leaves": { source: "constant", color: 6396257 },
+    "minecraft:birch_leaves": { source: "constant", color: 8431445 },
+    "minecraft:oak_leaves": { source: "constant", color: 4764952 },
+    "minecraft:jungle_leaves": { source: "constant", color: 4764952 },
+    "minecraft:acacia_leaves": { source: "constant", color: 4764952 },
+    "minecraft:dark_oak_leaves": { source: "constant", color: 4764952 },
+    "minecraft:vine": { source: "constant", color: 4764952 },
+    "minecraft:mangrove_leaves": { source: "constant", color: 4764952 },
+    "minecraft:leaf_litter": { source: "constant", color: 6044722 },
+    "minecraft:water_cauldron": { source: "constant", color: 4159204 },
+    "minecraft:redstone_wire": { source: "redstone" },
+    "minecraft:attached_melon_stem": { source: "constant", color: 14731036 },
+    "minecraft:attached_pumpkin_stem": { source: "constant", color: 14731036 },
+    "minecraft:melon_stem": { source: "stem" },
+    "minecraft:pumpkin_stem": { source: "stem" },
+    "minecraft:lily_pad": { source: "constant", color: 7455580 }
+  };
+
+  // src/model/block/BlockTints.ts
+  var rules = blockTints_default;
+  var BlockTints = class {
+    /** Resolves block preview colors without biome context; explicit tints take precedence. */
+    static async get(key, state, model, tints) {
+      const rule = key && rules[key.toNamespacedString()];
+      if (!key || !rule) return tints;
+      const indices = /* @__PURE__ */ new Set();
+      for (const element of model.elements ?? []) {
+        for (const face of Object.values(element.faces)) {
+          const index = face?.tintindex;
+          if (index !== void 0 && index >= 0 && tints?.[index] === void 0 && !rule.untinted?.includes(index)) {
+            indices.add(index);
+          }
+        }
+      }
+      if (!indices.size) return tints;
+      let color2;
+      switch (rule.source) {
+        case "constant":
+          color2 = rule.color;
+          break;
+        case "grass":
+          color2 = await this.grassColor(key);
+          break;
+        case "redstone": {
+          const power = Number(state.power ?? 0) / 15;
+          const red = power * 0.6 + (power > 0 ? 0.4 : 0.3);
+          const green = Math.max(0, power * power * 0.7 - 0.5);
+          const blue = Math.max(0, power * power * 0.6 - 0.7);
+          color2 = Math.floor(red * 255) << 16 | Math.floor(green * 255) << 8 | Math.floor(blue * 255);
+          break;
+        }
+        case "stem": {
+          const age = Number(state.age ?? 0);
+          color2 = age * 32 << 16 | 255 - age * 8 << 8 | age * 4;
+          break;
+        }
+      }
+      return { ...Object.fromEntries([...indices].map((index) => [index, color2])), ...tints };
+    }
+    static async grassColor(origin) {
+      const key = AssetKey.parse("textures", "minecraft:colormap/grass", origin);
+      return await Caching.blockTintCache.get(key.serialize(), async () => {
+        const image = await ModelTextures.get(key);
+        if (!image) throw new MineRenderError(`Missing grass colormap: ${key.toNamespacedString()}`);
+        if (image.width !== 256 || image.height !== 256) {
+          throw new MineRenderError("Grass colormaps must be 256 \xD7 256 pixels");
+        }
+        const [red, green, blue] = image.data.getImageData(127, 127, 1, 1).data;
+        return red << 16 | green << 8 | blue;
+      });
+    }
+  };
+
   // src/model/block/scene/index.ts
   init_dirname();
   init_buffer2();
@@ -79949,6 +80093,7 @@ return ${compiler2.callType("value", tagType)}
     createMeshes(force = false) {
       if (this.meshesCreated && !force) return;
       const mat = Materials.MISSING_TEXTURE;
+      const displayTransform = this.options.displayPosition ? DisplayTransforms.getMatrix(this.originalModel.display, this.options.displayPosition) : void 0;
       let allGeos = [];
       if (this.atlas) {
         if (this.atlas.model.elements) {
@@ -79977,6 +80122,7 @@ return ${compiler2.callType("value", tagType)}
               applyElementRotation(el.rotation, elGeo);
             }
             elGeo.applyMatrix4(new Matrix4().makeTranslation(-8, -8, -8));
+            if (displayTransform) DisplayTransforms.apply(elGeo, displayTransform);
             if (this.options.mergeMeshes) {
               allGeos.push(elGeo);
             } else {
@@ -79998,6 +80144,7 @@ return ${compiler2.callType("value", tagType)}
           combinedGeo = mergeBufferGeometries(allGeos);
         } else {
           combinedGeo = new BoxGeometry(16, 16, 16);
+          if (displayTransform) DisplayTransforms.apply(combinedGeo, displayTransform);
         }
         combinedGeo.computeBoundingBox();
         let mesh;
@@ -80215,6 +80362,7 @@ return ${compiler2.callType("value", tagType)}
       const model = await Models.getMerged(AssetKey.parse("models", variant.model));
       const options = {
         ...this.options,
+        tints: model ? await BlockTints.get(this.blockState.key, this.state, model, this.options.tints) : this.options.tints,
         uvLockRotation: variant.uvlock && (rotation.x !== 0 || rotation.y !== 0) ? [rotation.x, rotation.y, rotation.z] : void 0
       };
       const obj = await this.scene.addModel(model, options);
@@ -81329,7 +81477,8 @@ return ${compiler2.callType("value", tagType)}
         console.log("instanceMeshes + key");
         let key = asset.key.serialize();
         if (isModelObject(obj)) {
-          const { uvLockRotation, tints } = obj.options;
+          const { displayPosition, uvLockRotation, tints } = obj.options;
+          if (displayPosition) key += `|display:${displayPosition}`;
           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)}`;