BITCH I'M BACK OUT MY COMA

This commit is contained in:
CocoSimone
2023-02-12 23:58:26 +01:00
parent a81587ec21
commit eb10687837
8 changed files with 199 additions and 117 deletions

View File

@@ -14,7 +14,7 @@ namespace fs = std::filesystem;
name = value; \
} else { \
settingsFile.clear(); \
settings[param1][param2] = defaultVal; \
settings[param1][param2] = defaultVal; \
settingsFile << settings; \
name = defaultVal; \
} \

View File

@@ -37,8 +37,6 @@ void Window::InitSDL() {
SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI
);
windowID = SDL_GetWindowID(window);
if(volkInitialize() != VK_SUCCESS) {
Util::panic("Failed to load Volk!");
}
@@ -116,9 +114,6 @@ void Window::InitImgui() {
initInfo.CheckVkResultFn = check_vk_result;
ImGui_ImplVulkan_Init(&initInfo, GetVkRenderPass());
uiFont = io.Fonts->AddFontFromFileTTF("resources/OpenSans.ttf", 15.f);
codeFont = io.Fonts->AddFontFromFileTTF("resources/Sweet16.ttf", 15.f);
int displayIndex = SDL_GetWindowDisplayIndex(window);
float ddpi, hdpi, vdpi;
SDL_GetDisplayDPI(displayIndex, &ddpi, &hdpi, &vdpi);
@@ -126,7 +121,6 @@ void Window::InitImgui() {
ddpi /= 96.f;
uiFont = io.Fonts->AddFontFromFileTTF("resources/OpenSans.ttf", 16.f * ddpi);
codeFont = io.Fonts->AddFontFromFileTTF("resources/Sweet16.ttf", 16.f * ddpi);
ImGui::GetStyle().ScaleAllSizes(ddpi);
@@ -138,11 +132,12 @@ void Window::InitImgui() {
}
Window::~Window() {
VkResult err = vkDeviceWaitIdle(device);
auto err = vkDeviceWaitIdle(device);
check_vk_result(err);
ImGui_ImplVulkan_Shutdown();
ImGui_ImplSDL2_Shutdown();
ImGui::DestroyContext();
SDL_DestroyWindow(window);
SDL_DestroyWindow(g_Window);
SDL_Quit();

View File

@@ -15,8 +15,7 @@ struct Window {
ImDrawData* Present(n64::Core& core);
[[nodiscard]] bool gotClosed(SDL_Event event);
ImFont *uiFont{}, *codeFont{};
u32 windowID{};
ImFont *uiFont{};
Settings settings;
GameList gameList;
void LoadROM(n64::Core& core, const std::string& path);