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

Merge branch 'Preview4_0' into SoundAssetImplements

Browse source 
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
This commit is contained in:
AzaezelX 2021-10-11 20:11:27 -05:00
commit f5600826d7
122 changed files with 686 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1802,7 +1802,7 @@ function matchesSearch(%assetName, %assetType)
}
else
{
if(%assetName.tags !$= %word)
if(strstr(strlwr(%assetName.tags), strlwr(%word)) != -1)
%matchTags = true;
}
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/creator.tscript
View file

@ -174,7 +174,7 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
%method = "build" @ %class;
if( !ObjectBuilderGui.isMethod( %method ) )
%cmd = "return new " @ %class @ "();";
%cmd = "new " @ %class @ "();";
else
%cmd = "ObjectBuilderGui." @ %method @ "();";
@ -187,4 +187,4 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
%args.val[2] = %buildfunc;
%this.creatorClassArray.push_back( %group, %args );
}
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript
View file

@ -216,7 +216,7 @@ function directoryHandler::getFolderTreeItemFromAddress(%this, %address)
//break down the address
%folderCount = getTokenCount(%address, "/");
if(startsWith(%address, "Data/") || startsWith(%address, "Tools/") || startsWith(%address, "Core/"))
if(startsWith(%address, "data/") || startsWith(%address, "tools/") || startsWith(%address, "core/"))
{
%curItem = %this.treeCtrl.findChildItemByName(1, "Modules");
}
@ -242,7 +242,7 @@ function directoryHandler::expandTreeToAddress(%this, %address)
%rootId = AssetBrowser-->filterTree.findItemByName("Content");
%this.treeCtrl.expandItem(%rootId);
if(startsWith(%address, "Data/") || startsWith(%address, "Tools/") || startsWith(%address, "Core/"))
if(startsWith(%address, "data/") || startsWith(%address, "tools/") || startsWith(%address, "core/"))
{
%curItem = %this.treeCtrl.findChildItemByName(1, "Modules");
}

4
Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.tscript
View file

@ -22,7 +22,7 @@ function SelectAssetPath::showDialog(%this, %startingPath, %callback, %promptTex
%this.callback = %callback;
%dataItem = SelectAssetPath-->folderTree.insertItem(0, "Data");
%this.dirHandler.loadFolders("Data", %dataItem);
%this.dirHandler.loadFolders("data", %dataItem);
%this.dirHandler.expandTreeToAddress(%startingPath);
%id = %this.dirHandler.getFolderTreeItemFromAddress(%startingPath);
@ -60,4 +60,4 @@ function SelectAssetPath::newFolder(%this)
{
AssetBrowser_newFolderNameTxt.text = "NewFolder";
Canvas.pushDialog(AssetBrowser_newFolder);
}
}