[glass] Default to 2024 field image

Also relax field scale check a bit so 2024 field image passes.
PeterJohnson · Jan 14, 2024 · e1d8773 · e1d8773
1 parent d2ee423
commit e1d8773
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/glass/src/lib/native/cpp/other/Field2D.cpp b/glass/src/lib/native/cpp/other/Field2D.cpp
@@ -343,7 +343,7 @@ static bool InputPose(frc::Pose2d* pose) {
 }
 
 FieldInfo::FieldInfo(Storage& storage)
-    : m_builtin{storage.GetString("builtin")},
+    : m_builtin{storage.GetString("builtin", "2024 Crescendo")},
       m_filename{storage.GetString("image")},
       m_width{storage.GetFloat("width", kDefaultWidth.to<float>())},
       m_height{storage.GetFloat("height", kDefaultHeight.to<float>())},
@@ -511,7 +511,7 @@ bool FieldInfo::LoadJson(std::span<const char> is, std::string_view filename) {
   // check scaling
   int fieldWidth = m_right - m_left;
   int fieldHeight = m_bottom - m_top;
-  if (std::abs((fieldWidth / width) - (fieldHeight / height)) > 0.1) {
+  if (std::abs((fieldWidth / width) - (fieldHeight / height)) > 0.3) {
     fmt::print(stderr,
                "GUI: Field X and Y scaling substantially different: "
                "xscale={} yscale={}\n",