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

Fixed getAssetBy... functions so the lookup loop is more stable and doesn't fail if null results return

Browse source 
Added sanity check to reflectionProbe preview shape so if the material didn't load right, it doesn't crash
Added logic to better control if module groups as a whole should fail if a module dependency in that group fails, defaulted to off
Added sanity check if a shape's material failed to load so it doesn't crash when checking accumulation rules
Added search bar to SimView control for easier use
This commit is contained in:
Areloch 2023-05-08 21:18:23 -05:00
parent 3538da30d0
commit 667a0db760
9 changed files with 130 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/gui/simViewDlg, EditorGuiGroup.asset.taml → Templates/BaseGame/game/tools/gui/simViewDlg.asset.taml
View file

@ -1,7 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="simViewDlg, EditorGuiGroup"
AssetName="simViewDlg"
scriptFile="@assetFile=simViewDlg.ed.gui"
GUIFile="@assetFile=simViewDlg.ed.gui"
VersionId="1" />

317
Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui
View file

@ -1,262 +1,142 @@
//--- OBJECT WRITE BEGIN ---
$guiContent = new GuiControl(simViewDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "0 0";
Extent = "800 600";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
$guiContent = new GuiControl(simViewDlg,EditorGuiGroup) {
extent = "1024 768";
minExtent = "8 8";
profile = "ToolsGuiDefaultProfile";
tooltipProfile = "GuiToolTipProfile";
isContainer = "1";
canSaveDynamicFields = "1";
new GuiWindowCtrl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiWindowProfile";
HorizSizing = "center";
VertSizing = "center";
position = "70 43";
Extent = "685 489";
MinExtent = "602 440";
canSave = "1";
Visible = "1";
hovertime = "1000";
text = "Torque SimView";
maxLength = "1024";
resizeWidth = "1";
resizeHeight = "1";
canMove = "1";
canClose = "1";
canMinimize = "1";
canMaximize = "1";
minSize = "50 50";
closeCommand = "Canvas.popDialog(simViewDlg);";
position = "169 139";
extent = "685 489";
minExtent = "602 440";
horizSizing = "center";
vertSizing = "center";
profile = "ToolsGuiWindowProfile";
tooltipProfile = "GuiToolTipProfile";
new GuiScrollCtrl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiScrollProfile";
HorizSizing = "width";
VertSizing = "height";
position = "10 28";
Extent = "255 448";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
willFirstRespond = "1";
hScrollBar = "dynamic";
vScrollBar = "alwaysOn";
lockHorizScroll = "false";
lockVertScroll = "false";
constantThumbHeight = "0";
childMargin = "0 0";
position = "10 51";
extent = "255 425";
minExtent = "8 8";
horizSizing = "width";
vertSizing = "height";
profile = "ToolsGuiScrollProfile";
tooltipProfile = "GuiToolTipProfile";
new GuiTreeViewCtrl(InspectTreeView) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiTreeViewProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "2 2";
Extent = "212 21";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
tabSize = "16";
textOffset = "2";
fullRowSelect = "0";
itemHeight = "21";
destroyTreeOnSleep = "1";
MouseDragging = "1";
MultipleSelections = "1";
DeleteObjectAllowed = "1";
DragToItemAllowed = "1";
position = "2 25";
extent = "212 21";
minExtent = "8 8";
profile = "ToolsGuiTreeViewProfile";
tooltipProfile = "GuiToolTipProfile";
};
};
new GuiScrollCtrl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiScrollProfile";
HorizSizing = "left";
VertSizing = "height";
position = "272 96";
Extent = "404 380";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
willFirstRespond = "1";
hScrollBar = "alwaysOff";
vScrollBar = "alwaysOn";
lockHorizScroll = "true";
lockVertScroll = "false";
constantThumbHeight = "0";
childMargin = "0 0";
lockHorizScroll = "1";
position = "272 96";
extent = "404 380";
minExtent = "8 8";
horizSizing = "left";
vertSizing = "height";
profile = "ToolsGuiScrollProfile";
tooltipProfile = "GuiToolTipProfile";
new GuiInspector(InspectFields) {
StackingType = "Vertical";
HorizStacking = "Left to Right";
VertStacking = "Top to Bottom";
Padding = "1";
canSaveDynamicFields = "0";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "2 2";
Extent = "382 8";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
position = "1 1";
extent = "389 8";
minExtent = "8 8";
horizSizing = "width";
profile = "ToolsGuiTransparentProfile";
tooltipProfile = "GuiToolTipProfile";
};
};
new GuiTextEditCtrl(SimViewTreeFilter) {
position = "11 27";
extent = "255 18";
profile = "ToolsGuiTextEditProfile";
tooltipProfile = "GuiToolTipProfile";
placeholderText = "Filter...";
};
new GuiControl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "272 28";
Extent = "403 61";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
hovertime = "1000";
extent = "403 61";
horizSizing = "left";
profile = "ToolsGuiButtonProfile";
tooltipProfile = "GuiToolTipProfile";
isContainer = "1";
new GuiTextEditCtrl(InspectObjectName) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "121 8";
Extent = "195 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
maxLength = "1024";
historySize = "0";
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
extent = "195 18";
minExtent = "8 8";
profile = "ToolsGuiTextEditProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
Profile = "EditorTextHLRight";
HorizSizing = "right";
VertSizing = "bottom";
position = "217 35";
Extent = "44 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
text = "Sim ID:";
maxLength = "1024";
position = "217 35";
extent = "44 18";
minExtent = "8 8";
profile = "GuiTextProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
Profile = "EditorTextHLRight";
HorizSizing = "right";
VertSizing = "bottom";
position = "10 35";
Extent = "106 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
text = "Internal Name:";
maxLength = "1024";
position = "10 35";
extent = "106 18";
minExtent = "8 8";
profile = "GuiTextProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiTextEditCtrl(InspectObjectInternalName) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "121 35";
Extent = "93 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
maxLength = "1024";
historySize = "0";
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
extent = "93 18";
minExtent = "8 8";
profile = "ToolsGuiTextEditProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
Profile = "EditorTextHLBoldRight";
HorizSizing = "right";
VertSizing = "bottom";
position = "10 8";
Extent = "106 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
text = "Selected Object:";
maxLength = "1024";
position = "10 8";
extent = "106 18";
minExtent = "8 8";
profile = "GuiTextProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiIconButtonCtrl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "321 33";
Extent = "76 22";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "InspectApply();";
hovertime = "1000";
text = "Refresh";
groupNum = "-1";
buttonType = "PushButton";
bitmapAsset = "ToolsModule:iconRefresh_image";
sizeIconToButton = "0";
BitmapAsset = "ToolsModule:iconRefresh_image";
textLocation = "Right";
textMargin = "4";
buttonMargin = "4 4";
text = "Refresh";
position = "321 33";
extent = "76 22";
profile = "ToolsGuiButtonProfile";
command = "InspectApply();";
tooltipProfile = "GuiToolTipProfile";
};
new GuiTextCtrl(InspectObjectSimID) {
canSaveDynamicFields = "0";
Profile = "EditorTextHLBoldCenter";
HorizSizing = "right";
VertSizing = "bottom";
position = "265 35";
Extent = "51 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
text = "0";
maxLength = "1024";
position = "265 35";
extent = "51 18";
minExtent = "8 8";
profile = "GuiTextProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiIconButtonCtrl() {
canSaveDynamicFields = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "321 6";
Extent = "76 22";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "InspectDelete();";
hovertime = "1000";
text = "Delete";
groupNum = "-1";
buttonType = "PushButton";
bitmapAsset = "ToolsModule:iconDelete_image";
sizeIconToButton = "0";
BitmapAsset = "ToolsModule:iconDelete_image";
textLocation = "Right";
textMargin = "4";
buttonMargin = "4 4";
text = "Delete";
position = "321 6";
extent = "76 22";
profile = "ToolsGuiButtonProfile";
command = "InspectDelete();";
tooltipProfile = "GuiToolTipProfile";
};
};
};
@ -346,3 +226,12 @@ function GuiInspector::setAllGroupStateScript(%this, %obj, %groupState)
%this.setAllGroupState(%groupState);
%this.inspect(%obj);
}
function SimViewTreeFilter::onReturn(%this)
{
%text = %this.getText();
if( %text $= "" )
%this.reset();
else
InspectTreeView.setFilterText( %text );
}