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

Changes the creation of new materials in the material editor to go through the new asset interface, which ensures the creation is standardized across the board.

Browse source
This commit is contained in:
JeffR 2022-03-17 00:03:22 -05:00
parent 2198dd14d1
commit 532200ff43
2 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript
View file

@ -14,7 +14,6 @@ function AssetBrowser::createMaterialAsset(%this)
AssetName = %assetName; AssetName = %assetName;
versionId = 1; versionId = 1;
materialDefinitionName = %assetName; materialDefinitionName = %assetName;
scriptFile = %assetName @ "." @ $TorqueScriptFileExtension;
new Material(%assetName) { new Material(%assetName) {
}; };

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

@ -1971,39 +1971,15 @@ function MaterialEditorGui::save( %this )
function MaterialEditorGui::createNewMaterial( %this ) function MaterialEditorGui::createNewMaterial( %this )
{ {
AssetBrowser_SelectModule.showDialog("MaterialEditorGui.pickedNewMaterialTargetModule"); AssetBrowser.setupCreateNewAsset("MaterialAsset", AssetBrowser.selectedModule, "MaterialEditorGui.onCreateNewMaterialAsset");
AssetBrowser_SelectModuleWindow.selectWindow();
} }
function MaterialEditorGui::pickedNewMaterialTargetModule( %this, %module ) function MaterialEditorGui::onCreateNewMaterialAsset(%this, %newAssetId)
{ {
%moduleDef = ModuleDatabase.findModule(%module); //get the new asset definition
PE_EmitterEditor.targetModule = %module; %assetDef = AssetDatabase.acquireAsset(%newAssetId);
MaterialEditorGui.defaultMaterialFile = %moduleDef.ModulePath @ "/scripts/managedData/materials." @ $TorqueScriptFileExtension; if(isObject(%assetDef))
AssetBrowser.editMaterialAsset(%assetDef);
if(!isDirectory(filePath(MaterialEditorGui.defaultMaterialFile)))
{
AssetBrowser.dirHandler.createFolder(filePath(MaterialEditorGui.defaultMaterialFile));
}
%action = %this.createUndo(ActionCreateNewMaterial, "Create New Material");
%action.object = "";
%material = getUniqueName( "newMaterial" );
new Material(%material)
{
mapTo = "unmapped_mat";
parentGroup = RootGroup;
};
%action.newMaterial = %material.getId();
%action.oldMaterial = MaterialEditorGui.currentMaterial;
MaterialEditorGui.submitUndo( %action );
MaterialEditorGui.currentObject = "";
MaterialEditorGui.setMode();
MaterialEditorGui.prepareActiveMaterial( %material.getId(), true );
} }
function MaterialEditorGui::deleteMaterial( %this ) function MaterialEditorGui::deleteMaterial( %this )