GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-create-terrain-check' of git://github.com/VNNCC/FlaxEngine into VNNCC-fix-create-terrain-check

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-11 15:06:39 +01:00
parent 1ca31224e2 2252cd73f9
commit fc38aff46b
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Editor/Tools/Foliage/FoliageTab.cs
View File

@@ -21,6 +21,7 @@ namespace FlaxEditor.Tools.Foliage
private readonly Tabs _modes; private readonly Tabs _modes;
private readonly ContainerControl _noFoliagePanel; private readonly ContainerControl _noFoliagePanel;
private int _selectedFoliageTypeIndex = -1; private int _selectedFoliageTypeIndex = -1;
private Button _createNewFoliage;
/// <summary> /// <summary>
/// The editor instance. /// The editor instance.
@@ -99,6 +100,7 @@ namespace FlaxEditor.Tools.Foliage
public FoliageTab(SpriteHandle icon, Editor editor) public FoliageTab(SpriteHandle icon, Editor editor)
: base(string.Empty, icon) : base(string.Empty, icon)
{ {
Level.SceneLoaded += this.OnSceneLoaded;
Editor = editor; Editor = editor;
Editor.SceneEditing.SelectionChanged += OnSelectionChanged; Editor.SceneEditing.SelectionChanged += OnSelectionChanged;
@@ -135,14 +137,31 @@ namespace FlaxEditor.Tools.Foliage
Offsets = Margin.Zero, Offsets = Margin.Zero,
Parent = _noFoliagePanel Parent = _noFoliagePanel
}; };
var noFoliageButton = new Button _createNewFoliage = new Button
{ {
Text = "Create new foliage", Text = "Create new foliage",
AnchorPreset = AnchorPresets.MiddleCenter, AnchorPreset = AnchorPresets.MiddleCenter,
Offsets = new Margin(-60, 120, -12, 24), Offsets = new Margin(-60, 120, -12, 24),
Parent = _noFoliagePanel, Parent = _noFoliagePanel,
Enabled = false
}; };
noFoliageButton.Clicked += OnCreateNewFoliageClicked; _createNewFoliage.Clicked += OnCreateNewFoliageClicked;
}
private void OnSceneLoaded(Scene arg1, Guid arg2)
{
_createNewFoliage.Enabled = true;
Level.SceneUnloaded += this.OnSceneUnloaded;
Level.SceneLoaded -= OnSceneLoaded;
}
private void OnSceneUnloaded(Scene arg1, Guid arg2)
{
_createNewFoliage.Enabled = false;
Level.SceneLoaded += OnSceneLoaded;
Level.SceneUnloaded -= this.OnSceneUnloaded;
} }
private void OnSelected(Tab tab) private void OnSelected(Tab tab)

25
Source/Editor/Tools/Terrain/CarveTab.cs
View File

@@ -18,6 +18,7 @@ namespace FlaxEditor.Tools.Terrain
{ {
private readonly Tabs _modes; private readonly Tabs _modes;
private readonly ContainerControl _noTerrainPanel; private readonly ContainerControl _noTerrainPanel;
private readonly Button _createTerrainButton;
/// <summary> /// <summary>
/// The editor instance. /// The editor instance.
@@ -57,6 +58,7 @@ namespace FlaxEditor.Tools.Terrain
public CarveTab(SpriteHandle icon, Editor editor) public CarveTab(SpriteHandle icon, Editor editor)
: base(string.Empty, icon) : base(string.Empty, icon)
{ {
Level.SceneLoaded += this.OnSceneLoaded;
Editor = editor; Editor = editor;
Editor.SceneEditing.SelectionChanged += OnSelectionChanged; Editor.SceneEditing.SelectionChanged += OnSelectionChanged;
@@ -93,14 +95,31 @@ namespace FlaxEditor.Tools.Terrain
Offsets = Margin.Zero, Offsets = Margin.Zero,
Parent = _noTerrainPanel Parent = _noTerrainPanel
}; };
var noTerrainButton = new Button _createTerrainButton = new Button
{ {
Text = "Create new terrain", Text = "Create new terrain",
AnchorPreset = AnchorPresets.MiddleCenter, AnchorPreset = AnchorPresets.MiddleCenter,
Offsets = new Margin(-60, 120, -12, 24), Offsets = new Margin(-60, 120, -12, 24),
Parent = _noTerrainPanel Parent = _noTerrainPanel,
Enabled = false
}; };
noTerrainButton.Clicked += OnCreateNewTerrainClicked; _createTerrainButton.Clicked += OnCreateNewTerrainClicked;
}
private void OnSceneLoaded(Scene arg1, Guid arg2)
{
_createTerrainButton.Enabled = true;
Level.SceneUnloaded += this.OnSceneUnloaded;
Level.SceneLoaded -= OnSceneLoaded;
}
private void OnSceneUnloaded(Scene arg1, Guid arg2)
{
_createTerrainButton.Enabled = false;
Level.SceneLoaded += OnSceneLoaded;
Level.SceneUnloaded -= this.OnSceneUnloaded;
} }
private void OnSelected(Tab tab) private void OnSelected(Tab tab)