minerender 2.1.0-alpha.33 → 2.1.0-alpha.34

package/dist/node/index.d.mts

@@ -831,6 +831,8 @@ declare class BlockTints {
 
 interface Instanceable {
     nextInstance(): InstanceReference<SceneObject>;
+    removeInstanceAt(index: number): void;
+    isInstanceActive(index: number, reference: InstanceReference<Instanceable>): boolean;
     getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
     setMatrixAt(index: number, matrix: Matrix4): void;
     setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -843,12 +845,15 @@ interface Instanceable {
 }
 declare function isInstanceable(obj: any): obj is Instanceable;
 
-declare class InstanceReference<T extends Instanceable> implements Transformable {
+declare class InstanceReference<T extends Instanceable> implements Transformable, Disposable {
     readonly instanceable: T;
     readonly index: number;
     readonly isInstanceReference: true;
     constructor(instanceable: T, index: number);
     nextInstance(): InstanceReference<SceneObject>;
+    private get activeInstanceable();
+    removeFromScene(): void;
+    dispose(): void;
     getMatrix(matrix?: Matrix4): Matrix4;
     setMatrix(matrix: Matrix4): void;
     setPositionRotationScale(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -878,7 +883,6 @@ declare class ModelObject extends SceneObject {
     private meshesCreated;
     constructor(originalModel: Model, options?: Partial<ModelObjectOptions>);
     init(): Promise<void>;
-    dispose(): void;
     get textureAtlas(): Maybe<TextureAtlas>;
     protected loadTextures(): Promise<void>;
     protected createMeshes(force?: boolean): void;
@@ -1012,6 +1016,9 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
     private materialCallbacks;
     protected _isInstanced: boolean;
     _instanceCounter: number;
+    protected instanceMesh?: InstancedMesh;
+    private readonly instanceReferences;
+    private readonly freeInstanceIndices;
     constructor(options?: Partial<SceneObjectOptions>);
     set scene(scene: MineRenderScene);
     get scene(): MineRenderScene;
@@ -1051,6 +1058,10 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
     get instanceCounter(): number;
     protected constructInstanceReference(i: number): InstanceReference<SceneObject>;
     nextInstance(): InstanceReference<SceneObject>;
+    isInstanceActive(index: number, reference: InstanceReference<Instanceable>): boolean;
+    removeInstanceAt(index: number): void;
+    private growInstances;
+    protected activeInstanceIndices(): Iterable<number>;
     getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
     setMatrixAt(index: number, matrix: Matrix4): void;
     setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -1091,6 +1102,7 @@ declare class BlockObject extends SceneObject {
     init(): Promise<void>;
     dispose(): void;
     removeFromScene(): void;
+    private clearModels;
     get state(): {
         [key: string]: string;
     };

package/dist/node/index.d.ts

@@ -831,6 +831,8 @@ declare class BlockTints {
 
 interface Instanceable {
     nextInstance(): InstanceReference<SceneObject>;
+    removeInstanceAt(index: number): void;
+    isInstanceActive(index: number, reference: InstanceReference<Instanceable>): boolean;
     getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
     setMatrixAt(index: number, matrix: Matrix4): void;
     setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -843,12 +845,15 @@ interface Instanceable {
 }
 declare function isInstanceable(obj: any): obj is Instanceable;
 
-declare class InstanceReference<T extends Instanceable> implements Transformable {
+declare class InstanceReference<T extends Instanceable> implements Transformable, Disposable {
     readonly instanceable: T;
     readonly index: number;
     readonly isInstanceReference: true;
     constructor(instanceable: T, index: number);
     nextInstance(): InstanceReference<SceneObject>;
+    private get activeInstanceable();
+    removeFromScene(): void;
+    dispose(): void;
     getMatrix(matrix?: Matrix4): Matrix4;
     setMatrix(matrix: Matrix4): void;
     setPositionRotationScale(position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -878,7 +883,6 @@ declare class ModelObject extends SceneObject {
     private meshesCreated;
     constructor(originalModel: Model, options?: Partial<ModelObjectOptions>);
     init(): Promise<void>;
-    dispose(): void;
     get textureAtlas(): Maybe<TextureAtlas>;
     protected loadTextures(): Promise<void>;
     protected createMeshes(force?: boolean): void;
@@ -1012,6 +1016,9 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
     private materialCallbacks;
     protected _isInstanced: boolean;
     _instanceCounter: number;
+    protected instanceMesh?: InstancedMesh;
+    private readonly instanceReferences;
+    private readonly freeInstanceIndices;
     constructor(options?: Partial<SceneObjectOptions>);
     set scene(scene: MineRenderScene);
     get scene(): MineRenderScene;
@@ -1051,6 +1058,10 @@ declare class SceneObject extends Object3D<Object3DEventMap & {
     get instanceCounter(): number;
     protected constructInstanceReference(i: number): InstanceReference<SceneObject>;
     nextInstance(): InstanceReference<SceneObject>;
+    isInstanceActive(index: number, reference: InstanceReference<Instanceable>): boolean;
+    removeInstanceAt(index: number): void;
+    private growInstances;
+    protected activeInstanceIndices(): Iterable<number>;
     getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
     setMatrixAt(index: number, matrix: Matrix4): void;
     setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
@@ -1091,6 +1102,7 @@ declare class BlockObject extends SceneObject {
     init(): Promise<void>;
     dispose(): void;
     removeFromScene(): void;
+    private clearModels;
     get state(): {
         [key: string]: string;
     };

package/dist/node/index.js

@@ -3001,32 +3001,42 @@ var InstanceReference = class {
   nextInstance() {
     return this.instanceable.nextInstance();
   }
+  get activeInstanceable() {
+    if (!this.instanceable.isInstanceActive(this.index, this)) throw new MineRenderError("Instance has been removed");
+    return this.instanceable;
+  }
+  removeFromScene() {
+    if (this.instanceable.isInstanceActive(this.index, this)) this.instanceable.removeInstanceAt(this.index);
+  }
+  dispose() {
+    this.removeFromScene();
+  }
   getMatrix(matrix) {
-    return this.instanceable.getMatrixAt(this.index, matrix);
+    return this.activeInstanceable.getMatrixAt(this.index, matrix);
   }
   setMatrix(matrix) {
-    this.instanceable.setMatrixAt(this.index, matrix);
+    this.activeInstanceable.setMatrixAt(this.index, matrix);
   }
   setPositionRotationScale(position, rotation, scale) {
-    this.instanceable.setPositionRotationScaleAt(this.index, position, rotation, scale);
+    this.activeInstanceable.setPositionRotationScaleAt(this.index, position, rotation, scale);
   }
   setPosition(position) {
-    this.instanceable.setPositionAt(this.index, position);
+    this.activeInstanceable.setPositionAt(this.index, position);
   }
   getPosition() {
-    return this.instanceable.getPositionAt(this.index);
+    return this.activeInstanceable.getPositionAt(this.index);
   }
   setRotation(rotation) {
-    this.instanceable.setRotationAt(this.index, rotation);
+    this.activeInstanceable.setRotationAt(this.index, rotation);
   }
   getRotation() {
-    return this.instanceable.getRotationAt(this.index);
+    return this.activeInstanceable.getRotationAt(this.index);
   }
   setScale(scale) {
-    this.instanceable.setScaleAt(this.index, scale);
+    this.activeInstanceable.setScaleAt(this.index, scale);
   }
   getScale() {
-    return this.instanceable.getScaleAt(this.index);
+    return this.activeInstanceable.getScaleAt(this.index);
   }
   //TODO: support for custom methods e.g. setting block variants
 };
@@ -3044,6 +3054,8 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
     this.materialCallbacks = {};
     this._isInstanced = false;
     this._instanceCounter = 0;
+    this.instanceReferences = /* @__PURE__ */ new Map();
+    this.freeInstanceIndices = [];
     this.options = (0, import_ts_deepmerge3.default)({}, _SceneObject.DEFAULT_OPTIONS, options ?? {});
     console.log("SceneObject options", this.options);
   }
@@ -3147,6 +3159,8 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   createInstancedMesh(name, geometry, material, count) {
     const mesh = new import_three10.InstancedMesh(geometry, material, count);
     mesh.count = 0;
+    this.instanceMesh = mesh;
+    this._isInstanced = true;
     if (name) {
       mesh.name = `mesh:${name}`;
     }
@@ -3214,40 +3228,70 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
     return new InstanceReference(this, i);
   }
   nextInstance() {
-    if (!this.isInstanced) throw new MineRenderError("Object is not instanced");
-    const i = this._instanceCounter++;
-    this.setMatrixAt(i, new import_three10.Matrix4());
-    const mesh = this.children[0];
-    if (mesh && isInstancedMesh(mesh)) {
-      mesh.count = Math.min(this._instanceCounter, mesh.instanceMatrix.count);
-    }
-    console.debug(p6, "nextInstance " + i);
-    if (i === this.options.maxInstanceCount) {
-      console.warn(p6, "Max instance count reached for " + this);
-    }
-    if (this.scene) {
-      this.scene.stats.instanceCount++;
+    const mesh = this.instanceMesh;
+    if (!mesh) throw new MineRenderError("Object is not instanced");
+    const index = this.freeInstanceIndices.pop() ?? mesh.count;
+    if (index >= mesh.instanceMatrix.count) this.growInstances(index + 1);
+    const reference = this.constructInstanceReference(index);
+    this.instanceReferences.set(index, reference);
+    this._instanceCounter = this.instanceReferences.size;
+    mesh.count = Math.max(mesh.count, index + 1);
+    if (mesh.instanceColor) {
+      mesh.setColorAt(index, new import_three10.Color(16777215));
+      mesh.instanceColor.needsUpdate = true;
+    }
+    if (this._scene) this._scene.stats.instanceCount++;
+    this.setMatrixAt(index, new import_three10.Matrix4());
+    return reference;
+  }
+  isInstanceActive(index, reference) {
+    return this.instanceReferences.get(index) === reference;
+  }
+  removeInstanceAt(index) {
+    if (!this.instanceReferences.has(index)) return;
+    const mesh = this.instanceMesh;
+    this.setMatrixAt(index, new import_three10.Matrix4().makeScale(0, 0, 0));
+    this.instanceReferences.delete(index);
+    this.freeInstanceIndices.push(index);
+    this._instanceCounter = this.instanceReferences.size;
+    while (mesh.count > 0 && !this.instanceReferences.has(mesh.count - 1)) mesh.count--;
+    if (this._scene) this._scene.stats.instanceCount--;
+  }
+  growInstances(required) {
+    const mesh = this.instanceMesh;
+    const capacity = Math.max(required, mesh.instanceMatrix.count * 2);
+    const grow = (attribute, fill) => {
+      const array = new Float32Array(capacity * attribute.itemSize).fill(fill);
+      array.set(attribute.array);
+      return new import_three10.InstancedBufferAttribute(array, attribute.itemSize, attribute.normalized, attribute.meshPerAttribute).setUsage(attribute.usage);
+    };
+    const matrix = grow(mesh.instanceMatrix, 0);
+    const color = mesh.instanceColor ? grow(mesh.instanceColor, 1) : null;
+    mesh.dispose();
+    mesh.instanceMatrix = matrix;
+    mesh.instanceColor = color;
+  }
+  *activeInstanceIndices() {
+    if (this.instanceMesh) {
+      yield* this.instanceReferences.keys();
+    } else {
+      for (let i = 0; i < this.instanceCounter; i++) yield i;
     }
-    this.notifyDirty();
-    return this.constructInstanceReference(i);
   }
   //</editor-fold>
   //<editor-fold desc="TRANSFORMATION">
   getMatrixAt(index, matrix = new import_three10.Matrix4()) {
-    if (!this.isInstanced) throw new MineRenderError("Object is not instanced");
-    const child = this.children[0];
-    if (child && isInstancedMesh(child)) {
-      child.getMatrixAt(index, matrix);
-    }
+    if (!this.instanceReferences.has(index)) throw new MineRenderError("Instance is not active");
+    this.instanceMesh.getMatrixAt(index, matrix);
     return matrix;
   }
   setMatrixAt(index, matrix) {
-    if (!this.isInstanced) throw new MineRenderError("Object is not instanced");
-    const child = this.children[0];
-    if (child && isInstancedMesh(child)) {
-      child.setMatrixAt(index, matrix);
-      child.instanceMatrix.needsUpdate = true;
-    }
+    if (!this.instanceReferences.has(index)) throw new MineRenderError("Instance is not active");
+    const mesh = this.instanceMesh;
+    mesh.setMatrixAt(index, matrix);
+    mesh.instanceMatrix.needsUpdate = true;
+    mesh.boundingBox = null;
+    mesh.boundingSphere = null;
     this.notifyDirty();
   }
   setPositionRotationScaleAt(index, position, rotation, scale) {
@@ -3298,7 +3342,7 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   }
   setPositionRotationScale(position, rotation, scale) {
     if (this.isInstanced) {
-      for (let i = 0; i < this.instanceCounter; i++) {
+      for (const i of this.activeInstanceIndices()) {
         this.setPositionRotationScaleAt(i, position, rotation, scale);
       }
     } else {
@@ -3316,7 +3360,7 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   }
   setPosition(position) {
     if (this.isInstanced) {
-      for (let i = 0; i < this.instanceCounter; i++) {
+      for (const i of this.activeInstanceIndices()) {
         this.setPositionRotationScaleAt(i, position);
       }
     } else {
@@ -3326,14 +3370,14 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   }
   getPosition() {
     if (this.isInstanced) {
-      return this.getPositionAt(0);
+      return this.getPositionAt(this.instanceReferences.keys().next().value ?? 0);
     } else {
       return this.position;
     }
   }
   setRotation(rotation) {
     if (this.isInstanced) {
-      for (let i = 0; i < this.instanceCounter; i++) {
+      for (const i of this.activeInstanceIndices()) {
         this.setPositionRotationScaleAt(i, void 0, rotation);
       }
     } else {
@@ -3343,14 +3387,14 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   }
   getRotation() {
     if (this.isInstanced) {
-      return this.getRotationAt(0);
+      return this.getRotationAt(this.instanceReferences.keys().next().value ?? 0);
     } else {
       return this.rotation;
     }
   }
   setScale(scale) {
     if (this.isInstanced) {
-      for (let i = 0; i < this.instanceCounter; i++) {
+      for (const i of this.activeInstanceIndices()) {
         this.setPositionRotationScaleAt(i, void 0, void 0, scale);
       }
     } else {
@@ -3360,7 +3404,7 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
   }
   getScale() {
     if (this.isInstanced) {
-      return this.getScaleAt(0);
+      return this.getScaleAt(this.instanceReferences.keys().next().value ?? 0);
     } else {
       return this.scale;
     }
@@ -3384,6 +3428,17 @@ var SceneObject = class _SceneObject extends import_three10.Object3D {
     this.notifyDirty();
   }
   disposeAndRemoveAllChildren() {
+    if (this.instanceMesh) {
+      if (this._scene) this._scene.stats.instanceCount -= this.instanceReferences.size;
+      this.instanceReferences.clear();
+      this.freeInstanceIndices.length = 0;
+      this._instanceCounter = 0;
+      this.instanceMesh.count = 0;
+      this.instanceMesh.dispose();
+      this.instanceMesh.removeFromParent();
+      this.instanceMesh = void 0;
+      this._isInstanced = false;
+    }
     while (this.children.length > 0) {
       let c = this.children[0];
       if (isDisposable(c)) {
@@ -4596,10 +4651,6 @@ var ModelObject = class _ModelObject extends SceneObject {
     this.createMeshes();
     this.applyTextures();
   }
-  dispose() {
-    super.dispose();
-    this.atlas?.dispose();
-  }
   get textureAtlas() {
     return this.atlas;
   }
@@ -4768,18 +4819,21 @@ var BlockObject = class _BlockObject extends SceneObject {
     }
   }
   dispose() {
+    this.clearModels();
     super.dispose();
   }
   removeFromScene() {
-    for (let model of this._models) {
-      if (isModelObject(model)) {
-        model.removeFromScene();
-      } else if (isInstanceReference(model)) {
-        model.setScale(new import_three18.Vector3(0, 0, 0));
-      }
-    }
+    this.clearModels();
     super.removeFromScene();
   }
+  clearModels() {
+    for (const model of this._models.splice(0)) {
+      model.removeFromScene();
+      if (!isInstanceReference(model)) model.dispose();
+    }
+    this._isInstanced = false;
+    this._instanceCounter = 0;
+  }
   get state() {
     return this._state;
   }
@@ -4828,22 +4882,7 @@ var BlockObject = class _BlockObject extends SceneObject {
     return out;
   }
   async recreateModels() {
-    const instanceInfo = [];
-    if (this.isInstanced) {
-      for (let i = 0; i < this.instanceCounter; i++) {
-        instanceInfo[i] = this.getMatrixAt(i);
-      }
-    }
-    for (let model of this._models) {
-      if (isInstanceReference(model)) {
-        model.setScale(new import_three18.Vector3(0, 0, 0));
-      } else {
-        model.dispose();
-      }
-    }
-    while (this._models.length > 0) {
-      this._models.shift();
-    }
+    this.clearModels();
     const variantsToCreate = await this.mapStateToVariant(this.state);
     this._variants = variantsToCreate;
     for (let blockStateVariant of variantsToCreate) {
@@ -4894,6 +4933,7 @@ var BlockObject = class _BlockObject extends SceneObject {
       this._instanceCounter = 1;
     }
     obj.setRotation(rotation);
+    obj.setPosition(this.position);
     return obj;
   }
   async resetState() {