1000% Prototype

From: Vincent Vanwaelscappel Date: Mon, 23 Dec 2019 13:56:00 +0000 (+0100) Subject: wip #3207 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6f1d58e3fe47ae3066d1fb5b1f7bfac95e31e3f6;p=1000pourcent.git wip #3207 @2 --- diff --git a/assets/favicon/android-1024.png b/assets/favicon/android-1024.png new file mode 100644 index 0000000..4b1286f Binary files /dev/null and b/assets/favicon/android-1024.png differ diff --git a/assets/favicon/android-144.png b/assets/favicon/android-144.png new file mode 100644 index 0000000..cf1a705 Binary files /dev/null and b/assets/favicon/android-144.png differ diff --git a/assets/favicon/android-192.png b/assets/favicon/android-192.png new file mode 100644 index 0000000..bed004d Binary files /dev/null and b/assets/favicon/android-192.png differ diff --git a/assets/favicon/android-256.png b/assets/favicon/android-256.png new file mode 100644 index 0000000..e6f4174 Binary files /dev/null and b/assets/favicon/android-256.png differ diff --git a/assets/favicon/android-36.png b/assets/favicon/android-36.png new file mode 100644 index 0000000..74b68ae Binary files /dev/null and b/assets/favicon/android-36.png differ diff --git a/assets/favicon/android-48.png b/assets/favicon/android-48.png new file mode 100644 index 0000000..a410a51 Binary files /dev/null and b/assets/favicon/android-48.png differ diff --git a/assets/favicon/android-512.png b/assets/favicon/android-512.png new file mode 100644 index 0000000..f496f1b Binary files /dev/null and b/assets/favicon/android-512.png differ diff --git a/assets/favicon/android-76.png b/assets/favicon/android-76.png new file mode 100644 index 0000000..b42d8ef Binary files /dev/null and b/assets/favicon/android-76.png differ diff --git a/assets/favicon/android-96.png b/assets/favicon/android-96.png new file mode 100644 index 0000000..97be622 Binary files /dev/null and b/assets/favicon/android-96.png differ diff --git a/index.html b/index.html index 347909c..04df499 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,8 @@ 1000% Prototype + +

diff --git a/js/1000pct.js b/js/1000pct.js index 261e6f1..7ca77fe 100644 --- a/js/1000pct.js +++ b/js/1000pct.js @@ -8,7 +8,7 @@ function appReady() { video: { width: {min: 1280}, height: {min: 720}, - //facingMode: {exact: "environment"} + facingMode: {exact: "environment"} }, audio: false }).then(function (stream) { video.srcObject = stream; @@ -22,6 +22,7 @@ function appReady() { } function recognizeAttempt() { + cleanOpencvReferences(); var input = document.querySelector('#input'); input.width = video.videoWidth; input.height = video.videoHeight; @@ -30,6 +31,7 @@ function recognizeAttempt() { input.getContext('2d').drawImage(video, 0, 0, input.width, input.height); var start = Date.now(); var contour = detectBoard('input', input.width, input.height, true); + cleanOpencvReferences(); if (contour !== false) { console.log(Date.now() - start); correctPerspective(contour); @@ -64,11 +66,12 @@ function detectBoard(id, width, height, draw) { // Load source image let src = cv.imread(id); opencvReferences.push(src); - // Grayscale, threshold and find all coutours cv.cvtColor(src, src, cv.COLOR_RGBA2GRAY, 0); + opencvReferences.push(src); console.log('source grayscaled', Date.now(), Date.now() - start); cv.threshold(src, src, 120, 200, cv.THRESH_BINARY); + opencvReferences.push(src); console.log('source prepared', Date.now(), Date.now() - start); let contours = new cv.MatVector(); opencvReferences.push(contours); @@ -153,7 +156,6 @@ function detectBoard(id, width, height, draw) { res.push(vertex); } console.log('board vertices found', Date.now(), Date.now() - start); - cleanOpencvReferences(); console.log('cleaned', Date.now(), Date.now() - start); return res; } @@ -175,14 +177,14 @@ function sortArea(a, b) { function drawContours(canvas, contours, type, width, height) { try { - - let tmp = new cv.MatVector(); for (let i = 0; i < contours.length; i++) { tmp.push_back(contours[i][type]); } + opencvReferences.push(tmp); var dst = cv.Mat.zeros(height, width, cv.CV_8UC3); + opencvReferences.push(dst); for (let i = 0; i < tmp.size(); ++i) { let color = new cv.Scalar(Math.round(Math.random() * 255), Math.round(Math.random() * 255), Math.round(Math.random() * 255)); diff --git a/js/ocr.js b/js/ocr.js index cfe1264..6f200d4 100644 --- a/js/ocr.js +++ b/js/ocr.js @@ -7,7 +7,7 @@ function onTesseractReady() { for (var type in types) { window.tesseract[type] = Tesseract.createScheduler(); - for (let i = 0; i < 2; i++) { + for (let i = 0; i < 1; i++) { let worker = Tesseract.createWorker({ langPath: './assets/', }); diff --git a/manifest.webmanifest.json b/manifest.webmanifest.json new file mode 100644 index 0000000..a596ad6 --- /dev/null +++ b/manifest.webmanifest.json @@ -0,0 +1,67 @@ +{ + "name": "1000%", + "short_name": "1000%", + "description": "", + "display": "standalone", + "orientation": "any", + "background_color": "#0c6638", + "theme_color": "#0c6638", + "start_url": "https://demo1.cubedesigners.com/1000pct/", + "scope": "https://demo1.cubedesigners.com/1000pct/", + "icons": [ + { + "sizes": "36x36", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-36.png", + "density": 0.75 + }, + { + "sizes": "48x48", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-48.png", + "density": 1 + }, + { + "sizes": "72x72", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-72.png", + "density": 1.5 + }, + { + "sizes": "96x96", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-96.png", + "density": 2 + }, + { + "sizes": "144x144", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-144.png", + "density": 3 + }, + { + "sizes": "192x192", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-192.png", + "density": 4 + }, + { + "sizes": "256x256", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-256.png", + "density": 5.333 + }, + { + "sizes": "512x512", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-512.png", + "density": 10.667 + }, + { + "sizes": "1024x1024", + "type": "image\/png", + "src": "https://demo1.cubedesigners.com/1000pct/assets/favicon/android-1024.png", + "density": 21.333 + } + ] +} \ No newline at end of file diff --git a/style.less b/style.less index 4d204f1..e83d1c1 100644 --- a/style.less +++ b/style.less @@ -1,3 +1,12 @@ +*{ + margin: 0; + padding: 0; +} + +body{ + background-color:#0c6638; +} + #input{ } \ No newline at end of file