TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-26 23:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1500 from marauder2k9-torque/MissionArea-RemoveTerrainDependency

Browse source 
remove terrain dependency from mission area
This commit is contained in:
Brian Roberts 2025-06-16 16:36:24 -05:00 • committed by GitHub
commit 0aaddcddb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 150 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/missionAreaEditor/main.tscript
View file

@ -137,7 +137,7 @@ function MissionAreaEditorPlugin::readSettings( %this )
{
EditorSettings.beginGroup( "MissionAreaEditor", true );
MissionAreaEditorTerrainEditor.missionBoundsColor = EditorSettings.value("MissionBoundsColor");
MissionAreaEditorLevelEditor.missionBoundsColor = EditorSettings.value("MissionBoundsColor");
EditorSettings.endGroup();
}
@ -146,7 +146,7 @@ function MissionAreaEditorPlugin::writeSettings( %this )
{
EditorSettings.beginGroup( "MissionAreaEditor", true );
EditorSettings.setValue( "MissionBoundsColor", MissionAreaEditorTerrainEditor.missionBoundsColor );
EditorSettings.setValue( "MissionBoundsColor", MissionAreaEditorLevelEditor.missionBoundsColor );
EditorSettings.endGroup();
}

2
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui
View file

@ -79,7 +79,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup)
VertSizing = "height";
isContainer = "1";
new GuiMissionAreaCtrl(MissionAreaEditorTerrainEditor) {
new GuiMissionAreaCtrl(MissionAreaEditorLevelEditor) {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "EditorDefaultProfile";

8
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript
View file

@ -290,7 +290,7 @@ function MissionAreaEditorGui::onEditorActivated( %this )
{
EWorldEditor.selectObject( %ma );
EWorldEditor.syncGui();
MissionAreaEditorTerrainEditor.updateTerrain();
MissionAreaEditorLevelEditor.updateLevelBitmap();
%this.setSelectedMissionArea( %ma );
%this.onMissionAreaSelected( %this.getSelectedMissionArea() );
}
@ -303,18 +303,18 @@ function MissionAreaEditorGui::onEditorDeactivated( %this )
function MissionAreaEditorGui::onMissionAreaSelected( %this, %missionArea )
{
%this.missionArea = %missionArea;
MissionAreaEditorTerrainEditor.setMissionArea( %missionArea );
MissionAreaEditorLevelEditor.setMissionArea( %missionArea );
MissionAreaInspector.inspect( %missionArea );
}
//-----------------------------------------------------------------------------
function MissionAreaEditorTerrainEditor::onMissionAreaModified( %this )
function MissionAreaEditorLevelEditor::onMissionAreaModified( %this )
{
MissionAreaInspector.refresh();
}
function MissionAreaEditorTerrainEditor::onUndo( %this )
function MissionAreaEditorLevelEditor::onUndo( %this )
{
MissionAreaInspector.refresh();
}