minerender 2.1.0-alpha.23 → 2.1.0-alpha.25

package/dist/bundle.js

@@ -45353,7 +45353,6 @@ return ${compiler2.callType("value", tagType)}
     BUILTIN_GENERATED: () => BUILTIN_GENERATED,
     BasicAssetKey: () => BasicAssetKey,
     BatchedExecutor: () => BatchedExecutor,
-    BlockEntityModels: () => BlockEntityModels,
     BlockObject: () => BlockObject,
     BlockStates: () => BlockStates,
     BlockTints: () => BlockTints,
@@ -45375,7 +45374,6 @@ return ${compiler2.callType("value", tagType)}
     DisplayPosition: () => DisplayPosition,
     DisplayTransforms: () => DisplayTransforms,
     Entities: () => Entities,
-    EntityModels: () => EntityModels,
     EntityObject: () => EntityObject,
     Env: () => Env,
     Geometries: () => Geometries,
@@ -45427,7 +45425,6 @@ return ${compiler2.callType("value", tagType)}
     addWireframeToObject: () => addWireframeToObject,
     applyElementRotation: () => applyElementRotation,
     applyGenericRotation: () => applyGenericRotation,
-    applyModelPartRotation: () => applyModelPartRotation,
     axisToVec3: () => axisToVec3,
     base64decode: () => base64decode,
     base64encode: () => base64encode,
@@ -66383,7 +66380,8 @@ return ${compiler2.callType("value", tagType)}
         this.listAssetCache,
         this.defaultBlockStatesCache,
         this.blockTintCache,
-        this.entityModelsCache
+        this.entityModelCache,
+        this.entityTextureCache
       ];
     }
     static clear() {
@@ -66426,7 +66424,8 @@ return ${compiler2.callType("value", tagType)}
   _Caching.listAssetCache = _Caching.createAssetCache();
   _Caching.defaultBlockStatesCache = _Caching.createAssetCache();
   _Caching.blockTintCache = _Caching.createAssetCache();
-  _Caching.entityModelsCache = _Caching.createAssetCache();
+  _Caching.entityModelCache = _Caching.createAssetCache();
+  _Caching.entityTextureCache = _Caching.createAssetCache();
   var Caching = _Caching;
 
   // src/Geometries.ts
@@ -67605,14 +67604,6 @@ return ${compiler2.callType("value", tagType)}
     }
     geometry.translate(origin.x, origin.y, origin.z);
   }
-  function applyModelPartRotation(modelPart, geometry) {
-    const origin = new Vector3(modelPart.pivotX, modelPart.pivotY, modelPart.pivotZ);
-    geometry.translate(-origin.x, -origin.y, -origin.z);
-    geometry.rotateX(toRadians(modelPart.pitch));
-    geometry.rotateY(toRadians(modelPart.yaw));
-    geometry.rotateZ(toRadians(modelPart.roll));
-    geometry.translate(origin.x, origin.y, origin.z);
-  }
   function applyGenericRotation(axis, rotation, obj) {
     switch (axis) {
       case "x" /* X */:
@@ -78140,18 +78131,18 @@ return ${compiler2.callType("value", tagType)}
     }
     getUvEast(w4, h5, l4) {
       return [
-        [this.mapW(this.u), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u + l4), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u), this.mapH(this.v + l4)],
-        [this.mapW(this.u + l4), this.mapH(this.v + l4)]
+        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4)],
+        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)]
       ];
     }
     getUvWest(w4, h5, l4) {
       return [
-        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)],
-        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4)]
+        [this.mapW(this.u + l4), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u + l4), this.mapH(this.v + l4)],
+        [this.mapW(this.u), this.mapH(this.v + l4)]
       ];
     }
     getUvUp(w4, h5, l4) {
@@ -78164,26 +78155,26 @@ return ${compiler2.callType("value", tagType)}
     }
     getUvDown(w4, h5, l4) {
       return [
-        [this.mapW(this.u + l4), this.mapH(this.v + l4)],
-        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)],
         [this.mapW(this.u + l4), this.mapH(this.v)],
-        [this.mapW(this.u + l4 + w4), this.mapH(this.v)]
+        [this.mapW(this.u + l4 + w4), this.mapH(this.v)],
+        [this.mapW(this.u + l4), this.mapH(this.v + l4)],
+        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)]
       ];
     }
     getUvSouth(w4, h5, l4) {
       return [
-        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4 + h5)],
         [this.mapW(this.u + l4 + w4 + l4 + w4), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4)],
-        [this.mapW(this.u + l4 + w4 + l4 + w4), this.mapH(this.v + l4)]
+        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u + l4 + w4 + l4 + w4), this.mapH(this.v + l4)],
+        [this.mapW(this.u + l4 + w4 + l4), this.mapH(this.v + l4)]
       ];
     }
     getUvNorth(w4, h5, l4) {
       return [
-        [this.mapW(this.u + l4), this.mapH(this.v + l4 + h5)],
         [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4 + h5)],
-        [this.mapW(this.u + l4), this.mapH(this.v + l4)],
-        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)]
+        [this.mapW(this.u + l4), this.mapH(this.v + l4 + h5)],
+        [this.mapW(this.u + l4 + w4), this.mapH(this.v + l4)],
+        [this.mapW(this.u + l4), this.mapH(this.v + l4)]
       ];
     }
     getFaceUv(face, w4, h5, l4) {
@@ -78202,10 +78193,12 @@ return ${compiler2.callType("value", tagType)}
           return this.getUvNorth(w4, h5, l4);
       }
     }
