TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PostFXReorgAndUpdate' of https://github.com/Areloch/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2020-09-11 03:21:56 -05:00
commit b05d5fd3bd
181 changed files with 2487 additions and 1458 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs
View file

@ -332,6 +332,9 @@ function EditorSaveMission()
%obj.onSaveMission( $Server::MissionFile );
}
//Save out the PostFX config
PostFXManager::savePresetHandler( $Server::LevelAsset.getPostFXPresetPath() );
EditorClearDirty();
EditorGui.saveAs = false;
@ -355,14 +358,14 @@ function EditorSaveMissionAs( %levelAsset )
return;
}
%missionName = %levelAssetDef.getLevelFile();
%missionName = %levelAssetDef.getLevelPath();
if( fileExt( %missionName ) !$= ".mis" )
%missionName = %missionName @ ".mis";
//Update to be our active
$Server::MissionFile = %missionName;
%Server::LevelAsset = %levelAssetDef;
$Server::LevelAsset = %levelAssetDef;
//Update the scene name to comply to the new level's name
GetRootScene().name = %levelAssetDef.AssetName;
@ -490,7 +493,7 @@ function EditorOpenMission(%levelAsset)
updateEditorRecentLevelsList(%levelAssetId);
%filename = %assetDef.getlevelFile();
%filename = %assetDef.getLevelPath();
if(%filename $= "")
{
@ -539,7 +542,7 @@ function EditorOpenMission(%levelAsset)
function EditorOpenSceneAppend(%levelAsset)
{
//Load the asset's level file
exec(%levelAsset.getlevelFile());
exec(%levelAsset.getLevelPath());
//We'll assume the scene name and assetname are the same for now
%sceneName = %levelAsset.AssetName;