feat: Build a reference map of navmesh chunks for each worldspace/cell

tiltedphoques · Feb 3, 2022 · b16ec88 · b16ec88
1 parent 80c70b5
commit b16ec88
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/Code/components/es_loader/ESLoader.cpp b/Code/components/es_loader/ESLoader.cpp
@@ -26,7 +26,11 @@ UniquePtr<RecordCollection> ESLoader::BuildRecordCollection() noexcept
         return UniquePtr<RecordCollection>();
     }
 
-    return LoadFiles();
+    auto recordCollection = LoadFiles();
+
+    recordCollection->BuildReferences();
+
+    return std::move(recordCollection);
 }
 
 

diff --git a/Code/components/es_loader/ESLoaderTest.cpp b/Code/components/es_loader/ESLoaderTest.cpp
@@ -118,6 +118,7 @@ TEST_F(ESLoaderTest, GetWorldTamriel)
     const WRLD& tamrielWorld = pCollection->GetWorldById(60);
 
     EXPECT_EQ(tamrielWorld.m_editorId, "Tamriel");
+    EXPECT_EQ(tamrielWorld.m_navMeshRefs.size(), 0x3315);
 }
 
 } // namespace
diff --git a/Code/components/es_loader/RecordCollection.cpp b/Code/components/es_loader/RecordCollection.cpp
@@ -1,2 +1,13 @@
 #include "RecordCollection.h"
 
+void RecordCollection::BuildReferences()
+{
+    for (auto& [_, navmesh] : m_navMeshes)
+    {
+        if(navmesh.m_navMesh.m_worldSpaceId)
+        {
+            auto& world = GetWorldById(navmesh.m_navMesh.m_worldSpaceId);
+            world.m_navMeshRefs.push_back(&navmesh);
+        }
+    }
+}
diff --git a/Code/components/es_loader/RecordCollection.h b/Code/components/es_loader/RecordCollection.h
@@ -54,6 +54,8 @@ class RecordCollection
         return m_navMeshes[aFormId];
     }
 
+    void BuildReferences();
+
 private:
     Map<uint32_t, Record> m_allRecords{};
     Map<uint32_t, REFR> m_objectReferences{};

diff --git a/Code/components/es_loader/Records/WRLD.h b/Code/components/es_loader/Records/WRLD.h
@@ -3,6 +3,8 @@
 #include "Record.h"
 #include "Chunks.h"
 
+class NAVM;
+
 // https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/WRLD
 class WRLD : public Record
 {
@@ -17,6 +19,8 @@ class WRLD : public Record
     uint32_t m_musicId;
     float m_lodMultiplier;
 
+    Vector<NAVM const*> m_navMeshRefs;
+
     void ParseChunks(WRLD& aSourceRecord, Map<uint8_t, uint32_t>& aParentToFormIdPrefix) noexcept;
     void ParseGRUP() noexcept;
 };