diff options
Diffstat (limited to 'src')
82 files changed, 1479 insertions, 1429 deletions
diff --git a/src/devices/bus/rs232/hlemouse.cpp b/src/devices/bus/rs232/hlemouse.cpp index a6452b9dcef..38e9bfd5c20 100644 --- a/src/devices/bus/rs232/hlemouse.cpp +++ b/src/devices/bus/rs232/hlemouse.cpp @@ -247,7 +247,7 @@ WRITE_LINE_MEMBER(hle_msmouse_device_base::input_dtr) WRITE_LINE_MEMBER(hle_msmouse_device_base::input_rts) { - m_dtr = state ? 1U : 0U; + m_rts = state ? 1U : 0U; check_enable(); } diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 4d621508a20..3bc0e8ef5db 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1067,7 +1067,7 @@ unsigned render_target::configured_view(const char *viewname, int targetindex, i if (strcmp(viewname, "auto") != 0) { // scan for a matching view name - size_t viewlen = strlen(viewname); + size_t const viewlen = strlen(viewname); for (unsigned i = 0; !view && (m_views.size() > i); ++i) if (!core_strnicmp(m_views[i].first.get().name().c_str(), viewname, viewlen)) view = &m_views[i].first.get(); @@ -1082,21 +1082,22 @@ unsigned render_target::configured_view(const char *viewname, int targetindex, i // if we have enough targets to be one per screen, assign in order if (numtargets >= screens.size()) { - int const ourindex = index() % screens.size(); - screen_device &screen = screens[ourindex]; - // find the first view with this screen and this screen only - unsigned viewindex; - for (view = view_by_index(viewindex = 0); view != nullptr; view = view_by_index(++viewindex)) + screen_device const &screen = screens[index() % screens.size()]; + for (unsigned i = 0; !view && (m_views.size() > i); ++i) { - auto const &viewscreens = view->screens(); - if (viewscreens.empty()) + for (screen_device const &viewscreen : m_views[i].first.get().screens()) { - view = nullptr; - break; + if (&viewscreen == &screen) + { + view = &m_views[i].first.get(); + } + else + { + view = nullptr; + break; + } } - else if (std::find_if(viewscreens.begin(), viewscreens.end(), [&screen] (auto const &scr) { return &scr.get() != &screen; }) == viewscreens.end()) - break; } } @@ -1105,18 +1106,10 @@ unsigned render_target::configured_view(const char *viewname, int targetindex, i { for (unsigned i = 0; !view && (m_views.size() > i); ++i) { - view = &m_views[i].first.get(); - if (view->screen_count() >= screens.size()) - { - for (screen_device &screen : screens) - { - if (!view->has_screen(screen)) - { - view = nullptr; - break; - } - } - } + layout_view &curview = m_views[i].first; + if (curview.screen_count() >= screens.size()) + if (std::find_if(screens.begin(), screens.end(), [&curview] (screen_device &screen) { return !curview.has_screen(screen); }) == screens.end()) + view = &curview; } } } @@ -2631,7 +2624,7 @@ void render_target::config_load(util::xml::data_node const &targetnode) if (m_views.end() == view) continue; - for (util::xml::data_node const *vistogglenode = viewnode->get_child("vistoggle"); vistogglenode; vistogglenode = vistogglenode->get_next_sibling("vistoggle")) + for (util::xml::data_node const *vistogglenode = viewnode->get_child("collection"); vistogglenode; vistogglenode = vistogglenode->get_next_sibling("collection")) { char const *const vistogglename = vistogglenode->get_attribute_string("name", nullptr); if (!vistogglename) @@ -2642,7 +2635,7 @@ void render_target::config_load(util::xml::data_node const &targetnode) if (vistoggles.end() == vistoggle) continue; - int const enable = vistogglenode->get_attribute_int("enabled", -1); + int const enable = vistogglenode->get_attribute_int("visible", -1); if (0 <= enable) { if (enable) @@ -2716,9 +2709,9 @@ bool render_target::config_save(util::xml::data_node &targetnode) viewnode = targetnode.add_child("view", nullptr); viewnode->set_attribute("name", view.first.get().name().c_str()); } - util::xml::data_node *const vistogglenode = viewnode->add_child("vistoggle", nullptr); + util::xml::data_node *const vistogglenode = viewnode->add_child("collection", nullptr); vistogglenode->set_attribute("name", toggle.name().c_str()); - vistogglenode->set_attribute_int("enabled", BIT(view.second, i)); + vistogglenode->set_attribute_int("visible", BIT(view.second, i)); changed = true; } ++i; diff --git a/src/emu/render.h b/src/emu/render.h index d846dce58c1..ab7daa753e3 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -716,6 +716,7 @@ private: group_map &groupmap, std::vector<layout_group const *> &seen, bool empty, + bool collection, bool repeat, bool init); diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index 1d4a8f23265..3eedf6c728f 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -1116,7 +1116,7 @@ void layout_group::resolve_bounds(environment &env, group_map &groupmap, std::ve { set_render_bounds_xy(m_bounds, 0.0F, 0.0F, 1.0F, 1.0F); environment local(env); - resolve_bounds(local, m_groupnode, groupmap, seen, true, false, true); + resolve_bounds(local, m_groupnode, groupmap, seen, true, false, false, true); } seen.pop_back(); } @@ -1127,6 +1127,7 @@ void layout_group::resolve_bounds( group_map &groupmap, std::vector<layout_group const *> &seen, bool empty, + bool collection, bool repeat, bool init) { @@ -1216,16 +1217,16 @@ void layout_group::resolve_bounds( environment local(env); for (int i = 0; !m_bounds_resolved && (count > i); ++i) { - resolve_bounds(local, *itemnode, groupmap, seen, empty, true, !i); + resolve_bounds(local, *itemnode, groupmap, seen, empty, false, true, !i); local.increment_parameters(); } } - else if (!strcmp(itemnode->get_name(), "vistoggle")) + else if (!strcmp(itemnode->get_name(), "collection")) { if (!env.get_attribute_string(*itemnode, "name", nullptr)) - throw layout_syntax_error("vistoggle must have name attribute"); + throw layout_syntax_error("collection must have name attribute"); environment local(env); - resolve_bounds(local, *itemnode, groupmap, seen, empty, false, true); + resolve_bounds(local, *itemnode, groupmap, seen, empty, true, false, true); } else { @@ -1241,7 +1242,7 @@ void layout_group::resolve_bounds( m_bounds_resolved = resolved; } - if (!repeat) + if (!collection && !repeat) m_bounds_resolved = true; } @@ -3364,12 +3365,12 @@ void layout_view::add_items( local.increment_parameters(); } } - else if (!strcmp(itemnode->get_name(), "vistoggle")) + else if (!strcmp(itemnode->get_name(), "collection")) { char const *name(env.get_attribute_string(*itemnode, "name", nullptr)); if (!name) - throw layout_syntax_error("vistoggle must have name attribute"); - m_defvismask |= u32(env.get_attribute_bool(*itemnode, "enabled", true) ? 1 : 0) << m_vistoggles.size(); // TODO: make this less hacky + throw layout_syntax_error("collection must have name attribute"); + m_defvismask |= u32(env.get_attribute_bool(*itemnode, "visible", true) ? 1 : 0) << m_vistoggles.size(); // TODO: make this less hacky view_environment local(env, true); m_vistoggles.emplace_back(name, local.visibility_mask()); add_items(layers, local, *itemnode, elemmap, groupmap, orientation, trans, color, false, false, true); diff --git a/src/mame/drivers/mekd4.cpp b/src/mame/drivers/mekd4.cpp index 1b0828f1c47..f03c8e3248f 100644 --- a/src/mame/drivers/mekd4.cpp +++ b/src/mame/drivers/mekd4.cpp @@ -239,28 +239,32 @@ FS 0 to F ******************************************************************************/ #include "emu.h" + +#include "bus/rs232/rs232.h" #include "cpu/m6809/m6809.h" -#include "machine/input_merger.h" -#include "machine/bankdev.h" +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" #include "machine/6821pia.h" #include "machine/6850acia.h" -#include "machine/mc14411.h" +#include "machine/bankdev.h" #include "machine/clock.h" +#include "machine/input_merger.h" +#include "machine/mc14411.h" #include "machine/timer.h" #include "sound/wave.h" -#include "speaker.h" -#include "bus/rs232/rs232.h" -#include "mekd4.lh" -#include "imagedev/cassette.h" -#include "imagedev/snapquik.h" #include "video/pwm.h" // MEK68R2 #include "machine/terminal.h" #include "video/mc6845.h" + #include "emupal.h" -#include "screen.h" #include "render.h" +#include "screen.h" +#include "speaker.h" + +#include "mekd4.lh" + class mekd4_state : public driver_device { diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index 02d14e58273..5018829362d 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -617,8 +617,6 @@ void psikyo4_state::ps4big(machine_config &config) PALETTE(config, m_palette[0]).set_entries((0x2000/4) + 1); /* palette + clear colour */ PALETTE(config, m_palette[1]).set_entries((0x2000/4) + 1); - config.set_default_layout(layout_dualhsxs); - SCREEN(config, m_lscreen, SCREEN_TYPE_RASTER); m_lscreen->set_refresh_hz(60); m_lscreen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); diff --git a/src/mame/layout/280zzzap.lay b/src/mame/layout/280zzzap.lay index 548b73f7f7c..8122ae7cf13 100644 --- a/src/mame/layout/280zzzap.lay +++ b/src/mame/layout/280zzzap.lay @@ -67,64 +67,74 @@ license:CC0 <screen index="0"> <bounds x="0" y="0" width="640" height="480" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds x="0" y="0" width="640" height="480" /> - </overlay> - - <bezel element="shifter" inputtag="IN0" inputmask="0x10"> - <bounds x="606" y="414" width="32" height="64" /> - <color alpha="0.6" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="640" height="480" /> + </element> + </collection> + <collection name="Shifter"> + <element ref="shifter" inputtag="IN0" inputmask="0x10"> + <bounds x="606" y="414" width="32" height="64" /> + <color alpha="0.6" /> + </element> + </collection> </view> <view name="Color Overlay + Shifter-L"> <screen index="0"> <bounds x="0" y="0" width="640" height="480" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds x="0" y="0" width="640" height="480" /> - </overlay> - - <bezel element="shifter" inputtag="IN0" inputmask="0x10"> - <bounds x="2" y="414" width="32" height="64" /> - <color alpha="0.6" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="640" height="480" /> + </element> + </collection> + <collection name="Shifter"> + <element ref="shifter" inputtag="IN0" inputmask="0x10"> + <bounds x="2" y="414" width="32" height="64" /> + <color alpha="0.6" /> + </element> + </collection> </view> <view name="Widescreen Color Overlay + Shifter-R"> <screen index="0"> <bounds x="0" y="0" width="640" height="480" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds x="0" y="0" width="640" height="480" /> - </overlay> - - <bezel element="shifter" inputtag="IN0" inputmask="0x10"> - <bounds x="648" y="414" width="32" height="64" /> - <color alpha="0.65" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="640" height="480" /> + </element> + </collection> + <collection name="Shifter"> + <element ref="shifter" inputtag="IN0" inputmask="0x10"> + <bounds x="648" y="414" width="32" height="64" /> + </element> + </collection> </view> <view name="Widescreen Color Overlay + Shifter-L"> <screen index="0"> <bounds x="0" y="0" width="640" height="480" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds x="0" y="0" width="640" height="480" /> - </overlay> - - <bezel element="shifter" inputtag="IN0" inputmask="0x10"> - <bounds x="-40" y="414" width="32" height="64" /> - <color alpha="0.65" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="640" height="480" /> + </element> + </collection> + <collection name="Shifter"> + <element ref="shifter" inputtag="IN0" inputmask="0x10"> + <bounds x="-40" y="414" width="32" height="64" /> + </element> + </collection> </view> <view name="Color Overlay"> <screen index="0"> <bounds x="0" y="0" width="640" height="480" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="640" height="480" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/ace.lay b/src/mame/layout/ace.lay index 614a098828a..5ec0ca3a28d 100644 --- a/src/mame/layout/ace.lay +++ b/src/mame/layout/ace.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/alinvade.lay b/src/mame/layout/alinvade.lay index efb4bb2b1a2..eb8c571ae15 100644 --- a/src/mame/layout/alinvade.lay +++ b/src/mame/layout/alinvade.lay @@ -22,8 +22,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/armora.lay b/src/mame/layout/armora.lay index 8534545b9a6..a91e2f04775 100644 --- a/src/mame/layout/armora.lay +++ b/src/mame/layout/armora.lay @@ -148,43 +148,46 @@ license:CC0 <color red="0" green="0.235" blue="0.11" /> </rect> </element> - <view name="Color_Overlay"> - <overlay element="overlay"> - <bounds x="0" y="0" width="512" height="384" /> - </overlay> - <backdrop element="overlay"> + + <view name="Color Overlay"> + <screen index="0"> + <bounds x="0" y="0" width="1024" height="768" /> + </screen> + + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="512" height="384" /> - <color alpha=".8" /> - </backdrop> - <overlay element="overlay"> + </element> + <element ref="overlay" blend="multiply"> <bounds x="512" y="384" width="512" height="384" /> <orientation rotate="180" /> - </overlay> - <backdrop element="overlay"> + </element> + <element ref="overlay" blend="multiply"> + <bounds x="512" y="0" width="512" height="384" /> + <orientation flipx="yes" /> + </element> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="384" width="512" height="384" /> + <orientation flipy="yes" /> + </element> + + <element ref="overlay" blend="add"> + <bounds x="0" y="0" width="512" height="384" /> + <color alpha=".8" /> + </element> + <element ref="overlay" blend="add"> <bounds x="512" y="384" width="512" height="384" /> <color alpha=".8" /> <orientation rotate="180" /> - </backdrop> - <overlay element="overlay"> - <bounds x="512" y="0" width="512" height="384" /> - <orientation flipx="yes" /> - </overlay> - <backdrop element="overlay"> + </element> + <element ref="overlay" blend="add"> <bounds x="512" y="0" width="512" height="384" /> <color alpha=".8" /> <orientation flipx="yes" /> - </backdrop> - <overlay element="overlay"> - <bounds x="0" y="384" width="512" height="384" /> - <orientation flipy="yes" /> - </overlay> - <backdrop element="overlay"> + </element> + <element ref="overlay" blend="add"> <bounds x="0" y="384" width="512" height="384" /> <color alpha=".8" /> <orientation flipy="yes" /> - </backdrop> - <screen index="0"> - <bounds x="0" y="0" width="1024" height="768" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/astdelux.lay b/src/mame/layout/astdelux.lay index b0c6c68b1a0..e1ee1492dff 100644 --- a/src/mame/layout/astdelux.lay +++ b/src/mame/layout/astdelux.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/attackfc.lay b/src/mame/layout/attackfc.lay index 8aabbd1d73b..03154197288 100644 --- a/src/mame/layout/attackfc.lay +++ b/src/mame/layout/attackfc.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/avalnche.lay b/src/mame/layout/avalnche.lay index ff519254ef8..1143f2c08a8 100644 --- a/src/mame/layout/avalnche.lay +++ b/src/mame/layout/avalnche.lay @@ -30,8 +30,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/barricad.lay b/src/mame/layout/barricad.lay index 3b236920f8d..00e4fd9d8d3 100644 --- a/src/mame/layout/barricad.lay +++ b/src/mame/layout/barricad.lay @@ -20,16 +20,16 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay_red"> + <element ref="overlay_red" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> <view name="Green Overlay"> <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay_green"> + <element ref="overlay_green" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/barrier.lay b/src/mame/layout/barrier.lay index 0bf394a412f..3664f8e28b9 100644 --- a/src/mame/layout/barrier.lay +++ b/src/mame/layout/barrier.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/beaminv.lay b/src/mame/layout/beaminv.lay index 846e33c4a01..811159f9756 100644 --- a/src/mame/layout/beaminv.lay +++ b/src/mame/layout/beaminv.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/blockade.lay b/src/mame/layout/blockade.lay index 000a5731a8a..c78cd711fee 100644 --- a/src/mame/layout/blockade.lay +++ b/src/mame/layout/blockade.lay @@ -20,16 +20,16 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay_green"> + <element ref="overlay_green" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> <view name="Yellow Overlay"> <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay_yellow"> + <element ref="overlay_yellow" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/breakout.lay b/src/mame/layout/breakout.lay index eded2e3b2a2..bba1cca529f 100644 --- a/src/mame/layout/breakout.lay +++ b/src/mame/layout/breakout.lay @@ -72,17 +72,21 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> - <bezel name="lamp_credit1" element="lamp_credit1"> - <bounds x="0.2" y="4.01" width="0.55" height="0.55" /> - </bezel> - <bezel name="serve_led" element="serve_led"> - <bounds x="1.4" y="4.01" width="0.24" height="0.24" /> - </bezel> - <bezel name="lamp_credit2" element="lamp_credit2"> - <bounds x="2.25" y="4.01" width="0.55" height="0.55" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds left="0" top="0" right="3" bottom="4" /> + </element> + </collection> + <collection name="Lamps"> + <element name="lamp_credit1" ref="lamp_credit1"> + <bounds x="0.2" y="4.01" width="0.55" height="0.55" /> + </element> + <element name="serve_led" ref="serve_led"> + <bounds x="1.4" y="4.01" width="0.24" height="0.24" /> + </element> + <element name="lamp_credit2" ref="lamp_credit2"> + <bounds x="2.25" y="4.01" width="0.55" height="0.55" /> + </element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/bzone.lay b/src/mame/layout/bzone.lay index aae231c13fc..a62af6e6727 100644 --- a/src/mame/layout/bzone.lay +++ b/src/mame/layout/bzone.lay @@ -18,8 +18,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/circus.lay b/src/mame/layout/circus.lay index fb48532bc59..f78e13453f0 100644 --- a/src/mame/layout/circus.lay +++ b/src/mame/layout/circus.lay @@ -30,8 +30,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/clowns.lay b/src/mame/layout/clowns.lay index a4a7c0a3feb..85b3536bf64 100644 --- a/src/mame/layout/clowns.lay +++ b/src/mame/layout/clowns.lay @@ -30,8 +30,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/copsnrob.lay b/src/mame/layout/copsnrob.lay index 000cd517a19..81652bdfd9c 100644 --- a/src/mame/layout/copsnrob.lay +++ b/src/mame/layout/copsnrob.lay @@ -22,8 +22,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/cosmicm.lay b/src/mame/layout/cosmicm.lay index 33b53fe7075..544efa2d364 100644 --- a/src/mame/layout/cosmicm.lay +++ b/src/mame/layout/cosmicm.lay @@ -22,8 +22,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/crash.lay b/src/mame/layout/crash.lay index a88ff6d766c..60cc746462d 100644 --- a/src/mame/layout/crash.lay +++ b/src/mame/layout/crash.lay @@ -30,8 +30,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/deadeye.lay b/src/mame/layout/deadeye.lay index 63d4adc728c..e060863cd15 100644 --- a/src/mame/layout/deadeye.lay +++ b/src/mame/layout/deadeye.lay @@ -38,8 +38,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/demon.lay b/src/mame/layout/demon.lay index 3a9288e6a2e..dfad92942c1 100644 --- a/src/mame/layout/demon.lay +++ b/src/mame/layout/demon.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/depthch.lay b/src/mame/layout/depthch.lay index d4383780e3f..3255fcc78eb 100644 --- a/src/mame/layout/depthch.lay +++ b/src/mame/layout/depthch.lay @@ -16,8 +16,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay_gremlin"> + <element ref="overlay_gremlin" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/dragrace.lay b/src/mame/layout/dragrace.lay index de3fb5df7f3..7eb5fc24128 100644 --- a/src/mame/layout/dragrace.lay +++ b/src/mame/layout/dragrace.lay @@ -36,54 +36,54 @@ license:CC0 </element> -<!-- NOTE: still need to add the RPM tachometers, --> -<!-- but first figure out how they're hooked up --> + <!-- NOTE: still need to add the RPM tachometers, --> + <!-- but first figure out how they're hooked up --> <view name="Color Overlay"> <screen index="0"> <bounds left="0" top="0" right="400" bottom="300" /> </screen> - <overlay element="road_overlay"> + <element ref="road_overlay" blend="multiply"> <bounds left="0" top="0" right="400" bottom="300" /> - </overlay> + </element> - <bezel element="circle_red"> + <element ref="circle_red" blend="multiply"> <bounds x="24.5" y="168.5" width="24" height="24" /> - <color alpha=".3" /> - </bezel> - <bezel element="circle_green"> + </element> + <element ref="circle_green" blend="multiply"> <bounds x="49.5" y="168.5" width="24" height="24" /> - <color alpha=".3" /> - </bezel> - <bezel element="circle_yellow"> + </element> + <element ref="circle_yellow" blend="multiply"> <bounds x="74.5" y="168.5" width="24" height="24" /> - <color alpha=".3" /> - </bezel> - <bezel element="circle_yellow"> + </element> + <element ref="circle_yellow" blend="multiply"> <bounds x="99.5" y="168.5" width="24" height="24" /> - <color alpha=".3" /> - </bezel> - <bezel element="circle_yellow"> + </element> + <element ref="circle_yellow" blend="multiply"> <bounds x="124.5" y="168.5" width="24" height="24" /> - <color alpha=".3" /> - </bezel> + </element> - <overlay element="circle_red"> + <element ref="circle_red" blend="add"> <bounds x="24.5" y="168.5" width="24" height="24" /> - </overlay> - <overlay element="circle_green"> + <color red=".3" green=".3" blue=".3" /> + </element> + <element ref="circle_green" blend="add"> <bounds x="49.5" y="168.5" width="24" height="24" /> - </overlay> - <overlay element="circle_yellow"> + <color red=".3" green=".3" blue=".3" /> + </element> + <element ref="circle_yellow" blend="add"> <bounds x="74.5" y="168.5" width="24" height="24" /> - </overlay> - <overlay element="circle_yellow"> + <color red=".3" green=".3" blue=".3" /> + </element> + <element ref="circle_yellow" blend="add"> <bounds x="99.5" y="168.5" width="24" height="24" /> - </overlay> - <overlay element="circle_yellow"> + <color red=".3" green=".3" blue=".3" /> + </element> + <element ref="circle_yellow" blend="add"> <bounds x="124.5" y="168.5" width="24" height="24" /> - </overlay> + <color red=".3" green=".3" blue=".3" /> + </element> </view> </mamelayout> diff --git a/src/mame/layout/escmars.lay b/src/mame/layout/escmars.lay index 342bcc20fe5..b4c174f681d 100644 --- a/src/mame/layout/escmars.lay +++ b/src/mame/layout/escmars.lay @@ -22,12 +22,12 @@ license:CC0 </rect> </element> - <view name="Color_Overlay"> + <view name="Color Overlay"> <screen index="0"> <bounds x="0" y="0" width="3" height="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="3" height="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/et3400.lay b/src/mame/layout/et3400.lay index 9c05a2dcbd7..e7679de9b45 100644 --- a/src/mame/layout/et3400.lay +++ b/src/mame/layout/et3400.lay @@ -168,64 +168,59 @@ license:CC0 </element> <group name="displays"> - <cpanel element="surround"><bounds x="0" y="0" width="320" height="132" /></cpanel> + <element ref="surround"><bounds x="0" y="0" width="320" height="132" /></element> - <cpanel name="digit6" element="digit"><bounds x="16" y="16" width="48" height="80" /></cpanel> - <cpanel name="digit5" element="digit"><bounds x="64" y="16" width="48" height="80" /></cpanel> - <cpanel name="digit4" element="digit"><bounds x="112" y="16" width="48" height="80" /></cpanel> - <cpanel name="digit3" element="digit"><bounds x="160" y="16" width="48" height="80" /></cpanel> - <cpanel name="digit2" element="digit"><bounds x="208" y="16" width="48" height="80" /></cpanel> - <cpanel name="digit1" element="digit"><bounds x="256" y="16" width="48" height="80" /></cpanel> + <element name="digit6" ref="digit"><bounds x="16" y="16" width="48" height="80" /></element> + <element name="digit5" ref="digit"><bounds x="64" y="16" width="48" height="80" /></element> + <element name="digit4" ref="digit"><bounds x="112" y="16" width="48" height="80" /></element> + <element name="digit3" ref="digit"><bounds x="160" y="16" width="48" height="80" /></element> + <element name="digit2" ref="digit"><bounds x="208" y="16" width="48" height="80" /></element> + <element name="digit1" ref="digit"><bounds x="256" y="16" width="48" height="80" /></element> - <cpanel element="label_h"><bounds x="48" y="100" width="16" height="16" /></cpanel> - <cpanel element="label_i"><bounds x="96" y="100" width="16" height="16" /></cpanel> - <cpanel element="label_n"><bounds x="144" y="100" width="16" height="16" /></cpanel> - <cpanel element="label_z"><bounds x="192" y="100" width="16" height="16" /></cpanel> - <cpanel element="label_v"><bounds x="240" y="100" width="16" height="16" /></cpanel> - <cpanel element="label_c"><bounds x="288" y="100" width="16" height="16" /></cpanel> + <element ref="label_h"><bounds x="48" y="100" width="16" height="16" /></element> + <element ref="label_i"><bounds x="96" y="100" width="16" height="16" /></element> + <element ref="label_n"><bounds x="144" y="100" width="16" height="16" /></element> + <element ref="label_z"><bounds x="192" y="100" width="16" height="16" /></element> + <element ref="label_v"><bounds x="240" y="100" width="16" height="16" /></element> + <element ref="label_c"><bounds x="288" y="100" width="16" height="16" /></element> </group> <group name="keypad"> <bounds x="0" y="0" width="3.5" height="6.5" /> - <cpanel element="btn_d" inputtag="X0" inputmask="0x01"><bounds x="0.20" y="0.125" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_e" inputtag="X1" inputmask="0x01"><bounds x="1.25" y="0.125" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_f" inputtag="X2" inputmask="0x01"><bounds x="2.30" y="0.125" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_a" inputtag="X0" inputmask="0x02"><bounds x="0.20" y="1.175" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_b" inputtag="X1" inputmask="0x02"><bounds x="1.25" y="1.175" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_c" inputtag="X2" inputmask="0x02"><bounds x="2.30" y="1.175" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_7" inputtag="X0" inputmask="0x04"><bounds x="0.20" y="2.225" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_8" inputtag="X1" inputmask="0x04"><bounds x="1.25" y="2.225" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_9" inputtag="X2" inputmask="0x04"><bounds x="2.30" y="2.225" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_4" inputtag="X0" inputmask="0x08"><bounds x="0.20" y="3.275" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_5" inputtag="X1" inputmask="0x08"><bounds x="1.25" y="3.275" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_6" inputtag="X2" inputmask="0x08"><bounds x="2.30" y="3.275" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_1" inputtag="X0" inputmask="0x10"><bounds x="0.20" y="4.325" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_2" inputtag="X1" inputmask="0x10"><bounds x="1.25" y="4.325" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_3" inputtag="X2" inputmask="0x10"><bounds x="2.30" y="4.325" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_0" inputtag="X0" inputmask="0x20"><bounds x="0.725" y="5.375" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="1.775" y="5.375" width="1.0" height="1.0" /></cpanel> + <element ref="btn_d" inputtag="X0" inputmask="0x01"><bounds x="0.20" y="0.125" width="1.0" height="1.0" /></element> + <element ref="btn_e" inputtag="X1" inputmask="0x01"><bounds x="1.25" y="0.125" width="1.0" height="1.0" /></element> + <element ref="btn_f" inputtag="X2" inputmask="0x01"><bounds x="2.30" y="0.125" width="1.0" height="1.0" /></element> + <element ref="btn_a" inputtag="X0" inputmask="0x02"><bounds x="0.20" y="1.175" width="1.0" height="1.0" /></element> + <element ref="btn_b" inputtag="X1" inputmask="0x02"><bounds x="1.25" y="1.175" width="1.0" height="1.0" /></element> + <element ref="btn_c" inputtag="X2" inputmask="0x02"><bounds x="2.30" y="1.175" width="1.0" height="1.0" /></element> + <element ref="btn_7" inputtag="X0" inputmask="0x04"><bounds x="0.20" y="2.225" width="1.0" height="1.0" /></element> + <element ref="btn_8" inputtag="X1" inputmask="0x04"><bounds x="1.25" y="2.225" width="1.0" height="1.0" /></element> + <element ref="btn_9" inputtag="X2" inputmask="0x04"><bounds x="2.30" y="2.225" width="1.0" height="1.0" /></element> + <element ref="btn_4" inputtag="X0" inputmask="0x08"><bounds x="0.20" y="3.275" width="1.0" height="1.0" /></element> + <element ref="btn_5" inputtag="X1" inputmask="0x08"><bounds x="1.25" y="3.275" width="1.0" height="1.0" /></element> + <element ref="btn_6" inputtag="X2" inputmask="0x08"><bounds x="2.30" y="3.275" width="1.0" height="1.0" /></element> + <element ref="btn_1" inputtag="X0" inputmask="0x10"><bounds x="0.20" y="4.325" width="1.0" height="1.0" /></element> + <element ref="btn_2" inputtag="X1" inputmask="0x10"><bounds x="1.25" y="4.325" width="1.0" height="1.0" /></element> + <element ref="btn_3" inputtag="X2" inputmask="0x10"><bounds x="2.30" y="4.325" width="1.0" height="1.0" /></element> + <element ref="btn_0" inputtag="X0" inputmask="0x20"><bounds x="0.725" y="5.375" width="1.0" height="1.0" /></element> + <element ref="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="1.775" y="5.375" width="1.0" height="1.0" /></element> </group> - <view name="LED Displays, Terminal and Keypad"> - <cpanel element="beige"><bounds x="320" y="0" width="172" height="372" /></cpanel> - <group ref="displays"><bounds x="0" y="0" width="320" height="132" /></group> - <group ref="keypad"><bounds x="336" y="16" width="140" height="260" /></group> - <screen index="0"><bounds x="0" y="132" width="320" height="240" /></screen> - </view> - <view name="LED Displays and Terminal"> - <group ref="displays"><bounds x="0" y="0" width="320" height="132" /></group> + <collection name="Keypad"> + <element ref="beige"><bounds x="320" y="0" width="172" height="372" /></element> + <group ref="keypad"><bounds x="336" y="16" width="140" height="260" /></group> + </collection> <screen index="0"><bounds x="0" y="132" width="320" height="240" /></screen> - </view> - - <view name="LED Displays and Keypad"> - <cpanel element="beige"><bounds x="0" y="0" width="320" height="424" /></cpanel> <group ref="displays"><bounds x="0" y="0" width="320" height="132" /></group> - <group ref="keypad"><bounds x="164" y="148" width="140" height="260" /></group> </view> <view name="LED Displays"> + <collection name="Keypad"> + <element ref="beige"><bounds x="0" y="0" width="320" height="424" /></element> + <group ref="keypad"><bounds x="164" y="148" width="140" height="260" /></group> + </collection> <group ref="displays"><bounds x="0" y="0" width="320" height="132" /></group> </view> </mamelayout> diff --git a/src/mame/layout/galactic.lay b/src/mame/layout/galactic.lay index 3aa135c65a2..64704ced277 100644 --- a/src/mame/layout/galactic.lay +++ b/src/mame/layout/galactic.lay @@ -22,12 +22,12 @@ license:CC0 </rect> </element> - <view name="Color_Overlay"> + <view name="Color Overlay"> <screen index="0"> <bounds x="0" y="0" width="3" height="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="3" height="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/geebee.lay b/src/mame/layout/geebee.lay index 11b4985b4cb..fcfe4ed687d 100644 --- a/src/mame/layout/geebee.lay +++ b/src/mame/layout/geebee.lay @@ -72,8 +72,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/gunchamp.lay b/src/mame/layout/gunchamp.lay index 467367d06e2..5b8785b7414 100644 --- a/src/mame/layout/gunchamp.lay +++ b/src/mame/layout/gunchamp.lay @@ -69,8 +69,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/gunchamps.lay b/src/mame/layout/gunchamps.lay index c1e2b6f88af..1154c2b5320 100644 --- a/src/mame/layout/gunchamps.lay +++ b/src/mame/layout/gunchamps.lay @@ -69,8 +69,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/gunfight.lay b/src/mame/layout/gunfight.lay index c03824382ba..48ad62f9122 100644 --- a/src/mame/layout/gunfight.lay +++ b/src/mame/layout/gunfight.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/gypsyjug.lay b/src/mame/layout/gypsyjug.lay index e645c93b445..bf20371968f 100644 --- a/src/mame/layout/gypsyjug.lay +++ b/src/mame/layout/gypsyjug.lay @@ -42,8 +42,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/invad2ct.lay b/src/mame/layout/invad2ct.lay index 328ced839c2..6cc6aa1b2d4 100644 --- a/src/mame/layout/invad2ct.lay +++ b/src/mame/layout/invad2ct.lay @@ -50,8 +50,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/invaders.lay b/src/mame/layout/invaders.lay index f51ff058d2b..74897d58ab3 100644 --- a/src/mame/layout/invaders.lay +++ b/src/mame/layout/invaders.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/irrmaze.lay b/src/mame/layout/irrmaze.lay index 467ca89b6de..6ce23deb312 100644 --- a/src/mame/layout/irrmaze.lay +++ b/src/mame/layout/irrmaze.lay @@ -68,34 +68,38 @@ copyright-holders:Vas Crabb <view name="Cabinet Lamps"> <screen index="0"><bounds x="3.5" y="4.4" width="16" height="12" /></screen> - <bezel element="marquee"><bounds x="0" y="0" width="23" height="2.5" /></bezel> - <bezel element="colorlamp" name="sit13"><bounds x="0" y="0" width="11.5" height="1" /></bezel> - <bezel element="colorlamp" name="sit12"><bounds x="11.5" y="0" width="11.5" height="1" /></bezel> - <bezel element="timerlamp" name="sit9"><bounds x="2" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit8"><bounds x="4" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit7"><bounds x="6" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit6"><bounds x="8" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit5"><bounds x="10" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit4"><bounds x="12" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit3"><bounds x="14" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit2"><bounds x="16" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit1"><bounds x="18" y="1.25" width="1" height="1" /></bezel> - <bezel element="timerlamp" name="sit0"><bounds x="20" y="1.25" width="1" height="1" /></bezel> - - <bezel element="flashstick" name="sit14"><bounds x="0.75" y="6.5" width="1.5" height="5.5" /></bezel> - <bezel element="sidelamp" name="sit11"><bounds x="0.5" y="12.5" width="2" height="4.5" /></bezel> - <bezel element="flashstick" name="sit14"><bounds x="20.75" y="6.5" width="1.5" height="5.5" /></bezel> - <bezel element="sidelamp" name="sit11"><bounds x="20.5" y="12.5" width="2" height="4.5" /></bezel> - <bezel element="flashgrille" name="sit14"><bounds x="7" y="17.25" width="3" height="2.5" /></bezel> - <bezel element="flashgrille" name="sit14"><bounds x="13" y="17.25" width="3" height="2.5" /></bezel> - - <cpanel element="cpanel"><bounds x="4.5" y="20" width="14" height="7" /></cpanel> - <cpanel element="trackball" name="sit10"><bounds x="10" y="22" width="3" height="3" /></cpanel> - <cpanel element="bluebtn" inputtag="edge:irrmaze:START" inputmask="0x01"><bounds x="11.125" y="20.125" width="0.75" height="0.75" /></cpanel> - <cpanel element="redbtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x10"><bounds x="7" y="23" width="1" height="1" /></cpanel> - <cpanel element="bluebtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x20"><bounds x="5" y="22.5" width="1" height="1" /></cpanel> - <cpanel element="redbtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x40"><bounds x="15" y="23" width="1" height="1" /></cpanel> - <cpanel element="bluebtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x80"><bounds x="17" y="22.5" width="1" height="1" /></cpanel> + <collection name="Marquee and Timer Lamps"> + <element ref="marquee"><bounds x="0" y="0" width="23" height="2.5" /></element> + <element ref="colorlamp" name="sit13"><bounds x="0" y="0" width="11.5" height="1" /></element> + <element ref="colorlamp" name="sit12"><bounds x="11.5" y="0" width="11.5" height="1" /></element> + <element ref="timerlamp" name="sit9"><bounds x="2" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit8"><bounds x="4" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit7"><bounds x="6" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit6"><bounds x="8" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit5"><bounds x="10" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit4"><bounds x="12" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit3"><bounds x="14" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit2"><bounds x="16" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit1"><bounds x="18" y="1.25" width="1" height="1" /></element> + <element ref="timerlamp" name="sit0"><bounds x="20" y="1.25" width="1" height="1" /></element> + </collection> + + <element ref="flashstick" name="sit14"><bounds x="0.75" y="6.5" width="1.5" height="5.5" /></element> + <element ref="sidelamp" name="sit11"><bounds x="0.5" y="12.5" width="2" height="4.5" /></element> + <element ref="flashstick" name="sit14"><bounds x="20.75" y="6.5" width="1.5" height="5.5" /></element> + <element ref="sidelamp" name="sit11"><bounds x="20.5" y="12.5" width="2" height="4.5" /></element> + <element ref="flashgrille" name="sit14"><bounds x="7" y="17.25" width="3" height="2.5" /></element> + <element ref="flashgrille" name="sit14"><bounds x="13" y="17.25" width="3" height="2.5" /></element> + + <collection name="Control Panel"> + <element ref="cpanel"><bounds x="4.5" y="20" width="14" height="7" /></element> + <element ref="trackball" name="sit10"><bounds x="10" y="22" width="3" height="3" /></element> + <element ref="bluebtn" inputtag="edge:irrmaze:START" inputmask="0x01"><bounds x="11.125" y="20.125" width="0.75" height="0.75" /></element> + <element ref="redbtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x10"><bounds x="7" y="23" width="1" height="1" /></element> + <element ref="bluebtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x20"><bounds x="5" y="22.5" width="1" height="1" /></element> + <element ref="redbtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x40"><bounds x="15" y="23" width="1" height="1" /></element> + <element ref="bluebtn" inputtag="edge:irrmaze:BUTTONS" inputmask="0x80"><bounds x="17" y="22.5" width="1" height="1" /></element> + </collection> </view> <view name="Screen 0 Standard (320x224)"> diff --git a/src/mame/layout/lazercmd.lay b/src/mame/layout/lazercmd.lay index 3810eba0e2e..68d76d8866b 100644 --- a/src/mame/layout/lazercmd.lay +++ b/src/mame/layout/lazercmd.lay @@ -34,8 +34,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/lbeach.lay b/src/mame/layout/lbeach.lay index c0596696609..c7cb31d3ec6 100644 --- a/src/mame/layout/lbeach.lay +++ b/src/mame/layout/lbeach.lay @@ -34,11 +34,15 @@ license:CC0 <screen index="0"> <bounds x="0" y="0" width="738.46" height="480" /> </screen> - <bezel element="black"> - <bounds x="640" y="0" width="100" height="480" /> - </bezel> - <overlay element="overlay"> - <bounds x="0" y="0" width="738.46" height="480" /> - </overlay> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="738.46" height="480" /> + </element> + </collection> + <collection name="Overscan Mask"> + <element ref="black"> + <bounds x="640" y="0" width="100" height="480" /> + </element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/ltcasinn.lay b/src/mame/layout/ltcasinn.lay index 2e51320a5d8..9ae0da3031b 100644 --- a/src/mame/layout/ltcasinn.lay +++ b/src/mame/layout/ltcasinn.lay @@ -18,26 +18,26 @@ Simple layout for Little Casino (color) and clones </rect> </element> <view name="Buttons"> - <backdrop element="background"> + <element ref="background"> <bounds x="0" y="0" width="640" height="580" /> - </backdrop> + </element> <screen index="0"> <bounds left="0" top="0" right="640" bottom="480" /> </screen> - <cpanel name="button_0" element="button" inputtag="Q" inputmask="0x01"> + <element name="button_0" ref="button" inputtag="Q" inputmask="0x01"> <bounds x="80" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_1" element="button" inputtag="Q" inputmask="0x02"> + </element> + <element name="button_1" ref="button" inputtag="Q" inputmask="0x02"> <bounds x="180" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_2" element="button" inputtag="Q" inputmask="0x04"> + </element> + <element name="button_2" ref="button" inputtag="Q" inputmask="0x04"> <bounds x="280" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_3" element="button" inputtag="Q" inputmask="0x08"> + </element> + <element name="button_3" ref="button" inputtag="Q" inputmask="0x08"> <bounds x="380" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_4" element="button" inputtag="Q" inputmask="0x10"> + </element> + <element name="button_4" ref="button" inputtag="Q" inputmask="0x10"> <bounds x="480" y="505" width="70" height="35" /> - </cpanel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/ltcasino.lay b/src/mame/layout/ltcasino.lay index 465738a9bbc..7fb11a308cb 100644 --- a/src/mame/layout/ltcasino.lay +++ b/src/mame/layout/ltcasino.lay @@ -36,29 +36,33 @@ Simple layout for Little Casino (monochrome) </rect> </element> <view name="Buttons"> - <backdrop element="background"> - <bounds x="0" y="0" width="640" height="580" /> - </backdrop> + <collection name="Control Panel"> + <element ref="background"> + <bounds x="0" y="480" width="640" height="100" /> + </element> + <element name="button_0" ref="button" inputtag="Q" inputmask="0x01"> + <bounds x="80" y="505" width="70" height="35" /> + </element> + <element name="button_1" ref="button" inputtag="Q" inputmask="0x02"> + <bounds x="180" y="505" width="70" height="35" /> + </element> + <element name="button_2" ref="button" inputtag="Q" inputmask="0x04"> + <bounds x="280" y="505" width="70" height="35" /> + </element> + <element name="button_3" ref="button" inputtag="Q" inputmask="0x08"> + <bounds x="380" y="505" width="70" height="35" /> + </element> + <element name="button_4" ref="button" inputtag="Q" inputmask="0x10"> + <bounds x="480" y="505" width="70" height="35" /> + </element> + </collection> <screen index="0"> <bounds left="0" top="0" right="640" bottom="480" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds x="0" y="0" width="640" height="480" /> - </overlay> - <cpanel name="button_0" element="button" inputtag="Q" inputmask="0x01"> - <bounds x="80" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_1" element="button" inputtag="Q" inputmask="0x02"> - <bounds x="180" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_2" element="button" inputtag="Q" inputmask="0x04"> - <bounds x="280" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_3" element="button" inputtag="Q" inputmask="0x08"> - <bounds x="380" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="button_4" element="button" inputtag="Q" inputmask="0x10"> - <bounds x="480" y="505" width="70" height="35" /> - </cpanel> + <collection name="Overlay"> + <element name="overlay" ref="overlay" blend="multiply"> + <bounds x="0" y="0" width="640" height="480" /> + </element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/maze.lay b/src/mame/layout/maze.lay index 49b11a2a192..6f95cc6fa66 100644 --- a/src/mame/layout/maze.lay +++ b/src/mame/layout/maze.lay @@ -13,8 +13,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/mchess.lay b/src/mame/layout/mchess.lay index bcbeb011f48..aac18738a07 100644 --- a/src/mame/layout/mchess.lay +++ b/src/mame/layout/mchess.lay @@ -59,89 +59,95 @@ license:CC0 <!-- groups --> <group name="display"> - <backdrop element="cb_border"><bounds left="-3" right="83" top="-3" bottom="91.434" /></backdrop> + <collection name="Bezel"> + <element ref="cb_border"><bounds left="-3" right="83" top="-3" bottom="91.434" /></element> + </collection> + <screen index="0"><bounds left="0" right="80" top="0" bottom="88.434" /></screen> - <overlay element="cb_overlay"><bounds left="0" right="80" top="0" bottom="88.434" /></overlay> - <bezel element="blackb"><bounds left="79.9" right="80.1" top="-0.1" bottom="88.6" /></bezel> - <bezel element="blackb"><bounds left="-0.1" right="80.1" top="88.1" bottom="88.534" /></bezel> - <bezel element="blackb"><bounds x="-0.1" y="79.4" width="80.2" height="0.8" /></bezel> - - <repeat count="4"> - <param name="left" start="0" increment="20" /> - <param name="right" start="10" increment="20" /> + + <collection name="Overlay"> + <element ref="cb_overlay" blend="multiply"><bounds left="0" right="80" top="0" bottom="88.434" /></element> <repeat count="4"> - <param name="top" start="9.96" increment="19.92" /> - <param name="bottom" start="19.92" increment="19.92" /> - <overlay element="cb_mask"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></overlay> + <param name="left" start="0" increment="20" /> + <param name="right" start="10" increment="20" /> + <repeat count="4"> + <param name="top" start="9.96" increment="19.92" /> + <param name="bottom" start="19.92" increment="19.92" /> + <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element> + </repeat> </repeat> - </repeat> - <repeat count="4"> - <param name="left" start="70" increment="-20" /> - <param name="right" start="80" increment="-20" /> <repeat count="4"> - <param name="top" start="0" increment="19.92" /> - <param name="bottom" start="9.96" increment="19.92" /> - <overlay element="cb_mask"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></overlay> + <param name="left" start="70" increment="-20" /> + <param name="right" start="80" increment="-20" /> + <repeat count="4"> + <param name="top" start="0" increment="19.92" /> + <param name="bottom" start="9.96" increment="19.92" /> + <element ref="cb_mask" blend="multiply"><bounds left="~left~" right="~right~" top="~top~" bottom="~bottom~" /></element> + </repeat> </repeat> - </repeat> + + <element ref="blackb"><bounds left="79.9" right="80.1" top="-0.1" bottom="88.6" /></element> + <element ref="blackb"><bounds left="-0.1" right="80.1" top="88.1" bottom="88.534" /></element> + <element ref="blackb"><bounds x="-0.1" y="79.4" width="80.2" height="0.8" /></element> + </collection> </group> <group name="buttons"> <bounds x="6.1" y="6.1" width="87.8" height="45.8" /> - <bezel element="white"><bounds x="6.1" y="6.1" width="87.8" height="45.8" /></bezel> - <bezel element="blackb"><bounds x="6.9" y="6.9" width="44.2" height="44.2" /></bezel> - <bezel element="blackb"><bounds x="51.9" y="6.9" width="27.2" height="13.8" /></bezel> - <bezel element="blackb"><bounds x="51.9" y="21.5" width="27.2" height="29.6" /></bezel> - <bezel element="blackb"><bounds x="79.9" y="6.9" width="13.2" height="44.2" /></bezel> - - <bezel element="redd"><bounds x="10" y="24" width="7" height="10" /><orientation rotate="270" /></bezel> - <bezel element="redd"><bounds x="41" y="24" width="7" height="10" /><orientation rotate="90" /></bezel> - <bezel element="redd"><bounds x="24" y="10" width="10" height="7" /></bezel> - <bezel element="redd"><bounds x="24" y="41" width="10" height="7" /><orientation rotate="180" /></bezel> - - <bezel element="text_l0"><bounds x="23.5" y="25.5" width="11" height="2.7" /></bezel> - <bezel element="red"><bounds x="25.5" y="29" width="7" height="5" /></bezel> - - <bezel element="text_l1"><bounds x="53" y="10.3" width="11" height="2.7" /></bezel> - <bezel element="text_l2"><bounds x="67" y="10.3" width="11" height="2.7" /></bezel> - <bezel element="text_l3"><bounds x="81" y="10.3" width="11" height="2.7" /></bezel> - <bezel element="text_l4"><bounds x="53" y="25.5" width="11" height="2.7" /></bezel> - <bezel element="text_l5a"><bounds x="67" y="23.0" width="11" height="2.7" /></bezel> - <bezel element="text_l5b"><bounds x="67" y="25.5" width="11" height="2.7" /></bezel> - <bezel element="text_l6"><bounds x="81" y="25.5" width="11" height="2.7" /></bezel> - <bezel element="text_l7a"><bounds x="53" y="38.2" width="11" height="2.7" /></bezel> - <bezel element="text_l7b"><bounds x="53" y="40.7" width="11" height="2.7" /></bezel> - <bezel element="text_l8a"><bounds x="67" y="38.2" width="11" height="2.7" /></bezel> - <bezel element="text_l8b"><bounds x="67" y="40.7" width="11" height="2.7" /></bezel> - <bezel element="text_l9"><bounds x="81" y="40.7" width="11" height="2.7" /></bezel> - - <bezel element="blue"><bounds x="55" y="13.8" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="69" y="13.8" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="83" y="13.8" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="55" y="29.0" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="69" y="29.0" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="83" y="29.0" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="55" y="44.2" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="69" y="44.2" width="7" height="5" /></bezel> - <bezel element="blue"><bounds x="83" y="44.2" width="7" height="5" /></bezel> - - <bezel element="hl" inputtag="IN.1" inputmask="0x08"><bounds x="10" y="24" width="7" height="10" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.1" inputmask="0x04"><bounds x="41" y="24" width="7" height="10" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.1" inputmask="0x10"><bounds x="24" y="10" width="10" height="7" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.1" inputmask="0x80"><bounds x="24" y="41" width="10" height="7" /><color alpha="0.25" /></bezel> - - <bezel element="hl" inputtag="IN.1" inputmask="0x02"><bounds x="25.5" y="29" width="7" height="5" /><color alpha="0.25" /></bezel> - - <bezel element="hl" inputtag="IN.2" inputmask="0x10"><bounds x="55" y="13.8" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.0" inputmask="0x10"><bounds x="69" y="13.8" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.0" inputmask="0x08"><bounds x="83" y="13.8" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.2" inputmask="0x08"><bounds x="55" y="29.0" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.2" inputmask="0x04"><bounds x="69" y="29.0" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.0" inputmask="0x04"><bounds x="83" y="29.0" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.2" inputmask="0x80"><bounds x="55" y="44.2" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.2" inputmask="0x02"><bounds x="69" y="44.2" width="7" height="5" /><color alpha="0.25" /></bezel> - <bezel element="hl" inputtag="IN.0" inputmask="0x02"><bounds x="83" y="44.2" width="7" height="5" /><color alpha="0.25" /></bezel> + <element ref="white"><bounds x="6.1" y="6.1" width="87.8" height="45.8" /></element> + <element ref="blackb"><bounds x="6.9" y="6.9" width="44.2" height="44.2" /></element> + <element ref="blackb"><bounds x="51.9" y="6.9" width="27.2" height="13.8" /></element> + <element ref="blackb"><bounds x="51.9" y="21.5" width="27.2" height="29.6" /></element> + <element ref="blackb"><bounds x="79.9" y="6.9" width="13.2" height="44.2" /></element> + + <element ref="redd"><bounds x="10" y="24" width="7" height="10" /><orientation rotate="270" /></element> + <element ref="redd"><bounds x="41" y="24" width="7" height="10" /><orientation rotate="90" /></element> + <element ref="redd"><bounds x="24" y="10" width="10" height="7" /></element> + <element ref="redd"><bounds x="24" y="41" width="10" height="7" /><orientation rotate="180" /></element> + + <element ref="text_l0"><bounds x="23.5" y="25.5" width="11" height="2.7" /></element> + <element ref="red"><bounds x="25.5" y="29" width="7" height="5" /></element> + + <element ref="text_l1"><bounds x="53" y="10.3" width="11" height="2.7" /></element> + <element ref="text_l2"><bounds x="67" y="10.3" width="11" height="2.7" /></element> + <element ref="text_l3"><bounds x="81" y="10.3" width="11" height="2.7" /></element> + <element ref="text_l4"><bounds x="53" y="25.5" width="11" height="2.7" /></element> + <element ref="text_l5a"><bounds x="67" y="23.0" width="11" height="2.7" /></element> + <element ref="text_l5b"><bounds x="67" y="25.5" width="11" height="2.7" /></element> + <element ref="text_l6"><bounds x="81" y="25.5" width="11" height="2.7" /></element> + <element ref="text_l7a"><bounds x="53" y="38.2" width="11" height="2.7" /></element> + <element ref="text_l7b"><bounds x="53" y="40.7" width="11" height="2.7" /></element> + <element ref="text_l8a"><bounds x="67" y="38.2" width="11" height="2.7" /></element> + <element ref="text_l8b"><bounds x="67" y="40.7" width="11" height="2.7" /></element> + <element ref="text_l9"><bounds x="81" y="40.7" width="11" height="2.7" /></element> + + <element ref="blue"><bounds x="55" y="13.8" width="7" height="5" /></element> + <element ref="blue"><bounds x="69" y="13.8" width="7" height="5" /></element> + <element ref="blue"><bounds x="83" y="13.8" width="7" height="5" /></element> + <element ref="blue"><bounds x="55" y="29.0" width="7" height="5" /></element> + <element ref="blue"><bounds x="69" y="29.0" width="7" height="5" /></element> + <element ref="blue"><bounds x="83" y="29.0" width="7" height="5" /></element> + <element ref="blue"><bounds x="55" y="44.2" width="7" height="5" /></element> + <element ref="blue"><bounds x="69" y="44.2" width="7" height="5" /></element> + <element ref="blue"><bounds x="83" y="44.2" width="7" height="5" /></element> + + <element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="10" y="24" width="7" height="10" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="41" y="24" width="7" height="10" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.1" inputmask="0x10"><bounds x="24" y="10" width="10" height="7" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.1" inputmask="0x80"><bounds x="24" y="41" width="10" height="7" /><color alpha="0.25" /></element> + + <element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="25.5" y="29" width="7" height="5" /><color alpha="0.25" /></element> + + <element ref="hl" inputtag="IN.2" inputmask="0x10"><bounds x="55" y="13.8" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="69" y="13.8" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="83" y="13.8" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.2" inputmask="0x08"><bounds x="55" y="29.0" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.2" inputmask="0x04"><bounds x="69" y="29.0" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="83" y="29.0" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.2" inputmask="0x80"><bounds x="55" y="44.2" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.2" inputmask="0x02"><bounds x="69" y="44.2" width="7" height="5" /><color alpha="0.25" /></element> + <element ref="hl" inputtag="IN.0" inputmask="0x02"><bounds x="83" y="44.2" width="7" height="5" /><color alpha="0.25" /></element> </group> @@ -151,12 +157,12 @@ license:CC0 <bounds left="-1" right="182.5" top="-1" bottom="96" /> <group ref="display"><bounds x="0" y="0" width="86" height="94.434" /></group> - <bezel element="blueb2"><bounds x="88" y="0" width="95" height="53" /></bezel> - <bezel element="blueb"><bounds x="88" y="44" width="95" height="53" /></bezel> - <bezel element="blackb"><bounds x="91" y="47" width="95" height="53" /></bezel> + <element ref="blueb2"><bounds x="88" y="0" width="95" height="53" /></element> + <element ref="blueb"><bounds x="88" y="44" width="95" height="53" /></element> + <element ref="blackb"><bounds x="91" y="47" width="95" height="53" /></element> <group ref="buttons"><bounds x="93" y="48.634" width="87.8" height="45.8" /></group> - <bezel element="text_switch" inputtag="IN.3" inputmask="0x01"><bounds x="91" y="2" width="24" height="2.7" /></bezel> + <element ref="text_switch" inputtag="IN.3" inputmask="0x01"><bounds x="91" y="2" width="24" height="2.7" /></element> </view> <view name="Internal Layout (Screen)"> diff --git a/src/mame/layout/medlanes.lay b/src/mame/layout/medlanes.lay index 1636a7fed83..f84d35f6078 100644 --- a/src/mame/layout/medlanes.lay +++ b/src/mame/layout/medlanes.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/mekd2.lay b/src/mame/layout/mekd2.lay index 05f2393338d..c129f6c6df5 100644 --- a/src/mame/layout/mekd2.lay +++ b/src/mame/layout/mekd2.lay @@ -17,26 +17,26 @@ license:CC0 <view name="Default Layout"> <!-- Black background --> - <bezel element="background"> + <element ref="background"> <bounds left="97" top="95" right="428" bottom="195" /> - </bezel> - <bezel name="digit5" element="digit"> + </element> + <element name="digit5" ref="digit"> <bounds left="107" top="105" right="155" bottom="185" /> - </bezel> - <bezel name="digit4" element="digit"> + </element> + <element name="digit4" ref="digit"> <bounds left="155" top="105" right="203" bottom="185" /> - </bezel> - <bezel name="digit3" element="digit"> + </element> + <element name="digit3" ref="digit"> <bounds left="203" top="105" right="251" bottom="185" /> - </bezel> - <bezel name="digit2" element="digit"> + </element> + <element name="digit2" ref="digit"> <bounds left="251" top="105" right="299" bottom="185" /> - </bezel> - <bezel name="digit1" element="digit"> + </element> + <element name="digit1" ref="digit"> <bounds left="323" top="105" right="370" bottom="185" /> - </bezel> - <bezel name="digit0" element="digit"> + </element> + <element name="digit0" ref="digit"> <bounds left="371" top="105" right="418" bottom="185" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/mekd3.lay b/src/mame/layout/mekd3.lay index 5959708b59b..51de97bd209 100644 --- a/src/mame/layout/mekd3.lay +++ b/src/mame/layout/mekd3.lay @@ -218,90 +218,98 @@ license:CC0 <group name="displays"> <!-- Black background --> - <bezel element="background"> + <element ref="background"> <bounds left="0" top="0" right="482.0" bottom="70" /> - </bezel> - <bezel name="digit7" element="digit"> + </element> + <element name="digit7" ref="digit"> <bounds left="5.5" top="20" right="30.5" bottom="50" /> - </bezel> - <bezel name="digit6" element="digit"> + </element> + <element name="digit6" ref="digit"> <bounds left="63.5" top="20" right="88.5" bottom="50" /> - </bezel> - <bezel name="digit5" element="digit"> + </element> + <element name="digit5" ref="digit"> <bounds left="121.5" top="20" right="146.5" bottom="50" /> - </bezel> - <bezel name="digit4" element="digit"> + </element> + <element name="digit4" ref="digit"> <bounds left="179.5" top="20" right="204.5" bottom="50" /> - </bezel> - <bezel name="digit3" element="digit"> + </element> + <element name="digit3" ref="digit"> <bounds left="257.5" top="20" right="282.5" bottom="50" /> - </bezel> - <bezel name="digit2" element="digit"> + </element> + <element name="digit2" ref="digit"> <bounds left="315.5" top="20" right="340.5" bottom="50" /> - </bezel> - <bezel name="digit1" element="digit"> + </element> + <element name="digit1" ref="digit"> <bounds left="393.5" top="20" right="418.5" bottom="50" /> - </bezel> - <bezel name="digit0" element="digit"> + </element> + <element name="digit0" ref="digit"> <bounds left="451.5" top="20" right="476.5" bottom="50" /> - </bezel> + </element> </group> <group name="keypad"> - <bezel element="background"> + <element ref="background"> <bounds x="0" y="0" width="7.1" height="6.70" /> - </bezel> + </element> - <cpanel element="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></cpanel> + <element ref="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></element> - <cpanel element="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></cpanel> + <element ref="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></element> - <cpanel element="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></cpanel> + <element ref="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></element> - <cpanel element="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></cpanel> + <element ref="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></element> - <cpanel element="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></cpanel> + <element ref="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></element> </group> - <view name="LED Displays, Terminal and Keypad" index="0"> - <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> - <group ref="keypad"><bounds x="406" y="0" width="148" height="140" /></group> - <screen index="0"><bounds x="0" y="160" width="640" height="480" /></screen> + <view name="LED Displays, Terminal and Keypad"> + <collection name="LED Displays"> + <group ref="displays"><bounds x="240" y="0" width="320" height="47" /></group> + </collection> + <collection name="Keypad"> + <group ref="keypad"><bounds x="650" y="57" width="148" height="140" /></group> + </collection> + <screen index="0"><bounds x="0" y="57" width="640" height="480" /></screen> </view> - <view name="LED Displays, CRT and Keypad" index="1"> - <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> - <group ref="keypad"><bounds x="406" y="0" width="148" height="140" /></group> - <screen index="1"><bounds x="0" y="160" width="640" height="480" /></screen> + <view name="LED Displays, CRT and Keypad"> + <collection name="LED Displays"> + <group ref="displays"><bounds x="240" y="0" width="320" height="47" /></group> + </collection> + <collection name="Keypad"> + <group ref="keypad"><bounds x="650" y="57" width="148" height="140" /></group> + </collection> + <screen tag="screen"><bounds x="0" y="57" width="640" height="480" /></screen> </view> - <view name="LED Displays and Keypad" index="2"> + <view name="LED Displays and Keypad"> <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> <group ref="keypad"><bounds x="112" y="57" width="171" height="161" /></group> </view> - <view name="LED Displays" index="3"> + <view name="LED Displays"> <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> </view> diff --git a/src/mame/layout/mekd4.lay b/src/mame/layout/mekd4.lay index 5959708b59b..51de97bd209 100644 --- a/src/mame/layout/mekd4.lay +++ b/src/mame/layout/mekd4.lay @@ -218,90 +218,98 @@ license:CC0 <group name="displays"> <!-- Black background --> - <bezel element="background"> + <element ref="background"> <bounds left="0" top="0" right="482.0" bottom="70" /> - </bezel> - <bezel name="digit7" element="digit"> + </element> + <element name="digit7" ref="digit"> <bounds left="5.5" top="20" right="30.5" bottom="50" /> - </bezel> - <bezel name="digit6" element="digit"> + </element> + <element name="digit6" ref="digit"> <bounds left="63.5" top="20" right="88.5" bottom="50" /> - </bezel> - <bezel name="digit5" element="digit"> + </element> + <element name="digit5" ref="digit"> <bounds left="121.5" top="20" right="146.5" bottom="50" /> - </bezel> - <bezel name="digit4" element="digit"> + </element> + <element name="digit4" ref="digit"> <bounds left="179.5" top="20" right="204.5" bottom="50" /> - </bezel> - <bezel name="digit3" element="digit"> + </element> + <element name="digit3" ref="digit"> <bounds left="257.5" top="20" right="282.5" bottom="50" /> - </bezel> - <bezel name="digit2" element="digit"> + </element> + <element name="digit2" ref="digit"> <bounds left="315.5" top="20" right="340.5" bottom="50" /> - </bezel> - <bezel name="digit1" element="digit"> + </element> + <element name="digit1" ref="digit"> <bounds left="393.5" top="20" right="418.5" bottom="50" /> - </bezel> - <bezel name="digit0" element="digit"> + </element> + <element name="digit0" ref="digit"> <bounds left="451.5" top="20" right="476.5" bottom="50" /> - </bezel> + </element> </group> <group name="keypad"> - <bezel element="background"> + <element ref="background"> <bounds x="0" y="0" width="7.1" height="6.70" /> - </bezel> + </element> - <cpanel element="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></cpanel> + <element ref="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></element> - <cpanel element="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></cpanel> + <element ref="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></element> - <cpanel element="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></cpanel> + <element ref="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></element> - <cpanel element="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></cpanel> + <element ref="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></element> - <cpanel element="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></cpanel> + <element ref="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></element> </group> - <view name="LED Displays, Terminal and Keypad" index="0"> - <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> - <group ref="keypad"><bounds x="406" y="0" width="148" height="140" /></group> - <screen index="0"><bounds x="0" y="160" width="640" height="480" /></screen> + <view name="LED Displays, Terminal and Keypad"> + <collection name="LED Displays"> + <group ref="displays"><bounds x="240" y="0" width="320" height="47" /></group> + </collection> + <collection name="Keypad"> + <group ref="keypad"><bounds x="650" y="57" width="148" height="140" /></group> + </collection> + <screen index="0"><bounds x="0" y="57" width="640" height="480" /></screen> </view> - <view name="LED Displays, CRT and Keypad" index="1"> - <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> - <group ref="keypad"><bounds x="406" y="0" width="148" height="140" /></group> - <screen index="1"><bounds x="0" y="160" width="640" height="480" /></screen> + <view name="LED Displays, CRT and Keypad"> + <collection name="LED Displays"> + <group ref="displays"><bounds x="240" y="0" width="320" height="47" /></group> + </collection> + <collection name="Keypad"> + <group ref="keypad"><bounds x="650" y="57" width="148" height="140" /></group> + </collection> + <screen tag="screen"><bounds x="0" y="57" width="640" height="480" /></screen> </view> - <view name="LED Displays and Keypad" index="2"> + <view name="LED Displays and Keypad"> <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> <group ref="keypad"><bounds x="112" y="57" width="171" height="161" /></group> </view> - <view name="LED Displays" index="3"> + <view name="LED Displays"> <group ref="displays"><bounds x="0" y="0" width="320" height="47" /></group> </view> diff --git a/src/mame/layout/mekd5.lay b/src/mame/layout/mekd5.lay index 0f1caea9b14..8b126fff515 100644 --- a/src/mame/layout/mekd5.lay +++ b/src/mame/layout/mekd5.lay @@ -218,82 +218,78 @@ license:CC0 <group name="displays"> <!-- Black background --> - <bezel element="background"> + <element ref="background"> <bounds left="0" top="0" right="3485.0" bottom="738" /> - </bezel> - <bezel name="digit5" element="digit"> + </element> + <element name="digit5" ref="digit"> <bounds left="62.5" top="219" right="312.5" bottom="519" /> - </bezel> - <bezel name="digit4" element="digit"> + </element> + <element name="digit4" ref="digit"> <bounds left="562.5" top="219" right="812.5" bottom="519" /> - </bezel> - <bezel name="digit3" element="digit"> + </element> + <element name="digit3" ref="digit"> <bounds left="1062.5" top="219" right="1312.5" bottom="519" /> - </bezel> - <bezel name="digit2" element="digit"> + </element> + <element name="digit2" ref="digit"> <bounds left="1562.5" top="219" right="1812.5" bottom="519" /> - </bezel> - <bezel name="digit1" element="digit"> + </element> + <element name="digit1" ref="digit"> <bounds left="2672.5" top="219" right="2922.5" bottom="519" /> - </bezel> - <bezel name="digit0" element="digit"> + </element> + <element name="digit0" ref="digit"> <bounds left="3172." top="219" right="3422.5" bottom="519" /> - </bezel> + </element> </group> <group name="keypad"> - <bezel element="background"> + <element ref="background"> <bounds x="0" y="0" width="7.1" height="6.70" /> - </bezel> + </element> - <cpanel element="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></cpanel> + <element ref="btn_rst" inputtag="RESET" inputmask="0x01"><bounds x="0.35" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fs" inputtag="COL0" inputmask="0x10"><bounds x="1.70" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_fc" inputtag="COL1" inputmask="0x10"><bounds x="3.05" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_pl" inputtag="COL2" inputmask="0x10"><bounds x="4.40" y="0.15" width="1.0" height="1.0" /></element> + <element ref="btn_tb" inputtag="COL3" inputmask="0x10"><bounds x="5.75" y="0.15" width="1.0" height="1.0" /></element> - <cpanel element="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></cpanel> + <element ref="btn_7" inputtag="COL0" inputmask="0x08"><bounds x="0.35" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_8" inputtag="COL1" inputmask="0x08"><bounds x="1.70" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_9" inputtag="COL2" inputmask="0x08"><bounds x="3.05" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_a" inputtag="COL3" inputmask="0x08"><bounds x="4.40" y="1.50" width="1.0" height="1.0" /></element> + <element ref="btn_m" inputtag="COL0" inputmask="0x20"><bounds x="5.75" y="1.50" width="1.0" height="1.0" /></element> - <cpanel element="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></cpanel> + <element ref="btn_4" inputtag="COL0" inputmask="0x04"><bounds x="0.35" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_5" inputtag="COL1" inputmask="0x04"><bounds x="1.70" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_6" inputtag="COL2" inputmask="0x04"><bounds x="3.05" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_b" inputtag="COL3" inputmask="0x04"><bounds x="4.40" y="2.85" width="1.0" height="1.0" /></element> + <element ref="btn_ex" inputtag="COL1" inputmask="0x20"><bounds x="5.75" y="2.85" width="1.0" height="1.0" /></element> - <cpanel element="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></cpanel> + <element ref="btn_1" inputtag="COL0" inputmask="0x02"><bounds x="0.35" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_2" inputtag="COL1" inputmask="0x02"><bounds x="1.70" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_3" inputtag="COL2" inputmask="0x02"><bounds x="3.05" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_c" inputtag="COL3" inputmask="0x02"><bounds x="4.40" y="4.20" width="1.0" height="1.0" /></element> + <element ref="btn_rd" inputtag="COL2" inputmask="0x20"><bounds x="5.75" y="4.20" width="1.0" height="1.0" /></element> - <cpanel element="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></cpanel> - <cpanel element="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></cpanel> + <element ref="btn_0" inputtag="COL0" inputmask="0x01"><bounds x="0.35" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_f" inputtag="COL1" inputmask="0x01"><bounds x="1.70" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_e" inputtag="COL2" inputmask="0x01"><bounds x="3.05" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_d" inputtag="COL3" inputmask="0x01"><bounds x="4.40" y="5.55" width="1.0" height="1.0" /></element> + <element ref="btn_go" inputtag="COL3" inputmask="0x20"><bounds x="5.75" y="5.55" width="1.0" height="1.0" /></element> </group> - <view name="LED Displays and Keypad" index="0"> + <view name="LED Displays and Keypad"> <group ref="displays"><bounds x="0" y="0" width="320" height="68" /></group> <group ref="keypad"><bounds x="55" y="80" width="240" height="226" /></group> </view> - <view name="LED Displays" index="1"> + <view name="LED Displays"> <group ref="displays"><bounds x="0" y="0" width="320" height="68" /></group> </view> - <view name="LED Displays, Terminal" index="2"> + <view name="LED Displays, Terminal"> <group ref="displays"><bounds x="160" y="0" width="320" height="68" /></group> <screen index="0"><bounds x="0" y="80" width="640" height="480" /></screen> </view> - <view name="Terminal" index="3"> - <screen index="0"><bounds x="0" y="0" width="640" height="480" /></screen> - </view> - </mamelayout> diff --git a/src/mame/layout/minferno.lay b/src/mame/layout/minferno.lay index cba07f7ead8..5a1f89952b3 100644 --- a/src/mame/layout/minferno.lay +++ b/src/mame/layout/minferno.lay @@ -30,8 +30,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/model1io2.lay b/src/mame/layout/model1io2.lay index a0f84119241..785b3b4540e 100644 --- a/src/mame/layout/model1io2.lay +++ b/src/mame/layout/model1io2.lay @@ -30,20 +30,20 @@ license:CC0 </view> <view name="Diagnostic"> - <backdrop element="background"> + <element ref="background"> <bounds x="0" y="0" width="496" height="419" /> - </backdrop> + </element> <screen tag="screen"> <bounds left="0" top="0" right="496" bottom="384" /> </screen> <screen tag="ioboard:screen"> <bounds left="8" top="392" right="129" bottom="411" /> </screen> - <cpanel name="led_comm_err" element="led_red"> + <element name="led_comm_err" ref="led_red"> <bounds x="141" y="399" width="5" height="5" /> - </cpanel> - <cpanel element="text_comm_err"> + </element> + <element ref="text_comm_err"> <bounds x="145" y="398" width="40" height="7" /> - </cpanel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/navarone.lay b/src/mame/layout/navarone.lay index 2c4b6653d44..0b9792d6232 100644 --- a/src/mame/layout/navarone.lay +++ b/src/mame/layout/navarone.lay @@ -32,8 +32,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/omegrace.lay b/src/mame/layout/omegrace.lay index 0223ec9a143..67ac30b776c 100644 --- a/src/mame/layout/omegrace.lay +++ b/src/mame/layout/omegrace.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/phantom2.lay b/src/mame/layout/phantom2.lay index 0d775a88b6e..2bb585c1d86 100644 --- a/src/mame/layout/phantom2.lay +++ b/src/mame/layout/phantom2.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/quizshow.lay b/src/mame/layout/quizshow.lay index 652db6a29a7..af2e0fbe4db 100644 --- a/src/mame/layout/quizshow.lay +++ b/src/mame/layout/quizshow.lay @@ -38,8 +38,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/redbaron.lay b/src/mame/layout/redbaron.lay index b0c6c68b1a0..e1ee1492dff 100644 --- a/src/mame/layout/redbaron.lay +++ b/src/mame/layout/redbaron.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/rz1.lay b/src/mame/layout/rz1.lay index 0f81ef2f0c0..eefbc3697a4 100644 --- a/src/mame/layout/rz1.lay +++ b/src/mame/layout/rz1.lay @@ -122,523 +122,527 @@ Casio RZ-1 layout <element name="text_sample4"><text string="SAMPLE 4"><color red="0.15" green="0.11" blue="0.11" /></text></element> <view name="Default"> - <backdrop element="background"> - <bounds x="0" y="0" width="800" height="535" /> - </backdrop> + <collection name="Backdrop"> + <element ref="background"> + <bounds x="0" y="0" width="800" height="535" /> + </element> - <backdrop element="button_white"> - <bounds x="319" y="211" width="161" height="13" /> - </backdrop> - <backdrop element="button_white"> - <bounds x="319" y="211" width="23" height="47" /> - </backdrop> - <backdrop element="button_white"> - <bounds x="319" y="244" width="161" height="14" /> - </backdrop> - <backdrop element="button_white"> - <bounds x="457" y="211" width="23" height="47" /> - </backdrop> + <element ref="button_white"> + <bounds x="319" y="211" width="161" height="13" /> + </element> + <element ref="button_white"> + <bounds x="319" y="211" width="23" height="47" /> + </element> + <element ref="button_white"> + <bounds x="319" y="244" width="161" height="14" /> + </element> + <element ref="button_white"> + <bounds x="457" y="211" width="23" height="47" /> + </element> + + <!-- top bar --> + + <element ref="teal"> + <bounds x="11" y="15" width="40" height="10" /> + </element> + <element ref="teal"> + <bounds x="53" y="15" width="36" height="10" /> + </element> + <element ref="text_1"> + <bounds x="69" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="91" y="15" width="36" height="10" /> + </element> + <element ref="text_2"> + <bounds x="107" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="129" y="15" width="36" height="10" /> + </element> + <element ref="text_3"> + <bounds x="143" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="167" y="15" width="36" height="10" /> + </element> + <element ref="text_4"> + <bounds x="183" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="205" y="15" width="36" height="10" /> + </element> + <element ref="text_5"> + <bounds x="221" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="243" y="15" width="36" height="10" /> + </element> + <element ref="text_6"> + <bounds x="259" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="281" y="15" width="36" height="10" /> + </element> + <element ref="text_7"> + <bounds x="296" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="319" y="15" width="36" height="10" /> + </element> + <element ref="text_8"> + <bounds x="334" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="357" y="15" width="36" height="10" /> + </element> + <element ref="text_9"> + <bounds x="373" y="16" width="3" height="7" /> + </element> + <element ref="teal"> + <bounds x="395" y="15" width="36" height="10" /> + </element> + <element ref="text_10"> + <bounds x="409" y="16" width="6" height="7" /> + </element> + <element ref="teal"> + <bounds x="433" y="15" width="67" height="10" /> + </element> + <element ref="teal"> + <bounds x="502" y="15" width="56" height="10" /> + </element> + <element ref="teal"> + <bounds x="560" y="15" width="56" height="10" /> + </element> + <element ref="teal"> + <bounds x="618" y="15" width="160" height="10" /> + </element> + </collection> <screen index="0"> <bounds left="342" top="224" right="457" bottom="244" /> </screen> - <!-- top bar --> - - <backdrop element="teal"> - <bounds x="11" y="15" width="40" height="10" /> - </backdrop> - <backdrop element="teal"> - <bounds x="53" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_1"> - <bounds x="69" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="91" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_2"> - <bounds x="107" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="129" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_3"> - <bounds x="143" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="167" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_4"> - <bounds x="183" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="205" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_5"> - <bounds x="221" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="243" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_6"> - <bounds x="259" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="281" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_7"> - <bounds x="296" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="319" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_8"> - <bounds x="334" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="357" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_9"> - <bounds x="373" y="16" width="3" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="395" y="15" width="36" height="10" /> - </backdrop> - <backdrop element="text_10"> - <bounds x="409" y="16" width="6" height="7" /> - </backdrop> - <backdrop element="teal"> - <bounds x="433" y="15" width="67" height="10" /> - </backdrop> - <backdrop element="teal"> - <bounds x="502" y="15" width="56" height="10" /> - </backdrop> - <backdrop element="teal"> - <bounds x="560" y="15" width="56" height="10" /> - </backdrop> - <backdrop element="teal"> - <bounds x="618" y="15" width="160" height="10" /> - </backdrop> - - <!-- logo and text top right --> + <collection name="Controls"> + <!-- logo and text top right --> - <cpanel element="text_casio"> - <bounds x="623" y="46" width="141" height="31" /> - </cpanel> - <cpanel element="text_desc"> - <bounds x="607" y="123" width="184" height="9" /> - </cpanel> - <cpanel element="text_rz1"> - <bounds x="665" y="134" width="59" height="24" /> - </cpanel> + <element ref="text_casio"> + <bounds x="623" y="46" width="141" height="31" /> + </element> + <element ref="text_desc"> + <bounds x="607" y="123" width="184" height="9" /> + </element> + <element ref="text_rz1"> + <bounds x="665" y="134" width="59" height="24" /> + </element> - <!-- separator --> + <!-- separator --> - <cpanel name="sep1a" element="darkgray"> - <bounds x="1" y="180" width="798" height="1" /> - </cpanel> - <cpanel name="sep1b" element="black"> - <bounds x="1" y="181" width="798" height="1" /> - </cpanel> + <element name="sep1a" ref="darkgray"> + <bounds x="1" y="180" width="798" height="1" /> + </element> + <element name="sep1b" ref="black"> + <bounds x="1" y="181" width="798" height="1" /> + </element> - <!-- leds --> + <!-- leds --> - <cpanel name="led_song" element="led"> - <bounds x="50" y="271" width="9" height="4" /> - </cpanel> - <cpanel name="led_pattern" element="led"> - <bounds x="50" y="301" width="9" height="4" /> - </cpanel> - <cpanel name="led_startstop" element="led"> - <bounds x="50" y="404" width="9" height="4" /> - </cpanel> + <element name="led_song" ref="led"> + <bounds x="50" y="271" width="9" height="4" /> + </element> + <element name="led_pattern" ref="led"> + <bounds x="50" y="301" width="9" height="4" /> + </element> + <element name="led_startstop" ref="led"> + <bounds x="50" y="404" width="9" height="4" /> + </element> - <!-- controls top left --> + <!-- controls top left --> - <cpanel element="text_song"> - <bounds x="73" y="258" width="22" height="7" /> - </cpanel> - <cpanel name="button_song" element="button_yellow" inputtag="kc4" inputmask="0x02"> - <bounds x="71" y="267" width="26" height="10" /> - </cpanel> - <cpanel element="text_pattern"> - <bounds x="69" y="288" width="30" height="7" /> - </cpanel> - <cpanel name="button_pattern" element="button_yellow" inputtag="kc4" inputmask="0x01"> - <bounds x="71" y="298" width="26" height="10" /> - </cpanel> - <cpanel element="text_edit"> - <bounds x="115" y="270" width="14" height="7" /> - </cpanel> - <cpanel element="text_record"> - <bounds x="110" y="300" width="25" height="7" /> - </cpanel> - <cpanel name="button_editrecord" element="button_gray" inputtag="kc4" inputmask="0x04"> - <bounds x="109" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_delete"> - <bounds x="148" y="270" width="24" height="7" /> - </cpanel> - <cpanel element="text_delete"> - <bounds x="148" y="300" width="24" height="7" /> - </cpanel> - <cpanel name="button_delete" element="button_gray" inputtag="kc4" inputmask="0x08"> - <bounds x="147" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_insert"> - <bounds x="187" y="270" width="22" height="7" /> - </cpanel> - <cpanel element="text_auto"> - <bounds x="190" y="296" width="14" height="7" /> - </cpanel> - <cpanel element="text_compensate"> - <bounds x="184" y="303" width="30" height="7" /> - </cpanel> - <cpanel name="button_insertautocomp" element="button_gray" inputtag="kc4" inputmask="0x10"> - <bounds x="185" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_chain"> - <bounds x="226" y="270" width="18" height="7" /> - </cpanel> - <cpanel element="text_beat"> - <bounds x="228" y="300" width="16" height="7" /> - </cpanel> - <cpanel name="button_chainbeat" element="button_gray" inputtag="kc4" inputmask="0x20"> - <bounds x="223" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_reset"> - <bounds x="263" y="266" width="19" height="7" /> - </cpanel> - <cpanel element="text_copy"> - <bounds x="263" y="273" width="19" height="7" /> - </cpanel> - <cpanel name="button_resetcopy" element="button_gray" inputtag="kc3" inputmask="0x20"> - <bounds x="260" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_reset"> - <bounds x="263" y="296" width="19" height="7" /> - </cpanel> - <cpanel element="text_copy"> - <bounds x="263" y="303" width="19" height="7" /> - </cpanel> + <element ref="text_song"> + <bounds x="73" y="258" width="22" height="7" /> + </element> + <element name="button_song" ref="button_yellow" inputtag="kc4" inputmask="0x02"> + <bounds x="71" y="267" width="26" height="10" /> + </element> + <element ref="text_pattern"> + <bounds x="69" y="288" width="30" height="7" /> + </element> + <element name="button_pattern" ref="button_yellow" inputtag="kc4" inputmask="0x01"> + <bounds x="71" y="298" width="26" height="10" /> + </element> + <element ref="text_edit"> + <bounds x="115" y="270" width="14" height="7" /> + </element> + <element ref="text_record"> + <bounds x="110" y="300" width="25" height="7" /> + </element> + <element name="button_editrecord" ref="button_gray" inputtag="kc4" inputmask="0x04"> + <bounds x="109" y="328" width="26" height="10" /> + </element> + <element ref="text_delete"> + <bounds x="148" y="270" width="24" height="7" /> + </element> + <element ref="text_delete"> + <bounds x="148" y="300" width="24" height="7" /> + </element> + <element name="button_delete" ref="button_gray" inputtag="kc4" inputmask="0x08"> + <bounds x="147" y="328" width="26" height="10" /> + </element> + <element ref="text_insert"> + <bounds x="187" y="270" width="22" height="7" /> + </element> + <element ref="text_auto"> + <bounds x="190" y="296" width="14" height="7" /> + </element> + <element ref="text_compensate"> + <bounds x="184" y="303" width="30" height="7" /> + </element> + <element name="button_insertautocomp" ref="button_gray" inputtag="kc4" inputmask="0x10"> + <bounds x="185" y="328" width="26" height="10" /> + </element> + <element ref="text_chain"> + <bounds x="226" y="270" width="18" height="7" /> + </element> + <element ref="text_beat"> + <bounds x="228" y="300" width="16" height="7" /> + </element> + <element name="button_chainbeat" ref="button_gray" inputtag="kc4" inputmask="0x20"> + <bounds x="223" y="328" width="26" height="10" /> + </element> + <element ref="text_reset"> + <bounds x="263" y="266" width="19" height="7" /> + </element> + <element ref="text_copy"> + <bounds x="263" y="273" width="19" height="7" /> + </element> + <element name="button_resetcopy" ref="button_gray" inputtag="kc3" inputmask="0x20"> + <bounds x="260" y="328" width="26" height="10" /> + </element> + <element ref="text_reset"> + <bounds x="263" y="296" width="19" height="7" /> + </element> + <element ref="text_copy"> + <bounds x="263" y="303" width="19" height="7" /> + </element> - <!-- controls top middle --> + <!-- controls top middle --> - <cpanel element="text_mt"> - <bounds x="347" y="280" width="11" height="7" /> - </cpanel> - <cpanel element="text_save"> - <bounds x="326" y="289" width="14" height="7" /> - </cpanel> - <cpanel name="button_save" element="button_gray" inputtag="kc5" inputmask="0x01"> - <bounds x="321" y="298" width="26" height="10" /> - </cpanel> - <cpanel element="text_load"> - <bounds x="364" y="289" width="14" height="7" /> - </cpanel> - <cpanel name="button_load" element="button_gray" inputtag="kc5" inputmask="0x02"> - <bounds x="358" y="298" width="26" height="10" /> - </cpanel> - <cpanel element="text_tempo"> - <bounds x="340" y="315" width="23" height="7" /> - </cpanel> - <cpanel name="button_tempodown" element="button_gray" inputtag="kc3" inputmask="0x10"> - <bounds x="321" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_down"> - <bounds x="327" y="329" width="14" height="7" /> - </cpanel> - <cpanel name="button_tempoup" element="button_gray" inputtag="kc3" inputmask="0x08"> - <bounds x="358" y="328" width="26" height="10" /> - </cpanel> - <cpanel element="text_up"> - <bounds x="364" y="329" width="14" height="7" /> - </cpanel> - <cpanel element="text_midi"> - <bounds x="438" y="280" width="16" height="7" /> - </cpanel> - <cpanel element="text_channel"> - <bounds x="415" y="289" width="24" height="7" /> - </cpanel> - <cpanel name="button_channel" element="button_gray" inputtag="kc5" inputmask="0x04"> - <bounds x="414" y="298" width="26" height="10" /> - </cpanel> - <cpanel element="text_clock"> - <bounds x="455" y="289" width="18" height="7" /> - </cpanel> - <cpanel name="button_clock" element="button_gray" inputtag="kc5" inputmask="0x08"> - <bounds x="452" y="298" width="26" height="10" /> - </cpanel> - <cpanel name="bg_sampling" element="button_blue"> - <bounds x="446" y="317" width="37" height="9" /> - </cpanel> - <cpanel element="text_sampling"> - <bounds x="450" y="318" width="32" height="7" /> - </cpanel> - <cpanel name="button_sampling" element="button_darkblue" inputtag="kc3" inputmask="0x04"> - <bounds x="452" y="328" width="26" height="10" /> - </cpanel> + <element ref="text_mt"> + <bounds x="347" y="280" width="11" height="7" /> + </element> + <element ref="text_save"> + <bounds x="326" y="289" width="14" height="7" /> + </element> + <element name="button_save" ref="button_gray" inputtag="kc5" inputmask="0x01"> + <bounds x="321" y="298" width="26" height="10" /> + </element> + <element ref="text_load"> + <bounds x="364" y="289" width="14" height="7" /> + </element> + <element name="button_load" ref="button_gray" inputtag="kc5" inputmask="0x02"> + <bounds x="358" y="298" width="26" height="10" /> + </element> + <element ref="text_tempo"> + <bounds x="340" y="315" width="23" height="7" /> + </element> + <element name="button_tempodown" ref="button_gray" inputtag="kc3" inputmask="0x10"> + <bounds x="321" y="328" width="26" height="10" /> + </element> + <element ref="text_down"> + <bounds x="327" y="329" width="14" height="7" /> + </element> + <element name="button_tempoup" ref="button_gray" inputtag="kc3" inputmask="0x08"> + <bounds x="358" y="328" width="26" height="10" /> + </element> + <element ref="text_up"> + <bounds x="364" y="329" width="14" height="7" /> + </element> + <element ref="text_midi"> + <bounds x="438" y="280" width="16" height="7" /> + </element> + <element ref="text_channel"> + <bounds x="415" y="289" width="24" height="7" /> + </element> + <element name="button_channel" ref="button_gray" inputtag="kc5" inputmask="0x04"> + <bounds x="414" y="298" width="26" height="10" /> + </element> + <element ref="text_clock"> + <bounds x="455" y="289" width="18" height="7" /> + </element> + <element name="button_clock" ref="button_gray" inputtag="kc5" inputmask="0x08"> + <bounds x="452" y="298" width="26" height="10" /> + </element> + <element name="bg_sampling" ref="button_blue"> + <bounds x="446" y="317" width="37" height="9" /> + </element> + <element ref="text_sampling"> + <bounds x="450" y="318" width="32" height="7" /> + </element> + <element name="button_sampling" ref="button_darkblue" inputtag="kc3" inputmask="0x04"> + <bounds x="452" y="328" width="26" height="10" /> + </element> - <!-- controls top right --> + <!-- controls top right --> - <cpanel element="text_1_32"> - <bounds x="518" y="226" width="14" height="7" /> - </cpanel> - <cpanel name="button_7" element="button_white" inputtag="kc7" inputmask="0x02"> - <bounds x="513" y="236" width="24" height="9" /> - </cpanel> - <cpanel element="text_7"> - <bounds x="524" y="237" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_48"> - <bounds x="555" y="226" width="14" height="7" /> - </cpanel> - <cpanel name="button_8" element="button_white" inputtag="kc7" inputmask="0x04"> - <bounds x="551" y="236" width="24" height="9" /> - </cpanel> - <cpanel element="text_8"> - <bounds x="562" y="237" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_96"> - <bounds x="592" y="226" width="14" height="7" /> - </cpanel> - <cpanel name="button_9" element="button_white" inputtag="kc7" inputmask="0x08"> - <bounds x="588" y="236" width="24" height="9" /> - </cpanel> - <cpanel element="text_9"> - <bounds x="599" y="237" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_12"> - <bounds x="518" y="258" width="14" height="7" /> - </cpanel> - <cpanel name="button_4" element="button_white" inputtag="kc6" inputmask="0x10"> - <bounds x="513" y="268" width="24" height="9" /> - </cpanel> - <cpanel element="text_4"> - <bounds x="524" y="269" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_16"> - <bounds x="555" y="258" width="14" height="7" /> - </cpanel> - <cpanel name="button_5" element="button_white" inputtag="kc6" inputmask="0x20"> - <bounds x="551" y="268" width="24" height="9" /> - </cpanel> - <cpanel element="text_5"> - <bounds x="562" y="269" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_24"> - <bounds x="592" y="258" width="14" height="7" /> - </cpanel> - <cpanel name="button_6" element="button_white" inputtag="kc7" inputmask="0x01"> - <bounds x="588" y="268" width="24" height="9" /> - </cpanel> - <cpanel element="text_6"> - <bounds x="599" y="269" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_4"> - <bounds x="520" y="288" width="11" height="7" /> - </cpanel> - <cpanel name="button_1" element="button_white" inputtag="kc6" inputmask="0x02"> - <bounds x="513" y="298" width="24" height="9" /> - </cpanel> - <cpanel element="text_1"> - <bounds x="524" y="299" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_6"> - <bounds x="557" y="288" width="11" height="7" /> - </cpanel> - <cpanel name="button_2" element="button_white" inputtag="kc6" inputmask="0x04"> - <bounds x="551" y="298" width="24" height="9" /> - </cpanel> - <cpanel element="text_2"> - <bounds x="562" y="299" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_8"> - <bounds x="594" y="288" width="11" height="7" /> - </cpanel> - <cpanel name="button_3" element="button_white" inputtag="kc6" inputmask="0x08"> - <bounds x="588" y="298" width="24" height="9" /> - </cpanel> - <cpanel element="text_3"> - <bounds x="599" y="299" width="3" height="7" /> - </cpanel> - <cpanel element="text_1_2"> - <bounds x="520" y="319" width="11" height="7" /> - </cpanel> - <cpanel name="button_0" element="button_white" inputtag="kc6" inputmask="0x01"> - <bounds x="513" y="328" width="24" height="9" /> - </cpanel> - <cpanel element="text_0"> - <bounds x="524" y="329" width="3" height="7" /> - </cpanel> - <cpanel element="text_value"> - <bounds x="572" y="319" width="18" height="7" /> - </cpanel> - <cpanel element="text_no"> - <bounds x="557" y="341" width="11" height="7" /> - </cpanel> - <cpanel name="button_no" element="button_gray" inputtag="kc7" inputmask="0x20"> - <bounds x="551" y="328" width="24" height="9" /> - </cpanel> - <cpanel element="text_down"> - <bounds x="556" y="329" width="14" height="7" /> - </cpanel> - <cpanel element="text_yes"> - <bounds x="594" y="341" width="11" height="7" /> - </cpanel> - <cpanel name="button_yes" element="button_gray" inputtag="kc7" inputmask="0x10"> - <bounds x="588" y="328" width="24" height="9" /> - </cpanel> - <cpanel element="text_up"> - <bounds x="593" y="329" width="14" height="7" /> - </cpanel> + <element ref="text_1_32"> + <bounds x="518" y="226" width="14" height="7" /> + </element> + <element name="button_7" ref="button_white" inputtag="kc7" inputmask="0x02"> + <bounds x="513" y="236" width="24" height="9" /> + </element> + <element ref="text_7"> + <bounds x="524" y="237" width="3" height="7" /> + </element> + <element ref="text_1_48"> + <bounds x="555" y="226" width="14" height="7" /> + </element> + <element name="button_8" ref="button_white" inputtag="kc7" inputmask="0x04"> + <bounds x="551" y="236" width="24" height="9" /> + </element> + <element ref="text_8"> + <bounds x="562" y="237" width="3" height="7" /> + </element> + <element ref="text_1_96"> + <bounds x="592" y="226" width="14" height="7" /> + </element> + <element name="button_9" ref="button_white" inputtag="kc7" inputmask="0x08"> + <bounds x="588" y="236" width="24" height="9" /> + </element> + <element ref="text_9"> + <bounds x="599" y="237" width="3" height="7" /> + </element> + <element ref="text_1_12"> + <bounds x="518" y="258" width="14" height="7" /> + </element> + <element name="button_4" ref="button_white" inputtag="kc6" inputmask="0x10"> + <bounds x="513" y="268" width="24" height="9" /> + </element> + <element ref="text_4"> + <bounds x="524" y="269" width="3" height="7" /> + </element> + <element ref="text_1_16"> + <bounds x="555" y="258" width="14" height="7" /> + </element> + <element name="button_5" ref="button_white" inputtag="kc6" inputmask="0x20"> + <bounds x="551" y="268" width="24" height="9" /> + </element> + <element ref="text_5"> + <bounds x="562" y="269" width="3" height="7" /> + </element> + <element ref="text_1_24"> + <bounds x="592" y="258" width="14" height="7" /> + </element> + <element name="button_6" ref="button_white" inputtag="kc7" inputmask="0x01"> + <bounds x="588" y="268" width="24" height="9" /> + </element> + <element ref="text_6"> + <bounds x="599" y="269" width="3" height="7" /> + </element> + <element ref="text_1_4"> + <bounds x="520" y="288" width="11" height="7" /> + </element> + <element name="button_1" ref="button_white" inputtag="kc6" inputmask="0x02"> + <bounds x="513" y="298" width="24" height="9" /> + </element> + <element ref="text_1"> + <bounds x="524" y="299" width="3" height="7" /> + </element> + <element ref="text_1_6"> + <bounds x="557" y="288" width="11" height="7" /> + </element> + <element name="button_2" ref="button_white" inputtag="kc6" inputmask="0x04"> + <bounds x="551" y="298" width="24" height="9" /> + </element> + <element ref="text_2"> + <bounds x="562" y="299" width="3" height="7" /> + </element> + <element ref="text_1_8"> + <bounds x="594" y="288" width="11" height="7" /> + </element> + <element name="button_3" ref="button_white" inputtag="kc6" inputmask="0x08"> + <bounds x="588" y="298" width="24" height="9" /> + </element> + <element ref="text_3"> + <bounds x="599" y="299" width="3" height="7" /> + </element> + <element ref="text_1_2"> + <bounds x="520" y="319" width="11" height="7" /> + </element> + <element name="button_0" ref="button_white" inputtag="kc6" inputmask="0x01"> + <bounds x="513" y="328" width="24" height="9" /> + </element> + <element ref="text_0"> + <bounds x="524" y="329" width="3" height="7" /> + </element> + <element ref="text_value"> + <bounds x="572" y="319" width="18" height="7" /> + </element> + <element ref="text_no"> + <bounds x="557" y="341" width="11" height="7" /> + </element> + <element name="button_no" ref="button_gray" inputtag="kc7" inputmask="0x20"> + <bounds x="551" y="328" width="24" height="9" /> + </element> + <element ref="text_down"> + <bounds x="556" y="329" width="14" height="7" /> + </element> + <element ref="text_yes"> + <bounds x="594" y="341" width="11" height="7" /> + </element> + <element name="button_yes" ref="button_gray" inputtag="kc7" inputmask="0x10"> + <bounds x="588" y="328" width="24" height="9" /> + </element> + <element ref="text_up"> + <bounds x="593" y="329" width="14" height="7" /> + </element> - <!-- separator --> + <!-- separator --> - <cpanel name="sep2a" element="darkgray"> - <bounds x="1" y="360" width="798" height="1" /> - </cpanel> - <cpanel name="sep2b" element="black"> - <bounds x="1" y="361" width="798" height="1" /> - </cpanel> + <element name="sep2a" ref="darkgray"> + <bounds x="1" y="360" width="798" height="1" /> + </element> + <element name="sep2b" ref="black"> + <bounds x="1" y="361" width="798" height="1" /> + </element> - <!-- controls bottom --> + <!-- controls bottom --> - <cpanel element="text_startstop"> - <bounds x="66" y="378" width="54" height="9" /> - </cpanel> - <cpanel name="button_startstop" element="button_yellow" inputtag="kc3" inputmask="0x01"> - <bounds x="71" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_continue"> - <bounds x="71" y="428" width="46" height="9" /> - </cpanel> - <cpanel element="text_start"> - <bounds x="80" y="436" width="27" height="9" /> - </cpanel> - <cpanel name="button_continue" element="button_yellow" inputtag="kc3" inputmask="0x02"> - <bounds x="71" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_accent"> - <bounds x="189" y="379" width="34" height="9" /> - </cpanel> - <cpanel name="button_accent" element="button_blue" inputtag="kc2" inputmask="0x20"> - <bounds x="184" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_mute"> - <bounds x="194" y="436" width="25" height="9" /> - </cpanel> - <cpanel name="button_mute" element="button_blue" inputtag="kc2" inputmask="0x10"> - <bounds x="184" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_tom1"> - <bounds x="279" y="379" width="25" height="9" /> - </cpanel> - <cpanel name="button_tom1" element="button_gray" inputtag="kc0" inputmask="0x01"> - <bounds x="269" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_tom2"> - <bounds x="279" y="436" width="25" height="9" /> - </cpanel> - <cpanel name="button_tom2" element="button_gray" inputtag="kc1" inputmask="0x01"> - <bounds x="269" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_tom3"> - <bounds x="335" y="379" width="25" height="9" /> - </cpanel> - <cpanel name="button_tom3" element="button_gray" inputtag="kc0" inputmask="0x02"> - <bounds x="326" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_bd"> - <bounds x="340" y="436" width="14" height="9" /> - </cpanel> - <cpanel name="button_bd" element="button_gray" inputtag="kc1" inputmask="0x02"> - <bounds x="326" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_rim"> - <bounds x="395" y="379" width="17" height="9" /> - </cpanel> - <cpanel name="button_rim" element="button_gray" inputtag="kc0" inputmask="0x04"> - <bounds x="382" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_sd"> - <bounds x="397" y="436" width="13" height="9" /> - </cpanel> - <cpanel name="button_sd" element="button_gray" inputtag="kc1" inputmask="0x04"> - <bounds x="382" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_openhh"> - <bounds x="439" y="379" width="39" height="9" /> - </cpanel> - <cpanel name="button_openhh" element="button_gray" inputtag="kc0" inputmask="0x08"> - <bounds x="437" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_closedhh"> - <bounds x="434" y="436" width="48" height="9" /> - </cpanel> - <cpanel name="button_closedhh" element="button_gray" inputtag="kc1" inputmask="0x08"> - <bounds x="437" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_claps"> - <bounds x="500" y="379" width="29" height="9" /> - </cpanel> - <cpanel name="button_claps" element="button_gray" inputtag="kc0" inputmask="0x10"> - <bounds x="493" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_ride"> - <bounds x="504" y="436" width="21" height="9" /> - </cpanel> - <cpanel name="button_ride" element="button_gray" inputtag="kc1" inputmask="0x10"> - <bounds x="493" y="450" width="43" height="27" /> - </cpanel> - <cpanel element="text_cowbell"> - <bounds x="550" y="379" width="41" height="9" /> - </cpanel> - <cpanel name="button_cowbell" element="button_gray" inputtag="kc0" inputmask="0x20"> - <bounds x="550" y="393" width="43" height="27" /> - </cpanel> - <cpanel element="text_crash"> - <bounds x="555" y="436" width="30" height="9" /> - </cpanel> - <cpanel name="button_crash" element="button_gray" inputtag="kc1" inputmask="0x20"> - <bounds x="550" y="450" width="43" height="27" /> - </cpanel> - <cpanel name="bg_sample1" element="button_blue"> - <bounds x="605" y="379" width="46" height="9" /> - </cpanel> - <cpanel element="text_sample1"> - <bounds x="608" y="379" width="42" height="9" /> - </cpanel> - <cpanel name="button_sample1" element="button_white" inputtag="kc2" inputmask="0x01"> - <bounds x="607" y="393" width="43" height="27" /> - </cpanel> - <cpanel name="bg_sample2" element="button_blue"> - <bounds x="605" y="436" width="46" height="9" /> - </cpanel> - <cpanel element="text_sample2"> - <bounds x="608" y="436" width="42" height="9" /> - </cpanel> - <cpanel name="button_sample2" element="button_white" inputtag="kc2" inputmask="0x02"> - <bounds x="607" y="450" width="43" height="27" /> - </cpanel> - <cpanel name="bg_sample3" element="button_blue"> - <bounds x="662" y="379" width="46" height="9" /> - </cpanel> - <cpanel element="text_sample3"> - <bounds x="664" y="379" width="42" height="9" /> - </cpanel> - <cpanel name="button_sample3" element="button_white" inputtag="kc2" inputmask="0x04"> - <bounds x="664" y="393" width="43" height="27" /> - </cpanel> - <cpanel name="bg_sample4" element="button_blue"> - <bounds x="662" y="436" width="46" height="9" /> - </cpanel> - <cpanel element="text_sample4"> - <bounds x="664" y="436" width="42" height="9" /> - </cpanel> - <cpanel name="button_sample4" element="button_white" inputtag="kc2" inputmask="0x08"> - <bounds x="664" y="450" width="43" height="27" /> - </cpanel> + <element ref="text_startstop"> + <bounds x="66" y="378" width="54" height="9" /> + </element> + <element name="button_startstop" ref="button_yellow" inputtag="kc3" inputmask="0x01"> + <bounds x="71" y="393" width="43" height="27" /> + </element> + <element ref="text_continue"> + <bounds x="71" y="428" width="46" height="9" /> + </element> + <element ref="text_start"> + <bounds x="80" y="436" width="27" height="9" /> + </element> + <element name="button_continue" ref="button_yellow" inputtag="kc3" inputmask="0x02"> + <bounds x="71" y="450" width="43" height="27" /> + </element> + <element ref="text_accent"> + <bounds x="189" y="379" width="34" height="9" /> + </element> + <element name="button_accent" ref="button_blue" inputtag="kc2" inputmask="0x20"> + <bounds x="184" y="393" width="43" height="27" /> + </element> + <element ref="text_mute"> + <bounds x="194" y="436" width="25" height="9" /> + </element> + <element name="button_mute" ref="button_blue" inputtag="kc2" inputmask="0x10"> + <bounds x="184" y="450" width="43" height="27" /> + </element> + <element ref="text_tom1"> + <bounds x="279" y="379" width="25" height="9" /> + </element> + <element name="button_tom1" ref="button_gray" inputtag="kc0" inputmask="0x01"> + <bounds x="269" y="393" width="43" height="27" /> + </element> + <element ref="text_tom2"> + <bounds x="279" y="436" width="25" height="9" /> + </element> + <element name="button_tom2" ref="button_gray" inputtag="kc1" inputmask="0x01"> + <bounds x="269" y="450" width="43" height="27" /> + </element> + <element ref="text_tom3"> + <bounds x="335" y="379" width="25" height="9" /> + </element> + <element name="button_tom3" ref="button_gray" inputtag="kc0" inputmask="0x02"> + <bounds x="326" y="393" width="43" height="27" /> + </element> + <element ref="text_bd"> + <bounds x="340" y="436" width="14" height="9" /> + </element> + <element name="button_bd" ref="button_gray" inputtag="kc1" inputmask="0x02"> + <bounds x="326" y="450" width="43" height="27" /> + </element> + <element ref="text_rim"> + <bounds x="395" y="379" width="17" height="9" /> + </element> + <element name="button_rim" ref="button_gray" inputtag="kc0" inputmask="0x04"> + <bounds x="382" y="393" width="43" height="27" /> + </element> + <element ref="text_sd"> + <bounds x="397" y="436" width="13" height="9" /> + </element> + <element name="button_sd" ref="button_gray" inputtag="kc1" inputmask="0x04"> + <bounds x="382" y="450" width="43" height="27" /> + </element> + <element ref="text_openhh"> + <bounds x="439" y="379" width="39" height="9" /> + </element> + <element name="button_openhh" ref="button_gray" inputtag="kc0" inputmask="0x08"> + <bounds x="437" y="393" width="43" height="27" /> + </element> + <element ref="text_closedhh"> + <bounds x="434" y="436" width="48" height="9" /> + </element> + <element name="button_closedhh" ref="button_gray" inputtag="kc1" inputmask="0x08"> + <bounds x="437" y="450" width="43" height="27" /> + </element> + <element ref="text_claps"> + <bounds x="500" y="379" width="29" height="9" /> + </element> + <element name="button_claps" ref="button_gray" inputtag="kc0" inputmask="0x10"> + <bounds x="493" y="393" width="43" height="27" /> + </element> + <element ref="text_ride"> + <bounds x="504" y="436" width="21" height="9" /> + </element> + <element name="button_ride" ref="button_gray" inputtag="kc1" inputmask="0x10"> + <bounds x="493" y="450" width="43" height="27" /> + </element> + <element ref="text_cowbell"> + <bounds x="550" y="379" width="41" height="9" /> + </element> + <element name="button_cowbell" ref="button_gray" inputtag="kc0" inputmask="0x20"> + <bounds x="550" y="393" width="43" height="27" /> + </element> + <element ref="text_crash"> + <bounds x="555" y="436" width="30" height="9" /> + </element> + <element name="button_crash" ref="button_gray" inputtag="kc1" inputmask="0x20"> + <bounds x="550" y="450" width="43" height="27" /> + </element> + <element name="bg_sample1" ref="button_blue"> + <bounds x="605" y="379" width="46" height="9" /> + </element> + <element ref="text_sample1"> + <bounds x="608" y="379" width="42" height="9" /> + </element> + <element name="button_sample1" ref="button_white" inputtag="kc2" inputmask="0x01"> + <bounds x="607" y="393" width="43" height="27" /> + </element> + <element name="bg_sample2" ref="button_blue"> + <bounds x="605" y="436" width="46" height="9" /> + </element> + <element ref="text_sample2"> + <bounds x="608" y="436" width="42" height="9" /> + </element> + <element name="button_sample2" ref="button_white" inputtag="kc2" inputmask="0x02"> + <bounds x="607" y="450" width="43" height="27" /> + </element> + <element name="bg_sample3" ref="button_blue"> + <bounds x="662" y="379" width="46" height="9" /> + </element> + <element ref="text_sample3"> + <bounds x="664" y="379" width="42" height="9" /> + </element> + <element name="button_sample3" ref="button_white" inputtag="kc2" inputmask="0x04"> + <bounds x="664" y="393" width="43" height="27" /> + </element> + <element name="bg_sample4" ref="button_blue"> + <bounds x="662" y="436" width="46" height="9" /> + </element> + <element ref="text_sample4"> + <bounds x="664" y="436" width="42" height="9" /> + </element> + <element name="button_sample4" ref="button_white" inputtag="kc2" inputmask="0x08"> + <bounds x="664" y="450" width="43" height="27" /> + </element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/rzone.lay b/src/mame/layout/rzone.lay index e184ef809a6..ce5b8ad45fa 100644 --- a/src/mame/layout/rzone.lay +++ b/src/mame/layout/rzone.lay @@ -6,9 +6,8 @@ license:CC0 <!-- define elements --> - <element name="static_red"><rect><color red="1.0" green="0.2" blue="0.23" /></rect></element> - - <element name="dark" defstate="0"> + <element name="backlight" defstate="0"> + <rect state="1"><color red="1.0" green="0.2" blue="0.23" /></rect> <rect state="0"><color red="0" green="0" blue="0" /></rect> </element> @@ -17,8 +16,6 @@ license:CC0 <view name="Internal Layout"> <screen index="0"><bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" /></screen> - <overlay element="static_red"><bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" /></overlay> - <bezel name="led" element="dark"><bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" /></bezel> - + <element name="led" ref="backlight" blend="multiply"><bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" /></element> </view> </mamelayout> diff --git a/src/mame/layout/sbrkout.lay b/src/mame/layout/sbrkout.lay index 1232b73b628..70e64acdfaf 100644 --- a/src/mame/layout/sbrkout.lay +++ b/src/mame/layout/sbrkout.lay @@ -34,8 +34,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/seawolf.lay b/src/mame/layout/seawolf.lay index 46393b0dcbc..b5bec2521df 100644 --- a/src/mame/layout/seawolf.lay +++ b/src/mame/layout/seawolf.lay @@ -4,6 +4,8 @@ license:CC0 --> <mamelayout version="2"> + <element name="empty" /> + <element name="overlay"> <rect> <color red="0.25" green="0.5" blue="1" /> @@ -104,93 +106,93 @@ license:CC0 <view name="Lamps and Color Overlay"> - <bounds left="0" top="-90" right="400" bottom="300" /> - <screen index="0"> <bounds left="0" top="0" right="400" bottom="300" /> </screen> - <element ref="overlay" blend="multiply"> - <bounds left="0" top="0" right="400" bottom="300" /> - </element> - <element name="EXP_LAMP_0" ref="explamp" blend="add"> - <bounds x="20.1" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_1" ref="explamp" blend="add"> - <bounds x="66.5" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_2" ref="explamp" blend="add"> - <bounds x="112.9" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_3" ref="explamp" blend="add"> - <bounds x="159.3" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_4" ref="explamp" blend="add"> - <bounds x="205.7" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_5" ref="explamp" blend="add"> - <bounds x="252.1" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_6" ref="explamp" blend="add"> - <bounds x="298.5" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_7" ref="explamp" blend="add"> - <bounds x="344.9" y="66.8" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_8" ref="explamp" blend="add"> - <bounds x="20.1" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_9" ref="explamp" blend="add"> - <bounds x="66.5" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_A" ref="explamp" blend="add"> - <bounds x="112.9" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_B" ref="explamp" blend="add"> - <bounds x="159.3" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_C" ref="explamp" blend="add"> - <bounds x="205.7" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_D" ref="explamp" blend="add"> - <bounds x="252.1" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_E" ref="explamp" blend="add"> - <bounds x="298.5" y="28.3" width="35" height="17.7" /> - </element> - <element name="EXP_LAMP_F" ref="explamp" blend="add"> - <bounds x="344.9" y="28.3" width="35" height="17.7" /> - </element> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds left="0" top="0" right="400" bottom="300" /> + </element> + </collection> + + <collection name="Explosion Lamps"> + <element name="EXP_LAMP_0" ref="explamp" blend="add"> + <bounds x="20.1" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_1" ref="explamp" blend="add"> + <bounds x="66.5" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_2" ref="explamp" blend="add"> + <bounds x="112.9" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_3" ref="explamp" blend="add"> + <bounds x="159.3" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_4" ref="explamp" blend="add"> + <bounds x="205.7" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_5" ref="explamp" blend="add"> + <bounds x="252.1" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_6" ref="explamp" blend="add"> + <bounds x="298.5" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_7" ref="explamp" blend="add"> + <bounds x="344.9" y="66.8" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_8" ref="explamp" blend="add"> + <bounds x="20.1" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_9" ref="explamp" blend="add"> + <bounds x="66.5" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_A" ref="explamp" blend="add"> + <bounds x="112.9" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_B" ref="explamp" blend="add"> + <bounds x="159.3" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_C" ref="explamp" blend="add"> + <bounds x="205.7" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_D" ref="explamp" blend="add"> + <bounds x="252.1" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_E" ref="explamp" blend="add"> + <bounds x="298.5" y="28.3" width="35" height="17.7" /> + </element> + <element name="EXP_LAMP_F" ref="explamp" blend="add"> + <bounds x="344.9" y="28.3" width="35" height="17.7" /> + </element> + </collection> + + <collection name="Torpedo Lamps"> + <element ref="empty"> + <bounds x="0" y="-90" width="400" height="90" /> + </element> + + <element name="TORP_LAMP_4" ref="lamp_1"> + <bounds x="117.5" y="-80" width="30" height="30" /> + </element> + <element name="TORP_LAMP_3" ref="lamp_2"> + <bounds x="162.5" y="-80" width="30" height="30" /> + </element> + <element name="TORP_LAMP_2" ref="lamp_3"> + <bounds x="207.5" y="-80" width="30" height="30" /> + </element> + <element name="TORP_LAMP_1" ref="lamp_4"> + <bounds x="252.5" y="-80" width="30" height="30" /> + </element> + + <element name="READY_LAMP" ref="lamp_ready"> + <bounds x="117.5" y="-40" width="75" height="30" /> + </element> + <element name="RELOAD_LAMP" ref="lamp_reload"> + <bounds x="207.5" y="-40" width="75" height="30" /> + </element> + </collection> - <element name="TORP_LAMP_4" ref="lamp_1"> - <bounds x="117.5" y="-80" width="30" height="30" /> - </element> - <element name="TORP_LAMP_3" ref="lamp_2"> - <bounds x="162.5" y="-80" width="30" height="30" /> - </element> - <element name="TORP_LAMP_2" ref="lamp_3"> - <bounds x="207.5" y="-80" width="30" height="30" /> - </element> - <element name="TORP_LAMP_1" ref="lamp_4"> - <bounds x="252.5" y="-80" width="30" height="30" /> - </element> - - <element name="READY_LAMP" ref="lamp_ready"> - <bounds x="117.5" y="-40" width="75" height="30" /> - </element> - <element name="RELOAD_LAMP" ref="lamp_reload"> - <bounds x="207.5" y="-40" width="75" height="30" /> - </element> - - </view> - - <view name="Color Overlay"> - <screen index="0"> - <bounds left="0" top="0" right="400" bottom="300" /> - </screen> - <element ref="overlay" blend="multiply"> - <bounds left="0" top="0" right="400" bottom="300" /> - </element> </view> </mamelayout> diff --git a/src/mame/layout/shuttlei.lay b/src/mame/layout/shuttlei.lay index 40d8d90df93..79533b49043 100644 --- a/src/mame/layout/shuttlei.lay +++ b/src/mame/layout/shuttlei.lay @@ -18,12 +18,12 @@ license:CC0 </rect> </element> - <view name="Color_Overlay"> + <view name="Color Overlay"> <screen index="0"> <bounds x="0" y="0" width="3" height="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="3" height="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/skydiver.lay b/src/mame/layout/skydiver.lay index bddeae2c73a..7ffe2ec2d9b 100644 --- a/src/mame/layout/skydiver.lay +++ b/src/mame/layout/skydiver.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/solarq.lay b/src/mame/layout/solarq.lay index f91322d299b..d96c8f1b3f0 100644 --- a/src/mame/layout/solarq.lay +++ b/src/mame/layout/solarq.lay @@ -22,8 +22,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/spacecom.lay b/src/mame/layout/spacecom.lay index b6a5d293818..2ebf376144e 100644 --- a/src/mame/layout/spacecom.lay +++ b/src/mame/layout/spacecom.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/spacezap.lay b/src/mame/layout/spacezap.lay index fe5b4cd7364..bb6d690a0f5 100644 --- a/src/mame/layout/spacezap.lay +++ b/src/mame/layout/spacezap.lay @@ -208,16 +208,14 @@ license:CC0 </element> - <view name="Color Overlay"> - <bounds left="0" top="0" right="400" bottom="300" /> <screen index="0"> <bounds left="0" top="0" right="400" bottom="300" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="-100" y="-150" width="600" height="600" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/spacwalk.lay b/src/mame/layout/spacwalk.lay index 92236dc964f..d74b63c4836 100644 --- a/src/mame/layout/spacwalk.lay +++ b/src/mame/layout/spacwalk.lay @@ -53,8 +53,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/sstrangr.lay b/src/mame/layout/sstrangr.lay index a938fa4d150..d3557830c9c 100644 --- a/src/mame/layout/sstrangr.lay +++ b/src/mame/layout/sstrangr.lay @@ -61,16 +61,16 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay upright"> + <element ref="overlay upright" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> <view name="Color Overlay Cocktail"> <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay cocktail"> + <element ref="overlay cocktail" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/starcas.lay b/src/mame/layout/starcas.lay index c850e08e1d5..79131d3a125 100644 --- a/src/mame/layout/starcas.lay +++ b/src/mame/layout/starcas.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/summit.lay b/src/mame/layout/summit.lay index 9fd33fecf40..0dd0106e8ae 100644 --- a/src/mame/layout/summit.lay +++ b/src/mame/layout/summit.lay @@ -50,62 +50,62 @@ Simple layout for Push-Over (Summit Coin) </element> <view name="Buttons"> - <backdrop element="background"> + <element ref="background"> <bounds x="0" y="0" width="600" height="800" /> - </backdrop> + </element> <screen index="0"> <bounds left="60" top="80" right="480" bottom="640" /> </screen> - <cpanel name="lamp_12" element="gamble"> + <element name="lamp_12" ref="gamble"> <bounds x="10" y="20" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_3" element="cancel" inputtag="IN0" inputmask="0x01"> + </element> + <element name="lamp_3" ref="cancel" inputtag="IN0" inputmask="0x01"> <bounds x="10" y="730" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_0" element="hold" inputtag="IN0" inputmask="0x08"> + </element> + <element name="lamp_0" ref="hold" inputtag="IN0" inputmask="0x08"> <bounds x="90" y="730" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_1" element="hold" inputtag="IN0" inputmask="0x10"> + </element> + <element name="lamp_1" ref="hold" inputtag="IN0" inputmask="0x10"> <bounds x="170" y="730" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_2" element="hold" inputtag="IN0" inputmask="0x20"> + </element> + <element name="lamp_2" ref="hold" inputtag="IN0" inputmask="0x20"> <bounds x="250" y="730" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_8" element="start" inputtag="IN3" inputmask="0x01"> + </element> + <element name="lamp_8" ref="start" inputtag="IN3" inputmask="0x01"> <bounds x="400" y="730" width="70" height="35" /> - </cpanel> - <cpanel name="lamp_10" element="go"> + </element> + <element name="lamp_10" ref="go"> <bounds x="550" y="600" width="40" height="35" /> - </cpanel> - <cpanel name="lamp_4" element="red"> + </element> + <element name="lamp_4" ref="red"> <bounds x="200" y="20" width="40" height="35" /> - </cpanel> - <cpanel name="lamp_5" element="green"> + </element> + <element name="lamp_5" ref="green"> <bounds x="250" y="20" width="40" height="35" /> - </cpanel> + </element> <!-- Might not be lamps --> - <cpanel name="lamp_6" element="green"> + <element name="lamp_6" ref="green"> <bounds x="550" y="200" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_7" element="green"> + </element> + <element name="lamp_7" ref="green"> <bounds x="550" y="230" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_9" element="green"> + </element> + <element name="lamp_9" ref="green"> <bounds x="550" y="260" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_11" element="green"> + </element> + <element name="lamp_11" ref="green"> <bounds x="550" y="290" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_13" element="green"> + </element> + <element name="lamp_13" ref="green"> <bounds x="550" y="320" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_14" element="green"> + </element> + <element name="lamp_14" ref="green"> <bounds x="550" y="350" width="20" height="20" /> - </cpanel> - <cpanel name="lamp_15" element="green"> + </element> + <element name="lamp_15" ref="green"> <bounds x="550" y="380" width="20" height="20" /> - </cpanel> + </element> </view> diff --git a/src/mame/layout/sundance.lay b/src/mame/layout/sundance.lay index db086b53141..c82102d18ca 100644 --- a/src/mame/layout/sundance.lay +++ b/src/mame/layout/sundance.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/superbug.lay b/src/mame/layout/superbug.lay index 99d9f54c2f4..c9cdfb2bbf4 100644 --- a/src/mame/layout/superbug.lay +++ b/src/mame/layout/superbug.lay @@ -7,10 +7,13 @@ license:CC0 <!-- NOTE: highlight should be a bit star-shaped, not doable in MAME internal layout --> <element name="highlight_explosion"> - <rect><color red="1.0" green="1.0" blue="1.0" /></rect> - <disk><color red="0.875" green="1.0" blue="0.125" /></disk> + <rect><color red="1.0" green="1.0" blue="1.0" /></rect> + <disk><color red="0.875" green="1.0" blue="0.125" /></disk> + </element> + + <element name="static_green"> + <rect><color red="0.125" green="0.875" blue="0" /></rect> </element> - <element name="static_green"><rect><color red="0.125" green="0.875" blue="0" /></rect></element> <view name="Color Overlay"> @@ -18,10 +21,9 @@ license:CC0 <bounds left="0" top="0" right="300" bottom="400" /> </screen> - <overlay element="highlight_explosion"><bounds x="117" y="167" width="66" height="66" /></overlay> - - <overlay element="static_green"><bounds left="0" top="0" right="300" bottom="33" /></overlay> - <overlay element="static_green"><bounds left="0" top="367" right="300" bottom="400" /></overlay> + <element ref="highlight_explosion" blend="multiply"><bounds x="117" y="167" width="66" height="66" /></element> + <element ref="static_green" blend="multiply"><bounds left="0" top="0" right="300" bottom="33" /></element> + <element ref="static_green" blend="multiply"><bounds left="0" top="367" right="300" bottom="400" /></element> </view> </mamelayout> diff --git a/src/mame/layout/tailg.lay b/src/mame/layout/tailg.lay index 152574873b8..e3a8a78f536 100644 --- a/src/mame/layout/tailg.lay +++ b/src/mame/layout/tailg.lay @@ -14,8 +14,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/tinv2650.lay b/src/mame/layout/tinv2650.lay index 3f8b15edb96..fdde1883096 100644 --- a/src/mame/layout/tinv2650.lay +++ b/src/mame/layout/tinv2650.lay @@ -26,8 +26,8 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="3" bottom="4" /> </screen> - <overlay name="overlay" element="overlay"> + <element name="overlay" ref="overlay" blend="multiply"> <bounds left="0" top="0" right="3" bottom="4" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/trvmadns.lay b/src/mame/layout/trvmadns.lay index 2bf4e3d0371..d7712b72ba6 100644 --- a/src/mame/layout/trvmadns.lay +++ b/src/mame/layout/trvmadns.lay @@ -27,29 +27,29 @@ Simple layout for Trivia Madness <text string="START"><color red="0.1" green="0.1" blue="0.1" /></text> </element> <view name="Buttons"> - <backdrop element="background"> + <element ref="background"> <bounds x="0" y="0" width="640" height="640" /> - </backdrop> + </element> <screen index="0"> <bounds left="0" top="0" right="640" bottom="480" /> </screen> - <cpanel name="0.0" element="button" inputtag="IN0" inputmask="0x01"> + <element name="0.0" ref="button" inputtag="IN0" inputmask="0x01"> <bounds x="80" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="0.1" element="button" inputtag="IN0" inputmask="0x02"> + </element> + <element name="0.1" ref="button" inputtag="IN0" inputmask="0x02"> <bounds x="180" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="0.2" element="button" inputtag="IN0" inputmask="0x04"> + </element> + <element name="0.2" ref="button" inputtag="IN0" inputmask="0x04"> <bounds x="280" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="0.3" element="button" inputtag="IN0" inputmask="0x08"> + </element> + <element name="0.3" ref="button" inputtag="IN0" inputmask="0x08"> <bounds x="380" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="0.4" element="button" inputtag="IN0" inputmask="0x10"> + </element> + <element name="0.4" ref="button" inputtag="IN0" inputmask="0x10"> <bounds x="480" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="0.6" element="start" inputtag="IN0" inputmask="0x40"> + </element> + <element name="0.6" ref="start" inputtag="IN0" inputmask="0x40"> <bounds x="250" y="565" width="130" height="35" /> - </cpanel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/v4psi.lay b/src/mame/layout/v4psi.lay index 85e195d9429..b6b9c476bd4 100644 --- a/src/mame/layout/v4psi.lay +++ b/src/mame/layout/v4psi.lay @@ -22,9 +22,9 @@ license:CC0 <screen index="0"> <bounds x="0" y="0" width="504" height="296" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="504" height="296" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/vgmplay.lay b/src/mame/layout/vgmplay.lay index 6ebf67aea86..5dc72893791 100644 --- a/src/mame/layout/vgmplay.lay +++ b/src/mame/layout/vgmplay.lay @@ -125,127 +125,131 @@ license:CC0 </element> <group name="activity"> - <cpanel element="backdrop"><bounds x="0" y="0" width="60" height="34" /></cpanel> - - <cpanel name="led_act_0" element="act_led"><bounds x="1" y="1" width="2" height="2" /></cpanel> - <cpanel name="led_act_1" element="act_led"><bounds x="1" y="4" width="2" height="2" /></cpanel> - <cpanel name="led_act_2" element="act_led"><bounds x="1" y="7" width="2" height="2" /></cpanel> - <cpanel name="led_act_3" element="act_led"><bounds x="1" y="10" width="2" height="2" /></cpanel> - <cpanel name="led_act_4" element="act_led"><bounds x="1" y="13" width="2" height="2" /></cpanel> - <cpanel name="led_act_5" element="act_led"><bounds x="1" y="16" width="2" height="2" /></cpanel> - <cpanel name="led_act_6" element="act_led"><bounds x="1" y="19" width="2" height="2" /></cpanel> - <cpanel name="led_act_7" element="act_led"><bounds x="1" y="22" width="2" height="2" /></cpanel> - <cpanel name="led_act_8" element="act_led"><bounds x="1" y="25" width="2" height="2" /></cpanel> - <cpanel name="led_act_9" element="act_led"><bounds x="1" y="28" width="2" height="2" /></cpanel> - <cpanel name="led_act_10" element="act_led"><bounds x="1" y="31" width="2" height="2" /></cpanel> - - <cpanel name="led_act_11" element="act_led"><bounds x="16" y="1" width="2" height="2" /></cpanel> - <cpanel name="led_act_12" element="act_led"><bounds x="16" y="4" width="2" height="2" /></cpanel> - <cpanel name="led_act_13" element="act_led"><bounds x="16" y="7" width="2" height="2" /></cpanel> - <cpanel name="led_act_14" element="act_led"><bounds x="16" y="10" width="2" height="2" /></cpanel> - <cpanel name="led_act_15" element="act_led"><bounds x="16" y="13" width="2" height="2" /></cpanel> - <cpanel name="led_act_16" element="act_led"><bounds x="16" y="16" width="2" height="2" /></cpanel> - <cpanel name="led_act_17" element="act_led"><bounds x="16" y="19" width="2" height="2" /></cpanel> - <cpanel name="led_act_18" element="act_led"><bounds x="16" y="22" width="2" height="2" /></cpanel> - <cpanel name="led_act_19" element="act_led"><bounds x="16" y="25" width="2" height="2" /></cpanel> - <cpanel name="led_act_20" element="act_led"><bounds x="16" y="28" width="2" height="2" /></cpanel> - <cpanel name="led_act_21" element="act_led"><bounds x="16" y="31" width="2" height="2" /></cpanel> - - <cpanel name="led_act_22" element="act_led"><bounds x="31" y="1" width="2" height="2" /></cpanel> - <cpanel name="led_act_23" element="act_led"><bounds x="31" y="4" width="2" height="2" /></cpanel> - <cpanel name="led_act_24" element="act_led"><bounds x="31" y="7" width="2" height="2" /></cpanel> - <cpanel name="led_act_25" element="act_led"><bounds x="31" y="10" width="2" height="2" /></cpanel> - <cpanel name="led_act_26" element="act_led"><bounds x="31" y="13" width="2" height="2" /></cpanel> - <cpanel name="led_act_27" element="act_led"><bounds x="31" y="16" width="2" height="2" /></cpanel> - <cpanel name="led_act_28" element="act_led"><bounds x="31" y="19" width="2" height="2" /></cpanel> - <cpanel name="led_act_29" element="act_led"><bounds x="31" y="22" width="2" height="2" /></cpanel> - <cpanel name="led_act_30" element="act_led"><bounds x="31" y="25" width="2" height="2" /></cpanel> - <cpanel name="led_act_31" element="act_led"><bounds x="31" y="28" width="2" height="2" /></cpanel> - <cpanel name="led_act_32" element="act_led"><bounds x="31" y="31" width="2" height="2" /></cpanel> - - <cpanel name="led_act_33" element="act_led"><bounds x="46" y="1" width="2" height="2" /></cpanel> - <cpanel name="led_act_34" element="act_led"><bounds x="46" y="4" width="2" height="2" /></cpanel> - <cpanel name="led_act_35" element="act_led"><bounds x="46" y="7" width="2" height="2" /></cpanel> - <cpanel name="led_act_36" element="act_led"><bounds x="46" y="10" width="2" height="2" /></cpanel> - <cpanel name="led_act_37" element="act_led"><bounds x="46" y="13" width="2" height="2" /></cpanel> - <cpanel name="led_act_38" element="act_led"><bounds x="46" y="16" width="2" height="2" /></cpanel> - <cpanel name="led_act_39" element="act_led"><bounds x="46" y="19" width="2" height="2" /></cpanel> - <cpanel name="led_act_40" element="act_led"><bounds x="46" y="22" width="2" height="2" /></cpanel> - - <cpanel element="act_label_sn76496"><bounds x="4" y="1.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2413"><bounds x="4" y="4.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2612"><bounds x="4" y="7.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2151"><bounds x="4" y="10.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_segapcm"><bounds x="4" y="13.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_rf5c68"><bounds x="4" y="16.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2203"><bounds x="4" y="19.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2608"><bounds x="4" y="22.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym2610"><bounds x="4" y="25.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym3812"><bounds x="4" y="28.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ym3526"><bounds x="4" y="31.2" width="10" height="1.6" /></cpanel> - - <cpanel element="act_label_y8950"><bounds x="19" y="1.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ymf262"><bounds x="19" y="4.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ymf278b"><bounds x="19" y="7.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ymf271"><bounds x="19" y="10.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ymz280b"><bounds x="19" y="13.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_rf5c164"><bounds x="19" y="16.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_pwm"><bounds x="19" y="19.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ay8910"><bounds x="19" y="22.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_gameboy"><bounds x="19" y="25.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_nesapu"><bounds x="19" y="28.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_multipcm"><bounds x="19" y="31.2" width="10" height="1.6" /></cpanel> - - <cpanel element="act_label_upd7759"><bounds x="34" y="1.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_okim6258"><bounds x="34" y="4.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_okim6295"><bounds x="34" y="7.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_k051649"><bounds x="34" y="10.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_k054539"><bounds x="34" y="13.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_c6280"><bounds x="34" y="16.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_c140"><bounds x="34" y="19.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_k053260"><bounds x="34" y="22.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_pokey"><bounds x="34" y="25.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_qsound"><bounds x="34" y="28.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_scsp"><bounds x="34" y="31.2" width="10" height="1.6" /></cpanel> - - <cpanel element="act_label_wswan"><bounds x="49" y="1.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_vsu_vue"><bounds x="49" y="4.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_saa1099"><bounds x="49" y="7.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_es5503"><bounds x="49" y="10.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_es5505"><bounds x="49" y="13.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_x1_010"><bounds x="49" y="16.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_c352"><bounds x="49" y="19.2" width="10" height="1.6" /></cpanel> - <cpanel element="act_label_ga20"><bounds x="49" y="22.2" width="10" height="1.6" /></cpanel> + <element ref="backdrop"><bounds x="0" y="0" width="60" height="34" /></element> + + <element name="led_act_0" ref="act_led"><bounds x="1" y="1" width="2" height="2" /></element> + <element name="led_act_1" ref="act_led"><bounds x="1" y="4" width="2" height="2" /></element> + <element name="led_act_2" ref="act_led"><bounds x="1" y="7" width="2" height="2" /></element> + <element name="led_act_3" ref="act_led"><bounds x="1" y="10" width="2" height="2" /></element> + <element name="led_act_4" ref="act_led"><bounds x="1" y="13" width="2" height="2" /></element> + <element name="led_act_5" ref="act_led"><bounds x="1" y="16" width="2" height="2" /></element> + <element name="led_act_6" ref="act_led"><bounds x="1" y="19" width="2" height="2" /></element> + <element name="led_act_7" ref="act_led"><bounds x="1" y="22" width="2" height="2" /></element> + <element name="led_act_8" ref="act_led"><bounds x="1" y="25" width="2" height="2" /></element> + <element name="led_act_9" ref="act_led"><bounds x="1" y="28" width="2" height="2" /></element> + <element name="led_act_10" ref="act_led"><bounds x="1" y="31" width="2" height="2" /></element> + + <element name="led_act_11" ref="act_led"><bounds x="16" y="1" width="2" height="2" /></element> + <element name="led_act_12" ref="act_led"><bounds x="16" y="4" width="2" height="2" /></element> + <element name="led_act_13" ref="act_led"><bounds x="16" y="7" width="2" height="2" /></element> + <element name="led_act_14" ref="act_led"><bounds x="16" y="10" width="2" height="2" /></element> + <element name="led_act_15" ref="act_led"><bounds x="16" y="13" width="2" height="2" /></element> + <element name="led_act_16" ref="act_led"><bounds x="16" y="16" width="2" height="2" /></element> + <element name="led_act_17" ref="act_led"><bounds x="16" y="19" width="2" height="2" /></element> + <element name="led_act_18" ref="act_led"><bounds x="16" y="22" width="2" height="2" /></element> + <element name="led_act_19" ref="act_led"><bounds x="16" y="25" width="2" height="2" /></element> + <element name="led_act_20" ref="act_led"><bounds x="16" y="28" width="2" height="2" /></element> + <element name="led_act_21" ref="act_led"><bounds x="16" y="31" width="2" height="2" /></element> + + <element name="led_act_22" ref="act_led"><bounds x="31" y="1" width="2" height="2" /></element> + <element name="led_act_23" ref="act_led"><bounds x="31" y="4" width="2" height="2" /></element> + <element name="led_act_24" ref="act_led"><bounds x="31" y="7" width="2" height="2" /></element> + <element name="led_act_25" ref="act_led"><bounds x="31" y="10" width="2" height="2" /></element> + <element name="led_act_26" ref="act_led"><bounds x="31" y="13" width="2" height="2" /></element> + <element name="led_act_27" ref="act_led"><bounds x="31" y="16" width="2" height="2" /></element> + <element name="led_act_28" ref="act_led"><bounds x="31" y="19" width="2" height="2" /></element> + <element name="led_act_29" ref="act_led"><bounds x="31" y="22" width="2" height="2" /></element> + <element name="led_act_30" ref="act_led"><bounds x="31" y="25" width="2" height="2" /></element> + <element name="led_act_31" ref="act_led"><bounds x="31" y="28" width="2" height="2" /></element> + <element name="led_act_32" ref="act_led"><bounds x="31" y="31" width="2" height="2" /></element> + + <element name="led_act_33" ref="act_led"><bounds x="46" y="1" width="2" height="2" /></element> + <element name="led_act_34" ref="act_led"><bounds x="46" y="4" width="2" height="2" /></element> + <element name="led_act_35" ref="act_led"><bounds x="46" y="7" width="2" height="2" /></element> + <element name="led_act_36" ref="act_led"><bounds x="46" y="10" width="2" height="2" /></element> + <element name="led_act_37" ref="act_led"><bounds x="46" y="13" width="2" height="2" /></element> + <element name="led_act_38" ref="act_led"><bounds x="46" y="16" width="2" height="2" /></element> + <element name="led_act_39" ref="act_led"><bounds x="46" y="19" width="2" height="2" /></element> + <element name="led_act_40" ref="act_led"><bounds x="46" y="22" width="2" height="2" /></element> + + <element ref="act_label_sn76496"><bounds x="4" y="1.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2413"><bounds x="4" y="4.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2612"><bounds x="4" y="7.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2151"><bounds x="4" y="10.2" width="10" height="1.6" /></element> + <element ref="act_label_segapcm"><bounds x="4" y="13.2" width="10" height="1.6" /></element> + <element ref="act_label_rf5c68"><bounds x="4" y="16.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2203"><bounds x="4" y="19.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2608"><bounds x="4" y="22.2" width="10" height="1.6" /></element> + <element ref="act_label_ym2610"><bounds x="4" y="25.2" width="10" height="1.6" /></element> + <element ref="act_label_ym3812"><bounds x="4" y="28.2" width="10" height="1.6" /></element> + <element ref="act_label_ym3526"><bounds x="4" y="31.2" width="10" height="1.6" /></element> + + <element ref="act_label_y8950"><bounds x="19" y="1.2" width="10" height="1.6" /></element> + <element ref="act_label_ymf262"><bounds x="19" y="4.2" width="10" height="1.6" /></element> + <element ref="act_label_ymf278b"><bounds x="19" y="7.2" width="10" height="1.6" /></element> + <element ref="act_label_ymf271"><bounds x="19" y="10.2" width="10" height="1.6" /></element> + <element ref="act_label_ymz280b"><bounds x="19" y="13.2" width="10" height="1.6" /></element> + <element ref="act_label_rf5c164"><bounds x="19" y="16.2" width="10" height="1.6" /></element> + <element ref="act_label_pwm"><bounds x="19" y="19.2" width="10" height="1.6" /></element> + <element ref="act_label_ay8910"><bounds x="19" y="22.2" width="10" height="1.6" /></element> + <element ref="act_label_gameboy"><bounds x="19" y="25.2" width="10" height="1.6" /></element> + <element ref="act_label_nesapu"><bounds x="19" y="28.2" width="10" height="1.6" /></element> + <element ref="act_label_multipcm"><bounds x="19" y="31.2" width="10" height="1.6" /></element> + + <element ref="act_label_upd7759"><bounds x="34" y="1.2" width="10" height="1.6" /></element> + <element ref="act_label_okim6258"><bounds x="34" y="4.2" width="10" height="1.6" /></element> + <element ref="act_label_okim6295"><bounds x="34" y="7.2" width="10" height="1.6" /></element> + <element ref="act_label_k051649"><bounds x="34" y="10.2" width="10" height="1.6" /></element> + <element ref="act_label_k054539"><bounds x="34" y="13.2" width="10" height="1.6" /></element> + <element ref="act_label_c6280"><bounds x="34" y="16.2" width="10" height="1.6" /></element> + <element ref="act_label_c140"><bounds x="34" y="19.2" width="10" height="1.6" /></element> + <element ref="act_label_k053260"><bounds x="34" y="22.2" width="10" height="1.6" /></element> + <element ref="act_label_pokey"><bounds x="34" y="25.2" width="10" height="1.6" /></element> + <element ref="act_label_qsound"><bounds x="34" y="28.2" width="10" height="1.6" /></element> + <element ref="act_label_scsp"><bounds x="34" y="31.2" width="10" height="1.6" /></element> + + <element ref="act_label_wswan"><bounds x="49" y="1.2" width="10" height="1.6" /></element> + <element ref="act_label_vsu_vue"><bounds x="49" y="4.2" width="10" height="1.6" /></element> + <element ref="act_label_saa1099"><bounds x="49" y="7.2" width="10" height="1.6" /></element> + <element ref="act_label_es5503"><bounds x="49" y="10.2" width="10" height="1.6" /></element> + <element ref="act_label_es5505"><bounds x="49" y="13.2" width="10" height="1.6" /></element> + <element ref="act_label_x1_010"><bounds x="49" y="16.2" width="10" height="1.6" /></element> + <element ref="act_label_c352"><bounds x="49" y="19.2" width="10" height="1.6" /></element> + <element ref="act_label_ga20"><bounds x="49" y="22.2" width="10" height="1.6" /></element> </group> <group name="lights"> - <cpanel element="static_black2"><bounds x="0" y="4" width="11" height="5" /></cpanel> - <cpanel element="static_black2"><bounds x="12" y="4" width="11" height="5" /></cpanel> - <cpanel element="static_black2"><bounds x="24" y="4" width="11" height="5" /></cpanel> - <cpanel element="static_black2"><bounds x="36" y="4" width="11" height="5" /></cpanel> - <cpanel element="static_black2"><bounds x="48" y="4" width="11" height="5" /></cpanel> - - <cpanel element="text_l1"><bounds x="0" y="5" width="11" height="3.5" /></cpanel> - <cpanel element="text_l2"><bounds x="12" y="5" width="11" height="3.5" /></cpanel> - <cpanel element="text_l3"><bounds x="24" y="5" width="11" height="3.5" /></cpanel> - <cpanel element="text_l4"><bounds x="36" y="5" width="11" height="3.5" /></cpanel> - <cpanel element="text_l5"><bounds x="48" y="5" width="11" height="3.5" /></cpanel> - - <cpanel element="hl1" inputtag="CONTROLS" inputmask="0x0001"><bounds x="0" y="4" width="11" height="5" /><color alpha="0.15" /></cpanel> - <cpanel element="hl1" inputtag="CONTROLS" inputmask="0x0002"><bounds x="12" y="4" width="11" height="5" /><color alpha="0.15" /></cpanel> - <cpanel element="hl1" inputtag="CONTROLS" inputmask="0x0004"><bounds x="24" y="4" width="11" height="5" /><color alpha="0.15" /></cpanel> - <cpanel element="hl1" inputtag="CONTROLS" inputmask="0x0008"><bounds x="36" y="4" width="11" height="5" /><color alpha="0.15" /></cpanel> - <cpanel element="hl1" inputtag="CONTROLS" inputmask="0x0010"><bounds x="48" y="4" width="11" height="5" /><color alpha="0.15" /></cpanel> - - <group ref="activity"><bounds x="0" y="21" width="60" height="34" /></group> + </group> <view name="Full View"> - <group ref="lights"><bounds x="0" y="0" width="60" height="55" /></group> - <screen index="0"><bounds x="60" y="0" width="60" height="55" /></screen> - </view> - - <view name="Lights + Controls"> - <group ref="lights"><bounds x="0" y="0" width="60" height="55" /></group> + <collection name="Controls"> + <element ref="static_black2"><bounds x="0" y="4" width="11" height="5" /></element> + <element ref="static_black2"><bounds x="12" y="4" width="11" height="5" /></element> + <element ref="static_black2"><bounds x="24" y="4" width="11" height="5" /></element> + <element ref="static_black2"><bounds x="36" y="4" width="11" height="5" /></element> + <element ref="static_black2"><bounds x="48" y="4" width="11" height="5" /></element> + + <element ref="text_l1"><bounds x="0" y="5" width="11" height="3.5" /></element> + <element ref="text_l2"><bounds x="12" y="5" width="11" height="3.5" /></element> + <element ref="text_l3"><bounds x="24" y="5" width="11" height="3.5" /></element> + <element ref="text_l4"><bounds x="36" y="5" width="11" height="3.5" /></element> + <element ref="text_l5"><bounds x="48" y="5" width="11" height="3.5" /></element> + + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0001"><bounds x="0" y="4" width="11" height="5" /><color alpha="0.15" /></element> + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0002"><bounds x="12" y="4" width="11" height="5" /><color alpha="0.15" /></element> + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0004"><bounds x="24" y="4" width="11" height="5" /><color alpha="0.15" /></element> + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0008"><bounds x="36" y="4" width="11" height="5" /><color alpha="0.15" /></element> + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0010"><bounds x="48" y="4" width="11" height="5" /><color alpha="0.15" /></element> + </collection> + + <collection name="Activity Lights"> + <group ref="activity"><bounds x="0" y="21" width="60" height="34" /></group> + </collection> + + <collection name="Visualizer"> + <screen index="0"><bounds x="60" y="0" width="60" height="55" /></screen> + <element ref="hl1" inputtag="CONTROLS" inputmask="0x0020"><bounds x="60" y="0" width="60" height="55" /><color alpha="0" /></element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/video21.lay b/src/mame/layout/video21.lay index f63a9d51f5c..0c507bd486c 100644 --- a/src/mame/layout/video21.lay +++ b/src/mame/layout/video21.lay @@ -110,28 +110,32 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <overlay name="overlay" element="overlay"> - <bounds left="0" top="0" right="4" bottom="3" /> - </overlay> - <bezel name="lamp5" element="bet" inputtag="IN44" inputmask="0x10"> - <bounds x="0.0" y="3.05" width="0.35" height="0.24" /> - </bezel> - <bezel name="lamp0" element="start" inputtag="IN42" inputmask="0x04"> - <bounds x="0.4" y="3.05" width="0.35" height="0.24" /> - </bezel> - <bezel name="lamp1" element="card" inputtag="IN42" inputmask="0x08"> - <bounds x="0.8" y="3.05" width="0.35" height="0.24" /> - </bezel> - <bezel name="lamp2" element="stop" inputtag="IN42" inputmask="0x10"> - <bounds x="1.2" y="3.05" width="0.35" height="0.24" /> - </bezel> - <bezel name="lamp3" element="accept" inputtag="IN44" inputmask="0x40"> - <bounds x="1.85" y="3.05" width="0.35" height="0.24" /> - </bezel> - <bezel name="lamp4" element="double" inputtag="IN44" inputmask="0x20"> - <bounds x="2.25" y="3.05" width="0.35" height="0.24" /> - </bezel> + <collection name="Overlay"> + <element ref="overlay" blend="multiply"> + <bounds left="0" top="0" right="4" bottom="3" /> + </element> + </collection> + <collection name="Control Panel"> + <element name="lamp5" ref="bet" inputtag="IN44" inputmask="0x10"> + <bounds x="0.0" y="3.05" width="0.35" height="0.24" /> + </element> + <element name="lamp0" ref="start" inputtag="IN42" inputmask="0x04"> + <bounds x="0.4" y="3.05" width="0.35" height="0.24" /> + </element> + <element name="lamp1" ref="card" inputtag="IN42" inputmask="0x08"> + <bounds x="0.8" y="3.05" width="0.35" height="0.24" /> + </element> + <element name="lamp2" ref="stop" inputtag="IN42" inputmask="0x10"> + <bounds x="1.2" y="3.05" width="0.35" height="0.24" /> + </element> + <element name="lamp3" ref="accept" inputtag="IN44" inputmask="0x40"> + <bounds x="1.85" y="3.05" width="0.35" height="0.24" /> + </element> + <element name="lamp4" ref="double" inputtag="IN44" inputmask="0x20"> + <bounds x="2.25" y="3.05" width="0.35" height="0.24" /> + </element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/videosaa.lay b/src/mame/layout/videosaa.lay index 3daf74a10e7..264ea4e0603 100644 --- a/src/mame/layout/videosaa.lay +++ b/src/mame/layout/videosaa.lay @@ -27,29 +27,29 @@ Simple layout for games running on Videos A A hardware <text string="START"><color red="0.1" green="0.1" blue="0.1" /></text> </element> <view name="Buttons"> - <backdrop element="background"> + <element ref="background"> <bounds x="0" y="0" width="640" height="640" /> - </backdrop> + </element> <screen index="0"> <bounds left="0" top="0" right="640" bottom="480" /> </screen> - <cpanel name="lamp0" element="button" inputtag="in1" inputmask="0x01"> + <element name="lamp0" ref="button" inputtag="in1" inputmask="0x01"> <bounds x="80" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="lamp1" element="button" inputtag="in1" inputmask="0x02"> + </element> + <element name="lamp1" ref="button" inputtag="in1" inputmask="0x02"> <bounds x="180" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="lamp2" element="button" inputtag="in1" inputmask="0x04"> + </element> + <element name="lamp2" ref="button" inputtag="in1" inputmask="0x04"> <bounds x="280" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="lamp3" element="button" inputtag="in1" inputmask="0x08"> + </element> + <element name="lamp3" ref="button" inputtag="in1" inputmask="0x08"> <bounds x="380" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="lamp4" element="button" inputtag="in1" inputmask="0x10"> + </element> + <element name="lamp4" ref="button" inputtag="in1" inputmask="0x10"> <bounds x="480" y="505" width="70" height="35" /> - </cpanel> - <cpanel name="lamp5" element="start" inputtag="in1" inputmask="0x20"> + </element> + <element name="lamp5" ref="start" inputtag="in1" inputmask="0x20"> <bounds x="250" y="565" width="130" height="35" /> - </cpanel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/warrior.lay b/src/mame/layout/warrior.lay index 0b116013efb..d9f5484bb9f 100644 --- a/src/mame/layout/warrior.lay +++ b/src/mame/layout/warrior.lay @@ -45,24 +45,24 @@ license:CC0 <color red="0" green="0" blue="0" /> </rect> </element> - <view name="Color_Overlay"> - <backdrop name="pit1" element="pit"> + <view name="Backdrop"> + <element ref="pit"> <bounds x="270" y="330" width="190" height="190" /> <color alpha=".8" /> - </backdrop> - <backdrop name="pit2" element="pit"> + </element> + <element ref="pit"> <bounds x="580" y="270" width="190" height="190" /> <color alpha=".8" /> - </backdrop> - <backdrop name="p1start" element="p1start"> + </element> + <element ref="p1start"> <bounds x="75" y="75" width="130" height="130" /> <color alpha=".4" /> - </backdrop> - <backdrop name="p2start" element="p2start"> + </element> + <element ref="p2start"> <bounds x="825" y="580" width="130" height="130" /> <color alpha=".4" /> - </backdrop> - <screen index="0"> + </element> + <screen index="0" blend="add"> <bounds x="0" y="0" width="1024" height="768" /> </screen> </view> diff --git a/src/mame/layout/wotw.lay b/src/mame/layout/wotw.lay index a4d901a971d..8f8b6be4920 100644 --- a/src/mame/layout/wotw.lay +++ b/src/mame/layout/wotw.lay @@ -61,9 +61,9 @@ license:CC0 <bounds left="0" top="0" right="400" bottom="300" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="-50" y="0" width="500" height="300" /> - </overlay> + </element> </view> </mamelayout> diff --git a/src/mame/layout/yosakdon.lay b/src/mame/layout/yosakdon.lay index f329bf397ae..519b81e62f6 100644 --- a/src/mame/layout/yosakdon.lay +++ b/src/mame/layout/yosakdon.lay @@ -58,8 +58,8 @@ license:CC0 <screen index="0"> <bounds x="0" y="0" width="3" height="4" /> </screen> - <overlay element="overlay"> + <element ref="overlay" blend="multiply"> <bounds x="0" y="0" width="3" height="4" /> - </overlay> + </element> </view> </mamelayout> |