TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 15:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #558 from Areloch/MiscFixes20210901

Browse source 
Misc Fixes and QOL improvements
This commit is contained in:
Brian Roberts 2021-09-01 17:38:24 -05:00 • committed by GitHub
commit 09492f0885
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 341 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,3 @@
new SimGroup(AssetBrowserPreviewCache);
//AssetBrowser.addToolbarButton
function AssetBrowser::addToolbarButton(%this)
{
@ -30,11 +28,8 @@ function AssetBrowser::addToolbarButton(%this)
EWToolsToolbar.setExtent((25 + 8) * (ToolsToolbarArray.getCount()) + 12 SPC "33");
}
//
function AssetBrowser::onAdd(%this)
{
}
function AssetBrowser::onWake(%this)
function AssetBrowser::initialize(%this)
{
// manage preview array
if(!isObject(AssetPreviewArray))
@ -65,6 +60,30 @@ function AssetBrowser::onWake(%this)
AssetBrowser-->filterAssetsButton.setActive(true);
}
function AssetBrowser::onAdd(%this)
{
}
function AssetBrowser::onWake(%this)
{
%this.initialize();
}
function AssetBrowser::onDialogPop(%this)
{
%lastPosExt = AssetBrowserWindow.position SPC AssetBrowserWindow.extent;
EditorSettings.setValue("Assets/Browser/LastPosExt", %lastPosExt);
}
function AssetBrowser::restoreLastPosExt(%this)
{
%lastPosExt = EditorSettings.value("Assets/Browser/LastPosExt", "");
if(%lastPosExt !$= "")
{
AssetBrowserWindow.resize(getWord(%lastPosExt, 0), getWord(%lastPosExt, 1), getWord(%lastPosExt, 2), getWord(%lastPosExt, 3));
}
}
function contentTreeTabBook::onTabSelected(%this, %tabText, %tabIndex)
{
if(%tabText $= "Content")
@ -271,6 +290,7 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta
Canvas.popDialog(AssetBrowser);
Canvas.pushDialog(AssetBrowser);
AssetBrowser.setVisible(1);
AssetBrowserWindow.setVisible(1);
AssetBrowserWindow.selectWindow();
@ -299,6 +319,8 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta
}
AssetBrowser.loadDirectories();
AssetBrowser.restoreLastPosExt();
}
function AssetBrowser::hideDialog( %this )
@ -311,6 +333,18 @@ function AssetBrowser::hideDialog( %this )
Canvas.popDialog(AssetBrowser);
}
function AssetBrowser::toggleDialog( %this )
{
if(AssetBrowser.isAwake())
{
AssetBrowser.hideDialog();
}
else
{
AssetBrowser.showDialog();
}
}
function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
{
if(!isObject(%this.previewData))
@ -2401,6 +2435,11 @@ function EWorldEditor::onControlDropped( %this, %payload, %position )
%buildCommand = AssetBrowser @ ".on" @ %assetType @ "EditorDropped(" @ %assetDef @ ",\"" @ %position @ "\");";
}
eval(%buildCommand);
if(EditorSettings.value("AssetManagement/Assets/closeBrowserOnDragAction", false))
{
AssetBrowser.hideDialog();
}
}
EWorldEditor.isDirty = true;