minerender 2.1.0-alpha.10 → 2.1.0-alpha.11

package/dist/browser/index.mjs

@@ -32,8 +32,8 @@ var require_dist = __commonJS({
       __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
           s = arguments[i];
-          for (var p13 in s) if (Object.prototype.hasOwnProperty.call(s, p13))
-            t[p13] = s[p13];
+          for (var p12 in s) if (Object.prototype.hasOwnProperty.call(s, p12))
+            t[p12] = s[p12];
         }
         return t;
       };
@@ -1149,12 +1149,12 @@ var AssetKey = class _AssetKey extends BasicAssetKey {
     return a.join("/");
   }
   getFullPath() {
-    let p13 = [];
+    let p12 = [];
     if (this.type) {
-      p13.push(this.type);
+      p12.push(this.type);
     }
-    p13.push(this.path);
-    return p13.join("/");
+    p12.push(this.path);
+    return p12.join("/");
   }
   toNamespacedString() {
     return this.namespace + ":" + this.getFullPath();
@@ -1179,7 +1179,7 @@ var ModelMerger = class {
       merged = (0, import_ts_deepmerge.default)(merged, parentModel);
     }
     merged = (0, import_ts_deepmerge.default)(merged, model);
-    merged.hierarchy = models.map((m) => m.parent).filter((p13) => `${p13}`);
+    merged.hierarchy = models.map((m) => m.parent).filter((p12) => `${p12}`);
     merged.hierarchy.push(`${merged.parent}`);
     return merged;
   }
@@ -1366,6 +1366,16 @@ var AssetSource = class {
   constructor() {
   }
 };
