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

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into SubScenes_Gamemode_PR

Browse source
This commit is contained in:
JeffR 2024-09-28 22:11:39 -05:00
commit 20a01d9f02
71 changed files with 353 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

86
Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui
View file

@ -138,7 +138,7 @@ $guiContent = new GuiControl(AssetBrowser) {
};
};
new GuiWindowCtrl(AssetBrowserWindow) {
text = ":: Asset Browser";
text = ":: Asset Browser";
resizeWidth = "0";
resizeHeight = "1";
canMove = "1";
@ -1180,90 +1180,6 @@ $guiContent = new GuiControl(AssetBrowser) {
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab1) {
text = "Tab1 Text 1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "5 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab2) {
text = "Tab1 Text 2";
buttonType = "PushButton";
useMouseEvents = "0";
position = "105 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab3) {
text = "Tab1 Text 3";
buttonType = "PushButton";
useMouseEvents = "0";
position = "205 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl(assetBrowser_Tab4) {
text = "Tab1 Text 4";
buttonType = "PushButton";
useMouseEvents = "0";
position = "305 1";
extent = "95 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiEditorTabButton";
visible = "1";
hidden = "1";
active = "1";
command = "";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Bring this window to the front";
hovertime = "1000";
isContainer = "0";
canSave = "0";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowserWindow_UnDockBtn) {
canSaveDynamicFields = "0";
internalName = "";

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

@ -92,42 +92,6 @@ function AssetBrowser::onDialogPop(%this)
function AssetBrowser::onDialogPush(%this)
{
$AssetBrowser::Open = true;
// Add a tab to the windowed console
if($WindowConsole::Open)
{
%text = "Console Log";
%command = "windowConsoleControl.putToFront();";
AssetBrowserWindow.text = "";
windowConsoleControl.text = "";
AssetBrowser.setTab(assetBrowser_Tab1, "Asset Browser", "");
assetBrowser_Tab1.setHidden(false);
assetBrowser_Tab1.setActive(false);
if(assetBrowser_Tab2.text $= %text || assetBrowser_Tab3.text $= %text || assetBrowser_Tab4.text $= %text)
{
// we have a tab, don't do anything
}
else if(assetBrowser_Tab2.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab2, %text, %command);
}
else if(assetBrowser_Tab3.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab3, %text, %command);
}
else if(assetBrowser_Tab4.hidden == true)
{
AssetBrowser.setTab(assetBrowser_Tab4, %text, %command);
}
else
{
warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()");
}
}
EditorGui.updateSideBar();
}
@ -699,7 +663,9 @@ function AssetBrowser::doRefresh(%this)
function AssetBrowser::populatePreviewImages(%this)
{
echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count());
if (AssetPreviewArray.count()>0)
echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count());
for(%i=0; %i < AssetPreviewArray.count(); %i++)
{
%previewButton = AssetPreviewArray.getKey(%i);
@ -1526,7 +1492,8 @@ function AssetBrowser::rebuildAssetArray(%this)
if(!%this.previewArrayDirty)
{
%this.previewArrayDirty = true;
%this.schedule(16, "doRebuildAssetArray");
cancel(%this.pendingRebuild);
%this.pendingRebuild = %this.schedule(16, "doRebuildAssetArray");
}
}
@ -2899,6 +2866,5 @@ function AssetBrowserWindow::onResize(%this, %posX, %posY, %width, %height)
AssetBrowser-->assetList.fillRowFirst = true;
else
AssetBrowser-->assetList.fillRowFirst = false;
AssetBrowser.doRebuildAssetArray();
AssetBrowser.rebuildAssetArray();
}