fix(webgl): apply ModelSpec mode in compileModel, fix/simplify draw fns

thi-ng · May 26, 2019 · 67334a6 · 67334a6
1 parent 10a337e
commit 67334a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/webgl/src/buffer.ts b/packages/webgl/src/buffer.ts
@@ -81,6 +81,7 @@ export const compileModel = (
     }
     spec.instances && compileAttribs(gl, spec.instances.attribs, mode);
     compileIndices(gl, spec.indices, mode);
+    spec.mode == null && (spec.mode = gl.TRIANGLES);
     // TODO auto-create VAO & inject into model spec?
     return spec;
 };

diff --git a/packages/webgl/src/draw.ts b/packages/webgl/src/draw.ts
@@ -19,7 +19,7 @@ export const draw = (specs: ModelSpec | ModelSpec[]) => {
                 drawInstanced(gl, spec);
             } else {
                 gl.drawElements(
-                    spec.mode || gl.TRIANGLES,
+                    spec.mode,
                     spec.num,
                     indices.data instanceof Uint32Array
                         ? gl.UNSIGNED_INT
@@ -31,7 +31,7 @@ export const draw = (specs: ModelSpec | ModelSpec[]) => {
             if (spec.instances) {
                 drawInstanced(gl, spec);
             } else {
-                gl.drawArrays(spec.mode || gl.TRIANGLES, 0, spec.num);
+                gl.drawArrays(spec.mode, 0, spec.num);
             }
         }
         spec.shader.unbind(null);
@@ -60,22 +60,21 @@ const drawInstanced = (gl: WebGLRenderingContext, spec: ModelSpec) => {
                 : ext.vertexAttribDivisorANGLE(attr.loc, div);
         }
     }
-    const mode = spec.mode || gl.TRIANGLES;
     if (spec.indices) {
         const type =
             spec.indices.data instanceof Uint32Array
                 ? gl.UNSIGNED_INT
                 : gl.UNSIGNED_SHORT;
         isGL2
             ? (<WebGL2RenderingContext>gl).drawElementsInstanced(
-                  mode,
+                  spec.mode,
                   spec.num,
                   type,
                   0,
                   spec.instances.num
               )
             : ext.drawElementsInstancedANGLE(
-                  mode,
+                  spec.mode,
                   spec.num,
                   type,
                   0,
@@ -84,13 +83,13 @@ const drawInstanced = (gl: WebGLRenderingContext, spec: ModelSpec) => {
     } else {
         isGL2
             ? (<WebGL2RenderingContext>gl).drawArraysInstanced(
-                  mode,
+                  spec.mode,
                   0,
                   spec.num,
                   spec.instances.num
               )
             : ext.drawArraysInstancedANGLE(
-                  mode,
+                  spec.mode,
                   0,
                   spec.num,
                   spec.instances.num