mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +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
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cubemaped_cubepreview"
|
||||
fileName="@assetFile=cubemaped_cubepreview.dts"
|
||||
constuctorFileName="@assetFile=cubemaped_cubepreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cubemaped_cubepreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:cubemaped_cubepreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cubemaped_cylinderpreview"
|
||||
fileName="@assetFile=cubemaped_cylinderpreview.dts"
|
||||
constuctorFileName="@assetFile=cubemaped_cylinderpreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cubemaped_cylinderpreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:cubemaped_cylinderpreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cubemaped_spherepreview"
|
||||
fileName="@assetFile=cubemaped_spherepreview.dts"
|
||||
constuctorFileName="@assetFile=cubemaped_spherepreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cubemaped_spherepreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:cubemaped_spherepreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cubepreview"
|
||||
fileName="@assetFile=cubepreview.dts"
|
||||
constuctorFileName="@assetFile=cubepreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cubepreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:cubepreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="cylinderpreview"
|
||||
fileName="@assetFile=cylinderpreview.dts"
|
||||
constuctorFileName="@assetFile=cylinderpreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(cylinderpreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:cylinderpreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="pyramidpreview"
|
||||
fileName="@assetFile=pyramidpreview.dts"
|
||||
constuctorFileName="@assetFile=pyramidpreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(pyramidpreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:pyramidpreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="spherepreview"
|
||||
fileName="@assetFile=spherepreview.dts"
|
||||
constuctorFileName="@assetFile=spherepreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(spherepreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:spherepreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="torusknotpreview"
|
||||
fileName="@assetFile=torusknotpreview.dts"
|
||||
constuctorFileName="@assetFile=torusknotpreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(torusknotpreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:torusknotpreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="torusknowpreview"
|
||||
fileName="@assetFile=torusknowpreview.dts"
|
||||
constuctorFileName="@assetFile=torusknowpreview.tscript" />
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(torusknowpreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:torusknowpreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<ShapeAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="toruspreview"
|
||||
fileName="@assetFile=toruspreview.dts"
|
||||
constuctorFileName="@assetFile=toruspreview.tscript" />
|
||||
Binary file not shown.
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
singleton TSShapeConstructor(toruspreviewdts)
|
||||
{
|
||||
baseShapeAsset = "ToolsModule:toruspreview";
|
||||
singleDetailSize = "0";
|
||||
flipUVCoords = "0";
|
||||
JoinIdenticalVerts = "0";
|
||||
reverseWindingOrder = "0";
|
||||
removeRedundantMats = "0";
|
||||
animFPS = "2";
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue