Merge pull request #480 from AxioDL/name-db-support

Initial resource name database support

Author: Antidote

Runtime/CMain.cpp

@@ -1,3 +1,5 @@
+#include "CResourceNameDatabase.hpp"
+
 #include <string>
 #include <string_view>
 #include <numeric>
@@ -167,6 +169,7 @@ struct Application {
   FileStoreManager& m_fileMgr;
   CVarManager& m_cvarManager;
   CVarCommons& m_cvarCommons;
+  CResourceNameDatabase& m_nameDatabase;
   ImGuiConsole m_imGuiConsole;
 
   std::string m_deferredProject;
@@ -187,12 +190,14 @@ struct Application {
                                           // is built, i.e during initialization
 
 public:
-  Application(int argc, char** argv, FileStoreManager& fileMgr, CVarManager& cvarMgr, CVarCommons& cvarCmns)
+  Application(int argc, char** argv, FileStoreManager& fileMgr, CVarManager& cvarMgr, CVarCommons& cvarCmns,
+              CResourceNameDatabase& nameDatabase)
   : m_argc(argc)
   , m_argv(argv)
   , m_fileMgr(fileMgr)
   , m_cvarManager(cvarMgr)
   , m_cvarCommons(cvarCmns)
+  , m_nameDatabase(nameDatabase)
   , m_imGuiConsole(cvarMgr, cvarCmns) {}
 
   void onAppLaunched(const AuroraInfo& info) noexcept {
@@ -284,7 +289,7 @@ struct Application {
     const auto targetFrameTime = getTargetFrameTime();
     bool skipRetrace = false;
     if (g_ResFactory != nullptr) {
-//      OPTICK_EVENT("Async Load Resources");
+      //      OPTICK_EVENT("Async Load Resources");
       const auto idleTime = m_limiter.SleepTime(targetFrameTime);
       skipRetrace = g_ResFactory->AsyncIdle(idleTime);
     }
@@ -295,12 +300,12 @@ struct Application {
     } else {
       // No more to load, and we're under frame time
       {
-        //OPTICK_EVENT("Sleep");
+        // OPTICK_EVENT("Sleep");
         m_limiter.Sleep(targetFrameTime);
       }
     }
 
-    //OPTICK_FRAME("MainThread");
+    // OPTICK_FRAME("MainThread");
 
     // Check if fullscreen has been toggled, if so set the fullscreen cvar accordingly
     if (m_fullscreenToggleRequested) {
@@ -364,7 +369,7 @@ struct Application {
   }
 
   void onAppDraw() noexcept {
-    //OPTICK_EVENT("Draw");
+    // OPTICK_EVENT("Draw");
     if (g_Renderer != nullptr) {
       g_Renderer->BeginScene();
       if (g_mainMP1) {
@@ -376,7 +381,7 @@ struct Application {
   }
 
   void onAppPostDraw() noexcept {
-    //OPTICK_EVENT("PostDraw");
+    // OPTICK_EVENT("PostDraw");
 //    if (m_voiceEngine) {
 //      m_voiceEngine->pumpAndMixVoices();
 //    }
@@ -545,6 +550,8 @@ int main(int argc, char** argv) {
   do {
     metaforce::CVarManager cvarMgr{fileMgr};
     metaforce::CVarCommons cvarCmns{cvarMgr};
+    metaforce::CResourceNameDatabase nameDatabase{fileMgr};
+
     cvarMgr.parseCommandLine(args);
     if (!restart) {
       // TODO add clear loggers func to logvisor so we can recreate loggers on restart
@@ -569,7 +576,7 @@ int main(int argc, char** argv) {
       }
     }
 
-    g_app = std::make_unique<metaforce::Application>(argc, argv, fileMgr, cvarMgr, cvarCmns);
+    g_app = std::make_unique<metaforce::Application>(argc, argv, fileMgr, cvarMgr, cvarCmns, nameDatabase);
     std::string configPath{fileMgr.getStoreRoot()};
 
     const AuroraConfig config{

Runtime/CMakeLists.txt

@@ -138,6 +138,7 @@ set(RUNTIME_SOURCES_B
         CTextureCache.hpp CTextureCache.cpp
         CMayaSpline.hpp CMayaSpline.cpp
         ImGuiPlayerLoadouts.hpp ImGuiPlayerLoadouts.cpp
+        CResourceNameDatabase.hpp CResourceNameDatabase.cpp
         ${PLAT_SRCS})
 
 function(add_runtime_common_library name)

Runtime/CResFactory.cpp

@@ -1,11 +1,12 @@
 #include "Runtime/CResFactory.hpp"
 
+#include "CResourceNameDatabase.hpp"
 #include "Runtime/CSimplePool.hpp"
 #include "Runtime/CStopwatch.hpp"
 #include "Runtime/Logging.hpp"
 #include "Runtime/Formatting.hpp"
 
-//#include "optick.h"
+// #include "optick.h"
 
 namespace metaforce {
 void CResFactory::AddToLoadList(SLoadingData&& data) {
@@ -35,13 +36,18 @@ CFactoryFnReturn CResFactory::BuildSync(const SObjectTag& tag, const CVParamTran
 }
 
 bool CResFactory::PumpResource(SLoadingData& data) {
-  //OPTICK_EVENT();
+  // OPTICK_EVENT();
   if (data.x8_dvdReq && data.x8_dvdReq->IsComplete()) {
     data.x8_dvdReq.reset();
     *data.xc_targetPtr =
         x5c_factoryMgr.MakeObjectFromMemory(data.x0_tag, std::move(data.x10_loadBuffer), data.x14_resSize,
                                             data.m_compressed, data.x18_cvXfer, data.m_selfRef);
     spdlog::info("async-built {}", data.x0_tag);
+    if (CResourceNameDatabase::instance()) {
+      if (const auto* name = CResourceNameDatabase::instance()->assetName(data.x0_tag.id)) {
+        spdlog::info("rep filepath: {}", *name);
+      }
+    }
     return true;
   }
   return false;
@@ -77,7 +83,7 @@ void CResFactory::BuildAsync(const SObjectTag& tag, const CVParamTransfer& xfer,
 }
 
 bool CResFactory::AsyncIdle(std::chrono::nanoseconds target) {
-  //OPTICK_EVENT();
+  // OPTICK_EVENT();
   if (m_loadList.empty()) {
     return false;
   }
@@ -108,7 +114,7 @@ void CResFactory::CancelBuild(const SObjectTag& tag) {
 
 void CResFactory::LoadPersistentResources(CSimplePool& sp) {
   const auto& paks = x4_loader.GetPaks();
-  for (const auto & pak : paks) {
+  for (const auto& pak : paks) {
     if (!pak->IsWorldPak()) {
       for (const CAssetId& id : pak->GetDepList()) {
         SObjectTag tag(GetResourceTypeById(id), id);

Runtime/CResourceNameDatabase.cpp

@@ -0,0 +1,36 @@
+#include "Runtime/CResourceNameDatabase.hpp"
+
+#include "Runtime/CBasics.hpp"
+#include "Runtime/ConsoleVariables/FileStoreManager.hpp"
+#include "Runtime/Streams/CMemoryInStream.hpp"
+
+namespace metaforce {
+constexpr std::string_view kDatabaseName = "mp_resource_names_confirmed.bin";
+CResourceNameDatabase* CResourceNameDatabase::m_instance = nullptr;
+
+CResourceNameDatabase::CResourceNameDatabase(FileStoreManager& store) {
+  m_instance = this;
+  const std::string filename = std::string(store.getStoreRoot()) + "/" + std::string(kDatabaseName);
+  if (!CBasics::IsFile(filename.c_str())) {
+    return;
+  }
+
+  CBasics::Sstat st;
+  if (CBasics::Stat(filename.c_str(), &st) != 0) {
+    return;
+  }
+
+  std::unique_ptr<u8> const inBuf(new u8[st.st_size]);
+  auto* file = fopen(filename.c_str(), "rb");
+  (void)fread(inBuf.get(), 1, st.st_size, file);
+  (void)fclose(file);
+  CMemoryInStream mem(inBuf.get(), st.st_size, CMemoryInStream::EOwnerShip::NotOwned);
+
+  u32 count = mem.Get<u32>();
+  while ((count--) != 0u) {
+    const CAssetId assetId = mem.Get<u32>();
+    const auto name = mem.Get<std::string>();
+    m_assetNames[assetId] = name;
+  }
+}
+} // namespace metaforce

Runtime/CResourceNameDatabase.hpp

@@ -0,0 +1,29 @@
+#pragma once
+#include "RetroTypes.hpp"
+
+#include <unordered_map>
+
+namespace metaforce {
+class FileStoreManager;
+class CResourceNameDatabase {
+public:
+  explicit CResourceNameDatabase(FileStoreManager& store);
+
+  bool hasAssetName(const CAssetId asset) const { return m_assetNames.contains(asset); }
+
+  const std::string* assetName(const CAssetId asset) const {
+    if (!hasAssetName(asset)) {
+      return nullptr;
+    }
+
+    return &m_assetNames.at(asset);
+  }
+
+  static CResourceNameDatabase* instance() { return m_instance; }
+
+private:
+  std::unordered_map<CAssetId, std::string> m_assetNames;
+
+  static CResourceNameDatabase* m_instance;
+};
+} // namespace metaforce

Runtime/ConsoleVariables/CVarManager.cpp

@@ -213,7 +213,7 @@ std::vector<StoreCVar::CVar> CVarManager::loadCVars(const std::string& filename)
     );
     if (file != nullptr) {
 
-      std::unique_ptr<u8[]> inBuf(new u8[st.st_size]);
+      std::unique_ptr<u8> inBuf(new u8[st.st_size]);
       fread(inBuf.get(), 1, st.st_size, file);
       fclose(file);
       CMemoryInStream mem(inBuf.get(), st.st_size, CMemoryInStream::EOwnerShip::NotOwned);