From 0fab2ebf54bc3ae652a2bc657f9d60286f6ac9d1 Mon Sep 17 00:00:00 2001 From: Areloch Date: Thu, 28 Oct 2021 23:52:58 -0500 Subject: [PATCH] Added fallback handling to MaterialAssets if the asset was found but the matDef was not Added import config handling for prepending Directory to asset name Added handling for import config of appending a sound suffix Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing Corrected miswording of warn message for duplicate object names Correct GUI issues with verve tools Convert verve tools to utilize assets for their GUI elements Fix window binding/naming issue depending on window mode for verve Fix popup menus formatting for verve WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type Fix display issue with mission area editor toolbar button image Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing Fixed Create New Emitter button in particle emitter that was showing as no texture --- Engine/source/T3D/assets/MaterialAsset.cpp | 6 + Engine/source/T3D/assets/assetImporter.cpp | 87 ++- Engine/source/T3D/assets/assetImporter.h | 32 + Engine/source/console/simDictionary.cpp | 2 +- .../tools/VerveEditor/GUI/GuiProfiles.tscript | 2 +- .../tools/VerveEditor/GUI/VerveEditor.gui | 70 +- .../GUI/VerveEditorGroupBuilder.gui | 54 +- .../GUI/VerveEditorImportPathNodes.gui | 24 +- .../GUI/VerveEditorPreferences.gui | 64 +- .../Controller/VControllerProperties.tscript | 8 +- .../VerveEditor/Scripts/EditorMenu.tscript | 42 +- .../VerveEditor/Scripts/EditorWindow.tscript | 32 +- .../VerveEditor/Scripts/Groups/VGroup.tscript | 12 +- .../Scripts/Inspector/Controls.tscript | 4 +- .../Scripts/Inspector/Fields/TypeData.tscript | 4 +- .../Scripts/Inspector/Selection.tscript | 3 +- .../Scripts/Tracks/VMotionTrack.tscript | 12 +- .../VerveEditor/Scripts/Tracks/VTrack.tscript | 10 +- .../game/tools/VerveEditor/main.tscript | 5 +- .../tools/assetBrowser/assetImportConfigs.xml | 638 ++++++------------ .../scripts/assetImportConfig.tscript | 7 +- .../scripts/assetImportConfigEditor.tscript | 4 +- .../tools/gui/images/stencilIcons/larger.png | Bin 0 -> 15389 bytes .../stencilIcons/larger_image.asset.taml | 8 + .../tools/gui/images/stencilIcons/smaller.png | Bin 0 -> 15374 bytes .../stencilIcons/smaller_image.asset.taml | 8 + .../game/tools/gui/profiles.ed.tscript | 3 +- .../gui/guiMaterialPropertiesWindow.ed.gui | 2 +- .../scripts/materialEditor.ed.tscript | 69 +- .../images/mission-area_h.png | Bin 1218 -> 1254 bytes .../images/mission-area_n.png | Bin 845 -> 1472 bytes .../particleEditor/ParticleEditor.ed.gui | 2 +- .../worldEditor/scripts/EditorGui.ed.tscript | 10 +- .../worldEditor/scripts/menus.ed.tscript | 2 +- 34 files changed, 590 insertions(+), 636 deletions(-) create mode 100644 Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png create mode 100644 Templates/BaseGame/game/tools/gui/images/stencilIcons/larger_image.asset.taml create mode 100644 Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png create mode 100644 Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller_image.asset.taml diff --git a/Engine/source/T3D/assets/MaterialAsset.cpp b/Engine/source/T3D/assets/MaterialAsset.cpp index 50e75ffa3..e51f9a709 100644 --- a/Engine/source/T3D/assets/MaterialAsset.cpp +++ b/Engine/source/T3D/assets/MaterialAsset.cpp @@ -319,6 +319,12 @@ U32 MaterialAsset::getAssetByMaterialName(StringTableEntry matName, AssetPtrsetAssetId(MaterialAsset::smNoMaterialAssetFallback); + (*matAsset)->mLoadedState = AssetErrCode::UsingFallback; + return AssetErrCode::UsingFallback; + } StringTableEntry MaterialAsset::getAssetIdByMaterialName(StringTableEntry matName) diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index e9afcc479..8dc898dae 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -104,7 +104,9 @@ AssetImportConfig::AssetImportConfig() : importSounds(true), VolumeAdjust(false), PitchAdjust(false), - SoundsCompressed(false) + SoundsCompressed(false), + AlwaysAddSoundSuffix(false), + AddedSoundSuffix("_sound") { } @@ -316,6 +318,8 @@ void AssetImportConfig::loadImportConfig(Settings* configSettings, String config VolumeAdjust = dAtof(configSettings->value(String(configName + "/Sounds/VolumeAdjust").c_str())); PitchAdjust = dAtof(configSettings->value(String(configName + "/Sounds/PitchAdjust").c_str())); SoundsCompressed = dAtob(configSettings->value(String(configName + "/Sounds/Compressed").c_str())); + AlwaysAddSoundSuffix = dAtob(configSettings->value(String(configName + "/Sounds/AlwaysAddSoundSuffix").c_str())); + AddedSoundSuffix = configSettings->value(String(configName + "/Sounds/AddedSoundSuffix").c_str()); } void AssetImportConfig::CopyTo(AssetImportConfig* target) const @@ -406,6 +410,8 @@ void AssetImportConfig::CopyTo(AssetImportConfig* target) const target->VolumeAdjust = VolumeAdjust; target->PitchAdjust = PitchAdjust; target->SoundsCompressed = SoundsCompressed; + target->AlwaysAddSoundSuffix = AlwaysAddSoundSuffix; + target->AddedSoundSuffix = AddedSoundSuffix; } ConsoleDocClass(AssetImportObject, @@ -607,6 +613,7 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa assetName.replace('*', '_'); assetName.replace('-', '_'); assetName.replace('+', '_'); + assetName.replace('&', '_'); assetImportObj->assetType = assetType; assetImportObj->filePath = filePath; @@ -622,6 +629,14 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa assetImportObj->importStatus = AssetImportObject::NotProcessed; assetImportObj->generatedAsset = false; + //If the config is marked to always set the directory prefix, do that now + if (activeImportConfig->AddDirectoryPrefixToAssetName) + { + assetName = getFolderPrefixedName(assetImportObj); + assetImportObj->assetName = assetName; + assetImportObj->cleanAssetName = assetName; + } + if (parentItem != nullptr) { dSprintf(importLogBuffer, sizeof(importLogBuffer), "Added Child Importing Asset to %s", parentItem->assetName.c_str()); @@ -1976,6 +1991,12 @@ void AssetImporter::processSoundAsset(AssetImportObject* assetItem) dSprintf(importLogBuffer, sizeof(importLogBuffer), "Preparing Sound for Import: %s", assetItem->assetName.c_str()); activityLog.push_back(importLogBuffer); + if (activeImportConfig->AlwaysAddSoundSuffix) + { + assetItem->assetName += activeImportConfig->AddedSoundSuffix; + assetItem->cleanAssetName = assetItem->assetName; + } + assetItem->importStatus = AssetImportObject::Processed; } @@ -2165,7 +2186,49 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem) { //Set trailing number String renamedAssetName = assetItem->assetName; - renamedAssetName = Sim::getUniqueName(renamedAssetName.c_str()); + String renamedAssetId = assetItem->moduleName + ":" + renamedAssetName; + + String addedSuffix; + + if (assetItem->assetType == String("ShapeAsset")) + addedSuffix = activeImportConfig->AddedShapeSuffix; + else if (assetItem->assetType == String("MaterialAsset")) + addedSuffix = activeImportConfig->AddedMaterialSuffix; + else if (assetItem->assetType == String("ImageAsset")) + addedSuffix = activeImportConfig->AddedImageSuffix; + else if (assetItem->assetType == String("SoundAsset")) + addedSuffix = activeImportConfig->AddedSoundSuffix; + + //do the suffix if it isn't already on it + if (!renamedAssetName.endsWith(addedSuffix.c_str())) + { + renamedAssetName += addedSuffix; + renamedAssetId = assetItem->moduleName + ":" + renamedAssetName; + assetItem->assetName = renamedAssetName; + } + + //if still conflicted + //add the directory prefix + if (AssetDatabase.isDeclaredAsset(renamedAssetId.c_str())) + { + renamedAssetName = getFolderPrefixedName(assetItem); + renamedAssetId = assetItem->moduleName + ":" + renamedAssetName; + assetItem->assetName = renamedAssetName; + } + + bool appendedNumber = false; + U32 uniqueNumber = 0; + while (AssetDatabase.isDeclaredAsset(renamedAssetId.c_str())) + { + uniqueNumber++; + renamedAssetId = assetItem->moduleName + ":" + renamedAssetName + String::ToString(uniqueNumber); + appendedNumber = true; + } + + if (appendedNumber) + { + renamedAssetName += String::ToString(uniqueNumber); + } //Log it's renaming dSprintf(importLogBuffer, sizeof(importLogBuffer), "Asset %s was renamed due to %s as part of the Import Configuration", assetItem->assetName.c_str(), humanReadableReason.c_str()); @@ -2186,25 +2249,7 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem) } else if (activeImportConfig->DuplicateAutoResolution == String("FolderPrefix")) { - String renamedAssetName = assetItem->assetName; - - //Set trailing number - S32 dirIndex = assetItem->filePath.getDirectoryCount() - 1; - while (dirIndex > -1) - { - renamedAssetName = assetItem->assetName; - String owningFolder = assetItem->filePath.getDirectory(dirIndex); - - renamedAssetName = owningFolder + "_" + renamedAssetName; - - if (AssetDatabase.isDeclaredAsset(renamedAssetName)) - { - dirIndex--; - continue; - } - - break; - } + String renamedAssetName = getFolderPrefixedName(assetItem); //Log it's renaming dSprintf(importLogBuffer, sizeof(importLogBuffer), "Asset %s was renamed due to %s as part of the Import Configuration", assetItem->assetName.c_str(), humanReadableReason.c_str()); diff --git a/Engine/source/T3D/assets/assetImporter.h b/Engine/source/T3D/assets/assetImporter.h index b03c89c40..9505d00b1 100644 --- a/Engine/source/T3D/assets/assetImporter.h +++ b/Engine/source/T3D/assets/assetImporter.h @@ -409,6 +409,15 @@ public: /// bool SoundsCompressed; + /// When importing an image, this indicates if it should automatically add a standard suffix onto the name + /// + bool AlwaysAddSoundSuffix; + + /// + /// If AlwaysAddSoundSuffix is on, this is the suffix to be added + /// + String AddedSoundSuffix; + public: AssetImportConfig(); virtual ~AssetImportConfig(); @@ -934,4 +943,27 @@ public: // void setTargetModuleId(const String& moduleId) { targetModuleId = moduleId; } const String& getTargetModuleId() { return targetModuleId; } + + String getFolderPrefixedName(AssetImportObject* assetItem) + { + String renamedAssetName = assetItem->assetName; + S32 dirIndex = assetItem->filePath.getDirectoryCount() - 1; + while (dirIndex > -1) + { + renamedAssetName = assetItem->assetName; + String owningFolder = assetItem->filePath.getDirectory(dirIndex); + + renamedAssetName = owningFolder + "_" + renamedAssetName; + + if (AssetDatabase.isDeclaredAsset(renamedAssetName)) + { + dirIndex--; + continue; + } + + break; + } + + return renamedAssetName; + } }; diff --git a/Engine/source/console/simDictionary.cpp b/Engine/source/console/simDictionary.cpp index 93491fd1c..8730a89dd 100644 --- a/Engine/source/console/simDictionary.cpp +++ b/Engine/source/console/simDictionary.cpp @@ -53,7 +53,7 @@ void SimNameDictionary::insert(SimObject* obj) SimObject* checkForDup = find(obj->getName()); if (checkForDup) - Con::warnf("Warning! You have a duplicate datablock name of %s. This can cause problems. You should rename one of them.", obj->getName()); + Con::warnf("Warning! You have a duplicate object name of %s. This can cause problems. You should rename one of them.", obj->getName()); Mutex::lockMutex(mutex); #ifndef USE_NEW_SIMDICTIONARY diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript index f636bf413..3d7217100 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript @@ -92,7 +92,7 @@ singleton GuiControlProfile ( VEditorBitmapButtonProfile : VEditorDefaultProfile justify = "center"; hasBitmapArray = true; - bitmap = "./Images/Button"; + bitmapAsset = "ToolsModule:button_image"; }; //----------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui index 4c684b6ff..a11011a37 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui @@ -4,15 +4,15 @@ $guiContent = new GuiControl(VerveEditorGui) { Enabled = "1"; isContainer = "1"; Profile = "VEditorDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; + HorizSizing = "width"; + VertSizing = "height"; Position = "0 0"; Extent = "1024 768"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiControl() { @@ -44,7 +44,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -80,7 +80,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new VEditorButton() { @@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorGui) { MinExtent = "210 1"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; text = ""; groupNum = "-1"; @@ -122,7 +122,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; }; @@ -140,7 +140,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -176,7 +176,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new VTimeLineControl(VerveEditorTrackTimeLine) { @@ -192,7 +192,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; IsController = "0"; Controller = "VerveEditorController"; @@ -211,7 +211,7 @@ $guiContent = new GuiControl(VerveEditorGui) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; text = ""; groupNum = "-1"; @@ -237,7 +237,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; }; @@ -256,7 +256,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiDefaultProfile"; + tooltipprofile = "ToolsGuiDefaultProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -283,7 +283,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiBitmapButtonCtrl(VerveEditorAddGroupButton) { @@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Add New Group"; command = "$ThisControl.DisplayContextMenu();"; hovertime = "1000"; @@ -323,7 +323,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Add New Track"; command = "$ThisControl.DisplayContextMenu();"; hovertime = "1000"; @@ -345,7 +345,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Add New Event"; command = "VerveEditor::AddEvent();"; hovertime = "1000"; @@ -367,7 +367,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Delete Selected Object(s)"; command = "VerveEditor::DeleteSelection();"; hovertime = "1000"; @@ -391,7 +391,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -427,7 +427,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new VTimeLineControl(VerveEditorTimeLine) { @@ -443,7 +443,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; IsController = "1"; Controller = "VerveEditorController"; @@ -465,7 +465,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -496,7 +496,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; }; @@ -513,7 +513,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiDefaultProfile"; + tooltipprofile = "ToolsGuiDefaultProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -540,7 +540,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; }; @@ -557,7 +557,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiDefaultProfile"; + tooltipprofile = "ToolsGuiDefaultProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -584,7 +584,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiControl() { @@ -600,7 +600,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiBitmapButtonCtrl() { @@ -616,7 +616,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Jump Backwards"; command = "VerveEditor::Rewind();"; hovertime = "1000"; @@ -638,7 +638,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Step Backwards 1 Frame"; command = "VerveEditor::StepB();"; hovertime = "1000"; @@ -660,7 +660,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Play / Pause"; command = "VerveEditor::TogglePlay( $ThisControl );"; hovertime = "1000"; @@ -682,7 +682,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Step Forward 1 Frame"; command = "VerveEditor::StepF();"; hovertime = "1000"; @@ -704,7 +704,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Jump Forward"; command = "VerveEditor::Forward();"; hovertime = "1000"; @@ -727,7 +727,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Insert Time (Front)"; command = "VerveEditor::InsertTimeFront();"; hovertime = "1000"; @@ -749,7 +749,7 @@ $guiContent = new GuiControl(VerveEditorGui) { canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Insert Time (Back)"; command = "VerveEditor::InsertTimeBack();"; hovertime = "1000"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui index 19076f551..3d85c03b1 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui @@ -1,7 +1,7 @@ //--- OBJECT WRITE BEGIN --- $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { isContainer = "1"; - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "0 0"; @@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "1"; - Profile = "GuiWindowProfile"; + Profile = "ToolsGuiWindowProfile"; HorizSizing = "center"; VertSizing = "center"; position = "268 181"; @@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "256 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "14 30"; @@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "0"; - Profile = "GuiTextEditProfile"; + Profile = "ToolsGuiTextEditProfile"; HorizSizing = "width"; VertSizing = "bottom"; position = "79 29"; @@ -86,13 +86,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; new GuiBitmapBorderCtrl() { isContainer = "0"; - Profile = "GuiGroupBorderProfile"; + Profile = "ToolsGuiGroupBorderProfile"; HorizSizing = "width"; VertSizing = "bottom"; position = "7 55"; @@ -100,7 +100,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "1 1"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -112,7 +112,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { ChangeChildSizeToFit = "1"; ChangeChildPosition = "1"; isContainer = "1"; - Profile = "GuiTransparentProfile"; + Profile = "ToolsGuiTransparentProfile"; HorizSizing = "width"; VertSizing = "height"; position = "3 3"; @@ -120,13 +120,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; new GuiControl() { isContainer = "1"; - Profile = "GuiTransparentProfile"; + Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "0 0"; @@ -134,7 +134,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -148,7 +148,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "center"; position = "4 1"; @@ -156,7 +156,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -181,7 +181,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; internalName = "SceneObjectList"; canSaveDynamicFields = "0"; @@ -195,7 +195,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { buttonType = "PushButton"; useMouseEvents = "0"; isContainer = "0"; - Profile = "GuiButtonProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "top"; position = "66 139"; @@ -204,7 +204,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { canSave = "1"; Visible = "1"; Command = "VerveEditorGroupBuilderGUI._Build( VerveEditorGroupBuilderNameField.getText() );"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -214,7 +214,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { buttonType = "PushButton"; useMouseEvents = "0"; isContainer = "0"; - Profile = "GuiButtonProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "top"; position = "174 139"; @@ -223,7 +223,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { canSave = "1"; Visible = "1"; Command = "VerveEditorGroupBuilderGUI.Close();"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -283,7 +283,7 @@ function VerveEditorGroupBuilderGUI::_Build( %this, %groupLabel ) { if ( %groupLabel $= "" ) { - toolsMessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" ); + MessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" ); return; } @@ -316,7 +316,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType { %container = new GuiControl() { - Profile = "GuiTransparentProfile"; + Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; @@ -326,7 +326,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType %label = new GuiTextCtrl() { - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "center"; @@ -392,7 +392,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName { %container = new GuiControl() { - Profile = "GuiTransparentProfile"; + Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; @@ -402,7 +402,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName %label = new GuiTextCtrl() { - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "center"; @@ -415,7 +415,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName %checkBox = new GuiCheckBoxCtrl() { - Profile = "GuiCheckboxProfile"; + Profile = "ToolsGuiCheckboxProfile"; HorizSizing = "left"; VertSizing = "center"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui index 9309ee64f..0d79d862c 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui @@ -1,7 +1,7 @@ //--- OBJECT WRITE BEGIN --- $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { isContainer = "1"; - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "0 0"; @@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "1"; @@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "1"; - Profile = "GuiWindowProfile"; + Profile = "ToolsGuiWindowProfile"; HorizSizing = "center"; VertSizing = "center"; Position = "268 181"; @@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { MinExtent = "256 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "14 30"; @@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { AnchorLeft = "1"; AnchorRight = "0"; isContainer = "0"; - Profile = "GuiTextEditProfile"; + Profile = "ToolsGuiTextEditProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "79 29"; @@ -86,7 +86,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { MinExtent = "8 8"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { buttonType = "PushButton"; useMouseEvents = "0"; isContainer = "0"; - Profile = "GuiButtonProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "top"; Position = "66 62"; @@ -105,7 +105,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { canSave = "1"; Visible = "1"; Command = "VMotionTrack::_ImportPathNodes( VerveEditorImportPathNodesSpeed.getText() );"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -115,7 +115,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { buttonType = "PushButton"; useMouseEvents = "0"; isContainer = "0"; - Profile = "GuiButtonProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "top"; Position = "174 62"; @@ -124,7 +124,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { canSave = "1"; Visible = "1"; Command = "VerveEditorWindow.popDialog( VerveEditorImportPathNodesGUI );"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui index 417f15908..36db45114 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui @@ -2,7 +2,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSaveDynamicFields = "0"; isContainer = "1"; - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "0 0"; @@ -10,13 +10,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiWindowCtrl() { canSaveDynamicFields = "0"; isContainer = "1"; - Profile = "GuiWindowProfile"; + Profile = "ToolsGuiWindowProfile"; HorizSizing = "center"; VertSizing = "center"; position = "392 253"; @@ -24,7 +24,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Docking = "None"; Margin = "4 24 4 4"; @@ -50,7 +50,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiControl() { canSaveDynamicFields = "0"; isContainer = "1"; - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "10 93"; @@ -58,13 +58,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiBitmapBorderCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiBitmapBorderProfile"; + Profile = "ToolsGuiBitmapBorderProfile"; HorizSizing = "width"; VertSizing = "height"; position = "0 10"; @@ -72,7 +72,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; new GuiTextEditCtrl() { @@ -87,7 +87,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -101,7 +101,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "30 50"; @@ -109,7 +109,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -123,7 +123,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiCheckBoxCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiCheckBoxProfile"; + Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "6 30"; @@ -132,7 +132,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Variable = "$Pref::VerveEditor::Event::SnapToTime"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; text = " Snap to Time"; groupNum = "-1"; @@ -143,7 +143,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextEditCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextEditProfile"; + Profile = "ToolsGuiTextEditProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "150 50"; @@ -152,7 +152,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Variable = "$Pref::VerveEditor::Event::SnapToTimeThreshold"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -170,7 +170,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiCheckBoxCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiCheckBoxProfile"; + Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "6 80"; @@ -179,7 +179,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Variable = "$Pref::VerveEditor::Event::SnapToSiblings"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; text = " Snap to Siblings"; groupNum = "-1"; @@ -190,7 +190,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "30 100"; @@ -198,7 +198,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -212,7 +212,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextEditCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextEditProfile"; + Profile = "ToolsGuiTextEditProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "150 100"; @@ -221,7 +221,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Variable = "$Pref::VerveEditor::Event::SnapToSiblingThreshold"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -240,7 +240,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiControl() { canSaveDynamicFields = "0"; isContainer = "1"; - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "10 30"; @@ -248,13 +248,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiBitmapBorderCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiBitmapBorderProfile"; + Profile = "ToolsGuiBitmapBorderProfile"; HorizSizing = "width"; VertSizing = "height"; position = "0 10"; @@ -262,7 +262,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; }; new GuiTextEditCtrl() { @@ -277,7 +277,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -291,7 +291,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextEditCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextEditProfile"; + Profile = "ToolsGuiTextEditProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "6 30"; @@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Variable = "$Pref::VerveEditor::RecentFileSize"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -318,7 +318,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiTextCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiTextProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "56 30"; @@ -326,7 +326,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -341,7 +341,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { new GuiButtonCtrl() { canSaveDynamicFields = "0"; isContainer = "0"; - Profile = "GuiButtonProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "151 228"; @@ -350,7 +350,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) { canSave = "1"; Visible = "1"; Command = "VerveEditor::CloseEditorPreferences();"; - tooltipprofile = "GuiToolTipProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; text = "OK"; groupNum = "-1"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript index 3fd8b8046..3edb6ca34 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript @@ -103,13 +103,13 @@ function VController::DisplayContextMenu( %this, %x, %y ) Item[1] = "" TAB ""; - Item[2] = "Cu&t" TAB "" TAB ""; - Item[3] = "&Copy" TAB "" TAB ""; - Item[4] = "&Paste" TAB "" TAB "VerveEditor::Paste();"; + Item[2] = "Cut" TAB "" TAB ""; + Item[3] = "Copy" TAB "" TAB ""; + Item[4] = "Paste" TAB "" TAB "VerveEditor::Paste();"; Item[5] = "" TAB ""; - Item[6] = "&Delete" TAB "" TAB ""; + Item[6] = "Delete" TAB "" TAB ""; PasteIndex = 4; }; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript index 20bcfe3a3..daa08b5d3 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript @@ -76,7 +76,7 @@ function VerveEditorWindow::onCreateMenu( %this ) // Store Menu Bars. if ( !isObject( %this.MenuSet ) ) { - %this.MenuSet = new SimSet(); + %this.MenuSet = new GuiMenuBar(); } // CMD Key. @@ -103,14 +103,14 @@ function VerveEditorWindow::onCreateMenu( %this ) { SuperClass = "VerveWindowMenu"; - Label = "&File"; + Label = "File"; Position = 0; - Item[0] = "&New" TAB %cmdKey @ "+N" TAB "VerveEditor::NewFile();"; - Item[1] = "&Open" TAB %cmdKey @ "+O" TAB "VerveEditor::LoadFile();"; + Item[0] = "New" TAB %cmdKey @ "+N" TAB "VerveEditor::NewFile();"; + Item[1] = "Open" TAB %cmdKey @ "+O" TAB "VerveEditor::LoadFile();"; Item[2] = "" TAB ""; - Item[3] = "&Save" TAB %cmdKey @ "+S" TAB "VerveEditor::SaveFile();"; - Item[4] = "Save &As" TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );"; + Item[3] = "Save" TAB %cmdKey @ "+S" TAB "VerveEditor::SaveFile();"; + Item[4] = "Save As" TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );"; Item[5] = "" TAB ""; Item[6] = "Recent Files" TAB %recentSequenceMenu; }; @@ -133,34 +133,38 @@ function VerveEditorWindow::onCreateMenu( %this ) Class = "VerveWindowEditMenu"; SuperClass = "VerveWindowMenu"; - Label = "&Edit"; + Label = "Edit"; Position = 1; - Item[0] = "&Undo" TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();"; - Item[1] = "&Redo" TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();"; + Item[0] = "Undo" TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();"; + Item[1] = "Redo" TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();"; Item[2] = "" TAB ""; - Item[3] = "Cu&t" TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();" TAB VerveEditorEditMap; - Item[4] = "&Copy" TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();" TAB VerveEditorEditMap; - Item[5] = "&Paste" TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();" TAB VerveEditorEditMap; + Item[3] = "Cut" TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();" TAB VerveEditorEditMap; + Item[4] = "Copy" TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();" TAB VerveEditorEditMap; + Item[5] = "Paste" TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();" TAB VerveEditorEditMap; Item[6] = "" TAB ""; - Item[7] = "&Delete" TAB "Del" TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap; + Item[7] = "Delete" TAB "Del" TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap; Item[8] = "" TAB ""; - Item[9] = "&Clear Selection" TAB "Esc" TAB "VerveEditor::ClearSelection();"; + Item[9] = "Clear Selection" TAB "Esc" TAB "VerveEditor::ClearSelection();"; Item[10] = "" TAB ""; - Item[11] = "&Preferences" TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();"; + Item[11] = "Preferences" TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();"; }; %this.MenuSet.add( %editMenu ); // Init Popups. - %fileMenu.Init(); - %editMenu.Init(); + //%fileMenu.Init(); + //%editMenu.Init(); // Attach. - %fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label ); - %editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label ); + if($Verve::UseSeparateWindow) + { + %this.setMenuBar(%this.MenuSet); + //%fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label ); + //%editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label ); + } } function VerveEditorWindow::ClearMenu( %this ) diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript index 22baa8e95..ad64ab0c2 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript @@ -50,8 +50,9 @@ function VerveEditorWindow::Open() { %editorWindow = new guiWindowCtrl(VerveEditorWindow) { + Profile = "ToolsGuiWindowProfile"; position = "0 0"; - extent = "1024 768"; + extent = "1024 788"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -62,20 +63,23 @@ function VerveEditorWindow::Open() function VerveEditorWindow::UpdateWindowTitle( %this ) { - %fileName = fileName( $VerveEditor::Controller.FileName ); - if ( %fileName $= "" ) - { - %fileName = "Untitled.vsf"; - } + %fileName = fileName( $VerveEditor::Controller.FileName ); + if ( %fileName $= "" ) + { + %fileName = "Untitled.vsf"; + } + + if ( VerveEditor::IsDirty() ) + { + // Signify Unsaved Work. + %fileName = %fileName @ "*"; + } - if ( VerveEditor::IsDirty() ) - { - // Signify Unsaved Work. - %fileName = %fileName @ "*"; - } - - // Set Title. - %this.setWindowTitle( %fileName SPC "- Verve" ); + // Set Title. + if($Verve::UseSeparateWindow) + %this.setWindowTitle( %fileName SPC "- Verve" ); + else + %this.text = %fileName SPC "- Verve"; } function VerveEditorWindow::onGainFocus( %this ) diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript index 4bd4c5fb4..532278610 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript @@ -188,13 +188,13 @@ function VGroup::DisplayContextMenu( %this, %x, %y ) Item[1] = "" TAB ""; - Item[2] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();"; - Item[3] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();"; - Item[4] = "&Paste" TAB "" TAB "VerveEditor::Paste();"; + Item[2] = "Cut" TAB "" TAB "VerveEditor::CutSelection();"; + Item[3] = "Copy" TAB "" TAB "VerveEditor::CopySelection();"; + Item[4] = "Paste" TAB "" TAB "VerveEditor::Paste();"; Item[5] = "" TAB ""; - Item[6] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; + Item[6] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; AddIndex = 0; PasteIndex = 4; @@ -283,7 +283,7 @@ function VerveEditor::CreateGroupControl( %object ) Class = "VEditorSelectableGroup"; Profile = "VEditorGroupHeaderProfile"; - Bitmap = "~/VerveEditor/GUI/Images/GroupBackground"; + bitmapAsset = "ToolsModule:GroupBackground_image"; HorizSizing = "width"; VertSizing = "bottom"; @@ -322,7 +322,7 @@ function VerveEditor::CreateGroupControl( %object ) Class = "VEditorSelectableGroup"; Profile = "VEditorGroupTrackProfile"; - Bitmap = "~/VerveEditor/GUI/Images/GroupBackground"; + bitmapAsset = "ToolsModule:GroupBackground_image"; HorizSizing = "width"; VertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript index 79beeda86..520ca3cfa 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript @@ -33,7 +33,7 @@ function VerveEditorPropertyStack::CreatePropertyRollout( %this, %groupLabel ) %propertyStack = new GuiStackControl() { Class = "VEditorPropertyStack"; - Profile = "GuiTransparentProfile"; + Profile = "ToolsGuiTransparentProfile"; HorizSizing = "width"; VertSizing = "bottom"; @@ -123,7 +123,7 @@ function VerveEditor::CreateField( %targetStack, %fieldName, %fieldType ) if ( isMethod( "VerveEditor", "Create" @ %fieldType @ "Field" ) ) { // Create the Input Control. - %fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field( %fieldContainer, %fieldName );" ); + %fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field(" @ %fieldContainer @ "," @ %fieldName @ ");" ); } else { diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript index 93fe911fc..b1f134e47 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript @@ -56,7 +56,7 @@ function VerveEditor::CreateDataField( %fieldContainer, %fieldName ) Position = %fieldWidth - 24 SPC 0; Extent = "18 18"; - Bitmap = "tools/VerveEditor/GUI/Images/btn_DeleteSml"; + bitmapAsset = "ToolsModule:btn_DeleteSml_image"; Command = %fieldInput @ ".Remove();"; }; @@ -274,7 +274,7 @@ function VerveEditor::CreateAddDataField( %targetStack ) Position = %fieldWidth - 24 SPC 0; Extent = "18 18"; - Bitmap = "tools/VerveEditor/GUI/Images/btn_AddSml"; + bitmapAsset = "ToolsModule:btn_AddSml_image"; Command = "VEditorDataPropertyField::Insert(" @ %fieldType @ ".getText(), " @ %fieldName @ ".getText(), " @ %fieldValue @ ".getText() );"; }; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript index 1034044a2..43e44b797 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript @@ -114,7 +114,8 @@ function VEditorSelectable::OnRightMouseUp( %this, %position, %modifiers, %click VerveEditor::SetSelection( %this ); // Repaint. - VerveEditorWindow.Repaint(); + if($Verve::UseSeparateWindow) + VerveEditorWindow.Repaint(); if ( %this.Proxy.isMethod( "DisplayContextMenu" ) ) { diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript index 2341988e9..b67024340 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript @@ -105,21 +105,21 @@ function VMotionTrack::GetContextMenu( %this ) Label = "VTrackContextMenu"; Position = 0; - Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();"; + Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();"; Item[1] = "" TAB ""; - Item[2] = "&Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();"; + Item[2] = "Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();"; Item[3] = "" TAB ""; - Item[4] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();"; - Item[5] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();"; - Item[6] = "&Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();"; + Item[4] = "Cut" TAB "" TAB "VerveEditor::CutSelection();"; + Item[5] = "Copy" TAB "" TAB "VerveEditor::CopySelection();"; + Item[6] = "Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();"; Item[7] = "" TAB ""; - Item[8] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; + Item[8] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; AddIndex = 0; PasteIndex = 4; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript index 5c50497ed..891566662 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript @@ -175,17 +175,17 @@ function VTrack::GetContextMenu( %this ) Label = "VTrackContextMenu"; Position = 0; - Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();"; + Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();"; Item[1] = "" TAB ""; - Item[2] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();"; - Item[3] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();"; - Item[4] = "&Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();"; + Item[2] = "Cut" TAB "" TAB "VerveEditor::CutSelection();"; + Item[3] = "Copy" TAB "" TAB "VerveEditor::CopySelection();"; + Item[4] = "Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();"; Item[5] = "" TAB ""; - Item[6] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; + Item[6] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();"; AddIndex = 0; PasteIndex = 4; diff --git a/Templates/BaseGame/game/tools/VerveEditor/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/main.tscript index 45ff8b2d9..d65cd2651 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/main.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/main.tscript @@ -5,7 +5,7 @@ function InitializeVerveEditor() { - $Verve::UseSeparateWindow = true; + $Verve::UseSeparateWindow = ($pref::Video::deviceMode == 0); //can't do separate window atm if you're in fullscreen or borderless full // Preferences. exec( "./DefaultPrefs." @ $TorqueScriptFileExtension ); @@ -59,7 +59,7 @@ function DestroyVerveEditor() function ToggleVerveEditor( %value ) { - if ( %value && $Verve::UseSeparateWindow ) + if ( %value) { if ( !isObject( VerveEditorWindow ) ) { @@ -97,7 +97,6 @@ function VerveEditor::LaunchEditor() VerveEditor::ClearHistory(); // Update Window Title. - if($Verve::UseSeparateWindow) VerveEditorWindow.UpdateWindowTitle(); // Update Selection. diff --git a/Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml b/Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml index c2256aeb7..ae2e6b034 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml +++ b/Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml @@ -1,451 +1,239 @@ - + - - - 2 - Seconds - 1 - 1 + + + 2 + Seconds + 1 + 1 - - Col - CollisionMesh - 1 - 1 - CollisionMesh - LOS + + Col + CollisionMesh + 1 + 1 + CollisionMesh + LOS - - 0 - AutoPrune - 1 - 0 - 0 + + 0 + 0 + AutoPrune + 1 + 0 - - _image - 1 - _AO,_AMBIENT,_AMBIENTOCCLUSION - _COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM - 1 - _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL - 0 - N/A - 1 - 0 - _METAL,_MET,_METALNESS,_METALLIC - _NORMAL,_NORM - _ROUGH,_ROUGHNESS - 1.0 - _SMOOTH,_SMOOTHNESS - Bilinear - 1 + + _image + 1 + _AO,_AMBIENT,_AMBIENTOCCLUSION + _COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM + 1 + _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL + 0 + N/A + 1 + 0 + _METAL,_MET,_METALNESS,_METALLIC + _NORMAL,_NORM + _ROUGH,_ROUGHNESS + 1.0 + _SMOOTH,_SMOOTHNESS + Bilinear + 1 - - _mat - 0 - 1 - 1 - 1 - 1 - 1 + + _mat + 0 + 1 + 1 + 1 + 1 + 1 - - _shape - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - TrailingNumber - 0 - 0 - 1 - 0 - Z_AXIS + + _shape + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + TrailingNumber + 0 + 0 + 1 + 0 + Z_AXIS - - 0 - 1.0 - 1.0 + + 0 + 1.0 + 1.0 - - - 2 - Seconds - 1 - 1 + + + 2 + Seconds + 1 + 1 - - Col - CollisionMesh - 1 - 1 - CollisionMesh - LOS + + Col + CollisionMesh + 1 + 1 + CollisionMesh + LOS - - 0 - FolderPrefix - 1 - 0 - 1 + + 1 + 0 + FolderPrefix + 1 + 0 - - _image - 1 - _AO,_AMBIENT,_AMBIENTOCCLUSION - _COMP,_COMPOSITE - 1 - _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL - 0 - N/A - 1 - 0 - _METAL,_MET,_METALNESS,_METALLIC - _NORMAL,_NORM - _ROUGH,_ROUGHNESS - 1.0 - _SMOOTH,_SMOOTHNESS - Bilinear - 1 + + _image + 1 + _AO,_AMBIENT,_AMBIENTOCCLUSION + _COMP,_COMPOSITE + 1 + _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL + 0 + N/A + 1 + 0 + _METAL,_MET,_METALNESS,_METALLIC + _NORMAL,_NORM + _ROUGH,_ROUGHNESS + 1.0 + _SMOOTH,_SMOOTHNESS + Bilinear + 1 - - _mat - 1 - 1 - 1 - 1 - 1 - 1 + + _mat + 1 + 1 + 1 + 1 + 1 + 1 - - _shape - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - TrailingNumber - 0 - 0 - 1 - 0 - Z_AXIS + + _shape + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + TrailingNumber + 0 + 0 + 1 + 0 + Z_AXIS - - 0 - 1.0 - 1.0 + + 0 + 1.0 + 1.0 - - - 2 - Seconds - 1 - 1 + + + 2 + Seconds + 1 + 1 - - Col - CollisionMesh - 1 - 1 - CollisionMesh - LOS + + Col + CollisionMesh + 1 + 1 + CollisionMesh + LOS - - 0 - AutoPrune - 1 - 0 - 0 + + 0 + 0 + AutoPrune + 1 + 0 - - _AO,_AMBIENT,_AMBIENTOCCLUSION - 1 - _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL - 1 - N/A - 0 - _METAL,_MET,_METALNESS,_METALLIC - _NORMAL,_NORM - _COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM - _ROUGH,_ROUGHNESS - 1.0 - _SMOOTH,_SMOOTHNESS - Bilinear - 1 + + _AO,_AMBIENT,_AMBIENTOCCLUSION + 1 + _ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL + 1 + N/A + 0 + _METAL,_MET,_METALNESS,_METALLIC + _NORMAL,_NORM + _COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM + _ROUGH,_ROUGHNESS + 1.0 + _SMOOTH,_SMOOTHNESS + Bilinear + 1 - - 1 - 1 - 1 - 1 - 1 + + 1 + 1 + 1 + 1 + 1 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - TrailingNumber - 0 - 0 - 1 - 0 - Z_AXIS + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + TrailingNumber + 0 + 0 + 1 + 0 + Z_AXIS - - 0 - 1.0 - 1.0 + + 0 + 1.0 + 1.0 diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript index 30eac0209..44be3b3ce 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript @@ -35,6 +35,7 @@ function setupImportConfigSettingsList() ImportAssetConfigSettingsList.addNewConfigSetting("General/WarningsAsErrors", "Warnings As Errors", "bool", "", "0", "", ""); ImportAssetConfigSettingsList.addNewConfigSetting("General/PreventImportWithErrors", "Prevent Import With Errors", "bool", "", "1", "", ""); ImportAssetConfigSettingsList.addNewConfigSetting("General/AutomaticallyPromptMissingFiles", "Automatically Prompt Missing Files", "bool", "", "0", "", ""); + ImportAssetConfigSettingsList.addNewConfigSetting("General/AddDirectoryPrefixToAssetName", "Adds the name of the folder to importing asset name", "bool", "", "0", "", ""); ImportAssetConfigSettingsList.addNewConfigSetting("Meshes/ImportMesh", "Import Mesh", "bool", "", "1", "", "ToggleImportMesh"); ImportAssetConfigSettingsList.addNewConfigSetting("Meshes/AlwaysAddShapeSuffix", "Always Add Shape Suffix", "bool", "", "0", ""); @@ -117,6 +118,8 @@ function setupImportConfigSettingsList() ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/VolumeAdjust", "Volume Adjustment", "float", "", "1.0", ""); ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/PitchAdjust", "Pitch Adjustment", "float", "", "1.0", ""); ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/Compressed", "Is Compressed", "bool", "", "0", ""); + ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/AlwaysAddSoundSuffix", "Always Add Sound Suffix", "bool", "", "1", ""); + ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/AddedSoundSuffix", "Added Sound Suffix", "string", "", "_sound", ""); } } @@ -272,7 +275,7 @@ function ImportAssetConfigEditorWindow::populateConfigList(%this, %configName) %this.populateConfigListByGroup("Animations"); %this.populateConfigListByGroup("Images"); %this.populateConfigListByGroup("Collision"); - %this.populateConfigListByGroup("Sound"); + %this.populateConfigListByGroup("Sounds"); ImportOptionsConfigList.update(); } @@ -373,6 +376,8 @@ function ImportAssetConfigEditorWindow::addNewConfig(%this) AssetImportSettings.setValue("Sounds/VolumeAdjust", "1.0"); AssetImportSettings.setValue("Sounds/PitchAdjust", "1.0"); AssetImportSettings.setValue("Sounds/Compressed", "0"); + AssetImportSettings.setValue("Sounds/AlwaysAddSoundSuffix", "1"); + AssetImportSettings.setValue("Sounds/AddedSoundSuffix", "_sound"); AssetImportSettings.endGroup(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript index 2ad61eee0..effa43f52 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript @@ -38,10 +38,10 @@ function AssetImportConfigList::onSelect( %this, %id, %text ) %this.populateConfigListByGroup("General"); %this.populateConfigListByGroup("Meshes"); %this.populateConfigListByGroup("Materials"); - %this.populateConfigListByGroup("Animations"); %this.populateConfigListByGroup("Images"); + %this.populateConfigListByGroup("Sounds"); + %this.populateConfigListByGroup("Animations"); %this.populateConfigListByGroup("Collision"); - %this.populateConfigListByGroup("Sound"); ImportOptionsConfigList.update(); } diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png new file mode 100644 index 0000000000000000000000000000000000000000..4f5d73310dca5211a7e69b92d834df08fd3ffecb GIT binary patch literal 15389 zcmeI3du$X%9LE=eLJKIC@=}AFQ!GU8cK2TGt#^m*T}z7|l(s-oqilDl?b^HB<96G- ztBUo7;3L+GC@K&i#Gp|k2)+;vT4*Xt#79t!rbvPi2=)&HT71mjb9%jFF!9g1YzH?!N*x4pJB*Q#+p)<-ug8@f>&=XTj!U#Q zm!VuAkZ$zV(jFxYXq(Aq6j?JzmpV+G&FbK|xwM((EDXmoW`~jEcxx%o+3DoR;4Xxb zGb}apb>6DvaPTjep;gmDJi|mH5mUrsQo=0^=WsX}*36jAMyN2Vv7jbIjY0L=gh|TB z3sf;IhcsCU(z>tEq_k@;gFzoC{YlO%5K0deRFmu=MJ6hQ7|z5pd6Im-3#SDFIWtwQ z4rFGQb3nBr76MEiP?h$u2%!AhT(_WVl^t+ONkkW6RM`Q7T23oTO#6h|!~QsENo0T@ z1Yn8^DR4RG5^7a6MQv5`08Dr1#i+^6d06N@dDB2t&XcD1B+}wFl~`&gEM(pj27;!9 z8x+OwPLykH>h5Wehn~Gm4oXTyo#SM()tQ>f7y+-K0XM8^E39TCYi=-eyoKX!wi{TE zXIaD~q0I8|DU#eA8{uK**)ra0MLiH@wg=pUlAs9}<$`L5`}ll(O;FW@pa^QbZa8<7 zEK9u2!HPne!)!D=ETXZAvjU^TEW$q}3v1y@ORW~MEI!HM=_9PYirB8#P|{k0*4DBr zuiakhwVORv99L;At0=RSdu&!qg~!f0Z1$8bk~-2Bgyjw(RfUy6e0zt4unP2D<1(bS zP5L}Y)ty05T&gW|Q;7_HpoAdDnqFM_j!4fxMx+%4hi&()t(vfktMZ$uO0yOb!l1kb?g-2w zlrS8gk>6Qt6@o25ax*DtsfO$nC!?>LUmm__iPqt3nX12$YwwgqzF7$e1kEi6gciVr zf-O!a)0i34nf?#JdlbJChKCt&TbxX;W+Y2L`}NX>l!SOaa871KTeiMY-}wIaxW3fP z!Vi4ffS+V4+MS)c{KBbdcXnzfb4gIv+~(wHS|v)G(Wc5`+{ ztsDjZMz0LdQdQp}aB9h|HV}c8d2o(@qC=F~(aA6Ul0)h*rfsF|+EFx4uaG^A?F~NmJgbD~Q zlm<2?xUh&&0l|gRz{Ug@77;2SxKJ9{nBc-9LIngDN&_1cTv$Y?fZ#%DU}J&{iwG4E zTqq4}OmJZlp#p*nrGbqJE-WHcKyaZnura}fMT80nE|dl~Cb+POPyxY((!j<97ZwpJ zAh=K(*qGqLB0>cO7fJ&g6I@tCsDR)?X<%c53yTO95L_q?Y)o)r5upNt3#EaL2`(%m zR6uZ{G_dgnaTR7>wgf@=hGhi4O8IiZcTxBnCM{Oi`6#M$7DaVENKt?M1HVsDR69#i zCs$Au{~Se4Q+n>~t)i&WqiVe64bdM?{rJ^Wd+Fk;fvfh7K2$UJ{?mPRyVjk)>E<;X zTQB+k+1;ncubgT+->u%UadD4w%ieJdkL;RpqPXmmu1Pd{jTuL$uU8NC4!F*IDgJ$B z?4GATHHkE>w1V9rC*&J9y!)w+41e*U*gf7Z)~{tU1zj6*4H*qKG=V} ziQDnWhA$3y{8a0tm1ou! zRZe|nO5gKqdv3dIA8)8W;GHuV7-FifzT()%wM|d#`F7-%@^70+JLcVyt4`>vx0Tb|oGImaX$ zKA1Z6P5sb&({B7}^T0=o{%St)=A_8M!JUV%G0$RWcI*!J-@WpOoG=*Fte!l$>p8*oT@+GQ`tpTWUj=z)ef#2OKo4WdVImS S!Xo_z-kQpV-nS}NJn%2AIqYZv literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger_image.asset.taml new file mode 100644 index 000000000..6a0f57ae1 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png new file mode 100644 index 0000000000000000000000000000000000000000..c1520a5120492f4c22bfbe2172af38a04d1b75b4 GIT binary patch literal 15374 zcmeI3eQXnD9LH~SDr_+D4FS!(REbPz@2+dR_0n~2?dFCQ#+b4hbi3Z&w#(YPa(AQM z)JQ~;5tJ72{_4QfT^323PpXRpy z_B`L;_qpfu{GMm`&-K=?xMz0$!hC`tX4lnv8^E_<{LHup{0@!wH-fL3q1tARAPR0U zesYKxUYt)5&RtStliuW8&hkpo!U>9Bv_yg-pe6`cMI^-WouW?q#db+9H;unPXd)${ z+_c8-qkSQd*df*SsN(9L6^(pPC+`$Y74CdjgarmcQRm1=Fd%Deq}&wsWkGB-QzkMh z(L2jcmBxT%ldqoiD5^->Ep{_cTN$#{X<_U(C&Mfytu#|YF*Id$ni+<*m9mV3jDJk- zd=R-*p^a_u*2IScf0dg$bUnmUR5%>Agi9=n+Ds-VvYq!Tt z5(xvhukl&u^7BszjJ(yA)(KL*z*Nd{A(MsTxKA|o(5Ctvp zlo$|$AVmWdn2d7?btt-`btqW?CcCp@)TOp8ER3G4X<|gml4kV8(xNpLTWS|5WY(jK zoUW*iiV|?g%C$am_oT-|E?y(af)dt>T~xX{RWm6g(aY(g8`QK7RI{13Hd-0BgkkOW zB{aj*G-MJ}rg``jL2B!s;$da!GS<$(9*{EK1MES8)46H6z}m?^J|9~rYdRFV)Fw>mPZstlIwAs%)Xq$r<95$;zI?2iDQ>?uT-(}QL+*&ZK z%WAw1N43*o_0%v-wXLkGtfbOox0O_R9E{WMNZ3NDQ*A|6S}zJUsuGND?+~YIqOohr zO^I!jJP+bE5Z!mIlwqo|`*CEypDC%S`vK;zShtXMrllxnC^hAr#E_b5T1f-+D^&@c z=v)9|Wvt+T!JNSYx(VP0hN+b_uywkj@r`*K=jv*4-Q?CpM?jk9!X%dmoMtS?8z;6~ zDk8!cZl+&?Vh$(V^&dBb`wo$)5Dx9RhLbb0JM$f!+%5`kDgiCgke=eAj8zLrlNT-4I(aP<^*43xT>{UxDQb|@-BOTi z7paik?xIqSsWDy2{{XB<2`DN!%tUvIi^|jtWf^C`QQCkK7p(`zMNMf-*Ebm(KhPD` zms)A?0Z$v?6HkS^(^H$ToC@F(3 zIX$CZiim+GuLRCg&DbGeYVoA>o{X8zSu>%YcxJ2^pa-aEt;AZv;~97|q>_(@lglW% zG5_ZvHKqUA7`DTMz%-CC#)U)#3otI21~SIDkceOb#s$+r#uyh85iG#CU>e96<3b{W z1sE4h0~upnNJOvzK*kss5)mxGxL_K{7~?`Bf&~~COamEXTu4N)0ONvbAY+UR zi3k>8Trdq}jBz0m!2*m6rh$wxE+isYfN{YzkTJ%EL<9>kE|>-~#<-A(U;)Mj(?G@; z7ZMRHz_?%<$oPu5@>4HciZXb^G7Mg&TrzT@0=$Mv^0f^;`w&a=5Ay$|M|Kk?eDefsvk zmv#SrF9$}=Lhfxv7r!}hY~i_*%7#0xJN29Gv*HUk5LFxCYc9DVd2L^&6khs!X<%^A zm*Jrwlv86L{e0QqHvZCBLE#){-};O6+kKVAkGjjYQ3CzJaNxIFzujEidFdbj?%uYY zgZ||Y&w765YquObv+=K4iyvfeJawpV)e(N*i+|kp%B-XHM+#R}E!gzk)rZ!+vi0CK z{F=PF{>Ax^9k@JHyM?@G(aEjlOyTGJi6sNJ4}Wp*8_Zp{dTUX8^OC)`<7c|Qdf&9A zpyuPBw)fYcriYK6p3^+AZTQ`@=bsvxcYo1sheJcTd2@|R*x@?p*?BR%tEi>**9EUH zjW@?SpCEFK>w(fSt@&{O@#9*ve~dplIzLY1?X^$6I{fbb{x9}4jLXkZMZZ5{+5dU| z%)M`UigvY(cWx=}Jfq(9^w-1d7HprfY2LCtPr;(c2cEqC=qFXZtsMiA4I{1Rax2b1 z)N8u7VdIXxyLZlBJAUu?EqAWm>S diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index e59be8ddf..492423e3d 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -163,7 +163,8 @@ new GuiControlProfile (ToolsGuiWindowProfile) opaque = false; border = 1; fillColor = EditorSettings.value("Theme/tabsColor"); - fillColorHL = EditorSettings.value("Theme/tabsColor"); + fillColorHL = EditorSettings.value("Theme/tabsHLColor"); + fillColorSEL = EditorSettings.value("Theme/tabsSELColor"); fillColorNA = EditorSettings.value("Theme/tabsColor"); fontColor = EditorSettings.value("Theme/headerTextColor"); fontColorHL = EditorSettings.value("Theme/headerTextColor"); diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 50b5563a8..0f71d8757 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -113,7 +113,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "left"; tooltip = "Swap material on the object with existing"; bitmapAsset = "ToolsModule:change_material_btn_n_image"; - command = "materialSelector.showDialog(\"MaterialEditorGui.showMaterialChangeSaveDialog\");"; + command = "MaterialEditorGui.swapMaterial();"; }; new GuiTextEditCtrl(){ diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index 24b00874a..072925f14 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -465,6 +465,9 @@ function MaterialEditorGui::setActiveMaterial( %this, %material ) MaterialEditorGui.lastMaterial = %material; // we create or recreate a material to hold in a pristine state + if(isObject(notDirtyMaterial)) + notDirtyMaterial.delete(); + singleton Material(notDirtyMaterial) { mapTo = "matEd_mappedMat"; @@ -1949,8 +1952,8 @@ function MaterialEditorGui::showMaterialChangeSaveDialog( %this, %toMaterial ) toolsMessageBoxYesNoCancel("Save Material?", "The material " @ %fromMaterial.getName() @ " has unsaved changes.
Do you want to save before changing the material?", - "MaterialEditorGui.saveDialogSave(" @ %toMaterial @ "); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", " @ %toMaterial @ ");", - "MaterialEditorGui.saveDialogDontSave(" @ %toMaterial @ "); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", " @ %toMaterial @ ");", + "MaterialEditorGui.saveDialogSave(\"" @ %toMaterial @ "\"); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", \"" @ %toMaterial @ "\");", + "MaterialEditorGui.saveDialogDontSave(\"" @ %toMaterial @ "\"); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", \"" @ %toMaterial @ "\");", "MaterialEditorGui.saveDialogCancel();" ); } @@ -1986,11 +1989,21 @@ function MaterialEditorGui::saveDialogDontSave( %this, %material ) MaterialEditorGui.setMaterialNotDirty(); + if(AssetDatabase.isDeclaredAsset(%material)) + { + %material = AssetDatabase.acquireAsset(%material).materialDefinitionName; + } + MaterialEditorGui.setActiveMaterial( %material ); } function MaterialEditorGui::saveDialogSave( %this, %material ) { + if(AssetDatabase.isDeclaredAsset(%material)) + { + %material = AssetDatabase.acquireAsset(%material).materialDefinitionName; + } + MaterialEditorGui.save(); MaterialEditorGui.setActiveMaterial( %material ); } @@ -2277,16 +2290,34 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial) %materialTarget = SubMaterialSelector.text; %action.materialTarget = %materialTarget; + %toMaterialDefinition = %toMaterial; + + %isMatAsset = false; + if(AssetDatabase.isDeclaredAsset(%toMaterial)) + { + %isMatAsset = true; + %assetDef = AssetDatabase.acquireAsset(%toMaterial); + %toMaterialDefinition = %assetDef.materialDefinitionName; + %filename = %assetDef.getScriptPath(); + } + %action.fromMaterial = %fromMaterial; %action.toMaterial = %toMaterial; - %action.toMaterialOldFname = %toMaterial.getFilename(); + %action.toMaterialOldFname = %toMaterialDefinition.getFilename(); %action.object = MaterialEditorGui.currentObject; if( MaterialEditorGui.currentMeshMode $= "Model" ) // Models { %action.mode = "model"; - MaterialEditorGui.currentObject.changeMaterial( %materialTarget, %fromMaterial.getName(), %toMaterial.getName() ); + if(!%isMatAsset) + { + MaterialEditorGui.currentObject.changeMaterial( %materialTarget, %fromMaterial.getName(), %toMaterialDefinition.getName() ); + } + else + { + eval("MaterialEditorGui.currentObject." @ %materialTarget @ " = " @ %toMaterial); + } if( MaterialEditorGui.currentObject.shapeName !$= "" ) %sourcePath = MaterialEditorGui.currentObject.shapeName; @@ -2296,6 +2327,8 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial) %sourcePath = MaterialEditorGui.currentObject.getDatablock().shapeFile; } + if(!%isMatAsset) + { // Creating "to" path %k = 0; while( strpos( %sourcePath, "/", %k ) != -1 ) @@ -2308,28 +2341,33 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial) %action.toMaterialNewFname = %fileName; - MaterialEditorGui.prepareActiveMaterial( %toMaterial, true ); - if( !MaterialEditorGui.isMatEditorMaterial( %toMaterial ) ) + MaterialEditorGui.prepareActiveMaterial( %toMaterialDefinition, true ); + if( !MaterialEditorGui.isMatEditorMaterial( %toMaterialDefinition ) ) { - matEd_PersistMan.removeObjectFromFile(%toMaterial); + matEd_PersistMan.removeObjectFromFile(%toMaterialDefinition); + } } matEd_PersistMan.setDirty(%fromMaterial); - matEd_PersistMan.setDirty(%toMaterial, %fileName); + matEd_PersistMan.setDirty(%toMaterialDefinition, %fileName); matEd_PersistMan.saveDirty(); matEd_PersistMan.removeDirty(%fromMaterial); - matEd_PersistMan.removeDirty(%toMaterial); + matEd_PersistMan.removeDirty(%toMaterialDefinition); } else // EditorShapes { %action.mode = "editorShapes"; - MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterial.getName()); + if(!%isMatAsset) + MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterialDefinition.getName()); + else + MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterial); + if( MaterialEditorGui.currentObject.isMethod("postApply") ) MaterialEditorGui.currentObject.postApply(); - MaterialEditorGui.prepareActiveMaterial( %toMaterial, true ); + MaterialEditorGui.prepareActiveMaterial( %toMaterialDefinition, true ); } MaterialEditorGui.submitUndo( %action ); @@ -2458,3 +2496,12 @@ function MaterialEditorGui::saveCompositeMap(%this) saveCompositeTexture(%aoMap,%roughMap,%metalMap,"",%channelKey, %saveAs); %dlg.delete(); } + +function MaterialEditorGui::swapMaterial(%this) +{ + AssetBrowser.showDialog("MaterialAsset", %this @ ".doSwapMaterial", "", "", ""); +} +function MaterialEditorGui::doSwapMaterial(%this, %materialAsset) +{ + MaterialEditorGui.showMaterialChangeSaveDialog(%materialAsset); +} \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png index b96012a60889e0cae1fe49d9e85aa4f18549fdfe..e4d4e1cc0b2305df4d8a4ec97c10176551ab6e1f 100644 GIT binary patch literal 1254 zcmVEX>4Tx04R}tkv&MmKpe$iQ>9WW3KkS`$WUFhAS$ApRIvyaN?V~-2a`*`ph-)T z;^HW{799LotU9+0Yt2!bCVZf;JBE>hzEl0u6Z503ls?%w0>9U#<8Of@>j0aY{g zL^L9%GpnNS6@K)i7o(V!m{Ex(7gKN@U-$6v^)Ae_+|T_vx|OWK0FOvK$11u>yg@v@ zX;wJz69-vAQi#uq$8@?N@gvt|hu=8oZ5DWDP){Z1iG##qzK!KJW(8d(o+1t@sz&)j z+F^zB7H73oWzBo?7Y4H0N|Ng|hY-aQVu(Y8j4FyK!9+gyESr?6HZbf0(8Du*2gg5+XWgm%lbaHti}o8eFmlN54hX`2A(RCF4>ZorjW}4?`QN)8KCbL@UJ<&HTQA)0Hmm^%2nE(I)24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jvPE5Hm2tx1ss~00QDkL_t(o!|j$yZxmM$$A9&f zc|BRJDBG25mILx9Kmr9NMj{-LSPuCD;TR8!&EjsnTzx~y5s1}IYC;~fe=GJ$3?@1{m zgn$g8FoP{r0{k-D8a)L&(LZ_e7mY>(47AbMHgD+s|6IG9$!?YK#^EEYN7vTa{CgAc zJXtfNnKfyo#`cqqf8FnomsQElPe0>}pMN^{!YmNLIY$hUloDCWNGTCRB!U8L-kRAq?(;vC+&?Kg112BY0>_cjgz88rd`s)m}97gs3D3RCNi_1o`PuL3YN zGefzt!K0gNs2a|>z3at(B4DbR_1qMJx~_4)7llXP-(mCaUEVo$idT<*Lg(>gHrLn5 zKKy`m@Zfk-&^ue0|GLNPs;USUkRVJQJI3pW4xuSgmL+eVJP9U!|Da#5q8$AVv zVx}0%LSFRxLycyJY8NwQd1Zw(HHG(Kz?6|AFr04y=RB%PU3YQLVb&XqQSja)(tDcO zcrM|vw-@H;FjKB9E|C`ns>(v1lNSZvJ1$-R^+@&N=ct$2m7XIsWnV z8Jq}F1TTWYz-tj1P}PYb)6)a*$0o;nsoJpp+B&~F7CD~$6;A+60Q?{J4?=rV@B0CA QtN;K207*qoM6N<$g7ptSP)7uI`?m$=DXM z6SE@O@>oO`t8DNFB5Z;TC-a7ZxZN9U;6+e&FKrzNN)0}bJvqHlR z`r^_-q{X0l!mEx{WixJ8t0R?4h5cvK*?_-f)y%hBt+*MB!C+7>m&u(rF0;G%=*D?m z1=!xr+#o8KVN()JY3pk5ZPOG}2e&yie;{arAr7g?s=I*x=+dPebnounAx}kq(GP)h z4B55ji{2WI2Krj9_VtMqupv0-FJpXaDhDS?B243g@+lFnR*Jpo-I+(_dwF^M!_zD(ArznUQi*Z^(g3y* z3KypR(I2$Qu3f*eaO*ar6rP8ax+Sd-UpNo=#^QtU*s)j6p6zryX|D&D(li1iE~T7) zv%KZ0X4kJ>O%qU;;t_f9gcv%?c(c>#Sc}{^)-EBv^{kpt7Hd*BIs89S*BgyJjEz{XPOl$UEOZZasT8aqe8@ zJl3RAL#AzRz*KkuLNw!HGoX)NkU&zqBq2wMA!q(S2pU z27aMAOwQM8byH<9dG*SC-!zg}0S}AZ5W$~5{dr=1!sLs}S>xtHe)eZ)Kf%$m@7n;G zDR0VcO)o6m!lW=NynOj%pBfd&&CN}lH(k)~UY$&n#72)pj6L?f;5p z9<=WD``u0lD#k>)QmIy}C~RBXTN%H$xMnZ-K@b^cz$WEF$`=^TzWGW8lvR{g30G~`$T?ibl^#A|>07*qoM6N<$g7{Kd2><{9 diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png index 5612871e727f2d493b9e94529f9f8084e4824b65..5817fb9e775fcff3ec3e22509e1dd1fd70b1336e 100644 GIT binary patch literal 1472 zcmV;x1wZEX>4Tx04R}tkv&MmKpe$iQ>9WW3KkS`$WUFhAS$ApRIvyaN?V~-2a`*`ph-)T z;^HW{799LotU9+0Yt2!bCVZf;JBE>hzEl0u6Z503ls?%w0>9U#<8Of@>j0aY{g zL^L9%GpnNS6@K)i7o(V!m{Ex(7gKN@U-$6v^)Ae_+|T_vx|OWK0FOvK$11u>yg@v@ zX;wJz69-vAQi#uq$8@?N@gvt|hu=8oZ5DWDP){Z1iG##qzK!KJW(8d(o+1t@sz&)j z+F^zB7H73oWzBo?7Y4H0N|Ng|hY-aQVu(Y8j4FyK!9+gyESr?6HZbf0(8Du*2gg5+XWgm%lbaHti}o8eFmlN54hX`2A(RCF4>ZorjW}4?`QN)8KCbL@UJ<&HTQA)0Hmm^%2nE(I)24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jvPE5HSZyJZ5(Q00X>9L_t(o!|j(bPclsq$A7!G zdv}0JWo>I=WyHipKNE>yAn~lQpu+EAX=`O-VL~N-0t*uh8&Svu2e(i0W;e&NCw6b~ zzLOA^-I>|Bxtafefd9G(fX~lQgb;4i7=sYPeHXsr_9dk=cQh+1E7kRTF3eC z;^p}Z^Lszp`St*0QNb5&e$PIkU6(oj&E+nDqEnxPVh}%_mx)hD`O+$c;Qai2MSCz9 zh%%?eOqALB9!?bx^6TsCYXFiYq1kL2d(m&wp0}OP=SV5tXDxtY7JQN<2|*ALMG;D= z(kd51(Cv0tY`?y~&{|WiR{a5#U7jR~TTdnv!Z6&}89v+Z?{8|g8gU$N#(})EX0vH7 zFE5!)CP*o%R;$EuOcX_HeP8UPG)?JrI&?Z6k!2aRT8(z~@heM1pj7B3GjRs*Dl4Th|5KygFNz;@lio5~HpL$jZL6Ri& zdOgB0L@BlAY{p`-KuU=a zf*=UIZEK8SKA&TZL2K;=tY2lIsA!BKNfH)|#oF2Z{XGDOhlhN8eDL)21mJ?q*OU(l zW%0lmv-aCwDy3w(T(Vp)0T>R4yuQA2baceY$qD=W`@Foo@b>oR1-Ff_z(-0#2&9zs z`+bBEESF2C(`Ym}I5WZD6 z9kkYK87)Iu^;_C>21;R!ADY(oJ{b%KE)(r`8)FQu zR*QDKjZ%u6n;QU@%cTo$6CDeH@p!xjtF2aRMZ4ec6NVv+#lp3u#e}?FmStRAT)5f+ z==FL+YrWE%7K&97g3IW5Hk%=(#2Dj{&Vr4U($#?lt6r~%l+w|$h4o^Fm5&E}ub|uQ zBBdk<0vAYeIL(h~dBmJfr!H_CL}?qAQEI2t5tT~C%Z8p{P2M(5Q?%A(S+-{5YQQJ+ z`JC~1%w#el%QB)Ua%{M1T29lH>2yk(rU)U}+S+1!d)w8)S`GN-dMTwFLM*%4iD=V6 zVr^`TT1qa(0pI@uJA_#DE0U4#V!LPO2wR-iwy3YlSj`$qDINH18qbS`oX^xIl>J}+ aHTes{y8ys8GxlWw0000c4l_= zgr1+DL!r=~FRRrGUB*2}SYdQO1(AYL@f0MMI=ZCFrPHlQcN*5Y*-)qAmnep47wI>z zYi4jR_15*E=qJyFtXi!q==%CPXy$qy1nVbHHB~yD4&&wJWu;OH{m3o{75w@68U7KQ zHzS}Ukw`oq_dG9{cUCSgE)@Lw`WlT!lgZ?oH%JPdDDUs@u~=+Zc^L59+gmD?N+c5N zUA2DIfa5otO-R|9{ej}LTeEHn&FAyKzATqZcr%#{uB_`USWg@rE=d3Q67%Kh>FMU? z=KlVkPyK%X_VyM$yRtnaLD1lC@@A?X93xOM6KF1%8;wT8;SexNu~=j?+$0BhfaC0^ z;PBQ;B5Lh+8#5eNC~|go#yA)Z4i67cPEKaC*NtG4pR6che_`GQVl zA08eGg~I9SX+EDHkH?RXkLFt0IGFB(4kOV(fmA+`sH3AJf=Gx;rIO^0bh+OA>N}WbL9=GbSb>9 z*XzJ)wHgYH-ENn4LL{4Q>Dn(ZFYX1!QbEL*2rhilyQD}?&}cLy6HKZ1s4udOXC5xM z^^qTJ_$2pAt^g|%V!1NVF-o752C(h~ZgVhkpbcU}5QW`+J@r}A+c=$0#e+39ad2za zeFDzU&uKcQpP7wSFPF=7iEK72q1f=Ma3U7zlbjbu>1VrMXzCYF8CglE)BF4T!s`Y9 z95|Y^bLmy`UhL}Y0+ZsCR%z=&p-W%nnz?<)z+}4o5lN|nf5pK(_`808{)5*;{1adR Xeyjx=)AJ4p00000NkvXXu0mjf(zl7R diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index 681e67f7d..594a4dd92 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -214,7 +214,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - bitmapAsset = "ToolsModule:new_image"; + bitmapAsset = "ToolsModule:new_n_image"; tooltip = "Create New Emitter"; }; new GuiBitmapButtonCtrl() { diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index d68fa2258..3e950231a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -1883,10 +1883,16 @@ function EditorTree::GetTooltipGroundCover( %this, %obj ) // Tooltip for SFXEmitter function EditorTree::GetTooltipSFXEmitter( %this, %obj ) { + %soundName = %obj.soundAsset; + if(%soundName $= "") + { if(%obj.fileName $= "") - return "Track: " @ %obj.track; + %soundName = "Track: " @ %obj.track; else - return "File: " @ %obj.fileName; + %soundName = "File: " @ %obj.fileName; + } + + return "Sound: " @ %soundName; } // Tooltip for ParticleEmitterNode diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript index bf69e6bdb..48cb8c5d5 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript @@ -354,7 +354,7 @@ function EditorGui::buildMenus(%this) barTitle = "Tools"; - item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();"; + item[0] = "Network Graph" TAB "ctrl n" TAB "toggleNetGraph();"; item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);"; item[2] = "Torque SimView" TAB "" TAB "tree();"; item[3] = "Make Selected a Mesh" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"ShapeAsset\", AssetBrowser.selectedModule, \"makeSelectedAMesh\");";