Skip to content

Commit bc24dc1

Browse files
jsm174freezy
authored andcommitted
misc: More cleanup. Replace DisplayUpdateEvent with DisplayEvent.
1 parent 84b4a3b commit bc24dc1

8 files changed

+26
-25
lines changed

Editor/Descriptors/DisplayUpdateEventUnitDescriptor.cs renamed to Editor/Descriptors/DisplayEventUnitDescriptor.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020

2121
namespace VisualPinball.Unity.VisualScripting.Editor
2222
{
23-
[Descriptor(typeof(DisplayUpdateEventUnit))]
24-
public class DisplayUpdateEventUnitDescriptor : UnitDescriptor<DisplayUpdateEventUnit>
23+
[Descriptor(typeof(DisplayEventUnit))]
24+
public class DisplayEventUnitDescriptor : UnitDescriptor<DisplayEventUnit>
2525
{
26-
public DisplayUpdateEventUnitDescriptor(DisplayUpdateEventUnit target) : base(target) { }
26+
public DisplayEventUnitDescriptor(DisplayEventUnit target) : base(target) { }
2727

28-
protected override EditorTexture DefinedIcon() => EditorTexture.Single(Unity.Editor.Icons.DisplayUpdateEvent);
28+
protected override EditorTexture DefinedIcon() => EditorTexture.Single(Unity.Editor.Icons.DisplayEvent);
2929

3030
protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
3131
{
3232
base.DefinedPort(port, desc);
3333

3434
switch (port.key)
3535
{
36-
case nameof(DisplayUpdateEventUnit.NumericOutput):
37-
desc.summary = "The numerical value of the display update.";
36+
case nameof(DisplayEventUnit.NumericOutput):
37+
desc.summary = "The numerical value of the display event.";
3838
break;
39-
case nameof(DisplayUpdateEventUnit.TextOutput):
40-
desc.summary = "The text value of the display update.";
39+
case nameof(DisplayEventUnit.TextOutput):
40+
desc.summary = "The text value of the display event.";
4141
break;
4242
}
4343
}

Runtime/Nodes/Display/DisplayUpdateEventUnit.cs.meta renamed to Editor/Descriptors/DisplayEventUnitDescriptor.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Widgets/DisplayUpdateEventUnitWidget.cs renamed to Editor/Widgets/DisplayEventUnitWidget.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
namespace VisualPinball.Unity.VisualScripting.Editor
2222
{
23-
[Widget(typeof(DisplayUpdateEventUnit))]
24-
public sealed class DisplayUpdateEventUnitWidget : GleUnitWidget<DisplayUpdateEventUnit>
23+
[Widget(typeof(DisplayEventUnit))]
24+
public sealed class DisplayEventUnitWidget : GleUnitWidget<DisplayEventUnit>
2525
{
26-
public DisplayUpdateEventUnitWidget(FlowCanvas canvas, DisplayUpdateEventUnit unit) : base(canvas, unit)
26+
public DisplayEventUnitWidget(FlowCanvas canvas, DisplayEventUnit unit) : base(canvas, unit)
2727
{
2828
}
2929
}

Editor/Descriptors/DisplayUpdateEventUnitDescriptor.cs.meta renamed to Editor/Widgets/DisplayEventUnitWidget.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Gamelogic/VisualScriptingEventNames.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static class VisualScriptingEventNames
2222
public const string LampEvent = "LampEvent";
2323
public const string SwitchEvent = "SwitchEvent";
2424
public const string CoilEvent = "CoilEvent";
25-
public const string DisplayUpdateEvent = "DisplayUpdateEvent";
25+
public const string DisplayEvent = "DisplayEvent";
2626
public const string CurrentPlayerChanged = "CurrentPlayerChanged";
2727
public const string PlayerVariableChanged = "PlayerVariableChanged";
2828
public const string TableVariableChanged = "TableVariableChanged";

Runtime/Gamelogic/VisualScriptingGamelogicEngine.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public class VisualScriptingGamelogicEngine : MonoBehaviour, IGamelogicEngine, I
6666
public event EventHandler<RequestedDisplays> OnDisplaysRequested;
6767
public event EventHandler<string> OnDisplayClear;
6868
public event EventHandler<DisplayFrameData> OnDisplayUpdateFrame;
69+
public event EventHandler<DisplayFrameData> OnDisplayUpdated;
6970

7071
public event EventHandler<LampEventArgs> OnLampChanged;
7172
public event EventHandler<LampsEventArgs> OnLampsChanged;
@@ -166,11 +167,6 @@ public void DisplayUpdateFrame(DisplayFrameData data)
166167
OnDisplayUpdateFrame?.Invoke(this, data);
167168
}
168169

169-
public void DisplayUpdateEvent(DisplayFrameData data)
170-
{
171-
EventBus.Trigger(VisualScriptingEventNames.DisplayUpdateEvent, new DisplayUpdateEventArgs(data));
172-
}
173-
174170
public void Switch(string id, bool isClosed)
175171
{
176172
var args = new SwitchEventArgs2(id, isClosed);
@@ -190,6 +186,11 @@ public void SetLamp(string id, float value, bool isCoil = false, LampSource sour
190186
OnLampChanged?.Invoke(this, new LampEventArgs(id, value, isCoil, source));
191187
}
192188

189+
public void SetDisplay(DisplayFrameData data)
190+
{
191+
EventBus.Trigger(VisualScriptingEventNames.DisplayEvent, new DisplayEventArgs(data));
192+
}
193+
193194
public LampState GetLamp(string id)
194195
{
195196
return _player.LampStatuses.ContainsKey(id) ? _player.LampStatuses[id] : LampState.Default;

Runtime/Nodes/Display/DisplayUpdateEventUnit.cs renamed to Runtime/Nodes/Display/DisplayEventUnit.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
namespace VisualPinball.Unity.VisualScripting
2525
{
26-
[UnitTitle("On Display Update")]
26+
[UnitTitle("On Display Changed")]
2727
[UnitSurtitle("Gamelogic Engine")]
2828
[UnitCategory("Events\\Visual Pinball")]
29-
public class DisplayUpdateEventUnit : GleEventUnit<DisplayUpdateEventArgs>
29+
public class DisplayEventUnit : GleEventUnit<DisplayEventArgs>
3030
{
3131
[Serialize]
3232
[Inspectable]
@@ -44,7 +44,7 @@ public class DisplayUpdateEventUnit : GleEventUnit<DisplayUpdateEventArgs>
4444
[DoNotSerialize]
4545
protected override bool register => true;
4646

47-
public override EventHook GetHook(GraphReference reference) => new EventHook(VisualScriptingEventNames.DisplayUpdateEvent);
47+
public override EventHook GetHook(GraphReference reference) => new EventHook(VisualScriptingEventNames.DisplayEvent);
4848

4949
protected override void Definition()
5050
{
@@ -61,12 +61,12 @@ protected override void Definition()
6161
}
6262
}
6363

64-
protected override bool ShouldTrigger(Flow flow, DisplayUpdateEventArgs args)
64+
protected override bool ShouldTrigger(Flow flow, DisplayEventArgs args)
6565
{
6666
return Display != null && Display.Id.Equals(args.DisplayFrameData.Id);
6767
}
6868

69-
protected override void AssignArguments(Flow flow, DisplayUpdateEventArgs args)
69+
protected override void AssignArguments(Flow flow, DisplayEventArgs args)
7070
{
7171
if (Display.Supports(DisplayFrameFormat.Numeric)) {
7272
if (args.DisplayFrameData.Format == DisplayFrameFormat.Numeric) {

Editor/Widgets/DisplayUpdateEventUnitWidget.cs.meta renamed to Runtime/Nodes/Display/DisplayEventUnit.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)