display: Clean up types and fix frame format.

Author: freezy

VisualPinball.Engine.PinMAME.Unity/Editor/PinMameGamelogicEngineInspector.cs

@@ -16,8 +16,10 @@
 
 // ReSharper disable CheckNamespace
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using PinMame;
 using UnityEditor;
 using UnityEngine;
 using VisualPinball.Engine.PinMAME.Games;
@@ -178,7 +180,6 @@ private void CreateDisplays(IEnumerable<DisplayAuthoring> sceneDisplays)
 
 				var left = layout.Left / 2;
 				var top = layout.Top / 2;
-
 				var id = layout.IsDmd
 					? $"{PinMameGamelogicEngine.DmdPrefix}{index}"
 					: $"{PinMameGamelogicEngine.SegDispPrefix}{index}";
@@ -231,14 +232,15 @@ private void CreateDisplays(IEnumerable<DisplayAuthoring> sceneDisplays)
 			Debug.Log($"OnDisplaysAvailable ({displayLayouts.Count}): displays=\n{str}\n{tableWidth} - {totalWidth}");
 		}
 
-		private int ConvertSeparatorType(PinMameDisplayType layoutType)
+		private static int ConvertSeparatorType(PinMameDisplayType layoutType)
 		{
 			switch (layoutType) {
 
 				case PinMameDisplayType.Seg7S:
 				case PinMameDisplayType.Seg7:
 				case PinMameDisplayType.Seg9:
 				case PinMameDisplayType.Seg16N:
+				case PinMameDisplayType.Seg7 | PinMameDisplayType.NoDisp:
 					return 0;
 
 				case PinMameDisplayType.Seg16D:
@@ -271,6 +273,7 @@ private int ConvertSeparatorType(PinMameDisplayType layoutType)
 		private static bool ConvertSeparatorEveryThree(PinMameDisplayType layoutType)
 		{
 			switch (layoutType) {
+
 				case PinMameDisplayType.Seg98F:
 				case PinMameDisplayType.Seg98:
 				case PinMameDisplayType.Seg87F:
@@ -299,6 +302,7 @@ private static int ConvertNumSegments(PinMameDisplayType layoutType)
 				case PinMameDisplayType.Seg87F:
 				case PinMameDisplayType.Seg87H:
 				case PinMameDisplayType.Seg87FH:
+				case PinMameDisplayType.Seg7 | PinMameDisplayType.NoDisp:
 					return 7;
 
 				case PinMameDisplayType.Seg9:

VisualPinball.Engine.PinMAME.Unity/Runtime/PinMameGamelogicEngine.cs

@@ -200,7 +200,7 @@ private void UpdateDmd(int index, PinMameDisplayLayout displayLayout, IntPtr fra
 
 			lock (_dispatchQueue) {
 				_dispatchQueue.Enqueue(() => OnDisplayFrame?.Invoke(this,
-					new DisplayFrameData($"{DmdPrefix}{index}", GetDisplayType(displayLayout.Type), _frameBuffer[index])));
+					new DisplayFrameData($"{DmdPrefix}{index}", GetDisplayFrameFormat(displayLayout), _frameBuffer[index])));
 			}
 		}
 
@@ -211,7 +211,7 @@ private void UpdateSegDisp(int index, PinMameDisplayLayout displayLayout, IntPtr
 			lock (_dispatchQueue) {
 				//Logger.Info($"[PinMAME] Seg data ({index}): {BitConverter.ToString(_frameBuffer[index])}" );
 				_dispatchQueue.Enqueue(() => OnDisplayFrame?.Invoke(this,
-					new DisplayFrameData($"{SegDispPrefix}{index}", GetDisplayType(displayLayout.Type), _frameBuffer[index])));
+					new DisplayFrameData($"{SegDispPrefix}{index}", GetDisplayFrameFormat(displayLayout), _frameBuffer[index])));
 			}
 		}
 
@@ -300,41 +300,37 @@ public void Switch(string id, bool isClosed)
 			}
 		}
 
