minerender 2.1.0-alpha.21 → 2.1.0-alpha.23

package/dist/bundle.js

@@ -45373,6 +45373,7 @@ return ${compiler2.callType("value", tagType)}
     DISPLAY_POSITIONS: () => DISPLAY_POSITIONS,
     DefaultBlockStates: () => DefaultBlockStates,
     DisplayPosition: () => DisplayPosition,
+    DisplayTransforms: () => DisplayTransforms,
     Entities: () => Entities,
     EntityModels: () => EntityModels,
     EntityObject: () => EntityObject,
@@ -67219,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;
@@ -67379,7 +67447,7 @@ return ${compiler2.callType("value", tagType)}
         void 0,
         "assets",
         ".json",
-        DEFAULT_ROOT
+        AssetLoader.ROOT
       );
       return Caching.listAssetCache.get(key.serialize(), () => {
         return AssetLoader.get(key, "list" /* LIST */);
@@ -67677,17 +67745,17 @@ return ${compiler2.callType("value", tagType)}
         if (typeof namespaced !== "undefined") {
           return namespaced;
         }
-        if (typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT || typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT) {
+        if (typeof key.root !== "undefined" && key.root !== AssetLoader.ROOT || typeof this.root !== "undefined" && this.root !== AssetLoader.ROOT) {
           console.info(p6, "Retrying", key, "with default root+namespace");
-          const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+          const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, AssetLoader.ROOT);
           const namespacedRooted = await this.load(namespacedRootedKey, parser);
           if (typeof namespacedRooted !== "undefined") {
             return namespacedRooted;
           }
         }
-      } else if (typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT || typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT) {
+      } else if (typeof key.root !== "undefined" && key.root !== AssetLoader.ROOT || typeof this.root !== "undefined" && this.root !== AssetLoader.ROOT) {
         console.info(p6, "Retrying", key, "with default root");
-        const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+        const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, AssetLoader.ROOT);
         const rooted = await this.load(rootKey, parser);
         if (typeof rooted !== "undefined") {
           return rooted;
@@ -77334,6 +77402,20 @@ return ${compiler2.callType("value", tagType)}
   // src/assets/AssetLoader.ts
   var p7 = prefix("AssetLoader");
   var _AssetLoader = class _AssetLoader {
+    static get version() {
+      return this.ROOT.substring(this.ROOT.lastIndexOf("/") + 1);
+    }
+    static setVersion(version2) {
+      this.ROOT = `https://assets.mcasset.cloud/${version2}`;
+      const source = new HostedAssetSource(this.ROOT, { retryDefaults: false });
+      const index = this._SOURCES.findIndex((s4) => s4.key === "mcassets");
+      if (index !== -1) {
+        this._SOURCES[index] = { key: "mcassets", source };
+      } else {
+        this.addSource("mcassets", source);
+      }
+      Caching.clear();
+    }
     static addSource(key, source, override = true) {
       if (override) {
         const existing = this.removeSource(key);
@@ -77396,7 +77478,7 @@ return ${compiler2.callType("value", tagType)}
   _AssetLoader.ROOT = DEFAULT_ROOT;
   _AssetLoader._SOURCES = [];
   _AssetLoader.addSource("mcassets-fallback", new HostedAssetSource("https://raw.githubusercontent.com/InventivetalentDev/minerender-fallback-assets/master", { retryDefaults: false }));
-  _AssetLoader.addSource("mcassets", new HostedAssetSource(DEFAULT_ROOT, { retryDefaults: false }));
+  _AssetLoader.addSource("mcassets", new HostedAssetSource(_AssetLoader.ROOT, { retryDefaults: false }));
   var AssetLoader = _AssetLoader;
 
   // src/assets/ModelTextures.ts
@@ -79291,23 +79373,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();
@@ -80042,6 +80107,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) {
@@ -80070,6 +80136,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 {
@@ -80091,6 +80158,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;
@@ -81423,7 +81491,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)}`;