From 9e12be4a55c64226bb550d361357a2fff9520d14 Mon Sep 17 00:00:00 2001 From: esimov Date: Mon, 14 Nov 2022 10:46:37 +0200 Subject: [PATCH] Updated demos --- bgblur.go | 1 - bgblur/canvas.go | 5 ++--- css/style.css | 2 +- faceblur.go | 2 +- faceblur/canvas.go | 5 +++-- facemask.go | 2 +- facemask/canvas.go | 10 +++++----- masquerade.go | 2 +- pixelate.go | 2 +- pixelate/canvas.go | 4 ++-- triangulate.go | 2 +- triangulate/canvas.go | 4 ++-- 12 files changed, 20 insertions(+), 21 deletions(-) diff --git a/bgblur.go b/bgblur.go index cf53286..db4610a 100644 --- a/bgblur.go +++ b/bgblur.go @@ -1,5 +1,4 @@ //go:build js && wasm -// +build js,wasm package main diff --git a/bgblur/canvas.go b/bgblur/canvas.go index 8b327ba..5e851d3 100644 --- a/bgblur/canvas.go +++ b/bgblur/canvas.go @@ -1,5 +1,4 @@ //go:build js && wasm -// +build js,wasm package bgblur @@ -63,8 +62,8 @@ func NewCanvas() *Canvas { c.doc = c.window.Get("document") c.body = c.doc.Get("body") - c.windowSize.width = 768 - c.windowSize.height = 576 + c.windowSize.width = 1024 + c.windowSize.height = 640 c.canvas = c.doc.Call("createElement", "canvas") c.face = c.doc.Call("createElement", "canvas") diff --git a/css/style.css b/css/style.css index 9d8614a..43276f2 100644 --- a/css/style.css +++ b/css/style.css @@ -23,7 +23,7 @@ html, body { width: 80px; height: 40px; opacity: 0.8; - right: 20%; + right: 5%; top: 10%; z-index: 99; transform: translate(-50%, -50%); diff --git a/faceblur.go b/faceblur.go index f19c43d..bcecab0 100644 --- a/faceblur.go +++ b/faceblur.go @@ -1,4 +1,4 @@ -// +build js,wasm +//go:build js && wasm package main diff --git a/faceblur/canvas.go b/faceblur/canvas.go index 897ad9f..1802c98 100644 --- a/faceblur/canvas.go +++ b/faceblur/canvas.go @@ -60,8 +60,8 @@ func NewCanvas() *Canvas { c.doc = c.window.Get("document") c.body = c.doc.Get("body") - c.windowSize.width = 768 - c.windowSize.height = 576 + c.windowSize.width = 1024 + c.windowSize.height = 640 c.canvas = c.doc.Call("createElement", "canvas") c.ellipse = c.doc.Call("createElement", "canvas") @@ -182,6 +182,7 @@ func (c *Canvas) StartWebcam() (*Canvas, error) { failure := js.FuncOf(func(this js.Value, args []js.Value) interface{} { go func() { err = fmt.Errorf("failed initialising the camera: %s", args[0].String()) + fmt.Println(err) c.errCh <- err }() return nil diff --git a/facemask.go b/facemask.go index d9cbd8f..dc24bdd 100644 --- a/facemask.go +++ b/facemask.go @@ -1,4 +1,4 @@ -// +build js,wasm +//go:build js && wasm package main diff --git a/facemask/canvas.go b/facemask/canvas.go index f49845a..60f6ffa 100644 --- a/facemask/canvas.go +++ b/facemask/canvas.go @@ -65,7 +65,7 @@ const ( minStrokeWidth = 0 maxStrokeWidth = 4 - minScale = 200 + minScale = 170 ) var ( @@ -83,8 +83,8 @@ func NewCanvas() *Canvas { c.doc = c.window.Get("document") c.body = c.doc.Get("body") - c.windowSize.width = 768 - c.windowSize.height = 576 + c.windowSize.width = 720 + c.windowSize.height = 480 c.webcamCanvas = c.doc.Call("createElement", "canvas") c.webcamCanvas.Set("width", c.windowSize.width) @@ -300,7 +300,7 @@ func (c *Canvas) drawDetection(data []uint8, dets [][]int) error { c.ctx.Set("lineWidth", 2) c.ctx.Set("strokeStyle", "rgba(255, 0, 0, 0.5)") - row, col, scale := det[1], det[0], int(float64(det[2])*0.8) + row, col, scale := det[1], det[0], int(float64(det[2])*0.72) leftPupil := pigo.DetectLeftPupil(det) rightPupil := pigo.DetectRightPupil(det) @@ -331,7 +331,7 @@ func (c *Canvas) drawDetection(data []uint8, dets [][]int) error { ty := p1[1] + (p1[1]-p2[1])/2 - int(maskHeight*0.5) row += int(float64(row) * 0.02) - col += int(float64(scale) * 0.3) + col += int(float64(scale) * 0.4) // Substract the image under the detected face region. imgData := make([]byte, scale*scale*4) diff --git a/masquerade.go b/masquerade.go index 794afc6..1c5b847 100644 --- a/masquerade.go +++ b/masquerade.go @@ -1,4 +1,4 @@ -// +build js,wasm +//go:build js && wasm package main diff --git a/pixelate.go b/pixelate.go index fbbf7dc..ac1ea5b 100644 --- a/pixelate.go +++ b/pixelate.go @@ -1,4 +1,4 @@ -// +build js,wasm +//go:build js && wasm package main diff --git a/pixelate/canvas.go b/pixelate/canvas.go index abbaba1..11462c9 100644 --- a/pixelate/canvas.go +++ b/pixelate/canvas.go @@ -71,8 +71,8 @@ func NewCanvas() *Canvas { c.doc = c.window.Get("document") c.body = c.doc.Get("body") - c.windowSize.width = 768 - c.windowSize.height = 576 + c.windowSize.width = 720 + c.windowSize.height = 480 c.canvas = c.doc.Call("createElement", "canvas") c.ellipse = c.doc.Call("createElement", "canvas") diff --git a/triangulate.go b/triangulate.go index b43ce55..8abc55b 100644 --- a/triangulate.go +++ b/triangulate.go @@ -1,4 +1,4 @@ -// +build js,wasm +//go:build js && wasm package main diff --git a/triangulate/canvas.go b/triangulate/canvas.go index f5311f7..a0465c9 100644 --- a/triangulate/canvas.go +++ b/triangulate/canvas.go @@ -83,8 +83,8 @@ func NewCanvas() *Canvas { c.doc = c.window.Get("document") c.body = c.doc.Get("body") - c.windowSize.width = 768 - c.windowSize.height = 576 + c.windowSize.width = 720 + c.windowSize.height = 480 c.canvas = c.doc.Call("createElement", "canvas") c.ellipse = c.doc.Call("createElement", "canvas")