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 - Changed storage to be based on generics

Browse Source 
Nodes - Added XML docs to most types
This commit is contained in:
Robert 2021-09-24 23:05:16 +02:00
parent 8413b8d6db
commit c1dab91c16
28 changed files with 522 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Artemis.Core/Services/NodeService.cs
View File

@ -76,7 +76,8 @@ namespace Artemis.Core.Services
node.Y = entity.Y;
try
{
node.Storage = CoreJson.DeserializeObject(entity.Storage, true);
if (node is Node nodeImplementation)
nodeImplementation.DeserializeStorage(entity.Storage);
}
catch
{

19
src/Artemis.Core/VisualScripting/InputPin.cs
View File

@ -12,6 +12,7 @@ namespace Artemis.Core
public override PinDirection Direction => PinDirection.Input;
private T _value;
public T Value
{
get
@ -37,7 +38,8 @@ namespace Artemis.Core
[JsonConstructor]
internal InputPin(INode node, string name)
: base(node, name)
{ }
{
}
#endregion
@ -62,6 +64,7 @@ namespace Artemis.Core
public override PinDirection Direction => PinDirection.Input;
private object _value;
public object Value
{
get
@ -98,9 +101,19 @@ namespace Artemis.Core
private void Evaluate()
{
Value = ConnectedTo.Count > 0 ? ConnectedTo[0].PinValue : Type.GetDefault();
if (Type.IsValueType)
{
if (ConnectedTo.Count > 0 && ConnectedTo[0].PinValue != null)
Value = ConnectedTo[0].PinValue;
else
Value = Type.GetDefault()!;
}
else
{
Value = ConnectedTo[0].PinValue;
}
}
#endregion
}
}
}

52
src/Artemis.Core/VisualScripting/Interfaces/INode.cs
View File

@ -1,29 +1,73 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using Artemis.Storage.Entities.Profile.Nodes;
namespace Artemis.Core
{
/// <summary>
/// Represents a kind of node inside a <see cref="INodeScript" />
/// </summary>
public interface INode : INotifyPropertyChanged
{
/// <summary>
/// Gets the name of the node
/// </summary>
string Name { get; }
/// <summary>
/// Gets the description of the node
/// </summary>
string Description { get; }
/// <summary>
/// Gets a boolean indicating whether the node is the exit node of the script
/// </summary>
bool IsExitNode { get; }
/// <summary>
/// Gets a boolean indicating whether the node is a default node that connot be removed
/// </summary>
bool IsDefaultNode { get; }
/// <summary>
/// Gets or sets the X-position of the node
/// </summary>
public double X { get; set; }
/// <summary>
/// Gets or sets the Y-position of the node
/// </summary>
public double Y { get; set; }
public object? Storage { get; set; }
/// <summary>
/// Gets a read-only collection of the pins on this node
/// </summary>
public IReadOnlyCollection<IPin> Pins { get; }
public IReadOnlyCollection<IPinCollection> PinCollections { get; }
/// <summary>
/// Gets a read-only collection of the pin collections on this node
/// </summary>
public IReadOnlyCollection<IPinCollection> PinCollections { get; }
/// <summary>
/// Called when the node resets
/// </summary>
event EventHandler Resetting;
/// <summary>
/// Called when the node was loaded from storage or newly created
/// </summary>
/// <param name="script">The script the node is contained in</param>
void Initialize(INodeScript script);
/// <summary>
/// Evaluates the value of the output pins of this node
/// </summary>
void Evaluate();
/// <summary>
/// Resets the node causing all pins to re-evaluate the next time <see cref="Evaluate"/> is called
/// </summary>
void Reset();
}
}

55
src/Artemis.Core/VisualScripting/Interfaces/INodeScript.cs
View File

@ -5,27 +5,74 @@ using Artemis.Core.Events;
namespace Artemis.Core
{
/// <summary>
/// Represents a node script
/// </summary>
public interface INodeScript : INotifyPropertyChanged, IDisposable
{
/// <summary>
/// Gets the name of the node script.
/// </summary>
string Name { get; }
/// <summary>
/// Gets the description of the node script.
/// </summary>
string Description { get; }
/// <summary>
/// Gets an enumerable of all the nodes on this script.
/// </summary>
IEnumerable<INode> Nodes { get; }
/// <summary>
/// Gets the return type of the node script.
/// </summary>
Type ResultType { get; }
/// <summary>
/// Gets or sets the context of the node script, usually a <see cref="Profile" /> or
/// <see cref="ProfileConfiguration" />.
/// </summary>
object? Context { get; set; }
/// <summary>
/// Occurs whenever a node was added to the script
/// </summary>
event EventHandler<SingleValueEventArgs<INode>>? NodeAdded;
/// <summary>
/// Occurs whenever a node was removed from the script
/// </summary>
event EventHandler<SingleValueEventArgs<INode>>? NodeRemoved;
/// <summary>
/// Runs the script, evaluating nodes where needed
/// </summary>
void Run();
/// <summary>
/// Adds a node to the script
/// </summary>
/// <param name="node">The node to add</param>
void AddNode(INode node);
/// <summary>
/// Removes a node from the script
/// </summary>
/// <param name="node">The node to remove</param>
void RemoveNode(INode node);
}
/// <summary>
/// Represents a node script with a result value of type <paramref name="T" />
/// </summary>
/// <typeparam name="T">The type of result value</typeparam>
public interface INodeScript<out T> : INodeScript
{
/// <summary>
/// Gets the result of the script
/// </summary>
T Result { get; }
}
}
}

231
src/Artemis.Core/VisualScripting/Node.cs
View File

