TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc formatting fixes for material and shape editors

Browse source
This commit is contained in:
Areloch 2023-09-14 17:35:39 -05:00
parent bf200a511e
commit ca767efa34
5 changed files with 64 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Templates/BaseGame/game/tools/forestEditor/main.tscript
View file

@ -228,8 +228,7 @@ function ForestEditorPlugin::saveBrushSet(%this)
function ForestEditorPlugin::isDirty( %this )
{
%dirty = %this.dirty || ForestEditorGui.isDirty();
return %dirty;
return %this.dirty;
}
function ForestEditorPlugin::clearDirty( %this )

2
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file

@ -229,7 +229,7 @@ $guiContent = new GuiControl() {
};
new GuiCheckboxCtrl(){
position = "254 25";
position = "245 25";
Extent = "98 18";
HorizSizing = "left";
profile = "ToolsGuiCheckBoxProfile";

88
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -709,7 +709,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "5 0";
Extent = "57 24";
Extent = "70 24";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -732,7 +732,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "120 0";
Extent = "107 24";
Extent = "120 24";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -899,7 +899,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "86 2";
position = "70 2";
Extent = "100 18";
MinExtent = "8 2";
canSave = "1";
@ -1107,7 +1107,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "160 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1127,7 +1127,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "184 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1147,7 +1147,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "208 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1167,7 +1167,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "232 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1344,7 +1344,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "160 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1364,7 +1364,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "184 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1384,7 +1384,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "208 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1404,7 +1404,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "232 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1581,7 +1581,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "160 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1601,7 +1601,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "184 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1621,7 +1621,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "208 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1641,7 +1641,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "RadioButton";
useMouseEvents = "0";
position = "232 7";
extent = "20 10";
extent = "25 10";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -1965,14 +1965,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiTextCtrl() { // Detailmap Scale text
profile="ToolsGuiDefaultProfile";
position = "56 34";
Extent = "29 16";
Extent = "35 16";
text ="Scale";
};
new GuiTextEditCtrl() { // Detailmap Scale
profile="ToolsGuiNumericTextEditProfile";
internalName = "detailScaleTextEdit";
position = "87 33";
position = "95 33";
Extent = "28 18";
text ="0";
maxLength = "2";
@ -2111,14 +2111,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiTextCtrl() { // Detail Normal Map Strength text
profile="ToolsGuiDefaultProfile";
position = "56 34";
Extent = "29 16";
Extent = "50 16";
text ="Strength";
};
new GuiTextEditCtrl() { // Detail Normal Map Strength
profile="ToolsGuiNumericTextEditProfile";
internalName = "detailNormalStrengthTextEdit";
position = "87 33";
position = "115 33";
Extent = "28 18";
text ="0";
maxLength = "3";
@ -3120,7 +3120,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "120 4";
position = "130 24";
Extent = "70 20";
MinExtent = "8 2";
canSave = "1";
@ -3145,7 +3145,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "12 4";
Extent = "70 20";
Extent = "120 20";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -3167,8 +3167,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "116 4";
Extent = "60 16";
position = "130 4";
Extent = "150 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -3176,7 +3176,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Are we at all influenced by light?";
hovertime = "1000";
text = "ignoreLight";
text = "Ignore Lighting";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -3281,7 +3281,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "12 8";
Extent = "120 20";
Extent = "130 20";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -3350,7 +3350,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "12 56";
Extent = "79 20";
Extent = "95 20";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -4335,8 +4335,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiControl() {
class = "AggregateControl";
HorizSizing = "width";
position = "100 39";
Extent = "187 20";
position = "115 39";
Extent = "175 20";
new GuiSliderCtrl() {
canSaveDynamicFields = "0";
@ -4396,7 +4396,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "3 23";
Extent = "112 16";
Extent = "130 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -4465,7 +4465,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "3 70";
Extent = "112 16";
Extent = "115 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -4488,7 +4488,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "right";
VertSizing = "bottom";
position = "105 55";
Extent = "85 16";
Extent = "90 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -4551,7 +4551,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
HorizSizing = "width";
VertSizing = "bottom";
position = "3 6";
Extent = "84 18";
Extent = "75 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -4599,7 +4599,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiTextCtrl() {
text = "Effect Colors[0:1]";
position = "1 6";
extent = "86 15";
extent = "100 15";
profile = "ToolsGuiDefaultProfile";
};
new GuiSwatchButtonCtrl() {
@ -4607,7 +4607,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "89 6";
position = "100 6";
extent = "16 16";
minExtent = "8 2";
horizSizing = "right";
@ -4626,7 +4626,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "109 6";
position = "120 6";
extent = "16 16";
minExtent = "8 2";
horizSizing = "right";
@ -4646,7 +4646,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "1 24";
extent = "93 16";
extent = "115 16";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -4665,8 +4665,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "110 24";
extent = "68 16";
position = "120 24";
extent = "80 16";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -4683,7 +4683,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiTextCtrl() {
text = "Footstep sound";
position = "1 43";
extent = "77 15";
extent = "100 15";
profile = "ToolsGuiDefaultProfile";
};
new GuiPopUpMenuCtrl() {
@ -4699,8 +4699,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "80 42";
extent = "105 18";
position = "100 42";
extent = "85 18";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
@ -4717,7 +4717,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
new GuiTextCtrl() {
text = "Impact sound";
position = "1 63";
extent = "64 15";
extent = "100 15";
profile = "ToolsGuiDefaultProfile";
};
new GuiPopUpMenuCtrl() {
@ -4733,8 +4733,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "80 62";
extent = "105 18";
position = "100 62";
extent = "85 18";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";

32
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui
View file

@ -201,7 +201,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
HorizSizing = "right";
VertSizing = "bottom";
position = "5 1";
Extent = "104 16";
Extent = "120 16";
text = "Sequence Properties";
};
new GuiTextCtrl() { // Name
@ -209,7 +209,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
HorizSizing = "right";
VertSizing = "bottom";
position = "16 22";
Extent = "27 16";
Extent = "30 16";
text = "Name";
};
new GuiTextEditCtrl() {
@ -219,7 +219,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "46 21";
Position = "55 21";
Extent = "152 18";
MinExtent = "8 2";
canSave = "1";
@ -255,7 +255,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "46 41";
Position = "55 41";
Extent = "91 18";
};
// Start Frame
@ -303,7 +303,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
HorizSizing = "left";
VertSizing = "bottom";
Position = "143 43";
Extent = "39 13";
Extent = "45 13";
Command = "ShapeEdSequences.onToggleCyclic();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Loop Animation. Toggles the cyclic flag.";
@ -355,7 +355,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
HorizSizing = "right";
VertSizing = "bottom";
Position = "2 82";
Extent = "45 16";
Extent = "55 16";
Command = "ShapeEdSequences.onEditBlend();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle the blend flag for the selected sequence";
@ -367,8 +367,8 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "46 81";
Extent = "91 18";
Position = "60 81";
Extent = "75 18";
tooltip = "Blend reference sequence";
Command = "ShapeEdSequences.onEditBlend();";
};
@ -378,8 +378,8 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiTextRightProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "142 81";
Extent = "29 18";
Position = "135 81";
Extent = "30 18";
text = "Frame";
};
new GuiTextEditCtrl() {
@ -387,7 +387,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "173 81";
Position = "175 81";
Extent = "25 18";
text = "";
tooltip = "Blend reference frame";
@ -525,6 +525,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
};
};
new GuiTextCtrl() {
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "5 85";
@ -542,6 +543,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
AltCommand = "ShapeEdTriggerList.onEditSelection();";
};
new GuiTextCtrl() {
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "75 85";
@ -563,7 +565,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "152 87";
Position = "150 87";
Extent = "47 13";
text = "On/off";
Command = "ShapeEdTriggerList.onEditSelection();";
@ -1381,7 +1383,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "154 25";
Position = "300 25";
Extent = "17 17";
MinExtent = "8 2";
canSave = "1";
@ -1402,7 +1404,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "176 25";
Position = "320 25";
Extent = "17 17";
MinExtent = "8 2";
canSave = "1";
@ -1423,7 +1425,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "190 25";
Position = "340 25";
Extent = "17 17";
MinExtent = "8 2";
canSave = "1";

1
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui
View file

@ -379,6 +379,7 @@ $guiContent = new GuiControl() {
ToolTip = "Forces loading of DAE files (ignores cached.dts if present)";
hovertime = "1000";
text = " Source Art";
visible = false;
};
};