hzhang/Enigmos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade

Browse Source
This commit is contained in:
h z
2024-07-12 14:32:16 +01:00
parent 5548a7243b
commit 1df3c08a9e
20 changed files with 119 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Boards/BaseBoard.cs
View File

@@ -1,3 +1,4 @@
using Alchegos.DataStructure;
using Enigmos.Cables;
using Enigmos.Modules;
using Enigmos.Modules.ProgrammableModules;
@@ -47,7 +48,7 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
cable.Modulate = Color.Color8(255, 255, 255, (Byte)(CableVisualMode ? 20 : 255));
}
public IModuleManualLayer? ModuleManualLayer { get; set; }
public IModuleManualLayer ModuleManualLayer { get; set; }
public bool ManualOpened { get; set; }
protected HashSet<IBaseModule> Modules { get; set; } = new();
@@ -59,9 +60,8 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
Modules
.OfType<ITerminalModule>()
.Union(ProgrammableModules().SelectMany(module => module.UnderlyingBoard!.TerminalModules));
protected HashSet<IBasePort> Ports => Modules.SelectMany(module => module.Ports).ToHashSet();
public IPanelViewer? PanelViewer { get; set; }
public IPanelViewer PanelViewer { get; set; }
public Dictionary<IBasePort, IBaseCable> CablePairing { get; set; } = new();
public IEnumerable<IBasePort> OnBoardPorts
@@ -74,9 +74,9 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
return res;
}
}
public IBasePort? ConnectPending { get; set; }
public IBoardControlLayer? CircuitBoardControlLayer { get; set; }
public IModuleMovingLayer? ModuleMovingLayer { get; set; }
public IBasePort ConnectPending { get; set; }
public IBoardControlLayer CircuitBoardControlLayer { get; set; }
public IModuleMovingLayer ModuleMovingLayer { get; set; }
public virtual void Init()
{
@@ -84,17 +84,18 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
Modules = new HashSet<IBaseModule>();
FocusedCables = new HashSet<IBaseCable>();
ConnectPending = null;
}
public override void _Ready()
{
base._Ready();
ModuleManualLayer = GetNode<IModuleManualLayer>("ModuleManualLayer");
ModuleMovingLayer = GetNode<IModuleMovingLayer>("ModuleMovingLayer");
ModuleMovingLayer.Board = this;
PanelViewer = GetNode<IPanelViewer>("PanelViewer");
CircuitBoardControlLayer = GetNode<IBoardControlLayer>("CircuitBoardControlLayer");
CircuitBoardControlLayer.Board = this;
}
public override void _Ready()
{
base._Ready();
}
@@ -156,12 +157,12 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
public override bool _CanDropData(Vector2 atPosition, Variant data)
{
IVariantWithType vData = data.As<IVariantWithType>();
VariantWithType vData = data.As<VariantWithType>();
if (vData.TypeHint != "Module")
{
if(vData.TypeHint != "Item")
return false;
IBaseItem item = vData.UnderlyingData.As<IBaseItem>();
IBaseItem item = vData.UnderlyingData.As<Node>() as IBaseItem;
if (item is IBaseModuleItem moduleItem)
{
foreach (IBaseModule module in Modules)
@@ -187,7 +188,7 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
}
public override void _DropData(Vector2 atPosition, Variant data)
{
IVariantWithType vData = data.As<IVariantWithType>();
VariantWithType vData = data.As<VariantWithType>();
if(vData.TypeHint == "Module")
{
BaseModule vModule = vData.UnderlyingData.As<BaseModule>();
@@ -196,7 +197,7 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
}
else
{
IBaseModuleItem moduleItem = vData.UnderlyingData.As<IBaseModuleItem>();
IBaseModuleItem moduleItem = vData.UnderlyingData.As<Node>() as IBaseModuleItem;
AddModule(moduleItem.ContentModule, atPosition);
ItemDraggingControl.Instance.DraggingFrom!.Item = null;
}

13
Boards/FilterModuleBoard.cs
View File

@@ -7,17 +7,13 @@ using Nocturnis.GlobalManagement.Constants;
namespace Enigmos.Boards;
public partial class FilterModuleBoard : BaseBoard, ISceneConcept
{
public FilterModule? FilterModule { get; set; }
public FilterModule FilterModule { get; set; }
public FilterInputProviderModule? InputProvider { get; set; }
public FilterInputProviderModule InputProvider { get; set; }
public IInterlayerDataOutModule[] FilterInputProxy { get; set; } = Array.Empty<IInterlayerDataOutModule>();
//public IInterlayerDataOutModule[] Outputs { get; set; } = Array.Empty<IInterlayerDataOutModule>();
//public XIterativeOutputModule? IterativeOutput { get; set; }
//public IDataInPort? Indicate { get; set; }
//public IndicateInputModule? Indicate { get; set; }
public FilterIndicateModule? Indicate { get; set; }
public FilterIndicateModule Indicate { get; set; }
public void Init(FilterModule filterModule)
{
@@ -29,7 +25,6 @@ public partial class FilterModuleBoard : BaseBoard, ISceneConcept
for (int i = 1; i <= 3; i++)
FilterInputProxy[i - 1] = GetModule<InterlayerDataOutModule>($"IO{i}");
base.Init();
//IterativeOutput = GetModule<XIterativeOutputModule>("IterativeOutput");
Indicate = GetModule<FilterIndicateModule>("Indicate");
Indicate.Indicate!.SetDataType(DataTypeConstant.BaseDataTypes.Bit);
}

8
Enigmos.csproj
View File

@@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--Project Sdk="Microsoft.NET.Sdk"-->
<Project Sdk="Godot.NET.Sdk/4.3.0-beta.3">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GodotSharp" Version="4.3.0-beta.2" />
<PackageReference Include="GodotSharp" Version="4.3.0-beta.3" />
</ItemGroup>
<ItemGroup>

59
Manual/ModuleManual.cs
View File

@@ -7,7 +7,7 @@ using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Manual;
public abstract partial class ModuleManual : Panel, ISceneConcept
public abstract partial class ModuleManual : Panel, ISceneConcept, IModuleManual
{
private bool InitFlag { get; set; }
@@ -17,14 +17,14 @@ public abstract partial class ModuleManual : Panel, ISceneConcept
InitFlag = true;
}
private Label? ModuleDescriptionTitle { get; set; }
private RichTextLabel? ModuleDescription { get; set; }
private Label? ModuleConfigurationTitle { get; set; }
private TextureButton? Close { get; set; }
private TabContainer? ConfigurationTabs { get; set; }
private IBaseModule? Module { get; set; }
private Label ModuleDescriptionTitle { get; set; }
private RichTextLabel ModuleDescription { get; set; }
private Label ModuleConfigurationTitle { get; set; }
private TextureButton Close { get; set; }
private TabContainer ConfigurationTabs { get; set; }
private IBaseModule Module { get; set; }
private List<IModuleManualTab> Tabs { get; set; } = new();
private LineEdit? LabelString { get; set; }
private LineEdit LabelString { get; set; }
public override void _Ready()
{
if(!InitFlag)
@@ -38,58 +38,47 @@ public abstract partial class ModuleManual : Panel, ISceneConcept
LabelString = GetNode<LineEdit>("LabelString");
LabelString.Text = Module.LabelString;
Tabs = new List<IModuleManualTab>();
PortMaintenanceTab mainTab = GlobalProvider
.AssetMapper<PortMaintenanceTab>.Scene
.Instantiate<PortMaintenanceTab>();
mainTab.Init(Module);
PortMaintenanceTab mainTab =
GlobalProvider.ProcessProvider.BuildPortMaintenanceTab(Module) as PortMaintenanceTab;
Tabs.Add(mainTab);
ConfigurationTabs.AddChild(mainTab);
if (Module is IPolymorphismModule polyModule)
{
ModulePolymorphismTab polyTab = GlobalProvider
.AssetMapper<ModulePolymorphismTab>.Scene
.Instantiate<ModulePolymorphismTab>();
polyTab.Init(polyModule);
ModulePolymorphismTab polyTab =
GlobalProvider.ProcessProvider.BuildModulePolymorphismTab(polyModule) as ModulePolymorphismTab;
Tabs.Add(polyTab);
ConfigurationTabs.AddChild(polyTab);
}
if (Module is IParameterizedModule paraModule)
{
ModuleParameterTab paraTab = GlobalProvider
.AssetMapper<ModuleParameterTab>.Scene
.Instantiate<ModuleParameterTab>();
paraTab.Init(paraModule);
ModuleParameterTab paraTab =
GlobalProvider.ProcessProvider.BuildModuleParameterTab(paraModule) as ModuleParameterTab;
Tabs.Add(paraTab);
ConfigurationTabs.AddChild(paraTab);
}
if (Module is ICommunicateModule comModule)
{
CommunicatorPairTab pairTab = GlobalProvider
.AssetMapper<CommunicatorPairTab>.Scene
.Instantiate<CommunicatorPairTab>();
pairTab.Init(comModule);
CommunicatorPairTab pairTab =
GlobalProvider.ProcessProvider.BuildCommunicatorPairTab(comModule) as CommunicatorPairTab;
Tabs.Add(pairTab);
ConfigurationTabs.AddChild(pairTab);
}
if (Module is ProgrammableModule programmableModule)
if (Module is IProgrammableModule progModule)
{
ProgrammableModuleSettingTab progTab =GlobalProvider
.AssetMapper<ProgrammableModuleSettingTab>.Scene
.Instantiate<ProgrammableModuleSettingTab>();
progTab.Init(programmableModule);
ProgrammableModuleSettingTab progTab =
GlobalProvider.ProcessProvider.BuildProgrammableModuleSettingTab(progModule) as ProgrammableModuleSettingTab;
Tabs.Add(progTab);
ConfigurationTabs.AddChild(progTab);
}
if (Module is IErrorHandlerModule errorHandlerModule)
if (Module is IErrorHandlerModule errModule)
{
ErrorHandlerTab errTab = GlobalProvider
.AssetMapper<ErrorHandlerTab>.Scene
.Instantiate<ErrorHandlerTab>();
errTab.Init(errorHandlerModule);
ErrorHandlerTab errTab = GlobalProvider.ProcessProvider.BuildErrorHandlerTab(errModule) as ErrorHandlerTab;
Tabs.Add(errTab);
ConfigurationTabs.AddChild(errTab);
}

2
Manual/ModuleParameterSetter.cs
View File

@@ -3,7 +3,7 @@ using Nocturnis.DataStructures.ConfigurableParameters;
namespace Enigmos.Manual;
public abstract partial class ModuleParameterSetter : Control
public abstract partial class ModuleParameterSetter : Control, IModuleParameterSetter
{
protected bool InitFlag { get; set; }
public IConfigurableParameter UnderlyingParameter { get; set; }

26
Manual/ModuleParameterTab.cs
View File

@@ -30,37 +30,27 @@ public partial class ModuleParameterTab : Panel, IModuleManualTab, ISceneConcept
{
if(parameter is IDoubleParameter doubleParameter)
{
ModuleRealValueParameterSetter setter = GlobalProvider
.AssetMapper<ModuleRealValueParameterSetter>.Scene
.Instantiate<ModuleRealValueParameterSetter>();
setter.Init(doubleParameter);
ModuleRealValueParameterSetter setter = GlobalProvider.ProcessProvider
.BuildModuleRealValueParameterSetter(doubleParameter) as ModuleRealValueParameterSetter;
Parameters.AddChild(setter);
}
else if (parameter is IBoolParameter boolParameter)
{
ModuleBoolValueParameterSetter setter = GlobalProvider
.AssetMapper<ModuleBoolValueParameterSetter>.Scene
.Instantiate<ModuleBoolValueParameterSetter>();
setter.Init(boolParameter);
ModuleBoolValueParameterSetter setter = GlobalProvider.ProcessProvider
.BuildModuleBoolValueParameterSetter(boolParameter) as ModuleBoolValueParameterSetter;
Parameters.AddChild(setter);
}
else if (parameter is ICharParameter charParameter)
{
ModuleCharValueParameterSetter setter =
GlobalProvider
.AssetMapper<ModuleCharValueParameterSetter>.Scene
.Instantiate<ModuleCharValueParameterSetter>();
setter.Init(charParameter);
ModuleCharValueParameterSetter setter = GlobalProvider.ProcessProvider
.BuildModuleCharValueParameterSetter(charParameter) as ModuleCharValueParameterSetter;
Parameters.AddChild(setter);
}
else if (parameter is IKeyParameter keyParameter)
{
ModuleKeyValueParameterSetter setter =
GlobalProvider
.AssetMapper<ModuleKeyValueParameterSetter>.Scene
.Instantiate<ModuleKeyValueParameterSetter>();
setter.Init(keyParameter);
ModuleKeyValueParameterSetter setter = GlobalProvider.ProcessProvider
.BuildModuleKeyValueParameterSetter(keyParameter) as ModuleKeyValueParameterSetter;
Parameters.AddChild(setter);
}
}

15
Manual/PortTypeSelector.cs
View File

@@ -1,6 +1,7 @@
using Godot;
using Nocturnis;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Manual;
@@ -18,20 +19,20 @@ public partial class PortTypeSelector : Control, ISceneConcept
/// <summary>
/// Underlying Group must be set before _Ready
/// </summary>
public IDataPortGroup? UnderlyingGroup { get; set; }
private Label? Description { get; set; }
private OptionButton? TypeOptions { get; set; }
public IDataPortGroup UnderlyingGroup { get; set; }
private Label Description { get; set; }
private OptionButton TypeOptions { get; set; }
public override void _Ready()
{
if (!InitFlag)
throw new Exception("TODO - NEED INIT");
Description = GetNode<Label>("Description");
TypeOptions = GetNode<OptionButton>("TypeOptions");
TypeOptions.Clear();
for (int idx = 0; idx < UnderlyingGroup!.TypeOptions.Length; idx++)
TypeOptions.AddIconItem(GlobalProvider.EnigmosProvider!.DataPortTypeMap[UnderlyingGroup.TypeOptions[idx]], "", idx);
TypeOptions!.Clear();
for (int idx = 0; idx < UnderlyingGroup!.TypeOptions.Count; idx++)
TypeOptions.AddIconItem(GlobalProvider.DataTypeTexture[UnderlyingGroup.TypeOptions[idx].Type], "", idx);
Description.Text = UnderlyingGroup.Description;
TypeOptions.Select(Array.IndexOf(UnderlyingGroup.TypeOptions, UnderlyingGroup.SelectedType));
TypeOptions.Select(UnderlyingGroup.TypeOptions.IndexOf(UnderlyingGroup.SelectedType));
}
private void SetType(int index)

9
Manual/ProgrammableModuleSettingTab.cs
View File

@@ -2,17 +2,18 @@ using Enigmos.Modules.ProgrammableModules;
using Godot;
using Nocturnis;
using Nocturnis.Enigmos.ModuleManuals;
using Nocturnis.Enigmos.Modules;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Manual;
public abstract partial class ProgrammableModuleSettingTab : Panel, IModuleManualTab, ISceneConcept
{
private ProgrammableModule? Module { get; set; }
private IProgrammableModule Module { get; set; }
private Button? EditModule { get; set; }
private Button EditModule { get; set; }
public void Init(ProgrammableModule module)
public void Init(IProgrammableModule module)
{
Module = module;
}
@@ -28,7 +29,7 @@ public abstract partial class ProgrammableModuleSettingTab : Panel, IModuleManua
private void EnterProgrammableBoard()
{
GlobalProvider.SceneProvider!.RootScene.ChangeScene(Module!.UnderlyingBoard);
GlobalProvider.SceneProvider!.RootScene.ChangeScene(Module!.UnderlyingBoard.AsNode());
}
}

40
Modules/BaseModule.cs
View File

@@ -1,9 +1,9 @@
using Enigmos.Exceptions;
using Enigmos.Manual;
using Godot;
using Nocturnis;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Boards;
using Nocturnis.Enigmos.Cables;
using Nocturnis.Enigmos.ModuleManuals;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers;
@@ -15,7 +15,8 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
[Export] private int PresetPortQuality { get; set; }
[Export] private int PresetPortCondition { get; set; }
[Export] protected bool UsingPreset { get; set; }
[Export] public IPresetModuleConnection[] PresetConnections { get; set; } = Array.Empty<IPresetModuleConnection>();
//[Export]
public IPresetModuleConnection[] PresetConnections { get; set; } = Array.Empty<IPresetModuleConnection>();
[Export] public string LabelString { get; set; } = "";
public virtual Vector2 PositionToBoard => Position;
@@ -24,9 +25,9 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
public bool HasLabel => HasManual;
public virtual IEnumerable<IBasePort> Ports => GetChildren().OfType<IBasePort>();
public IBaseBoard? Board { get; set; }
private ModuleManual? Manual { get; set; }
public Label? Label { get; set; }
public IBaseBoard Board { get; set; }
public IModuleManual Manual { get; set; }
public Label Label { get; set; }
public Node AsNode => this;
public virtual void PresetValueInit()
@@ -82,15 +83,6 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
PresetValueInit();
}
protected virtual void TimeoutCheck(IRootModule root)
{
if (root.Timer!.ElapsedMilliseconds < 25) return;
root.Timer.Stop();
throw ModuleExecutionTimeout.Exception;
}
protected virtual void TimeoutHandler(ModuleExecutionTimeout timeout) => throw timeout;
public override Variant _GetDragData(Vector2 atPosition)
{
if (!Draggable)
@@ -99,7 +91,6 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
Board!.ModuleMovingLayer.MouseOffset = GetLocalMousePosition();
return GlobalProvider.DataStructureProvider!.NewVariantWithType("Module", this);
}
public override void _Input(InputEvent @event)
{
if (@event is InputEventMouseButton eventMouseButton)
@@ -109,19 +100,11 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
{
if (eventMouseButton.ButtonIndex == MouseButton.Right && eventMouseButton.Pressed)
{
if (!HasManual)
return;
if (Board!.ManualOpened)
if (!HasManual || Board!.ManualOpened)
return;
if (Manual == null)
{
Manual = GlobalProvider
.AssetMapper<ModuleManual>.Scene
.Instantiate<ModuleManual>();
Manual.Init(this);
}
Board.ModuleManualLayer!.AddChild(Manual);
GlobalProvider.ProcessProvider.BuildManual(this);
Board.ModuleManualLayer!.AddChild(Manual.AsNode());
Manual.Position = Board.ModuleManualLayer.ManualPosition.Position - Manual.Size / 2;
Board.ManualOpened = true;
return;
@@ -150,7 +133,6 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
base._Input(@event);
}
//public Texture2D PreviewTexture => GlobalProvider.TextureProvider.ModuleTextureMapper(this);
public abstract Texture2D PreviewTexture { get; }
}

2
Modules/ComputationalModules/Binary/V2Module.cs
View File

@@ -61,7 +61,7 @@ public abstract partial class V2Module : BinaryComputationalModule,
public void Inference()
{
OutputGroup!.SelectedType = GlobalProvider.DataTypeProvider!.BuildType(OutputGroup.SelectedType, 1, 2);
OutputGroup!.SelectedType = GlobalProvider.DataTypeProvider!.ToVector(OutputGroup.SelectedType);
}
}

10
Modules/ComputationalModules/Nullary/KeyListenerModule.cs
View File

@@ -14,11 +14,11 @@ public abstract partial class KeyListenerModule : NullaryComputationalModule,
IKeyListenerModule,
IDuplicateOutputModule
{
[Export] private StringName? PresetActionName { get; set; }
private DataOutPort? Output1 { get; set; }
private DataOutPort? Output2 { get; set; }
private DataOutPort? Output3 { get; set; }
public IKeyParameter? ListeningKey { get; set; }
[Export] private StringName PresetActionName { get; set; }
private DataOutPort Output1 { get; set; }
private DataOutPort Output2 { get; set; }
private DataOutPort Output3 { get; set; }
public IKeyParameter ListeningKey { get; set; }
public bool Pressed { get; set; }
public HashSet<IConfigurableParameter> ConfigurableParameters { get; set; } = new();
public override void Init()

2
Modules/ComputationalModules/Unary/V2ComponentModule.cs
View File

@@ -65,4 +65,4 @@ public abstract partial class V2ComponentModule : UnaryComputationalModule, IPol
ScalarOutputGroup!.SelectedType = GlobalProvider.DataTypeProvider!
.GetBaseField(VectorInputGroup!.SelectedType);
}
}

3
Modules/ControllingModules/RootModule.cs
View File

@@ -7,7 +7,7 @@ namespace Enigmos.Modules.ControllingModules;
public abstract partial class RootModule : BaseModule, IRootModule
{
public bool ActionFinished { get; set; }
public IBaseCreature? ManagedBy { get; set; }
public IBaseCreature ManagedBy { get; set; }
public void Start()
{
SignalOutPorts[0].Route();
@@ -15,7 +15,6 @@ public abstract partial class RootModule : BaseModule, IRootModule
protected override bool Draggable => false;
public ISignalOutPort[] SignalOutPorts { get; set; } = Array.Empty<ISignalOutPort>();
public Stopwatch? Timer { get; set; }
public bool Visited { get; set; }
public override void Init()

6
Modules/ProgrammableModules/ProgrammableModule.cs
View File

@@ -1,5 +1,7 @@
using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules;
using Nocturnis;
using Nocturnis.Enigmos.Boards;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers;
@@ -8,8 +10,8 @@ namespace Enigmos.Modules.ProgrammableModules;
public abstract partial class ProgrammableModule : CompositeModule, IProgrammableModule
{
public BaseBoard? UnderlyingBoard { get; set; }
public void EnterProgrammableBoard() => GlobalProvider.SceneProvider!.RootScene.ChangeScene(UnderlyingBoard!);
public IBaseBoard UnderlyingBoard { get; set; }
public void EnterProgrammableBoard() => GlobalProvider.SceneProvider!.RootScene.ChangeScene(UnderlyingBoard.AsNode());
public abstract IEnumerable<IBasePort> ExplicitPorts { get; }
public abstract IEnumerable<IBasePort> ImplicitPorts { get; }
public override void UpdateCables()

6
Modules/SubModules/SubModule.cs
View File

@@ -3,12 +3,12 @@ using Nocturnis.Enigmos.Modules;
namespace Enigmos.Modules.SubModules;
public class SubModule : BaseModule
public partial class SubModule : BaseModule
{
public ICompositeModule? ParentModule { get; set; }
public ICompositeModule ParentModule { get; set; }
public sealed override Vector2 PositionToBoard =>
base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
protected sealed override bool Draggable => false;
protected sealed override bool HasManual => false;
public override Texture2D? PreviewTexture => null;
public override Texture2D PreviewTexture => null;
}

6
Modules/TerminalModules/MemoryModule.cs
View File

@@ -9,7 +9,11 @@ using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.TerminalModules;
public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule, IDuplicateOutputModule
public abstract partial class MemoryModule : BaseModule,
ITerminalModule,
ISourceModule,
IDuplicateOutputModule,
IPolymorphismModule
{
private DataVariable? Memory { get; set; }
private IDataPortGroup? MemoryPortGroup { get; set; }

10
Modules/TerminalModules/TestingModules/R2Reader.cs
View File

@@ -6,11 +6,11 @@ namespace Enigmos.Modules.TerminalModules.TestingModules;
public partial class R2Reader : Control
{
private AnimatedSprite2D? Direction { get; set; }
private AnimatedSprite2D? Magnitude { get; set; }
public R2? UnderlyingVector { get; set; }
private double TargetPhase() => Math.Atan2(UnderlyingVector![2], UnderlyingVector![1]);
private double TargetLength() => UnderlyingVector!.Magnitude;
private AnimatedSprite2D Direction { get; set; }
private AnimatedSprite2D Magnitude { get; set; }
public R2 UnderlyingVector { get; set; }
private double TargetPhase() => UnderlyingVector == null ? 0: Math.Atan2(UnderlyingVector![2], UnderlyingVector![1]);
private double TargetLength() => UnderlyingVector?.Magnitude ?? 0;
private int TargetPhaseFrame =>
Mathf.FloorToInt((TargetPhase() % (2d * Math.PI) + 2d * Math.PI) % (2d * Math.PI) * 44d / (2d * Math.PI));

8
Ports/BasePort.cs
View File

@@ -1,4 +1,5 @@
using Godot;
using Nocturnis.Attributes;
using Nocturnis.Enigmos.Cables;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
@@ -17,9 +18,9 @@ public abstract partial class BasePort : TextureButton, IBasePort
/// </summary>
public int Quality { get; set; }
public IBaseModule? Module { get; set; }
public IBaseModule Module { get; set; }
public abstract bool IsMatch(IBasePort oth);
public IBasePort? ConnectedPort { get; set; }
public IBasePort ConnectedPort { get; set; }
public bool Connected => ConnectedPort != null;
public abstract void SetStatusPending();
@@ -33,5 +34,6 @@ public abstract partial class BasePort : TextureButton, IBasePort
public virtual void Init()
{
}
[Expose]
public void Connect() => this.ExtConnect();
}

4
Ports/DataPorts/DataOutPort.cs
View File

@@ -19,9 +19,9 @@ public abstract partial class DataOutPort : DataPort, IDataOutPort
//public void DataUpdateRequest(IRootModule root) => Module.ComputeWithTimeoutHandle(root);
public new IDataInPort? ConnectedPort
public new IDataInPort ConnectedPort
{
get => (base.ConnectedPort as IDataInPort)!;
get => base.ConnectedPort as IDataInPort;
set => base.ConnectedPort = value;
}

5
Ports/SignalPorts/SignalOutPort.cs
View File

@@ -35,6 +35,9 @@ public partial class SignalOutPort : SignalPort, ISignalOutPort
if (!Connected)
return;
ConnectedPort!.Module.Execute();
}
public void Connect()
{
Console.WriteLine("XXXXXX");
}
}