PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Updated LUS
Some checks are pending
GenerateBuilds / build-macos (push) Blocked by required conditions
Details
GenerateBuilds / build-linux (push) Blocked by required conditions
Details
GenerateBuilds / generate-port-o2r (push) Waiting to run
Details
GenerateBuilds / build-windows (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
KiritoDv 2025-01-15 13:12:00 -06:00
parent 223280a84e
commit 5aac47e2fa
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit 3e46fe77a4581a84f9c0edfab9c3a69a5320fe01
Subproject commit 31df12cdb7b877f4f0790dcc216a2c9d3823d58b

13
src/port/Engine.cpp
View File

@ -218,7 +218,6 @@ void GameEngine::StartFrame() const {
default:
break;
}
this->context->GetWindow()->StartFrame();
}
#if 0
@ -329,9 +328,17 @@ void GameEngine::AudioExit() {
}
void GameEngine::RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements) {
auto wnd = std::dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());
if (wnd == nullptr) {
return;
}
// Process window events for resize, mouse, keyboard events
wnd->HandleEvents();
for (const auto& m : mtx_replacements) {
gfx_run(Commands, m);
gfx_end_frame();
wnd->DrawAndRunGraphicsCommands(Commands, m);
}
bool curAltAssets = CVarGetInteger("gEnhancements.Mods.AlternateAssets", 0);

2
src/port/ui/UIWidgets.cpp
View File

@ -156,7 +156,7 @@ namespace UIWidgets {
ImGui::RenderFrame(check_bb.Min, check_bb.Max, ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding);
ImU32 check_col = ImGui::GetColorU32(ImGuiCol_CheckMark);
ImU32 cross_col = ImGui::GetColorU32(ImVec4(0.50f, 0.50f, 0.50f, 1.00f));
bool mixed_value = (g.LastItemData.InFlags & ImGuiItemFlags_MixedValue) != 0;
bool mixed_value = (g.LastItemData.ItemFlags & ImGuiItemFlags_MixedValue) != 0;
if (mixed_value) {
// Undocumented tristate/mixed/indeterminate checkbox (#2644)
// This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all widgets (not just checkbox)