refactor(webgl-shadertoy): update to new webgl API

thi-ng · Mar 28, 2020 · 40dd67b · 40dd67b
1 parent 633f693
commit 40dd67b
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/packages/webgl-shadertoy/src/shadertoy.ts b/packages/webgl-shadertoy/src/shadertoy.ts
@@ -4,27 +4,22 @@ import {
     defn,
     FLOAT0,
     FLOAT1,
-    vec4
+    vec4,
 } from "@thi.ng/shader-ast";
-import {
-    compileModel,
-    draw,
-    quad,
-    shader
-} from "@thi.ng/webgl";
+import { compileModel, defQuadModel, defShader, draw } from "@thi.ng/webgl";
 import type {
     MainImageFn,
     ShaderToy,
     ShaderToyOpts,
-    ShaderToyUniforms
+    ShaderToyUniforms,
 } from "./api";
 
 export const shaderToy = <U extends ShaderToyUniforms>(
     opts: ShaderToyOpts<U>
 ) => {
     const gl = opts.gl;
 
-    const model = quad(false);
+    const model = defQuadModel(false);
     model.textures = opts.textures || [];
     compileModel(gl, model);
 
@@ -33,7 +28,7 @@ export const shaderToy = <U extends ShaderToyUniforms>(
         const dpr = window.devicePixelRatio;
         model.uniforms!.mouse = [
             (e.clientX - rect.left) * dpr,
-            (rect.height - (e.clientY - rect.top)) * dpr
+            (rect.height - (e.clientY - rect.top)) * dpr,
         ];
     });
     opts.canvas.addEventListener("mousedown", (e) => {
@@ -77,14 +72,14 @@ export const shaderToy = <U extends ShaderToyUniforms>(
             if (model.shader) {
                 model.shader.release();
             }
-            model.shader = shader(gl, {
+            model.shader = defShader(gl, {
                 vs: (gl, _, ins) => [
                     defMain(() => [
                         assign(
                             gl.gl_Position,
                             vec4(ins.position, FLOAT0, FLOAT1)
-                        )
-                    ])
+                        ),
+                    ]),
                 ],
                 fs: (gl, unis, _, outputs) => [
                     defMain(() => [
@@ -93,22 +88,22 @@ export const shaderToy = <U extends ShaderToyUniforms>(
                             defn("vec4", "mainImage", [], () =>
                                 main(gl, <any>unis)
                             )()
-                        )
-                    ])
+                        ),
+                    ]),
                 ],
                 attribs: {
-                    position: "vec2"
+                    position: "vec2",
                 },
                 uniforms: {
                     resolution: "vec2",
                     mouse: ["vec2", [0, 0]],
                     mouseButtons: ["int", 0],
                     time: "float",
-                    ...opts.uniforms
-                }
+                    ...opts.uniforms,
+                },
             });
         },
-        model
+        model,
     };
     instance.recompile(opts.main);
     return instance;