working asset manager !

xmake/bin2c.lua

@@ -1,21 +1,18 @@
-
-buildAsset = function(target, batchcmds, sourcefile_bin, opt)
-
-	
-end
-
-
 rule("bin2c")
     set_extensions(".bin")
     
 	on_load(function (target)
         local headerdir = path.join(target:autogendir(), "rules", "bin2c")
+
+		local outputSource = table.unpack(target:extraconf("rules", "bin2c", "outputSource"))
         
 		if not os.isdir(headerdir) then
             os.mkdir(headerdir)
         end
-        
+
 		target:add("includedirs", headerdir)
+
+		target:add("files", outputSource)
     end)
 
     before_buildcmd_files(function (target, batchcmds, sourcebatch, opt)
@@ -44,32 +41,53 @@ enum class AssetName {
 };
 
 const Asset& getResource(AssetName fileName);
-	]], outputHeaderEnumContent)
+
+const Asset& getResource(const std::string& fileName);
+]], outputHeaderEnumContent)
 
         local outputSource = table.unpack(target:extraconf("rules", "bin2c", "outputSource"))
 
-		local outputSourceContent = string.format("#include \"%s\"\n", "AssetManager.h")
+		local relativePath = path.join(path.relative(path.directory(outputHeader), path.directory(outputSource)), path.filename(outputHeader))
+		
+		local outputSourceContent = string.format([[
+#include "%s"
+
+#include <map>
+
+]], relativePath)
+
 
 		local outputSourceArrayVars = ""
+		local outputSourceMapVars = ""
 		
 		for _, filePath in ipairs(sourcebatch.sourcefiles) do
 			local escapedName = string.gsub(filePath, "[/|.]", "_")
 			local varDecl = string.format("static const unsigned char %s[] = {\n\t#include <%s>\n};\n\n", escapedName, filePath .. ".h")
 			outputSourceContent = outputSourceContent .. varDecl
 			outputSourceArrayVars = outputSourceArrayVars .. string.format("\t{%s, sizeof(%s)},\n", escapedName, escapedName)
+			outputSourceMapVars = outputSourceMapVars .. string.format("\t{\"%s\", AssetName::%s},\n", filePath, escapedName)
 		end
 
 		outputSourceContent = outputSourceContent .. string.format([[
 static const Asset assets[] = {
 %s
 };
-		]], outputSourceArrayVars)
+
+static const std::map<std::string, AssetName> assetMap = {
+%s
+};
+
+]], outputSourceArrayVars, outputSourceMapVars)
 
 		outputSourceContent = outputSourceContent .. [[
 const Asset& getResource(AssetName fileName) {
 	return assets[static_cast<std::size_t>(fileName)];
 }
-		]]
+
+const Asset& getResource(const std::string& fileName) {
+	return getResource(assetMap.at(fileName));
+}
+]]
 
 		for _, sourcefile_bin in ipairs(sourcebatch.sourcefiles) do
 			-- get header file