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

Merge pull request #473 from Areloch/AssetScriptFileABFix

Browse source 
Misc. minor AB fixes
This commit is contained in:
Brian Roberts 2021-03-14 01:11:55 -06:00 • committed by GitHub
commit 6e6f90b8f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2877,11 +2877,12 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
StringTableEntry assetName = StringTable->insert(assetItem->assetName.c_str()); StringTableEntry assetName = StringTable->insert(assetItem->assetName.c_str());
String shapeFileName = assetItem->filePath.getFileName() + "." + assetItem->filePath.getExtension(); String shapeFileName = assetItem->filePath.getFileName() + "." + assetItem->filePath.getExtension();
String constructorFileName = assetItem->filePath.getFileName() + "." TORQUE_SCRIPT_EXTENSION;
String assetPath = targetPath + "/" + shapeFileName; String assetPath = targetPath + "/" + shapeFileName;
String constructorPath = targetPath + "/" + assetItem->filePath.getFileName() + "." TORQUE_SCRIPT_EXTENSION; String constructorPath = targetPath + "/" + constructorFileName;
String tamlPath = targetPath + "/" + assetName + ".asset.taml"; String tamlPath = targetPath + "/" + assetName + ".asset.taml";
String originalPath = assetItem->filePath.getFullPath().c_str(); String originalPath = assetItem->filePath.getFullPath().c_str();
String originalConstructorPath = assetItem->filePath.getPath() + "/" + assetItem->filePath.getFileName() + "." TORQUE_SCRIPT_EXTENSION; String originalConstructorPath = assetItem->filePath.getPath() + "/" + constructorFileName;
char qualifiedFromFile[2048]; char qualifiedFromFile[2048];
char qualifiedToFile[2048]; char qualifiedToFile[2048];
@ -2896,6 +2897,7 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
newAsset->setAssetName(assetName); newAsset->setAssetName(assetName);
newAsset->setShapeFile(shapeFileName.c_str()); newAsset->setShapeFile(shapeFileName.c_str());
newAsset->setShapeConstructorFile(constructorFileName.c_str());
AssetImportConfig* cachedConfig = new AssetImportConfig();; AssetImportConfig* cachedConfig = new AssetImportConfig();;
cachedConfig->registerObject(); cachedConfig->registerObject();

27
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -256,7 +256,7 @@ function AssetBrowser::selectAsset( %this, %asset )
%this.changeAsset(); %this.changeAsset();
} }
EWInspectorWindow.refresh(); Inspector.refresh();
AssetBrowser.hideDialog(); AssetBrowser.hideDialog();
} }
@ -270,6 +270,7 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta
AssetBrowser.fieldTargetObject = %targetObj; AssetBrowser.fieldTargetObject = %targetObj;
AssetBrowser.fieldTargetName = %fieldName; AssetBrowser.fieldTargetName = %fieldName;
Canvas.popDialog(AssetBrowser);
Canvas.pushDialog(AssetBrowser); Canvas.pushDialog(AssetBrowser);
AssetBrowser.setVisible(1); AssetBrowser.setVisible(1);
AssetBrowserWindow.setVisible(1); AssetBrowserWindow.setVisible(1);
@ -1701,6 +1702,30 @@ function AssetBrowser::doRebuildAssetArray(%this)
%tscriptPattern = %breadcrumbPath @ "/" @ "*.tscript"; %tscriptPattern = %breadcrumbPath @ "/" @ "*.tscript";
for (%fullScriptPath = findFirstFile(%tscriptPattern); %fullScriptPath !$= ""; %fullScriptPath = findNextFile(%tscriptPattern)) for (%fullScriptPath = findFirstFile(%tscriptPattern); %fullScriptPath !$= ""; %fullScriptPath = findNextFile(%tscriptPattern))
{ {
//If it's associated to an asset, we'll want to do extra checks
%assetQuery = new AssetQuery();
%foundAssets = AssetDatabase.findAssetLooseFile(%assetQuery, %fullScriptPath);
if(%foundAssets != 0)
{
%doSkip = false;
%count = %assetQuery.getCount();
for(%i=0; %i < %count; %i++)
{
%assetId = %assetQuery.getAsset(%i);
%foundAssetType = AssetDatabase.getAssetType(%assetId);
if(%foundAssetType !$= "ScriptAsset" && %foundAssetType !$= "GUIAsset")
{
%doSkip = true;
break;
}
}
if(%doSkip)
continue;
}
%tscriptPath = filePath(%fullScriptPath); %tscriptPath = filePath(%fullScriptPath);
%tscriptName = fileName(%fullScriptPath); %tscriptName = fileName(%fullScriptPath);