[build] Upgrade imgui and implot (#5668)

Upgrade implot to fix deprecation warning for sprintf(), and upgrade
imgui docking branch to match.
This commit is contained in:
Tyler Veness
2023-09-19 23:38:17 -07:00
committed by GitHub
parent 87ce1e3761
commit 97021f074a
9 changed files with 17 additions and 10 deletions

View File

@@ -7,13 +7,12 @@
#include <memory>
#include <string_view>
#include <libssh/libssh.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <glass/Context.h>
#include <glass/MainMenuBar.h>
#include <glass/Storage.h>
#include <libssh/libssh.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include <imgui_internal.h>
#include <wpigui.h>

View File

@@ -4,6 +4,7 @@
#pragma once
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0,

View File

@@ -4,9 +4,8 @@
#include "glass/support/ExtraGuiWidgets.h"
#include <imgui.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include <imgui_internal.h>
#include "glass/DataSource.h"

View File

@@ -9,6 +9,7 @@
#include <string_view>
#include <utility>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include "glass/View.h"

View File

@@ -10,6 +10,8 @@
#include <frc/geometry/Pose2d.h>
#include <frc/geometry/Rotation2d.h>
#include <frc/geometry/Translation2d.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include <wpi/function_ref.h>

View File

@@ -6,6 +6,8 @@
#include <frc/geometry/Rotation2d.h>
#include <frc/geometry/Translation2d.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
#include <wpi/function_ref.h>

View File

@@ -4,6 +4,7 @@
#pragma once
#define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui.h>
namespace glass {

View File

@@ -13,12 +13,14 @@ FetchContent_Declare(
FetchContent_Declare(
imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG 3ea0fad204e994d669f79ed29dcaf61cd5cb571d
# docking branch
GIT_TAG 64b1e448d20c9be9275af731c34b4c7bf14a8e95
)
FetchContent_Declare(
implot
GIT_REPOSITORY https://github.com/epezent/implot.git
GIT_TAG e80e42e8b4136ddb84ccfe04fa28d0c745828952
# v0.16
GIT_TAG 18c72431f8265e2b0b5378a3a73d8a883b2175ff
)
FetchContent_Declare(
fonts

View File

@@ -1,12 +1,12 @@
nativeUtils {
nativeDependencyContainer {
imgui(getNativeDependencyTypeClass('WPIStaticMavenDependency')) {
groupId = "edu.wpi.first.thirdparty.frc2023"
groupId = "edu.wpi.first.thirdparty.frc2024"
artifactId = "imgui"
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = '1.89.1-2'
version = '1.89.9-1'
targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
}
}