diff --git a/fieldImages/src/main/java/edu/wpi/fields/Fields.java b/fieldImages/src/main/java/edu/wpi/fields/Fields.java index 119415edef..a92cfb0f5c 100644 --- a/fieldImages/src/main/java/edu/wpi/fields/Fields.java +++ b/fieldImages/src/main/java/edu/wpi/fields/Fields.java @@ -15,12 +15,13 @@ public enum Fields { k2021GalacticSearchB("2021-galacticsearchb.json"), k2021Slalom("2021-slalompath.json"), k2022RapidReact("2022-rapidreact.json"), - k2023ChargedUp("2023-chargedup.json"); + k2023ChargedUp("2023-chargedup.json"), + k2024Crescendo("2024-crescendo.json"); public static final String kBaseResourceDir = "/edu/wpi/first/fields/"; /** Alias to the current game. */ - public static final Fields kDefaultField = k2023ChargedUp; + public static final Fields kDefaultField = k2024Crescendo; public final String m_resourceFile; diff --git a/fieldImages/src/main/native/cpp/fields.cpp b/fieldImages/src/main/native/cpp/fields.cpp index 4f79e6bf77..6fd6af0936 100644 --- a/fieldImages/src/main/native/cpp/fields.cpp +++ b/fieldImages/src/main/native/cpp/fields.cpp @@ -15,10 +15,13 @@ #include "fields/2021-slalom.h" #include "fields/2022-rapidreact.h" #include "fields/2023-chargedup.h" +#include "fields/2024-crescendo.h" using namespace fields; static const Field kFields[] = { + {"2024 Crescendo", GetResource_2024_crescendo_json, + GetResource_2024_field_png}, {"2023 Charged Up", GetResource_2023_chargedup_json, GetResource_2023_field_png}, {"2022 Rapid React", GetResource_2022_rapidreact_json, diff --git a/fieldImages/src/main/native/include/fields/2024-crescendo.h b/fieldImages/src/main/native/include/fields/2024-crescendo.h new file mode 100644 index 0000000000..11947efa5e --- /dev/null +++ b/fieldImages/src/main/native/include/fields/2024-crescendo.h @@ -0,0 +1,12 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +#pragma once + +#include + +namespace fields { +std::string_view GetResource_2024_crescendo_json(); +std::string_view GetResource_2024_field_png(); +} // namespace fields diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json new file mode 100644 index 0000000000..32650381bc --- /dev/null +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json @@ -0,0 +1,19 @@ +{ + "game": "Crescendo", + "field-image": "2024-field.png", + "field-corners": { + "top-left": [ + 46, + 36 + ], + "bottom-right": [ + 1088, + 544 + ] + }, + "field-size": [ + 54.27083, + 26.2916 + ], + "field-unit": "foot" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-field.png b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-field.png new file mode 100644 index 0000000000..c642a7fda1 Binary files /dev/null and b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-field.png differ