-		public static DisplayFrameFormat GetDisplayType(PinMameDisplayType dp)
+		public static DisplayFrameFormat GetDisplayFrameFormat(PinMameDisplayLayout layout)
 		{
-			switch (dp) {
+			if (layout.IsDmd) {
+				return layout.Depth == 4 ? DisplayFrameFormat.Dmd4 : DisplayFrameFormat.Dmd2;
+			}
+
+			switch (layout.Type) {
 				case PinMameDisplayType.Seg8:   // 7  segments and comma
 				case PinMameDisplayType.Seg7SC: // 7  segments, small, with comma
-					return DisplayFrameFormat.Segment7Comma;
 				case PinMameDisplayType.Seg8D:  // 7  segments and period
-					return DisplayFrameFormat.Segment7Dot;
 				case PinMameDisplayType.Seg7:  // 7  segments
 				case PinMameDisplayType.Seg7S: // 7  segments, small
-					return DisplayFrameFormat.Segment7;
 				case PinMameDisplayType.Seg87:  // 7  segments, comma every three
-					return DisplayFrameFormat.Segment7CommaEvery3;
 				case PinMameDisplayType.Seg87F: // 7  segments, forced comma every three
-					return DisplayFrameFormat.Segment7CommaEvery3Forced;
-
 				case PinMameDisplayType.Seg10: // 9  segments and comma
-					return DisplayFrameFormat.Segment9Comma;
 				case PinMameDisplayType.Seg9: // 9  segments
-					return DisplayFrameFormat.Segment9;
 				case PinMameDisplayType.Seg98: // 9  segments, comma every three
-					return DisplayFrameFormat.Segment9CommaEvery3;
 				case PinMameDisplayType.Seg98F: // 9  segments, forced comma every three
-					return DisplayFrameFormat.Segment9CommaEvery3Forced;
-
 				case PinMameDisplayType.Seg16:  // 16 segments
-					return DisplayFrameFormat.Segment16;
 				case PinMameDisplayType.Seg16R: // 16 segments with comma and period reversed
 				case PinMameDisplayType.Seg16N: // 16 segments without commas
 				case PinMameDisplayType.Seg16D: // 16 segments with periods only
 				case PinMameDisplayType.Seg16S: // 16 segments with split top and bottom line
-					return DisplayFrameFormat.Segment16;
-
-				case PinMameDisplayType.Dmd:
-					return DisplayFrameFormat.Dmd2;
+				case PinMameDisplayType.Seg8H:
+				case PinMameDisplayType.Seg7H:
+				case PinMameDisplayType.Seg87H:
+				case PinMameDisplayType.Seg87FH:
+				case PinMameDisplayType.Seg7SH:
+				case PinMameDisplayType.Seg7SCH:
+				case PinMameDisplayType.Seg7 | PinMameDisplayType.NoDisp:
+					return DisplayFrameFormat.Segment;
 
 				case PinMameDisplayType.Video:
 					break;
@@ -346,19 +342,13 @@ public static DisplayFrameFormat GetDisplayType(PinMameDisplayType dp)
 				case PinMameDisplayType.SegRev:
 				case PinMameDisplayType.DmdNoAA:
 				case PinMameDisplayType.NoDisp:
-				case PinMameDisplayType.Seg8H:
-				case PinMameDisplayType.Seg7H:
-				case PinMameDisplayType.Seg87H:
-				case PinMameDisplayType.Seg87FH:
-				case PinMameDisplayType.Seg7SH:
-				case PinMameDisplayType.Seg7SCH:
-					throw new ArgumentOutOfRangeException(nameof(dp), dp, null);
+					throw new ArgumentOutOfRangeException(nameof(layout), layout, null);
 
 				default:
-					throw new ArgumentOutOfRangeException(nameof(dp), dp, null);
+					throw new ArgumentOutOfRangeException(nameof(layout), layout, null);
 			}
 
-			throw new NotImplementedException($"Still unsupported segmented display format: {dp}.");
+			throw new NotImplementedException($"Still unsupported segmented display format: {layout}.");
 		}
 	}
 }

VisualPinball.Engine.PinMAME/VisualPinball.Engine.PinMAME.csproj

@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PinMame" Version="0.1.0-preview.31" />
-    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.212" />
+    <PackageReference Include="PinMame" Version="0.1.0-preview.37" />
+    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.223" />
     <PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.44" />
   </ItemGroup>