feat(webgl): add DrawMode enums

thi-ng · Mar 9, 2020 · 5adaa23 · 5adaa23
1 parent c742fae
commit 5adaa23
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/packages/webgl/src/api/model.ts b/packages/webgl/src/api/model.ts
@@ -4,6 +4,16 @@ import type { IndexBufferSpec, IWebGLBuffer } from "./buffers";
 import type { AttribBufferData, IShader, UniformValues } from "./shader";
 import type { ITexture } from "./texture";
 
+export const enum DrawMode {
+    POINTS = 0,
+    LINES = 1,
+    LINE_LOOP = 2,
+    LINE_STRIP = 3,
+    TRIANGLES = 4,
+    TRIANGLE_STRIP = 5,
+    TRIANGLE_FAN = 6
+}
+
 export type ModelAttributeSpecs = IObjectOf<ModelAttributeSpec>;
 
 export interface ModelSpec {
@@ -41,7 +51,7 @@ export interface ModelSpec {
     /**
      * WebGL draw mode. Defaults to `TRIANGLES`
      */
-    mode?: GLenum;
+    mode?: DrawMode;
     /**
      * Number of vertices/indices to draw
      */

diff --git a/packages/webgl/src/buffer.ts b/packages/webgl/src/buffer.ts
@@ -1,9 +1,14 @@
 import { AttribPool } from "@thi.ng/vector-pools";
+import {
+    DrawMode,
+    ModelAttributeSpec,
+    ModelAttributeSpecs,
+    ModelSpec
+} from "./api/model";
 import { isGL2Context } from "./checks";
 import { error } from "./error";
 import type { TypedArray } from "@thi.ng/api";
 import type { IndexBufferSpec, IWebGLBuffer } from "./api/buffers";
-import type { ModelAttributeSpec, ModelAttributeSpecs, ModelSpec } from "./api/model";
 
 export class WebGLArrayBuffer<T extends TypedArray> implements IWebGLBuffer<T> {
     gl: WebGLRenderingContext;
@@ -78,7 +83,7 @@ export const compileModel = (
     }
     spec.instances && compileAttribs(gl, spec.instances.attribs, mode);
     compileIndices(gl, spec.indices, mode);
-    spec.mode == null && (spec.mode = gl.TRIANGLES);
+    spec.mode == null && (spec.mode = DrawMode.TRIANGLES);
     // TODO auto-create VAO & inject into model spec?
     return spec;
 };

diff --git a/packages/webgl/src/geo/cube.ts b/packages/webgl/src/geo/cube.ts
@@ -1,4 +1,4 @@
-import type { ModelSpec } from "../api/model";
+import { DrawMode, ModelSpec } from "../api/model";
 
 export interface CubeOpts {
     size: number;
@@ -21,6 +21,7 @@ export const cube = (opts?: Partial<CubeOpts>) => {
         },
         uniforms: {},
         shader: <any>null,
+        mode: DrawMode.TRIANGLES,
         num: 36
     };
     opts.normal && (spec.attribs.normal = {

diff --git a/packages/webgl/src/geo/quad.ts b/packages/webgl/src/geo/quad.ts
@@ -1,4 +1,4 @@
-import type { ModelSpec } from "../api/model";
+import { DrawMode, ModelSpec } from "../api/model";
 
 export const quad = (uv = true): ModelSpec => ({
     attribs: {
@@ -17,6 +17,6 @@ export const quad = (uv = true): ModelSpec => ({
     },
     uniforms: {},
     shader: <any>null,
-    mode: 5, // TRIANGLE_STRIP,
+    mode: DrawMode.TRIANGLE_STRIP,
     num: 4
 });