DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 20:06:33 +00:00
Code Issues Releases Wiki Activity

Nodes - Lock nodes while resetting

Browse Source 
Nodes - Added more boolean operators
Nodes - Fix number comparisons
This commit is contained in:
Robert committed 2021-09-29 21:43:12 +02:00
1 parent 43b7b8345c
commit 0058322936
13 files changed
+218 -253
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventNode.cs
+1 -1
View File
@@ -8,7 +8,7 @@ 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))]
[Node("Data Model-Event", "Responds to a data model event trigger", "Data Model", OutputType = typeof(bool))]
public class DataModelEventNode : Node<DataModelPathEntity, DataModelEventNodeCustomViewModel>, IDisposable
{
private DataModelPath _dataModelPath;
src/Artemis.VisualScripting/Nodes/DataModel/DataModelNode.cs
+20 -6
View File
@@ -5,7 +5,7 @@ using Artemis.VisualScripting.Nodes.DataModel.CustomViewModels;
namespace Artemis.VisualScripting.Nodes.DataModel
{
[Node("Data Model-Value", "Outputs a selectable data model value.", "External")]
[Node("Data Model-Value", "Outputs a selectable data model value.", "Data Model")]
public class DataModelNode : Node<DataModelPathEntity, DataModelNodeCustomViewModel>, IDisposable
{
private DataModelPath _dataModelPath;
@@ -44,14 +44,29 @@ namespace Artemis.VisualScripting.Nodes.DataModel
UpdateOutputPin(false);
object pathValue = DataModelPath.GetValue();
if (pathValue != null)
Output.Value = pathValue;
if (pathValue == null)
{
if (!Output.Type.IsValueType)
Output.Value = null;
}
else
{
if (pathValue is double doublePathValue)
Output.Value = (float) doublePathValue;
else
Output.Value = pathValue;
}
}
}
public void UpdateOutputPin(bool loadConnections)
{
if (Output != null && Output.Type == DataModelPath?.GetPropertyType())
Type type = DataModelPath?.GetPropertyType();
if (type == typeof(double))
type = typeof(float);
if (Output != null && Output.Type == type)
return;
if (Output != null)
@@ -60,8 +75,7 @@ namespace Artemis.VisualScripting.Nodes.DataModel
Output = null;
}
Type type = DataModelPath?.GetPropertyType();
if (type != null)
if (type != null)
Output = CreateOutputPin(type);
if (loadConnections && Script is NodeScript nodeScript)