TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change Asset Browser logic to utilize folder heirarchy instead of strict Asset Type filtration

Browse source 
Added navigation history to AB, as well as ability to navigate via forward and backward buttons and breadcrumb buttons
Added folder 'asset type', allowing you to create, rename, delete and move folders via the asset browser for better organization
Adjusted various behaviors to work with the address-driven navigation/organization of the AB
Expanded visibility options for the AB and integrated them into editor settings so they are retained
Added Search field for searching the folder structure, in addition to the existing preview tiles search
Adjusted drag-n-drop behavior of the platform code so it accepts dropping folders
Added ability to dump active PostEffects list to see what is currently running
Added ability to mark specific items in GuiTreeViewCtrl as hidden
Made reflection probe bounds boxes translucent rather than wireframe to improve editing visibility
Added expanded loose file references to LevelAsset for common companion files like decals and posteffect scrips
Added editor setting for Editor Layout Mode, allowing you to set the editor into 'Modern' layout.
Added editor settings to set default import config ruleset, and also ability to set auto-import. If both of these are set, then as long as the importing assets have no errors, they will auto-process and the user doesn't need to manually check and confirm them via the asset import window
This commit is contained in:
Areloch 2019-10-20 02:47:15 -05:00
parent e621e362f4
commit cba14c035f
33 changed files with 1633 additions and 800 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/T3D/assets/LevelAsset.cpp
View file

@ -87,6 +87,10 @@ LevelAsset::LevelAsset() : AssetBase(), mIsSubLevel(false)
mLevelName = StringTable->EmptyString();
mLevelFile = StringTable->EmptyString();
mPreviewImage = StringTable->EmptyString();
mPostFXPresetFile = StringTable->EmptyString();
mDecalsFile = StringTable->EmptyString();
mForestFile = StringTable->EmptyString();
mNavmeshFile = StringTable->EmptyString();
mGamemodeName = StringTable->EmptyString();
mMainLevelAsset = StringTable->EmptyString();
@ -115,6 +119,15 @@ void LevelAsset::initPersistFields()
addProtectedField("PreviewImage", TypeAssetLooseFilePath, Offset(mPreviewImage, LevelAsset),
&setPreviewImageFile, &getPreviewImageFile, "Path to the image used for selection preview.");
addProtectedField("PostFXPresetFile", TypeAssetLooseFilePath, Offset(mPostFXPresetFile, LevelAsset),
&setLevelFile, &getLevelFile, "Path to the level's postFXPreset.");
addProtectedField("DecalsFile", TypeAssetLooseFilePath, Offset(mDecalsFile, LevelAsset),
&setLevelFile, &getLevelFile, "Path to the decals cache file.");
addProtectedField("ForestFile", TypeAssetLooseFilePath, Offset(mForestFile, LevelAsset),
&setLevelFile, &getLevelFile, "Path to the Forest cache file.");
addProtectedField("NavmeshFile", TypeAssetLooseFilePath, Offset(mNavmeshFile, LevelAsset),
&setLevelFile, &getLevelFile, "Path to the navmesh file.");
addField("isSubScene", TypeBool, Offset(mIsSubLevel, LevelAsset), "Is this a sublevel to another Scene");
addField("gameModeName", TypeString, Offset(mGamemodeName, LevelAsset), "Name of the Game Mode to be used with this level");
}

12
Engine/source/T3D/assets/LevelAsset.h
View file

@ -46,6 +46,10 @@ class LevelAsset : public AssetBase
StringTableEntry mLevelName;
StringTableEntry mLevelFile;
StringTableEntry mPostFXPresetFile;
StringTableEntry mDecalsFile;
StringTableEntry mForestFile;
StringTableEntry mNavmeshFile;
StringTableEntry mPreviewImage;
bool mIsSubLevel;
@ -66,6 +70,14 @@ public:
void setLevelFile(const char* pImageFile);
inline StringTableEntry getLevelFile(void) const { return mLevelFile; };
void setPostFXPresetFile(const char* pPostFXPresetFile);
inline StringTableEntry getPostFXPresetFile(void) const { return mPostFXPresetFile; };
void setDecalsFile(const char* pDecalsFile);
inline StringTableEntry getDecalsFile(void) const { return mDecalsFile; };
void setForestFile(const char* pForestFile);
inline StringTableEntry getForestFile(void) const { return mForestFile; };
void setNavmeshFile(const char* pNavmeshFile);
inline StringTableEntry getNavmeshFile(void) const { return mNavmeshFile; };
void setImageFile(const char* pImageFile);
inline StringTableEntry getImageFile(void) const { return mPreviewImage; };

3
Engine/source/T3D/lighting/reflectionProbe.cpp
View file

