mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 07:34:45 +00:00
Converts the ad-hoc design of the Material Editor to utilize the same inspector interface as most everything else does.
- Overhauls the material editor to simplify and streamline the logic behind it since the inspector does most of the work - Tweak a few order positions of materialdefinition fields to work better - Sets AO, Rough and Metal channel fields to use an enum type for human readability - Updates the MaterialPreview gui control to work with assetIds - MatEd now supports setting of parent material to inherit from - Creating a new material now can prompt selecting an existing material to inherit from - Can now edit the mapTo value of a material in the matEd - New standalone Composite Texture Editor window for convering AO, Roughness and Metalness maps in a material to an ORMMap - Can also star the creation of a composite texture via RMB context menu in AB on an image asset - Moved logic of CubemapEditor from MatEd to it's own stuff - Made ImageAsset fields now be more clear when they have nothing assigned, and also have a clear button to empty the field's value so it's consistent across the board - Reorganized the layout of the gui and image files for the MatEd to be easier to navigate - MaterialEditor now overlays the EditorGUI instead of being forcefully embedded in it, allowing easy editing of the MatEd Gui via the Gui editor
This commit is contained in:
JeffR
parent
8e93753b15
commit
f3cad0d77e
173 changed files with 3713 additions and 6977 deletions
437
Templates/BaseGame/game/tools/gui/compositeTextureEditor.gui
Normal file
437
Templates/BaseGame/game/tools/gui/compositeTextureEditor.gui
Normal file
|
|
@ -0,0 +1,437 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
$guiContent = new GuiControl(CompositeTextureEditor) {
|
||||
extent = "1920 1080";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
isContainer = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
enabled = "1";
|
||||
|
||||
new GuiWindowCtrl(CompositeTextureEditorWindow) {
|
||||
Text = "Composite Texture Editor";
|
||||
resizeWidth = "0";
|
||||
resizeHeight = "0";
|
||||
canMinimize = "0";
|
||||
canMaximize = "0";
|
||||
closeCommand = "Canvas.popDialog(CompositeTextureEditor);";
|
||||
position = "721 416";
|
||||
extent = "478 248";
|
||||
minExtent = "478 248";
|
||||
horizSizing = "center";
|
||||
vertSizing = "center";
|
||||
profile = "ToolsGuiWindowProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
||||
new GuiContainer(CompTextureEd_RedChan) {
|
||||
position = "11 39";
|
||||
extent = "107 174";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
className = "CompositeTextureSlotContainer";
|
||||
|
||||
new GuiTextCtrl() {
|
||||
Text = "Red Channel";
|
||||
position = "5 -2";
|
||||
extent = "100 15";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 20";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "InputMode";
|
||||
className = "CompositeTextureChannelMode";
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueContainer";
|
||||
|
||||
new GuiTextEditCtrl() {
|
||||
position = "0 8";
|
||||
extent = "28 20";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueTxtEdit";
|
||||
className = "CompositeTextureRawValueEdit";
|
||||
};
|
||||
new GuiSliderCtrl() {
|
||||
position = "38 9";
|
||||
extent = "68 19";
|
||||
profile = "GuiSliderProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueSlider";
|
||||
className = "CompositeTextureRawValueSlider";
|
||||
Command = "$thisControl.onDragComplete();";
|
||||
range = 0 SPC 1;
|
||||
ticks = 0.01;
|
||||
};
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "TextureContainer";
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
BitmapAsset = "ToolsModule:unknownImage_image";
|
||||
BitmapFile = "tools/materialEditor/images/unknownImage.png";
|
||||
position = "21 9";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "Bitmap";
|
||||
};
|
||||
new GuiBitmapButtonCtrl() {
|
||||
BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
|
||||
position = "21 9";
|
||||
extent = "64 64";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
command = "$CompTexSourceChannel = 0;AssetBrowser.showDialog(\"ImageAsset\", \"CompositeTextureEditor.setSourceTex\");";
|
||||
tooltipProfile = "ToolsGuiDefaultProfile";
|
||||
ToolTip = "Set the source of the texture for this channel to sample from when baking a composite.";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
Text = "Source Channel";
|
||||
position = "5 85";
|
||||
extent = "100 10";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 97";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "sourceChannel";
|
||||
className = "CompositeTextureTexSrcChannel";
|
||||
};
|
||||
};
|
||||
};
|
||||
new GuiContainer(CompTextureEd_GreenChan) {
|
||||
position = "129 39";
|
||||
extent = "107 174";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
className = "CompositeTextureSlotContainer";
|
||||
|
||||
new GuiTextCtrl() {
|
||||
Text = "Green Channel";
|
||||
position = "5 -2";
|
||||
extent = "100 15";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 20";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "InputMode";
|
||||
className = "CompositeTextureChannelMode";
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueContainer";
|
||||
|
||||
new GuiTextEditCtrl() {
|
||||
position = "0 8";
|
||||
extent = "28 20";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueTxtEdit";
|
||||
className = "CompositeTextureRawValueEdit";
|
||||
};
|
||||
new GuiSliderCtrl() {
|
||||
position = "38 9";
|
||||
extent = "68 19";
|
||||
profile = "GuiSliderProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueSlider";
|
||||
className = "CompositeTextureRawValueSlider";
|
||||
Command = "$thisControl.onDragComplete();";
|
||||
range = 0 SPC 1;
|
||||
ticks = 0.01;
|
||||
};
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "TextureContainer";
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
BitmapAsset = "ToolsModule:unknownImage_image";
|
||||
BitmapFile = "tools/materialEditor/images/unknownImage.png";
|
||||
position = "21 9";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "Bitmap";
|
||||
};
|
||||
new GuiBitmapButtonCtrl() {
|
||||
BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
|
||||
position = "21 9";
|
||||
extent = "64 64";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
command = "$CompTexSourceChannel = 1;AssetBrowser.showDialog(\"ImageAsset\", \"CompositeTextureEditor.setSourceTex\");";
|
||||
tooltipProfile = "ToolsGuiDefaultProfile";
|
||||
ToolTip = "Set the source of the texture for this channel to sample from when baking a composite.";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
Text = "Source Channel";
|
||||
position = "5 85";
|
||||
extent = "100 10";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 97";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "sourceChannel";
|
||||
className = "CompositeTextureTexSrcChannel";
|
||||
};
|
||||
};
|
||||
};
|
||||
new GuiContainer(CompTextureEd_BlueChan) {
|
||||
position = "247 39";
|
||||
extent = "107 174";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
className = "CompositeTextureSlotContainer";
|
||||
|
||||
new GuiTextCtrl() {
|
||||
Text = "Blue Channel";
|
||||
position = "5 -2";
|
||||
extent = "100 15";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 20";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "InputMode";
|
||||
className = "CompositeTextureChannelMode";
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueContainer";
|
||||
|
||||
new GuiTextEditCtrl() {
|
||||
position = "0 8";
|
||||
extent = "28 20";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueTxtEdit";
|
||||
className = "CompositeTextureRawValueEdit";
|
||||
};
|
||||
new GuiSliderCtrl() {
|
||||
position = "38 9";
|
||||
extent = "68 19";
|
||||
profile = "GuiSliderProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueSlider";
|
||||
className = "CompositeTextureRawValueSlider";
|
||||
Command = "$thisControl.onDragComplete();";
|
||||
range = 0 SPC 1;
|
||||
ticks = 0.01;
|
||||
};
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "TextureContainer";
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
BitmapAsset = "ToolsModule:unknownImage_image";
|
||||
BitmapFile = "tools/materialEditor/images/unknownImage.png";
|
||||
position = "21 9";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "Bitmap";
|
||||
};
|
||||
new GuiBitmapButtonCtrl() {
|
||||
BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
|
||||
position = "21 9";
|
||||
extent = "64 64";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
command = "$CompTexSourceChannel = 2;AssetBrowser.showDialog(\"ImageAsset\", \"CompositeTextureEditor.setSourceTex\");";
|
||||
tooltipProfile = "ToolsGuiDefaultProfile";
|
||||
ToolTip = "Set the source of the texture for this channel to sample from when baking a composite.";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
Text = "Source Channel";
|
||||
position = "5 85";
|
||||
extent = "100 10";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 97";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "sourceChannel";
|
||||
className = "CompositeTextureTexSrcChannel";
|
||||
};
|
||||
};
|
||||
};
|
||||
new GuiContainer(CompTextureEd_AlphaChan) {
|
||||
position = "361 39";
|
||||
extent = "107 174";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
className = "CompositeTextureSlotContainer";
|
||||
|
||||
new GuiTextCtrl() {
|
||||
Text = "Alpha Channel";
|
||||
position = "5 -2";
|
||||
extent = "100 15";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 20";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "InputMode";
|
||||
className = "CompositeTextureChannelMode";
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueContainer";
|
||||
|
||||
new GuiTextEditCtrl() {
|
||||
position = "0 8";
|
||||
extent = "28 20";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueTxtEdit";
|
||||
className = "CompositeTextureRawValueEdit";
|
||||
};
|
||||
new GuiSliderCtrl() {
|
||||
position = "38 9";
|
||||
extent = "68 19";
|
||||
profile = "GuiSliderProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "RawValueSlider";
|
||||
className = "CompositeTextureRawValueSlider";
|
||||
Command = "$thisControl.onDragComplete();";
|
||||
range = 0 SPC 1;
|
||||
ticks = 0.01;
|
||||
};
|
||||
};
|
||||
new GuiContainer() {
|
||||
position = "0 41";
|
||||
extent = "107 125";
|
||||
horizSizing = "width";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "TextureContainer";
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
BitmapAsset = "ToolsModule:unknownImage_image";
|
||||
BitmapFile = "tools/materialEditor/images/unknownImage.png";
|
||||
position = "21 9";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "Bitmap";
|
||||
};
|
||||
new GuiBitmapButtonCtrl() {
|
||||
BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
|
||||
position = "21 9";
|
||||
extent = "64 64";
|
||||
horizSizing = "center";
|
||||
profile = "ToolsGuiDefaultProfile";
|
||||
command = "$CompTexSourceChannel = 3;AssetBrowser.showDialog(\"ImageAsset\", \"CompositeTextureEditor.setSourceTex\");";
|
||||
tooltipProfile = "ToolsGuiDefaultProfile";
|
||||
ToolTip = "Set the source of the texture for this channel to sample from when baking a composite.";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
Text = "Source Channel";
|
||||
position = "5 85";
|
||||
extent = "100 10";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiPopUpMenuCtrl() {
|
||||
position = "1 97";
|
||||
extent = "106 23";
|
||||
horizSizing = "width";
|
||||
profile = "ToolsGuiPopUpMenuEditProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
internalName = "sourceChannel";
|
||||
className = "CompositeTextureTexSrcChannel";
|
||||
};
|
||||
};
|
||||
};
|
||||
new GuiButtonCtrl() {
|
||||
Text = "Save";
|
||||
position = "339 216";
|
||||
extent = "74 24";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
command = "CompositeTextureEditor.saveComposite();";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiButtonCtrl() {
|
||||
Text = "Cancel";
|
||||
position = "417 216";
|
||||
extent = "52 24";
|
||||
profile = "ToolsGuiButtonProfile";
|
||||
command = "Canvas.popDialog(CompositeTextureEditor);";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
Loading…
Add table
Add a link
Reference in a new issue