summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2021-03-11 17:21:24 +0100
committer hap <happppp@users.noreply.github.com>2021-03-11 17:21:39 +0100
commit28ab52f1aac17f02d5323d8858dee2975f8f1f1f (patch)
treed456d89f99a12dffc1df2c6a78b980ca17993dd3
parentdff6fc11a05660708c5511ecaaf6a11177c219c7 (diff)
f2pbball: use inline svg for diamond shape
-rw-r--r--src/mame/layout/f2pbball.lay157
-rw-r--r--src/mame/layout/tmtennis.lay9
2 files changed, 87 insertions, 79 deletions
diff --git a/src/mame/layout/f2pbball.lay b/src/mame/layout/f2pbball.lay
index daa820d7c89..a75f71ee5e9 100644
--- a/src/mame/layout/f2pbball.lay
+++ b/src/mame/layout/f2pbball.lay
@@ -6,48 +6,67 @@ license:CC0
<!-- define elements -->
- <element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
- <element name="static_red"><rect><color red="0.2" green="0.04" blue="0.05" /></rect></element>
- <element name="disk_red"><disk><color red="0.2" green="0.04" blue="0.05" /></disk></element>
- <element name="static_green"><rect><color red="0.0" green="0.38" blue="0.15" /></rect></element>
- <element name="static_white"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element>
- <element name="disk_white"><disk><color red="0.75" green="0.75" blue="0.75" /></disk></element>
- <element name="static_white2"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
-
- <element name="ledo" defstate="0">
- <disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
- <disk state="1"><color red="1.0" green="0.20" blue="0.22" /></disk>
+ <element name="diamond_white">
+ <image><data><![CDATA[
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1414.21356" height="1414.21356">
+ <rect width="1000.0" height="1000.0" x="500.0" y="-500.0" transform="rotate(45.0)" style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </svg>
+ ]]></data></image>
</element>
+ <element name="diamond_black">
+ <image><data><![CDATA[
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1414.21356" height="1414.21356">
+ <rect width="1000.0" height="1000.0" x="500.0" y="-500.0" transform="rotate(45.0)" style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </svg>
+ ]]></data></image>
+ </element>
+ <element name="diamond_green">
+ <image><data><![CDATA[
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1414.21356" height="1414.21356">
+ <rect width="1000.0" height="1000.0" x="500.0" y="-500.0" transform="rotate(45.0)" style="opacity:1;fill:#006126;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </svg>
+ ]]></data></image>
+ </element>
+
+ <element name="black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
+ <element name="blackd"><disk><color red="0.0" green="0.0" blue="0.0" /></disk></element>
+ <element name="green"><rect><color red="0.0" green="0.38" blue="0.149" /></rect></element>
+ <element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+
<element name="led" defstate="0">
<disk>
<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
- <color red="0.2" green="0.04" blue="0.05" />
+ <color red="0.0" green="0.0" blue="0.0" />
+ </disk>
+ <disk state="0">
+ <bounds x="0.25" y="0.25" width="0.5" height="0.5" />
+ <color red="0.1" green="0.01" blue="0.015" />
</disk>
<disk state="1">
<bounds x="0.25" y="0.25" width="0.5" height="0.5" />
- <color red="1.0" green="0.20" blue="0.22" />
+ <color red="1.0" green="0.1" blue="0.15" />
</disk>
</element>
<element name="digit" defstate="0">
- <led7seg><color red="1.0" green="0.20" blue="0.22" /></led7seg>
+ <led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
</element>
<element name="text_p">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
- <text string="P"><color red="0.9" green="0.9" blue="0.9" /></text>
+ <text string="P"><color red="0.8" green="0.8" blue="0.8" /></text>
</element>
<element name="text_1st">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
- <text string="1st"><color red="0.9" green="0.9" blue="0.9" /></text>
+ <text string="1st"><color red="0.8" green="0.8" blue="0.8" /></text>
</element>
<element name="text_2nd">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
- <text string="2nd"><color red="0.9" green="0.9" blue="0.9" /></text>
+ <text string="2nd"><color red="0.8" green="0.8" blue="0.8" /></text>
</element>
<element name="text_3rd">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
- <text string="3rd"><color red="0.9" green="0.9" blue="0.9" /></text>
+ <text string="3rd"><color red="0.8" green="0.8" blue="0.8" /></text>
</element>
<element name="text_foul">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
@@ -63,7 +82,7 @@ license:CC0
</element>
<element name="text_strike">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
- <text string="STRIKE"><color red="0.9" green="0.9" blue="0.9" /></text>
+ <text string="STRIKE"><color red="0.8" green="0.8" blue="0.8" /></text>
</element>
<element name="text_flyout">
<rect><color red="0.0" green="0.38" blue="0.15" /></rect>
@@ -104,14 +123,25 @@ license:CC0
<view name="Internal Layout">
<bounds left="3" right="28" top="-2" bottom="33" />
- <element ref="static_white2"><bounds x="2" y="3.6" width="27" height="1" /></element>
- <element ref="static_green"><bounds x="2" y="4" width="27" height="30" /></element>
+ <element ref="green"><bounds x="2" y="3" width="27" height="30" /></element>
+
+ <element ref="text_3rd"><bounds x="2.9" y="17.9" width="3" height="1.2" /></element>
+ <element ref="text_1st"><bounds x="25.1" y="17.9" width="3" height="1.2" /></element>
+
+ <element ref="diamond_white"><bounds x="3" y="3.5" width="25" height="25" /></element>
+ <element ref="diamond_green"><bounds x="3" y="3.25" width="25" height="25" /></element>
+
+ <element ref="white"><bounds x="2" y="3" width="27" height="1" /></element>
+ <element ref="black"><bounds x="2" y="2.6" width="27" height="1" /></element>
+
+ <element ref="black"><bounds x="1" y="0" width="2" height="50" /></element>
+ <element ref="black"><bounds x="28" y="0" width="2" height="50" /></element>
<!-- score panel -->
<element ref="text_visitor"><bounds x="6.55" y="-1.7" width="6.4" height="1.2" /></element>
- <element ref="static_white"><bounds x="6.55" y="-0.5" width="6.4" height="3.65" /></element>
- <element ref="static_black"><bounds x="6.75" y="-0.3" width="6" height="3.25" /></element>
+ <element ref="white"><bounds x="6.55" y="-0.5" width="6.4" height="3.65" /></element>
+ <element ref="black"><bounds x="6.75" y="-0.3" width="6" height="3.25" /></element>
<element ref="text_balls"><bounds x="6.75" y="-0.3" width="2" height="0.7" /></element>
<element ref="text_strikes"><bounds x="8.75" y="-0.3" width="2" height="0.7" /></element>
@@ -119,26 +149,25 @@ license:CC0
<element name="digit8" ref="digit"><bounds x="7" y="0.5" width="1.5" height="2.25" /></element>
<element name="digit7" ref="digit"><bounds x="9" y="0.5" width="1.5" height="2.25" /></element>
- <element name="8.7" ref="ledo"><bounds x="11.5" y="1.4" width="0.5" height="0.5" /></element>
+ <element name="8.7" ref="led"><bounds x="11.25" y="1.15" width="1" height="1" /></element>
- <element ref="static_white"><bounds x="8.65" y="-0.4" width="0.2" height="3.45" /></element>
- <element ref="static_white"><bounds x="10.65" y="-0.4" width="0.2" height="3.45" /></element>
+ <element ref="white"><bounds x="8.65" y="-0.4" width="0.2" height="3.45" /></element>
+ <element ref="white"><bounds x="10.65" y="-0.4" width="0.2" height="3.45" /></element>
<element ref="text_hometeam"><bounds x="18" y="-1.7" width="6.4" height="1.2" /></element>
- <element ref="static_white"><bounds x="18" y="-0.5" width="6.4" height="3.65" /></element>
- <element ref="static_black"><bounds x="18.2" y="-0.3" width="6" height="3.25" /></element>
+ <element ref="white"><bounds x="18" y="-0.5" width="6.4" height="3.65" /></element>
+ <element ref="black"><bounds x="18.2" y="-0.3" width="6" height="3.25" /></element>
<element ref="text_atbat"><bounds x="18.2" y="-0.3" width="2" height="0.7" /></element>
<element ref="text_outs"><bounds x="20.2" y="-0.3" width="2" height="0.7" /></element>
<element ref="text_innings"><bounds x="22.2" y="-0.3" width="2" height="0.7" /></element>
-
- <element name="6.7" ref="ledo"><bounds x="18.95" y="1.4" width="0.5" height="0.5" /></element>
+ <element name="6.7" ref="led"><bounds x="18.7" y="1.15" width="1" height="1" /></element>
<element name="digit6" ref="digit"><bounds x="20.45" y="0.5" width="1.5" height="2.25" /></element>
<element name="digit5" ref="digit"><bounds x="22.45" y="0.5" width="1.5" height="2.25" /></element>
- <element ref="static_white"><bounds x="20.1" y="-0.4" width="0.2" height="3.45" /></element>
- <element ref="static_white"><bounds x="22.1" y="-0.4" width="0.2" height="3.45" /></element>
+ <element ref="white"><bounds x="20.1" y="-0.4" width="0.2" height="3.45" /></element>
+ <element ref="white"><bounds x="22.1" y="-0.4" width="0.2" height="3.45" /></element>
<!-- upper part -->
@@ -174,8 +203,6 @@ license:CC0
<element ref="text_p"><bounds x="14" y="13.2" width="3" height="1.2" /></element>
<element ref="text_2nd"><bounds x="14" y="7" width="3" height="1.2" /></element>
- <element ref="text_3rd"><bounds x="2.9" y="17.9" width="3" height="1.2" /></element>
- <element ref="text_1st"><bounds x="25.1" y="17.9" width="3" height="1.2" /></element>
<element ref="text_strike"><bounds x="13" y="31.2" width="5" height="1.2" /></element>
<element ref="text_foul"><bounds x="6.8" y="24" width="2.2" height="1" /></element>
@@ -186,46 +213,28 @@ license:CC0
<element ref="text_curve"><bounds x="19.3" y="27" width="3" height="1" /></element>
<element ref="text_ball"><bounds x="18.9" y="30" width="3" height="1" /></element>
- <element ref="static_white"><bounds x="11.8" y="26.8" width="1.4" height="4.4" /></element>
- <element ref="static_green"><bounds x="12" y="27" width="1" height="4" /></element>
- <element ref="static_white"><bounds x="17.8" y="26.8" width="1.4" height="4.4" /></element>
- <element ref="static_green"><bounds x="18" y="27" width="1" height="4" /></element>
-
- <element ref="disk_red"><bounds x="14.5" y="8.5" width="2" height="2" /></element>
- <element ref="disk_red"><bounds x="5.5" y="17.5" width="2" height="2" /></element>
- <element ref="disk_red"><bounds x="23.5" y="17.5" width="2" height="2" /></element>
-
- <element ref="disk_red"><bounds x="14.5" y="14.5" width="2" height="2" /></element>
- <element ref="static_red"><bounds x="14.99" y="15.5" width="1.02" height="12" /></element>
-
- <element ref="static_white"><bounds x="14.5" y="26.5" width="2" height="2.5" /></element>
- <element ref="static_red"><bounds x="14.7" y="26.7" width="1.6" height="2.1" /></element>
-
- <!-- diamond city -->
-
- <repeat count="20">
- <param name="x" start="15.4" increment="0.5" />
- <param name="y" start="8.4" increment="0.5" />
- <element ref="disk_white"><bounds x="~x~" y="~y~" width="0.2" height="0.2" /></element>
- </repeat>
-
- <repeat count="20">
- <param name="x" start="15.4" increment="-0.5" />
- <param name="y" start="8.4" increment="0.5" />
- <element ref="disk_white"><bounds x="~x~" y="~y~" width="0.2" height="0.2" /></element>
- </repeat>
-
- <repeat count="26">
- <param name="x" start="15.4" increment="0.5" />
- <param name="y" start="28.4" increment="-0.5" />
- <element ref="disk_white"><bounds x="~x~" y="~y~" width="0.2" height="0.2" /></element>
- </repeat>
-
- <repeat count="26">
- <param name="x" start="15.4" increment="-0.5" />
- <param name="y" start="28.4" increment="-0.5" />
- <element ref="disk_white"><bounds x="~x~" y="~y~" width="0.2" height="0.2" /></element>
- </repeat>
+ <element ref="white"><bounds x="11.8" y="26.8" width="1.4" height="4.4" /></element>
+ <element ref="green"><bounds x="12" y="27" width="1" height="4" /></element>
+ <element ref="white"><bounds x="17.8" y="26.8" width="1.4" height="4.4" /></element>
+ <element ref="green"><bounds x="18" y="27" width="1" height="4" /></element>
+
+ <element ref="diamond_white"><bounds x="5.5" y="8.5" width="20" height="20" /></element>
+ <element ref="white"><bounds x="14.5" y="26.5" width="2" height="2.5" /></element>
+ <element ref="diamond_black"><bounds x="5.75" y="8.75" width="19.5" height="19.5" /></element>
+ <element ref="diamond_green"><bounds x="7.25" y="10.25" width="16.5" height="16.5" /></element>
+
+ <element ref="blackd"><bounds x="14.5" y="14.5" width="2" height="2" /></element>
+ <element ref="black"><bounds x="14.97" y="15.5" width="1.06" height="12" /></element>
+
+ <element ref="black"><bounds x="14.25" y="10.25" width="2.5" height="1" /></element>
+ <element ref="black"><bounds x="7.25" y="17.25" width="1" height="2.5" /></element>
+ <element ref="black"><bounds x="22.75" y="17.25" width="1" height="2.5" /></element>
+ <element ref="black"><bounds x="14" y="25.5" width="3" height="1" /></element>
+
+ <element ref="white"><bounds x="14.5" y="26.5" width="1.77" height="0.25" /></element>
+ <element ref="white"><bounds x="14.5" y="26.5" width="0.25" height="1.2" /></element>
+ <element ref="white"><bounds x="16.25" y="26.5" width="0.25" height="1" /></element>
+ <element ref="white"><bounds x="16.25" y="26.5" width="0.2" height="1.2" /></element>
<!-- field leds -->
diff --git a/src/mame/layout/tmtennis.lay b/src/mame/layout/tmtennis.lay
index 94384606c88..1825673283e 100644
--- a/src/mame/layout/tmtennis.lay
+++ b/src/mame/layout/tmtennis.lay
@@ -4,11 +4,11 @@ license:CC0
-->
<mamelayout version="2">
- <!-- define elements -->
+<!-- define elements -->
<element name="court">
<image><data><![CDATA[
- <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="700" height="249" viewBox="0 0 700 249" version="1.1" id="svg1">
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="700" height="249" viewBox="0 0 700 249">
<g fill="none" stroke="#00ff00" stroke-width="3" stroke-linecap="butt" stroke-linejoin="round" stroke-opacity="1">
<path d="m 1.5,247.5 h 697 l -95,-208 h -507 z" />
<path d="M 88,58.5 H 612" />
@@ -26,14 +26,13 @@ license:CC0
]]></data></image>
</element>
- <!-- build screen -->
- <view name="Internal Layout">
+<!-- build screen -->
+ <view name="Internal Layout">
<screen index="0" blend="add"><bounds x="3" y="7.6" width="64" height="13.9" /></screen>
<!-- draw the tennis court -->
-
<element ref="court"><bounds width="70" height="24.9" /><color alpha="0.5" /></element>
</view>