Skip to content

Commit ea1e3fb

Browse files
committed
api: Adapt to lamp-manager branch.
1 parent b0fde62 commit ea1e3fb

File tree

4 files changed

+16
-51
lines changed

4 files changed

+16
-51
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ var descr = await mpfApi.GetMachineDescription();
3333
Console.WriteLine($"Description: {descr}");
3434
```
3535

36+
## Unity
37+
38+
This currently need the following compiler flags in order to compile:
39+
40+
- `GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE`
41+
- `GRPC_DISABLE_PROTOBUF_BUFFER_SERIALIZATION`
42+
3643
## License
3744

3845
[MIT](LICENSE)

VisualPinball.Engine.Mpf.Unity/Plugins/linux-x64/libgrpc_csharp_ext.x64.so.meta

Lines changed: 0 additions & 43 deletions
This file was deleted.

VisualPinball.Engine.Mpf.Unity/Runtime/MpfClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public async Task<MachineDescription> GetMachineDescription() {
4444
public void Dispose()
4545
{
4646
Console.WriteLine("Disconnecting...");
47-
_client.Quit(new QuitRequest());
48-
_channel.ShutdownAsync();
47+
_client?.Quit(new QuitRequest());
48+
_channel?.ShutdownAsync();
4949
Console.WriteLine("Done!");
5050
}
5151

VisualPinball.Engine.Mpf.Unity/Runtime/MpfGamelogicEngine.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ public class MpfGamelogicEngine : MonoBehaviour, IGamelogicEngine,
3131

3232
public event EventHandler<LampEventArgs> OnLampChanged;
3333
public event EventHandler<LampsEventArgs> OnLampsChanged;
34+
public event EventHandler<LampColorEventArgs> OnLampColorChanged;
3435
public event EventHandler<CoilEventArgs> OnCoilChanged;
3536

36-
public void OnInit(TableApi tableApi, BallManager ballManager)
37+
public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
3738
{
3839
}
3940

@@ -45,9 +46,13 @@ public void OnUpdate()
4546
{
4647
}
4748

49+
public void OnDestroy()
50+
{
51+
}
52+
4853
public async void RefreshFromMpf()
4954
{
50-
using var mpfApi = new MpfApi(@"../../../../VisualPinball.Engine.Mpf/machine");
55+
using var mpfApi = new MpfApi(@"../../VisualPinball.Engine.Mpf/VisualPinball.Engine.Mpf/machine");
5156
await mpfApi.Launch();
5257

5358
mpfApi.Start(new Dictionary<string, bool> {
@@ -58,9 +63,5 @@ public async void RefreshFromMpf()
5863

5964
Debug.Log(descr);
6065
}
61-
62-
public void OnDestroy()
63-
{
64-
}
6566
}
6667
}

0 commit comments

Comments
 (0)