misc: add support for android-arm64-v8a

Author: jsm174

.github/workflows/build.yml

@@ -25,6 +25,8 @@ jobs:
             rid: ios-arm64
           - os: ubuntu-latest
             rid: linux-x64
+          - os: ubuntu-latest
+            rid: android-arm64-v8a
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1

README.md

@@ -37,6 +37,9 @@ In order to not accidentally commit those files, we recommend to ignore them:
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/PinMame.dll.meta
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/VisualPinball.Engine.PinMAME.dll.meta
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/libpinmame.so.3.5.meta
+git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/android-arm64-v8a/PinMame.dll.meta
+git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/android-arm64-v8a/VisualPinball.Engine.PinMAME.dll.meta
+git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/android-arm64-v8a/libpinmame.3.5.so.meta
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/PinMame.dll.meta
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/VisualPinball.Engine.PinMAME.dll.meta
 git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/libpinmame.3.5.dylib.meta

VisualPinball.Engine.PinMAME.Unity/Plugins/android-arm64-v8a.meta

@@ -20,11 +20,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using NLog;
 using PinMame;
 using UnityEngine;
+using UnityEngine.Networking;
 using VisualPinball.Engine.Game.Engines;
 using VisualPinball.Unity;
 using Logger = NLog.Logger;
@@ -141,16 +143,34 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 				OnLampChanged?.Invoke(this, new LampEventArgs(lamp.Id, 0));
 			}
 
-			Logger.Info($"New PinMAME instance at {(double)AudioSettings.outputSampleRate / 1000}kHz");
-
 			string vpmPath = null;
 
-			#if UNITY_IOS && !UNITY_EDITOR
-			vpmPath = Application.dataPath + "/pinmame";
+			#if (UNITY_IOS || UNITY_ANDROID) && !UNITY_EDITOR
+				vpmPath = Path.Combine(Application.persistentDataPath, "pinmame");
+				Directory.CreateDirectory(Path.Combine(vpmPath, "roms"));
+
+				byte[] data = null;
+
+				#if UNITY_IOS
+					data = File.ReadAllBytes(Path.Combine(Application.streamingAssetsPath, $"{romId}.zip");
+				#else
+					UnityWebRequest webRequest = new UnityWebRequest(Path.Combine(Application.streamingAssetsPath, $"{romId}.zip"));
+
+					webRequest.downloadHandler = new DownloadHandlerBuffer();
+					webRequest.SendWebRequest();
+
+					while (!webRequest.isDone) { };
+
+					data = webRequest.downloadHandler.data;
+				#endif
+
+				File.WriteAllBytes(Path.Combine(vpmPath, "roms", $"{romId}.zip"), data);
 			#endif
 
+			Logger.Info($"New PinMAME instance at {(double)AudioSettings.outputSampleRate / 1000}kHz");
+
 			_pinMame = PinMame.PinMame.Instance(PinMameAudioFormat.AudioFormatFloat, AudioSettings.outputSampleRate, vpmPath);
-                
+
 			_pinMame.SetHandleKeyboard(false);
 			_pinMame.SetHandleMechanics(DisableMechs ? 0 : 0xFF);
 

VisualPinball.Engine.PinMAME.Unity/Plugins/android-arm64-v8a/PinMame.dll.meta

@@ -13,9 +13,9 @@
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="PinMame" Version="0.2.0-preview.3" />
-    <PackageReference Include="PinMame.Native" Version="3.5.0-preview.9" />
-    <PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.83" /> 
+    <PackageReference Include="PinMame" Version="0.2.0-preview.5" />
+    <PackageReference Include="PinMame.Native" Version="3.5.0-preview.14" />
+    <PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.87" /> 
     <!-- Uncomment when doing local dev -->
     <!-- 
     <Reference Include="VisualPinball.Engine">
@@ -27,7 +27,7 @@
     <ItemGroup>
       <Plugins Include="$(OutDir)$(AssemblyName).dll" />
       <Plugins Include="$(OutDir)PinMame.dll" />
-      <Plugins Include="$(NuGetPackageRoot)\pinmame.native.$(RuntimeIdentifier)\3.5.0-preview.9\runtimes\$(RuntimeIdentifier)\native\*" />
+      <Plugins Include="$(NuGetPackageRoot)\pinmame.native.$(RuntimeIdentifier)\3.5.0-preview.14\runtimes\$(RuntimeIdentifier)\native\*" />
     </ItemGroup>
     <Message Text="PluginsDeploy: @(Plugins)" />
     <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />