From b68c48f5f87890ad0faa940727036c388d3afeef Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 10 Sep 2020 05:23:47 +1000 Subject: Remove last remaining uses of elements in layouts, and print warning messages on encountering deprecated elements. --- scripts/build/complay.py | 12 +- src/emu/rendlay.cpp | 20 ++- src/mame/layout/gamecom.lay | 414 ++------------------------------------------ 3 files changed, 35 insertions(+), 411 deletions(-) diff --git a/scripts/build/complay.py b/scripts/build/complay.py index 9b3334d96c2..2fbc7667a8e 100755 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -97,7 +97,6 @@ class LayoutChecker(Minifyer): VARPATTERN = re.compile('^.*~[0-9A-Za-z_]+~.*$') FLOATCHARS = re.compile('^.*[.eE].*$') SHAPES = frozenset(('disk', 'dotmatrix', 'dotmatrix5dot', 'dotmatrixdot', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect')) - OBJECTS = frozenset(('backdrop', )) ORIENTATIONS = frozenset((0, 90, 180, 270)) YESNO = frozenset(('yes', 'no')) BLENDMODES = frozenset(('none', 'alpha', 'multiply', 'add')) @@ -452,12 +451,11 @@ class LayoutChecker(Minifyer): self.handlers.pop() def groupViewStartHandler(self, name, attrs): - if (name in self.OBJECTS) or ('element' == name): - refattr = 'ref' if 'element' == name else 'element' - if refattr not in attrs: - self.handleError('Element %s missing attribute %s' % (name, refattr)) - elif attrs[refattr] not in self.referenced_elements: - self.referenced_elements[attrs[refattr]] = self.formatLocation() + if 'element' == name: + if 'ref' not in attrs: + self.handleError('Element %s missing attribute ref' % (name, )) + elif attrs['ref'] not in self.referenced_elements: + self.referenced_elements[attrs['ref']] = self.formatLocation() if ('blend' in attrs) and (attrs['blend'] not in self.BLENDMODES) and not self.VARPATTERN.match(attrs['blend']): self.handleError('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend'])) if 'inputtag' in attrs: diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index c18d2d7a66e..7d9eed28bf3 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -3305,11 +3305,6 @@ void layout_view::add_items( else env.set_repeat_parameter(*itemnode, init); } - else if (!strcmp(itemnode->get_name(), "backdrop")) - { - layers.backdrops.emplace_back(env, *itemnode, elemmap, orientation, trans, color); - m_has_art = true; - } else if (!strcmp(itemnode->get_name(), "screen")) { layers.screens.emplace_back(env, *itemnode, elemmap, orientation, trans, color); @@ -3319,23 +3314,38 @@ void layout_view::add_items( layers.screens.emplace_back(env, *itemnode, elemmap, orientation, trans, color); m_has_art = true; } + else if (!strcmp(itemnode->get_name(), "backdrop")) + { + if (layers.backdrops.empty()) + osd_printf_warning("Warning: layout view '%s' contains deprecated backdrop element\n", name()); + layers.backdrops.emplace_back(env, *itemnode, elemmap, orientation, trans, color); + m_has_art = true; + } else if (!strcmp(itemnode->get_name(), "overlay")) { + if (layers.overlays.empty()) + osd_printf_warning("Warning: layout view '%s' contains deprecated overlay element\n", name()); layers.overlays.emplace_back(env, *itemnode, elemmap, orientation, trans, color); m_has_art = true; } else if (!strcmp(itemnode->get_name(), "bezel")) { + if (layers.bezels.empty()) + osd_printf_warning("Warning: layout view '%s' contains deprecated bezel element\n", name()); layers.bezels.emplace_back(env, *itemnode, elemmap, orientation, trans, color); m_has_art = true; } else if (!strcmp(itemnode->get_name(), "cpanel")) { + if (layers.cpanels.empty()) + osd_printf_warning("Warning: layout view '%s' contains deprecated cpanel element\n", name()); layers.cpanels.emplace_back(env, *itemnode, elemmap, orientation, trans, color); m_has_art = true; } else if (!strcmp(itemnode->get_name(), "marquee")) { + if (layers.marquees.empty()) + osd_printf_warning("Warning: layout view '%s' contains deprecated marquee element\n", name()); layers.marquees.emplace_back(env, *itemnode, elemmap, orientation, trans, color); m_has_art = true; } diff --git a/src/mame/layout/gamecom.lay b/src/mame/layout/gamecom.lay index 7342be3c3eb..ae90327c3eb 100644 --- a/src/mame/layout/gamecom.lay +++ b/src/mame/layout/gamecom.lay @@ -5,409 +5,25 @@ license:CC0 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-70-g09d2