Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 13:34:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow per-layer blend modes supplied by driver for screens, as required

Browse Source 
for Laserdisc overlays.

This is a change in behaviour, and it means that games like Golly!
Ghost! will need an explicit blend mode specified in the XML.  I'm not
entirely happy with the situation, but a better, more general solution
than this would require some serious refactoring to MAME's renderer.
This commit is contained in:
Vas Crabb 2019-07-27 23:24:37 +10:00
parent 39736aea96
commit 2032eb60a6
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/techspecs/layout_files.rst
View File

@ -650,9 +650,9 @@ flipy
Screens (``screen`` elements) and layout elements (``element`` elements) may
have a ``blend`` attribute to set the blending mode. Supported values are
``none`` (no blending), ``alpha`` (alpha blending), ``multiply`` (RGB
multiplication), and ``add`` (additive blending). The default blending mode for
screens is additive blending, and the default blending mode for layout elements
is alpha blending.
multiplication), and ``add`` (additive blending). The default for screens is to
allow the driver to specify blending per layer; the default blending mode for
layout elements is alpha blending.
Screens (``screen`` elements), layout elements (``element`` elements) and groups
(``group`` elements) may be positioned and sized using a ``bounds`` child

20
src/emu/rendlay.cpp
View File

@ -2971,22 +2971,11 @@ layout_view::layout_view(
add_items(layers, local, viewnode, elemmap, groupmap, ROT0, identity_transform, render_color{ 1.0F, 1.0F, 1.0F, 1.0F }, true, false, true);
// deal with legacy element groupings
bool legacy(true);
for (auto it = layers.screens.begin(); (layers.screens.end() != it) && legacy; ++it)
{
if (!it->screen())
legacy = false;
}
if (!layers.overlays.empty() || (layers.backdrops.size() <= 1))
{
// screens (none) + overlays (RGB multiply) + backdrop (add) + bezels (alpha) + cpanels (alpha) + marquees (alpha)
// screens (-1) + overlays (RGB multiply) + backdrop (add) + bezels (alpha) + cpanels (alpha) + marquees (alpha)
for (item &backdrop : layers.backdrops)
backdrop.set_blend_mode(BLENDMODE_ADD);
if (legacy)
{
for (item &screen : layers.screens)
screen.set_blend_mode(BLENDMODE_NONE);
}
m_items.splice(m_items.end(), layers.screens);
m_items.splice(m_items.end(), layers.overlays);
m_items.splice(m_items.end(), layers.backdrops);
@ -2998,6 +2987,11 @@ layout_view::layout_view(
{
// multiple backdrop pieces and no overlays (Golly! Ghost! mode):
// backdrop (alpha) + screens (add) + bezels (alpha) + cpanels (alpha) + marquees (alpha)
for (item &screen : layers.screens)
{
if (screen.blend_mode() == -1)
screen.set_blend_mode(BLENDMODE_ADD);
}
m_items.splice(m_items.end(), layers.backdrops);
m_items.splice(m_items.end(), layers.screens);
m_items.splice(m_items.end(), layers.bezels);
@ -3497,7 +3491,7 @@ int layout_view::item::get_blend_mode(environment &env, util::xml::data_node con
// fall back to implicit blend mode based on element type
if (!strcmp(itemnode.get_name(), "screen"))
return BLENDMODE_ADD;
return -1; // magic number recognised by render.cpp to allow per-element blend mode
else if (!strcmp(itemnode.get_name(), "overlay"))
return BLENDMODE_RGB_MULTIPLY;
else