feat: Now works with both GDQ OBS green shades

GamesDoneQuick · Feb 26, 2022 · 8a14962 · 8a14962
1 parent 053472f
commit 8a14962
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gdq-viewport-assign",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/main.ts b/src/main.ts
@@ -4,6 +4,7 @@ import { icons } from './icons';
 
 const autocropThreshold = 35;
 const gdqGreen = [1, 128, 1];
+const gdqGreen2 = [0, 255, 0];
 
 let screenshotBase64 = '';
 let connectedToOBS = false;
@@ -766,7 +767,7 @@ async function refreshViewportsDiv() {
           .catch(obsError)
           .then(() => {
             subscribeToChanges();
-						arrangeViewportFeeds(currentSceneViewports[i])
+            arrangeViewportFeeds(currentSceneViewports[i]);
             refreshViewportsDiv();
           });
       };
@@ -1429,9 +1430,12 @@ function compareToGreen(
   y: number
 ): number {
   const pixel = Array.from(ctx.getImageData(x, y, 1, 1).data);
-  return (
+  return Math.min(
     Math.abs(pixel[0] - gdqGreen[0]) +
-    Math.abs(pixel[1] - gdqGreen[1]) +
-    Math.abs(pixel[2] - gdqGreen[2])
+      Math.abs(pixel[1] - gdqGreen[1]) +
+      Math.abs(pixel[2] - gdqGreen[2]),
+    Math.abs(pixel[0] - gdqGreen2[0]) +
+      Math.abs(pixel[1] - gdqGreen2[1]) +
+      Math.abs(pixel[2] - gdqGreen2[2])
   );
 }