@ -1,16 +1,24 @@
using Ninject;
using System;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Ninject;
using Ninject.Parameters;
namespace Artemis.Core
{
/// <summary>
/// Represents a kind of node inside a <see cref="NodeScript" />
/// </summary>
public abstract class Node : CorePropertyChanged, INode
{
/// <inheritdoc />
public event EventHandler? Resetting;
#region Properties & Fields
private string _name;
/// <inheritdoc />
public string Name
{
get => _name;
@ -18,6 +26,8 @@ namespace Artemis.Core
}
private string _description;
/// <inheritdoc />
public string Description
{
get => _description;
@ -26,6 +36,7 @@ namespace Artemis.Core
private double _x;
/// <inheritdoc />
public double X
{
get => _x;
@ -33,51 +44,62 @@ namespace Artemis.Core
}
private double _y;
/// <inheritdoc />
public double Y
{
get => _y;
set => SetAndNotify(ref _y, value);
}
private object? _storage;
public object? Storage
{
get => _storage;
set => SetAndNotify(ref _storage, value);
}
/// <inheritdoc />
public virtual bool IsExitNode => false;
/// <inheritdoc />
public virtual bool IsDefaultNode => false;
private readonly List<IPin> _pins = new();
/// <inheritdoc />
public IReadOnlyCollection<IPin> Pins => new ReadOnlyCollection<IPin>(_pins);
private readonly List<IPinCollection> _pinCollections = new();
/// <inheritdoc />
public IReadOnlyCollection<IPinCollection> PinCollections => new ReadOnlyCollection<IPinCollection>(_pinCollections);
#endregion
#region Events
public event EventHandler Resetting;
#endregion
#region Construtors
/// <summary>
/// Creates a new instance of the <see cref="Node" /> class with an empty name and description
/// </summary>
protected Node()
{ }
{
_name = string.Empty;
_description = string.Empty;
}
/// <summary>
/// Creates a new instance of the <see cref="Node" /> class with the provided name and description
/// </summary>
protected Node(string name, string description)
{
Name = name;
Description = description;
_name = name;
_description = description;
}
#endregion
#region Methods
/// <summary>
/// Creates a new input pin and adds it to the <see cref="Pins" /> collection
/// </summary>
/// <param name="name">The name of the pin</param>
/// <typeparam name="T">The type of value the pin will hold</typeparam>
/// <returns>The newly created pin</returns>
protected InputPin<T> CreateInputPin<T>(string name = "")
{
InputPin<T> pin = new(this, name);
@ -86,6 +108,12 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Creates a new input pin and adds it to the <see cref="Pins" /> collection
/// </summary>
/// <param name="type">The type of value the pin will hold</param>
/// <param name="name">The name of the pin</param>
/// <returns>The newly created pin</returns>
protected InputPin CreateInputPin(Type type, string name = "")
{
InputPin pin = new(this, type, name);
@ -94,6 +122,12 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Creates a new output pin and adds it to the <see cref="Pins" /> collection
/// </summary>
/// <param name="name">The name of the pin</param>
/// <typeparam name="T">The type of value the pin will hold</typeparam>
/// <returns>The newly created pin</returns>
protected OutputPin<T> CreateOutputPin<T>(string name = "")
{
OutputPin<T> pin = new(this, name);
@ -102,6 +136,12 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Creates a new output pin and adds it to the <see cref="Pins" /> collection
/// </summary>
/// <param name="type">The type of value the pin will hold</param>
/// <param name="name">The name of the pin</param>
/// <returns>The newly created pin</returns>
protected OutputPin CreateOutputPin(Type type, string name = "")
{
OutputPin pin = new(this, type, name);
@ -109,7 +149,12 @@ namespace Artemis.Core
OnPropertyChanged(nameof(Pins));
return pin;
}
/// <summary>
/// Removes the provided <paramref name="pin" /> from the node and it's <see cref="Pins" /> collection
/// </summary>
/// <param name="pin">The pin to remove</param>
/// <returns><see langword="true" /> if the pin was removed; otherwise <see langword="false" />.</returns>
protected bool RemovePin(Pin pin)
{
bool isRemoved = _pins.Remove(pin);
@ -122,6 +167,13 @@ namespace Artemis.Core
return isRemoved;
}
/// <summary>
/// Creates a new input pin collection and adds it to the <see cref="PinCollections" /> collection
/// </summary>
/// <typeparam name="T">The type of value the pins of this collection will hold</typeparam>
/// <param name="name">The name of the pin collection</param>
/// <param name="initialCount">The amount of pins to initially add to the collection</param>
/// <returns>The resulting input pin collection</returns>
protected InputPinCollection<T> CreateInputPinCollection<T>(string name = "", int initialCount = 1)
{
InputPinCollection<T> pin = new(this, name, initialCount);
@ -130,6 +182,13 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Creates a new input pin collection and adds it to the <see cref="PinCollections" /> collection
/// </summary>
/// <param name="type">The type of value the pins of this collection will hold</param>
/// <param name="name">The name of the pin collection</param>
/// <param name="initialCount">The amount of pins to initially add to the collection</param>
/// <returns>The resulting input pin collection</returns>
protected InputPinCollection CreateInputPinCollection(Type type, string name = "", int initialCount = 1)
{
InputPinCollection pin = new(this, type, name, initialCount);
@ -138,6 +197,13 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Creates a new output pin collection and adds it to the <see cref="PinCollections" /> collection
/// </summary>
/// <typeparam name="T">The type of value the pins of this collection will hold</typeparam>
/// <param name="name">The name of the pin collection</param>
/// <param name="initialCount">The amount of pins to initially add to the collection</param>
/// <returns>The resulting output pin collection</returns>
protected OutputPinCollection<T> CreateOutputPinCollection<T>(string name = "", int initialCount = 1)
{
OutputPinCollection<T> pin = new(this, name, initialCount);
@ -146,12 +212,18 @@ namespace Artemis.Core
return pin;
}
/// <summary>
/// Removes the provided <paramref name="pinCollection" /> from the node and it's <see cref="PinCollections" />
/// collection
/// </summary>
/// <param name="pinCollection">The pin collection to remove</param>
/// <returns><see langword="true" /> if the pin collection was removed; otherwise <see langword="false" />.</returns>
protected bool RemovePinCollection(PinCollection pinCollection)
{
bool isRemoved = _pinCollections.Remove(pinCollection);
if (isRemoved)
{
foreach (IPin pin in pinCollection)
foreach (IPin pin in pinCollection)
pin.DisconnectAll();
OnPropertyChanged(nameof(PinCollections));
}
@ -159,51 +231,122 @@ namespace Artemis.Core
return isRemoved;
}
/// <inheritdoc />
public virtual void Initialize(INodeScript script)
{ }
{
}
/// <inheritdoc />
public abstract void Evaluate();
/// <inheritdoc />
public virtual void Reset()
{
Resetting?.Invoke(this, new EventArgs());
Resetting?.Invoke(this, EventArgs.Empty);
}
/// <summary>
/// Called whenever the node must show it's custom view model, if <see langword="null" />, no custom view model is used
/// </summary>
/// <returns>The custom view model, if <see langword="null" />, no custom view model is used</returns>
public virtual ICustomNodeViewModel? GetCustomViewModel()
{
return null;
}
/// <summary>
/// Serializes the <see cref="Storage" /> object into a string
/// </summary>
/// <returns>The serialized object</returns>
internal virtual string SerializeStorage()
{
return string.Empty;
}
/// <summary>
/// Deserializes the <see cref="Storage" /> object and sets it
/// </summary>
/// <param name="serialized">The serialized object</param>
internal virtual void DeserializeStorage(string serialized)
{
}
#endregion
}
public abstract class Node<T> : CustomViewModelNode where T : ICustomNodeViewModel
/// <summary>
/// Represents a kind of node inside a <see cref="NodeScript" /> containing storage value of type
/// <typeparamref name="TStorage" />.
/// </summary>
/// <typeparam name="TStorage">The type of value the node stores</typeparam>
public abstract class Node<TStorage> : Node
{
private TStorage? _storage;
/// <inheritdoc />
protected Node()
{
}
/// <inheritdoc />
protected Node(string name, string description) : base(name, description)
{
}
/// <summary>
/// Gets or sets the storage object of this node, this is saved across sessions
/// </summary>
public TStorage? Storage
{
get => _storage;
set => SetAndNotify(ref _storage, value);
}
internal override string SerializeStorage()
{
return CoreJson.SerializeObject(Storage, true);
}
internal override void DeserializeStorage(string serialized)
{
Storage = CoreJson.DeserializeObject<TStorage>(serialized) ?? default(TStorage);
}
}
/// <summary>
/// Represents a kind of node inside a <see cref="NodeScript" /> containing storage value of type
/// <typeparamref name="TStorage" /> and a view model of type <typeparamref name="TViewModel" />.
/// </summary>
/// <typeparam name="TStorage">The type of value the node stores</typeparam>
/// <typeparam name="TViewModel">The type of view model the node uses</typeparam>
public abstract class Node<TStorage, TViewModel> : Node<TStorage> where TViewModel : ICustomNodeViewModel
{
/// <inheritdoc />
protected Node()
{
}
/// <inheritdoc />
protected Node(string name, string description) : base(name, description)
{
}
[Inject]
internal IKernel Kernel { get; set; } = null!;
protected Node()
{ }
protected Node(string name, string description) : base(name, description)
{ }
public virtual T GetViewModel()
/// <summary>
/// Called when a view model is required
/// </summary>
public virtual TViewModel GetViewModel()
{
return Kernel.Get<T>(new ConstructorArgument("node", this));
return Kernel.Get<TViewModel>(new ConstructorArgument("node", this));
}
/// <inheritdoc />
public override ICustomNodeViewModel GetCustomViewModel()
{
return GetViewModel();
}
}
public abstract class CustomViewModelNode : Node
{
/// <inheritdoc />
protected CustomViewModelNode()
{ }
/// <inheritdoc />
protected CustomViewModelNode(string name, string description) : base(name, description)
{ }
public abstract ICustomNodeViewModel GetCustomViewModel();
}
}

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

@ -9,6 +9,9 @@ using Artemis.Storage.Entities.Profile.Nodes;
namespace Artemis.Core
{
/// <summary>
/// Represents a node script
/// </summary>
public abstract class NodeScript : CorePropertyChanged, INodeScript, IStorageModel
{
private void NodeTypeStoreOnNodeTypeChanged(object? sender, NodeTypeStoreEvent e)
@ -16,23 +19,41 @@ namespace Artemis.Core
Load();
}
/// <inheritdoc />
public event EventHandler<SingleValueEventArgs<INode>>? NodeAdded;
/// <inheritdoc />
public event EventHandler<SingleValueEventArgs<INode>>? NodeRemoved;
#region Properties & Fields
internal NodeScriptEntity Entity { get; }
/// <inheritdoc />
public string Name { get; }
/// <inheritdoc />
public string Description { get; }
private readonly List<INode> _nodes = new();
/// <inheritdoc />
public IEnumerable<INode> Nodes => new ReadOnlyCollection<INode>(_nodes);
/// <summary>
/// Gets or sets the exit node of the script
/// </summary>
protected INode ExitNode { get; set; }
/// <summary>
/// Gets a boolean indicating whether the exit node is connected to any other nodes
/// </summary>
public abstract bool ExitNodeConnected { get; }
/// <inheritdoc />
public abstract Type ResultType { get; }
/// <inheritdoc />
public object? Context { get; set; }
#endregion
@ -65,6 +86,7 @@ namespace Artemis.Core
#region Methods
/// <inheritdoc />
public void Run()
{
foreach (INode node in Nodes)
@ -73,6 +95,7 @@ namespace Artemis.Core
ExitNode.Evaluate();
}
/// <inheritdoc />
public void AddNode(INode node)
{
_nodes.Add(node);
@ -80,6 +103,7 @@ namespace Artemis.Core
NodeAdded?.Invoke(this, new SingleValueEventArgs<INode>(node));
}
/// <inheritdoc />
public void RemoveNode(INode node)
{
_nodes.Remove(node);
@ -90,6 +114,7 @@ namespace Artemis.Core
NodeRemoved?.Invoke(this, new SingleValueEventArgs<INode>(node));
}
/// <inheritdoc />
public void Dispose()
{
NodeTypeStore.NodeTypeAdded -= NodeTypeStoreOnNodeTypeChanged;
@ -147,9 +172,7 @@ namespace Artemis.Core
// Restore pin collections
foreach (NodePinCollectionEntity entityNodePinCollection in nodeEntity.PinCollections)
{
IPinCollection? collection = node.PinCollections.FirstOrDefault(c => c.Name == entityNodePinCollection.Name &&
c.Type.Name == entityNodePinCollection.Type &&
(int) c.Direction == entityNodePinCollection.Direction);
IPinCollection? collection = node.PinCollections.ElementAtOrDefault(entityNodePinCollection.Id);
if (collection == null)
continue;
@ -161,12 +184,12 @@ namespace Artemis.Core
}
/// <summary>
/// Loads missing connections between the nodes of this node script from the <see cref="Entity"/>
/// Loads missing connections between the nodes of this node script from the <see cref="Entity" />
/// </summary>
public void LoadConnections()
{
List<INode> nodes = Nodes.ToList();
foreach (NodeConnectionEntity nodeConnectionEntity in Entity.Connections)
foreach (NodeConnectionEntity nodeConnectionEntity in Entity.Connections.OrderBy(p => p.SourcePinCollectionId))
{
INode? source = nodes.ElementAtOrDefault(nodeConnectionEntity.SourceNode);
if (source == null)
@ -191,15 +214,12 @@ namespace Artemis.Core
// Clear existing connections on input pins, we don't want none of that now
if (targetPin.Direction == PinDirection.Input)
{
while (targetPin.ConnectedTo.Any())
targetPin.DisconnectFrom(targetPin.ConnectedTo[0]);
}
if (sourcePin.Direction == PinDirection.Input)
{
while (sourcePin.ConnectedTo.Any())
while (sourcePin.ConnectedTo.Any())
sourcePin.DisconnectFrom(sourcePin.ConnectedTo[0]);
}
// Only connect the nodes if they aren't already connected (LoadConnections may be called twice or more)
if (!targetPin.ConnectedTo.Contains(sourcePin))
@ -231,21 +251,24 @@ namespace Artemis.Core
Type = node.GetType().Name,
X = node.X,
Y = node.Y,
Storage = CoreJson.SerializeObject(node.Storage, true),
Name = node.Name,
Description = node.Description,
IsExitNode = node.IsExitNode
};
if (node is Node nodeImplementation)
nodeEntity.Storage = nodeImplementation.SerializeStorage();
int collectionId = 0;
foreach (IPinCollection nodePinCollection in node.PinCollections)
{
nodeEntity.PinCollections.Add(new NodePinCollectionEntity
{
Name = nodePinCollection.Name,
Type = nodePinCollection.Type.Name,
Id = collectionId,
Direction = (int) nodePinCollection.Direction,
Amount = nodePinCollection.Count()
});
collectionId++;
}
Entity.Nodes.Add(nodeEntity);
@ -309,13 +332,21 @@ namespace Artemis.Core
#endregion
}
/// <summary>
/// Represents a node script with a result value of type <paramref name="T" />
/// </summary>
/// <typeparam name="T">The type of result value</typeparam>
public class NodeScript<T> : NodeScript, INodeScript<T>
{
#region Properties & Fields
/// <inheritdoc />
public T Result => ((ExitNode<T>) ExitNode).Value;
/// <inheritdoc />
public override bool ExitNodeConnected => ((ExitNode<T>) ExitNode).Input.ConnectedTo.Any();
/// <inheritdoc />
public override Type ResultType => typeof(T);
#endregion

3
src/Artemis.Storage/Entities/Profile/Nodes/NodePinCollectionEntity.cs
View File

@ -2,8 +2,7 @@
{
public class NodePinCollectionEntity
{
public string Name { get; set; }
public string Type { get; set; }
public int Id { get; set; }
public int Direction { set; get; }
public int Amount { get; set; }
}

4
src/Artemis.VisualScripting/Editor/Controls/VisualScriptNodePresenter.cs
View File

@ -155,10 +155,10 @@ namespace Artemis.VisualScripting.Editor.Controls
{
CustomViewModel?.OnDeactivate();
if (Node?.Node is CustomViewModelNode customViewModelNode)
if (Node?.Node is Node customViewModelNode)
{
CustomViewModel = customViewModelNode.GetCustomViewModel();
CustomViewModel.OnActivate();
CustomViewModel?.OnActivate();
}
else
CustomViewModel = null;

29
src/Artemis.VisualScripting/Nodes/Color/CustomViewModels/StaticSKColorValueNodeCustomViewModel.cs
View File

@ -1,38 +1,11 @@
using System.ComponentModel;
using Artemis.VisualScripting.Nodes.CustomViewModels;
using SkiaSharp;
using Artemis.VisualScripting.Nodes.CustomViewModels;
namespace Artemis.VisualScripting.Nodes.Color.CustomViewModels
{
public class StaticSKColorValueNodeCustomViewModel : CustomNodeViewModel
{
private readonly StaticSKColorValueNode _node;
public StaticSKColorValueNodeCustomViewModel(StaticSKColorValueNode node) : base(node)
{
_node = node;
}
public SKColor Input
{
get => (SKColor) (_node.Storage ?? SKColor.Empty);
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
}

2
src/Artemis.VisualScripting/Nodes/Color/CustomViews/StaticSKColorValueNodeCustomView.xaml
View File

@ -12,5 +12,5 @@
</UserControl.Resources>
<shared:ColorPicker VerticalAlignment="Center"
HorizontalAlignment="Stretch"
Color="{Binding Input, Converter={StaticResource SKColorToColorConverter}}" />
Color="{Binding Node.Storage, Converter={StaticResource SKColorToColorConverter}}" />
</UserControl>

14
src/Artemis.VisualScripting/Nodes/Color/StaticSKColorValueNode.cs
View File

@ -5,7 +5,7 @@ using SkiaSharp;
namespace Artemis.VisualScripting.Nodes.Color
{
[Node("Color-Value", "Outputs a configurable color value.", "Static", InputType = typeof(SKColor), OutputType = typeof(SKColor))]
public class StaticSKColorValueNode : Node<StaticSKColorValueNodeCustomViewModel>
public class StaticSKColorValueNode : Node<SKColor, StaticSKColorValueNodeCustomViewModel>
{
#region Constructors
@ -27,17 +27,9 @@ namespace Artemis.VisualScripting.Nodes.Color
public override void Evaluate()
{
Output.Value = Storage as SKColor? ?? SKColor.Empty;
Output.Value = Storage;
}
public override void Initialize(INodeScript script)
{
if (Storage is string && SKColor.TryParse(Storage.ToString(), out SKColor parsed))
Storage = parsed;
else
Storage = SKColor.Empty;
}
#endregion
}
}

18
src/Artemis.VisualScripting/Nodes/CustomViewModels/EnumEqualsNodeCustomViewModel.cs
View File

@ -1,6 +1,4 @@
using System;
using System.ComponentModel;
using Artemis.Core;
using Artemis.Core;
using Artemis.Core.Events;
using Artemis.UI.Shared;
using Stylet;
@ -16,19 +14,12 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels
_node = node;
}
public Enum Input
{
get => _node.Storage as Enum;
set => _node.Storage = value;
}
public BindableCollection<ValueDescription> EnumValues { get; } = new();
public override void OnActivate()
{
_node.InputPin.PinConnected += InputPinOnPinConnected;
_node.InputPin.PinDisconnected += InputPinOnPinDisconnected;
_node.PropertyChanged += NodeOnPropertyChanged;
if (_node.InputPin.Value != null && _node.InputPin.Value.GetType().IsEnum)
EnumValues.AddRange(EnumUtilities.GetAllValuesAndDescriptions(_node.InputPin.Value.GetType()));
@ -39,7 +30,6 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels
{
_node.InputPin.PinConnected -= InputPinOnPinConnected;
_node.InputPin.PinDisconnected -= InputPinOnPinDisconnected;
_node.PropertyChanged -= NodeOnPropertyChanged;
base.OnDeactivate();
}
@ -55,11 +45,5 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels
if (_node.InputPin.Value != null && _node.InputPin.Value.GetType().IsEnum)
EnumValues.AddRange(EnumUtilities.GetAllValuesAndDescriptions(_node.InputPin.Value.GetType()));
}
private void NodeOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
}

110
src/Artemis.VisualScripting/Nodes/CustomViewModels/StaticValueNodeViewModels.cs
View File

@ -1,132 +1,32 @@
using System.ComponentModel;
using Artemis.Core;
namespace Artemis.VisualScripting.Nodes.CustomViewModels
{
public class StaticDoubleValueNodeCustomViewModel : CustomNodeViewModel
{
private readonly StaticDoubleValueNode _node;
public StaticDoubleValueNodeCustomViewModel(StaticDoubleValueNode node) : base(node)
public StaticDoubleValueNodeCustomViewModel(INode node) : base(node)
{
_node = node;
}
public double Input
{
get => (double) (_node.Storage ?? 0.0);
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
public class StaticFloatValueNodeCustomViewModel : CustomNodeViewModel
{
private readonly StaticFloatValueNode _node;
public StaticFloatValueNodeCustomViewModel(StaticFloatValueNode node) : base(node)
public StaticFloatValueNodeCustomViewModel(INode node) : base(node)
{
_node = node;
}
public float Input
{
get => (float) (_node.Storage ?? 0f);
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
public class StaticIntegerValueNodeCustomViewModel : CustomNodeViewModel
{
private readonly StaticIntegerValueNode _node;
public StaticIntegerValueNodeCustomViewModel(StaticIntegerValueNode node) : base(node)
public StaticIntegerValueNodeCustomViewModel(INode node) : base(node)
{
_node = node;
}
public int Input
{
get => _node.Storage is long longInput ? (int) longInput : (int) (_node.Storage ?? 0);
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
public class StaticStringValueNodeCustomViewModel : CustomNodeViewModel
{
private readonly StaticStringValueNode _node;
public StaticStringValueNodeCustomViewModel(StaticStringValueNode node) : base(node)
public StaticStringValueNodeCustomViewModel(INode node) : base(node)
{
_node = node;
}
public string Input
{
get => (string) _node.Storage;
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
}

2
src/Artemis.VisualScripting/Nodes/CustomViews/EnumEqualsNodeCustomView.xaml
View File

@ -12,7 +12,7 @@
materialDesign:ComboBoxAssist.ClassicMode="True"
VerticalAlignment="Center"
HorizontalAlignment="Stretch"
SelectedValue="{Binding Input}"
SelectedValue="{Binding Node.Storage}"
ItemsSource="{Binding EnumValues}"
SelectedValuePath="Value"
DisplayMemberPath="Description">

2
src/Artemis.VisualScripting/Nodes/CustomViews/StaticDoubleValueNodeCustomView.xaml
View File

@ -8,5 +8,5 @@
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Center"
HorizontalAlignment="Stretch"
Text="{Binding Input}" />
Text="{Binding Node.Storage}" />
</UserControl>

2
src/Artemis.VisualScripting/Nodes/CustomViews/StaticFloatValueNodeCustomView.xaml
View File

@ -8,5 +8,5 @@
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Center"
HorizontalAlignment="Stretch"
Text="{Binding Input}" />
Text="{Binding Node.Storage}" />
</UserControl>

2
src/Artemis.VisualScripting/Nodes/CustomViews/StaticIntegerValueNodeCustomView.xaml
View File

@ -8,5 +8,5 @@
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Center"
HorizontalAlignment="Stretch"
Text="{Binding Input}" />
Text="{Binding Node.Storage}" />
</UserControl>

2
src/Artemis.VisualScripting/Nodes/CustomViews/StaticStringValueNodeCustomView.xaml
View File

@ -8,5 +8,5 @@
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Center"
HorizontalAlignment="Stretch"
Text="{Binding Input}" />
Text="{Binding Node.Storage}" />
</UserControl>

156
src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventNode.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Artemis.Core;
using Artemis.Core.Events;
@ -8,19 +9,69 @@ using Artemis.VisualScripting.Nodes.DataModel.CustomViewModels;
namespace Artemis.VisualScripting.Nodes.DataModel
{
[Node("Data Model-Event", "Responds to a data model event trigger", "External", OutputType = typeof(bool))]
public class DataModelEventNode : Node<DataModelEventNodeCustomViewModel>, IDisposable
public class DataModelEventNode : Node<DataModelPathEntity, DataModelEventNodeCustomViewModel>, IDisposable
{
private DataModelPath _dataModelPath;
private DateTime _lastTrigger;
private int _currentIndex;
private Type _currentType;
private bool _updating;
public DataModelEventNode() : base("Data Model-Event", "Responds to a data model event trigger")
{
Input = CreateInputPin<object>();
Input.PinConnected += InputOnPinConnected;
_currentType = typeof(object);
CreateCycleValues(typeof(object), 1);
Output = CreateOutputPin(typeof(object));
}
public InputPin<object> Input { get; }
private void CreateCycleValues(Type type, int initialCount)
{
if (CycleValues != null)
{
CycleValues.PinAdded -= CycleValuesOnPinAdded;
CycleValues.PinRemoved -= CycleValuesOnPinRemoved;
foreach (IPin pin in CycleValues)
{
pin.PinConnected -= OnPinConnected;
pin.PinDisconnected -= OnPinDisconnected;
}
RemovePinCollection(CycleValues);
}
CycleValues = CreateInputPinCollection(type, "", initialCount);
CycleValues.PinAdded += CycleValuesOnPinAdded;
CycleValues.PinRemoved += CycleValuesOnPinRemoved;
foreach (IPin pin in CycleValues)
{
pin.PinConnected += OnPinConnected;
pin.PinDisconnected += OnPinDisconnected;
}
}
private void CycleValuesOnPinAdded(object sender, SingleValueEventArgs<IPin> e)
{
e.Value.PinConnected += OnPinConnected;
e.Value.PinDisconnected += OnPinDisconnected;
}
private void CycleValuesOnPinRemoved(object sender, SingleValueEventArgs<IPin> e)
{
e.Value.PinConnected -= OnPinConnected;
e.Value.PinDisconnected -= OnPinDisconnected;
}
private void OnPinDisconnected(object sender, SingleValueEventArgs<IPin> e)
{
ProcessPinDisconnected();
}
private void OnPinConnected(object sender, SingleValueEventArgs<IPin> e)
{
IPin source = e.Value;
IPin target = (IPin) sender;
ProcessPinConnected(source, target);
}
public InputPinCollection CycleValues { get; set; }
public OutputPin Output { get; set; }
@ -35,70 +86,101 @@ namespace Artemis.VisualScripting.Nodes.DataModel
public override void Initialize(INodeScript script)
{
Script = script;
CreateCycleValues();
CreateOutput();
if (Storage is not DataModelPathEntity pathEntity)
if (Storage == null)
return;
DataModelPath = new DataModelPath(pathEntity);
DataModelPath = new DataModelPath(Storage);
}
public override void Evaluate()
{
object outputValue = null;
if (DataModelPath?.GetValue() is DataModelEvent dataModelEvent)
if (DataModelPath?.GetValue() is IDataModelEvent dataModelEvent)
{
if (dataModelEvent.LastTrigger > _lastTrigger)
{
_lastTrigger = dataModelEvent.LastTrigger;
_currentIndex++;
if (_currentIndex > CycleValues.Count())
if (_currentIndex >= CycleValues.Count())
_currentIndex = 0;
}
outputValue = _currentIndex == 0
? Input.Value
: CycleValues.ElementAt(_currentIndex - 1).PinValue;
outputValue = CycleValues.ElementAt(_currentIndex).PinValue;
}
Output.Value = outputValue ?? Output.Type.GetDefault();
if (Output.Type.IsInstanceOfType(outputValue))
Output.Value = outputValue;
else if (Output.Type.IsValueType)
Output.Value = Output.Type.GetDefault()!;
}
private void InputOnPinConnected(object sender, SingleValueEventArgs<IPin> e)
private void ProcessPinConnected(IPin source, IPin target)
{
CreateCycleValues();
CreateOutput();
}
if (_updating)
return;
private void CreateCycleValues()
{
int pinCount = CycleValues?.Count() ?? 1;
Type inputType = Input.ConnectedTo.FirstOrDefault()?.Type ?? typeof(object);
if (CycleValues != null)
try
{
if (inputType == CycleValues.Type)
return;
RemovePinCollection(CycleValues);
}
_updating = true;
CycleValues = CreateInputPinCollection(inputType, "", pinCount);
// No need to change anything if the types haven't changed
if (_currentType == source.Type)
return;
int reconnectIndex = CycleValues.ToList().IndexOf(target);
ChangeCurrentType(source.Type);
if (reconnectIndex != -1)
{
CycleValues.ToList()[reconnectIndex].ConnectTo(source);
source.ConnectTo(CycleValues.ToList()[reconnectIndex]);
}
}
finally
{
_updating = false;
}
}
private void CreateOutput()
private void ChangeCurrentType(Type type)
{
Type inputType = Input.ConnectedTo.FirstOrDefault()?.Type ?? typeof(object);
if (Output != null)
CreateCycleValues(type, CycleValues.Count());
List<IPin> oldOutputConnections = Output.ConnectedTo.ToList();
RemovePin(Output);
Output = CreateOutputPin(type);
foreach (IPin oldOutputConnection in oldOutputConnections.Where(o => o.Type.IsAssignableFrom(Output.Type)))
{
if (inputType == Output.Type)
return;
RemovePin(Output);
oldOutputConnection.DisconnectAll();
oldOutputConnection.ConnectTo(Output);
Output.ConnectTo(oldOutputConnection);
}
Output = CreateOutputPin(inputType);
_currentType = type;
}
private void ProcessPinDisconnected()
{
if (_updating)
return;
try
{
// If there's still a connected pin, stick to the current type
if (CycleValues.Any(v => v.ConnectedTo.Any()))
return;
ChangeCurrentType(typeof(object));
}
finally
{
_updating = false;
}
}
private void UpdatePinsType(IPin source)
{
}
/// <inheritdoc />

6
src/Artemis.VisualScripting/Nodes/DataModel/DataModelNode.cs
View File

@ -7,7 +7,7 @@ using Stylet;
namespace Artemis.VisualScripting.Nodes.DataModel
{
[Node("Data Model-Value", "Outputs a selectable data model value.", "External")]
public class DataModelNode : Node<DataModelNodeCustomViewModel>, IDisposable
public class DataModelNode : Node<DataModelPathEntity, DataModelNodeCustomViewModel>, IDisposable
{
private DataModelPath _dataModelPath;
@ -28,10 +28,10 @@ namespace Artemis.VisualScripting.Nodes.DataModel
{
Script = script;
if (Storage is not DataModelPathEntity pathEntity)
if (Storage == null)
return;
DataModelPath = new DataModelPath(pathEntity);
DataModelPath = new DataModelPath(Storage);
DataModelPath.PathValidated += DataModelPathOnPathValidated;
UpdateOutputPin(false);

15
src/Artemis.VisualScripting/Nodes/Easing/CustomViewModels/EasingTypeNodeCustomViewModel.cs
View File

@ -15,9 +15,7 @@ namespace Artemis.VisualScripting.Nodes.Easing.CustomViewModels
public EasingTypeNodeCustomViewModel(EasingTypeNode node) : base(node)
{
_node = node;
EasingViewModels = new BindableCollection<NodeEasingViewModel>(Enum.GetValues(typeof(Easings.Functions))
.Cast<Easings.Functions>()
.Select(e => new NodeEasingViewModel(e)));
EasingViewModels = new BindableCollection<NodeEasingViewModel>(Enum.GetValues(typeof(Easings.Functions)).Cast<Easings.Functions>().Select(e => new NodeEasingViewModel(e)));
}
public BindableCollection<NodeEasingViewModel> EasingViewModels { get; }
@ -35,7 +33,7 @@ namespace Artemis.VisualScripting.Nodes.Easing.CustomViewModels
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
SelectedEasingViewModel = EasingViewModels.FirstOrDefault(vm => vm.EasingFunction == _node.EasingFunction);
SelectedEasingViewModel = GetNodeEasingViewModel();
}
public override void OnDeactivate()
@ -45,11 +43,16 @@ namespace Artemis.VisualScripting.Nodes.Easing.CustomViewModels
private void NodeOnPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
if (e.PropertyName == nameof(_node.Storage))
{
_selectedEasingViewModel = EasingViewModels.FirstOrDefault(vm => vm.EasingFunction == _node.EasingFunction);
_selectedEasingViewModel = GetNodeEasingViewModel();
NotifyOfPropertyChange(nameof(SelectedEasingViewModel));
}
}
private NodeEasingViewModel GetNodeEasingViewModel()
{
return EasingViewModels.FirstOrDefault(vm => vm.EasingFunction == _node.Storage);
}
}
}

5
src/Artemis.VisualScripting/Nodes/Easing/EasingTypeNode.cs
View File

@ -4,7 +4,7 @@ using Artemis.VisualScripting.Nodes.Easing.CustomViewModels;
namespace Artemis.VisualScripting.Nodes.Easing
{
[Node("Easing Type", "Outputs a selectable easing type.", "Easing", OutputType = typeof(Easings.Functions))]
public class EasingTypeNode : Node<EasingTypeNodeCustomViewModel>
public class EasingTypeNode : Node<Easings.Functions, EasingTypeNodeCustomViewModel>
{
public EasingTypeNode() : base("Easing Type", "Outputs a selectable easing type.")
{
@ -12,11 +12,10 @@ namespace Artemis.VisualScripting.Nodes.Easing
}
public OutputPin<Easings.Functions> Output { get; }
public Easings.Functions EasingFunction => Storage as Easings.Functions? ?? Easings.Functions.Linear;
public override void Evaluate()
{
Output.Value = EasingFunction;
Output.Value = Storage;
}
}
}

3
src/Artemis.VisualScripting/Nodes/EnumEqualsNode.cs
View File

@ -1,12 +1,11 @@
using System;
using Artemis.Core;
using Artemis.Core.Events;
using Artemis.VisualScripting.Nodes.CustomViewModels;
namespace Artemis.VisualScripting.Nodes
{
[Node("Enum Equals", "Determines the equality between an input and a selected enum value", InputType = typeof(Enum), OutputType = typeof(bool))]
public class EnumEqualsNode : Node<EnumEqualsNodeCustomViewModel>
public class EnumEqualsNode : Node<Enum, EnumEqualsNodeCustomViewModel>
{
public EnumEqualsNode() : base("Enum Equals", "Determines the equality between an input and a selected enum value")
{

14
src/Artemis.VisualScripting/Nodes/LayerPropertyNode.cs
View File

@ -7,7 +7,7 @@ using Artemis.VisualScripting.Nodes.CustomViewModels;
namespace Artemis.VisualScripting.Nodes
{
[Node("Layer/Folder Property", "Outputs the property of a selected layer or folder", "External")]
public class LayerPropertyNode : Node<LayerPropertyNodeCustomViewModel>
public class LayerPropertyNode : Node<LayerPropertyNodeEntity, LayerPropertyNodeCustomViewModel>
{
private readonly object _layerPropertyLock = new();
@ -44,7 +44,7 @@ namespace Artemis.VisualScripting.Nodes
{
Script = script;
if (script.Context is Profile profile)
if (script.Context is Profile profile)
profile.ChildRemoved += ProfileOnChildRemoved;
LoadLayerProperty();
@ -54,15 +54,13 @@ namespace Artemis.VisualScripting.Nodes
{
lock (_layerPropertyLock)
{
if (Script.Context is not Profile profile)
if (Script.Context is not Profile profile || Storage == null)
return;
if (Storage is not LayerPropertyNodeEntity entity)
return;
RenderProfileElement element = profile.GetAllRenderElements().FirstOrDefault(l => l.EntityId == entity.ElementId);
RenderProfileElement element = profile.GetAllRenderElements().FirstOrDefault(l => l.EntityId == Storage.ElementId);
ProfileElement = element;
LayerProperty = element?.GetAllLayerProperties().FirstOrDefault(p => p.Path == entity.PropertyPath);
LayerProperty = element?.GetAllLayerProperties().FirstOrDefault(p => p.Path == Storage.PropertyPath);
CreatePins();
}
}

29
src/Artemis.VisualScripting/Nodes/Maths/CustomViewModels/MathExpressionNodeCustomViewModel.cs
View File

@ -1,37 +1,12 @@
using System.ComponentModel;
using Artemis.Core;
using Artemis.VisualScripting.Nodes.CustomViewModels;
namespace Artemis.VisualScripting.Nodes.Maths.CustomViewModels
{
public class MathExpressionNodeCustomViewModel : CustomNodeViewModel
{
private readonly MathExpressionNode _node;
public MathExpressionNodeCustomViewModel(MathExpressionNode node) : base(node)
public MathExpressionNodeCustomViewModel(INode node) : base(node)
{
_node = node;
}
public string Input
{
get => (string)_node.Storage;
set => _node.Storage = value;
}
public override void OnActivate()
{
_node.PropertyChanged += NodeOnPropertyChanged;
}
public override void OnDeactivate()
{
_node.PropertyChanged -= NodeOnPropertyChanged;
}
private void NodeOnPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Node.Storage))
OnPropertyChanged(nameof(Input));
}
}
}

2
src/Artemis.VisualScripting/Nodes/Maths/CustomViews/MathExpressionNodeCustomView.xaml
View File

@ -8,5 +8,5 @@
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"
Text="{Binding Input}" />
Text="{Binding Node.Storage}" />
</UserControl>

9
src/Artemis.VisualScripting/Nodes/Maths/ExpressionNode.cs
View File

@ -9,12 +9,13 @@ using NoStringEvaluating.Models.Values;
namespace Artemis.VisualScripting.Nodes.Maths
{
[Node("Math Expression", "Outputs the result of a math expression.", "Math", OutputType = typeof(int))]
public class MathExpressionNode : Node<MathExpressionNodeCustomViewModel>
public class MathExpressionNode : Node<string, MathExpressionNodeCustomViewModel>
{
private readonly INoStringEvaluator _evaluator;
private readonly PinsVariablesContainer _variables;
#region Constructors
public MathExpressionNode(INoStringEvaluator evaluator)
: base("Math Expression", "Outputs the result of a math expression.")
{
@ -24,7 +25,7 @@ namespace Artemis.VisualScripting.Nodes.Maths
Values.PinAdded += (_, _) => SetPinNames();
Values.PinRemoved += (_, _) => SetPinNames();
_variables = new PinsVariablesContainer(Values);
SetPinNames();
}
@ -41,8 +42,8 @@ namespace Artemis.VisualScripting.Nodes.Maths
public override void Evaluate()
{
if (Storage is string formula)
Output.Value = (float) _evaluator.CalcNumber(formula, _variables);
if (Storage != null)
Output.Value = (float) _evaluator.CalcNumber(Storage, _variables);
}
private void SetPinNames()

23
src/Artemis.VisualScripting/Nodes/StaticValueNodes.cs
View File

@ -4,7 +4,7 @@ using Artemis.VisualScripting.Nodes.CustomViewModels;
namespace Artemis.VisualScripting.Nodes
{
[Node("Integer-Value", "Outputs an configurable integer value.", "Static", OutputType = typeof(int))]
public class StaticIntegerValueNode : Node<StaticIntegerValueNodeCustomViewModel>
public class StaticIntegerValueNode : Node<int, StaticIntegerValueNodeCustomViewModel>
{
#region Properties & Fields
@ -26,16 +26,14 @@ namespace Artemis.VisualScripting.Nodes
public override void Evaluate()
{
Output.Value = Storage as int? ?? 0;
Output.Value = Storage;
}
public override void Initialize(INodeScript script) => Storage ??= 0;
#endregion
}
[Node("Double-Value", "Outputs a configurable double value.", "Static", OutputType = typeof(double))]
public class StaticDoubleValueNode : Node<StaticDoubleValueNodeCustomViewModel>
public class StaticDoubleValueNode : Node<double, StaticDoubleValueNodeCustomViewModel>
{
#region Properties & Fields
@ -60,13 +58,11 @@ namespace Artemis.VisualScripting.Nodes
Output.Value = Storage as double? ?? 0.0;
}
public override void Initialize(INodeScript script) => Storage ??= 0.0;
#endregion
}
[Node("Float-Value", "Outputs a configurable float value.", "Static", OutputType = typeof(float))]
public class StaticFloatValueNode : Node<StaticFloatValueNodeCustomViewModel>
public class StaticFloatValueNode : Node<float, StaticFloatValueNodeCustomViewModel>
{
#region Properties & Fields
@ -88,19 +84,14 @@ namespace Artemis.VisualScripting.Nodes
public override void Evaluate()
{
if (Storage is double doubleValue)
Storage = (float) doubleValue;
Output.Value = Storage as float? ?? 0.0f;
Output.Value = Storage;
}
public override void Initialize(INodeScript script) => Storage ??= 0.0f;
#endregion
}
[Node("String-Value", "Outputs a configurable string value.", "Static", OutputType = typeof(string))]
public class StaticStringValueNode : Node<StaticStringValueNodeCustomViewModel>
public class StaticStringValueNode : Node<string, StaticStringValueNodeCustomViewModel>
{
#region Properties & Fields
@ -122,7 +113,7 @@ namespace Artemis.VisualScripting.Nodes
public override void Evaluate()
{
Output.Value = Storage as string;
Output.Value = Storage;
}
#endregion