Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 04:43:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

-render.cpp: Fixed issue causing elements to be clipped on bottom/right.

Browse Source 
-rendlay.cpp: Tidied up and optimised ellipse drawing code a little.

-Reduced space between LEDs on several systems with matrix displays.
This commit is contained in:
Vas Crabb 2020-10-14 21:26:08 +11:00
parent 459b3ac3c0
commit 01b907bf70
15 changed files with 85 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/render.cpp
View File

@ -2527,20 +2527,14 @@ void render_target::add_element_primitives(render_primitive_list &list, const ob
prim->full_bounds = prim->bounds;
if (xform.orientation & ORIENTATION_SWAP_XY)
std::swap(width, height);
width = std::min(width, m_maxtexwidth);
height = std::min(height, m_maxtexheight);
width = (std::min)(width, m_maxtexwidth);
height = (std::min)(height, m_maxtexheight);
// get the scaled texture and append it
texture->get_scaled(width, height, prim->texture, list, prim->flags);
// compute the clip rect
render_bounds cliprect;
cliprect.x0 = render_round_nearest(xform.xoffs);
cliprect.y0 = render_round_nearest(xform.yoffs);
cliprect.x1 = render_round_nearest(xform.xoffs + xform.xscale);
cliprect.y1 = render_round_nearest(xform.yoffs + xform.yscale);
cliprect &= m_bounds;
render_bounds cliprect = prim->bounds & m_bounds;
// determine UV coordinates and apply clipping
prim->texcoords = oriented_texcoords[xform.orientation];

143
src/emu/rendlay.cpp
View File

@ -97,6 +97,29 @@ inline void render_bounds_transform(render_bounds &bounds, layout_group::transfo
(bounds.x1 * trans[1][0]) + (bounds.y1 * trans[1][1]) + trans[1][2] };
}
inline void alpha_blend(u32 &dest, u32 a, u32 r, u32 g, u32 b, u32 inva)
{
rgb_t const dpix(dest);
u32 const da(dpix.a());
u32 const finala((a * 255) + (da * inva));
u32 const finalr(r + (u32(dpix.r()) * da * inva));
u32 const finalg(g + (u32(dpix.g()) * da * inva));
u32 const finalb(b + (u32(dpix.b()) * da * inva));
dest = rgb_t(finala / 255, finalr / finala, finalg / finala, finalb / finala);
}
inline void alpha_blend(u32 &dest, render_color const &c, float fill)
{
u32 const a(c.a * fill * 255.0F);
if (a)
{
u32 const r(u32(c.r * (255.0F * 255.0F)) * a);
u32 const g(u32(c.g * (255.0F * 255.0F)) * a);
u32 const b(u32(c.b * (255.0F * 255.0F)) * a);
alpha_blend(dest, a, r, g, b, 255 - a);
}
}
//**************************************************************************
@ -1979,17 +2002,7 @@ protected:
{
u32 *dst(&dest.pix(y, bounds.left()));
for (u32 x = bounds.left(); x <= bounds.right(); ++x, ++dst)
{
rgb_t const dpix(*dst);
u32 const da(dpix.a());
u32 const finala((a * 255) + (da * inva));
u32 const finalr(r + (u32(dpix.r()) * da * inva));
u32 const finalg(g + (u32(dpix.g()) * da * inva));
u32 const finalb(b + (u32(dpix.b()) * da * inva));
// store the target pixel, dividing the RGBA values by the overall scale factor
*dst = rgb_t(finala / 255, finalr / finala, finalg / finala, finalb / finala);
}
alpha_blend(*dst, a, r, g, b, inva);
}
}
}
@ -2017,6 +2030,8 @@ public:
u32 const g(c.g * c.a * (255.0F * 255.0F * 255.0F));
u32 const b(c.b * c.a * (255.0F * 255.0F * 255.0F));
u32 const inva(255 - a);
if (!a)
return;
// calculate the position and size
render_bounds const curbounds = bounds(state);
@ -2030,28 +2045,25 @@ public:
if (miny == maxy)
{
// fits in a single row of pixels - integrate entire area of ellipse
float const scale = xradius * yradius * 0.5F;
s32 const minx = s32(curbounds.x0 * float(dest.width()));
s32 const maxx = s32(std::ceil(curbounds.x1 * float(dest.width()))) - 1;
float x1 = (xcenter - float(minx)) / xradius;
float x1 = (float(minx) - xcenter) / xradius;
u32 *dst = &dest.pix(miny, minx);
for (s32 x = minx; maxx >= x; ++x, ++dst)
{
float const x0 = x1;
x1 = (xcenter - float(x + 1)) / xradius;
float val = 0.0F;
if (float(x) < xcenter)
val += integral((std::min)(x0, 1.0F)) - integral((std::max)(x1, 0.0F));
if (float(x + 1) > xcenter)
val += integral((std::min)(-x1, 1.0F)) - integral((std::max)(-x0, 0.0F));
val *= xradius * yradius * 0.5F;
x1 = (float(x + 1) - xcenter) / xradius;
float const val = integral((std::max)(x0, -1.0F), (std::min)(x1, 1.0F)) * scale;
alpha_blend(*dst, c, val);
}
}
else
{
float const scale = xradius * yradius * 0.25F;
float const ooyradius2 = 1.0F / (yradius * yradius);
auto const draw_edge_row =
[this, &dest, &c, &curbounds, xcenter, xradius, yradius, ooyradius2] (s32 row, float ycoord, bool cross_axis)
[this, &dest, &c, &curbounds, xcenter, xradius, scale, ooyradius2] (s32 row, float ycoord, bool cross_axis)
{
float const xval = xradius * std::sqrt(1.0F - (ycoord * ycoord) * ooyradius2);
float const l = xcenter - xval;
@ -2060,18 +2072,13 @@ public:
{
s32 minx = s32(l);
s32 maxx = s32(std::ceil(r)) - 1;
float x1 = xcenter - float(minx);
float x1 = float(minx) - xcenter;
u32 *dst = &dest.pix(row, minx);
for (s32 x = minx; maxx >= x; ++x, ++dst)
{
float const x0 = x1;
x1 = xcenter - float(x + 1);
float val = 0.0F;
if (float(x) < xcenter)
val += integral((std::min)(x0, xval) / xradius) - integral((std::max)(x1, 0.0F) / xradius);
if (float(x + 1) > xcenter)
val += integral((std::min)(-x1, xval) / xradius) - integral((std::max)(-x0, 0.0F) / xradius);
val *= xradius * yradius * 0.25F;
x1 = float(x + 1) - xcenter;
float val = integral((std::max)(x0, -xval) / xradius, (std::min)(x1, xval) / xradius) * scale;
val -= ((std::min)(float(x + 1), r) - (std::max)(float(x), l)) * ycoord;
alpha_blend(*dst, c, val);
}
@ -2080,26 +2087,22 @@ public:
{
s32 const minx = s32(curbounds.x0 * float(dest.width()));
s32 const maxx = s32(std::ceil(curbounds.x1 * float(dest.width()))) - 1;
float x1 = (xcenter - float(minx)) / xradius;
float x1 = (float(minx) - xcenter) / xradius;
u32 *dst = &dest.pix(row, minx);
for (s32 x = minx; maxx >= x; ++x, ++dst)
{
float const x0 = x1;
x1 = (xcenter - float(x + 1)) / xradius;
float val = 0.0F;
if (float(x) < xcenter)
val += integral((std::min)(x0, 1.0F)) - integral((std::max)(x1, 0.0F));
if (float(x + 1) > xcenter)
val += integral((std::min)(-x1, 1.0F)) - integral((std::max)(-x0, 0.0F));
x1 = (float(x + 1) - xcenter) / xradius;
float val = integral((std::max)(x0, -1.0F), (std::min)(x1, 1.0F));
if (float(x + 1) <= l)
val += integral((std::min)(x0, 1.0F)) - integral(x1);
val += integral((std::max)(x0, -1.0F), x1);
else if (float(x) <= l)
val += integral((std::min)(x0, 1.0F)) - integral(xval / xradius);
val += integral((std::max)(x0, -1.0F), -xval / xradius);
if (float(x) >= r)
val += integral((std::min)(-x1, 1.0F)) - integral(-x0);
val += integral(x0, (std::min)(x1, 1.0F));
else if (float(x + 1) >= r)
val += integral((std::min)(-x1, 1.0F)) - integral(xval / xradius);
val *= xradius * yradius * 0.25F;
val += integral(xval / xradius, (std::min)(x1, 1.0F));
val *= scale;
val -= (std::max)(((std::min)(float(x + 1), r) - (std::max)(float(x), l)), 0.0F) * ycoord;
alpha_blend(*dst, c, val);
}
@ -2139,14 +2142,14 @@ public:
{
float val = 0.0F;
if (float(x + 1) <= l0)
val += integral((xcenter - (std::max)(float(x), l1)) / xradius) - integral((xcenter - float(x + 1)) / xradius);
val += integral((xcenter - float(x + 1)) / xradius, (xcenter - (std::max)(float(x), l1)) / xradius);
else if (float(x) <= l0)
val += integral((xcenter - (std::max)(float(x), l1)) / xradius) - integral((xcenter - l0) / xradius);
val += integral((xcenter - l0) / xradius, (xcenter - (std::max)(float(x), l1)) / xradius);
else if (float(x) >= r0)
val += integral(((std::min)(float(x + 1), r1) - xcenter) / xradius) - integral((float(x) - xcenter) / xradius);
val += integral((float(x) - xcenter) / xradius, ((std::min)(float(x + 1), r1) - xcenter) / xradius);
else if (float(x + 1) >= r0)
val += integral(((std::min)(float(x + 1), r1) - xcenter) / xradius) - integral((r0 - xcenter) / xradius);
val *= xradius * yradius * 0.25F;
val += integral((r0 - xcenter) / xradius, ((std::min)(float(x + 1), r1) - xcenter) / xradius);
val *= scale;
if (float(x) <= l0)
val -= ((std::min)(float(x + 1), l0) - (std::max)(float(x), l1)) * ycoord1;
else if (float(x + 1) >= r0)
@ -2182,22 +2185,22 @@ public:
{
float val = 0.0F;
if (float(x + 1) <= l0)
val += integral((std::min)((xcenter - float(x)) / xradius, 1.0F)) - integral((xcenter - float(x + 1)) / xradius);
val += integral((xcenter - float(x + 1)) / xradius, (std::min)((xcenter - float(x)) / xradius, 1.0F));
else if (float(x) <= l0)
val += integral((std::min)((xcenter - float(x)) / xradius, 1.0F)) - integral((xcenter - l0) / xradius);
val += integral((xcenter - l0) / xradius, (std::min)((xcenter - float(x)) / xradius, 1.0F));
else if (float(x) >= r0)
val += integral((std::min)((float(x + 1) - xcenter) / xradius, 1.0F)) - integral((float(x) - xcenter) / xradius);
val += integral((float(x) - xcenter) / xradius, (std::min)((float(x + 1) - xcenter) / xradius, 1.0F));
else if (float(x + 1) >= r0)
val += integral((std::min)((float(x + 1) - xcenter) / xradius, 1.0F)) - integral((r0 - xcenter) / xradius);
val += integral((r0 - xcenter) / xradius, (std::min)((float(x + 1) - xcenter) / xradius, 1.0F));
if (float(x + 1) <= l1)
val += integral((std::min)((xcenter - float(x)) / xradius, 1.0F)) - integral((xcenter - float(x + 1)) / xradius);
val += integral((xcenter - float(x + 1)) / xradius, (std::min)((xcenter - float(x)) / xradius, 1.0F));
else if (float(x) <= l1)
val += integral((std::min)((xcenter - float(x)) / xradius, 1.0F)) - integral((xcenter - l1) / xradius);
val += integral((xcenter - l1) / xradius, (std::min)((xcenter - float(x)) / xradius, 1.0F));
else if (float(x) >= r1)
val += integral((std::min)((float(x + 1) - xcenter) / xradius, 1.0F)) - integral((float(x) - xcenter) / xradius);
val += integral((float(x) - xcenter) / xradius, (std::min)((float(x + 1) - xcenter) / xradius, 1.0F));
else if (float(x + 1) >= r1)
val += integral((std::min)((float(x + 1) - xcenter) / xradius, 1.0F)) - integral((r1 - xcenter) / xradius);
val *= xradius * yradius * 0.25F;
val += integral((r1 - xcenter) / xradius, (std::min)((float(x + 1) - xcenter) / xradius, 1.0F));
val *= scale;
val += (std::max)(((std::min)(float(x + 1), r0) - (std::max)(float(x), l0)), 0.0F) * (ycenter - float(y));
val += (std::max)(((std::min)(float(x + 1), r1) - (std::max)(float(x), l1)), 0.0F) * (float(y + 1) - ycenter);
alpha_blend(*dst, c, val);
@ -2232,14 +2235,14 @@ public:
{
float val = 0.0F;
if (float(x + 1) <= l1)
val += integral((xcenter - (std::max)(float(x), l0)) / xradius) - integral((xcenter - float(x + 1)) / xradius);
val += integral((xcenter - float(x + 1)) / xradius, (xcenter - (std::max)(float(x), l0)) / xradius);
else if (float(x) <= l1)
val += integral((xcenter - (std::max)(float(x), l0)) / xradius) - integral((xcenter - l1) / xradius);
val += integral((xcenter - l1) / xradius, (xcenter - (std::max)(float(x), l0)) / xradius);
else if (float(x) >= r1)
val += integral(((std::min)(float(x + 1), r0) - xcenter) / xradius) - integral((float(x) - xcenter) / xradius);
val += integral((float(x) - xcenter) / xradius, ((std::min)(float(x + 1), r0) - xcenter) / xradius);
else if (float(x + 1) >= r1)
val += integral(((std::min)(float(x + 1), r0) - xcenter) / xradius) - integral((r1 - xcenter) / xradius);
val *= xradius * yradius * 0.25F;
val += integral((r1 - xcenter) / xradius, ((std::min)(float(x + 1), r0) - xcenter) / xradius);
val *= scale;
if (float(x) <= l1)
val -= ((std::min)(float(x + 1), l1) - (std::max)(float(x), l0)) * ycoord0;
else if (float(x + 1) >= r1)
@ -2256,27 +2259,9 @@ public:
}
private:
void alpha_blend(u32 &dest, render_color const &c, float fill)
static float integral(float x0, float x1)
{
u32 const a(c.a * fill * 255.0F);
if (a)
{
u32 const r(u32(c.r * (255.0F * 255.0F)) * a);
u32 const g(u32(c.g * (255.0F * 255.0F)) * a);
u32 const b(u32(c.b * (255.0F * 255.0F)) * a);
alpha_blend(dest, a, r, g, b, 255 - a);
}
}
void alpha_blend(u32 &dest, u32 a, u32 r, u32 g, u32 b, u32 inva)
{
rgb_t const dpix(dest);
u32 const da(dpix.a());
u32 const finala((a * 255) + (da * inva));
u32 const finalr(r + (u32(dpix.r()) * da * inva));
u32 const finalg(g + (u32(dpix.g()) * da * inva));
u32 const finalb(b + (u32(dpix.b()) * da * inva));
dest = rgb_t(finala / 255, finalr / finala, finalg / finala, finalb / finala);
return integral(x1) - integral(x0);
}
static float integral(float x)

2
src/mame/layout/brkball.lay
View File

@ -9,7 +9,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

11
src/mame/layout/cgang.lay
View File

@ -7,7 +7,6 @@ license:CC0
<!-- define elements -->
<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
<element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element>
<element name="white"><rect><color red="0.9" green="0.9" blue="0.92" /></rect></element>
<element name="gray2"><rect><color red="0.12" green="0.12" blue="0.12" /></rect></element>
<element name="yellow"><rect><color red="0.9" green="0.9" blue="0.15" /></rect></element>
@ -113,6 +112,10 @@ license:CC0
</element>
<element name="ledg" defstate="0">
<disk>
<bounds left="-0.5" top="-0.5" right="1.5" bottom="1.5" />
<color red="0" green="0" blue="0" />
</disk>
<disk state="0"><color red="0.2" green="0.4" blue="0.17" /></disk>
<disk state="1"><color red="0.5" green="1.0" blue="0.4" /></disk>
</element>
@ -423,13 +426,11 @@ license:CC0
<element name="misc_lamp10" ref="led2p"><bounds x="4.5" y="0.5" width="2" height="2" /></element>
<element ref="text_start1"><bounds x="9" y="0.55" width="5" height="1.9" /></element>
<element ref="blackd"><bounds x="14.5" y="0" width="3" height="3" /></element>
<element name="misc_lamp0" ref="ledg"><bounds x="15" y="0.5" width="2" height="2" /></element>
<element name="misc_lamp0" ref="ledg"><bounds x="14.5" y="0" width="3" height="3" /></element>
<element ref="hlb" inputtag="IN1" inputmask="0x10"><bounds x="14.5" y="0" width="3" height="3" /><color alpha="0.2" /></element>
<element ref="text_start2"><bounds x="18.5" y="0.55" width="5" height="1.9" /></element>
<element ref="blackd"><bounds x="24.0" y="0" width="3" height="3" /></element>
<element name="misc_lamp1" ref="ledg"><bounds x="24.5" y="0.5" width="2" height="2" /></element>
<element name="misc_lamp1" ref="ledg"><bounds x="24" y="0" width="3" height="3" /></element>
<element ref="hlb" inputtag="IN1" inputmask="0x08"><bounds x="24.0" y="0" width="3" height="3" /><color alpha="0.2" /></element>
</group>

2
src/mame/layout/esq2by16.lay
View File

@ -34,7 +34,7 @@ license:CC0
<element name="dotrow">
<rect>
<bounds x="-0.1" width="5.6" y="-0.1" height="1.2" />
<bounds x="-0.05" width="5.55" y="-0.05" height="1.1" />
<color red="0.0" green="0.0" blue="0.0" />
</rect>
<disk state="0" statemask="0x01">

2
src/mame/layout/hp9825.lay
View File

@ -7,7 +7,7 @@ Hewlett-Packard 9825 Layout
<mamelayout version="2">
<element name="dotmatrix5dot">
<rect>
<bounds x="-0.1" width="5.6" y="-0.1" height="1.2" />
<bounds x="-0.05" width="5.55" y="-0.05" height="1.1" />
<color red="0.0" green="0.0" blue="0.0" />
</rect>
<disk state="0" statemask="0x01">

2
src/mame/layout/sc2_dmd.lay
View File

@ -20,7 +20,7 @@ license:CC0
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2copcl7.lay
View File

@ -2101,7 +2101,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2cpe.lay
View File

@ -2127,7 +2127,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2prem2.lay
View File

@ -2187,7 +2187,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2prom.lay
View File

@ -1611,7 +1611,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2ptytm1.lay
View File

@ -1155,7 +1155,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc2town2.lay
View File

@ -1889,7 +1889,7 @@
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="1.0" blue="1.0" />

2
src/mame/layout/sc4_dmd.lay
View File

@ -89,7 +89,7 @@ license:CC0
<element name="dotmatrixdot">
<rect>
<color red="0" green="0" blue="0" />
<bounds left="-0.1" top="-0.1" right="1.1" bottom="1.1" />
<bounds left="-0.05" top="-0.05" right="1.05" bottom="1.05" />
</rect>
<disk>
<color state="1" red="1.0" green="0.0" blue="0.0" />

2
src/mame/layout/tecnbras.lay
View File

@ -5,7 +5,7 @@ license:CC0
<mamelayout version="2">
<element name="dotmatrix5dot">
<rect>
<bounds x="-0.1" width="5.6" y="-0.1" height="1.2" />
<bounds x="-0.05" width="5.55" y="-0.05" height="1.1" />
<color red="0.0" green="0.0" blue="0.0" />
</rect>
<disk state="0" statemask="0x01">