-    toUvArray(w4, h5, l4) {
+    toUvArray(w4, h5, l4, mirror = false) {
       const uv = [];
       for (let i4 = 0; i4 < CUBE_FACES.length; i4++) {
-        UVMapper.setFaceUvInArray(uv, i4 * 4, this.getFaceUv(CUBE_FACES[i4], w4, h5, l4));
+        const face = mirror && i4 < 2 ? CUBE_FACES[1 - i4] : CUBE_FACES[i4];
+        const corners = this.getFaceUv(face, w4, h5, l4);
+        UVMapper.setFaceUvInArray(uv, i4 * 4, mirror ? [corners[1], corners[0], corners[3], corners[2]] : corners);
       }
       return uv;
     }
@@ -78266,68 +78259,83 @@ return ${compiler2.callType("value", tagType)}
   init_dirname();
   init_buffer2();
   init_process2();
-  var Entities = class {
-    static async getBlockEntityModels() {
-      const key = AssetKey.parse("models", "minerender:blockEntityModels");
-      console.log(key);
-      return Caching.entityModelsCache.get(key.serialize(), () => {
-        return AssetLoader.get(key, "json" /* JSON */);
-      });
-    }
-    static async getEntityModels() {
-      const key = AssetKey.parse("models", "minerender:entityModels");
-      console.log(key);
-      return Caching.entityModelsCache.get(key.serialize(), () => {
-        return AssetLoader.get(key, "json" /* JSON */);
-      });
+
+  // src/error/MineRenderError.ts
+  init_dirname();
+  init_buffer2();
+  init_process2();
+  var MineRenderError = class _MineRenderError extends Error {
+    constructor(msg) {
+      super(msg);
+      Object.setPrototypeOf(this, _MineRenderError.prototype);
     }
-    // BlockEntity names are hardcoded
-    static async getBlockList() {
-      const models = await this.getBlockEntityModels();
-      if (!models) {
-        return [];
-      }
-      return Object.keys(models);
+    get name() {
+      return "MineRenderError";
     }
+  };
+
+  // src/assets/Entities.ts
+  var Entities = class {
     static async getEntityList() {
-      const models = await this.getEntityModels();
-      if (!models) {
-        return [];
-      }
-      return Object.keys(models);
-    }
-    static async getBlock(modelKey, textureKey) {
-      const models = await this.getBlockEntityModels();
-      if (!models) {
-        return void 0;
-      }
-      if (!textureKey) {
-        textureKey = modelKey;
-      }
-      const baseKey = modelKey.path.includes("/") ? new BasicAssetKey(modelKey.namespace, modelKey.path.split("/")[0]) : modelKey;
-      return {
-        key: textureKey,
-        parts: models[baseKey.toNamespacedString()]
+      const collect = async (path) => {
+        const prefix2 = path ? `${path}/` : "";
+        const key = new AssetKey(DEFAULT_NAMESPACE, `${prefix2}_list`, void 0, void 0, "entity-models", ".json");
+        const list = await Caching.listAssetCache.get(key.serialize(), () => AssetLoader.get(key, "list" /* LIST */));
+        if (!list) return [];
+        const files = list.files.filter((file) => file.endsWith(".json") && file !== "_list.json").map((file) => `${prefix2}${file.slice(0, -5)}`);
+        const children = await Promise.all(list.directories.map((directory) => collect(`${prefix2}${directory}`)));
+        return [...files, ...children.flat()];
       };
+      return collect("");
+    }
+    static async getEntity(modelKey, textureKey, options) {
+      const path = isAssetKey(modelKey) ? modelKey.getFullPath() : modelKey.path;
+      const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models", ".json");
+      const model = await Caching.entityModelCache.get(key.serialize(), () => AssetLoader.get(key, "json" /* JSON */));
+      if (!model) return void 0;
+      const layerName = options?.layer ?? "main";
+      const layer = model.layers[layerName];
+      if (!layer) {
+        throw new MineRenderError(`Entity ${model.id} has no layer "${layerName}". Available layers: ${Object.keys(model.layers).join(", ")}`);
+      }
+      let texture;
+      if (textureKey) {
+        const path2 = isAssetKey(textureKey) ? textureKey.getFullPath() : textureKey.path;
+        texture = isAssetKey(textureKey) && textureKey.assetType === "textures" && path2.startsWith("entity/") ? textureKey : new AssetKey(textureKey.namespace, path2, "textures", "entity", "assets", ".png", isAssetKey(textureKey) ? textureKey.root : void 0);
+      } else {
+        texture = await this.resolveTexture(modelKey);
+      }
+      return { key: textureKey ?? modelKey, texture, layer, id: model.id };
+    }
+    static async resolveTexture(modelKey) {
+      const path = isAssetKey(modelKey) ? modelKey.getFullPath() : modelKey.path;
+      const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models", ".json");
+      return Caching.entityTextureCache.get(key.serialize(), async () => {
+        const name2 = path.split("/").pop();
+        for (const candidate of [path, `${path}/${name2}`]) {
+          const texture = new AssetKey(modelKey.namespace, candidate, "textures", "entity", "assets", ".png");
+          if (await ModelTextures.get(texture)) return texture;
+        }
+        const listKey = new AssetKey(modelKey.namespace, "_list", `${name2}_variant`, void 0, "data", ".json");
+        const list = await AssetLoader.get(listKey, "list" /* LIST */);
+        const files = list?.files.filter((file2) => file2.endsWith(".json") && file2 !== "_list.json");
+        const file = files?.find((file2) => file2 === "temperate.json") ?? files?.[0];
+        if (!file) return void 0;
+        const variantKey = new AssetKey(modelKey.namespace, file.slice(0, -5), `${name2}_variant`, void 0, "data", ".json");
+        const variant = await AssetLoader.get(variantKey, "json" /* JSON */);
+        const assets = variant?.assets;
+        const textureId = variant?.asset_id ?? (typeof assets?.wild === "string" ? assets.wild : Object.values(assets ?? {}).find((value) => typeof value === "string"));
+        return typeof textureId === "string" ? AssetKey.parse("textures", textureId) : void 0;
+      });
     }
-    static async getEntity(modelKey, textureKey) {
-      const models = await this.getEntityModels();
-      if (!models) {
-        return void 0;
-      }
-      if (!textureKey) {
-        textureKey = modelKey;
-      }
-      const baseKey = modelKey.path.includes("/") ? new BasicAssetKey(modelKey.namespace, modelKey.path.split("/")[0]) : modelKey;
-      return {
-        key: textureKey,
-        parts: models[baseKey.toNamespacedString()]
-      };
+    /** @deprecated Use getEntityList(); block entities share the entity dataset. */
+    static getBlockList() {
+      return this.getEntityList();
+    }
+    /** @deprecated Use getEntity(); block entities share the entity dataset. */
+    static getBlock(modelKey, textureKey, options) {
+      return this.getEntity(modelKey, textureKey, options);
     }
-  };
-  var EntityModels = class {
-  };
-  var BlockEntityModels = class {
   };
 
   // src/bedrock/index.ts
@@ -78436,20 +78444,6 @@ return ${compiler2.callType("value", tagType)}
     return obj.isInstanceReference;
   }
 
-  // src/error/MineRenderError.ts
-  init_dirname();
-  init_buffer2();
-  init_process2();
-  var MineRenderError = class _MineRenderError extends Error {
-    constructor(msg) {
-      super(msg);
-      Object.setPrototypeOf(this, _MineRenderError.prototype);
-    }
-    get name() {
-      return "MineRenderError";
-    }
-  };
-
   // src/renderer/SceneObject.ts
   var import_ts_deepmerge3 = __toESM(require_dist());
   var p9 = prefix("SceneObject");
@@ -78575,15 +78569,8 @@ return ${compiler2.callType("value", tagType)}
       return this.toggleObjectVisibility(this.getMeshByName(name2), visible);
     }
     iterateAllMeshes(cb) {
-      this.children.forEach((obj) => {
-        if (obj.isMesh) {
-          cb(obj);
-        }
-        obj.children.forEach((obj1) => {
-          if (obj1.isMesh) {
-            cb(obj1);
-          }
-        });
+      this.traverse((obj) => {
+        if (isMesh(obj)) cb(obj);
       });
     }
     //</editor-fold>
@@ -78827,13 +78814,13 @@ return ${compiler2.callType("value", tagType)}
 
   // src/entity/scene/EntityObject.ts
   var import_ts_deepmerge4 = __toESM(require_dist());
-  var EntityObject = class extends SceneObject {
+  var _EntityObject = class _EntityObject extends SceneObject {
     constructor(entity, options) {
       super();
       this.entity = entity;
       this.isEntityObject = true;
       this.meshesCreated = false;
-      this.options = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+      this.options = (0, import_ts_deepmerge4.default)({}, _EntityObject.DEFAULT_OPTIONS, options ?? {});
     }
     async init() {
       this.createMeshes();
@@ -78843,10 +78830,11 @@ return ${compiler2.callType("value", tagType)}
       super.dispose();
     }
     get textureKey() {
+      if (this.entity.texture) return this.entity.texture;
+      const key = this.entity.key;
       return new AssetKey(
-        this.entity.key?.namespace ?? DEFAULT_NAMESPACE,
-        this.entity.key.path,
-        //TODO: texture may differ from entity name; most of them are in subdirectories for multiple variants etc.
+        key.namespace,
+        isAssetKey(key) ? key.getFullPath() : key.path,
         "textures",
         "entity",
         "assets",
@@ -78856,36 +78844,41 @@ return ${compiler2.callType("value", tagType)}
     async loadTextures() {
       this.imageData = await ModelTextures.get(this.textureKey);
     }
-    //TODO: abstract this, since extracted model data can be used for entities, blocks, players
     createMeshes(force = false) {
       if (this.meshesCreated && !force) return;
-      const mat = Materials.MISSING_TEXTURE;
-      for (let partName in this.entity.parts) {
-        const part = this.entity.parts[partName];
-        const texture = new MinecraftCubeTexture(part.textureOffsetU, part.textureOffsetV, part.textureWidth, part.textureHeight);
-        const partAnchor = new Object3D();
-        partAnchor.position.x = part.pivotX;
-        partAnchor.position.y = part.pivotY;
-        partAnchor.position.z = part.pivotZ;
-        for (let cube of part.cubes) {
-          const w4 = cube.maxX - cube.minX;
-          const h5 = cube.maxY - cube.minY;
-          const l4 = cube.maxZ - cube.minZ;
-          const uv = texture.toUvArray(w4, h5, l4);
-          const cubeGeo = this._getBoxGeometryForDimensionsAndUv(w4, h5, l4, uv).clone();
-          cubeGeo.applyMatrix4(new Matrix4().makeTranslation(w4 / 2, h5 / 2, l4 / 2));
-          cubeGeo.applyMatrix4(new Matrix4().makeTranslation(cube.minX, cube.minY, cube.minZ));
-          applyModelPartRotation(part, cubeGeo);
-          const mesh = this.createMesh(partName, cubeGeo, mat);
-          partAnchor.add(mesh);
-          if (this.options.wireframe) {
-            addWireframeToMesh(cubeGeo, mesh);
-          }
-        }
-        this.add(partAnchor);
-      }
+      const modelRoot = new Object3D();
+      if (this.options.flip) modelRoot.scale.set(-1, -1, 1);
+      this.add(modelRoot);
+      this.createPart("root", this.entity.layer.root, modelRoot, this.entity.layer.texture, Materials.MISSING_TEXTURE);
       this.meshesCreated = true;
     }
+    createPart(name2, part, parent, textureSize, material) {
+      const anchor = this.createGroup(name2);
+      anchor.position.fromArray(part.pose.offset);
+      anchor.rotation.set(...part.pose.rotation, "ZYX");
+      anchor.scale.fromArray(part.pose.scale ?? [1, 1, 1]);
+      parent.add(anchor);
+      const size = part.texture ?? textureSize;
+      for (const cube of part.cubes) {
+        const [width, height, depth] = cube.size;
+        const [growX, growY, growZ] = cube.grow ?? [0, 0, 0];
+        const texture = new MinecraftCubeTexture(...cube.uv, ...size);
+        const uv = size[0] === 0 || size[1] === 0 ? new Array(48).fill(0) : texture.toUvArray(width, height, depth, cube.mirror);
+        const geometry = this._getBoxGeometryForDimensionsAndUv(
+          width + growX * 2,
+          height + growY * 2,
+          depth + growZ * 2,
+          uv
+        ).clone();
+        geometry.translate(cube.origin[0] + width / 2, cube.origin[1] + height / 2, cube.origin[2] + depth / 2);
+        const mesh = this.createMesh(name2, geometry, material);
+        anchor.add(mesh);
+        if (this.options.wireframe) addWireframeToMesh(geometry, mesh);
+      }
+      for (const [childName, child] of Object.entries(part.children)) {
+        this.createPart(childName, child, anchor, size, material);
+      }
+    }
     async applyTextures() {
       const assetKeyStr = this.textureKey.serialize();
       const keyStr = `entity:${assetKeyStr}`;
@@ -78906,7 +78899,8 @@ return ${compiler2.callType("value", tagType)}
       this.notifyDirty();
     }
   };
-  EntityObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, {});
+  _EntityObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, { flip: true });
+  var EntityObject = _EntityObject;
   function isEntityObject(obj) {
     return obj.isEntityObject;
   }
@@ -79411,11 +79405,6 @@ return ${compiler2.callType("value", tagType)}
   init_buffer2();
   init_process2();
 
-  // src/model/ModelPart.ts
-  init_dirname();
-  init_buffer2();
-  init_process2();
-
   // src/model/block/index.ts
   init_dirname();
   init_buffer2();