- fixed "signal loops" causing StackOverFlowExceptions (now the signals can only take 10 "steps" between components per frame)

- parameter for changing the output value of And/Or components when the input conditions aren't met
- or components work properly now
- a limited number of signals (100) can be queued in a delay component
This commit is contained in:
Regalis
2016-04-02 02:25:44 +03:00
parent 3ac8139fc7
commit 5f05db7ca4
24 changed files with 107 additions and 69 deletions
@@ -9,8 +9,10 @@ namespace Barotrauma.Items.Components
{
class DelayComponent : ItemComponent
{
const int SignalQueueSize = 500;
//the output is sent if both inputs have received a signal within the timeframe
protected TimeSpan delay;
private TimeSpan delay;
private Queue<Tuple<string, DateTime>> signalQueue;
@@ -40,15 +42,17 @@ namespace Barotrauma.Items.Components
{
var signalOut = signalQueue.Dequeue();
item.SendSignal(signalOut.Item1, "signal_out");
item.SendSignal(0, signalOut.Item1, "signal_out");
}
}
public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power=0.0f)
{
switch (connection.Name)
{
case "signal_in":
if (signalQueue.Count >= SignalQueueSize) return;
signalQueue.Enqueue(new Tuple<string, DateTime>(signal, DateTime.Now));
break;
}