WIP updated UI

WIP dark editor theme
fixed multiwindow
This commit is contained in:
Areloch 2019-05-09 00:11:49 -05:00
parent cedbd387d9
commit 60a29777fa
46 changed files with 2404 additions and 2295 deletions

View file

@ -2,11 +2,11 @@ exec( "tools/gui/profiles.ed.cs" );
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
bitmap = "data/ui/art/background-dark.png";
bitmap = "data/ui/art/BackgroundImage.png";
useVariable = "0";
tile = "0";
position = "0 0";
extent = "1280 1024";
extent = "1024 768";
minExtent = "8 8";
horizSizing = "width";
vertSizing = "height";
@ -22,7 +22,7 @@ exec( "tools/gui/profiles.ed.cs" );
isDecoy = "0";
new GuiBitmapButtonCtrl(MainMenuAppLogo) {
bitmap = "data/ui/art/Torque-3D-logo-shortcut.png";
bitmap = "data/ui/art/Torque-3D-logo-shortcut";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -31,7 +31,7 @@ exec( "tools/gui/profiles.ed.cs" );
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "624 30";
position = "550 30";
extent = "443 139";
minExtent = "8 2";
horizSizing = "left";
@ -47,10 +47,10 @@ exec( "tools/gui/profiles.ed.cs" );
canSaveDynamicFields = "1";
};
new GuiControl(MainMenuButtonContainer) {
position = "67 321";
position = "557 193";
extent = "442 381";
minExtent = "8 2";
horizSizing = "right";
horizSizing = "left";
vertSizing = "center";
profile = "GuiDefaultProfile";
visible = "1";

View file

@ -1,7 +1,7 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(OptionsMenu) {
position = "0 0";
extent = "1280 720";
extent = "1024 768";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -60,11 +60,11 @@
canSaveDynamicFields = "0";
};
new GuiControl() {
position = "51 118";
position = "139 118";
extent = "700 518";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
horizSizing = "center";
vertSizing = "center";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
@ -81,12 +81,11 @@
horizSizing = "right";
vertSizing = "center";
profile = "GuiDefaultProfile";
visible = "0";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
hidden = "1";
canSave = "1";
canSaveDynamicFields = "0";
@ -310,6 +309,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 450";
@ -357,6 +357,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 20";
@ -439,7 +440,7 @@
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
text = "NVIDIA GeForce GTX 950 (D3D9)";
text = "NVIDIA GeForce GT 745M (D3D11)";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -495,6 +496,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 20";
@ -577,7 +579,7 @@
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
text = "1280 x 720 (16:9)";
text = "1366 x 768 (16:9)";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -824,7 +826,7 @@
range = "65 90";
ticks = "25";
snap = "1";
value = "90";
value = "74.6154";
position = "190 0";
extent = "209 20";
minExtent = "8 2";
@ -841,7 +843,7 @@
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "90";
text = "74.6154";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
@ -1009,6 +1011,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 450";
@ -1047,6 +1050,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 20";
@ -1145,6 +1149,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "350 20";
@ -1410,6 +1415,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "350 20";
@ -1817,6 +1823,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "350 20";
@ -2567,6 +2574,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/ScreenBrightness_Dark.png";
color = "255 255 255 255";
wrap = "0";
position = "0 100";
extent = "350 200";
@ -2584,6 +2592,7 @@
};
new GuiBitmapCtrl() {
bitmap = "data/ui/art/ScreenBrightness_Light.png";
color = "255 255 255 255";
wrap = "0";
position = "350 100";
extent = "350 200";
@ -2754,11 +2763,12 @@
horizSizing = "right";
vertSizing = "center";
profile = "GuiDefaultProfile";
visible = "1";
visible = "0";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
hidden = "1";
canSave = "1";
canSaveDynamicFields = "0";
@ -2863,6 +2873,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 20";
@ -3004,6 +3015,547 @@
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "700 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "GraphicsMenuSetting";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Forward";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "nameText";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "550 0";
extent = "150 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiButtonCtrl() {
text = "w, up";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "1";
position = "0 0";
extent = "150 35";
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "rebindButton";
class = "ControlsMenuRebindButton";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 35";
extent = "700 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "GraphicsMenuSetting";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Backward";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "nameText";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "550 0";
extent = "150 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiButtonCtrl() {
text = "s, down";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "1";
position = "0 0";
extent = "150 35";
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "rebindButton";
class = "ControlsMenuRebindButton";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 70";
extent = "700 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "GraphicsMenuSetting";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Strafe Left";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "nameText";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "550 0";
extent = "150 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiButtonCtrl() {
text = "a, left";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "1";
position = "0 0";
extent = "150 35";
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "rebindButton";
class = "ControlsMenuRebindButton";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 105";
extent = "700 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "GraphicsMenuSetting";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Strafe Right";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "nameText";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "550 0";
extent = "150 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiButtonCtrl() {
text = "d, right";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "1";
position = "0 0";
extent = "150 35";
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "rebindButton";
class = "ControlsMenuRebindButton";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 140";
extent = "700 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
class = "GraphicsMenuSetting";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextCtrl() {
text = "Jump";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "550 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "nameText";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "550 0";
extent = "150 35";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiButtonCtrl() {
text = "space";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "1";
position = "0 0";
extent = "150 35";
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "bottom";
profile = "GuiMenuButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "rebindButton";
class = "ControlsMenuRebindButton";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
};
};
};
@ -3032,6 +3584,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 460";
@ -3535,6 +4088,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 450";
@ -3573,6 +4127,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "700 35";
@ -3684,6 +4239,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -3722,6 +4278,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "35 0";
extent = "180 35";
@ -3851,6 +4408,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -3889,6 +4447,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "35 0";
extent = "180 35";
@ -4017,6 +4576,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -4055,6 +4615,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "250 35";
@ -4165,6 +4726,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -4203,6 +4765,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "250 35";
@ -4313,6 +4876,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -4351,6 +4915,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "250 35";
@ -4461,6 +5026,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "450 35";
@ -4499,6 +5065,7 @@
new GuiBitmapCtrl() {
bitmap = "data/ui/art/hudfill.png";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "250 35";

View file

@ -7,8 +7,8 @@ new GuiControlProfile( GuiMenuButtonProfile )
fontType = "Arial Bold";
fontColor = "240 240 240";
fontColorHL = "0 0 0";
fontColorNA = "125 125 125";
//fontColorSEL ="0 0 0";
fontColorNA = "0 0 0";
fontColorSEL ="0 0 0";
fixedExtent = false;
justify = "center";
canKeyFocus = false;
@ -45,7 +45,7 @@ new GuiControlProfile( GuiBlankMenuButtonProfile )
border = false;
fontSize = 18;
fontType = "Arial Bold";
fontColor = "200 200 200";
fontColor = "220 220 220";
fontColorHL = "255 255 255";
fontColorNA = "200 200 200";
//fontColorSEL ="0 0 0";

View file

@ -5,7 +5,7 @@
function InitializeVerveEditor()
{
$Verve::UseSeparateWindow = false;
$Verve::UseSeparateWindow = true;
// Preferences.
exec( "./DefaultPrefs.cs" );

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 586 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 397 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 241 B

Before After
Before After

View file

@ -68,6 +68,11 @@ singleton GuiControlProfile (menubarProfile : NavPanelProfile)
{
bitmap = "./menubar";
category = "Editor";
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
};
singleton GuiControlProfile (editorMenubarProfile : NavPanelProfile)
{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 182 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 301 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 211 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 414 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 307 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 276 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 333 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 154 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 276 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 939 B

After

Width:  |  Height:  |  Size: 495 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 250 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 221 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 229 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 588 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 540 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 861 B

Before After
Before After

View file

@ -38,25 +38,25 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
// fill color
opaque = false;
fillColor = "242 241 240";
fillColorHL ="228 228 235";
fillColorSEL = "98 100 137";
fillColorNA = "255 255 255 ";
fillColor = "48 48 48";
fillColorHL = "91 101 116";
fillColorSEL = "91 101 116";
fillColorNA = "255 0 255 ";
// border color
border = 0;
borderColor = "100 100 100";
borderColorHL = "50 50 50 50";
borderColorNA = "75 75 75";
borderColor = "34 34 34";
borderColorHL = "91 101 116";
borderColorNA = "32 32 32";
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontCharset = ANSI;
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fontColorNA = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "215 215 215";
fontColorSEL= "255 255 255";
// bitmap information
@ -71,7 +71,7 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
autoSizeHeight = false;
returnTab = false;
numbersOnly = false;
cursorColor = "0 0 0 255";
cursorColor = "215 215 215 255";
// sounds
//soundButtonDown = "";
@ -118,15 +118,15 @@ if( !isObject( ToolsGuiToolTipProfile ) )
new GuiControlProfile (ToolsGuiToolTipProfile)
{
// fill color
fillColor = "239 237 222";
fillColor = "255 255 255";
// border color
borderColor = "138 134 122";
borderColor = "0 0 0";
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "0 0 0";
fontColor = "24 24 24";
category = "Tools";
};
@ -141,7 +141,7 @@ new GuiControlProfile( ToolsGuiModelessDialogProfile )
if( !isObject( ToolsGuiFrameSetProfile ) )
new GuiControlProfile (ToolsGuiFrameSetProfile)
{
fillcolor = "255 255 255";
fillColor = "48 48 48";
borderColor = "246 245 244";
border = 1;
opaque = true;
@ -153,17 +153,17 @@ if( !isObject( ToolsGuiWindowProfile ) )
new GuiControlProfile (ToolsGuiWindowProfile)
{
opaque = false;
border = 2;
fillColor = "242 241 240";
fillColorHL = "221 221 221";
fillColorNA = "200 200 200";
fontColor = "50 50 50";
fontColorHL = "0 0 0";
border = 1;
fillColor = "48 48 48";
fillColorHL = "42 42 42";
fillColorNA = "42 42 42";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
bevelColorHL = "255 255 255";
bevelColorLL = "0 0 0";
text = "untitled";
bitmap = "./images/window";
textOffset = "8 4";
textOffset = "10 4";
hasBitmapArray = true;
justify = "left";
category = "Tools";
@ -187,15 +187,15 @@ if( !isObject( ToolsGuiTextProfile ) )
new GuiControlProfile (ToolsGuiTextProfile)
{
justify = "left";
fontColor = "20 20 20";
fontColor = "185 185 185";
category = "Tools";
};
if( !isObject( ToolsGuiTextBoldCenterProfile ) )
new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile)
{
fontColor = "50 50 50";
fontType = "Arial Bold";
fontColor = "165 165 165";
fontType = "Noto Sans Bold";
fontSize = 16;
justify = "center";
category = "Tools";
@ -225,7 +225,7 @@ new GuiControlProfile (ToolsGuiInspectorTitleTextProfile)
if( !isObject( ToolsGuiAutoSizeTextProfile ) )
new GuiControlProfile (ToolsGuiAutoSizeTextProfile)
{
fontColor = "0 0 0";
fontColor = "215 215 215";
autoSizeWidth = true;
autoSizeHeight = true;
category = "Tools";
@ -245,10 +245,10 @@ new GuiControlProfile( ToolsGuiMLTextProfile )
if( !isObject( ToolsGuiTextArrayProfile ) )
new GuiControlProfile( ToolsGuiTextArrayProfile : ToolsGuiTextProfile )
{
fontColor = "50 50 50";
fontColorHL = " 0 0 0";
fontColorSEL = "0 0 0";
fillColor ="200 200 200";
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorSEL = "215 215 215";
fillColor = "200 200 200";
fillColorHL = "228 228 235";
fillColorSEL = "200 200 200";
border = false;
@ -272,10 +272,10 @@ new GuiControlProfile( ToolsGuiTextEditProfile )
border = -2; // fix to display textEdit img
//borderWidth = "1"; // fix to display textEdit img
//borderColor = "100 100 100";
fillColor = "242 241 240 0";
fillColorHL = "255 255 255";
fontColor = "0 0 0";
fontColorHL = "255 255 255";
fillColor = "42 42 42 0";
fillColorHL = "91 101 116";
fontColor = "215 215 215";
fontColorHL = "115 115 115";
fontColorSEL = "98 100 137";
fontColorNA = "200 200 200";
textOffset = "4 2";
@ -287,55 +287,6 @@ new GuiControlProfile( ToolsGuiTextEditProfile )
category = "Tools";
};
if( !isObject( ToolsGuiTextEditErrorProfile ) )
new GuiControlProfile( ToolsGuiTextEditErrorProfile )
{
opaque = true;
bitmap = "./images/textEditFrame";
hasBitmapArray = true;
border = -2; // fix to display textEdit img
//borderWidth = "1"; // fix to display textEdit img
//borderColor = "100 100 100";
fillColor = "242 241 240 0";
fillColorHL = "255 255 255";
fontColor = "0 0 0";
fontColorHL = "255 0 0";
fontColorSEL = "98 100 137";
fontColorNA = "200 200 200";
textOffset = "4 2";
autoSizeWidth = false;
autoSizeHeight = true;
justify = "left";
tab = true;
canKeyFocus = true;
category = "Tools";
};
if( !isObject( ToolsGuiTextEditCenterProfile ) )
new GuiControlProfile (ToolsGuiTextEditCenterProfile)
{
opaque = true;
//bitmap = "./images/textEditFrame";
//hasBitmapArray = true;
border = -2; // fix to display textEdit img
//borderWidth = "1"; // fix to display textEdit img
//borderColor = "100 100 100";
fillColor = "255 255 255 0";
fillColorHL = "72 72 72";
fillColorSEL = "255 255 255";
fontColor = "196 196 196 255";
fontColorHL = "255 255 255";
fontColorSEL = "0 0 0";
fontColorNA = "196 196 196 255";
textOffset = "4 2";
autoSizeWidth = false;
autoSizeHeight = true;
justify = "center";
tab = true;
canKeyFocus = true;
category = "Tools";
};
if( !isObject( ToolsGuiNumericTextEditProfile ) )
new GuiControlProfile( ToolsGuiNumericTextEditProfile : ToolsGuiTextEditProfile )
{
@ -363,8 +314,8 @@ if( !isObject( ToolsGuiProgressTextProfile ) )
new GuiControlProfile( ToolsGuiProgressTextProfile )
{
fontSize = "14";
fontType = "Arial";
fontColor = "0 0 0";
fontType = "Noto Sans";
fontColor = "215 215 215";
justify = "center";
category = "Tools";
};
@ -374,8 +325,8 @@ new GuiControlProfile( ToolsGuiButtonProfile )
{
opaque = true;
border = true;
fontColor = "50 50 50";
fontColorHL = "0 0 0";
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorNA = "200 200 200";
fixedExtent = false;
justify = "center";
@ -397,8 +348,8 @@ new GuiControlProfile( ToolsGuiIconButtonProfile )
{
opaque = true;
border = true;
fontColor = "50 50 50";
fontColorHL = "0 0 0";
fontColor = "165 165 165";
fontColorHL = "215 215 215";
fontColorNA = "200 200 200";
fixedExtent = false;
justify = "center";
@ -420,10 +371,12 @@ new GuiControlProfile(ToolsGuiEditorTabPage)
{
opaque = true;
border = false;
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
fixedExtent = false;
justify = "center";
justify = "left";
canKeyFocus = false;
bitmap = "./images/tab";
hasBitmapArray = true;
@ -438,7 +391,7 @@ new GuiControlProfile( ToolsGuiCheckBoxProfile )
border = false;
borderColor = "100 100 100";
fontSize = 14;
fontColor = "20 20 20";
fontColor = "185 185 185";
fontColorHL = "80 80 80";
fontColorNA = "200 200 200";
fixedExtent = true;
@ -473,7 +426,7 @@ new GuiControlProfile( ToolsGuiRadioProfile )
{
fontSize = 14;
fillColor = "232 232 232";
fontColor = "20 20 20";
fontColor = "185 185 185";
fontColorHL = "80 80 80";
fixedExtent = true;
bitmap = "./images/radioButton";
@ -485,9 +438,10 @@ if( !isObject( ToolsGuiScrollProfile ) )
new GuiControlProfile( ToolsGuiScrollProfile )
{
opaque = true;
fillcolor = "255 255 255";
fontColor = "0 0 0";
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "150 150 150";
borderColor = "34 34 34";
border = true;
bitmap = "./images/scrollBar";
hasBitmapArray = true;
@ -498,10 +452,10 @@ if( !isObject( ToolsGuiOverlayProfile ) )
new GuiControlProfile( ToolsGuiOverlayProfile )
{
opaque = true;
fillcolor = "255 255 255";
fontColor = "0 0 0";
fillColor = "48 48 48";
fontColor = "215 215 215";
fontColorHL = "255 255 255";
fillColor = "0 0 0 100";
fillColor = "0 0 0 100";
category = "Tools";
};
@ -524,8 +478,8 @@ new GuiControlProfile( ToolsGuiPopupMenuItemBorder : ToolsGuiButtonProfile )
{
opaque = true;
border = true;
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "255 255 255";
fixedExtent = false;
justify = "center";
@ -546,12 +500,12 @@ new GuiControlProfile( ToolsGuiPopUpMenuDefault : ToolsGuiDefaultProfile )
bitmap = "./images/scrollbar";
hasBitmapArray = true;
profileForChildren = ToolsGuiPopupMenuItemBorder;
fillColor = "242 241 240 ";//"255 255 255";//100
fillColorHL = "228 228 235 ";//"204 203 202";
fillColorSEL = "98 100 137 ";//"204 203 202";
fillColor = "48 48 48";//"255 255 255";//100
fillColorHL = "228 228 235 ";//"91 101 116";
fillColorSEL = "98 100 137 ";//"91 101 116";
// font color is black
fontColorHL = "0 0 0 ";//"0 0 0";
fontColorSEL = "255 255 255";//"0 0 0";
fontColorHL = "215 215 215 ";//"215 215 215";
fontColorSEL = "255 255 255";//"215 215 215";
borderColor = "100 100 100";
category = "Tools";
};
@ -604,18 +558,18 @@ new GuiControlProfile( ToolsGuiTabBookProfile )
{
fillColorHL = "100 100 100";
fillColorNA = "150 150 150";
fontColor = "30 30 30";
fontColorHL = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "215 215 215";
fontColorNA = "50 50 50";
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
justify = "center";
bitmap = "./images/tab";
tabWidth = 64;
tabHeight = 24;
tabWidth = 65;
tabHeight = 25;
tabPosition = "Top";
tabRotation = "Horizontal";
textOffset = "0 -3";
textOffset = "10 0";
tab = true;
cankeyfocus = true;
category = "Tools";
@ -631,7 +585,7 @@ new GuiControlProfile( ToolsGuiTabBookNoBitmapProfile : ToolsGuiTabBookProfile )
if( !isObject( ToolsGuiTabPageProfile ) )
new GuiControlProfile( ToolsGuiTabPageProfile : ToolsGuiDefaultProfile )
{
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 10;
justify = "center";
bitmap = "./images/tab";
@ -646,16 +600,16 @@ new GuiControlProfile( ToolsGuiTreeViewProfile )
bitmap = "./images/treeView";
autoSizeHeight = true;
canKeyFocus = true;
fillColor = "255 255 255";
fillColorHL = "228 228 235";
fillColorSEL = "98 100 137";
fillColorNA = "255 255 255";
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fontColorSEL= "255 255 255";
fontColorNA = "200 200 200";
borderColor = "128 000 000";
borderColorHL = "255 228 235";
fillColor = "48 48 48";
fillColorHL = "116 116 116";
fillColorSEL = "91 101 116";
fillColorNA = "40 40 40";
fontColor = "215 215 215";
fontColorHL = "240 240 240";
fontColorSEL= "240 240 240";
fontColorNA = "150 150 150";
borderColor = "34 34 34";
borderColorHL = "34 34 34";
fontSize = 14;
opaque = false;
border = false;
@ -672,7 +626,7 @@ new GuiControlProfile( ToolsGuiTextPadProfile )
// Deviate from the Default
opaque=true;
fillColor = "255 255 255";
fillColor = "48 48 48";
border = 0;
category = "Tools";
};
@ -697,9 +651,9 @@ singleton GuiControlProfile( GuiEditorClassProfile )
opaque = true;
fillColor = "232 232 232";
border = 1;
borderColor = "40 40 40 140";
borderColor = "42 42 42 140";
borderColorHL = "127 127 127";
fontColor = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "50 50 50";
fixedExtent = true;
justify = "center";
@ -714,9 +668,9 @@ singleton GuiControlProfile( GuiBackFillProfile )
fillColor = "0 94 94";
border = true;
borderColor = "255 128 128";
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 12;
fontColor = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "50 50 50";
fixedExtent = true;
justify = "center";
@ -726,12 +680,12 @@ singleton GuiControlProfile( GuiBackFillProfile )
singleton GuiControlProfile( GuiControlListPopupProfile )
{
opaque = true;
fillColor = "255 255 255";
fillColorHL = "204 203 202";
fillColor = "48 48 48";
fillColorHL = "91 101 116";
border = false;
//borderColor = "0 0 0";
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "240 240 240";
fontColorNA = "50 50 50";
textOffset = "0 2";
autoSizeWidth = false;
@ -771,7 +725,7 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile )
// Transparent Background
opaque = true;
fillColor = "0 0 0 0";
fillColorHL = "255 255 255";
fillColorHL = "91 101 116";
// No Border (Rendered by field control)
border = false;
@ -780,12 +734,12 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile )
canKeyFocus = true;
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "0 0 0";
fontColorSEL = "43 107 206";
fontColorHL = "244 244 244";
fontColor = "215 215 215";
fontColorSEL = "0 140 220";
fontColorHL = "240 240 240";
fontColorNA = "100 100 100";
category = "Editor";
};
@ -802,11 +756,11 @@ singleton GuiControlProfile( GuiInspectorTextEditRightProfile : GuiInspectorText
singleton GuiControlProfile( GuiInspectorGroupProfile )
{
fontType = "Arial";
fontType = "Noto Sans";
fontSize = "14";
fontColor = "0 0 0 150";
fontColorHL = "25 25 25 220";
fontColor = "215 215 215 150";
fontColorHL = "215 215 215 220";
fontColorNA = "128 128 128";
justify = "left";
@ -824,8 +778,8 @@ singleton GuiControlProfile( GuiInspectorFieldProfile)
{
// fill color
opaque = false;
fillColor = "255 255 255";
fillColorHL = "204 203 202";
fillColor = "48 48 48";
fillColorHL = "91 101 116";
fillColorNA = "244 244 244";
// border color
@ -838,11 +792,11 @@ singleton GuiControlProfile( GuiInspectorFieldProfile)
//bevelColorLL = "0 0 0";
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "32 32 32";
fontColorHL = "50 50 50";
fontColor = "240 240 240";
fontColorHL = "240 240 240";
fontColorNA = "190 190 190";
textOffset = "10 0";
@ -870,7 +824,7 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField
// Transparent Background
opaque = true;
fillColor = "0 0 0 0";
fillColorHL = "255 255 255";
fillColorHL = "91 101 116";
// No Border (Rendered by field control)
border = false;
@ -879,21 +833,25 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField
canKeyFocus = true;
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "0 0 0";
fontColorSEL = "43 107 206";
fontColorHL = "244 244 244";
fontColor = "215 215 215";
fontColorSEL = "0 140 220";
fontColorHL = "240 240 240";
fontColorNA = "100 100 100";
category = "Editor";
};
singleton GuiControlProfile( GuiRolloutProfile )
{
border = 1;
border = 0;
borderColor = "200 200 200";
fontColor = "240 240 240";
fontColorHL = "240 240 240";
fontColorNA = "190 190 190";
hasBitmapArray = true;
bitmap = "tools/editorClasses/gui/images/rollout";
@ -904,12 +862,12 @@ singleton GuiControlProfile( GuiRolloutProfile )
singleton GuiControlProfile( GuiInspectorRolloutProfile0 )
{
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "32 32 32";
fontColorHL = "32 100 100";
fontColorNA = "0 0 0";
fontColorNA = "215 215 215";
justify = "left";
opaque = false;
@ -935,7 +893,7 @@ singleton GuiControlProfile( GuiInspectorStackProfile )
singleton GuiControlProfile( GuiInspectorProfile : GuiInspectorFieldProfile )
{
opaque = true;
fillColor = "255 255 255 255";
fillColor = "42 42 42 255";
border = 0;
cankeyfocus = true;
tab = true;
@ -944,7 +902,7 @@ singleton GuiControlProfile( GuiInspectorProfile : GuiInspectorFieldProfile )
singleton GuiControlProfile( GuiInspectorInfoProfile : GuiInspectorFieldProfile )
{
opaque = true;
fillColor = "242 241 240";
fillColor = "48 48 48";
border = 0;
cankeyfocus = true;
tab = true;
@ -971,18 +929,18 @@ singleton GuiControlProfile( GuiInspectorTypeFileNameProfile )
canKeyFocus = true;
// font
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
// Center text
justify = "center";
fontColor = "32 32 32";
fontColorHL = "50 50 50";
fontColorNA = "0 0 0";
fontColor = "240 240 240";
fontColorHL = "240 240 240";
fontColorNA = "215 215 215";
fillColor = "255 255 255";
fillColorHL = "204 203 202";
fillColor = "48 48 48";
fillColorHL = "91 101 116";
fillColorNA = "244 244 244";
borderColor = "190 190 190";
@ -1023,7 +981,7 @@ singleton GuiControlProfile( InspectorTypeCheckboxProfile : GuiInspectorFieldPro
singleton GuiControlProfile( GuiToolboxButtonProfile : ToolsGuiButtonProfile )
{
justify = "center";
fontColor = "0 0 0";
fontColor = "215 215 215";
border = 0;
textOffset = "0 0";
category = "Editor";
@ -1031,22 +989,22 @@ singleton GuiControlProfile( GuiToolboxButtonProfile : ToolsGuiButtonProfile )
singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile )
{
fontColor = "40 40 40";
fontColor = "240 240 240";
fontColorSEL= "250 250 250 175";
fillColorHL = "0 60 150";
fontColorNA = "240 240 240";
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
category = "Editor";
};
singleton GuiControlProfile( GuiDirectoryFileListProfile )
{
fontColor = "40 40 40";
fontColor = "240 240 240";
fontColorSEL= "250 250 250 175";
fillColorHL = "0 60 150";
fontColorNA = "240 240 240";
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
category = "Editor";
};
@ -1095,10 +1053,10 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
//tab = true;
//canKeyFocus = true;
fontType = "Arial";
fontType = "Noto Sans";
fontSize = 14;
fontColor = "0 0 0";
fontColor = "215 215 215";
fontColorSEL = "43 107 206";
fontColorHL = "244 244 244";
fontColorNA = "100 100 100";
@ -1115,16 +1073,12 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
singleton GuiControlProfile( GuiMenuBarProfile )
{
fillcolor = "255 255 255";
fillcolorHL = "213 231 248";
fontColorNA = "180 180 180";
border = 1;
fillColor = "48 48 48";
fillcolorHL = "42 42 42";
borderColor = "30 30 30 255";
borderColorHL = "30 30 30 255";
border = 0;
borderThickness = 1;
borderColor = "128 128 128";
borderColorHL = "122 177 232";
opaque = true;
mouseOverSelected = true;
category = "Editor";

View file

@ -1,82 +1,82 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<EditorSettings>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
</Group>
<Group name="WorldEditor">
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="undoLimit">40</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="displayType">6</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="undoLimit">40</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Group name="Render">
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
</Group>
<Group name="Images">
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
</Group>
<Group name="Color">
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
</Group>
<Group name="Grid">
<Setting name="gridColor">102 102 102 100</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
</Group>
<Group name="Tools">
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="snapSoft">0</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIconsStartDist">8</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
</Group>
<Group name="Color">
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="objectTextColor">White</Setting>
</Group>
<Group name="Render">
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderObjText">1</Setting>
</Group>
<Group name="Images">
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
</Group>
<Group name="Grid">
<Setting name="gridSize">1</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridMinorColor">51 51 51 100</Setting>
</Group>
<Group name="Tools">
<Setting name="snapSoftSize">2</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="snapSoft">0</Setting>
</Group>
<Group name="Docs">
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
</Group>
<Group name="AxisGizmo">
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Group name="Grid">
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="planeDim">500</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="snapToGrid">0</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="planeDim">500</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="snapToGrid">0</Setting>
</Group>
</Group>
<Group name="LevelInformation">

View file

@ -317,7 +317,7 @@
HorizSizing = "width";
VertSizing = "top";
Position = "0 578";
Extent = "800 22";
Extent = "800 35";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
@ -331,14 +331,12 @@
Profile = "ToolsGuiTextProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "3 2";
Position = "10 8";
Extent = "450 18";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
@ -352,7 +350,7 @@
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "459 2";
position = "465 8";
Extent = "2 18";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
@ -365,7 +363,7 @@
Profile = "ToolsGuiTextProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "469 2";
Position = "485 8";
Extent = "180 18";
MinExtent = "8 8";
canSave = "1";
@ -377,7 +375,7 @@
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "";
text = "Ready.";
maxLength = "255";
};
@ -386,7 +384,7 @@
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "659 2";
position = "645 8";
Extent = "2 18";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
@ -399,7 +397,7 @@
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "667 2";
Position = "665 8";
Extent = "120 18";
MinExtent = "8 8";
canSave = "1";

View file

@ -19,16 +19,16 @@
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiWindowProfile";
Position = getWord($pref::Video::mode, 0) - 209 SPC
getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) - 2;
Extent = "210 373";
MinExtent = "210 140";
Position = getWord($pref::Video::mode, 0) - 330 SPC
getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) + 40;
Extent = "300 250";
MinExtent = "200 150";
HorizSizing = "windowRelative";
VertSizing = "windowRelative";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "8 8 8 8";
Margin = "5 5 5 5";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
@ -52,7 +52,7 @@
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";
VertSizing = "height";
Position = "4 24";
Position = "5 24";
Extent = "202 304";
MinExtent = "64 64";
canSave = "1";
@ -60,7 +60,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Docking = "client";
Margin = "3 41 3 3";
Margin = "0 43 0 5";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
@ -74,8 +74,8 @@
Profile = "GuiEditorScrollProfile";
HorizSizing = "width";
VertSizing = "height";
Position = "0 0";
Extent = "202 304";
Position = "5 5";
Extent = "187 238";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
@ -90,7 +90,7 @@
AnchorRight = "0";
willFirstRespond = "1";
hScrollBar = "alwaysOff";
vScrollBar = "dynamic";
vScrollBar = "alwaysOn";
lockHorizScroll = "true";
lockVertScroll = "false";
constantThumbHeight = "0";
@ -126,14 +126,14 @@
Profile = "GuiInspectorFieldInfoMLTextProfile";
HorizSizing = "width";
VertSizing = "top";
Position = "1 328";
Extent = "205 14";
Position = "6 205";
Extent = "197 35";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
lineSpacing = "2";
lineSpacing = "3";
allowColorChars = "0";
maxChars = "-1";
useURLMouseCursor = "0";

View file

@ -19,16 +19,16 @@
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiWindowProfile";
Position = firstWord($pref::Video::mode) - 209
SPC getWord(EditorGuiToolbar.extent, 1) -1;
Extent = "210 324";
MinExtent = "210 140";
Position = firstWord($pref::Video::mode) - 330
SPC getWord(EditorGuiToolbar.extent, 1) + 40;
Extent = "300 270";
MinExtent = "200 250";
HorizSizing = "windowRelative";
VertSizing = "windowRelative";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "8 8 8 8";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
@ -38,7 +38,7 @@
resizeHeight = "1";
canMove = "1";
canClose = "0";
canMinimize = "0";
canMinimize = "1";
canMaximize = "0";
minSize = "50 50";
closeCommand = "EWTreeWindow.setVisible(false);";
@ -58,7 +58,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "3 2 3 3";
Margin = "0 0 0 0";
Docking = "client";
Padding = "0 0 0 0";
AnchorTop = "1";
@ -67,7 +67,7 @@
AnchorRight = "0";
TabPosition = "Top";
TabMargin = "0";
MinTabWidth = "64";
MinTabWidth = "65";
new GuiTabPageCtrl() {
canSaveDynamicFields = "0";
@ -92,8 +92,8 @@
maxLength = "1024";
new GuiTextEditCtrl( EditorTreeFilter ) {
position = "2 4";
extent = "175 18";
position = "5 6";
extent = "187 25";
profile = "ToolsGuiTextEditProfile";
horizSizing = "width";
vertSizing = "bottom";
@ -110,7 +110,7 @@
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "180 5";
position = "171 6";
Extent = "17 17";
MinExtent = "8 2";
canSave = "1";
@ -129,15 +129,15 @@
Profile = "ToolsGuiScrollProfile";
HorizSizing = "width";
VertSizing = "height";
Position = "0 25";
Extent = "197 246";
Position = "5 29";
Extent = "187 238";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
willFirstRespond = "1";
hScrollBar = "dynamic";
vScrollBar = "dynamic";
vScrollBar = "alwaysOn";
lockHorizScroll = "false";
lockVertScroll = "false";
constantThumbHeight = "0";
@ -148,18 +148,18 @@
Enabled = "1";
isContainer = "1";
Profile = "ToolsGuiTreeViewProfile";
HorizSizing = "right";
HorizSizing = "width";
VertSizing = "bottom";
Position = "1 1";
Extent = "193 21";
Position = "0 0";
Extent = "197 25";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
hovertime = "1000";
tabSize = "16";
textOffset = "2";
fullRowSelect = "0";
itemHeight = "21";
textOffset = "5";
fullRowSelect = "1";
itemHeight = "25";
destroyTreeOnSleep = "1";
MouseDragging = "1";
MultipleSelections = "1";
@ -219,7 +219,7 @@
Profile = "ToolsGuiTabBorderProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "0 0";
position = "5 5";
Extent = "198 271";
MinExtent = "8 2";
canSave = "0";
@ -255,7 +255,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "4 4 4 4";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
@ -387,8 +387,8 @@
Profile = "ToolsGuiTabBookProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "6 4";
Extent = "198 21";
Position = "0 4";
Extent = "201 25";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
@ -402,7 +402,7 @@
AnchorLeft = "1";
AnchorRight = "0";
TabPosition = "Top";
TabMargin = "4";
TabMargin = "0";
MinTabWidth = "49";
new GuiTabPageCtrl() {
@ -509,7 +509,7 @@
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "157 26";
Position = "225 23";
Extent = "16 16";
MinExtent = "8 2";
canSave = "1";
@ -533,7 +533,7 @@
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "173 26";
Position = "250 23";
Extent = "16 16";
MinExtent = "8 2";
canSave = "1";
@ -557,7 +557,7 @@
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "189 26";
Position = "275 23";
Extent = "16 16";
MinExtent = "8 2";
canSave = "1";

View file

@ -877,24 +877,6 @@ function ObjectBuilderGui::buildParticleSimulation(%this)
%this.process();
}
function ObjectBuilderGui::buildReflectionProbe(%this)
{
%this.objectClassName = "ReflectionProbe";
%this.process();
%defaultPath = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/";
%this.addField("reflectionPath", "TypeFilepath", "reflectionPath", %defaultPath);
}
function ObjectBuilderGui::buildSkylight(%this)
{
%this.objectClassName = "Skylight";
%this.process();
%defaultPath = filePath($Server::MissionFile) @ "/" @ fileBase($Server::MissionFile) @ "/probes/";
%this.addField("reflectionPath", "TypeFilepath", "reflectionPath", %defaultPath);
}
//------------------------------------------------------------------------------
// Mission
//------------------------------------------------------------------------------

View file

@ -35,8 +35,8 @@ singleton GuiControlProfile (EditorToolButtonProfile)
singleton GuiControlProfile (EditorTextProfile)
{
fontType = "Arial Bold";
fontColor = "0 0 0";
fontType = "Noto Sans Bold";
fontColor = "215 215 215";
autoSizeWidth = true;
autoSizeHeight = true;
category = "Editor";
@ -44,7 +44,7 @@ singleton GuiControlProfile (EditorTextProfile)
singleton GuiControlProfile (EditorTextProfileWhite)
{
fontType = "Arial Bold";
fontType = "Noto Sans Bold";
fontColor = "255 255 255";
autoSizeWidth = true;
autoSizeHeight = true;
@ -76,7 +76,7 @@ singleton GuiControlProfile (GuiEditorClassProfile)
border = true;
borderColor = "0 0 0";
borderColorHL = "127 127 127";
fontColor = "0 0 0";
fontColor = "215 215 215";
fontColorHL = "50 50 50";
fixedExtent = true;
justify = "center";
@ -108,7 +108,7 @@ singleton GuiControlProfile( EPainterBorderButtonProfile : ToolsGuiDefaultProfil
singleton GuiControlProfile( EPainterDragDropProfile )
{
justify = "center";
fontColor = "0 0 0";
fontColor = "215 215 215";
border = 0;
textOffset = "0 0";
opaque = true;

View file

@ -44,7 +44,6 @@ function initializeWorldEditor()
exec("./gui/SelectObjectsWindow.ed.gui");
exec("./gui/ProceduralTerrainPainterGui.gui" );
exec("./gui/shadowViz.gui" );
exec("./gui/probeBakeDlg.gui" );
// Load Scripts.
exec("./scripts/menus.ed.cs");
@ -67,7 +66,6 @@ function initializeWorldEditor()
exec("./scripts/cameraCommands.ed.cs");
exec("./scripts/lightViz.cs");
exec("./scripts/shadowViz.cs");
exec("./scripts/probeBake.ed.cs");
// Load Custom Editors
loadDirectory(expandFilename("./scripts/editors"));
@ -122,24 +120,16 @@ function initializeWorldEditor()
EVisibility.addOption( "Debug Render: Light Frustums", "$Light::renderLightFrustums", "" );
EVisibility.addOption( "Debug Render: Bounding Boxes", "$Scene::renderBoundingBoxes", "" );
EVisibility.addOption( "Debug Render: Physics World", "$PhysicsWorld::render", "togglePhysicsDebugViz" );
EVisibility.addOption( "Debug Render: Reflection Probes", "$Light::renderReflectionProbes", "" );
EVisibility.addOption( "Debug Render: Probe Previews", "$Light::renderPreviewProbes", "" );
EVisibility.addOption( "AL: Disable Shadows", "$Shadows::disable", "" );
EVisibility.addOption( "AL: Diffuse Lighting Viz", "$AL_LightColorVisualizeVar", "toggleLightColorViz" );
EVisibility.addOption( "AL: Specular Lighting Viz", "$AL_LightSpecularVisualizeVar", "toggleLightSpecularViz" );
EVisibility.addOption( "AL: Light Color Viz", "$AL_LightColorVisualizeVar", "toggleLightColorViz" );
EVisibility.addOption( "AL: Light Specular Viz", "$AL_LightSpecularVisualizeVar", "toggleLightSpecularViz" );
EVisibility.addOption( "AL: Normals Viz", "$AL_NormalsVisualizeVar", "toggleNormalsViz" );
EVisibility.addOption( "AL: Depth Viz", "$AL_DepthVisualizeVar", "toggleDepthViz" );
EVisibility.addOption( "AL: Color Buffer", "$AL_ColorBufferShaderVar", "toggleColorBufferViz" );
EVisibility.addOption( "AL: Spec Map(Rough)", "$AL_RoughMapShaderVar", "toggleRoughMapViz");
EVisibility.addOption( "AL: Spec Map(Metal)", "$AL_MetalMapShaderVar", "toggleMetalMapViz");
EVisibility.addOption( "AL: Spec Map", "$AL_SpecMapShaderVar", "toggleSpecMapViz");
EVisibility.addOption( "AL: Backbuffer", "$AL_BackbufferVisualizeVar", "toggleBackbufferViz" );
EVisibility.addOption( "AL: Glow Buffer", "$AL_GlowVisualizeVar", "toggleGlowViz" );
EVisibility.addOption( "AL: PSSM Cascade Viz", "$AL::PSSMDebugRender", "" );
EVisibility.addOption( "Probes: Attenuation", "$Probes::showAttenuation", "" );
EVisibility.addOption( "Probes: Specular Cubemaps", "$Probes::showSpecularCubemaps", "" );
EVisibility.addOption( "Probes: Diffuse Cubemaps", "$Probes::showDiffuseCubemaps", "" );
EVisibility.addOption( "Probes: Contribution", "$Probes::showProbeContrib", "" );
EVisibility.addOption( "Frustum Lock", "$Scene::lockCull", "" );
EVisibility.addOption( "Disable Zone Culling", "$Scene::disableZoneCulling", "" );
EVisibility.addOption( "Disable Terrain Occlusion", "$Scene::disableTerrainOcclusion", "" );

View file

@ -55,11 +55,6 @@ function EWCreatorWindow::init( %this )
%this.registerMissionObject( "PointLight", "Point Light" );
%this.registerMissionObject( "SpotLight", "Spot Light" );
%this.registerMissionObject( "BoxEnvironmentProbe", "Box Environment Probe" );
%this.registerMissionObject( "SphereEnvironmentProbe", "Sphere Environment Probe" );
%this.registerMissionObject( "Skylight", "Skylight" );
%this.registerMissionObject( "GroundCover", "Ground Cover" );
%this.registerMissionObject( "TerrainBlock", "Terrain Block" );
%this.registerMissionObject( "GroundPlane", "Ground Plane" );

View file

@ -294,28 +294,6 @@ function TerrainMaterialDlg::changeNormal( %this )
//-----------------------------------------------------------------------------
function TerrainMaterialDlg::changecomposite( %this )
{
%ctrl = %this-->compositeTexCtrl;
%file = %ctrl.bitmap;
if( getSubStr( %file, 0 , 6 ) $= "tools/" )
%file = "";
%file = TerrainMaterialDlg._selectTextureFileDialog( %file );
if( %file $= "" )
{
if( %ctrl.bitmap !$= "" )
%file = %ctrl.bitmap;
else
%file = "tools/materialEditor/gui/unknownImage";
}
%file = makeRelativePath( %file, getMainDotCsDir() );
%ctrl.setBitmap( %file );
}
//-----------------------------------------------------------------------------
function TerrainMaterialDlg::newMat( %this )
{
// Create a unique material name.
@ -416,12 +394,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
%this-->normTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{
%this-->normTexCtrl.setBitmap( %mat.normalMap );
}
if (%mat.compositeMap $= ""){
%this-->compositeTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{
%this-->compositeTexCtrl.setBitmap( %mat.compositeMap );
}
}
%this-->detSizeCtrl.setText( %mat.detailSize );
%this-->baseSizeCtrl.setText( %mat.diffuseSize );
%this-->detStrengthCtrl.setText( %mat.detailStrength );
@ -475,11 +448,6 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
}else{
%newMacro = %this-->macroTexCtrl.bitmap;
}
if (%this-->compositeTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
%newComposite = "";
}else{
%newComposite = %this-->compositeTexCtrl.bitmap;
}
%detailSize = %this-->detSizeCtrl.getText();
%diffuseSize = %this-->baseSizeCtrl.getText();
%detailStrength = %this-->detStrengthCtrl.getText();
@ -498,7 +466,6 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
%mat.diffuseMap $= %newDiffuse &&
%mat.normalMap $= %newNormal &&
%mat.detailMap $= %newDetail &&
%mat.compositeMap $= %newComposite &&
%mat.macroMap $= %newMacro &&
%mat.detailSize == %detailSize &&
%mat.diffuseSize == %diffuseSize &&
@ -530,8 +497,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
}
%mat.diffuseMap = %newDiffuse;
%mat.normalMap = %newNormal;
%mat.compositeMap = %newComposite;
%mat.normalMap = %newNormal;
%mat.detailMap = %newDetail;
%mat.macroMap = %newMacro;
%mat.detailSize = %detailSize;
@ -578,7 +544,6 @@ function TerrainMaterialDlg::snapshotMaterials( %this )
diffuseMap = %mat.diffuseMap;
normalMap = %mat.normalMap;
detailMap = %mat.detailMap;
compositeMap = %mat.compositeMap;
macroMap = %mat.macroMap;
detailSize = %mat.detailSize;
diffuseSize = %mat.diffuseSize;
@ -613,7 +578,6 @@ function TerrainMaterialDlg::restoreMaterials( %this )
%mat.diffuseMap = %obj.diffuseMap;
%mat.normalMap = %obj.normalMap;
%mat.detailMap = %obj.detailMap;
%mat.compositeMap = %obj.compositeMap;
%mat.macroMap = %obj.macroMap;
%mat.detailSize = %obj.detailSize;
%mat.diffuseSize = %obj.diffuseSize;

View file

@ -61,109 +61,39 @@ function toggleColorBufferViz( %enable )
}
}
//roughness map display (matinfo.b)
new ShaderData( AL_RoughMapShader )
new ShaderData( AL_SpecMapShader )
{
DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl";
DXPixelShaderFile = "shaders/common/lighting/advanced/dbgRoughMapVisualizeP.hlsl";
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
DXPixelShaderFile = "./shaders/dbgSpecMapVisualizeP.hlsl";
OGLVertexShaderFile = "shaders/common/postFx/gl/postFxV.glsl";
OGLPixelShaderFile = "shaders/common/lighting/advanced/gl/dbgRoughMapVisualizeP.glsl";
OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
OGLPixelShaderFile = "./shaders/dbgSpecMapVisualizeP.glsl";
samplerNames[0] = "matinfoTex";
pixVersion = 2.0;
};
singleton PostEffect( AL_RoughMapVisualize )
singleton PostEffect( AL_SpecMapVisualize )
{
shader = AL_RoughMapShader;
shader = AL_SpecMapShader;
stateBlock = AL_DefaultVisualizeState;
texture[0] = "#matinfo";
target = "$backBuffer";
renderPriority = 9999;
};
function toggleRoughMapViz( %enable )
/// Toggles the visualization of the AL lighting specular power buffer.
function toggleSpecMapViz( %enable )
{
if ( %enable $= "" )
{
$AL_RoughMapShaderVar = AL_RoughMapVisualize.isEnabled() ? false : true;
AL_RoughMapVisualize.toggle();
$AL_SpecMapShaderVar = AL_SpecMapVisualize.isEnabled() ? false : true;
AL_SpecMapVisualize.toggle();
}
else if ( %enable )
AL_RoughMapVisualize.enable();
AL_SpecMapVisualize.enable();
else if ( !%enable )
AL_RoughMapVisualize.disable();
}
//metalness map display (matinfo.a)
new ShaderData( AL_MetalMapShader )
{
DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl";
DXPixelShaderFile = "shaders/common/lighting/advanced/dbgMetalMapVisualizeP.hlsl";
OGLVertexShaderFile = "shaders/common/postFx/gl/postFxV.glsl";
OGLPixelShaderFile = "shaders/common/lighting/advanced/gl/dbgMetalMapVisualizeP.glsl";
samplerNames[0] = "matinfoTex";
pixVersion = 2.0;
};
singleton PostEffect( AL_MetalMapVisualize )
{
shader = AL_MetalMapShader;
stateBlock = AL_DefaultVisualizeState;
texture[0] = "#matinfo";
target = "$backBuffer";
renderPriority = 9999;
};
function toggleMetalMapViz( %enable )
{
if ( %enable $= "" )
{
$AL_MetalMapShaderVar = AL_MetalMapVisualize.isEnabled() ? false : true;
AL_MetalMapVisualize.toggle();
}
else if ( %enable )
AL_MetalMapVisualize.enable();
else if ( !%enable )
AL_MetalMapVisualize.disable();
}
//Light map display (indirectLighting)
new ShaderData( AL_LightMapShader )
{
DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl";
DXPixelShaderFile = "shaders/common/lighting/advanced/dbgLightMapVisualizeP.hlsl";
OGLVertexShaderFile = "shaders/common/postFx/gl/postFxV.glsl";
OGLPixelShaderFile = "shaders/common/lighting/advanced/gl/dbgLightMapVisualizeP.glsl";
samplerNames[0] = "specularLightingBuffer";
pixVersion = 2.0;
};
singleton PostEffect( AL_LightMapVisualize )
{
shader = AL_LightMapShader;
stateBlock = AL_DefaultVisualizeState;
texture[0] = "#specularLighting";
target = "$backBuffer";
renderPriority = 9999;
};
function toggleLightMapViz( %enable )
{
if ( %enable $= "" )
{
$AL_LightMapShaderVar = AL_LightMapVisualize.isEnabled() ? false : true;
AL_LightMapVisualize.toggle();
}
else if ( %enable )
AL_LightMapVisualize.enable();
else if ( !%enable )
AL_LightMapVisualize.disable();
AL_SpecMapVisualize.disable();
}
new GFXStateBlockData( AL_DepthVisualizeState )

View file

@ -61,8 +61,3 @@ function EditorLightingMenu::onMenuSelect( %this )
//%selSize = EWorldEditor.getSelectionSize();
%this.enableItem( 1, true /*%selSize == 1*/ );
}
function updateReflectionProbes()
{
Canvas.pushDialog(ProbeBakeDlg);
}

View file

@ -322,8 +322,6 @@ function EditorGui::buildMenus(%this)
item[0] = "Full Relight" TAB "Alt L" TAB "Editor.lightScene(\"\", forceAlways);";
item[1] = "Toggle ShadowViz" TAB "" TAB "toggleShadowViz();";
item[2] = "-";
item[3] = "Update Reflection Probes" TAB "" TAB "updateReflectionProbes();";
item[4] = "-";
// NOTE: The light managers will be inserted as the
// last menu items in EditorLightingMenu::onAdd().