up version to v3 to signal potential breaking change, getPupilFeatures can use internal var instead of needed it as a param, fix collision.html

jeffhuang · jeffhuang · commit cd26c906ae2c · 2022-03-25T18:56:37.000-04:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webgazer",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/brownhci/WebGazer.git"
diff --git a/src/facemesh.mjs b/src/facemesh.mjs
@@ -19,6 +19,7 @@ TFFaceMesh.prototype.positionsArray = null;
 
 /**
  * Isolates the two patches that correspond to the user's eyes
+ * @param  {Object} video - the video element itself
  * @param  {Canvas} imageCanvas - canvas corresponding to the webcam stream
  * @param  {Number} width - of imageCanvas
  * @param  {Number} height - of imageCanvas
diff --git a/src/index.mjs b/src/index.mjs
@@ -192,17 +192,16 @@ function drawCoordinates(colour,x,y){
 /**
  * Gets the pupil features by following the pipeline which threads an eyes object through each call:
  * curTracker gets eye patches -> blink detector -> pupil detection
- * @param {Object} video - the video element itself
  * @param {Canvas} canvas - a canvas which will have the video drawn onto it
  * @param {Number} width - the width of canvas
  * @param {Number} height - the height of canvas
  */
-function getPupilFeatures(video, canvas, width, height) {
+function getPupilFeatures(canvas, width, height) {
   if (!canvas) {
     return;
   }
   try {
-    return curTracker.getEyePatches(video, canvas, width, height);
+    return curTracker.getEyePatches(videoElement, canvas, width, height);
   } catch(err) {
     console.log("can't get pupil features ", err);
     return null;
@@ -235,7 +234,7 @@ function paintCurrentFrame(canvas, width, height) {
 async function getPrediction(regModelIndex) {
   var predictions = [];
   // [20200617 xk] TODO: this call should be made async somehow. will take some work.
-  latestEyeFeatures = await getPupilFeatures(videoElement, videoElementCanvas, videoElementCanvas.width, videoElementCanvas.height);
+  latestEyeFeatures = await getPupilFeatures(videoElementCanvas, videoElementCanvas.width, videoElementCanvas.height);
 
   if (regs.length === 0) {
     console.log('regression not set, call setRegression()');
diff --git a/www/collision.html b/www/collision.html
@@ -6,7 +6,6 @@
 <body>
   <script src="https://d3js.org/d3.v3.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/localforage/1.8.1/localforage.js"></script>
-  <!-- <script src="./tensorflow.js"></script> -->
   <script src="./webgazer.js"></script>
   <script src="js/collision.js"></script>
 </body>
diff --git a/www/js/collision.js b/www/js/collision.js
@@ -151,7 +151,6 @@
       webgazerCanvas = webgazer.getVideoElementCanvas();
     }
 
-    await webgazer.getTracker().getEyePatches(webgazerCanvas, webgazerCanvas.width, webgazerCanvas.height);
     var fmPositions = await webgazer.getTracker().getPositions();
 
     var whr = webgazer.getVideoPreviewToCameraResolutionRatio();
diff --git a/www/package.json b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webgazer-www",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/brownhci/WebGazer.git"
diff --git a/www/webgazer.js b/www/webgazer.js
@@ -146366,6 +146366,7 @@ TFFaceMesh.prototype.positionsArray = null;
 
 /**
  * Isolates the two patches that correspond to the user's eyes
+ * @param  {Object} video - the video element itself
  * @param  {Canvas} imageCanvas - canvas corresponding to the webcam stream
  * @param  {Number} width - of imageCanvas
  * @param  {Number} height - of imageCanvas
@@ -148027,17 +148028,16 @@ function drawCoordinates(colour,x,y){
 /**
  * Gets the pupil features by following the pipeline which threads an eyes object through each call:
  * curTracker gets eye patches -> blink detector -> pupil detection
- * @param {Object} video - the video element itself
  * @param {Canvas} canvas - a canvas which will have the video drawn onto it
  * @param {Number} width - the width of canvas
  * @param {Number} height - the height of canvas
  */
-function getPupilFeatures(video, canvas, width, height) {
+function getPupilFeatures(canvas, width, height) {
   if (!canvas) {
     return;
   }
   try {
-    return curTracker.getEyePatches(video, canvas, width, height);
+    return curTracker.getEyePatches(videoElement, canvas, width, height);
   } catch(err) {
     console.log("can't get pupil features ", err);
     return null;
@@ -148070,7 +148070,7 @@ function paintCurrentFrame(canvas, width, height) {
 async function getPrediction(regModelIndex) {
   var predictions = [];
   // [20200617 xk] TODO: this call should be made async somehow. will take some work.
-  latestEyeFeatures = await getPupilFeatures(videoElement, videoElementCanvas, videoElementCanvas.width, videoElementCanvas.height);
+  latestEyeFeatures = await getPupilFeatures(videoElementCanvas, videoElementCanvas.width, videoElementCanvas.height);
 
   if (regs.length === 0) {
     console.log('regression not set, call setRegression()');
diff --git a/www/webgazer.js.map b/www/webgazer.js.map

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgazer",`
`3`		`- "version": "2.2.0",`
	`3`	`+ "version": "3.0.0",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/brownhci/WebGazer.git"`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,6 @@`
`151`	`151`	`webgazerCanvas = webgazer.getVideoElementCanvas();`
`152`	`152`	`}`
`153`	`153`
`154`		`- await webgazer.getTracker().getEyePatches(webgazerCanvas, webgazerCanvas.width, webgazerCanvas.height);`
`155`	`154`	`var fmPositions = await webgazer.getTracker().getPositions();`
`156`	`155`
`157`	`156`	`var whr = webgazer.getVideoPreviewToCameraResolutionRatio();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgazer-www",`
`3`		`- "version": "2.2.0",`
	`3`	`+ "version": "3.0.0",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/brownhci/WebGazer.git"`