nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fetch imgui (#4094)

Browse Source
This commit is contained in:
briaguya
2024-04-30 22:49:54 -04:00
committed by GitHub
parent c70e6d280a
commit 8480f37f77
14 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

Submodule libultraship updated: 5b67a45fc4...8b4a7a627b

2
soh/soh/Enhancements/audio/AudioEditor.h
View File

@@ -7,7 +7,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include "AudioCollection.h" #include "AudioCollection.h"
class AudioEditor : public Ship::GuiWindow { class AudioEditor : public Ship::GuiWindow {

2
soh/soh/Enhancements/controls/InputViewer.cpp
View File

@@ -7,7 +7,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <cmath> #include <cmath>

2
soh/soh/Enhancements/controls/SohInputEditorWindow.h
View File

@@ -5,7 +5,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <vector> #include <vector>

4
soh/soh/Enhancements/debugconsole.cpp
View File

@@ -20,8 +20,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <ImGui/imgui_internal.h> #include <imgui_internal.h>
#undef PATH_HACK #undef PATH_HACK
#undef Path #undef Path

4
soh/soh/Enhancements/game-interactor/GameInteractor_Remote.cpp
View File

@@ -2,8 +2,8 @@
#include "GameInteractor.h" #include "GameInteractor.h"
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <ImGui/imgui.h> #include <imgui.h>
#include <ImGui/imgui_internal.h> #include <imgui_internal.h>
#include <unordered_map> #include <unordered_map>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@@ -15,8 +15,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <ImGui/imgui_internal.h> #include <imgui_internal.h>
#include "../custom-message/CustomMessageTypes.h" #include "../custom-message/CustomMessageTypes.h"
#include "../item-tables/ItemTableManager.h" #include "../item-tables/ItemTableManager.h"
#include "../presets.h" #include "../presets.h"

2
soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp
View File

@@ -1,5 +1,5 @@
#include "ResolutionEditor.h" #include "ResolutionEditor.h"
#include <ImGui/imgui.h> #include <imgui.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <soh/UIWidgets.hpp> #include <soh/UIWidgets.hpp>

2
soh/soh/OTRGlobals.cpp
View File

@@ -319,7 +319,7 @@ OTRGlobals::OTRGlobals() {
context->InitConsole(); context->InitConsole();
auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>("gControllerConfigurationEnabled", "Input Editor"); auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>("gControllerConfigurationEnabled", "Input Editor");
context->InitWindow(sohInputEditorWindow); context->InitWindow({ sohInputEditorWindow });
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f); overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f);

4
soh/soh/SohGui.cpp
View File

@@ -11,8 +11,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <ImGui/imgui_internal.h> #include <imgui_internal.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <Fast3D/gfx_pc.h> #include <Fast3D/gfx_pc.h>

2
soh/soh/SohMenuBar.cpp
View File

@@ -2,7 +2,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include "ImGui/imgui.h" #include <imgui.h>
#include "regex" #include "regex"
#include "public/bridge/consolevariablebridge.h" #include "public/bridge/consolevariablebridge.h"
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>

2
soh/soh/SohModals.cpp
View File

@@ -1,5 +1,5 @@
#include "SohModals.h" #include "SohModals.h"
#include "ImGui/imgui.h" #include <imgui.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <libultraship/bridge.h> #include <libultraship/bridge.h>

4
soh/soh/UIWidgets.cpp
View File

@@ -10,8 +10,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
#include <ImGui/imgui_internal.h> #include <imgui_internal.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <libultraship/libultra/types.h> #include <libultraship/libultra/types.h>

2
soh/soh/UIWidgets.hpp
View File

@@ -16,7 +16,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <ImGui/imgui.h> #include <imgui.h>
namespace UIWidgets { namespace UIWidgets {