Added utility methods to AssetBase:

getAssetDependencyFieldCount
clearAssetDependencyFields
addAssetDependencyField
saveAsset

Updated the saveAsset function for terrain block to utilize utility methods to ensure the terrain asset's material dependencies, so they will load properly.
This commit is contained in:
Areloch 2019-11-07 00:42:55 -06:00
parent 906c7095f1
commit d8cc73f5a1
6 changed files with 120 additions and 100 deletions

View file

@ -284,6 +284,78 @@ void AssetBase::refreshAsset(void)
//-----------------------------------------------------------------------------
S32 AssetBase::getAssetDependencyFieldCount(const char* pFieldName)
{
S32 matchedFieldCount = 0;
SimFieldDictionary* fieldDictionary = getFieldDictionary();
for (SimFieldDictionaryIterator itr(fieldDictionary); *itr; ++itr)
{
SimFieldDictionary::Entry* entry = *itr;
if (String(entry->slotName).startsWith(pFieldName))
{
matchedFieldCount++;
}
}
return matchedFieldCount;
}
//-----------------------------------------------------------------------------
void AssetBase::clearAssetDependencyFields(const char* pFieldName)
{
SimFieldDictionary* fieldDictionary = getFieldDictionary();
for (SimFieldDictionaryIterator itr(fieldDictionary); *itr; ++itr)
{
SimFieldDictionary::Entry* entry = *itr;
if (String(entry->slotName).startsWith(pFieldName))
{
setDataField(entry->slotName, NULL, "");
}
}
}
//-----------------------------------------------------------------------------
void AssetBase::addAssetDependencyField(const char* pFieldName, const char* pAssetId)
{
U32 existingFieldCount = getAssetDependencyFieldCount(pFieldName);
//we have a match!
char depSlotName[50];
dSprintf(depSlotName, sizeof(depSlotName), "%s%d", pFieldName, existingFieldCount);
char depValue[255];
dSprintf(depValue, sizeof(depValue), "@Asset=%s", pAssetId);
setDataField(StringTable->insert(depSlotName), NULL, StringTable->insert(depValue));
}
//-----------------------------------------------------------------------------
bool AssetBase::saveAsset()
{
// Set the format mode.
Taml taml;
// Yes, so set it.
taml.setFormatMode(Taml::getFormatModeEnum("xml"));
// Turn-off auto-formatting.
taml.setAutoFormat(false);
// Read object.
bool success = taml.write(this, AssetDatabase.getAssetFilePath(getAssetId()));
if (!success)
return false;
return true;
}
//-----------------------------------------------------------------------------
void AssetBase::acquireAssetReference(void)
{
// Acquired the acquired reference count.

View file

@ -104,6 +104,12 @@ public:
void refreshAsset(void);
S32 getAssetDependencyFieldCount(const char* pFieldName);
void clearAssetDependencyFields(const char* pFieldName);
void addAssetDependencyField(const char* pFieldName, const char* pAssetId);
bool saveAsset();
/// Declare Console Object.
DECLARE_CONOBJECT(AssetBase);

View file

@ -1,4 +1,4 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// Copyright (c) 2013 GarageGames, LLC
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
@ -39,3 +39,31 @@ DefineEngineMethod(AssetBase, getAssetId, String, (), ,
{
return object->getAssetId();
}
DefineEngineMethod(AssetBase, getAssetDependencyFieldCount, S32, (const char* pFieldName), (""),
"Gets the assets' Asset Id. This is only available if the asset was acquired from the asset manager.\n"
"@return The assets' Asset Id.\n")
{
return object->getAssetDependencyFieldCount(pFieldName);
}
DefineEngineMethod(AssetBase, clearAssetDependencyFields, void, (const char* pFieldName), (""),
"Gets the assets' Asset Id. This is only available if the asset was acquired from the asset manager.\n"
"@return The assets' Asset Id.\n")
{
object->clearAssetDependencyFields(pFieldName);
}
DefineEngineMethod(AssetBase, addAssetDependencyField, void, (const char* pFieldName, const char* pAssetId), ("", ""),
"Gets the assets' Asset Id. This is only available if the asset was acquired from the asset manager.\n"
"@return The assets' Asset Id.\n")
{
object->addAssetDependencyField(pFieldName, pAssetId);
}
DefineEngineMethod(AssetBase, saveAsset, bool, (), ,
"Gets the assets' Asset Id. This is only available if the asset was acquired from the asset manager.\n"
"@return The assets' Asset Id.\n")
{
return object->saveAsset();
}