summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-09-10 14:20:32 +1000
committer Vas Crabb <vas@vastheman.com>2020-09-10 14:20:32 +1000
commit2eb5d9485e86cad71b4e155d48d6e3e03de3b364 (patch)
tree945c4f3c73fd29fedf583fe8021e13f7fd5c4304
parentf0555fbbe7ea9b0303ddb677462993669b25ef32 (diff)
Fix issues from layout migration.
Removed problematic bounds from SDA5708 layout - automatic bounds works fine. de_2.cpp: Cleaned up laoyouts using loops and made bounds fit the content. gts80a.cpp: Made caveman screen match the height of the backglass, fixed bounds, and added backglass-only view. dct11em.cpp: Fixed layout bounds, corrected screen aspect ratio, and centred LED displays.
-rw-r--r--src/mame/layout/dct11em.lay8
-rw-r--r--src/mame/layout/de2.lay124
-rw-r--r--src/mame/layout/de2a3.lay137
-rw-r--r--src/mame/layout/gts80a_caveman.lay19
-rw-r--r--src/mame/layout/sda5708.lay2
5 files changed, 77 insertions, 213 deletions
diff --git a/src/mame/layout/dct11em.lay b/src/mame/layout/dct11em.lay
index b00982d72da..dc2dd3d67c3 100644
--- a/src/mame/layout/dct11em.lay
+++ b/src/mame/layout/dct11em.lay
@@ -19,10 +19,10 @@ license:CC0
</element>
<view name="Default Layout">
- <bounds left="0" top="0" right="274" bottom="350" />
+ <bounds left="0" top="0" right="320" bottom="328" />
<screen index="0">
- <bounds x="0" y="0" width="362" height="262" />
+ <bounds x="0" y="0" width="320" height="240" />
</screen>
<element name="led0" ref="a_led">
@@ -31,10 +31,10 @@ license:CC0
<repeat count="2">
<param name="s" start="11" increment="-6" />
- <param name="y" start="267" increment="40" />
+ <param name="y" start="245" increment="40" />
<repeat count="6">
<param name="n" start="~s~" increment="-1" />
- <param name="x" start="10" increment="44" />
+ <param name="x" start="33" increment="44" />
<element name="digit~n~" ref="digit">
<bounds x="~x~" y="~y~" width="34" height="38" />
</element>
diff --git a/src/mame/layout/de2.lay b/src/mame/layout/de2.lay
index c8b20749332..a4162aa9005 100644
--- a/src/mame/layout/de2.lay
+++ b/src/mame/layout/de2.lay
@@ -16,115 +16,53 @@ copyright-holders:Barry Rodewald
<color red="1.0" green="0.0" blue="0.0" />
</led7seg>
</element>
- <element name="diagled" defstate="0">
- <disk>
- <color red="1.0" green="0.0" blue="0.0" />
- </disk>
- </element>
<element name="P3"><text string="Player 1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P4"><text string="Player 2"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
+ <group name="score">
+ <repeat count="7">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="24" />
+ <element name="digit~n~" ref="~e~">
+ <bounds x="~x~" y="0" width="24" height="39" />
+ </element>
+ </repeat>
+ </group>
- <!-- Background -->
- <bounds left="0" top="20" right="318" bottom="394" />
+ <view name="Default Layout">
+ <bounds left="0" top="20" right="364" bottom="149" />
<!-- LEDs -->
<!-- Player 1 Score -->
-
- <element name="digit1" ref="digit">
- <bounds left="10" top="45" right="30" bottom="84" />
- </element>
- <element name="digit2" ref="digit">
- <bounds left="34" top="45" right="54" bottom="84" />
- </element>
- <element name="digit3" ref="digit">
- <bounds left="58" top="45" right="78" bottom="84" />
- </element>
- <element name="digit4" ref="digit">
- <bounds left="82" top="45" right="102" bottom="84" />
- </element>
- <element name="digit5" ref="digit">
- <bounds left="106" top="45" right="126" bottom="84" />
- </element>
- <element name="digit6" ref="digit">
- <bounds left="130" top="45" right="150" bottom="84" />
- </element>
- <element name="digit7" ref="digit">
- <bounds left="154" top="45" right="174" bottom="84" />
- </element>
+ <param name="e" value="digit" />
+ <param name="s" value="1" />
+ <group ref="score">
+ <bounds left="10" top="45" right="174" bottom="84" />
+ </group>
<!-- Player 2 Score -->
- <element name="digit9" ref="digit">
- <bounds left="190" top="45" right="210" bottom="84" />
- </element>
- <element name="digit10" ref="digit">
- <bounds left="214" top="45" right="234" bottom="84" />
- </element>
- <element name="digit11" ref="digit">
- <bounds left="238" top="45" right="258" bottom="84" />
- </element>
- <element name="digit12" ref="digit">
- <bounds left="262" top="45" right="282" bottom="84" />
- </element>
- <element name="digit13" ref="digit">
- <bounds left="286" top="45" right="306" bottom="84" />
- </element>
- <element name="digit14" ref="digit">
- <bounds left="310" top="45" right="330" bottom="84" />
- </element>
- <element name="digit15" ref="digit">
- <bounds left="334" top="45" right="354" bottom="84" />
- </element>
+ <param name="e" value="digit" />
+ <param name="s" value="9" />
+ <group ref="score">
+ <bounds left="190" top="45" right="354" bottom="84" />
+ </group>
<!-- Player 3 Score -->
- <element name="digit17" ref="ldigit">
- <bounds left="10" top="100" right="30" bottom="139" />
- </element>
- <element name="digit18" ref="ldigit">
- <bounds left="34" top="100" right="54" bottom="139" />
- </element>
- <element name="digit19" ref="ldigit">
- <bounds left="58" top="100" right="78" bottom="139" />
- </element>
- <element name="digit20" ref="ldigit">
- <bounds left="82" top="100" right="102" bottom="139" />
- </element>
- <element name="digit21" ref="ldigit">
- <bounds left="106" top="100" right="126" bottom="139" />
- </element>
- <element name="digit22" ref="ldigit">
- <bounds left="130" top="100" right="150" bottom="139" />
- </element>
- <element name="digit23" ref="ldigit">
- <bounds left="154" top="100" right="174" bottom="139" />
- </element>
+ <param name="e" value="ldigit" />
+ <param name="s" value="17" />
+ <group ref="score">
+ <bounds left="10" top="100" right="174" bottom="139" />
+ </group>
<!-- Player 4 Score -->
- <element name="digit25" ref="ldigit">
- <bounds left="190" top="100" right="210" bottom="139" />
- </element>
- <element name="digit26" ref="ldigit">
- <bounds left="214" top="100" right="234" bottom="139" />
- </element>
- <element name="digit27" ref="ldigit">
- <bounds left="238" top="100" right="258" bottom="139" />
- </element>
- <element name="digit28" ref="ldigit">
- <bounds left="262" top="100" right="282" bottom="139" />
- </element>
- <element name="digit29" ref="ldigit">
- <bounds left="286" top="100" right="306" bottom="139" />
- </element>
- <element name="digit30" ref="ldigit">
- <bounds left="310" top="100" right="330" bottom="139" />
- </element>
- <element name="digit31" ref="ldigit">
- <bounds left="334" top="100" right="354" bottom="139" />
- </element>
+ <param name="e" value="ldigit" />
+ <param name="s" value="25" />
+ <group ref="score">
+ <bounds left="190" top="100" right="354" bottom="139" />
+ </group>
<element ref="P3"><bounds left="10" right="174" top="30" bottom="42" /></element>
<element ref="P4"><bounds left="190" right="354" top="30" bottom="42" /></element>
diff --git a/src/mame/layout/de2a3.lay b/src/mame/layout/de2a3.lay
index f94ea1ef186..c220a85aa70 100644
--- a/src/mame/layout/de2a3.lay
+++ b/src/mame/layout/de2a3.lay
@@ -13,132 +13,49 @@ Data East Alphanumeric Display Type 3
<color red="1.0" green="0.0" blue="0.0" />
</led14segsc>
</element>
- <element name="ldigit" defstate="0">
- <led7seg>
- <color red="1.0" green="0.0" blue="0.0" />
- </led7seg>
- </element>
- <element name="diagled" defstate="0">
- <disk>
- <color red="1.0" green="0.0" blue="0.0" />
- </disk>
- </element>
<element name="P3"><text string="Player 1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P4"><text string="Player 2"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
+ <group name="score">
+ <repeat count="8">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="24" />
+ <element name="digit~n~" ref="digit">
+ <bounds x="~x~" y="0" width="24" height="39" />
+ </element>
+ </repeat>
+ </group>
- <!-- Background -->
- <bounds left="0" top="20" right="318" bottom="394" />
+ <view name="Default Layout">
+ <bounds left="0" top="20" right="400" bottom="149" />
<!-- LEDs -->
<!-- Player 1 Score -->
-
- <element name="digit0" ref="digit">
- <bounds left="10" top="45" right="30" bottom="84" />
- </element>
- <element name="digit1" ref="digit">
- <bounds left="34" top="45" right="54" bottom="84" />
- </element>
- <element name="digit2" ref="digit">
- <bounds left="58" top="45" right="78" bottom="84" />
- </element>
- <element name="digit3" ref="digit">
- <bounds left="82" top="45" right="102" bottom="84" />
- </element>
- <element name="digit4" ref="digit">
- <bounds left="106" top="45" right="126" bottom="84" />
- </element>
- <element name="digit5" ref="digit">
- <bounds left="130" top="45" right="150" bottom="84" />
- </element>
- <element name="digit6" ref="digit">
- <bounds left="154" top="45" right="174" bottom="84" />
- </element>
- <element name="digit7" ref="digit">
- <bounds left="178" top="45" right="198" bottom="84" />
- </element>
+ <param name="s" value="0" />
+ <group ref="score">
+ <bounds left="10" top="45" right="198" bottom="84" />
+ </group>
<!-- Player 2 Score -->
- <element name="digit8" ref="digit">
- <bounds left="202" top="45" right="222" bottom="84" />
- </element>
- <element name="digit9" ref="digit">
- <bounds left="226" top="45" right="246" bottom="84" />
- </element>
- <element name="digit10" ref="digit">
- <bounds left="250" top="45" right="270" bottom="84" />
- </element>
- <element name="digit11" ref="digit">
- <bounds left="274" top="45" right="294" bottom="84" />
- </element>
- <element name="digit12" ref="digit">
- <bounds left="298" top="45" right="318" bottom="84" />
- </element>
- <element name="digit13" ref="digit">
- <bounds left="322" top="45" right="342" bottom="84" />
- </element>
- <element name="digit14" ref="digit">
- <bounds left="346" top="45" right="366" bottom="84" />
- </element>
- <element name="digit15" ref="digit">
- <bounds left="370" top="45" right="390" bottom="84" />
- </element>
+ <param name="s" value="8" />
+ <group ref="score">
+ <bounds left="202" top="45" right="390" bottom="84" />
+ </group>
<!-- Player 3 Score -->
- <element name="digit16" ref="digit">
- <bounds left="10" top="100" right="30" bottom="139" />
- </element>
- <element name="digit17" ref="digit">
- <bounds left="34" top="100" right="54" bottom="139" />
- </element>
- <element name="digit18" ref="digit">
- <bounds left="58" top="100" right="78" bottom="139" />
- </element>
- <element name="digit19" ref="digit">
- <bounds left="82" top="100" right="102" bottom="139" />
- </element>
- <element name="digit20" ref="digit">
- <bounds left="106" top="100" right="126" bottom="139" />
- </element>
- <element name="digit21" ref="digit">
- <bounds left="130" top="100" right="150" bottom="139" />
- </element>
- <element name="digit22" ref="digit">
- <bounds left="154" top="100" right="174" bottom="139" />
- </element>
- <element name="digit23" ref="digit">
- <bounds left="178" top="100" right="198" bottom="139" />
- </element>
+ <param name="s" value="16" />
+ <group ref="score">
+ <bounds left="10" top="100" right="198" bottom="139" />
+ </group>
<!-- Player 4 Score -->
- <element name="digit24" ref="digit">
- <bounds left="202" top="100" right="222" bottom="139" />
- </element>
- <element name="digit25" ref="digit">
- <bounds left="226" top="100" right="246" bottom="139" />
- </element>
- <element name="digit26" ref="digit">
- <bounds left="250" top="100" right="270" bottom="139" />
- </element>
- <element name="digit27" ref="digit">
- <bounds left="274" top="100" right="294" bottom="139" />
- </element>
- <element name="digit28" ref="digit">
- <bounds left="298" top="100" right="318" bottom="139" />
- </element>
- <element name="digit29" ref="digit">
- <bounds left="322" top="100" right="342" bottom="139" />
- </element>
- <element name="digit30" ref="digit">
- <bounds left="346" top="100" right="366" bottom="139" />
- </element>
- <element name="digit31" ref="digit">
- <bounds left="370" top="100" right="390" bottom="139" />
- </element>
+ <param name="s" value="24" />
+ <group ref="score">
+ <bounds left="202" top="100" right="390" bottom="139" />
+ </group>
<element ref="P3"><bounds left="10" right="174" top="30" bottom="42" /></element>
<element ref="P4"><bounds left="190" right="354" top="30" bottom="42" /></element>
diff --git a/src/mame/layout/gts80a_caveman.lay b/src/mame/layout/gts80a_caveman.lay
index d8180a76584..ea39780fc8f 100644
--- a/src/mame/layout/gts80a_caveman.lay
+++ b/src/mame/layout/gts80a_caveman.lay
@@ -26,9 +26,7 @@ copyright-holders:Robbbert
<element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
- <view name="Default Layout">
- <bounds left="0" top="20" right="318" bottom="394" />
-
+ <group name="backglass">
<!-- LEDs -->
<!-- Player 1 Score -->
@@ -143,9 +141,22 @@ copyright-holders:Robbbert
<element name="text2" ref="P4"><bounds left="100" right="180" top="90" bottom="102" /></element>
<element name="text1" ref="P5"><bounds left="100" right="180" top="150" bottom="162" /></element>
<element name="text0" ref="P6"><bounds left="100" right="180" top="210" bottom="222" /></element>
+ </group>
+
+ <view name="Backglass and Screen">
+ <bounds left="0" top="20" right="817" bottom="394" />
+
+ <group ref="backglass" />
<screen index="0">
- <bounds x="320" y="0" width="320" height="240" />
+ <bounds x="318" y="20" width="499" height="374" />
</screen>
</view>
+
+ <view name="Backglass Only">
+ <bounds left="0" top="20" right="318" bottom="394" />
+
+ <group ref="backglass" />
+ </view>
+
</mamelayout>
diff --git a/src/mame/layout/sda5708.lay b/src/mame/layout/sda5708.lay
index 223434d99c7..57388936ee7 100644
--- a/src/mame/layout/sda5708.lay
+++ b/src/mame/layout/sda5708.lay
@@ -44,8 +44,6 @@ license:CC0
</element>
<view name="Default Layout">
- <bounds left="0" top="0" right="150" bottom="20" />
-
<!-- generated with mechanical data from the data sheet -->
<repeat count="8"> <!-- 8 digits -->
<param name="digitno" start="1" increment="1" />