feat(webgl): add webgl resource factory fns, update buffer() arg order

thi-ng · Apr 5, 2019 · 131e551 · 131e551
1 parent ab81ed4
commit 131e551
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/packages/webgl/src/buffer.ts b/packages/webgl/src/buffer.ts
@@ -14,9 +14,9 @@ export class WebGLArrayBuffer<T extends TypedArray> implements IWebGLBuffer<T> {
 
     constructor(
         gl: WebGLRenderingContext,
+        data?: T,
         target = gl.ARRAY_BUFFER,
-        mode = gl.STATIC_DRAW,
-        data?: T
+        mode = gl.STATIC_DRAW
     ) {
         this.gl = gl;
         this.buffer = gl.createBuffer();
@@ -54,7 +54,14 @@ export class WebGLArrayBuffer<T extends TypedArray> implements IWebGLBuffer<T> {
     }
 }
 
-export const compileBuffers = (
+export const buffer = (
+    gl: WebGLRenderingContext,
+    data?: TypedArray,
+    target = gl.ARRAY_BUFFER,
+    mode = gl.STATIC_DRAW
+) => new WebGLArrayBuffer(gl, data, target, mode);
+
+export const compileModel = (
     gl: WebGLRenderingContext,
     spec: ModelSpec,
     mode = gl.STATIC_DRAW
@@ -79,9 +86,9 @@ const compileAttribs = (
             } else {
                 attr.buffer = new WebGLArrayBuffer(
                     gl,
+                    attr.data,
                     gl.ARRAY_BUFFER,
-                    mode,
-                    attr.data
+                    mode
                 );
             }
         }
@@ -99,9 +106,9 @@ const compileIndices = (
     } else {
         index.buffer = new WebGLArrayBuffer(
             gl,
+            index.data,
             gl.ELEMENT_ARRAY_BUFFER,
-            mode,
-            index.data
+            mode
         );
     }
 };
diff --git a/packages/webgl/src/fbo.ts b/packages/webgl/src/fbo.ts
@@ -121,3 +121,6 @@ export class FBO implements IFbo {
         }
     }
 }
+
+export const fbo = (gl: WebGLRenderingContext, opts?: Partial<FboOpts>) =>
+    new FBO(gl, opts);
diff --git a/packages/webgl/src/renderbuffer.ts b/packages/webgl/src/renderbuffer.ts
@@ -55,3 +55,8 @@ export class RenderBuffer implements IRenderBuffer {
         return true;
     }
 }
+
+export const renderBuffer = (
+    gl: WebGLRenderingContext,
+    opts?: Partial<RenderBufferOpts>
+) => new RenderBuffer(gl, opts);
diff --git a/packages/webgl/src/shader.ts b/packages/webgl/src/shader.ts
@@ -182,7 +182,7 @@ export class Shader implements IShader {
         }
     }
 
-    setState(id: number, val: GLenum | boolean) {
+    protected setState(id: number, val: GLenum | boolean) {
         if (val) {
             this.gl.enable(id);
         } else {
@@ -191,6 +191,9 @@ export class Shader implements IShader {
     }
 }
 
+export const shader = (gl: WebGLRenderingContext, spec: ShaderSpec) =>
+    Shader.fromSpec(gl, spec);
+
 const compileVars = (
     attribs: any,
     syntax: Fn3<string, any, GLSLDeclPrefixes, string>,

diff --git a/packages/webgl/src/texture.ts b/packages/webgl/src/texture.ts
@@ -111,3 +111,8 @@ export class Texture implements ITexture {
         return false;
     }
 }
+
+export const texture = (
+    gl: WebGLRenderingContext,
+    opts?: Partial<TextureOpts>
+) => new Texture(gl, opts);