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

Add developer menu hint on startup

This commit is contained in:
Luke Street 2021-05-31 11:03:41 -04:00
parent 1a1c008239
commit b55e56b8a6
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CMakeLists.txt
View File

@ -206,8 +206,8 @@ elseif(UNIX)
set(PLAT_LIBS rt) set(PLAT_LIBS rt)
endif() endif()
add_executable(metaforce CMain.cpp ${PLAT_SRCS} ImGuiConsole.hpp ImGuiConsole.cpp ImGuiEntitySupport.hpp ImGuiEntitySupport.cpp ImGuiPlayerLoadouts.hpp) add_executable(metaforce CMain.cpp ${PLAT_SRCS} ImGuiConsole.hpp ImGuiConsole.cpp ImGuiEntitySupport.hpp ImGuiEntitySupport.cpp) # ImGuiPlayerLoadouts.hpp
target_atdna(metaforce atdna_ImGuiPlayerLoadouts.cpp ImGuiPlayerLoadouts.hpp) # target_atdna(metaforce atdna_ImGuiPlayerLoadouts.cpp ImGuiPlayerLoadouts.hpp)
# RUNTIME_LIBRARIES repeated here for link ordering # RUNTIME_LIBRARIES repeated here for link ordering
target_link_libraries(metaforce PUBLIC RuntimeCommon RuntimeCommonB ${RUNTIME_LIBRARIES} ${PLAT_LIBS}) target_link_libraries(metaforce PUBLIC RuntimeCommon RuntimeCommonB ${RUNTIME_LIBRARIES} ${PLAT_LIBS})

39
Runtime/ImGuiConsole.cpp
View File

@ -142,7 +142,7 @@ void ImGuiConsole::LerpDebugColor(CActor* act) {
act->m_debugAddColor = zeus::skClear; act->m_debugAddColor = zeus::skClear;
return; return;
} }
act->m_debugAddColorTime += 1.f / 60.f; act->m_debugAddColorTime += ImGui::GetIO().DeltaTime;
float lerp = act->m_debugAddColorTime; float lerp = act->m_debugAddColorTime;
if (lerp > 2.f) { if (lerp > 2.f) {
lerp = 0.f; lerp = 0.f;
@ -1124,6 +1124,8 @@ void ImGuiConsole::PreUpdate() {
bool canInspect = g_StateManager != nullptr && g_StateManager->GetObjectList(); bool canInspect = g_StateManager != nullptr && g_StateManager->GetObjectList();
if (m_isVisible) { if (m_isVisible) {
ShowAppMainMenuBar(canInspect); ShowAppMainMenuBar(canInspect);
} else if (m_developer) {
ShowMenuHint();
} }
if (canInspect && (m_showInspectWindow || !inspectingEntities.empty())) { if (canInspect && (m_showInspectWindow || !inspectingEntities.empty())) {
UpdateEntityEntries(); UpdateEntityEntries();
@ -1463,4 +1465,39 @@ void ImGuiConsole::ShowLayersWindow() {
ImGui::End(); ImGui::End();
} }
void ImGuiConsole::ShowMenuHint() {
if (m_menuHintTime <= 0.f) {
return;
}
m_menuHintTime -= ImGui::GetIO().DeltaTime;
constexpr auto hintText = "Press ` to toggle menu";
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;
constexpr float padding = 10.0f;
windowPos.x = workPos.x + (workSize.x + ImGui::CalcTextSize(hintText).x) / 2 + ImGui::GetStyle().WindowPadding.x;
windowPos.y = workPos.y + workSize.y - padding;
ImGui::SetNextWindowPos(windowPos, ImGuiCond_Always, ImVec2{1.f, 1.f});
float alpha = std::min(m_menuHintTime, 1.f);
ImGui::SetNextWindowBgAlpha(alpha * 0.65f);
ImVec4 textColor = ImGui::GetStyleColorVec4(ImGuiCol_Text);
textColor.w *= alpha;
ImVec4 borderColor = ImGui::GetStyleColorVec4(ImGuiCol_Border);
borderColor.w *= alpha;
ImGui::PushStyleColor(ImGuiCol_Text, textColor);
ImGui::PushStyleColor(ImGuiCol_Border, borderColor);
if (ImGui::Begin("Menu Hint", nullptr,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize |
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav |
ImGuiWindowFlags_NoMove)) {
ImGui::TextUnformatted(hintText);
}
ImGui::End();
ImGui::PopStyleColor(2);
}
} // namespace metaforce } // namespace metaforce

2
Runtime/ImGuiConsole.hpp
View File

@ -88,6 +88,7 @@ private:
const void* m_currentRoom = nullptr; const void* m_currentRoom = nullptr;
double m_lastRoomTime = 0.f; double m_lastRoomTime = 0.f;
double m_currentRoomStart = 0.f; double m_currentRoomStart = 0.f;
float m_menuHintTime = 5.f;
void ShowAppMainMenuBar(bool canInspect); void ShowAppMainMenuBar(bool canInspect);
void ShowMenuGame(); void ShowMenuGame();
@ -99,5 +100,6 @@ private:
void ShowItemsWindow(); void ShowItemsWindow();
void ShowLayersWindow(); void ShowLayersWindow();
void ShowConsoleVariablesWindow(); void ShowConsoleVariablesWindow();
void ShowMenuHint();
}; };
} // namespace metaforce } // namespace metaforce