TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #363 from Areloch/ImprovedImageSuffixHandling

Browse source 
Improves default suffix handling for asset importer on image assets under a material asset
This commit is contained in:
Brian Roberts 2020-10-17 00:59:12 -05:00 • committed by GitHub
commit 225a2ecf4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Engine/source/T3D/assets/assetImporter.cpp
View file

@ -1613,7 +1613,10 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem)
String imageAssetName = childAssetItem->assetName; String imageAssetName = childAssetItem->assetName;
materialImageNoSuffix = imageAssetName.erase(imageAssetName.length() - suffix.length(), suffix.length());//cache this for later as we may need it for file association lookups if (suffix.isEmpty())
materialImageNoSuffix = imageAssetName;
else
materialImageNoSuffix = imageAssetName.erase(imageAssetName.length() - suffix.length(), suffix.length());//cache this for later as we may need it for file association lookups
} }
} }
} }
@ -1622,34 +1625,34 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem)
//Now that we've checked off any existingly matched image types, process through the unmatched to look for files that associate //Now that we've checked off any existingly matched image types, process through the unmatched to look for files that associate
for (S32 t = 0; t < ImageAsset::ImageTypeCount; t++) for (S32 t = 0; t < ImageAsset::ImageTypeCount; t++)
{ {
//This type wasn't found, so try and find a match based on suffix
String suffixList;
switch (t)
{
case ImageAsset::Albedo:
suffixList = activeImportConfig->DiffuseTypeSuffixes;
break;
case ImageAsset::Normal:
suffixList = activeImportConfig->NormalTypeSuffixes;
break;
case ImageAsset::ORMConfig:
suffixList = activeImportConfig->PBRTypeSuffixes;
break;
case ImageAsset::Metalness:
suffixList = activeImportConfig->MetalnessTypeSuffixes;
break;
case ImageAsset::AO:
suffixList = activeImportConfig->AOTypeSuffixes;
break;
case ImageAsset::Roughness:
suffixList = activeImportConfig->RoughnessTypeSuffixes;
break;
//TODO: Glow map lookup too
}
if (!matchedImageTypes[t]) if (!matchedImageTypes[t])
{ {
//This type wasn't found, so try and find a match based on suffix
String suffixList;
switch (t)
{
case ImageAsset::Albedo:
suffixList = activeImportConfig->DiffuseTypeSuffixes;
break;
case ImageAsset::Normal:
suffixList = activeImportConfig->NormalTypeSuffixes;
break;
case ImageAsset::ORMConfig:
suffixList = activeImportConfig->PBRTypeSuffixes;
break;
case ImageAsset::Metalness:
suffixList = activeImportConfig->MetalnessTypeSuffixes;
break;
case ImageAsset::AO:
suffixList = activeImportConfig->AOTypeSuffixes;
break;
case ImageAsset::Roughness:
suffixList = activeImportConfig->RoughnessTypeSuffixes;
break;
//TODO: Glow map lookup too
}
U32 suffixCount = StringUnit::getUnitCount(suffixList.c_str(), ",;"); U32 suffixCount = StringUnit::getUnitCount(suffixList.c_str(), ",;");
for (U32 i = 0; i < suffixCount; i++) for (U32 i = 0; i < suffixCount; i++)
{ {
@ -1716,6 +1719,18 @@ void AssetImporter::processMaterialAsset(AssetImportObject* assetItem)
} }
} }
} }
else
{
//just a bit of cleanup and logical testing for matches
//in the event we KNOW what the type is, but we don't have a suffix, such as a found image on a material lookup
//that doesn't have a suffix, we assume it to be the albedo, so we'll just append the suffix to avoid collisions if
//the name already matches our material name, similar to above logic
if (matchedImageTypes[t]->assetName == assetItem->assetName)
{
matchedImageTypes[t]->assetName += StringUnit::getUnit(suffixList.c_str(), 0, ",;");
matchedImageTypes[t]->cleanAssetName = matchedImageTypes[t]->assetName;
}
}
} }
/*for (U32 i = 0; i < assetItem->childAssetItems.size(); i++) /*for (U32 i = 0; i < assetItem->childAssetItems.size(); i++)
@ -1904,6 +1919,11 @@ void AssetImporter::processShapeMaterialInfo(AssetImportObject* assetItem, S32 m
{ {
imageAssetItem->imageSuffixType = suffixType; imageAssetItem->imageSuffixType = suffixType;
} }
else
{
//we'll assume it's albedo
imageAssetItem->imageSuffixType = "Albedo";
}
} }
else else
{ {