Data Type

This commit is contained in:
h z
2024-07-11 11:21:29 +01:00
parent a8688d7f95
commit bd5ab1e940
62 changed files with 233 additions and 277 deletions

View File

@@ -19,7 +19,7 @@ public abstract partial class EngineModule : TerminalModule
public override void Init()
{
base.Init();
Throttle!.SetDataType(EnigmosConstant.DataPortTypes.Real);
Throttle!.SetDataType(DataTypeConstant.BaseDataTypes.Real);
FuelTank = GetNode<IChemicalItemSlot>("FuelTank");
PostInit();
}
@@ -33,7 +33,7 @@ public abstract partial class EngineModule : TerminalModule
return;
}
HomogeneousMixture bottom = FuelTank.Item.ContentMaterial.LayerOrder.Last.Value;
double consumption = Math.Min(bottom.Amount, Throttle!.GetData.Get!.Double.DoubleCut() * bottom.CombustRate);
double consumption = Math.Min(bottom.Amount, Throttle!.GetData.Get!.Real.DoubleCut() * bottom.CombustRate);
EnigmosControl.Instance.Energy = consumption * bottom.Energy;
bottom.Amount -= consumption;
}

View File

@@ -1,8 +1,7 @@
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
@@ -12,7 +11,7 @@ namespace Enigmos.Modules.TerminalModules;
public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule, IDuplicateOutputModule
{
private IData? Memory { get; set; }
private DataVariable? Memory { get; set; }
private IDataPortGroup? MemoryPortGroup { get; set; }
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
@@ -22,18 +21,18 @@ public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourc
public override void Init()
{
base.Init();
Memory = GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null);
Memory = GlobalProvider.DataStructureProvider!.NewData(0, DataTypeConstant.BaseDataTypes.Null);
this.DataInInit("Input", 3);
this.DataOutInit("Output", 4);
DataInPorts[1].SetDataType(EnigmosConstant.DataPortTypes.Bit);
DataInPorts[2].SetDataType(EnigmosConstant.DataPortTypes.Bit);
DataInPorts[1].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
DataInPorts[2].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
MemoryPortGroup =GlobalProvider.DataStructureProvider!.NewDataPortGroup(
this,
new IDataPort[] { DataInPorts[0] }.Union(DataOutPorts).ToArray(),
"Memory Data Type:",
EnigmosConstant.DataPortTypes.Real,
EnigmosConstant.DataPortTypes.AnyType
DataTypeConstant.BaseDataTypes.Real,
DataTypeConstant.DataTypeOptions.AnyType
);
ConfigurablePortGroups = new HashSet<IDataPortGroup> { MemoryPortGroup };
PostInit();

View File

@@ -1,6 +1,5 @@
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
@@ -36,13 +35,13 @@ public abstract partial class SRLatchModule : BaseModule,
base.Init();
this.DataInInit("Input",2);
this.DataOutInit("Output", 2);
this.SetOutputType(EnigmosConstant.DataPortTypes.Bit);
this.SetInputType(EnigmosConstant.DataPortTypes.Bit);
this.SetOutputType(DataTypeConstant.BaseDataTypes.Bit);
this.SetInputType(DataTypeConstant.BaseDataTypes.Bit);
PostInit();
}
public void Define()
{
this.Define(cache => (State, EnigmosConstant.DataPortTypes.Bit));
this.Define(cache => (State, DataTypeConstant.BaseDataTypes.Bit));
}
}

View File

@@ -1,8 +1,6 @@
using Enigmos.Modules.ControllingModules;
using Enigmos.Ports.DataPorts;
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
@@ -23,7 +21,7 @@ public abstract partial class LightEmittingDiodeModule : TerminalModule
Finished = true;
LightEmittingDiode = GetNode<Sprite2D>("LightEmittingDiode");
Input = this.GetPort<DataInPort>("Input");
Input.SetDataType(EnigmosConstant.DataPortTypes.Bit);
Input.SetDataType(DataTypeConstant.BaseDataTypes.Bit);
PostInit();
}

View File

@@ -1,5 +1,3 @@
using Enigmos.Modules.ControllingModules;
using Enigmos.Ports;
using Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Modules;
using Nocturnis.GlobalManagement.Constants;
@@ -15,7 +13,7 @@ public abstract partial class R2ReaderModule : TerminalModule
{
base.Init();
DataIn = this.GetPort<DataInPort>("DataIn");
DataIn.SetDataType(EnigmosConstant.DataPortTypes.R2);
DataIn.SetDataType(DataTypeConstant.BaseDataTypes.R2);
R2Reader = GetNode<R2Reader>("R2Reader");
R2Reader.Init();
PostInit();

View File

@@ -1,7 +1,6 @@
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
using Skeleton.Utils.Helpers;
@@ -17,7 +16,7 @@ public abstract partial class RealReaderModule : BaseModule, ITerminalModule, IO
{
base.Init();
this.DataInInit("Input", 3);
this.SetInputType(EnigmosConstant.DataPortTypes.Real);
this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
RealReader = GetNode<AnimatedSprite2D>("RealReader");
RealReader.SpeedScale = 0;
RealReader.Play();
@@ -26,9 +25,9 @@ public abstract partial class RealReaderModule : BaseModule, ITerminalModule, IO
public void Drain()
{
double max = DataInPorts[0].GetData.Get!.Double;
double min = DataInPorts[2].GetData.Get!.Double;
double value = DataInPorts[1].GetData.Get!.Double;
double max = DataInPorts[0].GetData.Get!.Real;
double min = DataInPorts[2].GetData.Get!.Real;
double value = DataInPorts[1].GetData.Get!.Real;
double range = max - min;
double percentage = (range == 0 ? 0d : value / range).DoubleCut();
int frame = Mathf.FloorToInt(percentage * 122);