etro 0.7.0 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (106) hide show
  1. package/.github/workflows/nodejs.yml +1 -1
  2. package/CHANGELOG.md +45 -1
  3. package/CONTRIBUTING.md +23 -19
  4. package/README.md +81 -26
  5. package/dist/effect/base.d.ts +38 -0
  6. package/dist/effect/brightness.d.ts +16 -0
  7. package/dist/effect/channels.d.ts +23 -0
  8. package/dist/effect/chroma-key.d.ts +23 -0
  9. package/dist/effect/contrast.d.ts +15 -0
  10. package/dist/effect/elliptical-mask.d.ts +31 -0
  11. package/dist/effect/gaussian-blur.d.ts +60 -0
  12. package/dist/effect/grayscale.d.ts +7 -0
  13. package/dist/effect/index.d.ts +15 -0
  14. package/dist/effect/pixelate.d.ts +18 -0
  15. package/dist/effect/shader.d.ts +99 -0
  16. package/dist/effect/stack.d.ts +23 -0
  17. package/dist/effect/transform.d.ts +73 -0
  18. package/dist/etro-cjs.js +9337 -3331
  19. package/dist/etro-iife.js +9279 -3273
  20. package/dist/etro.d.ts +7 -0
  21. package/dist/event.d.ts +35 -0
  22. package/dist/index.d.ts +6 -0
  23. package/dist/layer/audio-source.d.ts +24 -0
  24. package/dist/layer/audio.d.ts +14 -0
  25. package/dist/layer/base.d.ts +69 -0
  26. package/dist/layer/image.d.ts +6 -0
  27. package/dist/layer/index.d.ts +11 -0
  28. package/dist/layer/text.d.ts +60 -0
  29. package/dist/layer/video.d.ts +11 -0
  30. package/dist/layer/visual-source.d.ts +32 -0
  31. package/dist/layer/visual.d.ts +58 -0
  32. package/dist/movie.d.ts +192 -0
  33. package/dist/object.d.ts +12 -0
  34. package/dist/util.d.ts +125 -0
  35. package/eslint.conf.js +0 -8
  36. package/eslint.example-conf.js +9 -0
  37. package/eslint.typescript-conf.js +5 -0
  38. package/examples/application/readme-screenshot.html +12 -9
  39. package/examples/application/video-player.html +7 -7
  40. package/examples/application/webcam.html +6 -6
  41. package/examples/introduction/audio.html +30 -18
  42. package/examples/introduction/effects.html +14 -10
  43. package/examples/introduction/export.html +32 -25
  44. package/examples/introduction/functions.html +6 -4
  45. package/examples/introduction/hello-world1.html +9 -5
  46. package/examples/introduction/hello-world2.html +5 -5
  47. package/examples/introduction/keyframes.html +35 -23
  48. package/examples/introduction/media.html +26 -18
  49. package/examples/introduction/text.html +9 -5
  50. package/karma.conf.js +1 -1
  51. package/package.json +29 -13
  52. package/rollup.config.js +15 -4
  53. package/scripts/gen-effect-samples.html +29 -25
  54. package/scripts/save-effect-samples.js +14 -15
  55. package/spec/assets/effect/gaussian-blur-horizontal.png +0 -0
  56. package/spec/assets/effect/gaussian-blur-vertical.png +0 -0
  57. package/spec/assets/effect/grayscale.png +0 -0
  58. package/spec/assets/effect/original.png +0 -0
  59. package/spec/assets/effect/pixelate.png +0 -0
  60. package/spec/assets/effect/transform/multiply.png +0 -0
  61. package/spec/assets/effect/transform/rotate.png +0 -0
  62. package/spec/assets/effect/transform/scale-fraction.png +0 -0
  63. package/spec/assets/effect/transform/scale.png +0 -0
  64. package/spec/assets/effect/transform/translate-fraction.png +0 -0
  65. package/spec/assets/effect/transform/translate.png +0 -0
  66. package/spec/effect.spec.js +126 -57
  67. package/spec/event.spec.js +14 -0
  68. package/spec/layer.spec.js +175 -18
  69. package/spec/movie.spec.js +191 -7
  70. package/spec/util.spec.js +14 -5
  71. package/src/effect/base.ts +96 -0
  72. package/src/effect/brightness.ts +43 -0
  73. package/src/effect/channels.ts +50 -0
  74. package/src/effect/chroma-key.ts +82 -0
  75. package/src/effect/contrast.ts +42 -0
  76. package/src/effect/elliptical-mask.ts +75 -0
  77. package/src/effect/gaussian-blur.ts +232 -0
  78. package/src/effect/grayscale.ts +34 -0
  79. package/src/effect/index.ts +22 -0
  80. package/src/effect/pixelate.ts +59 -0
  81. package/src/effect/shader.ts +561 -0
  82. package/src/effect/stack.ts +74 -0
  83. package/src/effect/transform.ts +194 -0
  84. package/src/etro.ts +26 -0
  85. package/src/event.ts +118 -0
  86. package/src/index.ts +8 -0
  87. package/src/layer/audio-source.ts +217 -0
  88. package/src/layer/audio.ts +35 -0
  89. package/src/layer/base.ts +156 -0
  90. package/src/layer/image.ts +8 -0
  91. package/src/layer/index.ts +13 -0
  92. package/src/layer/text.ts +138 -0
  93. package/src/layer/video.ts +15 -0
  94. package/src/layer/visual-source.ts +150 -0
  95. package/src/layer/visual.ts +198 -0
  96. package/src/movie.ts +709 -0
  97. package/src/object.ts +14 -0
  98. package/src/util.ts +473 -0
  99. package/tsconfig.json +8 -0
  100. package/screenshots/2019-08-17_0.png +0 -0
  101. package/src/effect.js +0 -1268
  102. package/src/event.js +0 -78
  103. package/src/index.js +0 -23
  104. package/src/layer.js +0 -897
  105. package/src/movie.js +0 -637
  106. package/src/util.js +0 -505
package/eslint.conf.js CHANGED
@@ -14,15 +14,7 @@ module.exports = {
14
14
  ecmaVersion: 2018,
15
15
  sourceType: 'module'
16
16
  },
17
- plugins: [
18
- 'html'
19
- ],
20
17
  rules: {
21
18
  'brace-style': ['error', '1tbs', { allowSingleLine: false }]
22
19
  },
23
- settings: {
24
- html: {
25
- indent: '+2'
26
- }
27
- }
28
20
  }
@@ -0,0 +1,9 @@
1
+ const conf = require('./eslint.conf.js')
2
+ conf.globals.etro = 'readonly'
3
+ conf.plugins = ['html']
4
+ conf.settings = {
5
+ html: {
6
+ indent: '+2'
7
+ }
8
+ }
9
+ module.exports = conf
@@ -0,0 +1,5 @@
1
+ const conf = require('./eslint.conf.js')
2
+ conf.extends.push('plugin:@typescript-eslint/recommended')
3
+ conf.parser = '@typescript-eslint/parser'
4
+ conf.plugins = ['@typescript-eslint']
5
+ module.exports = conf
@@ -3,17 +3,17 @@
3
3
  <html>
4
4
  <head>
5
5
  <title>Fun with Etro</title>
6
+ <script src="../../dist/etro-iife.js"></script>
6
7
  </head>
7
8
  <body>
8
- <script type="module">
9
- import etro from '../../src/index.js'
9
+ <script>
10
10
  const cols = 2; const rows = 2
11
11
  let movie, sample
12
12
 
13
13
  const begin = () => {
14
14
  const canvas = document.createElement('canvas')
15
15
  document.body.appendChild(canvas)
16
- movie = new etro.Movie(canvas)
16
+ movie = new etro.Movie({ canvas })
17
17
  etro.event.subscribe(movie, 'movie.timeupdate', () => {
18
18
  if (movie.currentTime >= 11) {
19
19
  movie.pause()
@@ -21,7 +21,7 @@
21
21
  })
22
22
 
23
23
  sample = document.createElement('video')
24
- sample.src = '../assets/sample.ogv'
24
+ sample.src = '../assets/desert.mp4'
25
25
 
26
26
  sample.onloadedmetadata = addLayers
27
27
  }
@@ -35,7 +35,7 @@
35
35
  for (let y = 0; y < movie.height; y += height) {
36
36
  for (let x = 0; x < movie.width; x += width) {
37
37
  const video = document.createElement('video')
38
- video.src = '../assets/sample.ogv'
38
+ video.src = '../assets/desert.mp4'
39
39
  if (x * y) {
40
40
  video.onplay = event => {
41
41
  console.log(event)
@@ -43,9 +43,9 @@
43
43
  }
44
44
 
45
45
  video.onloadedmetadata = () => {
46
- const layer = new etro.layer.Video(0, video, {
47
- x: x, y: y, width: width, height: height
48
- // mediaStartTime: 0
46
+ const layer = new etro.layer.Video({
47
+ startTime: 0, source: video, x, y, width, height
48
+ // sourceStartTime: 0
49
49
  }).addEffect(new etro.effect.Channels({
50
50
  r: 0.5 + Math.random() * 0.5,
51
51
  g: 0.5 + Math.random() * 0.5,
@@ -64,7 +64,10 @@
64
64
 
65
65
  const end = () => {
66
66
  movie
67
- .addLayer(new etro.layer.Text(0, sample.duration, 'etro', {
67
+ .addLayer(new etro.layer.Text({
68
+ startTime: 0,
69
+ duration: sample.duration,
70
+ text: 'etro',
68
71
  width: movie.width / 2,
69
72
  height: movie.height / 2,
70
73
  x: movie.width / 4,
@@ -2,6 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Video player in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  <style>
6
7
  body {
7
8
  background: #333;
@@ -58,9 +59,7 @@
58
59
  </style>
59
60
  </head>
60
61
  <body>
61
- <script type="module">
62
- import etro from '../../src/index.js'
63
-
62
+ <script>
64
63
  window.addEventListener('load', () => {
65
64
  const canvas = document.getElementById('output')
66
65
 
@@ -69,7 +68,7 @@
69
68
  progressBar: document.getElementById('progress')
70
69
  }
71
70
 
72
- const movie = new etro.Movie(canvas, { repeat: true })
71
+ const movie = new etro.Movie({ canvas, repeat: true })
73
72
 
74
73
  // FIXME: resetting to beginning every time paused and played
75
74
  controls.playPause.onclick = event => {
@@ -103,6 +102,7 @@
103
102
  controls.progressBar.value = 0 // just for sure, it's weird
104
103
  controls.progressBar.addEventListener('input', () => {
105
104
  movie.currentTime = 1 * controls.progressBar.value
105
+ movie.refresh()
106
106
  })
107
107
  etro.event.subscribe(movie, 'movie.timeupdate', () => {
108
108
  controls.progressBar.value = movie.currentTime
@@ -114,15 +114,15 @@
114
114
 
115
115
  // For simplicity, only use one layer
116
116
  movie.addLayer(
117
- new etro.layer.Video(0, video)
117
+ new etro.layer.Video({ startTime: 0, source: video })
118
118
  )
119
119
 
120
120
  controls.progressBar.max = movie.duration
121
121
  })
122
122
  </script>
123
123
  <div id="container">
124
- <video src="../assets/sample.ogv"></video>
125
- <img src="../assets/sample.jpg"/>
124
+ <video src="../assets/desert.mp4"></video>
125
+ <img src="../assets/lake.jpg"/>
126
126
  <canvas id="output"></canvas><br>
127
127
  <button id="pause-play" class="play"><!-- styled --></button>
128
128
  <input id="progress" type="range" value="0"/>
@@ -2,13 +2,12 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>getUserMedia()</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
8
  <video style="display:none"></video>
8
9
  <canvas></canvas>
9
- <script type="module">
10
- import etro from '../../src/index.js'
11
-
10
+ <script>
12
11
  const video = document.querySelector('video')
13
12
  navigator.mediaDevices.getUserMedia({ video: true }).then(stream => {
14
13
  video.srcObject = stream
@@ -19,9 +18,10 @@
19
18
  }
20
19
  })
21
20
 
22
- const movie = new etro.Movie(document.querySelector('canvas'))
23
- .addLayer(new etro.layer.Visual(0, Infinity, { background: 'black' }))
24
- .addLayer(new etro.layer.Video(0, video)
21
+ const canvas = document.querySelector('canvas')
22
+ const movie = new etro.Movie({ canvas })
23
+ .addLayer(new etro.layer.Visual({ startTime: 0, duration: Infinity, background: 'black' }))
24
+ .addLayer(new etro.layer.Video({ startTime: 0, source: video })
25
25
  .addEffect(new etro.effect.ChromaKey(etro.parseColor('black'), 100)))
26
26
  </script>
27
27
  </body>
@@ -2,19 +2,26 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Manipulating Audio in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
9
- let movie
10
-
11
- const initMovie = () => {
8
+ <script>
9
+ const start = () => {
10
+ button.disabled = true
12
11
  // initialize movie
13
- movie = new etro.Movie(document.createElement('canvas'))
12
+ const canvas = document.createElement('canvas')
13
+ const movie = new etro.Movie({ canvas })
14
14
  // initialize layers (all with durations clipped to 5 seconds)
15
- const layer1 = new etro.layer.Audio(0, document.getElementById('layer1'), { duration: 5 })
16
- const layer2 = new etro.layer.Audio(layer1.duration, document.getElementById('layer2'), { duration: 5 })
17
- const layer3 = new etro.layer.Audio(layer2.startTime + layer2.duration, document.getElementById('layer3'), { duration: 5 })
15
+ const audio1 = document.getElementById('layer1')
16
+ const audio2 = document.getElementById('layer2')
17
+ const audio3 = document.getElementById('layer3')
18
+ const layer1 = new etro.layer.Audio({ startTime: 0, source: audio1, duration: 5 })
19
+ const layer2 = new etro.layer.Audio({ startTime: layer1.duration, source: audio2, duration: 5 })
20
+ const layer3 = new etro.layer.Audio({
21
+ startTime: layer2.startTime + layer2.duration,
22
+ source: audio3,
23
+ duration: 5
24
+ })
18
25
 
19
26
  /*
20
27
  Once a media layer is added to the movie, it will automatically be connected to the movie's `actx`
@@ -24,29 +31,34 @@
24
31
  // movie.layers.push.apply(movie.layers, [layer1, layer2, layer3])
25
32
  movie.layers.push(layer1, layer2, layer3)
26
33
 
27
- // Now, disconnect the layers from the audio node graph and reconnect them with intermediate audio
34
+ // Now, disconnect the layers from the audio node graph and reconnect them with intersourcete audio
28
35
  // effect nodes.
29
36
 
30
- layer1.source.disconnect(movie.actx.destination)
37
+ layer1.audioNode.disconnect(movie.actx.destination)
31
38
  const muter = movie.actx.createGain()
32
39
  muter.gain.value = 0
33
- layer1.source.connect(muter).connect(movie.actx.destination)
40
+ layer1.audioNode.connect(muter).connect(movie.actx.destination)
34
41
 
35
- layer2.source.disconnect(movie.actx.destination)
42
+ layer2.audioNode.disconnect(movie.actx.destination)
36
43
  const panner = movie.actx.createStereoPanner()
37
44
  panner.pan.value = +1 // completely to the right
38
- layer2.source.connect(panner).connect(movie.actx.destination)
45
+ layer2.audioNode.connect(panner).connect(movie.actx.destination)
39
46
 
40
47
  // Manipulating the audio graph is not always necessary
41
48
  layer3.playbackRate = 2 // double the speed
42
49
 
50
+ etro.event.subscribe(movie, 'movie.ended', () => {
51
+ button.disabled = false
52
+ })
43
53
  movie.play()
44
54
  }
45
55
 
46
- window.addEventListener('load', initMovie)
56
+ const button = document.querySelector('button')
57
+ button.addEventListener('click', start)
47
58
  </script>
48
- <audio id="layer1" src="../assets/sample.wav"></audio>
49
- <audio id="layer2" src="../assets/sample.wav"></audio>
50
- <audio id="layer3" src="../assets/sample.wav"></audio>
59
+ <button>Start</button>
60
+ <audio id="layer1" src="../assets/strings.wav"></audio>
61
+ <audio id="layer2" src="../assets/strings.wav"></audio>
62
+ <audio id="layer3" src="../assets/strings.wav"></audio>
51
63
  </body>
52
64
  </html>
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Effects in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
8
+ <script>
9
9
  let movie
10
10
  window.addEventListener('load', () => {
11
11
  const canvas = document.createElement('canvas')
@@ -15,42 +15,46 @@
15
15
  })
16
16
 
17
17
  const initMovie = canvas => {
18
- movie = new etro.Movie(canvas)
18
+ movie = new etro.Movie({ canvas })
19
19
 
20
20
  const image = document.querySelector('img')
21
21
  canvas.width = image.width
22
22
  canvas.height = image.height
23
23
  // create a red 400x400 rectangle that starts at time 0 and lasts 2 seconds
24
24
  movie
25
- .addLayer(new etro.layer.Image(0, 2, image))
25
+ .addLayer(new etro.layer.Image({ startTime: 0, duration: 2, source: image }))
26
26
  // create a transparent blue 500x200 at (50, 20) that starts at time 1 and lasts 2 seconds
27
27
  .addLayer(
28
- new etro.layer.Image(2, 2, image).addEffect(
28
+ new etro.layer.Image({ startTime: 2, duration: 2, source: image }).addEffect(
29
29
  new etro.effect.GaussianBlur(3)
30
30
  )
31
31
  )
32
32
  .addLayer(
33
- new etro.layer.Image(4, 2, image).addEffect(
33
+ new etro.layer.Image({ startTime: 4, duration: 2, source: image }).addEffect(
34
34
  // you can also use keyframes for almost any property in Etro
35
35
  new etro.effect.Channels({ 0: { r: 2, g: 0.5 }, 2: { r: 0.5, g: 2 } })
36
36
  )
37
37
  )
38
38
  .addLayer(
39
- new etro.layer.Image(6, 2, image, {
39
+ new etro.layer.Image({
40
+ startTime: 6,
41
+ duration: 2,
42
+ source: image,
40
43
  // allow rotated image to fill entire screen by setting the size of the layer, which is not the image
41
- width: movie.width, height: movie.height
44
+ width: movie.width,
45
+ height: movie.height
42
46
  }).addEffect(
43
47
  new etro.effect.Transform(new etro.effect.Transform.Matrix().rotate(Math.PI / 6)) // 30d
44
48
  )
45
49
  )
46
50
  .addLayer(
47
- new etro.layer.Image(8, 2, image).addEffect(
51
+ new etro.layer.Image({ startTime: 8, duration: 2, source: image }).addEffect(
48
52
  new etro.effect.EllipticalMask(image.width / 2, image.height / 2, image.width / 2, image.height / 2)
49
53
  )
50
54
  )
51
55
  .play()
52
56
  }
53
57
  </script>
54
- <img src="../assets/sample.jpg" style="display: none;"/>
58
+ <img src="../assets/lake.jpg" style="display: none;"/>
55
59
  </body>
56
60
  </html>
@@ -2,11 +2,21 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Media in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
+ <div id="input">
9
+ <img src="../assets/lake.jpg" style="display:none"/>
10
+ <video src="../assets/desert.mp4" style="display:none"></video>
11
+ <audio src="../assets/strings.wav" style="display:none"></audio>
12
+ </div>
13
+ <div id="output">
14
+ <video controls></video><br>
15
+ </div>
16
+ <button>Record</button>
17
+
18
+ <script>
8
19
  // TODO: test audio output on a device that actually has drivers
9
- import etro from '../../src/index.js'
10
20
  let movie
11
21
  const btn = document.querySelector('button')
12
22
  btn.addEventListener('click', () => {
@@ -20,34 +30,41 @@
20
30
  })
21
31
 
22
32
  const initMovie = canvas => {
23
- movie = new etro.Movie(canvas)
33
+ movie = new etro.Movie({ canvas })
24
34
  const video = document.querySelector('#input video')
25
35
  movie.width = video.videoWidth
26
36
  movie.height = video.videoHeight
27
37
  movie
28
- .addLayer(new etro.layer.Image(0, 3, document.querySelector('#input img'), {
38
+ .addLayer(new etro.layer.Image({
39
+ startTime: 0,
40
+ duration: 3,
41
+ source: document.querySelector('#input img'),
29
42
  // crop @ (150, 150) extending (200, 200)
30
- clipX: 100,
31
- clipY: 100,
43
+ sourceX: 100,
44
+ sourceY: 100,
45
+ sourceWidth: 400,
46
+ sourceHeight: 400,
32
47
  x: 100,
33
48
  y: 100,
34
- clipWidth: 400,
35
- clipHeight: 400,
36
- width: 400,
37
- height: 400
49
+ destWidth: 400,
50
+ destHeight: 400
38
51
  }))
39
- .addLayer(new etro.layer.Video(3, video, {
52
+ .addLayer(new etro.layer.Video({
53
+ startTime: 3,
54
+ source: video,
40
55
  // trim video to only include 3 seconds starting 2 minutes into the video in the video
41
- mediaStartTime: 5,
56
+ sourceStartTime: 5,
42
57
  duration: 3
43
58
  }))
44
- .addLayer(new etro.layer.Audio(6, document.querySelector('#input audio'), {
45
- mediaStartTime: 9, // start audio at 9s
59
+ .addLayer(new etro.layer.Audio({
60
+ startTime: 6,
61
+ source: document.querySelector('#input audio'),
62
+ sourceStartTime: 9, // start audio at 9s
46
63
  duration: 3 // last 3s
47
64
  // volume: 0.25 // 25% of default volume (same as setting volume attribute on audio element)
48
65
  }))
49
66
 
50
- .record(25)
67
+ .record({ frameRate: 25 })
51
68
  .then(blob => {
52
69
  const video = document.querySelector('#output video')
53
70
  video.src = URL.createObjectURL(blob)
@@ -62,15 +79,5 @@
62
79
  })
63
80
  }
64
81
  </script>
65
- <div id="input">
66
- <img src="../assets/sample.jpg" style="display:none"/>
67
- <video src="../assets/sample.ogv" style="display:none"></video>
68
- <audio src="../assets/sample.wav" style="display:none"></audio>
69
- </div>
70
- <div id="output">
71
- <video controls></video><br>
72
- </div>
73
-
74
- <button>Record</button>
75
82
  </body>
76
83
  </html>
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Functions in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
8
+ <script>
9
9
  let movie
10
10
  window.addEventListener('load', () => {
11
11
  const canvas = document.createElement('canvas')
@@ -15,14 +15,16 @@
15
15
  })
16
16
 
17
17
  const initMovie = canvas => {
18
- movie = new etro.Movie(canvas)
18
+ movie = new etro.Movie({ canvas })
19
19
 
20
20
  canvas.width = canvas.height = 400
21
21
  movie
22
22
  // Functions are callbacks that are called every time a property value is queried.
23
23
  // For instance, you can set a layer's opacity to the function `Math.random`, which will make the
24
24
  // layer's opacity randomized each animation frame.
25
- .addLayer(new etro.layer.Visual(0, 3, {
25
+ .addLayer(new etro.layer.Visual({
26
+ startTime: 0,
27
+ duration: 3,
26
28
  // omitting width or height sets the respective element to fill the screen
27
29
  background: 'green',
28
30
 
@@ -2,23 +2,27 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Hello World in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
8
+ <script>
9
9
  window.addEventListener('load', () => {
10
10
  const canvas = document.createElement('canvas')
11
11
  canvas.width = 600
12
12
  canvas.height = 400
13
13
  document.body.appendChild(canvas)
14
14
 
15
- new etro.Movie(canvas)
15
+ new etro.Movie({ canvas })
16
16
  // create a red rectangle that starts at time 0 and lasts 4 seconds and fills the entire screen
17
- .addLayer(new etro.layer.Visual(0, 4, {
17
+ .addLayer(new etro.layer.Visual({
18
+ startTime: 0,
19
+ duration: 4,
18
20
  background: 'red'
19
21
  }))
20
22
  // create a transparent blue 500x200 at (50, 20) that starts at time 1 and lasts 2 seconds
21
- .addLayer(new etro.layer.Visual(1, 2, {
23
+ .addLayer(new etro.layer.Visual({
24
+ startTime: 1,
25
+ duration: 2,
22
26
  background: '#0000ff80',
23
27
  border: { color: '#00f', thickness: 4 },
24
28
  width: 500,
@@ -2,24 +2,24 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Hello World in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
8
+ <script>
9
9
  window.addEventListener('load', () => {
10
10
  const canvas = document.createElement('canvas')
11
11
  document.body.appendChild(canvas)
12
12
 
13
13
  const video = document.createElement('video')
14
- video.src = '../assets/sample.ogv'
14
+ video.src = '../assets/desert.mp4'
15
15
 
16
16
  video.onloadeddata = () => {
17
17
  canvas.width = video.videoWidth // you could also do movie.width = video.videoWidth;
18
18
  canvas.height = video.videoHeight
19
- const movie = new etro.Movie(canvas)
19
+ const movie = new etro.Movie({ canvas })
20
20
  movie
21
21
  // add a video layer at 0s in the timeline
22
- .addLayer(new etro.layer.Video(0, video))
22
+ .addLayer(new etro.layer.Video({ startTime: 0, source: video }))
23
23
  .play()
24
24
 
25
25
  // FOR TESTING issue#8 (don't delete):
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Keyframes in Etro</title>
5
+ <script src="../../dist/etro-iife.js"></script>
5
6
  </head>
6
7
  <body>
7
- <script type="module">
8
- import etro from '../../src/index.js'
8
+ <script>
9
9
  let movie
10
10
  window.addEventListener('load', () => {
11
11
  const canvas = document.createElement('canvas')
@@ -15,7 +15,7 @@
15
15
  })
16
16
 
17
17
  const initMovie = canvas => {
18
- movie = new etro.Movie(canvas)
18
+ movie = new etro.Movie({ canvas })
19
19
 
20
20
  canvas.width = canvas.height = 400
21
21
  movie
@@ -23,42 +23,54 @@
23
23
  // Keyframes let you make a dynamic property that interpolates.
24
24
  // For instance, you can set a layer's opacity to decrease over time, effectively making it fade out
25
25
  // Numbers and objects interpolate (animate smoothly)
26
- .addLayer(new etro.layer.Visual(0, 3, {
26
+ .addLayer(new etro.layer.Visual({
27
+ startTime: 0,
28
+ duration: 3,
27
29
  // omitting width or height sets the respective element to fill the screen
28
30
  background: 'green',
29
31
  // opacity=1 @ 0s (relative to the layer) -> opacity=0 @ 1s (relative to the layer)
30
- opacity: { 0: 1, 3: 0 }
32
+ opacity: new etro.KeyFrame([0, 1], [3, 0])
31
33
  }))
32
34
  // Because strings don't interpolate, you need to convert colors and fonts to objects
33
35
  // for a smooth effect (which will then be automatically `.toString()`ed when set on the canvas
34
36
  // context).
35
- .addLayer(new etro.layer.Visual(3, 3, {
36
- background: { 0: etro.parseColor('red'), 3: new etro.Color(0, 0, 255) }
37
+ .addLayer(new etro.layer.Visual({
38
+ startTime: 3,
39
+ duration: 3,
40
+ background: new etro.KeyFrame([0, etro.parseColor('red')], [3, new etro.Color(0, 0, 255)])
37
41
  }))
38
42
  // You can use other types in keyframes, but they will be used sequentially without interpolation
39
- .addLayer(new etro.layer.Text(6, 3, { 0: 'Hello ...', 1.5: '...world' }))
43
+ .addLayer(new etro.layer.Text({
44
+ startTime: 6,
45
+ duration: 3,
46
+ text: new etro.KeyFrame([0, 'Hello ...'], [1.5, '...world'])
47
+ }))
40
48
 
41
49
  // When interpolating, you can specify how the keyframes will be interpolated
42
- .addLayer(new etro.layer.Visual(9, 3, {
43
- width: { 0: movie.width, 3: 0, interpolate: etro.linearInterp }, // (obviously) linear
44
- height: { 0: movie.height, 3: 0, interpolate: etro.cosineInterp }, // curved
50
+ .addLayer(new etro.layer.Visual({
51
+ startTime: 9,
52
+ duration: 3,
53
+ width: new etro.KeyFrame([0, movie.width, etro.linearInterp], [3, 0]), // (obviously) linear
54
+ height: new etro.KeyFrame([0, movie.height, etro.linearInterp], [3, 0]), // (obviously) linear
45
55
  background: 'blue'
46
56
  }))
47
57
 
48
58
  // Of course, you can have more than two keyframes
49
- .addLayer(new etro.layer.Text(12, 6, 'Etro', {
50
- background: {
51
- 0: etro.parseColor('#0ff'),
52
- 2: etro.parseColor('#ff0'),
53
- 4: etro.parseColor('#f0f'),
54
- 6: etro.parseColor('#fff')
55
- },
59
+ .addLayer(new etro.layer.Text({
60
+ text: 'Etro',
61
+ startTime: 12,
62
+ duration: 6,
63
+ background: new etro.KeyFrame(
64
+ [0, etro.parseColor('#0ff')],
65
+ [2, etro.parseColor('#ff0')],
66
+ [4, etro.parseColor('#f0f')],
67
+ [6, etro.parseColor('#fff')]
68
+ ),
56
69
  // let's just add another property (fonts can be parsed into objects just like colors)
57
- font: {
58
- 0: etro.parseFont('28px monospace'),
59
- 6: etro.parseFont('36px monospace'),
60
- interpolate: etro.cosineInterp
61
- }
70
+ font: new etro.KeyFrame(
71
+ [0, etro.parseFont('28px monospace'), etro.cosineInterp],
72
+ [6, etro.parseFont('36px monospace')]
73
+ )
62
74
  }))
63
75
  .play()
64
76
  }