minerender 2.1.0-alpha.23 → 2.1.0-alpha.24

package/dist/node/index.js

@@ -137,7 +137,6 @@ __export(index_node_exports, {
   BUILTIN_GENERATED: () => BUILTIN_GENERATED,
   BasicAssetKey: () => BasicAssetKey,
   BatchedExecutor: () => BatchedExecutor,
-  BlockEntityModels: () => BlockEntityModels,
   BlockObject: () => BlockObject,
   BlockStates: () => BlockStates,
   BlockTints: () => BlockTints,
@@ -157,7 +156,6 @@ __export(index_node_exports, {
   DisplayPosition: () => DisplayPosition,
   DisplayTransforms: () => DisplayTransforms,
   Entities: () => Entities,
-  EntityModels: () => EntityModels,
   EntityObject: () => EntityObject,
   Env: () => Env,
   Geometries: () => Geometries,
@@ -211,7 +209,6 @@ __export(index_node_exports, {
   addWireframeToObject: () => addWireframeToObject,
   applyElementRotation: () => applyElementRotation,
   applyGenericRotation: () => applyGenericRotation,
-  applyModelPartRotation: () => applyModelPartRotation,
   axisToVec3: () => axisToVec3,
   base64decode: () => base64decode,
   base64encode: () => base64encode,
@@ -562,7 +559,7 @@ var Caching = class _Caching {
     this.blockTintCache = _Caching.createAssetCache();
   }
   static {
-    this.entityModelsCache = _Caching.createAssetCache();
+    this.entityModelCache = _Caching.createAssetCache();
   }
   static createAssetCache() {
     return import_loading_cache.Caches.builder().expireAfterWrite(import_time.Time.minutes(10)).expireAfterAccess(import_time.Time.minutes(5)).expirationInterval(import_time.Time.seconds(30)).buildAsync();
@@ -587,7 +584,7 @@ var Caching = class _Caching {
       this.listAssetCache,
       this.defaultBlockStatesCache,
       this.blockTintCache,
-      this.entityModelsCache
+      this.entityModelCache
     ];
   }
   static clear() {
@@ -1697,14 +1694,6 @@ function applyElementRotation(rotation, geometry) {
   }
   geometry.translate(origin.x, origin.y, origin.z);
 }
-function applyModelPartRotation(modelPart, geometry) {
-  const origin = new import_three8.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 */:
@@ -2761,18 +2750,18 @@ var MinecraftCubeTexture = class {
   }
   getUvEast(w, h, l) {
     return [
-      [this.mapW(this.u), this.mapH(this.v + l + h)],
-      [this.mapW(this.u + l), this.mapH(this.v + l + h)],
-      [this.mapW(this.u), this.mapH(this.v + l)],
-      [this.mapW(this.u + l), this.mapH(this.v + l)]
+      [this.mapW(this.u + l + w + l), this.mapH(this.v + l + h)],
+      [this.mapW(this.u + l + w), this.mapH(this.v + l + h)],
+      [this.mapW(this.u + l + w + l), this.mapH(this.v + l)],
+      [this.mapW(this.u + l + w), this.mapH(this.v + l)]
     ];
   }
   getUvWest(w, h, l) {
     return [
-      [this.mapW(this.u + l + w), this.mapH(this.v + l + h)],
-      [this.mapW(this.u + l + w + l), this.mapH(this.v + l + h)],
-      [this.mapW(this.u + l + w), this.mapH(this.v + l)],
-      [this.mapW(this.u + l + w + l), this.mapH(this.v + l)]
+      [this.mapW(this.u + l), this.mapH(this.v + l + h)],
+      [this.mapW(this.u), this.mapH(this.v + l + h)],
+      [this.mapW(this.u + l), this.mapH(this.v + l)],
+      [this.mapW(this.u), this.mapH(this.v + l)]
     ];
   }
   getUvUp(w, h, l) {
@@ -2785,26 +2774,26 @@ var MinecraftCubeTexture = class {
   }
   getUvDown(w, h, l) {
     return [
-      [this.mapW(this.u + l), this.mapH(this.v + l)],
-      [this.mapW(this.u + l + w), this.mapH(this.v + l)],
       [this.mapW(this.u + l), this.mapH(this.v)],
-      [this.mapW(this.u + l + w), this.mapH(this.v)]
+      [this.mapW(this.u + l + w), this.mapH(this.v)],
+      [this.mapW(this.u + l), this.mapH(this.v + l)],
+      [this.mapW(this.u + l + w), this.mapH(this.v + l)]
     ];
   }
   getUvSouth(w, h, l) {
     return [
-      [this.mapW(this.u + l + w + l), this.mapH(this.v + l + h)],
       [this.mapW(this.u + l + w + l + w), this.mapH(this.v + l + h)],
-      [this.mapW(this.u + l + w + l), this.mapH(this.v + l)],
-      [this.mapW(this.u + l + w + l + w), this.mapH(this.v + l)]
+      [this.mapW(this.u + l + w + l), this.mapH(this.v + l + h)],
+      [this.mapW(this.u + l + w + l + w), this.mapH(this.v + l)],
+      [this.mapW(this.u + l + w + l), this.mapH(this.v + l)]
     ];
   }
   getUvNorth(w, h, l) {
     return [
-      [this.mapW(this.u + l), this.mapH(this.v + l + h)],
       [this.mapW(this.u + l + w), this.mapH(this.v + l + h)],
-      [this.mapW(this.u + l), this.mapH(this.v + l)],
-      [this.mapW(this.u + l + w), this.mapH(this.v + l)]
+      [this.mapW(this.u + l), this.mapH(this.v + l + h)],
+      [this.mapW(this.u + l + w), this.mapH(this.v + l)],
+      [this.mapW(this.u + l), this.mapH(this.v + l)]
     ];
   }
   getFaceUv(face, w, h, l) {
@@ -2823,10 +2812,12 @@ var MinecraftCubeTexture = class {
         return this.getUvNorth(w, h, l);
     }
   }
-  toUvArray(w, h, l) {
+  toUvArray(w, h, l, mirror = false) {
     const uv = [];
     for (let i = 0; i < CUBE_FACES.length; i++) {
-      UVMapper.setFaceUvInArray(uv, i * 4, this.getFaceUv(CUBE_FACES[i], w, h, l));
+      const face = mirror && i < 2 ? CUBE_FACES[1 - i] : CUBE_FACES[i];
+      const corners = this.getFaceUv(face, w, h, l);
+      UVMapper.setFaceUvInArray(uv, i * 4, mirror ? [corners[1], corners[0], corners[3], corners[2]] : corners);
     }
     return uv;
   }
@@ -2856,69 +2847,51 @@ function shutdown() {
   Caching.end();
 }
 
-// src/assets/Entities.ts
-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
+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) {
-    const models = await this.getEntityModels();
-    if (!models) {
-      return void 0;
-    }
-    if (!textureKey) {
-      textureKey = modelKey;
+  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(", ")}`);
     }
-    const baseKey = modelKey.path.includes("/") ? new BasicAssetKey(modelKey.namespace, modelKey.path.split("/")[0]) : modelKey;
-    return {
-      key: textureKey,
-      parts: models[baseKey.toNamespacedString()]
-    };
+    return { key: textureKey ?? modelKey, layer, id: model.id };
+  }
+  /** @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/renderer/SceneObject.ts
@@ -2967,17 +2940,6 @@ function isInstanceReference(obj) {
   return obj.isInstanceReference;
 }
 
-// src/error/MineRenderError.ts
-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 p6 = prefix("SceneObject");
@@ -3111,15 +3073,8 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
     return this.toggleObjectVisibility(this.getMeshByName(name), 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>
@@ -3357,17 +3312,16 @@ function isSceneObject(obj) {
 // src/entity/scene/EntityObject.ts
 var import_ts_deepmerge4 = __toESM(require_dist());
 var import_three12 = require("three");
-var THREE3 = __toESM(require("three"));
-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 ?? {});
   }
   static {
-    this.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, {});
+    this.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, { flip: true });
   }
   async init() {
     this.createMeshes();
@@ -3377,10 +3331,10 @@ var EntityObject = class extends SceneObject {
     super.dispose();
   }
   get textureKey() {
+    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",
@@ -3390,36 +3344,41 @@ var EntityObject = class extends SceneObject {
   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 import_three12.Object3D();
-      partAnchor.position.x = part.pivotX;
-      partAnchor.position.y = part.pivotY;
-      partAnchor.position.z = part.pivotZ;
-      for (let cube of part.cubes) {
-        const w = cube.maxX - cube.minX;
-        const h = cube.maxY - cube.minY;
-        const l = cube.maxZ - cube.minZ;
-        const uv = texture.toUvArray(w, h, l);
-        const cubeGeo = this._getBoxGeometryForDimensionsAndUv(w, h, l, uv).clone();
-        cubeGeo.applyMatrix4(new THREE3.Matrix4().makeTranslation(w / 2, h / 2, l / 2));
-        cubeGeo.applyMatrix4(new THREE3.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 import_three12.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(name, part, parent, textureSize, material) {
+    const anchor = this.createGroup(name);
+    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(name, 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}`;
@@ -7328,7 +7287,6 @@ var Chunk = class _Chunk {
   BUILTIN_GENERATED,
   BasicAssetKey,
   BatchedExecutor,
-  BlockEntityModels,
   BlockObject,
   BlockStates,
   BlockTints,
@@ -7348,7 +7306,6 @@ var Chunk = class _Chunk {
   DisplayPosition,
   DisplayTransforms,
   Entities,
-  EntityModels,
   EntityObject,
   Env,
   Geometries,
@@ -7402,7 +7359,6 @@ var Chunk = class _Chunk {
   addWireframeToObject,
   applyElementRotation,
   applyGenericRotation,
-  applyModelPartRotation,
   axisToVec3,
   base64decode,
   base64encode,