upgrade to docking imgui 1.90.0 (#3402)

ce0d0ac829

libultraship

@@ -1 +1 @@
-Subproject commit 7a8d314a0ecc7d6ece1b12626a0ae917ee4ed666
+Subproject commit d25e0e977755ec09c22d6540963ffcd825954a23

soh/soh/Enhancements/audio/AudioEditor.h

@@ -4,6 +4,9 @@
 #ifdef __cplusplus
 
 #include <libultraship/libultraship.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 
 class AudioEditor : public LUS::GuiWindow {

soh/soh/Enhancements/controls/GameControlEditor.cpp

@@ -7,6 +7,9 @@
 #include <iterator>
 #include <variables.h>
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/bridge.h>

soh/soh/Enhancements/controls/SohInputEditorWindow.h

@@ -2,6 +2,9 @@
 
 #include "stdint.h"
 #include <libultraship/libultraship.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 #include <unordered_map>
 #include <string>

soh/soh/Enhancements/debugconsole.cpp

@@ -17,6 +17,10 @@
 
 #include <Window.h>
 #include <Context.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #undef PATH_HACK
 #undef Path

soh/soh/Enhancements/randomizer/randomizer.cpp

@@ -12,6 +12,10 @@
 #include "3drando/rando_main.hpp"
 #include "3drando/random.hpp"
 #include "../../UIWidgets.hpp"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include "../custom-message/CustomMessageTypes.h"
 #include "../item-tables/ItemTableManager.h"

soh/soh/SohGui.cpp

@@ -8,8 +8,10 @@
 #include "SohGui.hpp"
 
 #include <spdlog/spdlog.h>
-#include <ImGui/imgui.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/libultraship.h>
 #include <Fast3D/gfx_pc.h>

soh/soh/SohMenuBar.cpp

@@ -1,4 +1,7 @@
 #include "SohMenuBar.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "ImGui/imgui.h"
 #include "regex"
 #include "public/bridge/consolevariablebridge.h"

soh/soh/UIWidgets.cpp

@@ -7,7 +7,10 @@
 
 #include "UIWidgets.hpp"
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/libultraship.h>
 

soh/soh/UIWidgets.hpp

@@ -12,6 +12,9 @@
 #include <vector>
 #include <span>
 #include <stdint.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 
 namespace UIWidgets {