Merge branch 'master' into opencv-macos-fix

PhotonVision · Oct 25, 2023 · 3fae3dd · 3fae3dd
2 parents 5240d54 + f3fb010
commit 3fae3dd
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 4 deletions.
diff --git a/photonlib-java-examples/simaimandrange/2020-field.png b/photonlib-java-examples/simaimandrange/2020-field.png
diff --git a/photonlib-java-examples/simaimandrange/2020-infiniterecharge.json b/photonlib-java-examples/simaimandrange/2020-infiniterecharge.json
@@ -0,0 +1,19 @@
+{
+  "game": "Infinite Recharge",
+  "field-image": "2020-field.png",
+  "field-corners": {
+    "top-left": [
+      96,
+      25
+    ],
+    "bottom-right": [
+      1040,
+      514
+    ]
+  },
+  "field-size": [
+    52.4375,
+    26.9375
+  ],
+  "field-unit": "foot"
+}
diff --git a/photonlib-java-examples/simaimandrange/simgui.json b/photonlib-java-examples/simaimandrange/simgui.json
@@ -22,6 +22,7 @@
           ],
           "weight": 3.0
         },
+        "bottom": 514,
         "cameras": {
           "arrowColor": [
             0.0,
@@ -33,7 +34,19 @@
           "selectable": false,
           "style": "Hidden"
         },
+        "height": 8.210550308227539,
+        "image": "2020-field.png",
+        "left": 96,
+        "right": 1040,
         "targets": {
+          "arrowColor": [
+            0.27848100662231445,
+            1.0,
+            0.0,
+            255.0
+          ],
+          "arrowSize": 58,
+          "arrowWeight": 6.0,
           "color": [
             0.05063295364379883,
             1.0,
@@ -43,6 +56,8 @@
           "style": "Hidden",
           "weight": 1.0
         },
+        "top": 25,
+        "width": 15.982950210571289,
         "window": {
           "visible": true
         }

diff --git a/photonlib-java-examples/swervedriveposeestsim/2023-field.json b/photonlib-java-examples/swervedriveposeestsim/2023-field.json
@@ -0,0 +1,19 @@
+{
+    "game": "Charged Up",
+    "field-image": "2023-field.png",
+    "field-corners": {
+      "top-left": [
+        46,
+        36
+      ],
+      "bottom-right": [
+        1088,
+        544
+      ]
+    },
+    "field-size": [
+      54.27083,
+      26.2916
+    ],
+    "field-unit": "foot"
+  }
diff --git a/photonlib-java-examples/swervedriveposeestsim/2023-field.png b/photonlib-java-examples/swervedriveposeestsim/2023-field.png
diff --git a/photonlib-java-examples/swervedriveposeestsim/simgui.json b/photonlib-java-examples/swervedriveposeestsim/simgui.json
@@ -57,10 +57,12 @@
           "weight": 2.0
         },
         "apriltag": {
+          "arrows": false,
           "image": "tag-green.png",
-          "length": 0.5,
-          "width": 0.4000000059604645
+          "length": 0.6000000238418579,
+          "width": 0.5
         },
+        "bottom": 544,
         "cameras": {
           "arrowColor": [
             0.29535865783691406,
@@ -75,15 +77,19 @@
           "weight": 1.0,
           "width": 1.0
         },
-        "height": 8.013699531555176,
+        "height": 8.013679504394531,
+        "image": "2023-field.png",
+        "left": 46,
+        "right": 1088,
+        "top": 36,
         "visibleTargetPoses": {
           "arrows": false,
           "image": "tag-blue.png",
           "length": 0.5,
           "selectable": false,
           "width": 0.4000000059604645
         },
-        "width": 16.541749954223633,
+        "width": 16.541748046875,
         "window": {
           "visible": true
         }