+var AssetLoadError = class extends Error {
+  constructor(source, key, path, cause) {
+    super(`Failed to load ${key.toNamespacedString()} from ${path}${cause instanceof Error ? `: ${cause.message}` : ""}`);
+    this.source = source;
+    this.key = key;
+    this.path = path;
+    this.cause = cause;
+    this.name = "AssetLoadError";
+  }
+};
 
 // src/util/BatchedExecutor.ts
 var BatchedExecutor = class {
@@ -1544,31 +1554,25 @@ var _HostedAssetSource = class _HostedAssetSource extends AssetSource {
     console.info(p3, "Loading", key);
     const url = `${this.assetBasePath(key)}${key.type !== void 0 ? key.type + "/" : ""}${key.path}${key.extension}`;
     console.debug(p3, url);
-    let req = {
-      url
-    };
-    parser.config(req);
-    return await Requests.mcAssetRequest(req).then((response) => {
-      if (response && response.data) {
-        try {
-          return parser.parse(response);
-        } catch (e) {
-          console.warn("Parser failed to process response", response, e);
-          throw e;
-        }
-      }
-      return void 0;
-    }).catch((err) => {
-      if (err.response) {
-        let response = err.response;
-        if (response.status === 404) {
-          console.debug(p3, key, "not found");
+    const request = { url };
+    try {
+      parser.config(request);
+      let response;
+      try {
+        response = await Requests.mcAssetRequest(request);
+      } catch (cause) {
+        if (cause instanceof RequestError && cause.response?.status === 404) {
           return void 0;
         }
+        throw cause;
       }
-      console.debug(p3, "Failed to load", key, err?.message);
-      return void 0;
-    });
+      if (response.data === void 0) {
+        throw new Error("Asset response has no data");
+      }
+      return await parser.parse(response);
+    } catch (cause) {
+      throw new AssetLoadError(this, key, request.url, cause);
+    }
   }
   assetBasePath(key) {
     return `${key.root ?? this.root ?? AssetLoader.ROOT}/${key.rootType !== void 0 ? key.rootType + "/" : ""}${key.namespace !== void 0 ? key.namespace + "/" : ""}${key.assetType !== void 0 ? key.assetType + "/" : ""}`;
@@ -1675,7 +1679,6 @@ var BrowserArchiveProxy = class {
 };
 
 // src/assets/source/archive/ArchiveAssetSource.ts
-var p4 = prefix("ArchiveAssetSource");
 var ArchiveAssetSource = class _ArchiveAssetSource extends AssetSource {
   constructor(archiveProxy) {
     super();
@@ -1694,74 +1697,31 @@ var ArchiveAssetSource = class _ArchiveAssetSource extends AssetSource {
   }
   async get(key, parser) {
     const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
-    console.log("ArchiveAssetSource.get", key, parser);
-    let entries = await this.getEntries();
-    const path = `${this.assetBasePath(key)}${key.type !== void 0 ? key.type + "/" : ""}${key.path}${key.extension}`;
-    console.log(path);
-    const entry = await this.getEntry(path);
-    console.log(entry);
-    if (!entry) {
-      return void 0;
-    }
-    let blob = await entry.getData();
-    const url = URL.createObjectURL(blob);
-    console.log(url);
-    let req = {
-      url
-    };
-    responseParser.config(req);
-    return Requests.genericRequest(req).then((response) => {
-      if (response && response.data) {
-        try {
-          return responseParser.parse(response);
-        } catch (e) {
-          console.warn("Parser failed to process response", response, e);
-          throw e;
-        }
-      }
-      return void 0;
-    }).catch((err) => {
-      if (err.response) {
-        let response = err.response;
-        if (response.status === 404) {
-          console.debug(p4, key, "not found");
-          return void 0;
-        }
-      }
-      console.debug(p4, "Failed to load", key, err?.message);
-      return void 0;
-    });
+    return this.load(key, responseParser);
   }
-  //TODO: abstract this
   async load(key, parser) {
-    console.info(p4, "Loading", key);
-    const url = `${this.assetBasePath(key)}${key.type !== void 0 ? key.type + "/" : ""}${key.path}${key.extension}`;
-    console.debug(p4, url);
-    let req = {
-      url
-    };
-    parser.config(req);
-    return await Requests.genericRequest(req).then((response) => {
-      if (response && response.data) {
-        try {
-          return parser.parse(response);
-        } catch (e) {
-          console.warn("Parser failed to process response", response, e);
-          throw e;
-        }
+    const path = `${this.assetBasePath(key)}${key.type !== void 0 ? key.type + "/" : ""}${key.path}${key.extension}`;
+    let url;
+    try {
+      const entry = await this.getEntry(path);
+      if (!entry) {
+        return void 0;
       }
-      return void 0;
-    }).catch((err) => {
-      if (err.response) {
-        let response = err.response;
-        if (response.status === 404) {
-          console.debug(p4, key, "not found");
-          return void 0;
-        }
+      url = URL.createObjectURL(await entry.getData());
+      const request = { url };
+      parser.config(request);
+      const response = await Requests.genericRequest(request);
+      if (response.data === void 0) {
+        throw new Error("Asset response has no data");
       }
-      console.debug(p4, "Failed to load", key, err?.message);
-      return void 0;
-    });
+      return await parser.parse(response);
+    } catch (cause) {
+      throw new AssetLoadError(this, key, path, cause);
+    } finally {
+      if (url !== void 0) {
+        URL.revokeObjectURL(url);
+      }
+    }
   }
   assetBasePath(key) {
     return `${key.rootType !== void 0 ? key.rootType + "/" : ""}${key.namespace !== void 0 ? key.namespace + "/" : ""}${key.assetType !== void 0 ? key.assetType + "/" : ""}`;
@@ -1769,17 +1729,17 @@ var ArchiveAssetSource = class _ArchiveAssetSource extends AssetSource {
 };
 
 // src/assets/AssetLoader.ts
-var p5 = prefix("AssetLoader");
+var p4 = prefix("AssetLoader");
 var _AssetLoader = class _AssetLoader {
   static addSource(key, source, override = true) {
     if (override) {
       const existing = this.removeSource(key);
       if (existing) {
-        console.log(p5, "Removed existing AssetSource", key);
+        console.log(p4, "Removed existing AssetSource", key);
       }
     }
     this._SOURCES.unshift({ key, source });
-    console.log(p5, "Added AssetSource", key);
+    console.log(p4, "Added AssetSource", key);
   }
   static removeSource(key) {
     const index = this._SOURCES.findIndex((s) => s.key === key);
@@ -2029,7 +1989,7 @@ var ModelGenerator = class {
 ModelGenerator.ITEM_LAYERS = ["layer0", "layer1", "layer2", "layer3", "layer4"];
 
 // src/UVMapper.ts
-var p6 = prefix("UVMapper");
+var p5 = prefix("UVMapper");
 var DEFAULT_UV = [0, 0, 16, 16];
 var X = 0;
 var Y = 1;
@@ -2206,7 +2166,7 @@ var UVMapper = class {
     const metaMap = {};
     const model = { ...originalModel };
     const isItemModel = !("elements" in model);
-    console.debug(p6, "Creating Atlas for", model.key);
+    console.debug(p5, "Creating Atlas for", model.key);
     if (model.textures) {
       const promises = [];
       const uniqueTextureNames = [];
@@ -2220,7 +2180,7 @@ var UVMapper = class {
           const assetKey = AssetKey.parse("textures", textureValue, model.key);
           promises.push(ModelTextures.get(assetKey).then((asset) => {
             if (!asset) {
-              console.warn(p6, "Missing texture", assetKey);
+              console.warn(p5, "Missing texture", assetKey);
               return;
             }
             textureMap[textureKey] = new WrappedImage(asset);
@@ -2232,7 +2192,7 @@ var UVMapper = class {
       }
       await Promise.all(promises);
       const textureCount = uniqueTextureNames.length;
-      console.debug(p6, "Creating Atlas for", textureCount, "textures");
+      console.debug(p5, "Creating Atlas for", textureCount, "textures");
       this.fillMissingTextureKeys(model.textures, textureMap);
       this.fillMissingTextureKeys(model.textures, metaMap);
       const sizes = {};
@@ -2252,7 +2212,7 @@ var UVMapper = class {
       this.fillMissingTextureKeys(model.textures, sizes);
       const s = Math.ceil(Math.sqrt(textureCount + 1));
       const size = Math.ceil(s * maxWidth);
-      console.debug(p6, "Atlas size:", size);
+      console.debug(p5, "Atlas size:", size);
       const squaredSize = size * size;
       const missing = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC");
       const empty = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAA5JREFUKM9jGAWjgAIAAAJAAAFSSwuTAAAAAElFTkSuQmCC");
@@ -2307,10 +2267,10 @@ var UVMapper = class {
         }
       }
       const atlasImageData = image.toDataURL();
-      console.log(p6, "Atlas Image for", model.key, atlasImageData);
+      console.log(p5, "Atlas Image for", model.key, atlasImageData);
       this.fillMissingTextureKeys(model.textures, positions);
       if (isItemModel) {
-        console.debug(p6, "Generating item model for", model);
+        console.debug(p5, "Generating item model for", model);
         model.elements = [];
         for (let layerName of ModelGenerator.ITEM_LAYERS) {
           const textureImage = textureMap[layerName];
@@ -2318,7 +2278,7 @@ var UVMapper = class {
             model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName));
           }
         }
-        console.debug(p6, "Item model elements", model.elements);
+        console.debug(p5, "Item model elements", model.elements);
       }
       if (!model.elements) {
       }
@@ -2378,7 +2338,7 @@ var UVMapper = class {
         hasTransparency
       );
     } else {
-      console.warn(p6, "Model does not have any textures", model);
+      console.warn(p5, "Model does not have any textures", model);
     }
     return void 0;
   }
@@ -2639,7 +2599,7 @@ var MineRenderError = class _MineRenderError extends Error {
 
 // src/renderer/SceneObject.ts
 var import_ts_deepmerge3 = __toESM(require_dist());
-var p7 = prefix("SceneObject");
+var p6 = prefix("SceneObject");
 var _SceneObject = class _SceneObject extends Object3D2 {
   constructor(options) {
     super();
@@ -2818,9 +2778,9 @@ var _SceneObject = class _SceneObject extends Object3D2 {
     if (!this.isInstanced) throw new MineRenderError("Object is not instanced");
     const i = this._instanceCounter++;
     this.setMatrixAt(i, new Matrix42());
-    console.debug(p7, "nextInstance " + i);
+    console.debug(p6, "nextInstance " + i);
     if (i === this.options.maxInstanceCount) {
-      console.warn(p7, "Max instance count reached for " + this);
+      console.warn(p6, "Max instance count reached for " + this);
     }
     if (this.scene) {
       this.scene.stats.instanceCount++;
@@ -3102,7 +3062,7 @@ var GuiObject = class extends SceneObject {
 
 // src/inspector/SceneInspector.ts
 import { Raycaster, Vector2 as Vector22 } from "three";
-var p8 = prefix("SceneInspector");
+var p7 = prefix("SceneInspector");
 var help = "<span>Ctrl+Click to Select<br/></span><br/>";
 var SceneInspector = class {
   constructor(renderer) {
@@ -3171,7 +3131,7 @@ var SceneInspector = class {
   }
   selectObject(targetObject, targetIntersection) {
     this.selectedObject = targetObject;
-    console.log(p8, "selected", targetObject);
+    console.log(p7, "selected", targetObject);
     this.redraw(targetObject, targetIntersection);
   }
   redraw(targetObject, targetIntersection) {
@@ -3469,7 +3429,7 @@ var SceneStatsDisplay = class {
 };
 
 // src/instance/InstanceManager.ts
-var p9 = prefix("InstanceManager");
+var p8 = prefix("InstanceManager");
 var InstanceManager = class {
   constructor() {
     this.isInstanceManager = true;
@@ -3477,7 +3437,7 @@ var InstanceManager = class {
   }
   async get(key) {
     if (key in this.instanceCache) {
-      console.debug(p9, "key in cache", key);
+      console.debug(p8, "key in cache", key);
       return (await this.instanceCache[key]).nextInstance();
     }
     return void 0;
@@ -3486,13 +3446,17 @@ var InstanceManager = class {
     if (key in this.instanceCache) {
       return await this.get(key);
     }
-    console.debug(p9, "key not in cache", key);
-    this.instanceCache[key] = new Promise(async (resolve) => {
-      const obj = await supplier();
-      const instance = obj.nextInstance();
-      resolve(instance);
-    });
-    return await this.instanceCache[key];
+    console.debug(p8, "key not in cache", key);
+    const pending = Promise.resolve().then(supplier).then((obj) => obj.nextInstance());
+    this.instanceCache[key] = pending;
+    try {
+      return await pending;
+    } catch (error) {
+      if (this.instanceCache[key] === pending) {
+        delete this.instanceCache[key];
+      }
+      throw error;
+    }
   }
   reset() {
     for (let instanceCacheKey in this.instanceCache) {
@@ -4092,7 +4056,7 @@ function computeMorphedAttributes(object) {
 
 // src/model/scene/ModelObject.ts
 var import_ts_deepmerge5 = __toESM(require_dist());
-var p10 = prefix("ModelObject");
+var p9 = prefix("ModelObject");
 var _ModelObject = class _ModelObject extends SceneObject {
   constructor(originalModel, options) {
     super(options);
@@ -4142,10 +4106,10 @@ var _ModelObject = class _ModelObject extends SceneObject {
           }
         });
       } else {
-        console.debug(p10, this.atlas.model, "has no elements");
+        console.debug(p9, this.atlas.model, "has no elements");
       }
     } else {
-      console.debug(p10, "Missing atlas for", this);
+      console.debug(p9, "Missing atlas for", this);
     }
     if (this.options.mergeMeshes) {
       let combinedGeo;
@@ -4206,7 +4170,7 @@ function isModelObject(obj) {
 // src/model/block/scene/BlockObject.ts
 var import_ts_deepmerge6 = __toESM(require_dist());
 import { Euler as Euler3, Matrix4 as Matrix46, Vector3 as Vector36 } from "three";
-var p11 = prefix("BlockObject");
+var p10 = prefix("BlockObject");
 var _BlockObject = class _BlockObject extends SceneObject {
   constructor(blockState, options) {
     super(options);
@@ -4224,7 +4188,7 @@ var _BlockObject = class _BlockObject extends SceneObject {
   }
   async init() {
     if (this.options.applyDefaultState) {
-      const defaultState = this.blockState.key ? BlockStates.getDefaultState(this.blockState.key) : void 0;
+      const defaultState = this.blockState.key ? await BlockStates.getDefaultState(this.blockState.key) : void 0;
       if (defaultState && Object.keys(defaultState).length > 0) {
         const state = {};
         for (let k in defaultState) {
@@ -4300,7 +4264,7 @@ var _BlockObject = class _BlockObject extends SceneObject {
     } else if (this.blockState.multipart) {
       for (let part of this.blockState.multipart) {
         if (!part.apply) {
-          console.debug(p11, "Missing apply for blockState part", part);
+          console.debug(p10, "Missing apply for blockState part", part);
           continue;
         }
         if (!part.when) {
@@ -6769,7 +6733,7 @@ var MineRenderWorld = class {
 };
 
 // src/world/Chunk.ts
-var p12 = prefix("Chunk");
+var p11 = prefix("Chunk");
 var Chunk = class _Chunk {
   constructor(scene, x, y, z) {
     this._blocks = [];
@@ -6821,7 +6785,7 @@ var Chunk = class _Chunk {
     const index = _Chunk.chunkPosToBlockIndex(pos);
     const current = this._blocks[index];
     if (typeof current !== "undefined") {
-      console.debug(p12, "deleting existing block at", pos, worldPos, index);
+      console.debug(p11, "deleting existing block at", pos, worldPos, index);
       current.object.removeFromScene();
       delete this._blocks[index];
     }
@@ -6887,6 +6851,7 @@ export {
   AXES,
   ArchiveAssetSource,
   AssetKey,
+  AssetLoadError,
   AssetLoader,
   AssetParser,
   AssetSource,