Skip to content

Commit 432716c

Browse files
committed
display: Add support for 16 segment displays.
1 parent d11e3f8 commit 432716c

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,22 @@ public override void OnInspectorGUI()
102102
// }
103103

104104
// rom dropdown
105-
EditorGUI.BeginDisabledGroup(_gle.Game == null);
106-
EditorGUI.BeginChangeCheck();
107-
_selectedRomIndex = EditorGUILayout.Popup("ROM", _selectedRomIndex, _romNames);
108-
if (EditorGUI.EndChangeCheck()) {
109-
_gle.romId = Rom.Id;
110-
}
111-
112-
// info label
113-
EditorGUILayout.LabelField("ROM ID", _gle.romId);
105+
// EditorGUI.BeginDisabledGroup(_gle.Game == null);
106+
// EditorGUI.BeginChangeCheck();
107+
// _selectedRomIndex = EditorGUILayout.Popup("ROM", _selectedRomIndex, _romNames);
108+
// if (EditorGUI.EndChangeCheck()) {
109+
// _gle.romId = Rom.Id;
110+
// }
111+
//
112+
// // info label
113+
// EditorGUILayout.LabelField("ROM ID", _gle.romId);
114114

115-
EditorGUI.EndDisabledGroup();
115+
//EditorGUI.EndDisabledGroup();
116116

117117
EditorGUILayout.Space();
118118
EditorGUILayout.Separator();
119119

120-
EditorGUI.BeginDisabledGroup(!IsGameSet || Application.isPlaying);
120+
//EditorGUI.BeginDisabledGroup(!IsGameSet || Application.isPlaying);
121121
if (GUILayout.Button("Populate Hardware")) {
122122
if (EditorUtility.DisplayDialog("PinMAME", "This will clear all linked switches, coils and lamps and re-populate them. You sure you want to do that?", "Yes", "No")) {
123123
_tableAuthoring.RepopulateHardware(_gle);
@@ -137,7 +137,7 @@ public override void OnInspectorGUI()
137137
SceneView.RepaintAll();
138138
}
139139
}
140-
EditorGUI.EndDisabledGroup();
140+
//EditorGUI.EndDisabledGroup();
141141
}
142142

143143
private void CreateDisplays(IEnumerable<DisplayAuthoring> sceneDisplays)
@@ -241,6 +241,7 @@ private static int ConvertSeparatorType(PinMameDisplayType layoutType)
241241
case PinMameDisplayType.Seg9:
242242
case PinMameDisplayType.Seg16N:
243243
case PinMameDisplayType.Seg7 | PinMameDisplayType.NoDisp:
244+
case PinMameDisplayType.Seg16S:
244245
return 0;
245246

246247
case PinMameDisplayType.Seg16D:
@@ -261,7 +262,6 @@ private static int ConvertSeparatorType(PinMameDisplayType layoutType)
261262
case PinMameDisplayType.Seg98F:
262263
case PinMameDisplayType.Seg10:
263264
case PinMameDisplayType.Seg16:
264-
case PinMameDisplayType.Seg16S:
265265
case PinMameDisplayType.Seg16R:
266266
return 2;
267267

@@ -313,11 +313,13 @@ private static int ConvertNumSegments(PinMameDisplayType layoutType)
313313

314314
case PinMameDisplayType.Seg16:
315315
case PinMameDisplayType.Seg16R:
316-
case PinMameDisplayType.Seg16S:
317316
case PinMameDisplayType.Seg16N:
318317
case PinMameDisplayType.Seg16D:
319318
return 14;
320319

320+
case PinMameDisplayType.Seg16S:
321+
return 16;
322+
321323
default:
322324
throw new ArgumentOutOfRangeException(nameof(layoutType), layoutType, "Unknown segment display size");
323325
}

0 commit comments

Comments
 (0)