mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
Requested cleanups
This commit is contained in:
parent
25a32cba2a
commit
e8a49ef4ca
5 changed files with 16 additions and 14 deletions
|
|
@ -32,7 +32,6 @@ function AssetBrowser_addModuleWindow::onGainFirstResponder(%this)
|
||||||
function AssetBrowser_addModuleWindow::close()
|
function AssetBrowser_addModuleWindow::close()
|
||||||
{
|
{
|
||||||
Canvas.popDialog(AssetBrowser_addModule);
|
Canvas.popDialog(AssetBrowser_addModule);
|
||||||
//eval(AssetBrowser_addModuleWindow.callbackFunction);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function AssetBrowser_addModuleWindow::CreateNewModule(%this)
|
function AssetBrowser_addModuleWindow::CreateNewModule(%this)
|
||||||
|
|
|
||||||
|
|
@ -198,20 +198,20 @@ function AssetBrowser::buildImageAssetPreview(%this, %assetDef, %previewData)
|
||||||
|
|
||||||
if(%success)
|
if(%success)
|
||||||
{
|
{
|
||||||
%previewAsset = new ImageAsset()
|
%previewAsset = new ImageAsset()
|
||||||
{
|
{
|
||||||
assetName = %previewAssetName;
|
assetName = %previewAssetName;
|
||||||
versionId = 1;
|
versionId = 1;
|
||||||
imageFile = fileName(%previewFilePath);
|
imageFile = fileName(%previewFilePath);
|
||||||
};
|
};
|
||||||
|
|
||||||
%previewAssetName = "ToolsModule:" @ %previewAssetName;
|
%previewAssetName = "ToolsModule:" @ %previewAssetName;
|
||||||
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
|
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
|
||||||
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
|
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
|
||||||
|
|
||||||
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
|
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
|
||||||
|
|
||||||
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);
|
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -324,9 +324,13 @@ function AssetBrowser::buildShapeAssetPreview(%this, %assetDef, %previewData)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(EditorSettings.value("Assets/Browser/doubleClickAction", "Edit Asset") $= "Edit Asset")
|
if(EditorSettings.value("Assets/Browser/doubleClickAction", "Edit Asset") $= "Edit Asset")
|
||||||
%previewData.doubleClickCommand = "AssetBrowser.editAsset( "@%assetDef@" );";
|
{
|
||||||
|
%previewData.doubleClickCommand = "AssetBrowser.editAsset( "@%assetDef@" );";
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
%previewData.doubleClickCommand = "AssetBrowser.onShapeAssetEditorDropped( "@%assetDef@" );";
|
%previewData.doubleClickCommand = "AssetBrowser.onShapeAssetEditorDropped( "@%assetDef@" );";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -364,7 +364,6 @@ new GuiControlProfile( ToolsGuiButtonProfile )
|
||||||
fixedExtent = false;
|
fixedExtent = false;
|
||||||
justify = "center";
|
justify = "center";
|
||||||
canKeyFocus = false;
|
canKeyFocus = false;
|
||||||
//bitmapAsset = "ToolsModule:button_image";
|
|
||||||
hasBitmapArray = false;
|
hasBitmapArray = false;
|
||||||
category = "Tools";
|
category = "Tools";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1059,7 +1059,7 @@ function EditorDropTypeMenu::onSelectItem(%this, %id, %text)
|
||||||
// a drop type is selected in the menu.
|
// a drop type is selected in the menu.
|
||||||
EWorldEditor.dropType = getField(%this.item[%id], 2);
|
EWorldEditor.dropType = getField(%this.item[%id], 2);
|
||||||
|
|
||||||
for(%i=0; %i < %this.getItemCount() + 1; %i++)
|
for(%i=0; %i < %this.getItemCount(); %i++)
|
||||||
{
|
{
|
||||||
%this.checkItem(%i, false);
|
%this.checkItem(%i, false);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue