TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removes erroneous assignment of loaded state onto fallback assets when we fail to find an assetId by filename for image and shape assets

Browse source 
Fixed handling of TSStatics' materialSlot fields, where if the field has been changed, it properly loads the modified field and ensures the reskin action happens correctly.
Changed text on some context popup menu to better indicate the action Views loose files, not imports them
Makes the Loose File Viewer skip cached.dts files.
This commit is contained in:
JeffR 2022-05-25 00:12:12 -05:00
parent 237f5230d7
commit 70a9666cc3
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -221,8 +221,7 @@ StringTableEntry ImageAsset::getAssetIdByFilename(StringTableEntry fileName)
}
else
{
AssetPtr<ImageAsset> imageAsset = imageAssetId;
imageAsset->mLoadedState = AssetErrCode::BadFileReference;
AssetPtr<ImageAsset> imageAsset = imageAssetId; //ensures the fallback is loaded
}
return imageAssetId;

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

@ -475,8 +475,7 @@ StringTableEntry ShapeAsset::getAssetIdByFilename(StringTableEntry fileName)
}
else
{
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId;
shapeAsset->mLoadedState = AssetErrCode::BadFileReference;
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId; //ensures the fallback is loaded
}
return shapeAssetId;

4
Engine/source/T3D/tsStatic.cpp
View file

@ -419,6 +419,8 @@ bool TSStatic::_createShape()
// Reapply the current skin
mAppliedSkinName = "";
reSkin();
updateMaterials();
}
prepCollision();
@ -1619,8 +1621,6 @@ void TSStatic::updateMaterials()
}
}
mChangingMaterials.clear();
// Initialize the material instances
mShapeInstance->initMaterialList();
}

5
Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript
View file

@ -128,8 +128,8 @@ function LooseFileAuditWindow::refresh(%this)
while( %file !$= "" )
{
//%filename = fileName(%file);
//%filePath = filePath(%file);
if(!endsWith(%file, ".cached.dts"))
{
if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file))
{
%assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file);
@ -139,6 +139,7 @@ function LooseFileAuditWindow::refresh(%this)
LooseFileList.insertItem(1, %file);
}
}
}
%file = findNextFileMultiExpr( %this.currentAddress @ "/*.*" );
}

8
Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript
View file

@ -216,7 +216,7 @@ function AssetBrowser::buildPopupMenus(%this)
Item[ 9 ] = "-";
Item[ 10 ] = "Delete Module" TAB "" TAB "AssetBrowser.deleteModule();";
item[ 11 ] = "-";
item[ 12 ] = "Import Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
item[ 12 ] = "View Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
};
}
@ -254,7 +254,7 @@ function AssetBrowser::buildPopupMenus(%this)
item[ 4 ] = "-";
item[ 5 ] = "Delete Folder" TAB "" TAB "AssetBrowser.deleteAsset();";
item[ 6 ] = "-";
item[ 7 ] = "Import Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
item[ 7 ] = "View Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
};
}
@ -326,9 +326,7 @@ function AssetBrowser::buildPopupMenus(%this)
superClass = "MenuBuilder";
class = "EditorWorldMenu";
item[ 0 ] = "Import Project Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
Item[ 1 ] = "-";
item[ 2 ] = "Import new assets" TAB "" TAB "Canvas.pushDialog(AssetImportCtrl);";
item[ 1 ] = "Import new assets" TAB "" TAB "Canvas.pushDialog(AssetImportCtrl);";
};
}