[upstream_utils] Add imgui and friends (wpilibsuite#6822)

srimanachanta · Jul 21, 2024 · 6922b9d · 6922b9d
1 parent 8548d83
commit 6922b9d
Show file tree

Hide file tree

Showing 157 changed files with 149,208 additions and 165 deletions.
diff --git a/.github/workflows/pregenerate.yml b/.github/workflows/pregenerate.yml
@@ -36,6 +36,10 @@ jobs:
         run: ./wpilibj/generate_hids.py && ./wpilibc/generate_hids.py && ./wpilibNewCommands/generate_hids.py
       - name: Run PWM Controllers
         run: ./wpilibj/generate_pwm_motor_controllers.py && ./wpilibc/generate_pwm_motor_controllers.py
+      - name: Run imgui gl3w
+        run: ./thirdparty/imgui_suite/generate_gl3w.py
+      - name: Run imgui fonts
+        run: ./thirdparty/imgui_suite/generate_fonts.sh
       - name: Add untracked files to index so they count as changes
         run: git add -A
       - name: Check output

diff --git a/.github/workflows/upstream-utils.yml b/.github/workflows/upstream-utils.yml
@@ -45,11 +45,31 @@ jobs:
           cd upstream_utils
           ./gcem.py clone
           ./gcem.py copy-upstream-to-thirdparty
+      - name: Run gl3w.py
+        run: |
+          cd upstream_utils
+          ./gl3w.py clone
+          ./gl3w.py copy-upstream-to-thirdparty
+      - name: Run glfw.py
+        run: |
+          cd upstream_utils
+          ./glfw.py clone
+          ./glfw.py copy-upstream-to-thirdparty
       - name: Run googletest.py
         run: |
           cd upstream_utils
           ./googletest.py clone
           ./googletest.py copy-upstream-to-thirdparty
+      - name: Run imgui.py
+        run: |
+          cd upstream_utils
+          ./imgui.py clone
+          ./imgui.py copy-upstream-to-thirdparty
+      - name: Run implot.py
+        run: |
+          cd upstream_utils
+          ./implot.py clone
+          ./implot.py copy-upstream-to-thirdparty
       - name: Run json.py
         run: |
           cd upstream_utils
@@ -90,6 +110,11 @@ jobs:
           cd upstream_utils
           ./sleipnir.py clone
           ./sleipnir.py copy-upstream-to-thirdparty
+      - name: Run stb.py
+        run: |
+          cd upstream_utils
+          ./stb.py clone
+          ./stb.py copy-upstream-to-thirdparty
       - name: Add untracked files to index so they count as changes
         run: git add -A
       - name: Check output

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -287,7 +287,7 @@ endif()
 
 if(WITH_GUI)
     add_subdirectory(fieldImages)
-    add_subdirectory(imgui)
+    add_subdirectory(thirdparty/imgui_suite)
     add_subdirectory(wpigui)
     add_subdirectory(glass)
     add_subdirectory(outlineviewer)

diff --git a/cscore/build.gradle b/cscore/build.gradle
@@ -186,8 +186,6 @@ nativeUtils.exportsConfigs {
     }
 }
 
