AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-17 08:57:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed file properties to asset properties and modified asset properties to store a CAssetID instead of a CResourceInfo

Browse Source
This commit is contained in:
parax0
2016-09-01 00:24:46 -06:00
parent f6ae1376ac
commit 0929b20ba1
556 changed files with 2992 additions and 3461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Resource/Cooker/CScriptCooker.cpp
View File

@@ -86,13 +86,10 @@ void CScriptCooker::WriteProperty(IProperty *pProp, bool InSingleStruct)
break;
}
case eFileProperty:
case eAssetProperty:
{
TFileProperty *pFileCast = static_cast<TFileProperty*>(pProp);
if (mVersion <= eEchoes)
mpSCLY->WriteLong(pFileCast->Get().ID().ToLong());
else
mpSCLY->WriteLongLong(pFileCast->Get().ID().ToLongLong());
TAssetProperty *pAssetCast = static_cast<TAssetProperty*>(pProp);
pAssetCast->Get().Write(*mpSCLY);
break;
}

20
src/Core/Resource/Cooker/CTemplateWriter.cpp
View File

@@ -620,11 +620,11 @@ void CTemplateWriter::SaveProperties(XMLDocument *pDoc, XMLElement *pParent, CSt
pElem->LinkEndChild(pCookPref);
}
// File-specific parameters
if (pProp->Type() == eFileProperty)
// Asset-specific parameters
if (pProp->Type() == eAssetProperty)
{
CFileTemplate *pFile = static_cast<CFileTemplate*>(pProp);
const TStringList& rkExtensions = pFile->Extensions();
CAssetTemplate *pAsset = static_cast<CAssetTemplate*>(pProp);
const TStringList& rkExtensions = pAsset->AllowedExtensions();
TString ExtensionsString;
for (auto it = rkExtensions.begin(); it != rkExtensions.end(); it++)
@@ -790,17 +790,17 @@ void CTemplateWriter::SavePropertyOverrides(XMLDocument *pDoc, XMLElement *pPare
pElem->LinkEndChild(pCookPref);
}
// File-specific parameters
if (pProp->Type() == eFileProperty)
// Asset-specific parameters
if (pProp->Type() == eAssetProperty)
{
CFileTemplate *pFile = static_cast<CFileTemplate*>(pProp);
CFileTemplate *pSourceFile = static_cast<CFileTemplate*>(pSource);
CAssetTemplate *pAsset = static_cast<CAssetTemplate*>(pProp);
CAssetTemplate *pSourceAsset = static_cast<CAssetTemplate*>(pSource);
if (pFile->Extensions() != pSourceFile->Extensions())
if (pAsset->AllowedExtensions() != pSourceAsset->AllowedExtensions())
{
TString ExtensionsString;
for (auto it = pFile->Extensions().begin(); it != pFile->Extensions().end(); it++)
for (auto it = pAsset->AllowedExtensions().begin(); it != pAsset->AllowedExtensions().end(); it++)
ExtensionsString += *it + ",";
ExtensionsString = ExtensionsString.ChopBack(1);