AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compile fixes

This commit is contained in:
Phillip Stephens 2021-06-06 16:58:27 -07:00
parent 5f1aed51cb
commit 5bfe881b95
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
3 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Runtime/ImGuiConsole.cpp
View File

@ -859,24 +859,7 @@ void ImGuiConsole::ShowDebugOverlay() {
ImGuiStringViewText(fmt::format(FMT_STRING("Resource Objects: {}\n"), g_SimplePool->GetLiveObjects())); ImGuiStringViewText(fmt::format(FMT_STRING("Resource Objects: {}\n"), g_SimplePool->GetLiveObjects()));
} }
if (ImGui::BeginPopupContextWindow()) { ShowCornerContextMenu(m_debugOverlayCorner, m_inputOverlayCorner);
if (ImGui::MenuItem("Custom", nullptr, m_debugOverlayCorner == -1)) {
m_debugOverlayCorner = -1;
}
if (ImGui::MenuItem("Top-left", nullptr, m_debugOverlayCorner == 0, m_inputOverlayCorner != 0)) {
m_debugOverlayCorner = 0;
}
if (ImGui::MenuItem("Top-right", nullptr, m_debugOverlayCorner == 1, m_inputOverlayCorner != 1)) {
m_debugOverlayCorner = 1;
}
if (ImGui::MenuItem("Bottom-left", nullptr, m_debugOverlayCorner == 2, m_inputOverlayCorner != 2)) {
m_debugOverlayCorner = 2;
}
if (ImGui::MenuItem("Bottom-right", nullptr, m_debugOverlayCorner == 3, m_inputOverlayCorner != 3)) {
m_debugOverlayCorner = 3;
}
ImGui::EndPopup();
}
} }
ImGui::End(); ImGui::End();
} }
@ -895,17 +878,7 @@ void ImGuiConsole::ShowInputViewer() {
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing |
ImGuiWindowFlags_NoNav; ImGuiWindowFlags_NoNav;
if (m_inputOverlayCorner != -1) { if (m_inputOverlayCorner != -1) {
const ImGuiViewport* viewport = ImGui::GetMainViewport(); SetOverlayWindowLocation(m_inputOverlayCorner);
ImVec2 workPos = viewport->WorkPos; // Use work area to avoid menu-bar/task-bar, if any!
ImVec2 workSize = viewport->WorkSize;
ImVec2 windowPos;
ImVec2 windowPosPivot;
constexpr float padding = 10.0f;
windowPos.x = (m_inputOverlayCorner & 1) != 0 ? (workPos.x + workSize.x - padding) : (workPos.x + padding);
windowPos.y = (m_inputOverlayCorner & 2) != 0 ? (workPos.y + workSize.y - padding) : (workPos.y + padding);
windowPosPivot.x = (m_inputOverlayCorner & 1) != 0 ? 1.0f : 0.0f;
windowPosPivot.y = (m_inputOverlayCorner & 2) != 0 ? 1.0f : 0.0f;
ImGui::SetNextWindowPos(windowPos, ImGuiCond_Always, windowPosPivot);
windowFlags |= ImGuiWindowFlags_NoMove; windowFlags |= ImGuiWindowFlags_NoMove;
} }
ImGui::SetNextWindowBgAlpha(0.65f); ImGui::SetNextWindowBgAlpha(0.65f);
@ -1037,26 +1010,44 @@ void ImGuiConsole::ShowInputViewer() {
} }
ImGui::Dummy(zeus::CVector2f(270, 130) * scale); ImGui::Dummy(zeus::CVector2f(270, 130) * scale);
ShowCornerContextMenu(m_inputOverlayCorner, m_debugOverlayCorner);
}
ImGui::End();
}
void ImGuiConsole::ShowCornerContextMenu(int& corner, int avoidCorner) const {
if (ImGui::BeginPopupContextWindow()) { if (ImGui::BeginPopupContextWindow()) {
if (ImGui::MenuItem("Custom", nullptr, m_inputOverlayCorner == -1)) { if (ImGui::MenuItem("Custom", nullptr, corner == -1)) {
m_inputOverlayCorner = -1; corner = -1;
} }
if (ImGui::MenuItem("Top-left", nullptr, m_inputOverlayCorner == 0, m_debugOverlayCorner != 0)) { if (ImGui::MenuItem("Top-left", nullptr, corner == 0, avoidCorner != 0)) {
m_inputOverlayCorner = 0; corner = 0;
} }
if (ImGui::MenuItem("Top-right", nullptr, m_inputOverlayCorner == 1, m_debugOverlayCorner != 1)) { if (ImGui::MenuItem("Top-right", nullptr, corner == 1, avoidCorner != 1)) {
m_inputOverlayCorner = 1; corner = 1;
} }
if (ImGui::MenuItem("Bottom-left", nullptr, m_inputOverlayCorner == 2, m_debugOverlayCorner != 2)) { if (ImGui::MenuItem("Bottom-left", nullptr, corner == 2, avoidCorner != 2)) {
m_inputOverlayCorner = 2; corner = 2;
} }
if (ImGui::MenuItem("Bottom-right", nullptr, m_inputOverlayCorner == 3, m_debugOverlayCorner != 3)) { if (ImGui::MenuItem("Bottom-right", nullptr, corner == 3, avoidCorner != 3)) {
m_inputOverlayCorner = 3; corner = 3;
} }
ImGui::EndPopup(); ImGui::EndPopup();
} }
} }
ImGui::End();
void ImGuiConsole::SetOverlayWindowLocation(int corner) const {
const ImGuiViewport* viewport = ImGui::GetMainViewport();
ImVec2 workPos = viewport->WorkPos; // Use work area to avoid menu-bar/task-bar, if any!
ImVec2 workSize = viewport->WorkSize;
ImVec2 windowPos;
ImVec2 windowPosPivot;
constexpr float padding = 10.0f;
windowPos.x = (corner & 1) != 0 ? (workPos.x + workSize.x - padding) : (workPos.x + padding);
windowPos.y = (corner & 2) != 0 ? (workPos.y + workSize.y - padding) : (workPos.y + padding);
windowPosPivot.x = (corner & 1) != 0 ? 1.0f : 0.0f;
windowPosPivot.y = (corner & 2) != 0 ? 1.0f : 0.0f;
ImGui::SetNextWindowPos(windowPos, ImGuiCond_Always, windowPosPivot);
} }
void ImGuiConsole::ShowAppMainMenuBar(bool canInspect) { void ImGuiConsole::ShowAppMainMenuBar(bool canInspect) {
@ -1116,7 +1107,9 @@ void ImGuiConsole::ShowAppMainMenuBar(bool canInspect) {
if (ImGui::MenuItem("Clear Settings")) { if (ImGui::MenuItem("Clear Settings")) {
ImGui::ClearIniSettings(); ImGui::ClearIniSettings();
} }
#ifndef NDEBUG
ImGui::MenuItem("Show Demo", nullptr, &m_showDemoWindow); ImGui::MenuItem("Show Demo", nullptr, &m_showDemoWindow);
#endif
ImGui::EndMenu(); ImGui::EndMenu();
} }
ImGui::EndMenu(); ImGui::EndMenu();

2
Runtime/ImGuiConsole.hpp
View File

@ -104,5 +104,7 @@ private:
void ShowConsoleVariablesWindow(); void ShowConsoleVariablesWindow();
void ShowMenuHint(); void ShowMenuHint();
void ShowInputViewer(); void ShowInputViewer();
void SetOverlayWindowLocation(int corner) const;
void ShowCornerContextMenu(int& corner, int avoidCorner) const;
}; };
} // namespace metaforce } // namespace metaforce

1
Runtime/MP1/CMemoryCardDriver.cpp
View File

@ -4,6 +4,7 @@
#include "Runtime/CCRC32.hpp" #include "Runtime/CCRC32.hpp"
#include "Runtime/MP1/MP1.hpp" #include "Runtime/MP1/MP1.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
namespace metaforce::MP1 { namespace metaforce::MP1 {