update libs

dvdrtrgn · dvdrtrgn · commit 2bfbbf29371d · 2016-12-31T16:04:54.000-06:00
diff --git a/19 - Webcam Fun/main.js b/19 - Webcam Fun/main.js
@@ -5,36 +5,35 @@ require.config({
   paths: {
     lodash: '../vendors/lodash.js/lodash',
   },
-  shim: {
-    foo: {
-      deps: ['lodash'],
-      exports: 'Foo',
-    },
-  },
 });
 
-function init($, V) {
+function init($, V, Ival) {
+
   var cfg = {
     _: 'init()',
     $play: $('button.play'),
     $photo: $('canvas.photo'),
     $video: $('video.player'),
     $snap: $('button.shot'),
+    interval: Ival.create($.noop, 999),
+    cameraObj: null,
+    canvasObj: null,
   };
 
-  cfg.camera2video = V.camera2video(cfg.$video);
+  cfg.cameraObj = V.pipeCameraTo(cfg.$video);
 
   cfg.$video.addEventListener('canplay', evt => {
-    if (!cfg.video2canvas) {
-      cfg.video2canvas = V.video2canvas(cfg.$video, cfg.$photo);
+    if (!cfg.canvasObj) {
+      cfg.canvasObj = V.video2canvas(cfg.$video, cfg.$photo);
+      cfg.interval.setAction(cfg.canvasObj.draw);
     }
   });
 
   cfg.$play.addEventListener('click', evt => {
-    if (!cfg.camera2video.playing) {
-      cfg.camera2video.start();
+    if (!cfg.cameraObj.playing) {
+      cfg.cameraObj.start();
     } else {
-      cfg.camera2video.stop();
+      cfg.cameraObj.stop();
     }
   });
 
@@ -49,4 +48,4 @@ function init($, V) {
   return cfg;
 }
 
-require(['./util', './vid'], init);
+require(['util', 'vid', 'interval'], init);
diff --git a/libs/interval.js b/libs/interval.js
@@ -0,0 +1,64 @@
+define(['util'], {
+  create: function (_fn, _ms, _once) {
+    var count, interval, action, rate, self;
+
+    function _clear() {
+      interval = window.clearInterval(interval);
+    }
+
+    function _makeInterval(once) {
+      interval = window.setInterval((foo) => {
+        if (once && count) return _clear();
+        count++;
+        action(foo);
+      }, rate > 9 ? rate : 99);
+    }
+
+    function _reload() {
+      _clear();
+      _makeInterval();
+    }
+
+    function _create(fn, ms, once) {
+      count = 0;
+      _clear();
+      setAction(fn);
+      setRate(ms);
+      _makeInterval(once);
+      return self;
+    }
+    /*
+
+    PUBLIC
+
+    */
+    function setAction(fn) {
+      action = fn;
+    }
+
+    function setRate(ms) {
+      rate = ms;
+      if (interval) _reload();
+    }
+
+    function start() {
+      _reload();
+    }
+
+    function stop() {
+      _clear();
+    }
+
+    self = Object.create({
+      get count() {
+        return count;
+      },
+      setAction,
+      setRate,
+      start,
+      stop,
+    });
+
+    return _create(_fn, _ms, _once);
+  }
+});
diff --git a/libs/util.js b/libs/util.js
@@ -1,3 +1,9 @@
-define(function () {
-  return (sel) => document.querySelector(sel);
-});
+function PolyJQ() {
+  let polyjq = (sel) => document.querySelector(sel);
+  polyjq.noop = () => {};
+  return polyjq;
+};
+
+define(PolyJQ);
+
+polyjq = PolyJQ();
diff --git a/libs/vid.js b/libs/vid.js
@@ -1,6 +1,6 @@
 define(['util'], function ($) {
 
-  function camera2video(_video = {}) {
+  function pipeCameraTo(_video = {}) {
     if (_video.tagName !== 'VIDEO') {
       throw Error('Pipes only to video elements');
     }
@@ -31,19 +31,19 @@ define(['util'], function ($) {
   }
 
   function video2canvas(_video, _canvas) {
-    var context, height, width, interval;
+    var context, height, width;
 
     context = _canvas.getContext('2d');
     height = _canvas.height = _video.videoHeight;
     width = _canvas.width = _video.videoWidth;
-    interval = setInterval(foo => {
-      context.drawImage(_video, 0, 0, width, height);
-    });
     _video.hidden = true;
 
     return {
       _: 'video2canvas',
-      _video, _canvas, context, height, width, interval,
+      _video, _canvas, context, height, width,
+      draw: foo => {
+        context.drawImage(_video, 0, 0, width, height);
+      },
     };
   }
 
@@ -66,7 +66,7 @@ define(['util'], function ($) {
   }
 
   return {
-    camera2video,
+    pipeCameraTo,
     video2canvas,
     snapCanvas,
   };