-apply from: "${rootDir}/shared/imgui.gradle"
-
 model {
     components {
         examplesMap.each { key, value ->
@@ -200,7 +198,7 @@ model {
                             lib project: ':wpinet', library: 'wpinet', linkage: 'shared'
                             lib project: ':wpigui', library: 'wpigui', linkage: 'static'
                             lib library: 'cscore', linkage: 'shared'
-                            nativeUtils.useRequiredLibrary(it, 'imgui')
+                            lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                             if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
                                 it.buildable = false
                                 return

diff --git a/datalogtool/build.gradle b/datalogtool/build.gradle
@@ -25,7 +25,6 @@ def wpilibVersionFileInput = file("src/main/generate/WPILibVersion.cpp.in")
 def wpilibVersionFileOutput = file("$buildDir/generated/main/cpp/WPILibVersion.cpp")
 
 apply from: "${rootDir}/shared/libssh.gradle"
-apply from: "${rootDir}/shared/imgui.gradle"
 
 task generateCppVersion() {
     description = 'Generates the wpilib version class'
@@ -102,7 +101,8 @@ model {
                 lib project: ':glass', library: 'glass', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
-                nativeUtils.useRequiredLibrary(it, 'imgui', 'libssh')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
+                nativeUtils.useRequiredLibrary(it, 'libssh')
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                     it.linker.args << 'ws2_32.lib' << 'advapi32.lib' << 'crypt32.lib' << 'user32.lib'

diff --git a/glass/build.gradle b/glass/build.gradle
@@ -24,8 +24,6 @@ apply from: "${rootDir}/shared/config.gradle"
 def wpilibVersionFileInput = file("src/app/generate/WPILibVersion.cpp.in")
 def wpilibVersionFileOutput = file("$buildDir/generated/app/cpp/WPILibVersion.cpp")
 
-apply from: "${rootDir}/shared/imgui.gradle"
-
 task generateCppVersion() {
     description = 'Generates the wpilib version class'
     group = 'WPILib'
@@ -112,7 +110,7 @@ model {
                 lib project: ':wpimath', library: 'wpimath', linkage: 'shared'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
                 lib project: ':fieldImages', library: 'fieldImages', linkage: 'shared'
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
             }
             appendDebugPathToBinaries(binaries)
         }
@@ -142,7 +140,7 @@ model {
                 lib project: ':wpimath', library: 'wpimath', linkage: 'shared'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
                 lib project: ':fieldImages', library: 'fieldImages', linkage: 'shared'
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
             }
             appendDebugPathToBinaries(binaries)
         }
@@ -181,7 +179,7 @@ model {
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
                 lib project: ':fieldImages', library: 'fieldImages', linkage: 'static'
                 nativeUtils.useRequiredLibrary(it, 'opencv_static')
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                     it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind'

diff --git a/imgui/.styleguide b/imgui/.styleguide
diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
diff --git a/imgui/src/stb_image.cpp b/imgui/src/stb_image.cpp
diff --git a/outlineviewer/build.gradle b/outlineviewer/build.gradle
@@ -24,8 +24,6 @@ apply from: "${rootDir}/shared/config.gradle"
 def wpilibVersionFileInput = file("src/main/generate/WPILibVersion.cpp.in")
 def wpilibVersionFileOutput = file("$buildDir/generated/main/cpp/WPILibVersion.cpp")
 
-apply from: "${rootDir}/shared/imgui.gradle"
-
 task generateCppVersion() {
     description = 'Generates the wpilib version class'
     group = 'WPILib'
@@ -104,7 +102,7 @@ model {
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
                 lib project: ':fieldImages', library: 'fieldImages', linkage: 'static'
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                 } else if (it.targetPlatform.operatingSystem.isMacOsX()) {

diff --git a/roborioteamnumbersetter/build.gradle b/roborioteamnumbersetter/build.gradle
@@ -25,7 +25,6 @@ def wpilibVersionFileInput = file("src/main/generate/WPILibVersion.cpp.in")
 def wpilibVersionFileOutput = file("$buildDir/generated/main/cpp/WPILibVersion.cpp")
 
 apply from: "${rootDir}/shared/libssh.gradle"
-apply from: "${rootDir}/shared/imgui.gradle"
 
 task generateCppVersion() {
     description = 'Generates the wpilib version class'
@@ -103,7 +102,8 @@ model {
                 lib project: ':wpinet', library: 'wpinet', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
-                nativeUtils.useRequiredLibrary(it, 'imgui', 'libssh')
+                nativeUtils.useRequiredLibrary(it, 'libssh')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                     it.linker.args << 'ws2_32.lib' << 'advapi32.lib' << 'crypt32.lib' << 'user32.lib'

diff --git a/settings.gradle b/settings.gradle
@@ -61,6 +61,7 @@ include 'processstarter'
 include 'epilogue-processor'
 include 'epilogue-runtime'
 include 'thirdparty:googletest'
+include 'thirdparty:imgui_suite'
 
 buildCache {
     def cred = {

diff --git a/shared/imgui.gradle b/shared/imgui.gradle
diff --git a/simulation/halsim_gui/build.gradle b/simulation/halsim_gui/build.gradle
@@ -20,8 +20,6 @@ apply from: "${rootDir}/shared/googletest.gradle"
 apply from: "${rootDir}/shared/plugins/setupBuild.gradle"
 
 
-apply from: "${rootDir}/shared/imgui.gradle"
-
 model {
     binaries {
         all {
@@ -33,7 +31,7 @@ model {
             lib project: ':wpinet', library: 'wpinet', linkage: 'shared'
             lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
             lib project: ':fieldImages', library: 'fieldImages', linkage: 'static'
-            nativeUtils.useRequiredLibrary(it, 'imgui')
+            lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
             if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
                 it.buildable = false
                 return

diff --git a/sysid/build.gradle b/sysid/build.gradle
@@ -25,8 +25,6 @@ apply from: "${rootDir}/shared/config.gradle"
 def wpilibVersionFileInput = file("src/main/generate/WPILibVersion.cpp.in")
 def wpilibVersionFileOutput = file("$buildDir/generated/main/cpp/WPILibVersion.cpp")
 
-apply from: "${rootDir}/shared/imgui.gradle"
-
 task generateCppVersion() {
     description = 'Generates the wpilib version class'
     group = 'WPILib'
@@ -105,7 +103,7 @@ model {
                 lib project: ':wpimath', library: 'wpimath', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                     it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind'
@@ -147,7 +145,7 @@ model {
                 lib project: ':wpimath', library: 'wpimath', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
-                nativeUtils.useRequiredLibrary(it, 'imgui')
+                lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static'
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                     it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind'