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

package/dist/browser/index.d.mts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Scene, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, BufferGeometry as BufferGeometry$1, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { AxiosResponse, AxiosRequestConfig } from 'axios';
@@ -7,8 +7,6 @@ import { Buffer as Buffer$1 } from 'buffer';
 import { NBT } from 'prismarine-nbt';
 import { ZipReader } from '@zip.js/zip.js';
 import { AsyncLoadingCache, SimpleCache } from '@inventivetalent/loading-cache';
-import { BufferGeometry } from 'three/src/core/BufferGeometry';
-import { Material as Material$1 } from 'three/src/materials/Material';
 import Stats from 'stats.js';
 import { EffectComposer } from 'postprocessing';
 
@@ -431,7 +429,7 @@ interface Transformable {
 declare function isTransformable(obj: any): obj is Transformable;
 
 declare const changeEvent: {
-    type: string;
+    type: "change";
 };
 type Maybe<T> = T | undefined;
 declare function md5(str: string): string;
@@ -886,7 +884,9 @@ interface MineRenderSceneOptions {
 }
 declare function isMineRenderScene(obj: any): obj is MineRenderScene;
 
-declare class SceneObject extends Object3D implements Disposable, Instanceable, Transformable {
+declare class SceneObject extends Object3D<Object3DEventMap & {
+    change: {};
+}> implements Disposable, Instanceable, Transformable {
     readonly isSceneObject: true;
     static readonly DEFAULT_OPTIONS: SceneObjectOptions;
     readonly options: SceneObjectOptions;
@@ -912,9 +912,9 @@ declare class SceneObject extends Object3D implements Disposable, Instanceable,
      */
     toggleGroupVisibility(name: string, visible?: boolean): boolean;
     protected addOrReplaceMesh(mesh: Mesh, parent: Object3D, name?: string): void;
-    protected createAndAddMesh(name?: string, group?: Object3D, geometry?: BufferGeometry, material?: Material$1 | Material$1[], offsetAxis?: Axis, offset?: number): Mesh;
-    protected createMesh(name?: string, geometry?: BufferGeometry, material?: Material$1 | Material$1[], offsetAxis?: Axis, offset?: number): Mesh;
-    protected createInstancedMesh(name: Maybe<string>, geometry: BufferGeometry, material: Material$1 | Material$1[], count: number): InstancedMesh;
+    protected createAndAddMesh(name?: string, group?: Object3D, geometry?: BufferGeometry, material?: Material | Material[], offsetAxis?: Axis, offset?: number): Mesh;
+    protected createMesh(name?: string, geometry?: BufferGeometry, material?: Material | Material[], offsetAxis?: Axis, offset?: number): Mesh;
+    protected createInstancedMesh(name: Maybe<string>, geometry: BufferGeometry, material: Material | Material[], count: number): InstancedMesh;
     /**
      * Get a mesh by its name
      */
@@ -1319,15 +1319,14 @@ declare class Renderer implements Disposable {
     protected _scene: MineRenderScene;
     protected _camera: Camera;
     protected _renderer: WebGLRenderer;
-    protected _composer: EffectComposer;
+    protected _composer?: EffectComposer;
     protected _controls?: OrbitControls;
     protected _stats?: Stats;
     protected _dirty: boolean;
     protected _animationLoop: any;
-    protected _fpsTimer: any;
-    protected _animationTimer?: NodeJS.Timeout;
-    protected _animationFrame?: number;
+    protected _frameInterval?: number;
     protected _resizeListener?: () => void;
+    private _nextFrameTime?;
     private _disposed;
     private readonly _debugHelpers;
     private readonly _eventDispatchers;
@@ -1336,7 +1335,7 @@ declare class Renderer implements Disposable {
     protected createScene(): MineRenderScene;
     protected createCamera(): Camera;
     protected createRenderer(): WebGLRenderer;
-    protected createComposer(): EffectComposer;
+    protected createComposer(): Maybe<EffectComposer>;
     protected createControls(): Maybe<OrbitControls>;
     init(): void;
     get element(): Maybe<HTMLElement>;
@@ -1345,7 +1344,7 @@ declare class Renderer implements Disposable {
      * Redraws when the dispatcher emits the selected event. Registering the same pair twice has no effect.
      * The renderer removes its listener on disposal; the caller retains ownership of the dispatcher.
      */
-    registerEventDispatcher(dispatcher: EventDispatcher, changeEvent?: string): void;
+    registerEventDispatcher(dispatcher: EventDispatcher<any>, changeEvent?: string): void;
     resize(width: number, height: number): void;
     get dirty(): boolean;
     set dirty(dirty: boolean);
@@ -1365,7 +1364,7 @@ declare class Renderer implements Disposable {
     get scene(): MineRenderScene;
     get camera(): Camera;
     get renderer(): WebGLRenderer;
-    get composer(): EffectComposer;
+    get composer(): Maybe<EffectComposer>;
     /** Renderer-owned controls, or undefined when disabled at construction or after disposal. */
     get controls(): Maybe<OrbitControls>;
 }
@@ -1394,6 +1393,7 @@ interface CameraOptions {
     lookingAt: Vector3 | TripleArray;
 }
 interface RenderOptions {
+    /** Maximum draw rate (60 by default); zero or a negative value disables the limit. */
     fpsLimit: number;
     stats: boolean;
     antialias: boolean;
@@ -1421,7 +1421,7 @@ declare class SceneInspector {
     private selectedObject?;
     constructor(renderer: Renderer);
     protected init(): void;
-    findMeshChildren(from: Object3D, out?: Mesh[]): Mesh<three.BufferGeometry, three.Material | three.Material[]>[];
+    findMeshChildren(from: Object3D, out?: Mesh[]): Mesh<three.BufferGeometry<three.NormalBufferAttributes>, three.Material | three.Material[], three.Object3DEventMap>[];
     onClick(event: any): void;
     appendTo(el: HTMLElement): void;
     protected handleRaycasterObjects(intersections: Intersection[]): void;
@@ -1523,12 +1523,12 @@ declare class Textures {
     static getImage(key: TextureKey): Texture;
 }
 
-declare function mergeBufferGeometries(geometries: BufferGeometry$1[], useGroups?: boolean): BufferGeometry$1;
+declare function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry;
 declare function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;
 declare function interleaveAttributes(attributes: BufferAttribute[]): InterleavedBufferAttribute;
-declare function estimateBytesUsed(geometry: BufferGeometry$1): number;
-declare function mergeVertices(geometry: BufferGeometry$1, tolerance?: number): BufferGeometry$1;
-declare function toTrianglesDrawMode(geometry: BufferGeometry$1, drawMode: TrianglesDrawModes): BufferGeometry$1;
+declare function estimateBytesUsed(geometry: BufferGeometry): number;
+declare function mergeVertices(geometry: BufferGeometry, tolerance?: number): BufferGeometry;
+declare function toTrianglesDrawMode(geometry: BufferGeometry, drawMode: TrianglesDrawModes): BufferGeometry;
 declare function computeMorphedAttributes(object: Mesh | Line | Points): object;
 
 interface BlockInfo {

package/dist/browser/index.d.ts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Scene, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, BufferGeometry as BufferGeometry$1, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { AxiosResponse, AxiosRequestConfig } from 'axios';
@@ -7,8 +7,6 @@ import { Buffer as Buffer$1 } from 'buffer';
 import { NBT } from 'prismarine-nbt';
 import { ZipReader } from '@zip.js/zip.js';
 import { AsyncLoadingCache, SimpleCache } from '@inventivetalent/loading-cache';
-import { BufferGeometry } from 'three/src/core/BufferGeometry';
-import { Material as Material$1 } from 'three/src/materials/Material';
 import Stats from 'stats.js';
 import { EffectComposer } from 'postprocessing';
 
@@ -431,7 +429,7 @@ interface Transformable {
 declare function isTransformable(obj: any): obj is Transformable;
 
 declare const changeEvent: {
-    type: string;
+    type: "change";
 };
 type Maybe<T> = T | undefined;
 declare function md5(str: string): string;
@@ -886,7 +884,9 @@ interface MineRenderSceneOptions {
 }
 declare function isMineRenderScene(obj: any): obj is MineRenderScene;
 
-declare class SceneObject extends Object3D implements Disposable, Instanceable, Transformable {
+declare class SceneObject extends Object3D<Object3DEventMap & {
+    change: {};
+}> implements Disposable, Instanceable, Transformable {
     readonly isSceneObject: true;
     static readonly DEFAULT_OPTIONS: SceneObjectOptions;
     readonly options: SceneObjectOptions;
@@ -912,9 +912,9 @@ declare class SceneObject extends Object3D implements Disposable, Instanceable,
      */
     toggleGroupVisibility(name: string, visible?: boolean): boolean;
     protected addOrReplaceMesh(mesh: Mesh, parent: Object3D, name?: string): void;
-    protected createAndAddMesh(name?: string, group?: Object3D, geometry?: BufferGeometry, material?: Material$1 | Material$1[], offsetAxis?: Axis, offset?: number): Mesh;
-    protected createMesh(name?: string, geometry?: BufferGeometry, material?: Material$1 | Material$1[], offsetAxis?: Axis, offset?: number): Mesh;
-    protected createInstancedMesh(name: Maybe<string>, geometry: BufferGeometry, material: Material$1 | Material$1[], count: number): InstancedMesh;
+    protected createAndAddMesh(name?: string, group?: Object3D, geometry?: BufferGeometry, material?: Material | Material[], offsetAxis?: Axis, offset?: number): Mesh;
+    protected createMesh(name?: string, geometry?: BufferGeometry, material?: Material | Material[], offsetAxis?: Axis, offset?: number): Mesh;
+    protected createInstancedMesh(name: Maybe<string>, geometry: BufferGeometry, material: Material | Material[], count: number): InstancedMesh;
     /**
      * Get a mesh by its name
      */
@@ -1319,15 +1319,14 @@ declare class Renderer implements Disposable {
     protected _scene: MineRenderScene;
     protected _camera: Camera;
     protected _renderer: WebGLRenderer;
-    protected _composer: EffectComposer;
+    protected _composer?: EffectComposer;
     protected _controls?: OrbitControls;
     protected _stats?: Stats;
     protected _dirty: boolean;
     protected _animationLoop: any;
-    protected _fpsTimer: any;
-    protected _animationTimer?: NodeJS.Timeout;
-    protected _animationFrame?: number;
+    protected _frameInterval?: number;
     protected _resizeListener?: () => void;
+    private _nextFrameTime?;
     private _disposed;
     private readonly _debugHelpers;
     private readonly _eventDispatchers;
@@ -1336,7 +1335,7 @@ declare class Renderer implements Disposable {
     protected createScene(): MineRenderScene;
     protected createCamera(): Camera;
     protected createRenderer(): WebGLRenderer;
-    protected createComposer(): EffectComposer;
+    protected createComposer(): Maybe<EffectComposer>;
     protected createControls(): Maybe<OrbitControls>;
     init(): void;
     get element(): Maybe<HTMLElement>;
@@ -1345,7 +1344,7 @@ declare class Renderer implements Disposable {
      * Redraws when the dispatcher emits the selected event. Registering the same pair twice has no effect.
      * The renderer removes its listener on disposal; the caller retains ownership of the dispatcher.
      */
-    registerEventDispatcher(dispatcher: EventDispatcher, changeEvent?: string): void;
+    registerEventDispatcher(dispatcher: EventDispatcher<any>, changeEvent?: string): void;
     resize(width: number, height: number): void;
     get dirty(): boolean;
     set dirty(dirty: boolean);
@@ -1365,7 +1364,7 @@ declare class Renderer implements Disposable {
     get scene(): MineRenderScene;
     get camera(): Camera;
     get renderer(): WebGLRenderer;
-    get composer(): EffectComposer;
+    get composer(): Maybe<EffectComposer>;
     /** Renderer-owned controls, or undefined when disabled at construction or after disposal. */
     get controls(): Maybe<OrbitControls>;
 }
@@ -1394,6 +1393,7 @@ interface CameraOptions {
     lookingAt: Vector3 | TripleArray;
 }
 interface RenderOptions {
+    /** Maximum draw rate (60 by default); zero or a negative value disables the limit. */
     fpsLimit: number;
     stats: boolean;
     antialias: boolean;
@@ -1421,7 +1421,7 @@ declare class SceneInspector {
     private selectedObject?;
     constructor(renderer: Renderer);
     protected init(): void;
-    findMeshChildren(from: Object3D, out?: Mesh[]): Mesh<three.BufferGeometry, three.Material | three.Material[]>[];
+    findMeshChildren(from: Object3D, out?: Mesh[]): Mesh<three.BufferGeometry<three.NormalBufferAttributes>, three.Material | three.Material[], three.Object3DEventMap>[];
     onClick(event: any): void;
     appendTo(el: HTMLElement): void;
     protected handleRaycasterObjects(intersections: Intersection[]): void;
@@ -1523,12 +1523,12 @@ declare class Textures {
     static getImage(key: TextureKey): Texture;
 }
 
-declare function mergeBufferGeometries(geometries: BufferGeometry$1[], useGroups?: boolean): BufferGeometry$1;
+declare function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry;
 declare function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;
 declare function interleaveAttributes(attributes: BufferAttribute[]): InterleavedBufferAttribute;
-declare function estimateBytesUsed(geometry: BufferGeometry$1): number;
-declare function mergeVertices(geometry: BufferGeometry$1, tolerance?: number): BufferGeometry$1;
-declare function toTrianglesDrawMode(geometry: BufferGeometry$1, drawMode: TrianglesDrawModes): BufferGeometry$1;
+declare function estimateBytesUsed(geometry: BufferGeometry): number;
+declare function mergeVertices(geometry: BufferGeometry, tolerance?: number): BufferGeometry;
+declare function toTrianglesDrawMode(geometry: BufferGeometry, drawMode: TrianglesDrawModes): BufferGeometry;
 declare function computeMorphedAttributes(object: Mesh | Line | Points): object;
 
 interface BlockInfo {

package/dist/browser/index.js

@@ -631,6 +631,7 @@ var import_three5 = require("three");
 
 // src/texture/TextureLoader.ts
 var import_three4 = require("three");
+var THREE = __toESM(require("three"));
 
 // src/canvas/CanvasCompat.ts
 function createImage(width, height) {
@@ -1019,6 +1020,7 @@ var TextureLoader = class {
   }
   static loadInBackground(src, format = import_three4.RGBAFormat, rotation = 0) {
     const texture = this.createTexture();
+    texture.colorSpace = THREE.SRGBColorSpace;
     const image = ImageLoader.loadElement(src);
     image.onload = function() {
       texture.needsUpdate = true;
@@ -1030,6 +1032,7 @@ var TextureLoader = class {
   }
   static load(src, format = import_three4.RGBAFormat, rotation = 0) {
     const texture = new import_three4.Texture();
+    texture.colorSpace = THREE.SRGBColorSpace;
     ImageLoader.getData(src).then((image) => {
       texture.needsUpdate = true;
       texture.image = image;
@@ -1041,11 +1044,11 @@ var TextureLoader = class {
 };
 
 // src/texture/Textures.ts
-var THREE = __toESM(require("three"));
+var THREE2 = __toESM(require("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;
   }
@@ -1056,7 +1059,9 @@ var Textures = class _Textures {
     return new import_three5.Texture();
   }
   static createCanvasTexture(canvas) {
-    return this.initTextureProps(new import_three5.CanvasTexture(canvas));
+    const texture = new import_three5.CanvasTexture(canvas);
+    texture.colorSpace = THREE2.SRGBColorSpace;
+    return this.initTextureProps(texture);
   }
   static getImage(key) {
     const keyStr = serializeTextureKey(key);
@@ -1173,6 +1178,9 @@ var _Materials = class _Materials {
                     gl_FragColor = vec4(lift + color.rgb * light2, 1.0);
 
                 }
+
+                #include <tonemapping_fragment>
+                #include <colorspace_fragment>
             }
         `;
     try {
@@ -3047,7 +3055,7 @@ function isSceneObject(obj) {
 // src/entity/scene/EntityObject.ts
 var import_ts_deepmerge5 = __toESM(require_dist());
 var import_three11 = require("three");
-var THREE2 = __toESM(require("three"));
+var THREE3 = __toESM(require("three"));
 var EntityObject = class extends SceneObject {
   constructor(entity, options) {
     super();
@@ -3091,8 +3099,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);
@@ -6190,8 +6198,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 = [];
@@ -6201,7 +6207,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();
@@ -6248,13 +6254,13 @@ var _Renderer = class _Renderer {
     renderer.setClearColor(0, 0);
     renderer.shadowMap.enabled = true;
     renderer.shadowMap.type = import_three19.PCFSoftShadowMap;
-    renderer.outputEncoding = import_three19.LinearEncoding;
+    renderer.outputColorSpace = import_three19.SRGBColorSpace;
     renderer.setSize(this.viewWidth, this.viewHeight);
     return renderer;
   }
   createComposer() {
+    if (!this.options.composer.enabled) return void 0;
     const composer = new import_postprocessing.EffectComposer(this.renderer);
-    if (!this.options.composer.enabled) return composer;
     composer.setSize(this.viewWidth, this.viewHeight);
     composer.addPass(new import_postprocessing.RenderPass(this.scene, this.camera));
     return composer;
@@ -6363,7 +6369,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">
@@ -6382,12 +6388,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
@@ -6427,25 +6428,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) {