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

Converts the ad-hoc design of the Material Editor to utilize the same inspector interface as most everything else does.

Browse source 
- 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 2025-08-03 12:03:02 -05:00
parent 8e93753b15
commit f3cad0d77e
173 changed files with 3713 additions and 6977 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -2179,8 +2179,7 @@ function ShapeEdMaterials::editSelectedMaterial( %this )
ShapeEdSelectWindow.setVisible( false );
ShapeEdPropWindow.setVisible( false );
EditorGui-->MatEdPropertiesWindow.setVisible( true );
EditorGui-->MatEdPreviewWindow.setVisible( true );
Canvas.pushDialog(MaterialEditorGui);
MatEd_phoBreadcrumb.setVisible( true );
MatEd_phoBreadcrumb.command = "ShapeEdMaterials.editSelectedMaterialEnd();";
@ -2204,8 +2203,7 @@ function ShapeEdMaterials::editSelectedMaterialEnd( %this, %closeEditor )
MatEd_phoBreadcrumb.command = "";
MaterialEditorGui.quit();
EditorGui-->MatEdPropertiesWindow.setVisible( false );
EditorGui-->MatEdPreviewWindow.setVisible( false );
Canvas.popDialog(MaterialEditorGui);
// Delete the temporary TSStatic
%this.tempShape.delete();