Merge pull request regl-project#528 from benjamind/delarre/nested-dyn…

…amic-types Nested dynamic types
kfitfk · Sep 12, 2019 · 0cf38ff · 0cf38ff
2 parents 2f9fe61 + 5372146
commit 0cf38ff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/example/typescript/dynamic.ts b/example/typescript/dynamic.ts
@@ -54,6 +54,21 @@ const draw = regl<Uniforms, Attributes, Props>({
     enable: false
   },
 
+  scissor: {
+    enable: true,
+    box: ({ tick, viewportWidth, viewportHeight }) => {
+      const SCISSOR_TIME = 500;
+      const percent = (tick % SCISSOR_TIME) / SCISSOR_TIME;
+      const scaleFactor = (percent >= 0.5 ? 1 - percent : percent) * 2.0;
+      return {
+        x: (viewportWidth / 2) * scaleFactor,
+        y: (viewportHeight / 2) * scaleFactor,
+        width: viewportWidth - viewportWidth * scaleFactor,
+        height: viewportHeight - viewportHeight * scaleFactor
+      };
+    }
+  },
+
   count: 3
 })
 

diff --git a/regl.d.ts b/regl.d.ts
@@ -352,6 +352,9 @@ declare namespace REGL {
     DynamicVariable<Type> |
     DynamicVariableFn<Type, Context, Props>;
 
+  type MaybeNestedDynamic<Type, Context extends REGL.DefaultContext, Props extends {}> =
+    { [K in keyof Type]: MaybeDynamic<Type[K], Context, Props> };
+
   interface ClearOptions {
     /**
      * RGBA values (range 0-1) to use when the color buffer is cleared. Initial value: [0, 0, 0, 0].
@@ -604,7 +607,7 @@ declare namespace REGL {
 
     /* Scissor */
 
-    scissor?: MaybeDynamic<REGL.ScissorOptions, ParentContext & OwnContext, Props>;
+    scissor?: MaybeNestedDynamic<REGL.ScissorOptions, ParentContext & OwnContext, Props>;
 
     /* Viewport */