TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

@rextimmy fix for GuiWindowCtrl so they snap correctly again

Browse source 
Added asset loose files for editor and bake level files on level asset
Correct return of ConsoleGetType on TypeShapeAssetPtr
Adds shape asset support to TSStatic, now will support either raw shape file or ShapeAsset
Adds onInspect function behavior, so when object is inspected, it can do special editor behavior
Adds callback for when editTSCtrl is resized
Added editor setting to force the world editor sidebar(scene tree and inspector windows) to resize to fit to the right side of the screen automatically instead of float
If assimp loader encounters error, it's output into the console log
Makes root Data item in folder hierarchy tree in Asset Browser able to support right mouse popup menu action
Material and Shape assets now correctly base on current browsed folder
Material asset generation now more properly fills out common maps, as well as handles skipped dependencies better
More theme corrections
Updated TestGrid images asset defs to have proper loose file handling
This commit is contained in:
Areloch 2019-11-18 03:30:04 -06:00
parent 7ff451ec89
commit 7b5e1c3c58
35 changed files with 619 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -853,7 +853,7 @@
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiTransparentProfile";
Profile = "ToolsGuiSolidDefaultProfile";
HorizSizing = "width";
VertSizing = "height";
Position = "5 5";

3
Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui
View file

@ -347,6 +347,7 @@
};
};
new GuiCheckBoxCtrl() {
profile = "ToolsGuiCheckBoxProfile";
text = "Snap to object bounding box";
groupNum = "1";
useMouseEvents = "0";
@ -775,6 +776,7 @@
};
};
new GuiCheckBoxCtrl() {
profile = "ToolsGuiCheckBoxProfile";
text = "Grid Snapping";
groupNum = "1";
useMouseEvents = "0";
@ -794,6 +796,7 @@
canSaveDynamicFields = "0";
};
new GuiCheckBoxCtrl() {
profile = "ToolsGuiCheckBoxProfile";
text = "Use Group Center";
groupNum = "1";
useMouseEvents = "0";

2
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui
View file

@ -20,7 +20,7 @@
isContainer = "1";
Profile = "ToolsGuiWindowProfile";
Position = getWord($pref::Video::mode, 0) - 330 SPC
getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) + 40;
getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) + 40;
Extent = "300 250";
MinExtent = "200 150";
HorizSizing = "windowRelative";

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

@ -58,6 +58,12 @@ function EditorGui::init(%this)
%this.add( EWTreeWindow );
EWTreeWindow-->EditorTree.selectPage( 0 );
EWTreeWindow.setVisible( false );
if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1)
{
EWTreeWindow.position = %this.extent.x - EWTreeWindow.Extent.x SPC EditorGuiToolbar.extent.y;
EWTreeWindow.extent = EWTreeWindow.extent.x SPC %this.extent.y - EditorGuiToolbar.extent.y - EditorGuiStatusBar.extent.y - 25;
}
}
}
@ -70,6 +76,12 @@ function EditorGui::init(%this)
{
%this.add( EWInspectorWindow );
EWInspectorWindow.setVisible( false );
if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1)
{
EWInspectorWindow.position = EWTreeWindow.position.x SPC EWTreeWindow.extent.y;
EWInspectorWindow.extent = EWTreeWindow.extent.x SPC EWTreeWindow.extent.y;
}
}
}
@ -1425,6 +1437,24 @@ function EWorldEditorAlignPopup::onSelect(%this, %id, %text)
//-----------------------------------------------------------------------------
function EWorldEditor::onResize(%this, %newPosition, %newExtent)
{
//if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1)
//{
%treePos = %this.extent.x - (%this.extent.x * 0.2) SPC EditorGuiToolbar.extent.y;
%treeExt = %this.extent.x * 0.2 SPC (%this.extent.y * 0.5) - EditorGuiToolbar.extent.y - EditorGuiStatusBar.extent.y - 25;
EWTreeWindow.resize(%treePos.x, %treePos.y, %treeExt.x, %treeExt.y);
//}
//if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1)
//{
%inspPos = EWTreeWindow.position.x SPC EWTreeWindow.position.y + EWTreeWindow.extent.y;
%inspExt = EWTreeWindow.extent.x SPC %this.extent.y - EWTreeWindow.extent.y - (EditorGuiStatusBar.extent.y * 2);
EWInspectorWindow.resize(%inspPos.x, %inspPos.y, %inspExt.x, %inspExt.y);
//}
}
//-----------------------------------------------------------------------------