BatchedMesh: geometry methods, error signatures (#660)

* BatchedMesh: geometry methods, error signatures * Update examples --------- Co-authored-by: Nathan Bierema <nbierema@gmail.com>
three-types · Nov 4, 2023 · 7f83ce3 · 7f83ce3
1 parent 29bdb05
commit 7f83ce3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch
@@ -9207,7 +9207,7 @@ index dfca0ac..bfa38b8 100644
  const spherical = new THREE.Spherical();
  const rotationMatrix = new THREE.Matrix4();
 diff --git a/examples-testing/examples/webgl_mesh_batch.ts b/examples-testing/examples/webgl_mesh_batch.ts
-index 411556f..a92abcb 100644
+index c8e8597..cc3affd 100644
 --- a/examples-testing/examples/webgl_mesh_batch.ts
 +++ b/examples-testing/examples/webgl_mesh_batch.ts
 @@ -6,10 +6,10 @@ import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

diff --git a/three.js b/three.js
diff --git a/types/three/examples/jsm/objects/BatchedMesh.d.ts b/types/three/examples/jsm/objects/BatchedMesh.d.ts
@@ -6,6 +6,12 @@ declare class BatchedMesh extends Mesh<BufferGeometry, Material> {
     _indexStarts: number[];
     _indexCounts: number[];
 
+    _reservedRanges: {
+        vertexStart: number;
+        vertexCount: number;
+        indexStart: number;
+        indexCount: number;
+    }[];
     _visible: boolean[];
     _active: boolean[];
 
@@ -15,9 +21,6 @@ declare class BatchedMesh extends Mesh<BufferGeometry, Material> {
 
     _geometryInitialized: boolean;
     _geometryCount: number;
-    _vertexCount: number;
-    _indexCount: number;
-
     _matrices: Matrix4[];
     _matricesTexture: DataTexture | null;
 
@@ -26,31 +29,28 @@ declare class BatchedMesh extends Mesh<BufferGeometry, Material> {
     constructor(maxGeometryCount: number, maxVertexCount: number, maxIndexCount?: number, material?: Material);
 
     _initMatricesTexture(): void;
-
     _initShader(): void;
-
     _initializeGeometry(reference: BufferGeometry): void;
+    _validateGeometry(geometry: BufferGeometry): void;
 
     getGeometryCount(): number;
-
     getVertexCount(): number;
-
     getIndexCount(): number;
-
-    applyGeometry(geometry: BufferGeometry): number;
-
+    addGeometry(geometry: BufferGeometry, vertexCount?: number, indexCount?: number): number;
+    setGeometryAt(id: number, geometry: BufferGeometry): number;
     deleteGeometry(geometryId: number): this;
 
-    optimize(): never;
-
     setMatrixAt(geometryId: number, matrix: Matrix4): this;
-
     getMatrixAt(geometryId: number, matrix: Matrix4): Matrix4;
-
     setVisibleAt(geometryId: number, value: boolean): this;
-
     getVisibleAt(geometryId: number): boolean;
 
+    // Not implemented
+    optimize(): never;
+    raycast(): void; // no-op
+    copy(): never;
+    toJSON(): never;
+
     dispose(): this;
 }