chore: move asset marker to ZoneCommon

src/ObjLoading/Asset/GlobalAssetPoolsLoader.h

@@ -7,7 +7,7 @@ template<typename AssetType> class GlobalAssetPoolsLoader : public AssetCreator<
 public:
     static_assert(std::is_base_of_v<IAssetBase, AssetType>);
 
-    GlobalAssetPoolsLoader(Zone& zone)
+    explicit GlobalAssetPoolsLoader(Zone& zone)
         : m_zone(zone)
     {
     }

src/ZoneCode.lua

@@ -225,6 +225,20 @@ function ZoneCode:allTestFiles()
     return result
 end
 
+function ZoneCode:allMarkFiles()
+    result = {}
+
+    for game, assets in pairs(self.Assets) do
+        for i, assetName in ipairs(assets) do
+            local assetNameLower = string.lower(assetName)
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp")
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h")
+        end
+    end
+    
+    return result
+end
+
 function ZoneCode:allLoadFiles()
     result = {}
 
@@ -233,8 +247,6 @@ function ZoneCode:allLoadFiles()
             local assetNameLower = string.lower(assetName)
             table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.cpp")
             table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.h")
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp")
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h")
         end
     end
     

src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp

@@ -32,7 +32,7 @@ namespace
             LINE("#pragma once")
             LINE("")
             LINEF("#include \"Game/{0}/{0}.h\"", m_env.m_game)
-            LINE("#include \"Loading/AssetMarker.h\"")
+            LINE("#include \"Marking/AssetMarker.h\"")
             LINE("")
             LINE("#include <string>")
             LINE("")

src/ZoneCommon.lua

@@ -43,9 +43,20 @@ function ZoneCommon:project()
 		
 		files {
 			path.join(folder, "ZoneCommon/**.h"), 
-			path.join(folder, "ZoneCommon/**.cpp") 
+			path.join(folder, "ZoneCommon/**.cpp"),
+			ZoneCode:allMarkFiles()
+		}
+		
+        vpaths {
+			["*"] = {
+				path.join(folder, "ZoneCommon"),
+				path.join(BuildFolder(), "src/ZoneCode")
+			}
 		}
 		
-		lzx:include(includes)
         self:include(includes)
+		lzx:include(includes)
+		ZoneCode:include(includes)
+
+		ZoneCode:use()
 end

src/ZoneCommon/Marking/AssetMarker.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "ContentLoaderBase.h"
 #include "Pool/XAssetInfo.h"
 #include "Zone/ZoneTypes.h"