Skip to content

Commit

Permalink
Merge pull request #1088 from Areloch/MiscFixes_20230914
Browse files Browse the repository at this point in the history 
Misc formatting fixes for material and shape editors
  • Loading branch information
@Azaezel
Azaezel authored Sep 14, 2023
2 parents bf200a5 + ca767ef commit d441e21
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 62 deletions.
3 changes: 1 addition & 2 deletions Templates/BaseGame/game/tools/forestEditor/main.tscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ $guiContent = new GuiControl() {
};

new GuiCheckboxCtrl(){
position = "254 25";
position = "245 25";
Extent = "98 18";
HorizSizing = "left";
profile = "ToolsGuiCheckBoxProfile";
Expand Down
88 changes: 44 additions & 44 deletions Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -3167,16 +3167,16 @@ $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";
Command = "MaterialEditorGui.updateActiveMaterial(\"ignoreLighting[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue());";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Are we at all influenced by light?";
hovertime = "1000";
text = "ignoreLight";
text = "Ignore Lighting";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -4599,15 +4599,15 @@ $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() {
color = "1 1 1 1";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "89 6";
position = "100 6";
extent = "16 16";
minExtent = "8 2";
horizSizing = "right";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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() {
Expand All @@ -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";
Expand All @@ -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() {
Expand All @@ -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";
Expand Down
Loading

0 comments on commit d441e21

Please sign in to comment.