From 17acc2fa3e3311e5f4a403b40af5b6ad88aa2cce Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 2 Apr 2023 13:26:32 -0700 Subject: [PATCH] Prog on assets --- src/dawntools/prefabtool/PrefabAssetParser.cpp | 2 +- src/dawntools/prefabtool/PrefabGen.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dawntools/prefabtool/PrefabAssetParser.cpp b/src/dawntools/prefabtool/PrefabAssetParser.cpp index 55d94b35..c94b9c41 100644 --- a/src/dawntools/prefabtool/PrefabAssetParser.cpp +++ b/src/dawntools/prefabtool/PrefabAssetParser.cpp @@ -21,7 +21,7 @@ int32_t PrefabAssetParser::onParse( struct PrefabAsset *out, std::string *error ) { - out->name = values["name"]; + out->fileName = values["name"]; if(values["type"] == "texture") { out->type = PREFAB_ASSET_TYPE_TEXTURE; diff --git a/src/dawntools/prefabtool/PrefabGen.cpp b/src/dawntools/prefabtool/PrefabGen.cpp index 39d9909a..2ac09fc7 100644 --- a/src/dawntools/prefabtool/PrefabGen.cpp +++ b/src/dawntools/prefabtool/PrefabGen.cpp @@ -45,7 +45,8 @@ void PrefabGen::generate( assertUnreachable(); } a.usageName = "asset" + std::to_string(assetNumber++); - line(&methodInit.body, "auto " + a.usageName + " = man->get<" + assetType + ">(" + a.fileName + ");", ""); + line(&methodInit.body, "auto " + a.usageName + " = man->get<" + assetType + ">(\"" + a.fileName + "\");", ""); + line(&methodAssets.body, "assets.push_back(man->get<" + assetType + ">(\"" + a.fileName + "\"));", ""); }; // Load self assets @@ -55,6 +56,7 @@ void PrefabGen::generate( ++itAssets; } // TODO: Load child assets? + line(&methodInit.body, "", ""); // Process root and all of its children int32_t childNumber = 0;