Game list uses new DB

external/parallel-rdp/ParallelRDPWrapper.cpp

@@ -187,7 +187,7 @@ void InitParallelRDP(const u8* rdram, SDL_Window* window) {
   LoadParallelRDP(rdram, window);
 }
 
-void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::IntrusivePtr<CommandBuffer> cmd) {
+void DrawFullscreenTexturedQuad(float mainMenuBarHeight, Util::IntrusivePtr<Image> image, Util::IntrusivePtr<CommandBuffer> cmd) {
   cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::LinearClamp);
   cmd->set_program(fullscreen_quad_program);
   cmd->set_quad_state();
@@ -202,12 +202,20 @@ void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::Intrusive
   int sdlWinWidth, sdlWinHeight;
   SDL_GetWindowSize(g_Window, &sdlWinWidth, &sdlWinHeight);
 
-  float zoom = std::min(
+  sdlWinHeight -= mainMenuBarHeight;
-    (float)sdlWinWidth / wsi->get_platform().get_surface_width(),
-    (float)sdlWinHeight / wsi->get_platform().get_surface_height());
 
-  float width = (wsi->get_platform().get_surface_width() / (float)sdlWinWidth) * zoom;
+  float platform_width = wsi->get_platform().get_surface_width();
-  float height = (wsi->get_platform().get_surface_height() / (float)sdlWinHeight) * zoom;
+  float platform_height = wsi->get_platform().get_surface_height();
+
+  platform_height -= mainMenuBarHeight;
+
+  float zoom = std::min(
+    (float)sdlWinWidth / platform_width,
+    (float)sdlWinHeight / platform_height);
+
+
+  float width = (platform_width / (float)sdlWinWidth) * zoom;
+  float height = (platform_height / (float)sdlWinHeight) * zoom;
 
   float uniform_data[] = {
     // Size
@@ -253,9 +261,11 @@ void UpdateScreen(n64::Core& core, Window& imguiWindow, Util::IntrusivePtr<Image
   Util::IntrusivePtr<CommandBuffer> cmd = wsi->get_device().request_command_buffer();
 
   cmd->begin_render_pass(wsi->get_device().get_swapchain_render_pass(SwapchainRenderPass::ColorOnly));
-  DrawFullscreenTexturedQuad(image, cmd);
+  DrawData data = imguiWindow.Present(core);
 
-  ImGui_ImplVulkan_RenderDrawData(imguiWindow.Present(core), cmd->get_command_buffer());
+  DrawFullscreenTexturedQuad(data.second, image, cmd);
+
+  ImGui_ImplVulkan_RenderDrawData(data.first, cmd->get_command_buffer());
 
   cmd->end_render_pass();
   wsi->get_device().submit(cmd);

src/frontend/imgui/GameList.cpp

@@ -37,24 +37,59 @@ inline std::string CountryCodeToStr(u8 code) {
 
 GameList::GameList(const std::string& path) {
   if(!path.empty()) {
-    std::for_each(std::execution::par_unseq, begin(recursive_directory_iterator{path}), end(recursive_directory_iterator{path}), [&](const auto& p) {
+    std::ifstream gameDbFile("resources/db.json");
+    json gameDb = json::parse(gameDbFile);
+    std::vector<u8> rom{};
+
+    std::for_each(std::execution::par, begin(directory_iterator{path}), end(directory_iterator{path}), [&](const auto& p) {
+      const auto filename = p.path().string();
       if(p.path().extension() == ".n64" || p.path().extension() == ".z64" || p.path().extension() == ".v64" ||
          p.path().extension() == ".N64" || p.path().extension() == ".Z64" || p.path().extension() == ".V64") {
+        std::ifstream file(filename, std::ios::binary);
+        file.unsetf(std::ios::skipws);
 
+        if(!file.is_open()) {
+          util::panic("Unable to open {}!", filename);
         }
+
+        file.seekg(0, std::ios::end);
+        auto size = file.tellg();
+        auto sizeAdjusted = util::NextPow2(size);
+        file.seekg(0, std::ios::beg);
+
+        std::fill(rom.begin(), rom.end(), 0);
+        rom.resize(sizeAdjusted);
+        rom.insert(rom.begin(), std::istream_iterator<u8>(file), std::istream_iterator<u8>());
+        file.close();
+
+        u32 crc{};
+        util::SwapN64RomJustCRC(sizeAdjusted, rom.data(), crc);
+
+        std::for_each(std::execution::par, gameDb["items"].begin(), gameDb["items"].end(), [&](const auto& item) {
+          const auto& crcEntry = item["crc"];
+          if(!crcEntry.empty()) {
+            if(crcEntry.template get<std::string>() == fmt::format("{:08X}", crc)) {
+              gamesList.push_back({
+                item["name"].template get<std::string>(),
+                item["region"].template get<std::string>(),
+                fmt::format("{:.2f} MiB", float(size) / 1024 / 1024),
+                "Good",
+                p.path().string()
               });
             }
           }
+        });
+      }
+    });
 
-bool GameList::RenderWidget(bool showMainMenuBar, float mainMenuBarHeight, std::string& rom) {
+    gameDbFile.close();
+  }
+}
+
+bool GameList::RenderWidget(float mainMenuBarHeight, std::string& rom) {
   const auto windowSize = ImGui::GetIO().DisplaySize;
-  if (showMainMenuBar) {
   ImGui::SetNextWindowPos(ImVec2(0, mainMenuBarHeight));
   ImGui::SetNextWindowSize(ImVec2(windowSize.x, windowSize.y - mainMenuBarHeight));
-  } else {
-    ImGui::SetNextWindowPos(ImVec2(0, 0));
-    ImGui::SetNextWindowSize(windowSize);
-  }
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.f, 0.f));
   ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.f);
 
@@ -72,17 +107,18 @@ bool GameList::RenderWidget(bool showMainMenuBar, float mainMenuBarHeight, std::
     | ImGuiTableFlags_SizingStretchProp;
 
   bool toOpen = false;
-  if (ImGui::BeginTable("Games List", 3, flags)) {
+  if (ImGui::BeginTable("Games List", 4, flags)) {
     ImGui::TableSetupColumn("Title");
     ImGui::TableSetupColumn("Region");
+    ImGui::TableSetupColumn("Status");
     ImGui::TableSetupColumn("Size");
     ImGui::TableHeadersRow();
 
-    for (int row = 0; row < gamesList.size(); row++) {
+    int i = 0;
-      GameInfo entry = gamesList[row];
 
+    for (const auto& entry : gamesList) {
       ImGui::TableNextRow(ImGuiTableRowFlags_None);
-      ImGui::PushID(row);
+      ImGui::PushID(i);
       ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, ImVec2(0.0f, 0.5f));
       ImGui::TableSetColumnIndex(0);
 
@@ -100,6 +136,13 @@ bool GameList::RenderWidget(bool showMainMenuBar, float mainMenuBarHeight, std::
 
       ImGui::TableSetColumnIndex(2);
 
+      if (ImGui::Selectable(entry.status.c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap, ImVec2(0.0f, 20.f))) {
+        toOpen = true;
+        rom = entry.path;
+      }
+
+      ImGui::TableSetColumnIndex(3);
+
       if (ImGui::Selectable(entry.size.c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap, ImVec2(0.0f, 20.f))) {
         toOpen = true;
         rom = entry.path;
@@ -107,6 +150,7 @@ bool GameList::RenderWidget(bool showMainMenuBar, float mainMenuBarHeight, std::
 
       ImGui::PopStyleVar();
       ImGui::PopID();
+      i++;
     }
 
     ImGui::EndTable();

src/frontend/imgui/GameList.hpp

@@ -3,16 +3,16 @@
 #include <string>
 
 struct GameInfo {
-  std::string name, region, size, path;
+  std::string name, region, size, status, path;
 };
 
 struct GameList {
   GameList(const std::string&);
   ~GameList() = default;
 
-  bool RenderWidget(bool, float, std::string&);
+  bool RenderWidget(float, std::string&);
 
   std::vector<GameInfo> GetGamesList() const { return gamesList; }
 private:
-  std::vector<GameInfo> gamesList{};
+  std::vector<GameInfo> gamesList{}, notMatch{};
 };

src/frontend/imgui/Window.cpp

@@ -144,15 +144,15 @@ Window::~Window() {
   SDL_Quit();
 }
 
-ImDrawData* Window::Present(n64::Core& core) {
+DrawData Window::Present(n64::Core& core) {
   ImGui_ImplVulkan_NewFrame();
   ImGui_ImplSDL2_NewFrame(window);
   ImGui::NewFrame();
 
-  Render(core);
+  float mainMenuBarHeight = Render(core);
 
   ImGui::Render();
-  return ImGui::GetDrawData();
+  return {ImGui::GetDrawData(), mainMenuBarHeight};
 }
 
 void Window::LoadROM(n64::Core& core, const std::string &path) {
@@ -160,35 +160,35 @@ void Window::LoadROM(n64::Core& core, const std::string &path) {
     n64::CartInfo cartInfo = core.LoadROM(path);
     std::ifstream gameDbFile("resources/db.json");
     json gameDb = json::parse(gameDbFile);
+    gameName = "";
 
-    for(const auto& item : gameDb["titles"]) {
+    for(const auto& item : gameDb["items"]) {
-      auto temp = item["part"]["dataarea"];
+      auto crc = item["crc"];
-      std::cout << temp << "\n";
+      if(!crc.empty()) {
-      //if(!crc.empty()) {
+        if(crc.get<std::string>() == fmt::format("{:08X}", cartInfo.crc)) {
-      //  if(crc.get<std::string>() == fmt::format("{:08x}", cartInfo.crc)) {
+          auto name = item["name"];
-      //    auto desc = item["description"];
+          if(!name.empty()) {
-      //    if(desc.empty()) {
+            gameName = name.get<std::string>();
-      //      gameName = desc.get<std::string>();
+          }
-      //    }
+        }
-      //  }
+      }
-      //}
     };
 
     if(gameName.empty()) {
       gameName = std::filesystem::path(path).stem().string();
     }
 
-    std::cout << gameName << "\n";
-
     util::UpdateRPC(util::Playing, gameName);
     windowTitle = "Gadolinium - " + gameName;
     shadowWindowTitle = windowTitle;
+    renderGameList = false;
 
     SDL_SetWindowTitle(window, windowTitle.c_str());
+    gameDbFile.close();
   }
 }
 
-void Window::Render(n64::Core& core) {
+float Window::Render(n64::Core& core) {
   ImGui::PushFont(uiFont);
 
   u32 ticks = SDL_GetTicks();
@@ -201,11 +201,8 @@ void Window::Render(n64::Core& core) {
     windowTitle = shadowWindowTitle;
   }
 
-  static bool renderGameList = true;
   static bool showSettings = false;
-  bool showMainMenuBar = windowID == SDL_GetWindowID(SDL_GetMouseFocus());
   static float mainMenuBarHeight = 0;
-  if(showMainMenuBar) {
   ImGui::BeginMainMenuBar();
   mainMenuBarHeight = ImGui::GetWindowSize().y;
   if (ImGui::BeginMenu("File")) {
@@ -217,7 +214,6 @@ void Window::Render(n64::Core& core) {
         LoadROM(core, outpath);
         util::UpdateRPC(util::Playing, gameName);
         NFD_FreePath(outpath);
-          renderGameList = false;
       }
     }
     if (ImGui::MenuItem("Dump RDRAM")) {
@@ -237,7 +233,6 @@ void Window::Render(n64::Core& core) {
   if (ImGui::BeginMenu("Emulation")) {
     if (ImGui::MenuItem("Reset")) {
       LoadROM(core, core.rom);
-        renderGameList = false;
     }
     if (ImGui::MenuItem("Stop")) {
       renderGameList = true;
@@ -265,14 +260,15 @@ void Window::Render(n64::Core& core) {
     ImGui::EndMenu();
   }
   ImGui::EndMainMenuBar();
-  }
 
   static std::string rom{};
-  if(renderGameList && gameList.RenderWidget(showMainMenuBar, mainMenuBarHeight, rom)) {
+  if(renderGameList && gameList.RenderWidget(mainMenuBarHeight, rom)) {
     LoadROM(core, rom);
     renderGameList = false;
   }
   settings.RenderWidget(showSettings);
 
   ImGui::PopFont();
+
+  return mainMenuBarHeight;
 }

src/frontend/imgui/Window.hpp

@@ -9,10 +9,15 @@
 #include <Settings.hpp>
 #include <GameList.hpp>
 
+struct DrawData {
+  ImDrawData* first;
+  float second;
+};
+
 struct Window {
   explicit Window(n64::Core& core);
   ~Window();
-  ImDrawData* Present(n64::Core& core);
+  DrawData Present(n64::Core& core);
 
   [[nodiscard]] bool gotClosed(SDL_Event event);
   ImFont *uiFont{}, *codeFont{};
@@ -21,13 +26,14 @@ struct Window {
   GameList gameList;
   void LoadROM(n64::Core& core, const std::string& path);
 private:
+  bool renderGameList = true;
   SDL_Window* window{};
   std::string windowTitle{"Gadolinium"};
   std::string shadowWindowTitle{windowTitle};
   std::string gameName{};
   void InitSDL();
   void InitImgui();
-  void Render(n64::Core& core);
+  float Render(n64::Core& core);
 
   VkPhysicalDevice physicalDevice{};
   VkDevice device{};

src/util.hpp

@@ -170,6 +170,28 @@ enum RomTypes {
   V64 = 0x37804012
 };
 
+inline void SwapN64RomJustCRC(size_t size, u8* rom, u32& crc) {
+  RomTypes endianness;
+  memcpy(&endianness, rom, 4);
+  endianness = static_cast<RomTypes>(be32toh(endianness));
+
+  switch(endianness) {
+    case RomTypes::V64: {
+      SwapBuffer16(size, rom);
+      crc = crc32(0, rom, size);
+    } break;
+    case RomTypes::N64: {
+      SwapBuffer32(size, rom);
+      crc = crc32(0, rom, size);
+    } break;
+    case RomTypes::Z64:
+      crc = crc32(0, rom, size);
+      break;
+    default:
+      panic("Unrecognized rom format! Make sure this is a valid Nintendo 64 ROM dump!\n");
+  }
+}
+
 inline void SwapN64Rom(size_t size, u8* rom, u32& crc, u32& cicChecksum) {
   RomTypes endianness;
   memcpy(&endianness, rom, 4);