minerender 2.1.0-alpha.3 → 2.1.0-alpha.5

package/dist/browser/index.mjs

@@ -477,6 +477,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) {
@@ -865,6 +866,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;
@@ -876,6 +878,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;
@@ -887,11 +890,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;
   }
@@ -902,7 +905,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);
@@ -1019,6 +1024,9 @@ var _Materials = class _Materials {
                     gl_FragColor = vec4(lift + color.rgb * light2, 1.0);
 
                 }
+
+                #include <tonemapping_fragment>
+                #include <colorspace_fragment>
             }
         `;
     try {
@@ -2893,7 +2901,7 @@ function isSceneObject(obj) {
 // src/entity/scene/EntityObject.ts
 var import_ts_deepmerge5 = __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();
@@ -2937,8 +2945,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);
@@ -5395,7 +5403,7 @@ function isMineRenderScene(obj) {
 }
 
 // src/renderer/Renderer.ts
-import { AxesHelper as AxesHelper3, GridHelper, LinearEncoding, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Vector3 as Vector38, WebGLRenderer } from "three";
+import { AxesHelper as AxesHelper3, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, SRGBColorSpace as SRGBColorSpace3, Vector3 as Vector38, WebGLRenderer } from "three";
 var import_ts_deepmerge10 = __toESM(require_dist());
 import Stats from "stats.js";
 import { EffectComposer, RenderPass } from "postprocessing";
@@ -6054,8 +6062,6 @@ var MapControls = class extends OrbitControls {
 var _Renderer = class _Renderer {
   constructor(options) {
     this._dirty = true;
-    this._animationTimer = void 0;
-    this._animationFrame = void 0;
     this._resizeListener = void 0;
     this._disposed = false;
     this._debugHelpers = [];
@@ -6065,7 +6071,7 @@ var _Renderer = class _Renderer {
     };
     this.options = (0, import_ts_deepmerge10.default)({}, _Renderer.DEFAULT_OPTIONS, options ?? {});
     this._animationLoop = this.animate.bind(this);
-    this._fpsTimer = this.options.render.fpsLimit > 0 ? 1e3 / this.options.render.fpsLimit : void 0;
+    this._frameInterval = this.options.render.fpsLimit > 0 ? 1e3 / this.options.render.fpsLimit : void 0;
     this._scene = this.createScene();
     this._camera = this.createCamera();
     this._renderer = this.createRenderer();
@@ -6112,13 +6118,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;
@@ -6227,7 +6233,7 @@ var _Renderer = class _Renderer {
       this.camera.updateProjectionMatrix();
     }
     this.renderer.setSize(width, height);
-    this.composer.setSize(width, height);
+    this.composer?.setSize(width, height);
     this._dirty = true;
   }
   //<editor-fold desc="RENDER">
@@ -6246,12 +6252,7 @@ var _Renderer = class _Renderer {
   stop() {
     if (this._disposed) return;
     this.renderer.setAnimationLoop(null);
-    if (this._animationTimer)
-      clearTimeout(this._animationTimer);
-    this._animationTimer = void 0;
-    if (this._animationFrame)
-      cancelAnimationFrame(this._animationFrame);
-    this._animationFrame = void 0;
+    this._nextFrameTime = void 0;
   }
   /**
    * Stops rendering and releases owned resources. Repeated calls have no effect, and a disposed
@@ -6291,25 +6292,30 @@ var _Renderer = class _Renderer {
       }
     }
     this._debugHelpers.length = 0;
-    this.composer.dispose();
+    this.composer?.dispose();
     this.renderer.dispose();
     this.renderer.forceContextLoss();
   }
-  animate(t) {
+  animate(t = performance.now()) {
     if (this._disposed) return;
-    if (this._stats) {
-      this._stats.begin();
-    }
     if (this._controls?.enabled) {
       this._controls.update();
     }
     if (this._disposed) return;
-    if (this.dirty || this.options.render.renderAlways) {
-      if (this.options.composer.enabled) {
-        this.composer.render();
-      } else {
-        this.renderer.render(this.scene, this.camera);
-      }
+    if (!this.dirty && !this.options.render.renderAlways) return;
+    const interval = this._frameInterval;
+    if (interval) {
+      const next = this._nextFrameTime;
+      if (next !== void 0 && t + 0.1 < next) return;
+      this._nextFrameTime = next !== void 0 && t - next < interval ? next + interval : t + interval;
+    }
+    if (this._stats) {
+      this._stats.begin();
+    }
+    if (this.options.composer.enabled && this.composer) {
+      this.composer.render();
+    } else {
+      this.renderer.render(this.scene, this.camera);
     }
     this.dirty = false;
     if (this._stats) {