1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2024-11-22 08:50:18 +01:00

Compare commits

..

3 commits

Author SHA1 Message Date
Muzychenko Andrey
6c299ed103
Updated plans in readme 2021-10-30 12:51:24 +03:00
Muzychenko Andrey
fc1975a607 Fixed bug: dialogs not shown when main menu is hidden.
Ref issue #76.
2021-10-30 12:34:17 +03:00
Muzychenko Andrey
e61bbd634c Added fallback to SW SDL renderer. 2021-10-30 10:12:30 +03:00
2 changed files with 19 additions and 13 deletions

View file

@ -77,10 +77,10 @@ Tested with: macOS Big Sur (Intel) with Xcode 13 & macOS Montery Beta (Apple Sil
* ~~Decompile original game~~ * ~~Decompile original game~~
* ~~Resizable window, scaled graphics~~ * ~~Resizable window, scaled graphics~~
* ~~Loader for high-res sprites from CADET.DAT~~ * ~~Loader for high-res sprites from CADET.DAT~~
* ~~Cross-platform port using SDL2, SDL2_mixer, ImGui~~
* Misc features of Full Tilt: 3 music tracks, multiball, centered textboxes, etc. * Misc features of Full Tilt: 3 music tracks, multiball, centered textboxes, etc.
* Cross-platform port * Maybe: Text translations
* Using SDL2, SDL2_mixer, ImGui * Maybe: Android port
* Maybe: Android port
* Maybe x2: support for other two tables * Maybe x2: support for other two tables
* Table specific BL (control interactions and missions) is hardcoded, othere parts might be also patched * Table specific BL (control interactions and missions) is hardcoded, othere parts might be also patched

View file

@ -37,7 +37,7 @@ bool winmain::LaunchBallEnabled = true;
bool winmain::HighScoresEnabled = true; bool winmain::HighScoresEnabled = true;
bool winmain::DemoActive = false; bool winmain::DemoActive = false;
char* winmain::BasePath; char* winmain::BasePath;
int winmain::MainMenuHeight = 0; int winmain::MainMenuHeight = 0;
std::string winmain::FpsDetails; std::string winmain::FpsDetails;
double winmain::UpdateToFrameRatio; double winmain::UpdateToFrameRatio;
winmain::DurationMs winmain::TargetFrameTime; winmain::DurationMs winmain::TargetFrameTime;
@ -88,18 +88,25 @@ int winmain::WinMain(LPCSTR lpCmdLine)
return 1; return 1;
} }
SDL_Renderer* renderer = SDL_CreateRenderer // If HW fails, fallback to SW SDL renderer.
( SDL_Renderer* renderer = nullptr;
window, for (int i = 0; i < 2 && !renderer; i++)
-1, {
SDL_RENDERER_ACCELERATED Renderer = renderer = SDL_CreateRenderer
); (
Renderer = renderer; window,
-1,
i == 0 ? SDL_RENDERER_ACCELERATED : SDL_RENDERER_SOFTWARE
);
}
if (!renderer) if (!renderer)
{ {
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not create renderer", SDL_GetError(), window); SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not create renderer", SDL_GetError(), window);
return 1; return 1;
} }
SDL_RendererInfo rendererInfo{};
if (!SDL_GetRendererInfo(renderer, &rendererInfo))
printf("Using SDL renderer: %s\n", rendererInfo.name);
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest"); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
@ -332,7 +339,6 @@ void winmain::RenderUi()
} }
ImGui::End(); ImGui::End();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
return;
} }
// No demo window in release to save space // No demo window in release to save space
@ -341,7 +347,7 @@ void winmain::RenderUi()
ImGui::ShowDemoWindow(&ShowImGuiDemo); ImGui::ShowDemoWindow(&ShowImGuiDemo);
#endif #endif
if (ImGui::BeginMainMenuBar()) if (Options.ShowMenu && ImGui::BeginMainMenuBar())
{ {
int currentMenuHeight = static_cast<int>(ImGui::GetWindowSize().y); int currentMenuHeight = static_cast<int>(ImGui::GetWindowSize().y);
if (MainMenuHeight != currentMenuHeight) if (MainMenuHeight != currentMenuHeight)