minerender 2.1.0-alpha.4 → 2.1.0-alpha.6

package/dist/node/index.mjs

@@ -85,7 +85,7 @@ var require_dist = __commonJS({
       return false;
     };
     var PROTECTED_KEYS = ["__proto__"];
-    var merge11 = function() {
+    var merge10 = function() {
       var objects = [];
       for (var _i = 0; _i < arguments.length; _i++) {
         objects[_i] = arguments[_i];
@@ -96,9 +96,9 @@ var require_dist = __commonJS({
             return;
           }
           if (Array.isArray(result[key]) && Array.isArray(current[key])) {
-            result[key] = merge11.options.mergeArrays ? Array.from(new Set(result[key].concat(current[key]))) : current[key];
+            result[key] = merge10.options.mergeArrays ? Array.from(new Set(result[key].concat(current[key]))) : current[key];
           } else if (isObject(result[key]) && isObject(current[key])) {
-            result[key] = merge11(result[key], current[key]);
+            result[key] = merge10(result[key], current[key]);
           } else {
             result[key] = current[key];
           }
@@ -109,18 +109,18 @@ var require_dist = __commonJS({
     var defaultOptions = {
       mergeArrays: true
     };
-    merge11.options = defaultOptions;
-    merge11.withOptions = function(options) {
+    merge10.options = defaultOptions;
+    merge10.withOptions = function(options) {
       var objects = [];
       for (var _i = 1; _i < arguments.length; _i++) {
         objects[_i - 1] = arguments[_i];
       }
-      merge11.options = __assign({ mergeArrays: true }, options);
-      var result = merge11.apply(void 0, __spreadArray([], __read(objects), false));
-      merge11.options = defaultOptions;
+      merge10.options = __assign({ mergeArrays: true }, options);
+      var result = merge10.apply(void 0, __spreadArray([], __read(objects), false));
+      merge10.options = defaultOptions;
       return result;
     };
-    exports.default = merge11;
+    exports.default = merge10;
   }
 });
 
@@ -166,7 +166,7 @@ var _PersistentCache = class _PersistentCache {
   }
 };
 /** Bump to invalidate every persisted entry. */
-_PersistentCache.VERSION = 1;
+_PersistentCache.VERSION = 2;
 var PersistentCache = _PersistentCache;
 
 // src/env/node/NodeCache.ts
@@ -441,6 +441,7 @@ import { CanvasTexture, Texture as Texture2 } from "three";
 
 // src/texture/TextureLoader.ts
 import { RGBAFormat, Texture } from "three";
+import * as THREE from "three";
 
 // src/canvas/CanvasCompat.ts
 function createImage(width, height) {
@@ -829,6 +830,7 @@ var TextureLoader = class {
   }
   static loadInBackground(src, format = RGBAFormat, rotation = 0) {
     const texture = this.createTexture();
+    texture.colorSpace = THREE.SRGBColorSpace;
     const image = ImageLoader.loadElement(src);
     image.onload = function() {
       texture.needsUpdate = true;
@@ -840,6 +842,7 @@ var TextureLoader = class {
   }
   static load(src, format = RGBAFormat, rotation = 0) {
     const texture = new Texture();
+    texture.colorSpace = THREE.SRGBColorSpace;
     ImageLoader.getData(src).then((image) => {
       texture.needsUpdate = true;
       texture.image = image;
@@ -851,11 +854,11 @@ var TextureLoader = class {
 };
 
 // src/texture/Textures.ts
-import * as THREE from "three";
+import * as THREE2 from "three";
 var Textures = class _Textures {
   static initTextureProps(texture) {
-    texture.magFilter = THREE.NearestFilter;
-    texture.minFilter = THREE.NearestFilter;
+    texture.magFilter = THREE2.NearestFilter;
+    texture.minFilter = THREE2.NearestFilter;
     texture.anisotropy = 0;
     return texture;
   }
@@ -866,7 +869,9 @@ var Textures = class _Textures {
     return new Texture2();
   }
   static createCanvasTexture(canvas) {
-    return this.initTextureProps(new CanvasTexture(canvas));
+    const texture = new CanvasTexture(canvas);
+    texture.colorSpace = THREE2.SRGBColorSpace;
+    return this.initTextureProps(texture);
   }
   static getImage(key) {
     const keyStr = serializeTextureKey(key);
@@ -983,6 +988,9 @@ var _Materials = class _Materials {
                     gl_FragColor = vec4(lift + color.rgb * light2, 1.0);
 
                 }
+
+                #include <tonemapping_fragment>
+                #include <colorspace_fragment>
             }
         `;
     try {
@@ -1613,7 +1621,6 @@ var ArchiveAssetSource = class _ArchiveAssetSource extends AssetSource {
 };
 
 // src/assets/AssetLoader.ts
-var import_ts_deepmerge3 = __toESM(require_dist());
 var p5 = prefix("AssetLoader");
 var _AssetLoader = class _AssetLoader {
   static addSource(key, source, override = true) {
@@ -1637,7 +1644,6 @@ var _AssetLoader = class _AssetLoader {
     return void 0;
   }
   static async getAll(key, parser) {
-    console.log(this._SOURCES);
     let promises = [];
     for (const source of this._SOURCES) {
       promises.push(source.source.get(key, parser));
@@ -1646,24 +1652,16 @@ var _AssetLoader = class _AssetLoader {
       return results.filter((r) => r != void 0);
     });
   }
+  /** Returns the first defined result in source-priority order, without merging assets. */
   static async get(key, parser) {
-    console.log(this._SOURCES);
-    let promises = [];
-    for (const source of this._SOURCES) {
-      promises.push(source.source.get(key, parser));
-    }
-    return Promise.all(promises).then((results) => {
-      const fallback = results[results.length - 1];
-      for (const result of results) {
-        if (result) {
-          if (fallback) {
-            return (0, import_ts_deepmerge3.default)({}, fallback, result);
-          }
-          return result;
-        }
+    const sources = [...this._SOURCES];
+    for (const source of sources) {
+      const result = await source.source.get(key, parser);
+      if (result !== void 0) {
+        return result;
       }
-      return void 0;
-    });
+    }
+    return void 0;
   }
 };
 _AssetLoader.ROOT = DEFAULT_ROOT;
@@ -2487,7 +2485,7 @@ var MineRenderError = class _MineRenderError extends Error {
 };
 
 // src/renderer/SceneObject.ts
-var import_ts_deepmerge4 = __toESM(require_dist());
+var import_ts_deepmerge3 = __toESM(require_dist());
 var p7 = prefix("SceneObject");
 var _SceneObject = class _SceneObject extends Object3D2 {
   constructor(options) {
@@ -2496,7 +2494,7 @@ var _SceneObject = class _SceneObject extends Object3D2 {
     this.materialCallbacks = {};
     this._isInstanced = false;
     this._instanceCounter = 0;
-    this.options = (0, import_ts_deepmerge4.default)({}, _SceneObject.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge3.default)({}, _SceneObject.DEFAULT_OPTIONS, options ?? {});
     console.log("SceneObject options", this.options);
   }
   set scene(scene) {
@@ -2846,7 +2844,7 @@ var _SceneObject = class _SceneObject extends Object3D2 {
   }
   //</editor-fold>
 };
-_SceneObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, {
+_SceneObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge3.default)({}, {
   instanceMeshes: true,
   maxInstanceCount: 50,
   mergeMeshes: true,
@@ -2858,16 +2856,16 @@ function isSceneObject(obj) {
 }
 
 // src/entity/scene/EntityObject.ts
-var import_ts_deepmerge5 = __toESM(require_dist());
+var import_ts_deepmerge4 = __toESM(require_dist());
 import { Object3D as Object3D3 } from "three";
-import * as THREE2 from "three";
+import * as THREE3 from "three";
 var EntityObject = class extends SceneObject {
   constructor(entity, options) {
     super();
     this.entity = entity;
     this.isEntityObject = true;
     this.meshesCreated = false;
-    this.options = (0, import_ts_deepmerge5.default)({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
   }
   async init() {
     this.createMeshes();
@@ -2905,8 +2903,8 @@ var EntityObject = class extends SceneObject {
         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 THREE2.Matrix4().makeTranslation(w / 2, h / 2, l / 2));
-        cubeGeo.applyMatrix4(new THREE2.Matrix4().makeTranslation(cube.minX, cube.minY, cube.minZ));
+        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);
@@ -2936,7 +2934,7 @@ var EntityObject = class extends SceneObject {
     }
   }
 };
-EntityObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge5.default)({}, SceneObject.DEFAULT_OPTIONS, {});
+EntityObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge4.default)({}, SceneObject.DEFAULT_OPTIONS, {});
 function isEntityObject(obj) {
   return obj.isEntityObject;
 }
@@ -3938,7 +3936,7 @@ function computeMorphedAttributes(object) {
 }
 
 // src/model/scene/ModelObject.ts
-var import_ts_deepmerge6 = __toESM(require_dist());
+var import_ts_deepmerge5 = __toESM(require_dist());
 var p10 = prefix("ModelObject");
 var _ModelObject = class _ModelObject extends SceneObject {
   constructor(originalModel, options) {
@@ -3946,7 +3944,7 @@ var _ModelObject = class _ModelObject extends SceneObject {
     this.originalModel = originalModel;
     this.isModelObject = true;
     this.meshesCreated = false;
-    this.options = (0, import_ts_deepmerge6.default)({}, _ModelObject.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge5.default)({}, _ModelObject.DEFAULT_OPTIONS, options ?? {});
     console.log("ModelObject options", this.options);
   }
   async init() {
@@ -4046,14 +4044,14 @@ var _ModelObject = class _ModelObject extends SceneObject {
     }
   }
 };
-_ModelObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge6.default)({}, SceneObject.DEFAULT_OPTIONS, {});
+_ModelObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge5.default)({}, SceneObject.DEFAULT_OPTIONS, {});
 var ModelObject = _ModelObject;
 function isModelObject(obj) {
   return obj.isModelObject;
 }
 
 // src/model/block/scene/BlockObject.ts
-var import_ts_deepmerge7 = __toESM(require_dist());
+var import_ts_deepmerge6 = __toESM(require_dist());
 import { Euler as Euler3, Matrix4 as Matrix46, Vector3 as Vector36 } from "three";
 var p11 = prefix("BlockObject");
 var _BlockObject = class _BlockObject extends SceneObject {
@@ -4069,7 +4067,7 @@ var _BlockObject = class _BlockObject extends SceneObject {
     this._instanceModel = [];
     this._variants = [];
     this._models = [];
-    this.options = (0, import_ts_deepmerge7.default)({}, _BlockObject.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge6.default)({}, _BlockObject.DEFAULT_OPTIONS, options ?? {});
   }
   async init() {
     if (this.options.applyDefaultState) {
@@ -4358,7 +4356,7 @@ var _BlockObject = class _BlockObject extends SceneObject {
   //TODO: should override rotation + scale methods
   //TODO
 };
-_BlockObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge7.default)({}, ModelObject.DEFAULT_OPTIONS, {
+_BlockObject.DEFAULT_OPTIONS = (0, import_ts_deepmerge6.default)({}, ModelObject.DEFAULT_OPTIONS, {
   applyDefaultState: true
 });
 var BlockObject = _BlockObject;
@@ -4409,7 +4407,7 @@ var StructureParser = class {
 
 // src/renderer/MineRenderScene.ts
 import { Scene as Scene2 } from "three";
-var import_ts_deepmerge9 = __toESM(require_dist());
+var import_ts_deepmerge8 = __toESM(require_dist());
 
 // src/skin/SkinPart.ts
 var SkinPart = /* @__PURE__ */ ((SkinPart2) => {
@@ -5140,7 +5138,7 @@ var slimSkinGeometries = {
 };
 
 // src/skin/scene/SkinObject.ts
-var import_ts_deepmerge8 = __toESM(require_dist());
+var import_ts_deepmerge7 = __toESM(require_dist());
 var SkinObject = class extends SceneObject {
   constructor(options) {
     super();
@@ -5148,7 +5146,7 @@ var SkinObject = class extends SceneObject {
     this.legacy = false;
     this.skinTextureWidth = 64;
     this.skinTextureHeight = 64;
-    this.options = (0, import_ts_deepmerge8.default)({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge7.default)({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
   }
   async init() {
     this.createMeshes();
@@ -5266,7 +5264,7 @@ var _MineRenderScene = class _MineRenderScene extends Scene2 {
         this.dirty = true;
       }
     };
-    this.options = (0, import_ts_deepmerge9.default)({}, _MineRenderScene.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge8.default)({}, _MineRenderScene.DEFAULT_OPTIONS, options ?? {});
   }
   add(...objects) {
     for (const object of objects) {
@@ -5363,15 +5361,15 @@ var _MineRenderScene = class _MineRenderScene extends Scene2 {
     return this.addSceneObject(entity, () => new EntityObject(entity, options), options, parent);
   }
 };
-_MineRenderScene.DEFAULT_OPTIONS = (0, import_ts_deepmerge9.default)({}, {});
+_MineRenderScene.DEFAULT_OPTIONS = (0, import_ts_deepmerge8.default)({}, {});
 var MineRenderScene = _MineRenderScene;
 function isMineRenderScene(obj) {
   return obj.isMineRenderScene;
 }
 
 // src/renderer/Renderer.ts
-import { AxesHelper as AxesHelper3, GridHelper, LinearEncoding, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Vector3 as Vector38, WebGLRenderer } from "three";
-var import_ts_deepmerge10 = __toESM(require_dist());
+import { AxesHelper as AxesHelper3, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, SRGBColorSpace as SRGBColorSpace3, Vector3 as Vector38, WebGLRenderer } from "three";
+var import_ts_deepmerge9 = __toESM(require_dist());
 import Stats from "stats.js";
 import { EffectComposer, RenderPass } from "postprocessing";
 
@@ -6036,7 +6034,7 @@ var _Renderer = class _Renderer {
     this._changeListener = () => {
       this._dirty = true;
     };
-    this.options = (0, import_ts_deepmerge10.default)({}, _Renderer.DEFAULT_OPTIONS, options ?? {});
+    this.options = (0, import_ts_deepmerge9.default)({}, _Renderer.DEFAULT_OPTIONS, options ?? {});
     this._animationLoop = this.animate.bind(this);
     this._frameInterval = this.options.render.fpsLimit > 0 ? 1e3 / this.options.render.fpsLimit : void 0;
     this._scene = this.createScene();
@@ -6085,13 +6083,13 @@ var _Renderer = class _Renderer {
     renderer.setClearColor(0, 0);
     renderer.shadowMap.enabled = true;
     renderer.shadowMap.type = PCFSoftShadowMap;
-    renderer.outputEncoding = LinearEncoding;
+    renderer.outputColorSpace = SRGBColorSpace3;
     renderer.setSize(this.viewWidth, this.viewHeight);
     return renderer;
   }
   createComposer() {
+    if (!this.options.composer.enabled) return void 0;
     const composer = new EffectComposer(this.renderer);
-    if (!this.options.composer.enabled) return composer;
     composer.setSize(this.viewWidth, this.viewHeight);
     composer.addPass(new RenderPass(this.scene, this.camera));
     return composer;
@@ -6189,6 +6187,7 @@ var _Renderer = class _Renderer {
     dispatcher.addEventListener(changeEvent2, this._changeListener);
   }
   resize(width, height) {
+    var _a;
     if (this._disposed) return;
     if (isPerspectiveCamera(this.camera)) {
       this.camera.aspect = width / height;
@@ -6201,7 +6200,7 @@ var _Renderer = class _Renderer {
       this.camera.updateProjectionMatrix();
     }
     this.renderer.setSize(width, height);
-    this.composer.setSize(width, height);
+    (_a = this.composer) == null ? void 0 : _a.setSize(width, height);
     this._dirty = true;
   }
   //<editor-fold desc="RENDER">
@@ -6228,7 +6227,7 @@ var _Renderer = class _Renderer {
    * controls must be managed by their owners.
    */
   dispose() {
-    var _a;
+    var _a, _b;
     if (this._disposed) return;
     this.stop();
     this._disposed = true;
@@ -6261,7 +6260,7 @@ var _Renderer = class _Renderer {
       }
     }
     this._debugHelpers.length = 0;
-    this.composer.dispose();
+    (_b = this.composer) == null ? void 0 : _b.dispose();
     this.renderer.dispose();
     this.renderer.forceContextLoss();
   }
@@ -6282,7 +6281,7 @@ var _Renderer = class _Renderer {
     if (this._stats) {
       this._stats.begin();
     }
-    if (this.options.composer.enabled) {
+    if (this.options.composer.enabled && this.composer) {
       this.composer.render();
     } else {
       this.renderer.render(this.scene, this.camera);
@@ -6326,7 +6325,7 @@ var _Renderer = class _Renderer {
   }
   ///
 };
-_Renderer.DEFAULT_OPTIONS = (0, import_ts_deepmerge10.default)({}, {
+_Renderer.DEFAULT_OPTIONS = (0, import_ts_deepmerge9.default)({}, {
   camera: {
     type: "perspective",
     near: 1,