TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 21:35:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added fallback handling to MaterialAssets if the asset was found but the matDef was not

Browse source 
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
This commit is contained in:
Areloch 2021-10-28 23:52:58 -05:00
parent 59bebe0bb4
commit 0fab2ebf54
34 changed files with 590 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript
View file

@ -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;
};

42
Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript
View file

@ -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 )

32
Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript
View file

@ -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 )

12
Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript
View file

@ -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";

4
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript
View file

@ -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
{

4
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript
View file

@ -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() );";
};

3
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript
View file

@ -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" ) )
{

12
Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript
View file

@ -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;

10
Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript
View file

@ -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;