fixed webcam examples

justadudewhohacks · justadudewhohacks · commit 1519a743f51f · 2019-04-30T09:50:18.000+02:00
diff --git a/examples/examples-browser/views/webcamFaceDetection.html b/examples/examples-browser/views/webcamFaceDetection.html
@@ -159,8 +159,8 @@
 
       if (result) {
         const canvas = $('#overlay').get(0)
-        faceapi.matchDimensions(canvas, videoEl)
-        faceapi.draw.drawDetections(canvas, faceapi.resizeResults(results, videoEl))
+        const dims = faceapi.matchDimensions(canvas, videoEl, true)
+        faceapi.draw.drawDetections(canvas, faceapi.resizeResults(result, dims))
       }
 
       setTimeout(() => onPlay())
diff --git a/examples/examples-browser/views/webcamFaceExpressionRecognition.html b/examples/examples-browser/views/webcamFaceExpressionRecognition.html
@@ -171,14 +171,14 @@
 
       if (result) {
         const canvas = $('#overlay').get(0)
-        faceapi.matchDimensions(canvas, videoEl, true)
+        const dims = faceapi.matchDimensions(canvas, videoEl, true)
 
-        const resizedResult = faceapi.resizeResults(result, videoEl)
+        const resizedResult = faceapi.resizeResults(result, dims)
         const minConfidence = 0.05
         if (withBoxes) {
-          faceapi.draw.drawDetections(canvas, resizedResults)
+          faceapi.draw.drawDetections(canvas, resizedResult)
         }
-        faceapi.draw.drawFaceExpressions(canvas, resizedResults, minConfidence)
+        faceapi.draw.drawFaceExpressions(canvas, resizedResult, minConfidence)
       }
 
       setTimeout(() => onPlay())
diff --git a/examples/examples-browser/views/webcamFaceLandmarkDetection.html b/examples/examples-browser/views/webcamFaceLandmarkDetection.html
@@ -170,7 +170,14 @@
       updateTimeStats(Date.now() - ts)
 
       if (result) {
-        drawLandmarks(videoEl, $('#overlay').get(0), [result], withBoxes)
+        const canvas = $('#overlay').get(0)
+        const dims = faceapi.matchDimensions(canvas, videoEl, true)
+        const resizedResult = faceapi.resizeResults(result, dims)
+
+        if (withBoxes) {
+          faceapi.draw.drawDetections(canvas, resizedResult)
+        }
+        faceapi.draw.drawFaceLandmarks(canvas, resizedResult)
       }
 
       setTimeout(() => onPlay())

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@`
`159`	`159`
`160`	`160`	`if (result) {`
`161`	`161`	`const canvas = $('#overlay').get(0)`
`162`		`- faceapi.matchDimensions(canvas, videoEl)`
`163`		`- faceapi.draw.drawDetections(canvas, faceapi.resizeResults(results, videoEl))`
	`162`	`+ const dims = faceapi.matchDimensions(canvas, videoEl, true)`
	`163`	`+ faceapi.draw.drawDetections(canvas, faceapi.resizeResults(result, dims))`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`setTimeout(() => onPlay())`