Fixes for vao instanced bind (#128)

* Unified Buffer's and BufferChannel's bind method * 0.13.3
2gis · Mar 13, 2023 · 4ef7658 · 4ef7658
1 parent 749bcc3
commit 4ef7658
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -89,7 +89,7 @@ declare module '2gl' {
 
     export class BufferChannel {
         constructor(buffer: Buffer, options: Partial<BufferBindOptions>);
-        public bind(gl: WebGLRenderingContext, location?: number): this;
+        public bind(gl: WebGLRenderingContext, location?: number, options?: BufferBindOptions, instancesExt?: ANGLE_instanced_arrays): this;
     }
 
     export interface TextureOptions {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "2gl",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "WebGL library for 2GIS projects",
   "repository": {
     "type": "git",

diff --git a/src/BufferChannel.js b/src/BufferChannel.js
@@ -30,8 +30,8 @@ class BufferChannel {
      * Связывает данные с контекстом WebGL с нужными параметрами.
      * Вызывает {@link Buffer#bind} исходного буфера.
      */
-    bind(gl, location, instancesExt) {
-        this._buffer.bind(gl, location, this.options, instancesExt);
+    bind(gl, location, options, instancesExt) {
+        this._buffer.bind(gl, location, options || this.options, instancesExt);
     }
 }
 

diff --git a/src/Vao.js b/src/Vao.js
@@ -98,7 +98,7 @@ class Vao {
             if (shaderAttribute.index !== true) {
                 gl.enableVertexAttribArray(shaderAttribute.location);
             }
-            attributes[name].bind(gl, shaderAttribute.location, instancesExt);
+            attributes[name].bind(gl, shaderAttribute.location, null, instancesExt);
         }
         if (this.indicesBuffer) {
             this.indicesBuffer.bind(gl);