Merge branch 'master' into master

kingpalethe · Jun 20, 2018 · cbd66d9 · cbd66d9
2 parents f41685c + 5550538
commit cbd66d9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/lib/init-frames.js b/lib/init-frames.js
@@ -115,6 +115,7 @@ module.exports.initScene = async (opts) => {
   scene.transition = {
     name: 'fade',
     duration: 500,
+    params: { },
     ...t
   }
 

diff --git a/lib/render-frames.js b/lib/render-frames.js
@@ -76,7 +76,8 @@ module.exports.renderFrame = async (opts) => {
     await ctx.render({
       imagePathFrom: cFramePath,
       imagePathTo: nFramePath,
-      progress: cProgress
+      progress: cProgress,
+      params: current.transition.params
     })
 
     await ctx.capture(filePath)

diff --git a/lib/transition.js b/lib/transition.js
@@ -32,7 +32,8 @@ module.exports = (opts) => {
     draw: async ({
       imagePathFrom,
       imagePathTo,
-      progress
+      progress,
+      params
     }) => {
       gl.clear(gl.COLOR_BUFFER_BIT)
 
@@ -54,7 +55,7 @@ module.exports = (opts) => {
       textureTo.magFilter = gl.LINEAR
 
       buffer.bind()
-      transition.draw(progress, textureFrom, textureTo)
+      transition.draw(progress, textureFrom, textureTo, gl.drawingBufferWidth, gl.drawingBufferHeight, params)
 
       textureFrom.dispose()
       textureTo.dispose()

diff --git a/readme.md b/readme.md
@@ -97,7 +97,9 @@ await concat({
     },
     {
       name: 'directionalWarp',
-      duration: 500
+      duration: 500,
+      // pass custom params to a transition
+      params: { direction: [ 1, -1 ] }
     },
     {
       name: 'squaresWire',
@@ -148,7 +150,8 @@ Note that you must specify either `transition` or `transitions`, depending on ho
 // example
 const transition = {
   duration: 1000, // ms
-  name: 'directionalwipe' // gl-transition name to use (will match with lower-casing)
+  name: 'directionalwipe', // gl-transition name to use (will match with lower-casing)
+  params: { direction: [1, -1] } // optionally override default parameters
 }
 ```