mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 11:56:30 +00:00
Nodes - Added Enum Switch node
Nodes editor - Rewrite the way pin VMs are constructed
This commit is contained in:
1 parent
1b5101dc27
commit
0120f37c93
2 files changed
+137
-36
No files matched your search
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Reactive;
|
||||
using System.Reactive.Linq;
|
||||
using Artemis.Core;
|
||||
@@ -41,44 +42,23 @@ public class NodeViewModel : ActivatableViewModelBase
|
||||
|
||||
DeleteNode = ReactiveCommand.Create(ExecuteDeleteNode, this.WhenAnyValue(vm => vm.IsStaticNode).Select(v => !v));
|
||||
|
||||
SourceList<IPin> nodePins = new();
|
||||
SourceList<IPinCollection> nodePinCollections = new();
|
||||
SourceList<PinViewModel> nodePins = new();
|
||||
SourceList<PinCollectionViewModel> nodePinCollections = new();
|
||||
|
||||
// Create observable collections split up by direction
|
||||
nodePins.Connect()
|
||||
.Filter(n => n.Direction == PinDirection.Input)
|
||||
.Transform(p => (PinViewModel) nodeVmFactory.InputPinViewModel(p, nodeScriptViewModel))
|
||||
.Bind(out ReadOnlyObservableCollection<PinViewModel> inputPins)
|
||||
.Subscribe();
|
||||
nodePins.Connect()
|
||||
.Filter(n => n.Direction == PinDirection.Output)
|
||||
.Transform(p => (PinViewModel) nodeVmFactory.OutputPinViewModel(p, nodeScriptViewModel))
|
||||
.Bind(out ReadOnlyObservableCollection<PinViewModel> outputPins)
|
||||
.Subscribe();
|
||||
nodePins.Connect().Filter(n => n.Pin.Direction == PinDirection.Input).Bind(out ReadOnlyObservableCollection<PinViewModel> inputPins).Subscribe();
|
||||
nodePins.Connect().Filter(n => n.Pin.Direction == PinDirection.Output).Bind(out ReadOnlyObservableCollection<PinViewModel> outputPins).Subscribe();
|
||||
InputPinViewModels = inputPins;
|
||||
OutputPinViewModels = outputPins;
|
||||
|
||||
// Same again but for pin collections
|
||||
nodePinCollections.Connect()
|
||||
.Filter(n => n.Direction == PinDirection.Input)
|
||||
.Transform(c => (PinCollectionViewModel) nodeVmFactory.InputPinCollectionViewModel(c, nodeScriptViewModel))
|
||||
.Bind(out ReadOnlyObservableCollection<PinCollectionViewModel> inputPinCollections)
|
||||
.Subscribe();
|
||||
nodePinCollections.Connect()
|
||||
.Filter(n => n.Direction == PinDirection.Output)
|
||||
.Transform(c => (PinCollectionViewModel) nodeVmFactory.OutputPinCollectionViewModel(c, nodeScriptViewModel))
|
||||
.Bind(out ReadOnlyObservableCollection<PinCollectionViewModel> outputPinCollections)
|
||||
.Subscribe();
|
||||
nodePinCollections.Connect().Filter(n => n.PinCollection.Direction == PinDirection.Input).Bind(out ReadOnlyObservableCollection<PinCollectionViewModel> inputPinCollections).Subscribe();
|
||||
nodePinCollections.Connect().Filter(n => n.PinCollection.Direction == PinDirection.Output).Bind(out ReadOnlyObservableCollection<PinCollectionViewModel> outputPinCollections).Subscribe();
|
||||
InputPinCollectionViewModels = inputPinCollections;
|
||||
OutputPinCollectionViewModels = outputPinCollections;
|
||||
|
||||
// Create a single observable collection containing all pin view models
|
||||
InputPinViewModels.ToObservableChangeSet()
|
||||
.Merge(OutputPinViewModels.ToObservableChangeSet())
|
||||
.Merge(InputPinCollectionViewModels.ToObservableChangeSet().TransformMany(c => c.PinViewModels))
|
||||
.Merge(OutputPinCollectionViewModels.ToObservableChangeSet().TransformMany(c => c.PinViewModels))
|
||||
.Bind(out ReadOnlyObservableCollection<PinViewModel> pins)
|
||||
.Subscribe();
|
||||
nodePins.Connect().Merge(nodePinCollections.Connect().TransformMany(c => c.PinViewModels)).Bind(out ReadOnlyObservableCollection<PinViewModel> pins).Subscribe();
|
||||
|
||||
PinViewModels = pins;
|
||||
|
||||
@@ -101,30 +81,54 @@ public class NodeViewModel : ActivatableViewModelBase
|
||||
|
||||
// Subscribe to pin changes
|
||||
Observable.FromEventPattern<SingleValueEventArgs<IPin>>(x => Node.PinAdded += x, x => Node.PinAdded -= x)
|
||||
.Subscribe(p => nodePins.Add(p.EventArgs.Value))
|
||||
.Subscribe(p =>
|
||||
{
|
||||
if (p.EventArgs.Value.Direction == PinDirection.Input)
|
||||
nodePins.Add(nodeVmFactory.InputPinViewModel(p.EventArgs.Value, nodeScriptViewModel));
|
||||
else
|
||||
nodePins.Add(nodeVmFactory.OutputPinViewModel(p.EventArgs.Value, nodeScriptViewModel));
|
||||
})
|
||||
.DisposeWith(d);
|
||||
Observable.FromEventPattern<SingleValueEventArgs<IPin>>(x => Node.PinRemoved += x, x => Node.PinRemoved -= x)
|
||||
.Subscribe(p => nodePins.Remove(p.EventArgs.Value))
|
||||
.Subscribe(p => nodePins!.Remove(nodePins.Items.FirstOrDefault(vm => vm.Pin == p.EventArgs.Value)))
|
||||
.DisposeWith(d);
|
||||
nodePins.Edit(l =>
|
||||
{
|
||||
l.Clear();
|
||||
l.AddRange(Node.Pins);
|
||||
foreach (IPin nodePin in Node.Pins)
|
||||
{
|
||||
if (nodePin.Direction == PinDirection.Input)
|
||||
l.Add(nodeVmFactory.InputPinViewModel(nodePin, nodeScriptViewModel));
|
||||
else
|
||||
l.Add(nodeVmFactory.OutputPinViewModel(nodePin, nodeScriptViewModel));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Subscribe to pin collection changes
|
||||
Observable.FromEventPattern<SingleValueEventArgs<IPinCollection>>(x => Node.PinCollectionAdded += x, x => Node.PinCollectionAdded -= x)
|
||||
.Subscribe(p => nodePinCollections.Add(p.EventArgs.Value))
|
||||
.Subscribe(p =>
|
||||
{
|
||||
if (p.EventArgs.Value.Direction == PinDirection.Input)
|
||||
nodeVmFactory.InputPinCollectionViewModel(p.EventArgs.Value, nodeScriptViewModel);
|
||||
else
|
||||
nodeVmFactory.OutputPinCollectionViewModel(p.EventArgs.Value, nodeScriptViewModel);
|
||||
})
|
||||
.DisposeWith(d);
|
||||
Observable.FromEventPattern<SingleValueEventArgs<IPinCollection>>(x => Node.PinCollectionRemoved += x, x => Node.PinCollectionRemoved -= x)
|
||||
.Subscribe(p => nodePinCollections.Remove(p.EventArgs.Value))
|
||||
.Subscribe(p => nodePinCollections!.Remove(nodePinCollections.Items.FirstOrDefault(vm => vm.PinCollection == p.EventArgs.Value)))
|
||||
.DisposeWith(d);
|
||||
nodePinCollections.Edit(l =>
|
||||
{
|
||||
l.Clear();
|
||||
l.AddRange(Node.PinCollections);
|
||||
foreach (IPinCollection nodePinCollection in Node.PinCollections)
|
||||
{
|
||||
if (nodePinCollection.Direction == PinDirection.Input)
|
||||
l.Add(nodeVmFactory.InputPinCollectionViewModel(nodePinCollection, nodeScriptViewModel));
|
||||
else
|
||||
l.Add(nodeVmFactory.OutputPinCollectionViewModel(nodePinCollection, nodeScriptViewModel));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (Node is Node coreNode)
|
||||
CustomNodeViewModel = coreNode.GetCustomViewModel(nodeScriptViewModel.NodeScript);
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user