TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #409 from Azaezel/alpha40_assetPipeCleanups

Browse source 
asset pipe cleanups
This commit is contained in:
Brian Roberts 2020-12-19 02:34:57 -06:00 • committed by GitHub
commit 78a836e433
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -440,9 +440,12 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
//Didn't work, so have us fall back to a placeholder asset //Didn't work, so have us fall back to a placeholder asset
StringTableEntry noShapeId = StringTable->insert("Core_Rendering:noshape"); StringTableEntry noShapeId = StringTable->insert("Core_Rendering:noshape");
shapeAsset->setAssetId(noShapeId); shapeAsset->setAssetId(noShapeId);
(*shapeAsset)->mLoadedState = AssetErrCode::UsingFallback;
if (shapeAsset->notNull()) if (shapeAsset->notNull())
{
(*shapeAsset)->mLoadedState = AssetErrCode::UsingFallback;
return AssetErrCode::UsingFallback; return AssetErrCode::UsingFallback;
}
return AssetErrCode::Failed; return AssetErrCode::Failed;
} }

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

@ -2073,7 +2073,7 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
ModuleDefinition* moduleDef = AssetDatabase.getAssetModuleDefinition(assetId); ModuleDefinition* moduleDef = AssetDatabase.getAssetModuleDefinition(assetId);
if (moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str())) if ((moduleDef == NULL) || moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str()))
continue; continue;
StringTableEntry assetName = AssetDatabase.getAssetName(assetId); StringTableEntry assetName = AssetDatabase.getAssetName(assetId);
@ -2990,7 +2990,7 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
{ {
constructor = new TSShapeConstructor(qualifiedToFile); constructor = new TSShapeConstructor(qualifiedToFile);
String constructorName = assetItem->filePath.getFileName() + "_" + assetItem->filePath.getExtension().substr(0, 3); String constructorName = assetItem->filePath.getFileName() + assetItem->filePath.getExtension().substr(0, 3);
constructorName.replace(" ", "_"); constructorName.replace(" ", "_");
constructorName.replace("-", "_"); constructorName.replace("-", "_");
constructorName.replace(".", "_"); constructorName.replace(".", "_");