display: Add 9-segment support.

Author: freezy

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

@@ -14,18 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
+// ReSharper disable CheckNamespace
+
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using PinMame;
 using UnityEditor;
 using UnityEngine;
 using VisualPinball.Engine.PinMAME.Games;
 using VisualPinball.Unity;
 using VisualPinball.Unity.Editor;
-using Object = UnityEngine.Object;
 
 namespace VisualPinball.Engine.PinMAME.Editor
 {
@@ -43,7 +40,6 @@ public class PinMameGamelogicEngineInspector : UnityEditor.Editor
 		private int _selectedRomIndex;
 
 		private TableAuthoring _tableAuthoring;
-		private PinMame.PinMame _pinMame;
 
 		private PinMameRom Rom => _gle.Game.Roms[_selectedRomIndex];
 
@@ -85,21 +81,23 @@ private void OnEnable()
 		public override void OnInspectorGUI()
 		{
 			// game dropdown
-			EditorGUI.BeginChangeCheck();
-			_selectedGameIndex = EditorGUILayout.Popup("Game", _selectedGameIndex, _gameNames);
-			if (EditorGUI.EndChangeCheck()) {
-				_selectedRomIndex = 0;
-				if (_selectedGameIndex > 0) {
-					_gle.Game = _games[_selectedGameIndex - 1];
-					_gle.romId = Rom.Id;
-					_romNames = _gle.Game.Roms.Select(g => g.ToString()).ToArray();
-
-				} else {
-					_gle.Game = null;
-					_gle.romId = string.Empty;
-					_romNames = new string[0];
-				}
-			}
+			_gle.romId = EditorGUILayout.TextField("ROM ID", _gle.romId);
+
+			// EditorGUI.BeginChangeCheck();
+			// _selectedGameIndex = EditorGUILayout.Popup("Game", _selectedGameIndex, _gameNames);
+			// if (EditorGUI.EndChangeCheck()) {
+			// 	_selectedRomIndex = 0;
+			// 	if (_selectedGameIndex > 0) {
+			// 		_gle.Game = _games[_selectedGameIndex - 1];
+			// 		_gle.romId = Rom.Id;
+			// 		_romNames = _gle.Game.Roms.Select(g => g.ToString()).ToArray();
+			//
+			// 	} else {
+			// 		_gle.Game = null;
+			// 		_gle.romId = string.Empty;
+			// 		_romNames = new string[0];
+			// 	}
+			// }
 
 			// rom dropdown
 			EditorGUI.BeginDisabledGroup(_gle.Game == null);
@@ -191,8 +189,8 @@ private void CreateDisplays(IEnumerable<DisplayAuthoring> sceneDisplays)
 
 				if (layout.IsDmd) {
 					var auth = !displayGameObjects.ContainsKey(id)
-						? go.AddComponent<DmdAuthoring>()
-						: go.GetComponent<DmdAuthoring>();
+						? go.AddComponent<DotMatrixDisplayAuthoring>()
+						: go.GetComponent<DotMatrixDisplayAuthoring>();
 
 					auth.Id = id;
 					auth.Width = layout.width;

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

@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+// ReSharper disable PossibleNullReferenceException
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -311,13 +315,6 @@ private Dictionary<byte, byte> GetMap(PinMameDisplayLayout displayLayout)
 		private static DisplayFrameFormat GetDisplayType(PinMameDisplayType dp)
 		{
 			switch (dp) {
-				case PinMameDisplayType.SEG16:  // 16 segments
-				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.SEG8:   // 7  segments and comma
 				case PinMameDisplayType.SEG8D:  // 7  segments and period
 				case PinMameDisplayType.SEG7:   // 7  segments
@@ -328,19 +325,39 @@ private static DisplayFrameFormat GetDisplayType(PinMameDisplayType dp)
 					return DisplayFrameFormat.Segment7;
 
 				case PinMameDisplayType.SEG10: // 9  segments and comma
-					break;
 				case PinMameDisplayType.SEG9: // 9  segments
-					break;
 				case PinMameDisplayType.SEG98: // 9  segments, comma every three
-					break;
 				case PinMameDisplayType.SEG98F: // 9  segments, forced comma every three
-					break;
+					return DisplayFrameFormat.Segment9;
+
+				case PinMameDisplayType.SEG16:  // 16 segments
+				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.VIDEO:
 					break;
+
+				case PinMameDisplayType.SEGALL:
+				case PinMameDisplayType.IMPORT:
+				case PinMameDisplayType.SEGMASK:
+				case PinMameDisplayType.SEGHIBIT:
+				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);
+
 				default:
 					throw new ArgumentOutOfRangeException(nameof(dp), dp, null);
 			}