TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds logic to up-convert non-embedded terrain materials and materials to have embedded definitions

Browse source
This commit is contained in:
JeffR 2022-03-31 00:40:24 -05:00
parent 85bb4cbff3
commit c2857efe28
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -1963,7 +1963,24 @@ function MaterialEditorGui::save( %this )
MaterialEditorGui.copyMaterials( materialEd_previewMaterial, notDirtyMaterial );
%assetDef = AssetDatabase.acquireAsset(MaterialEditorGui.currentMaterialAsset);
%assetDef.saveAsset(); //write it out
%didEmbed = false;
%matScriptFile = %assetDef.getScriptPath();
if(%matScriptFile !$= "")
{
//lets up-convert to embedded
%assetDef.add(%assetDef.materialDefinitionName);
%assetDef.scriptFile = "";
%didEmbed = true;
}
//write it out
if(%assetDef.saveAsset())
{
if(%didEmbed)
{
fileDelete(%matScriptFile); //cleanup the old definition file
}
}
}
else
{

21
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
View file

@ -778,7 +778,26 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %materialAssetId )
%fxMat.customImpactSound = getField(%impactSound, 1);
//Save the material asset
%assetDef.saveAsset();
%didEmbed = false;
%matScriptFile = %assetDef.getScriptPath();
if(%matScriptFile !$= "")
{
//lets up-convert to embedded
%assetDef.add(%mat);
%assetDef.add(%fxMat);
%assetDef.scriptFile = "";
%didEmbed = true;
}
//write it out
if(%assetDef.saveAsset())
{
if(%didEmbed)
{
fileDelete(%matScriptFile); //cleanup the old definition file
}
}
%this.schedule(32, "cleanupDirtyMaterial");
}