Add fonts + gdb stub WIP

src/frontend/imgui/Window.cpp

@@ -48,12 +48,9 @@ void Window::InitImgui() {
   ImGui::CreateContext();
   ImGuiIO& io = ImGui::GetIO();
   (void)io;
-  //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
-  //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 
   // Setup Dear ImGui style
   ImGui::StyleColorsDark();
-  //ImGui::StyleColorsLight();
 
   instance = GetVkInstance();
   physicalDevice = GetVkPhysicalDevice();
@@ -110,50 +107,19 @@ void Window::InitImgui() {
   initInfo.CheckVkResultFn = check_vk_result;
   ImGui_ImplVulkan_Init(&initInfo, GetVkRenderPass());
 
-  // Load Fonts
-  // - If no fonts are loaded, dear imgui will use the default font. You can also load multiple fonts and use ImGui::PushFont()/PopFont() to select them.
-  // - AddFontFromFileTTF() will return the ImFont* so you can store it if you need to select the font among multiple.
-  // - If the file cannot be loaded, the function will return NULL. Please handle those errors in your application (e.g. use an assertion, or display an error and quit).
-  // - The fonts will be rasterized at a given size (w/ oversampling) and stored into a texture when calling ImFontAtlas::Build()/GetTexDataAsXXXX(), which ImGui_ImplXXXX_NewFrame below will call.
-  // - Read 'docs/FONTS.md' for more instructions and details.
-  // - Remember that in C/C++ if you want to include a backslash \ in a string literal you need to write a double backslash \\ !
-  //io.Fonts->AddFontDefault();
-  //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Roboto-Medium.ttf", 16.0f);
-  //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Cousine-Regular.ttf", 15.0f);
-  //io.Fonts->AddFontFromFileTTF("../../misc/fonts/DroidSans.ttf", 16.0f);
-  //io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f);
-  //ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
-  //IM_ASSERT(font != NULL);
-  io.Fonts->AddFontDefault();
+  uiFont = io.Fonts->AddFontFromFileTTF("resources/OpenSans.ttf", 15.f);
+  codeFont = io.Fonts->AddFontFromFileTTF("resources/Sweet16.ttf", 15.f);
 
-  // Upload Fonts
   {
     VkCommandBuffer commandBuffer = GetVkCommandBuffer();
     ImGui_ImplVulkan_CreateFontsTexture(commandBuffer);
     SubmitRequestedVkCommandBuffer();
   }
-
-  VkSamplerCreateInfo samplerCreateInfo {
-    .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
-    .magFilter = VK_FILTER_NEAREST,
-    .minFilter = VK_FILTER_NEAREST,
-    .mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST,
-    .addressModeU = VK_SAMPLER_ADDRESS_MODE_REPEAT,
-    .addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT,
-    .addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT,
-    .maxAnisotropy = 1.0f,
-    .minLod = -1000,
-    .maxLod = 1000,
-  };
-  VkSampler sampler;
-  err = vkCreateSampler(device, &samplerCreateInfo, allocator, &sampler);
-  check_vk_result(err);
 }
 
 Window::~Window() {
   VkResult err = vkDeviceWaitIdle(device);
   check_vk_result(err);
-  vkDestroySampler(device, screenSampler, nullptr);
   ImGui_ImplVulkan_Shutdown();
   ImGui_ImplSDL2_Shutdown();
   ImGui::DestroyContext();
@@ -162,73 +128,17 @@ Window::~Window() {
   SDL_Quit();
 }
 
-ImDrawData* Window::Present(const Util::IntrusivePtr<Vulkan::Image>& image, n64::Core& core) {
+ImDrawData* Window::Present(n64::Core& core) {
   ImGui_ImplVulkan_NewFrame();
   ImGui_ImplSDL2_NewFrame(window);
   ImGui::NewFrame();
 
-  Render(image, core);
+  Render(core);
 
   ImGui::Render();
   return ImGui::GetDrawData();
 }
 
-void Window::Render(const Util::IntrusivePtr<Vulkan::Image>& image, n64::Core& core) {
-  if(windowID == SDL_GetWindowID(SDL_GetMouseFocus())) {
-    ImGui::BeginMainMenuBar();
-    if (ImGui::BeginMenu("File")) {
-      if (ImGui::MenuItem("Open", "O")) {
-        nfdchar_t *outpath;
-        const nfdu8filteritem_t filter{"Nintendo 64 roms", "n64,z64,v64,N64,Z64,V64"};
-        nfdresult_t result = NFD_OpenDialog(&outpath, &filter, 1, nullptr);
-        if (result == NFD_OKAY) {
-          core.LoadROM(outpath);
-          NFD_FreePath(outpath);
-        }
-      }
-      if (ImGui::MenuItem("Exit")) {
-        core.done = true;
-      }
-      ImGui::EndMenu();
-    }
-    if (ImGui::BeginMenu("Emulation")) {
-      if (ImGui::MenuItem("Reset")) {
-        core.Reset();
-      }
-      if (ImGui::MenuItem("Stop")) {
-        core.Stop();
-      }
-      if (ImGui::MenuItem(core.pause ? "Resume" : "Pause", nullptr, false, core.romLoaded)) {
-        core.TogglePause();
-      }
-      ImGui::EndMenu();
-    }
-    ImGui::EndMainMenuBar();
-  }
-
-  ImGui::Begin("Screen");
-  if(core.romLoaded && !core.pause) {
-    auto size = ImGui::GetContentRegionAvail();
-    float current_aspect_ratio = size.x / size.y;
-    if (ASPECT_RATIO > current_aspect_ratio) {
-      size.y = size.x / ASPECT_RATIO;
-    }
-    else {
-      size.x = size.y * ASPECT_RATIO;
-    }
-
-    ImGui::SetCursorPos({
-      (ImGui::GetContentRegionAvail().x / 2) - (size.x / 2),
-      (ImGui::GetContentRegionAvail().y / 2) - (size.y / 2) + 24
-    });
-    ImGui::Image(
-      ImGui_ImplVulkan_AddTexture(
-        screenSampler,
-        image->get_view().get_view(),
-        image->get_layout(VK_IMAGE_LAYOUT_GENERAL)
-      ),
-      size
-    );
-  }
-  ImGui::End();
+void Window::Render(n64::Core& core) {
+  MainMenuBar(core);
 }