DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Nodes - Ensure there always is an exit node

Browse Source
This commit is contained in:
Robert 2021-08-26 23:37:31 +02:00
parent c4340c3c97
commit 3e201336f1
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
View File

@ -234,7 +234,7 @@ namespace Artemis.Core
Script.Save(); Script.Save();
Entity.IsEnabled = IsEnabled; Entity.IsEnabled = IsEnabled;
Entity.NodeScript = Script?.Entity; Entity.NodeScript = Script.Entity.Nodes.Any() ? Script.Entity : null;
} }
#endregion #endregion

11
src/Artemis.Core/VisualScripting/NodeScript.cs
View File

@ -83,6 +83,9 @@ namespace Artemis.Core
{ {
_nodes.Remove(node); _nodes.Remove(node);
if (node is IDisposable disposable)
disposable.Dispose();
NodeRemoved?.Invoke(this, node); NodeRemoved?.Invoke(this, node);
} }
@ -105,7 +108,9 @@ namespace Artemis.Core
/// <inheritdoc /> /// <inheritdoc />
public void Load() public void Load()
{ {
_nodes.Clear(); List<INode> removeNodes = _nodes.Where(n => !n.IsExitNode).ToList();
foreach (INode removeNode in removeNodes)
RemoveNode(removeNode);
// Create nodes // Create nodes
foreach (NodeEntity entityNode in Entity.Nodes) foreach (NodeEntity entityNode in Entity.Nodes)
@ -113,7 +118,9 @@ namespace Artemis.Core
INode? node = LoadNode(entityNode, entityNode.IsExitNode ? ExitNode : null); INode? node = LoadNode(entityNode, entityNode.IsExitNode ? ExitNode : null);
if (node == null) if (node == null)
continue; continue;
_nodes.Add(node);
if (!entityNode.IsExitNode)
AddNode(node);
} }
LoadConnections(); LoadConnections();

5
src/Artemis.UI/Screens/ProfileEditor/Windows/NodeScriptWindowView.xaml
View File

@ -28,8 +28,9 @@
<materialDesign:PackIcon Kind="FreehandLine" Width="20" Height="28" /> <materialDesign:PackIcon Kind="FreehandLine" Width="20" Height="28" />
</mde:AppBar.AppIcon> </mde:AppBar.AppIcon>
</mde:AppBar> </mde:AppBar>
<controls:VisualScriptEditor Script="{Binding NodeScript}" AvailableNodes="{Binding AvailableNodes}" /> <controls:VisualScriptEditor Script="{Binding NodeScript}"
AvailableNodes="{Binding AvailableNodes}"
AlwaysShowValues="{Binding AlwaysShowValues.Value}" />
</DockPanel> </DockPanel>
</materialDesign:DialogHost> </materialDesign:DialogHost>
</mde:MaterialWindow> </mde:MaterialWindow>

4
src/Artemis.UI/Screens/ProfileEditor/Windows/NodeScriptWindowViewModel.cs
View File

@ -6,13 +6,15 @@ namespace Artemis.UI.Screens.ProfileEditor.Windows
{ {
public class NodeScriptWindowViewModel : Screen public class NodeScriptWindowViewModel : Screen
{ {
public NodeScriptWindowViewModel(NodeScript nodeScript, INodeService nodeService) public NodeScriptWindowViewModel(NodeScript nodeScript, INodeService nodeService, ISettingsService settingsService)
{ {
NodeScript = nodeScript; NodeScript = nodeScript;
AvailableNodes = new BindableCollection<NodeData>(nodeService.AvailableNodes); AvailableNodes = new BindableCollection<NodeData>(nodeService.AvailableNodes);
AlwaysShowValues = settingsService.GetSetting("ProfileEditor.AlwaysShowValues", true);
} }
public NodeScript NodeScript { get; } public NodeScript NodeScript { get; }
public BindableCollection<NodeData> AvailableNodes { get; } public BindableCollection<NodeData> AvailableNodes { get; }
public PluginSetting<bool> AlwaysShowValues { get; }
} }
} }