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 #781 from Areloch/MiscFixes20220510

Browse source 
Misc Fixes for 2022/05/10
This commit is contained in:
Brian Roberts 2022-05-11 01:15:07 -05:00 • committed by GitHub
commit 516163fd5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 59 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -671,10 +671,17 @@ function AssetBrowser::loadDirectories( %this )
if(%this.selectMode)
{
//Due to a fluke in how this tracks, it overrides the current addres, so we'll
//store it real fast
%curAdd = AssetBrowser.dirHandler.currentAddress;
//Disable these for this go
AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.collectionsIdx);
AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.creatorIdx);
AssetBrowser-->filterTree.hideSelection();
AssetBrowser-->filterTree.clearSelection();
AssetBrowser.dirHandler.currentAddress = %curAdd;
}
%this.dirHandler.loadFolders("data", %dataItem);
@ -700,49 +707,6 @@ function AssetBrowser::loadDirectories( %this )
%this.dirHandler.loadFolders("tools", %toolsItem);
}
//Add Non-Asset Scripted Objects. Datablock, etc based
/*%category = getWord( %breadcrumbPath, 1 );
%dataGroup = "DataBlockGroup";
if(%dataGroup.getCount() != 0)
{
%scriptedItem = AssetBrowser-->filterTree.insertItem(1, "Scripted");
for ( %i = 0; %i < %dataGroup.getCount(); %i++ )
{
%obj = %dataGroup.getObject(%i);
// echo ("Obj: " @ %obj.getName() @ " - " @ %obj.category );
//if ( %obj.category $= "" && %obj.category == 0 )
// continue;
%dbFilename = %obj.getFileName();
%dbFilePath = filePath(%dbFilename);
if(%breadcrumbPath $= %dbFilePath)
{
//if ( %breadcrumbPath $= "" )
//{
%catItem = AssetBrowser-->filterTree.findItemByName(%obj.category);
if(%catItem == 0)
AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.category, "scripted");
/*%ctrl = %this.findIconCtrl( %obj.category );
if ( %ctrl == -1 )
{
%this.addFolderIcon( %obj.category );
}*/
//}
/*else if ( %breadcrumbPath $= %obj.category )
{
AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.getName());
}*/
//}
//}
// }
AssetBrowser-->filterTree.buildVisibleTree(true);
//Remove any modules that have no assets if we have that filter on
@ -769,9 +733,6 @@ function AssetBrowser::loadDirectories( %this )
AssetBrowser.newModuleId = "";
}
//%dataItem = AssetBrowser-->filterTree.findItemByName("data");
//AssetBrowser-->filterTree.expandItem(%dataItem);
AssetBrowser.dirHandler.expandTreeToAddress(AssetBrowser.dirHandler.currentAddress);
%selectedItem = AssetBrowser.dirHandler.getFolderTreeItemFromAddress(AssetBrowser.dirHandler.currentAddress);
@ -1476,6 +1437,40 @@ function AssetBrowser::doRebuildAssetArray(%this)
%finalAssetCount = 0;
//Add folders
if(EditorSettings.value("Assets/Browser/showFolders", true) == true)
{
%folders = getDirectoryList(%breadcrumbPath);
for(%f=0; %f < getFieldCount(%folders); %f++)
{
%folderName = getField(%folders, %f);
%searchActive = AssetSearchTerms.count() != 0;
if(%searchActive)
{
if(matchesSearch(%folderName, "Folder", ""))
{
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
continue;
}
}
else
{
//got it.
if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git")
continue;
if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "")
continue;
if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "")
continue;
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
}
}
}
//now, we'll iterate through, and find the assets that are in this module, and this category
for( %i=0; %i < %numAssetsFound; %i++)
{
@ -1544,40 +1539,6 @@ function AssetBrowser::doRebuildAssetArray(%this)
}
}
}
//Add folders
if(EditorSettings.value("Assets/Browser/showFolders", true) == true)
{
%folders = getDirectoryList(%breadcrumbPath);
for(%f=0; %f < getFieldCount(%folders); %f++)
{
%folderName = getField(%folders, %f);
%searchActive = AssetSearchTerms.count() != 0;
if(%searchActive)
{
if(matchesSearch(%folderName, "Folder", ""))
{
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
continue;
}
}
else
{
//got it.
if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git")
continue;
if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "")
continue;
if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "")
continue;
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
}
}
}
//Add Non-Asset Scripted Objects. Datablock, etc based
%hasDBFilter = true;