@ -963,7 +963,8 @@ void ReflectionProbe::_onRenderViz(ObjectRenderInst *ri,
desc.setZReadWrite(true, false);
desc.setCullMode(GFXCullNone);
desc.setBlend(true);
desc.fillMode = GFXFillWireframe;
//desc.fillMode = GFXFillWireframe;
// Base the sphere color on the light color.
ColorI color = ColorI(255, 0, 255, 63);

36
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -1176,6 +1176,10 @@ void GuiTreeViewCtrl::_buildItem( Item* item, U32 tabLevel, bool bForceFullUpdat
else
item->mState.clear( Item::Filtered );
//If the item should be hidden from view, check now
if (mHiddenItemsList.contains(item->mId))
item->mState.set(Item::Filtered);
// Is this the root item?
const bool isRoot = item == mRoot;
@ -4477,6 +4481,18 @@ void GuiTreeViewCtrl::setItemFilterException(U32 item, bool isExempted)
}
}
void GuiTreeViewCtrl::setItemHidden(U32 item, bool isHidden)
{
if (isHidden)
{
mHiddenItemsList.push_back(item);
}
else
{
mHiddenItemsList.remove(item);
}
}
void GuiTreeViewCtrl::reparentItems(Vector<Item*> selectedItems, Item* newParent)
{
for (S32 i = 0; i < selectedItems.size(); i++)
@ -5651,6 +5667,26 @@ DefineEngineMethod(GuiTreeViewCtrl, setItemFilterException, void, (U32 item, boo
{
object->setItemFilterException(item, isExempt);
}
DefineEngineMethod(GuiTreeViewCtrl, setItemHidden, void, (U32 item, bool hidden), (0, true),
"Set the pattern by which to filter items in the tree. Only items in the tree whose text "
"matches this pattern are displayed.\n\n"
"@param pattern New pattern based on which visible items in the tree should be filtered. If empty, all items become visible.\n\n"
"@see getFilterText\n"
"@see clearFilterText")
{
object->setItemHidden(item, hidden);
}
DefineEngineMethod(GuiTreeViewCtrl, clearHiddenItems, void, (),,
"Set the pattern by which to filter items in the tree. Only items in the tree whose text "
"matches this pattern are displayed.\n\n"
"@param pattern New pattern based on which visible items in the tree should be filtered. If empty, all items become visible.\n\n"
"@see getFilterText\n"
"@see clearFilterText")
{
object->clearHiddenItems();
}
//-----------------------------------------------------------------------------
DefineEngineMethod( GuiTreeViewCtrl, clearFilterText, void, (),,

3
Engine/source/gui/controls/guiTreeViewCtrl.h
View file

@ -360,6 +360,7 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
bool mDoFilterChildren;
Vector<U32> mItemFilterExceptionList;
Vector<U32> mHiddenItemsList;
/// If true, a trace of actions taken by the control is logged to the console. Can
/// be turned on with the setDebug() script method.
@ -578,6 +579,8 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
void setFilterChildren(bool doFilter) { mDoFilterChildren = doFilter; }
void setItemFilterException(U32 item, bool isExempt);
void setItemHidden(U32 item, bool isHidden);
void clearHiddenItems() { mHiddenItemsList.clear(); }
/// Clear the current item filtering pattern.
void clearFilterText() { setFilterText( String::EmptyString ); }

73
Engine/source/postFx/postEffectManager.cpp
View file

@ -314,3 +314,76 @@ S32 PostEffectManager::_effectPrioritySort( PostEffect* const *e1, PostEffect* c
return 0;
}
void PostEffectManager::dumpActivePostFX()
{
EffectVector effects;
for (U32 i = 0; i < mEndOfFrameList.size(); i++)
{
PostEffect* effect = mEndOfFrameList[i];
if(effect->isEnabled())
effects.push_back(effect);
}
for (U32 i = 0; i < mAfterDiffuseList.size(); i++)
{
PostEffect* effect = mAfterDiffuseList[i];
if (effect->isEnabled())
effects.push_back(effect);
}
// Now check the bin maps.
EffectMap::Iterator mapIter = mAfterBinMap.begin();
for (; mapIter != mAfterBinMap.end(); mapIter++)
{
EffectVector& ef = mapIter->value;
for (U32 i = 0; i < ef.size(); i++)
{
PostEffect* effect = ef[i];
if (effect->isEnabled())
effects.push_back(effect);
}
}
mapIter = mBeforeBinMap.begin();
for (; mapIter != mBeforeBinMap.end(); mapIter++)
{
EffectVector& ef = mapIter->value;
for (U32 i = 0; i < ef.size(); i++)
{
PostEffect* effect = ef[i];
if (effect->isEnabled())
effects.push_back(effect);
}
}
// Resort the effects by priority.
effects.sort(&_effectPrioritySort);
Con::printf("PostEffectManager::dumpActivePostFX() - Beginning Dump");
for (U32 i = 0; i < effects.size(); i++)
{
PostEffect* effect = effects[i];
if (effect->isEnabled())
{
Con::printf("%s", effect->getName());
}
}
Con::printf("PostEffectManager::dumpActivePostFX() - Ending Dump");
}
DefineEngineFunction(dumpActivePostFX, void, (),, "")
{
PFXMGR->dumpActivePostFX();
}

4
Engine/source/postFx/postEffectManager.h
View file

@ -132,9 +132,11 @@ public:
// For ManagedSingleton.
static const char* getSingletonName() { return "PostEffectManager"; }
void dumpActivePostFX();
};
/// Returns the PostEffectManager singleton.
#define PFXMGR ManagedSingleton<PostEffectManager>::instance()
#endif // _POSTEFFECTMANAGER_H_
#endif // _POSTEFFECTMANAGER_H_

2
Engine/source/windowManager/sdl/sdlWindowMgr.cpp
View file

@ -353,7 +353,7 @@ void PlatformWindowManagerSDL::_process()
char* fileName = evt.drop.file;
if (!Platform::isFile(fileName))
if (!Platform::isDirectory(fileName) && !Platform::isFile(fileName))
break;
Con::executef("onDropFile", StringTable->insert(fileName));

2
Templates/BaseGame/game/core/postFX/scripts/glow.cs
View file

@ -146,7 +146,7 @@ singleton PostEffect( VolFogGlowPostFx )
texture[0] = "$backbuffer";
target = "$outTex";
targetScale = "0.5 0.5";
isEnabled = true;
isEnabled = false;
// Blur vertically
new PostEffect()
{

2
Templates/BaseGame/game/core/postFX/scripts/hdr.cs
View file

@ -328,7 +328,7 @@ function HDRPostFX::onAdd( %this )
PostFXManager.registerPostEffect(%this);
//HDR should really be on at all times
%this.enable();
//%this.enable();
$HDRPostFX::enableToneMapping = 1;
}

2
Templates/BaseGame/game/core/postFX/scripts/postFx.cs
View file

@ -35,8 +35,6 @@ singleton ShaderData( PFX_PassthruShader )
function postFXInit()
{
exec("core/postFX/guis/postFxManager.gui");
//Load the core postFX files themselves
if (!$Server::Dedicated)
{

66
Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml
View file

@ -1,56 +1,56 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<AssetImportSettings>
<Group name="TestConfig">
<Group name="Meshes">
<Setting name="DoUpAxisOverride">0</Setting>
<Setting name="IgnoreNodeScale">0</Setting>
<Setting name="ScaleOverride">1</Setting>
<Setting name="CollapseSubmeshes">0</Setting>
<Setting name="AdjustCenter">0</Setting>
<Setting name="AdjustFloor">0</Setting>
<Setting name="UpAxisOverride">Z_AXIS</Setting>
<Setting name="LODType">TrailingNumber</Setting>
<Group name="Animations">
<Setting name="SeparateAnimations">1</Setting>
<Setting name="ImportAnimations">1</Setting>
</Group>
<Group name="Materials">
<Setting name="ImportMaterials">1</Setting>
<Setting name="CreateComposites">1</Setting>
<Setting name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting name="UseExistingMaterials">1</Setting>
<Setting name="IgnoreMaterials">ColorEffect*,</Setting>
<Setting name="UseExistingMaterials">1</Setting>
<Setting name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting name="CreateComposites">1</Setting>
<Setting name="ImportMaterials">1</Setting>
</Group>
<Group name="Meshes">
<Setting name="AdjustFloor">0</Setting>
<Setting name="CollapseSubmeshes">0</Setting>
<Setting name="IgnoreNodeScale">0</Setting>
<Setting name="UpAxisOverride">Z_AXIS</Setting>
<Setting name="ScaleOverride">1</Setting>
<Setting name="LODType">TrailingNumber</Setting>
<Setting name="AdjustCenter">0</Setting>
<Setting name="DoUpAxisOverride">0</Setting>
</Group>
<Group name="Images">
<Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
<Setting name="PopulateMaterialMaps">1</Setting>
<Setting name="UseMips">1</Setting>
<Setting name="Compressed">1</Setting>
<Setting name="TextureFilteringMode">Bilinear</Setting>
<Setting name="GenerateMaterialOnImport">1</Setting>
<Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
<Setting name="IsHDR">0</Setting>
<Setting name="Scaling">1.0</Setting>
<Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL,_baseColor,</Setting>
<Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting>
<Setting name="ImageType">N/A</Setting>
<Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
<Setting name="UseMips">1</Setting>
<Setting name="TextureFilteringMode">Bilinear</Setting>
<Setting name="IsHDR">0</Setting>
<Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
<Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
<Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting name="ImageType">N/A</Setting>
<Setting name="Compressed">1</Setting>
<Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
<Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
<Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL,_baseColor,_a,</Setting>
<Setting name="PopulateMaterialMaps">1</Setting>
<Setting name="GenerateMaterialOnImport">1</Setting>
<Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting>
</Group>
<Group name="Collision">
<Setting name="GenerateLOSCollisions">1</Setting>
<Setting name="GenerateCollisions">1</Setting>
<Setting name="LOSCollisionMeshPrefix">LOS</Setting>
<Setting name="CollisionMeshPrefix">Col</Setting>
<Setting name="GenCollisionType">CollisionMesh</Setting>
<Setting name="GenerateCollisions">1</Setting>
<Setting name="LOSCollisionMeshPrefix">LOS</Setting>
<Setting name="GenLOSCollisionType">CollisionMesh</Setting>
</Group>
<Group name="Animations">
<Setting name="ImportAnimations">1</Setting>
<Setting name="SeparateAnimations">1</Setting>
</Group>
<Group name="Sounds">
<Setting name="PitchAdjust">1.0</Setting>
<Setting name="Compressed">0</Setting>
<Setting name="VolumeAdjust">1.0</Setting>
<Setting name="Compressed">0</Setting>
</Group>
<Group name="General">
<Setting name="DuplicatAutoResolution">AutoPrune</Setting>

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

@ -13,13 +13,23 @@
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "1";
AddNewArtAssetPopup = "18222";
AddNewAssetPopup = "18223";
AddNewScriptAssetPopup = "18221";
AddNewArtAssetPopup = "18110";
AddNewAssetPopup = "18112";
AddNewCppAssetPopup = "18111";
AddNewScriptAssetPopup = "18109";
coreModulesFilter = "0";
currentPreviewPage = "0";
enabled = "1";
Enabled = "1";
importAssetFinalListArray = "20689";
ImportAssetResolutionsPopup = "18119";
importAssetUnprocessedListArray = "20688";
importingFilesArray = "20687";
isReImportingAsset = "0";
navigationHistoryIdx = "0";
onlyShowModulesWithAssets = "0";
previewData = "19953";
previewSize = "80";
templateFilesPath = "tools/assetBrowser/scripts/templateFiles/";
totalPages = "1";
treeFilterMode = "list";
@ -201,7 +211,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "50 22";
position = "52 22";
extent = "45 19";
minExtent = "8 2";
horizSizing = "right";
@ -215,97 +225,107 @@
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiWindowCtrl(TagFilterWindow) {
text = "New Window";
resizeWidth = "1";
resizeHeight = "1";
canMove = "1";
canClose = "0";
canMinimize = "0";
canMaximize = "0";
canCollapse = "0";
edgeSnap = "1";
docking = "None";
margin = "4 4 4 4";
padding = "0 0 0 0";
anchorTop = "0";
anchorBottom = "0";
anchorLeft = "0";
anchorRight = "0";
position = "129 62";
extent = "161 250";
minExtent = "161 86";
horizSizing = "windowRelative";
vertSizing = "windowRelative";
profile = "ToolsGuiToolbarWindowProfile";
visible = "0";
new GuiBitmapButtonCtrl(AssetBrowser_NavigateBackBtn) {
bitmap = "tools/gui/images/folderUp.png";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "98 21";
extent = "22 22";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.navigateHistoryBack();";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowser_NavigateForwardBtn) {
bitmap = "tools/gui/images/folderDown.png";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "120 21";
extent = "22 22";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.navigateHistoryForward();";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiStackControl(AssetBrowser_BreadcrumbBar) {
stackingType = "Horizontal";
horizStacking = "Left to Right";
vertStacking = "Top to Bottom";
padding = "0";
dynamicSize = "0";
dynamicNonStackExtent = "0";
dynamicPos = "0";
changeChildSizeToFit = "0";
changeChildPosition = "1";
position = "156 21";
extent = "326 23";
minExtent = "16 16";
horizSizing = "width";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "VisibilityLayerWindow";
hidden = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiScrollCtrl() {
willFirstRespond = "1";
hScrollBar = "alwaysOff";
vScrollBar = "dynamic";
lockHorizScroll = "1";
lockVertScroll = "0";
constantThumbHeight = "0";
childMargin = "2 0";
mouseWheelScrollSpeed = "-1";
docking = "Client";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "1 9";
extent = "159 238";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "ToolsGuiScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "ToolsGuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiStackControl(TagFilterList) {
stackingType = "Vertical";
horizStacking = "Left to Right";
vertStacking = "Top to Bottom";
padding = "-2";
dynamicSize = "1";
dynamicNonStackExtent = "0";
dynamicPos = "0";
changeChildSizeToFit = "1";
changeChildPosition = "1";
position = "3 1";
extent = "153 16";
minExtent = "16 16";
horizSizing = "width";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "ToolsGuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "theVisOptionsList";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
new GuiSplitContainer() {
new GuiBitmapButtonCtrl(AssetBrowser_VisibilityOptions) {
bitmap = "tools/gui/images/visible";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "487 21";
extent = "23 23";
minExtent = "8 2";
horizSizing = "left";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showVisibiltyOptions();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Visibility Options";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiSplitContainer(AssetBrowser_MainSplit) {
orientation = "Vertical";
splitterSize = "2";
splitPoint = "149 100";
@ -332,7 +352,7 @@
canSave = "1";
canSaveDynamicFields = "0";
new GuiPanel() {
new GuiPanel(AssetBrowser_FoldersPanel) {
docking = "Client";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -342,7 +362,7 @@
anchorRight = "0";
position = "0 0";
extent = "147 509";
minExtent = "16 16";
minExtent = "0 0";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
@ -376,8 +396,13 @@
canSave = "1";
canSaveDynamicFields = "0";
new GuiTextCtrl() {
text = "Filters";
new GuiTextEditCtrl(AssetBrowserFolderSearchFilter) {
historySize = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
text = "Search Folders...";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -385,23 +410,24 @@
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 0";
extent = "30 16";
position = "0 0";
extent = "148 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";
profile = "ToolsGuiTextEditProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "AssetBrowserSearchFilterTxt";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/visible";
bitmapMode = "Stretched";
new GuiBitmapButtonCtrl(AssetBrowser_ClearFolderFilterBtn) {
bitmap = "tools/gui/images/clear-icon";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
@ -409,17 +435,15 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "128 -1";
extent = "18 19";
position = "132 0";
extent = "15 15";
minExtent = "8 2";
horizSizing = "right";
horizSizing = "left";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showFilterPopup();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Views assets via module-oriented list tree.";
hovertime = "1000";
isContainer = "0";
canSave = "1";
@ -500,7 +524,7 @@
canRenameObjects = "1";
renameInternal = "0";
position = "1 1";
extent = "145 252";
extent = "145 147";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -517,7 +541,7 @@
};
};
};
new GuiPanel() {
new GuiPanel(AssetBrowser_AssetsPanel) {
docking = "Client";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -548,7 +572,7 @@
anchorLeft = "1";
anchorRight = "0";
position = "1 0";
extent = "354 41";
extent = "354 19";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
@ -561,65 +585,13 @@
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/new";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "42 22";
extent = "15 15";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.createNewAsset();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Create New Asset";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "23 22";
extent = "15 15";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showDeleteDialog();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Delete Asset";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextEditCtrl(AssetBrowserSearchFilter) {
historySize = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
text = "\c2Filter...";
text = "Search Assets...";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -627,8 +599,8 @@
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "62 19";
extent = "273 18";
position = "21 1";
extent = "314 18";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
@ -638,12 +610,12 @@
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "AssetBrowserSearchFilterText";
class = "AssetBrowserSearchFilterTxt";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(TagFilterButton) {
bitmap = "tools/gui/images/visible";
new GuiBitmapButtonCtrl(AssetBrowser_ClearAssetFilterBtn) {
bitmap = "tools/gui/images/clear-icon";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -652,55 +624,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "4 19";
extent = "20 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.toggleTagFilterPopup();";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Assets";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 0";
extent = "53 16";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "337 22";
position = "321 1";
extent = "15 15";
minExtent = "8 2";
horizSizing = "left";
@ -708,9 +632,60 @@
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showDeleteDialog();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Delete Asset";
tooltip = "Create New Asset";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowser_ToggleFolderPanel) {
bitmap = "tools/gui/images/iconList.png";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "1 1";
extent = "15 15";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.toggleFolderCollapseButton();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Toggles the display of the folders panel";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowser_FilterOptionsBtn) {
bitmap = "tools/gui/images/filter.png";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "337 1";
extent = "15 15";
minExtent = "8 2";
horizSizing = "left";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
command = "AssetBrowser.showFilterOptions();";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Filter Options";
hovertime = "1000";
isContainer = "0";
canSave = "1";
@ -724,8 +699,8 @@
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "1";
position = "1 40";
extent = "354 468";
position = "1 17";
extent = "354 487";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
@ -755,7 +730,7 @@
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "354 448";
extent = "354 467";
minExtent = "8 8";
horizSizing = "width";
vertSizing = "height";
@ -768,6 +743,22 @@
canSave = "1";
canSaveDynamicFields = "0";
new GuiMouseEventCtrl(AssetListPanelInputs) {
lockMouse = "0";
position = "1 0";
extent = "339 467";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiStackControl() {
stackingType = "Vertical";
horizStacking = "Left to Right";
@ -778,8 +769,8 @@
dynamicPos = "0";
changeChildSizeToFit = "1";
changeChildPosition = "0";
position = "1 1";
extent = "352 254";
position = "2 1";
extent = "339 124";
minExtent = "16 16";
horizSizing = "width";
vertSizing = "bottom";
@ -792,25 +783,10 @@
canSave = "1";
canSaveDynamicFields = "0";
new GuiControl() {
position = "0 0";
extent = "352 4";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiDynamicCtrlArrayControl() {
colCount = "3";
colSize = "100";
rowCount = "2";
rowCount = "1";
rowSize = "124";
rowSpacing = "2";
colSpacing = "2";
@ -819,8 +795,8 @@
fillRowFirst = "1";
dynamicSize = "1";
padding = "0 0 0 0";
position = "3 4";
extent = "352 250";
position = "3 0";
extent = "339 124";
minExtent = "8 8";
horizSizing = "width";
vertSizing = "bottom";
@ -830,7 +806,7 @@
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "materialSelection";
internalName = "assetList";
canSave = "1";
canSaveDynamicFields = "0";
};
@ -844,7 +820,7 @@
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 448";
position = "0 467";
extent = "354 20";
minExtent = "8 2";
horizSizing = "width";
@ -859,13 +835,35 @@
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl(AssetBrowser_FooterText) {
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 470";
extent = "269 23";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "top";
profile = "ToolsGuiTextProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
};
new GuiButtonCtrl() {
text = "Select";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "242 491";
position = "301 488";
extent = "53 19";
minExtent = "8 2";
horizSizing = "left";
@ -882,26 +880,6 @@
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl() {
text = "Cancel";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "300 491";
extent = "52 19";
minExtent = "8 2";
horizSizing = "left";
vertSizing = "top";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "AssetBrowser.hideDialog();";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
};

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui
View file

@ -224,7 +224,7 @@
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiScrollCtrl() {
new GuiScrollCtrl(ImportAssetConfigEditorScroll) {
willFirstRespond = "1";
hScrollBar = "dynamic";
vScrollBar = "dynamic";

27
Templates/BaseGame/game/tools/assetBrowser/main.cs
View file

@ -30,6 +30,32 @@ function initializeAssetBrowser()
{
echo(" % - Initializing Asset Browser");
$AssetBrowser::importConfigsFile = "tools/assetBrowser/assetImportConfigs.xml";
$AssetBrowser::currentImportConfig = "";
if(!isObject(AssetFilterTypeList))
{
new ArrayObject(AssetFilterTypeList);
AssetFilterTypeList.add("Component");
AssetFilterTypeList.add("Cpp");
AssetFilterTypeList.add("Cubemap");
AssetFilterTypeList.add("GameObjects");
AssetFilterTypeList.add("GUIs");
AssetFilterTypeList.add("Images");
AssetFilterTypeList.add("Levels");
AssetFilterTypeList.add("Materials");
AssetFilterTypeList.add("Particles");
AssetFilterTypeList.add("PostFXs");
AssetFilterTypeList.add("Scripts");
AssetFilterTypeList.add("Shapes");
AssetFilterTypeList.add("ShapeAnimations");
AssetFilterTypeList.add("Sounds");
AssetFilterTypeList.add("StateMachines");
AssetFilterTypeList.add("Terrains");
AssetFilterTypeList.add("TerrainMaterials");
}
exec("./guis/assetBrowser.gui");
exec("./guis/addModuleWindow.gui");
exec("./guis/gameObjectCreator.gui");
@ -67,6 +93,7 @@ function initializeAssetBrowser()
exec("./scripts/assetTypes/sound.cs");
exec("./scripts/assetTypes/stateMachine.cs");
exec("./scripts/assetTypes/cubemap.cs");
exec("./scripts/assetTypes/folder.cs");
exec("./scripts/fieldTypes/fieldTypes.cs");
exec("./scripts/fieldTypes/listField.cs");

882
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs
View file

File diff suppressed because it is too large Load diff

176
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs
View file

@ -85,6 +85,7 @@ function AssetBrowser::onBeginDropFiles( %this )
//prep the import control
Canvas.pushDialog(AssetImportCtrl);
AssetImportCtrl.setHidden(true);
ImportAssetTree.clear();
ImportAssetTree.insertItem(0, "Importing Assets");
AssetBrowser.unprocessedAssetsCount = 0;
@ -161,136 +162,39 @@ function AssetBrowser::onDropZipFile(%this, %filePath)
}
}
function AssetBrowser::onDropImageFile(%this, %filePath)
{
if(!%this.isVisible())
return;
// File Information madness
%fileName = %filePath;
%fileOnlyName = fileName( %fileName );
%fileBase = validateDatablockName(fileBase( %fileName ) @ "ImageMap");
// [neo, 5/17/2007 - #3117]
// Check if the file being dropped is already in data/images or a sub dir by checking if
// the file path up to length of check path is the same as check path.
%defaultPath = EditorSettings.value( "WorldEditor/defaultMaterialsPath" );
%checkPath = expandFilename( "^"@%defaultPath );
%fileOnlyPath = expandFileName( %filePath ); //filePath( expandFileName( %filePath ) );
%fileBasePath = getSubStr( %fileOnlyPath, 0, strlen( %checkPath ) );
if( %checkPath !$= %fileBasePath )
{
// No match so file is from outside images directory and we need to copy it in
%fileNewLocation = expandFilename("^"@%defaultPath) @ "/" @ fileBase( %fileName ) @ fileExt( %fileName );
// Move to final location
if( !pathCopy( %filePath, %fileNewLocation ) )
return;
}
else
{
// Already in images path somewhere so just link to it
%fileNewLocation = %filePath;
}
addResPath( filePath( %fileNewLocation ) );
%matName = fileBase( %fileName );
// Create Material
%imap = new Material(%matName)
{
mapTo = fileBase( %matName );
diffuseMap[0] = %defaultPath @ "/" @ fileBase( %fileName ) @ fileExt( %fileName );
};
//%imap.setName( %fileBase );
//%imap.imageName = %fileNewLocation;
//%imap.imageMode = "FULL";
//%imap.filterPad = false;
//%imap.compile();
%diffusecheck = %imap.diffuseMap[0];
// Bad Creation!
if( !isObject( %imap ) )
return;
%this.addDatablock( %fileBase, false );
}
function AssetBrowser::onDropSoundFile(%this, %filePath)
{
if(!%this.isVisible())
return;
// File Information madness
%fileName = %filePath;
%fileOnlyName = fileName( %fileName );
%fileBase = validateDatablockName(fileBase( %fileName ) @ "ImageMap");
// [neo, 5/17/2007 - #3117]
// Check if the file being dropped is already in data/images or a sub dir by checking if
// the file path up to length of check path is the same as check path.
%defaultPath = EditorSettings.value( "WorldEditor/defaultMaterialsPath" );
%checkPath = expandFilename( "^"@%defaultPath );
%fileOnlyPath = expandFileName( %filePath ); //filePath( expandFileName( %filePath ) );
%fileBasePath = getSubStr( %fileOnlyPath, 0, strlen( %checkPath ) );
if( %checkPath !$= %fileBasePath )
{
// No match so file is from outside images directory and we need to copy it in
%fileNewLocation = expandFilename("^"@%defaultPath) @ "/" @ fileBase( %fileName ) @ fileExt( %fileName );
// Move to final location
if( !pathCopy( %filePath, %fileNewLocation ) )
return;
}
else
{
// Already in images path somewhere so just link to it
%fileNewLocation = %filePath;
}
addResPath( filePath( %fileNewLocation ) );
%matName = fileBase( %fileName );
// Create Material
%imap = new Material(%matName)
{
mapTo = fileBase( %matName );
diffuseMap[0] = %defaultPath @ "/" @ fileBase( %fileName ) @ fileExt( %fileName );
};
//%imap.setName( %fileBase );
//%imap.imageName = %fileNewLocation;
//%imap.imageMode = "FULL";
//%imap.filterPad = false;
//%imap.compile();
%diffusecheck = %imap.diffuseMap[0];
// Bad Creation!
if( !isObject( %imap ) )
return;
%this.addDatablock( %fileBase, false );
}
function AssetBrowser::onEndDropFiles( %this )
{
if(!%this.isVisible())
return;
//we have assets to import, so go ahead and display the window for that now
AssetImportCtrl.setHidden(false);
ImportAssetWindow.visible = true;
//ImportAssetWindow.validateAssets();
ImportAssetWindow.refresh();
ImportAssetWindow.selectWindow();
%hasIssues = ImportAssetWindow.validateAssets();
//If we have a valid config file set and we've set to auto-import, and we have no
//issues for importing, then go ahead and run the import immediately, don't
//bother showing the window.
//If any of these conditions fail, we'll display the import window so it can be handled
//by the user
if(ImportAssetWindow.importConfigsList.count() != 0 &&
EditorSettings.value("Assets/AssetImporDefaultConfig") !$= "" &&
EditorSettings.value("Assets/AutoImport", false) == true
&& %hasIssues == false)
{
AssetImportCtrl.setHidden(true);
ImportAssetWindow.visible = false;
//Go ahead and check if we have any issues, and if not, run the import!
ImportAssetWindow.ImportAssets();
}
else
{
//we have assets to import, so go ahead and display the window for that now
AssetImportCtrl.setHidden(false);
ImportAssetWindow.visible = true;
ImportAssetWindow.selectWindow();
}
// Update object library
GuiFormManager::SendContentMessage($LBCreateSiderBar, %this, "refreshAll 1");
@ -503,9 +407,6 @@ function ImportAssetWindow::onWake(%this)
//Lets refresh our list
if(!ImportAssetWindow.isVisible())
return;
$AssetBrowser::importConfigsFile = "tools/assetBrowser/assetImportConfigs.xml";
$AssetBrowser::currentImportConfig = "";
if(!isObject(AssetImportSettings))
{
@ -526,7 +427,11 @@ function ImportAssetWindow::onWake(%this)
function ImportAssetWindow::reloadImportOptionConfigs(%this)
{
ImportAssetWindow.importConfigsList = new ArrayObject();
if(!isObject(ImportAssetWindow.importConfigsList))
ImportAssetWindow.importConfigsList = new ArrayObject();
else
ImportAssetWindow.importConfigsList.empty();
ImportAssetConfigList.clear();
%xmlDoc = new SimXMLDocument();
@ -1168,10 +1073,12 @@ function ImportAssetWindow::validateAssets(%this)
//Clear any status
%this.resetAssetsValidationStatus();
ImportAssetWindow.importIssues = false;
%id = ImportAssetTree.getChild(1);
%hasIssues = %this.validateAsset(%id);
if(%hasIssues)
if(ImportAssetWindow.importIssues == false)
return false;
else
return true;
@ -1179,6 +1086,7 @@ function ImportAssetWindow::validateAssets(%this)
function ImportAssetWindow::validateAsset(%this, %id)
{
%moduleName = ImportAssetModuleList.getText();
while (%id > 0)
@ -1229,21 +1137,17 @@ function ImportAssetWindow::validateAsset(%this, %id)
{
%foundCollision = true;
%assetItem.status = "Warning";
%assetItem.status = "error";
%assetItem.statusType = "DuplicateAsset";
%assetItem.statusInfo = "Duplicate asset names found with the target module!\nAsset \"" @
%assetItem.assetName @ "\" of type \"" @ %assetItem.assetType @ "\" has a matching name.\nPlease rename it and try again!";
//Clean up our queries
%assetQuery.delete();
break;
}
}
if(%foundCollision == true)
{
%hasIssues = true;
//yup, a collision, prompt for the change and bail out
/*MessageBoxOK( "Error!", "Duplicate asset names found with the target module!\nAsset \"" @
%assetItemA.assetName @ "\" of type \"" @ %assetItemA.assetType @ "\" has a matching name.\nPlease rename it and try again!");*/
@ -1259,7 +1163,6 @@ function ImportAssetWindow::validateAsset(%this, %id)
//Check if we were given a file path(so not generated) but somehow isn't a valid file
if(%assetItem.filePath !$= "" && !%assetItem.generatedAsset && !isFile(%assetItem.filePath))
{
%hasIssues = true;
%assetItem.status = "error";
%assetItem.statusType = "MissingFile";
%assetItem.statusInfo = "Unable to find file to be imported. Please select asset file.";
@ -1273,6 +1176,9 @@ function ImportAssetWindow::validateAsset(%this, %id)
}
}
if(%assetItem.status $= "error")
ImportAssetWindow.importIssues = true;
if(ImportAssetTree.isParentItem(%id))
{
%childItem = ImportAssetTree.getChild(%id);

9
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.cs
View file

@ -9,7 +9,9 @@ function ImportAssetConfigList::onSelect( %this, %id, %text )
ImportAssetWindow.activeImportConfigIndex = %id;
ImportAssetWindow.activeImportConfig = ImportAssetWindow.importConfigsList.getKey(%id);
AssetBrowser.reloadImportingFiles();
//If we were trying to import anything, refresh it with the new config
if( AssetBrowser.importingFilesArray.count() != 0)
AssetBrowser.reloadImportingFiles();
}
function setupImportConfigSettingsList()
@ -428,8 +430,9 @@ function ImportOptionsConfigList::changeEditorSetting(%this, %varName, %value)
if(%oldValue !$= %value)
{
%id = %this.getSelectedRow();
%this.setSelectedRow(%id);
%scollPos = ImportAssetConfigEditorScroll.getScrollPosition();
ImportAssetConfigEditorWindow.populateConfigList(ImportAssetWindow.activeImportConfig);
ImportAssetConfigEditorScroll.setScrollPosition(%scollPos.x, %scollPos.y);
}
}

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.cs
View file

@ -76,7 +76,7 @@ function AssetBrowser::duplicateComponentAsset(%this, %assetId)
}
function AssetBrowser::renameGameObjectAsset(%this, %assetDef, %newAssetId, %originalName, %newName)
function AssetBrowser::renameComponentAsset(%this, %assetDef, %newAssetId, %originalName, %newName)
{
%assetPath = AssetDatabase.getAssetFilePath(%newAssetId);

8
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.cs
View file

@ -5,9 +5,11 @@ function AssetBrowser::createGUIAsset(%this)
%assetName = AssetBrowser.newAssetSettings.assetName;
%tamlpath = %modulePath @ "/GUIs/" @ %assetName @ ".asset.taml";
%guipath = %modulePath @ "/GUIs/" @ %assetName @ ".gui";
%scriptPath = %modulePath @ "/GUIs/" @ %assetName @ ".cs";
%assetPath = AssetBrowser.currentAddress @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%guipath = %assetPath @ %assetName @ ".gui";
%scriptPath = %assetPath @ %assetName @ ".cs";
%asset = new GUIAsset()
{

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.cs
View file

@ -117,7 +117,7 @@ function AssetBrowser::importImageAsset(%this, %assetItem)
%assetImportSuccessful = false;
%assetId = %moduleName@":"@%assetName;
%assetPath = "data/" @ %moduleName @ "/Images";
%assetPath = AssetBrowser.currentAddress @ "/";
%assetFullPath = %assetPath @ "/" @ fileName(%filePath);
%newAsset = new ImageAsset()

14
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.cs
View file

@ -5,14 +5,20 @@ function AssetBrowser::createLevelAsset(%this)
%assetName = AssetBrowser.newAssetSettings.assetName;
%tamlpath = %modulePath @ "/levels/" @ %assetName @ ".asset.taml";
%levelPath = %modulePath @ "/levels/" @ %assetName @ ".mis";
%assetPath = AssetBrowser.currentAddress @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%levelPath = %assetPath @ %assetName @ ".mis";
%asset = new LevelAsset()
{
AssetName = %assetName;
versionId = 1;
LevelFile = %assetName @ ".mis";
DecalsFile = %assetName @ ".mis.decals";
PostFXPresetFile = %assetName @ ".postfxpreset.cs";
ForestFile = %assetName @ ".forest";
NavmeshFile = %assetName @ ".nav";
LevelName = AssetBrowser.newAssetSettings.levelName;
AssetDescription = AssetBrowser.newAssetSettings.description;
PreviewImage = AssetBrowser.newAssetSettings.levelPreviewImage;
@ -24,6 +30,10 @@ function AssetBrowser::createLevelAsset(%this)
{
echo("Unable to copy template level file!");
}
//Generate the associated files
DecalManagerSave( %assetPath @ %asset.DecalsFile );
PostFXManager::savePresetHandler( %assetPath @ %asset.PostFXPresetFile );
%moduleDef = ModuleDatabase.findModule(%moduleName, 1);
AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath);

8
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
View file

@ -278,10 +278,10 @@ function AssetBrowser::importMaterialAsset(%this, %assetItem)
%assetImportSuccessful = false;
%assetId = %moduleName@":"@%assetName;
%assetPath = "data/" @ %moduleName @ "/materials";
%tamlpath = %assetPath @ "/" @ %assetName @ ".asset.taml";
%sgfPath = %assetPath @ "/" @ %assetName @ ".sgf";
%scriptPath = %assetPath @ "/" @ %assetName @ ".cs";
%assetPath = AssetBrowser.currentAddress @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%sgfPath = %assetPath @ %assetName @ ".sgf";
%scriptPath = %assetPath @ %assetName @ ".cs";
%newAsset = new MaterialAsset()
{

8
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.cs
View file

@ -3,10 +3,12 @@ function AssetBrowser::createScriptAsset(%this)
%moduleName = AssetBrowser.newAssetSettings.moduleName;
%modulePath = "data/" @ %moduleName;
%assetName = AssetBrowser.newAssetSettings.assetName;
%assetName = AssetBrowser.newAssetSettings.assetName;
%tamlpath = %modulePath @ "/scripts/" @ %assetName @ ".asset.taml";
%scriptPath = %modulePath @ "/scripts/" @ %assetName @ ".cs";
%assetPath = AssetBrowser.currentAddress @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%scriptPath = %assetPath @ %assetName @ ".cs";
%asset = new ScriptAsset()
{

6
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.cs
View file

@ -5,8 +5,10 @@ function AssetBrowser::createShapeAsset(%this)
%assetName = AssetBrowser.newAssetSettings.assetName;
%tamlpath = %modulePath @ "/shapes/" @ %assetName @ ".asset.taml";
%shapeFilePath = %modulePath @ "/shapes/" @ %assetName @ ".dae";
%assetPath = AssetBrowser.currentAddress @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%shapeFilePath = %assetPath @ %assetName @ ".dae";
%asset = new ShapeAsset()
{

115
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs
View file

@ -76,7 +76,7 @@ function AssetBrowser::refreshAsset(%this, %assetId)
function AssetBrowser::renameAsset(%this)
{
//Find out what type it is
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
//%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%curFirstResponder = AssetBrowser.getFirstResponder();
@ -92,36 +92,56 @@ function AssetBrowser::performRenameAsset(%this, %originalAssetName, %newName)
//if the name is different to the asset's original name, rename it!
if(%originalAssetName !$= %newName)
{
%moduleName = AssetBrowser.selectedModule;
//do a rename!
%success = AssetDatabase.renameDeclaredAsset(%moduleName @ ":" @ %originalAssetName, %moduleName @ ":" @ %newName);
if(%success)
echo("AssetBrowser - renaming of asset " @ %moduleName @ ":" @ %originalAssetName @ " to " @ %moduleName @ ":" @ %newName @ " was a success.");
else
echo("AssetBrowser - renaming of asset " @ %moduleName @ ":" @ %originalAssetName @ " to " @ %moduleName @ ":" @ %newName @ " was a failure.");
if(%success)
if(EditAssetPopup.assetType !$= "Folder")
{
%newAssetId = %moduleName @ ":" @ %newName;
%assetPath = AssetDatabase.getAssetFilePath(%newAssetId);
%moduleName = AssetBrowser.selectedModule;
//Rename any associated files as well
%assetDef = AssetDatabase.acquireAsset(%newAssetId);
%assetType = %assetDef.getClassName();
//do a rename!
%success = AssetDatabase.renameDeclaredAsset(%moduleName @ ":" @ %originalAssetName, %moduleName @ ":" @ %newName);
//rename the file to match
%path = filePath(%assetPath);
if(%success)
echo("AssetBrowser - renaming of asset " @ %moduleName @ ":" @ %originalAssetName @ " to " @ %moduleName @ ":" @ %newName @ " was a success.");
else
echo("AssetBrowser - renaming of asset " @ %moduleName @ ":" @ %originalAssetName @ " to " @ %moduleName @ ":" @ %newName @ " was a failure.");
//Do the rename command
%buildCommand = %this @ ".rename" @ %assetType @ "(" @ %assetDef @ "," @ %newAssetId @ ");";
eval(%buildCommand);
if(%success)
{
%newAssetId = %moduleName @ ":" @ %newName;
%assetPath = AssetDatabase.getAssetFilePath(%newAssetId);
//Rename any associated files as well
%assetDef = AssetDatabase.acquireAsset(%newAssetId);
%assetType = %assetDef.getClassName();
//rename the file to match
%path = filePath(%assetPath);
//Do the rename command
%buildCommand = %this @ ".rename" @ %assetType @ "(" @ %assetDef @ "," @ %newAssetId @ ");";
eval(%buildCommand);
}
}
else
{
%buildCommand = %this @ ".renameFolder(\"" @ EditAssetPopup.assetId @ "\",\"" @ %newName @ "\");";
eval(%buildCommand);
}
}
//Make sure everything is refreshed
AssetBrowser.loadFilters();
//Update the selection to immediately jump to the new asset
AssetBrowser-->filterTree.clearSelection();
%ModuleItem = AssetBrowser-->filterTree.findItemByName(%moduleName);
%assetTypeId = AssetBrowser-->filterTree.findChildItemByName(%ModuleItem, %assetType);
AssetBrowser-->filterTree.selectItem(%assetTypeId);
%selectedItem = AssetBrowser-->filterTree.getSelectedItem();
AssetBrowser-->filterTree.scrollVisibleByObjectId(%selectedItem);
AssetBrowser-->filterTree.buildVisibleTree();
}
function AssetNameField::onReturn(%this)
@ -132,6 +152,26 @@ function AssetNameField::onReturn(%this)
AssetBrowser.performRenameAsset(%this.originalAssetName, %this.getText());
}
//------------------------------------------------------------
function AssetBrowser::moveAsset(%this, %destination)
{
if(EditAssetPopup.assetType $= "Folder")
{
//Do any cleanup required given the type
if(%this.isMethod("moveFolder"))
eval(%this @ ".moveFolder("@EditAssetPopup.assetId@",\""@%destination@"\");");
}
else
{
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%assetType = AssetDatabase.getAssetType(EditAssetPopup.assetType);
//Do any cleanup required given the type
if(%this.isMethod("move"@%assetType))
eval(%this @ ".move"@%assetType@"("@%assetDef@");");
}
}
//------------------------------------------------------------
function AssetBrowser::duplicateAsset(%this, %targetModule)
@ -157,10 +197,10 @@ function AssetBrowser::duplicateAsset(%this, %targetModule)
function AssetBrowser::deleteAsset(%this)
{
//Find out what type it is
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%assetType = %assetDef.getClassName();
//%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
//%assetType = %assetDef.getClassName();
MessageBoxOKCancel("Warning!", "This will delete the selected asset and the files associated to it, do you wish to continue?",
MessageBoxOKCancel("Warning!", "This will delete the selected content and the files associated to it, do you wish to continue?",
"AssetBrowser.confirmDeleteAsset();", "");
}
@ -169,14 +209,23 @@ function AssetBrowser::confirmDeleteAsset(%this)
%currentSelectedItem = AssetBrowserFilterTree.getSelectedItem();
%currentItemParent = AssetBrowserFilterTree.getParentItem(%currentSelectedItem);
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%assetType = AssetDatabase.getAssetType(EditAssetPopup.assetId);
//Do any cleanup required given the type
if(%this.isMethod("delete"@%assetType))
eval(%this @ ".delete"@%assetType@"("@%assetDef@");");
AssetDatabase.deleteAsset(EditAssetPopup.assetId, false);
if(EditAssetPopup.assetType $= "Folder")
{
//Do any cleanup required given the type
if(%this.isMethod("deleteFolder"))
eval(%this @ ".deleteFolder(\""@EditAssetPopup.assetId@"\");");
}
else
{
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
%assetType = AssetDatabase.getAssetType(EditAssetPopup.assetType);
//Do any cleanup required given the type
if(%this.isMethod("delete"@%assetType))
eval(%this @ ".delete"@%assetType@"("@%assetDef@");");
AssetDatabase.deleteAsset(EditAssetPopup.assetId, false);
}
%this.loadFilters();

12
Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs
View file

@ -191,6 +191,18 @@ function CreateNewAsset()
%callbackCommand = "" @ AssetBrowser_newAsset.callbackFunc @ "(\"" @ %moduleName @ ":" @ %assetName @ "\");";
eval(%callbackCommand);
}
//Update the selection to immediately jump to the new asset
AssetBrowser-->filterTree.clearSelection();
%ModuleItem = AssetBrowser-->filterTree.findItemByName(%moduleName);
%assetTypeId = AssetBrowser-->filterTree.findChildItemByName(%ModuleItem, %assetType);
AssetBrowser-->filterTree.selectItem(%assetTypeId);
%selectedItem = AssetBrowser-->filterTree.getSelectedItem();
AssetBrowser-->filterTree.scrollVisibleByObjectId(%selectedItem);
AssetBrowser-->filterTree.buildVisibleTree();
}
function ParentComponentList::onWake(%this)

88
Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.cs
View file

@ -55,15 +55,31 @@ function AssetBrowser::buildPopupMenus(%this)
item[ 5 ] = "-";
Item[ 6 ] = "Duplicate Asset" TAB "" TAB "AssetBrowser.duplicateAsset();";
item[ 7 ] = "-";
item[ 8 ] = "Re-Import Asset" TAB "" TAB "AssetBrowser.reImportAsset();";
item[ 9 ] = "-";
item[ 10 ] = "Delete Asset" TAB "" TAB "AssetBrowser.deleteAsset();";
//item[ 8 ] = "Re-Import Asset" TAB "" TAB "AssetBrowser.reImportAsset();";
//item[ 9 ] = "-";
item[ 8 ] = "Delete Asset" TAB "" TAB "AssetBrowser.deleteAsset();";
jumpFileName = "";
jumpLineNumber = "";
};
}
if( !isObject( EditFolderPopup ) )
{
new PopupMenu( EditFolderPopup )
{
superClass = "MenuBuilder";
class = "EditorWorldMenu";
//isPopup = true;
item[ 0 ] = "Rename Folder" TAB "" TAB "AssetBrowser.renameAsset();";
item[ 1 ] = "-";
Item[ 2 ] = "Duplicate Folder" TAB "" TAB "AssetBrowser.duplicateAsset();";
item[ 3 ] = "-";
item[ 4 ] = "Delete Folder" TAB "" TAB "AssetBrowser.deleteAsset();";
};
}
if( !isObject( AddNewComponentAssetPopup ) )
{
new PopupMenu( AddNewComponentAssetPopup )
@ -148,15 +164,17 @@ function AssetBrowser::buildPopupMenus(%this)
superClass = "MenuBuilder";
class = "EditorWorldMenu";
item[0] = "Create Code Asset" TAB AddNewScriptAssetPopup;
item[0] = "Create Folder" TAB "" TAB "AssetBrowser.CreateNewFolder();";
item[1] = "-";
item[2] = "Create Art Asset" TAB AddNewArtAssetPopup;
item[2] = "Create Code Asset" TAB AddNewScriptAssetPopup;
item[3] = "-";
item[4] = "Create Level" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"LevelAsset\", AssetBrowser.selectedModule);";//"AssetBrowser.createNewLevelAsset(\"NewLevel\", AssetBrowser.selectedModule);";
item[4] = "Create Art Asset" TAB AddNewArtAssetPopup;
item[5] = "-";
item[6] = "Create C++ Asset" TAB AddNewCppAssetPopup;
item[6] = "Create Level" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"LevelAsset\", AssetBrowser.selectedModule);";//"AssetBrowser.createNewLevelAsset(\"NewLevel\", AssetBrowser.selectedModule);";
item[7] = "-";
item[8] = "Create New Module" TAB "" TAB "AssetBrowser.CreateNewModule();";
item[8] = "Create C++ Asset" TAB AddNewCppAssetPopup;
item[9] = "-";
item[10] = "Create New Module" TAB "" TAB "AssetBrowser.CreateNewModule();";
};
}
@ -198,6 +216,38 @@ function AssetBrowser::buildPopupMenus(%this)
};
}
//Asset Preview size presets
if( !isObject( AssetPreviewSizePopup ) )
{
new PopupMenu( AssetPreviewSizePopup )
{
superClass = "MenuBuilder";
class = "EditorWorldMenu";
item[ 0 ] = "Small" TAB "" TAB "AssetBrowser.setPreviewSize(\"Small\");";
item[ 1 ] = "Medium" TAB "" TAB "AssetBrowser.setPreviewSize(\"Medium\");";
Item[ 2 ] = "Large" TAB "" TAB "AssetBrowser.setPreviewSize(\"Large\");";
};
AssetPreviewSizePopup.checkItem(0, true);
}
if( !isObject( AssetTypeListPopup ) )
{
new PopupMenu( AssetTypeListPopup )
{
superClass = "MenuBuilder";
class = "EditorWorldMenu";
//isPopup = true;
};
/*for(%i=0; %i < AssetFilterTypeList.Count(); %i++)
{
%assetTypeName = AssetFilterTypeList.getKey(%i);
AssetTypeListPopup.insertItem(%i, %assetTypeName, "", "AssetBrowser.toggleAssetTypeFilter(" @ %i @ ");");
}*/
}
//Browser visibility menu
if( !isObject( BrowserVisibilityPopup ) )
{
@ -208,13 +258,26 @@ function AssetBrowser::buildPopupMenus(%this)
//isPopup = true;
item[ 0 ] = "Toggle Show Core Modules" TAB "" TAB "AssetBrowser.viewCoreModulesFilter();";
item[ 1 ] = "Toggle Only Show Modules with Assets" TAB "" TAB "AssetBrowser.viewPopulatedModulesFilter();";
Item[ 2 ] = "-";
item[ 3 ] = "Show Assets as list" TAB "" TAB "AssetBrowser.viewListFilter();";
Item[ 4 ] = "Show Assets with tags" TAB "" TAB "AssetBrowser.viewTagsFilter();";
item[ 1 ] = "Toggle Show Tools Modules" TAB "" TAB "AssetBrowser.viewToolsModulesFilter();";
item[ 2 ] = "Toggle Only Show Modules with Assets" TAB "" TAB "AssetBrowser.viewPopulatedModulesFilter();";
Item[ 3 ] = "-";
item[ 4 ] = "Show Folders" TAB "" TAB "AssetBrowser.toggleShowingFolders();";
item[ 5 ] = "Show Empty Folders" TAB "" TAB "AssetBrowser.toggleShowingEmptyFolders();";
item[ 6 ] = "-";
item[ 7 ] = "Filter by Asset Type" TAB AssetTypeListPopup;
item[ 8 ] = "-";
item[ 9 ] = "Enable Auto-refresh" TAB "" TAB "AssetBrowser.toggleAutorefresh();";
Item[ 10 ] = "-";
Item[ 11 ] = "Asset Preview Size" TAB AssetPreviewSizePopup;
};
BrowserVisibilityPopup.enableItem(5, false);
BrowserVisibilityPopup.enableItem(7, false);
BrowserVisibilityPopup.enableItem(9, false);
}
//
//Import Legacy menus
if( !isObject( ImportAssetsPopup ) )
{
@ -266,6 +329,7 @@ function AssetBrowser::buildPopupMenus(%this)
};
}
}
function AddNewScriptAssetPopupMenu::onSelectItem(%this, %id, %text)

39
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs
View file

@ -32,6 +32,7 @@ function ESettingsWindow::startup( %this )
%this.addEditorSettingsPage("ShapeEditor", "Shape Editor");
%this.addEditorSettingsPage("NavEditor", "Navigation Editor");
%this.addEditorSettingsPage("Theme", "Theme");
%this.addEditorSettingsPage("AssetEditing", "Asset Editing");
%this.addGameSettingsPage("GameGeneral", "General");
%this.addGameSettingsPage("Gameplay", "Gameplay");
@ -185,7 +186,7 @@ function SettingsInspector::changeEditorSetting(%this, %varName, %value)
%success = ProjectSettings.write();
if(%oldValue !$= %value)
ESettingsWindow.refresh();
ESettingsWindow.schedule(15,"refresh");
}
function GuiInspectorVariableGroup::buildOptionsSettingField(%this, %fieldName, %fieldLabel, %fieldDesc, %fieldDefaultVal, %fieldDataVals, %ownerObj)
@ -292,6 +293,12 @@ function ESettingsWindow::getGeneralSettings(%this)
SettingsInspector.addSettingsField("WorldEditor/Theme/windowTitleFontColor", "Window Title Text Color", "colorI", "");
SettingsInspector.addSettingsField("WorldEditor/Theme/mainTextColor", "Main Text Color", "colorI", "");
SettingsInspector.endGroup();
SettingsInspector.startGroup("Layout");
SettingsInspector.addSettingsField("WorldEditor/Layout/LayoutMode", "Editor Layout Mode", "list", "This dictates which layout style the editor should use." @
"WARNING - Modern layout is highlight experimental." @
"Updating this requires a restart of the program", "Classic,Modern");
SettingsInspector.endGroup();
}
function ESettingsWindow::getCameraSettings(%this)
@ -380,6 +387,7 @@ function ESettingsWindow::getThemeSettings(%this)
SettingsInspector.addSettingsField("Theme/fieldTextColor", "Field Text Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextHLColor", "Field Text Highlight Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextSELColor", "Field Text Selected Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldTextNAColor", "Field Text N/A Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldBGColor", "Field Background Color", "ColorI", "");
SettingsInspector.addSettingsField("Theme/fieldBGHLColor", "Field Background Highlight Color", "ColorI", "");
@ -431,9 +439,38 @@ function ESettingsWindow::getAssetManagementSettings(%this)
SettingsInspector.addSettingsField("AssetManagement/Assets/assetExtension", "Asset Extension", "string", "");
SettingsInspector.addSettingsField("AssetManagement/Assets/datablockCaching", "Cache Datablocks", "bool", "");
//SettingsInspector.addSettingsField("AssetManagement/Assets/moduleExtension", "Module Extension", "string", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getAssetEditingSettings(%this)
{
ImportAssetWindow::reloadImportOptionConfigs();
for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++)
{
%configName = ImportAssetWindow.importConfigsList.getKey(%i);
%formattedConfigList = %i == 0 ? %configName : %formattedConfigList @ "," @ %configName;
}
SettingsInspector.startGroup("Assets Importing");
SettingsInspector.addSettingsField("Assets/AssetImporDefaultConfig", "Default Asset Import Config", "list", "", %formattedConfigList);
SettingsInspector.addSettingsField("Assets/AutoImport", "Automatically Import using default config", "bool", "If on, the asset importing process" @
"will attempt to automatically import any inbound assets"@
"using the default config, without prompting the import window."@
"The window will still display if any issues are detected", "");
SettingsInspector.endGroup();
SettingsInspector.startGroup("Asset Browser");
SettingsInspector.addSettingsField("Assets/Browser/showCoreModule", "Show Core Module in Asset Browser", "bool", "");
SettingsInspector.addSettingsField("Assets/Browser/showToolsModule", "Show Tools Module in Asset Browser", "bool", "");
SettingsInspector.addSettingsField("Assets/Browser/showOnlyPopulatedModule", "Show Only Modules with Assets in Asset Browser", "bool", "");
SettingsInspector.addSettingsField("Assets/Browser/showFolders", "Show Folders in Tiles view in Asset Browser", "bool", "");
SettingsInspector.addSettingsField("Assets/Browser/showEmptyFolders", "Show Empty Folders in Tiles view in Asset Browser", "bool", "");
SettingsInspector.addSettingsField("Assets/Browser/previewTileSize", "Asset Preview Tile Size", "bool", "");
SettingsInspector.endGroup();
}
function ESettingsWindow::getGameplaySettings(%this)
{
SettingsInspector.startGroup("Game Modes");

2
Templates/BaseGame/game/tools/gui/profiles.ed.cs
View file

@ -1109,7 +1109,7 @@ singleton GuiControlProfile( ToolsGuiMenuBarProfile )
fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
border = 0;
borderThickness = 1;
opaque = true;

302
Templates/BaseGame/game/tools/settings.xml
View file

@ -1,219 +1,247 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<EditorSettings>
<Group name="LevelInformation">
<Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
<Group name="levels">
<Group name="BlankRoom.mis">
<Setting name="cameraSpeed">25</Setting>
</Group>
<Group name="PbrMatTest.mis">
<Setting name="cameraSpeed">5</Setting>
</Group>
</Group>
</Group>
<Group name="MeshRoadEditor">
<Setting name="DefaultNormal">0 0 1</Setting>
<Setting name="DefaultWidth">10</Setting>
<Setting name="HoverSplineColor">255 0 0 255</Setting>
<Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
<Setting name="DefaultWidth">10</Setting>
<Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
<Setting name="DefaultNormal">0 0 1</Setting>
<Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
<Setting name="SelectedSplineColor">0 255 0 255</Setting>
</Group>
<Group name="Theme">
<Setting name="fieldTextHLColor">234 232 230 255</Setting>
<Setting name="tooltipDividerColor">72 70 68 255</Setting>
<Setting name="tooltipTextColor">255 255 255 255</Setting>
<Setting name="headerColor">50 49 48 255</Setting>
<Setting name="fieldBGSELColor">100 98 96 255</Setting>
<Setting name="dividerMidColor">50 49 48 255</Setting>
<Setting name="dividerDarkColor">17 16 15 255</Setting>
<Setting name="dividerLightColor">96 94 92 255</Setting>
<Setting name="fieldBGHLColor">72 70 68 255</Setting>
<Setting name="tabsSELColor">59 58 57 255</Setting>
<Setting name="fieldTextSELColor">255 255 255 255</Setting>
<Setting name="tooltipBGColor">43 43 43 255</Setting>
<Setting name="windowBackgroundColor">32 31 30 255</Setting>
<Setting name="tabsHLColor">50 49 48 255</Setting>
<Setting name="fieldTextColor">178 175 172 255</Setting>
<Setting name="fieldBGColor">59 58 57 255</Setting>
<Setting name="dividerDarkColor">17 16 15 255</Setting>
<Setting name="tabsColor">37 36 35 255</Setting>
<Setting name="tabsSELColor">59 58 57 255</Setting>
<Setting name="windowBackgroundColor">32 31 30 255</Setting>
<Setting name="headerColor">50 49 48 255</Setting>
<Setting name="tooltipTextColor">255 255 255 255</Setting>
<Setting name="headerTextColor">236 234 232 255</Setting>
<Setting name="fieldTextColor">178 175 172 255</Setting>
<Setting name="fieldBGHLColor">72 70 68 255</Setting>
<Setting name="dividerMidColor">50 49 48 255</Setting>
<Setting name="fieldBGSELColor">100 98 96 255</Setting>
<Setting name="fieldBGColor">59 58 57 255</Setting>
<Setting name="dividerLightColor">96 94 92 255</Setting>
<Setting name="fieldTextHLColor">234 232 230 255</Setting>
<Setting name="fieldTextNAColor">77 77 77 255</Setting>
<Setting name="tabsHLColor">50 49 48 255</Setting>
</Group>
<Group name="AxisGizmo">
<Setting name="renderInfoText">1</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="rotationSnap">15</Setting>
<Group name="Grid">
<Setting name="snapToGrid">0</Setting>
<Setting name="planeDim">500</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="renderPlaneHashes">0</Setting>
</Group>
<Group name="ShapeEditor">
<Setting name="showNodes">1</Setting>
<Setting name="renderMounts">1</Setting>
<Setting name="backgroundColor">0 0 0 100</Setting>
<Setting name="highlightMaterial">1</Setting>
<Setting name="RenderCollision">0</Setting>
<Setting name="SunDiffuseColor">255 255 255 255</Setting>
<Setting name="SunAngleZ">135</Setting>
<Setting name="SunAmbientColor">180 180 180 255</Setting>
<Setting name="AdvancedWndVisible">1</Setting>
<Setting name="ShowGrid">1</Setting>
<Setting name="showObjBox">1</Setting>
<Setting name="gridDimension">40 40</Setting>
<Setting name="showBounds">0</Setting>
<Setting name="SunAngleX">45</Setting>
<Setting name="gridSize">0.1</Setting>
</Group>
<Group name="GuiEditor">
<Setting name="lastPath">tools/gui</Setting>
<Setting name="previewResolution">1024 768</Setting>
<Group name="EngineDevelopment">
<Setting name="showEditorProfiles">0</Setting>
<Setting name="toggleIntoEditor">0</Setting>
<Setting name="showEditorProfiles">0</Setting>
<Setting name="showEditorGuis">0</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
</Group>
<Group name="Snapping">
<Setting name="snapToCenters">1</Setting>
<Setting name="snapToControls">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snapToGuides">1</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snapToEdges">1</Setting>
<Setting name="snap2Grid">0</Setting>
<Setting name="snapToCanvas">1</Setting>
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snapToEdges">1</Setting>
</Group>
<Group name="Help">
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
</Group>
<Group name="Rendering">
<Setting name="drawBorderLines">1</Setting>
<Setting name="drawGuides">1</Setting>
</Group>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
</Group>
<Group name="AxisGizmo">
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Group name="Grid">
<Setting name="renderPlane">0</Setting>
<Setting name="snapToGrid">1</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="gridSize">1 1 1</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="planeDim">500</Setting>
</Group>
</Group>
<Group name="WorldEditor">
<Setting name="orthoFOV">50</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="torsionPath">AssetWork_Debug.exe</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="displayType">6</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="undoLimit">40</Setting>
<Group name="Render">
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
</Group>
<Group name="Color">
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
</Group>
<Setting name="dropType">screenCenter</Setting>
<Setting name="displayType">6</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="EditorLayoutMode">Modern</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Group name="Grid">
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridSnap">1</Setting>
</Group>
<Group name="Render">
<Setting name="renderSelectionBox">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderObjText">1</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIcons">1</Setting>
</Group>
<Group name="Docs">
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
</Group>
<Group name="Tools">
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="snapGround">0</Setting>
<Group name="Color">
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
</Group>
<Group name="Theme">
<Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="windowTitleFontColor">215 215 215 255</Setting>
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
</Group>
<Group name="Tools">
<Setting name="snapGround">0</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="objectsUseBoxCenter">1</Setting>
</Group>
<Group name="Docs">
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Images">
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
</Group>
<Group name="Layout">
<Setting name="LayoutMode">Classic</Setting>
</Group>
</Group>
<Group name="ShapeEditor">
<Setting name="SunAmbientColor">180 180 180 255</Setting>
<Setting name="RenderCollision">0</Setting>
<Setting name="showBounds">0</Setting>
<Setting name="renderMounts">1</Setting>
<Setting name="gridSize">0.1</Setting>
<Setting name="SunAngleZ">135</Setting>
<Setting name="showNodes">1</Setting>
<Setting name="highlightMaterial">1</Setting>
<Setting name="showObjBox">1</Setting>
<Setting name="SunDiffuseColor">255 255 255 255</Setting>
<Setting name="backgroundColor">0 0 0 100</Setting>
<Setting name="AdvancedWndVisible">1</Setting>
<Setting name="SunAngleX">45</Setting>
<Setting name="ShowGrid">1</Setting>
<Setting name="gridDimension">40 40</Setting>
<Group name="AssetCreation">
<Setting name="ScriptAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
<Setting name="AutoImport">1</Setting>
<Setting name="TerrainMatAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
<Setting name="GUIAssetSubdirectoryFormat">&lt;AssetType&gt;/OtherFolder/</Setting>
<Setting name="StatemachineAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
<Setting name="LevelAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;AssetName&gt;/</Setting>
<Setting name="AssetImporDefaultConfig">TestConfig</Setting>
<Setting name="CubemapAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
<Setting name="TerrainAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
<Setting name="PostFXAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
<Setting name="CppAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
</Group>
<Group name="TerrainEditor">
<Setting name="currentAction">lowerHeight</Setting>
<Group name="Brush">
<Setting name="brushPressure">1</Setting>
<Setting name="brushSize">40 40</Setting>
<Setting name="maxBrushSize">40 40</Setting>
<Setting name="brushSoftness">1</Setting>
<Setting name="brushType">ellipse</Setting>
</Group>
<Group name="ActionValues">
<Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
<Setting name="noiseFactor">1</Setting>
<Setting name="SlopeMaxAngle">90</Setting>
<Setting name="softSelectRadius">50</Setting>
<Setting name="SlopeMinAngle">0</Setting>
<Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
<Setting name="smoothFactor">0.1</Setting>
<Setting name="adjustHeightVal">10</Setting>
<Setting name="setHeightVal">100</Setting>
<Setting name="scaleVal">1</Setting>
<Setting name="SlopeMinAngle">0</Setting>
<Setting name="adjustHeightVal">10</Setting>
<Setting name="softSelectRadius">50</Setting>
<Setting name="SlopeMaxAngle">90</Setting>
<Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
<Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
<Setting name="noiseFactor">1</Setting>
<Setting name="smoothFactor">0.1</Setting>
</Group>
<Group name="Brush">
<Setting name="brushPressure">1</Setting>
<Setting name="brushType">ellipse</Setting>
<Setting name="maxBrushSize">40 40</Setting>
<Setting name="brushSize">40 40</Setting>
<Setting name="brushSoftness">1</Setting>
</Group>
</Group>
<Group name="RiverEditor">
<Setting name="DefaultNormal">0 0 1</Setting>
<Setting name="HoverNodeColor">255 255 255 255</Setting>
<Setting name="HoverSplineColor">255 0 0 255</Setting>
<Group name="RoadEditor">
<Setting name="SelectedSplineColor">0 255 0 255</Setting>
<Setting name="HoverNodeColor">255 255 255 255</Setting>
<Setting name="materialName">DefaultDecalRoadMaterial</Setting>
<Setting name="DefaultWidth">10</Setting>
<Setting name="DefaultDepth">5</Setting>
</Group>
<Group name="Assets">
<Setting name="AssetImporDefaultConfig">TestConfig</Setting>
<Setting name="AutoImport">0</Setting>
<Group name="Browser">
<Setting name="previewTileSize">small</Setting>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="spawnDatablock">DefaultPlayerData</Setting>
<Setting name="backgroundBuild">1</Setting>
<Setting name="SpawnClass">AIPlayer</Setting>
<Setting name="spawnDatablock">DefaultPlayerData</Setting>
</Group>
<Group name="RoadEditor">
<Setting name="HoverNodeColor">255 255 255 255</Setting>
<Group name="RiverEditor">
<Setting name="HoverSplineColor">255 0 0 255</Setting>
<Setting name="DefaultWidth">10</Setting>
<Setting name="materialName">DefaultDecalRoadMaterial</Setting>
<Setting name="DefaultNormal">0 0 1</Setting>
<Setting name="SelectedSplineColor">0 255 0 255</Setting>
<Setting name="HoverNodeColor">255 255 255 255</Setting>
<Setting name="DefaultDepth">5</Setting>
</Group>
<Group name="LevelInformation">
<Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
<Group name="levels">
<Group name="PbrMatTest.mis">
<Setting name="cameraSpeed">5</Setting>
</Group>
<Group name="BlankRoom.mis">
<Setting name="cameraSpeed">25</Setting>
</Group>
</Group>
</Group>
<Group name="AssetBrowser">
<Setting name="previewSize">Small</Setting>
</Group>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>

3
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs
View file

@ -1885,6 +1885,9 @@ function Editor::open(%this)
Canvas.setContent(EditorGui);
$isFirstPersonVar = true;
EditorGui.syncCameraGui();
if(EditorSettings.value("WorldEditor/Layout/LayoutMode", "Classic") $= "Modern")
togglePanelLayout();
}
function Editor::close(%this, %gui)

2
Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs
View file

@ -164,7 +164,7 @@ function toggleEditor(%make)
//------------------------------------------------------------------------------
// The editor action maps are defined in editor.bind.cs
GlobalActionMap.bind(keyboard, "f11", toggleEditor);
GlobalActionMap.bind(keyboard, "f11", fastLoadWorldEdit);
// The scenario: