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

Improvements to rgb_t (nw)

Browse Source 
- Make most class methods constexpr
- Make color constants (white, black, etc.) into constexpr factory methods, in order to fix a static initialization problem discussed on the MAMEWorld forums.
  (Note that while C++14 allows constexpr member variables to be initialized outside classes, current compilers' support for C++14 constexpr rules has proven to be lamentably deficient.)
- Create bitmap_rgb32::erase to simplify syntax in update handlers
This commit is contained in:
AJR 2016-10-23 00:22:00 +02:00
parent f1dcd36b73
commit 7d41a1f619
176 changed files with 381 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/c64/xl80.cpp
View File

@ -122,7 +122,7 @@ GFXDECODE_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_xl80 )
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*8)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1)

4
src/devices/bus/cbm2/hrg.cpp
View File

@ -85,7 +85,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_a )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 512)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1)
@ -106,7 +106,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_b )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)

4
src/devices/bus/compis/hrg.cpp
View File

@ -74,7 +74,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( compis_uhrg_t::display_pixels )
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( hrg )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate
@ -107,7 +107,7 @@ machine_config_constructor compis_hrg_t::device_mconfig_additions() const
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( uhrg )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate

2
src/devices/bus/comx35/clm.cpp
View File

@ -135,7 +135,7 @@ GFXDECODE_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( comx_clm )
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_SCREEN_SIZE(80*8, 24*8)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1)

2
src/devices/bus/ecbbus/grip.cpp
View File

@ -459,7 +459,7 @@ static MACHINE_CONFIG_FRAGMENT( grip )
MCFG_CPU_IO_MAP(grip_io)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)

2
src/devices/bus/iq151/minigraf.cpp
View File

@ -82,7 +82,7 @@ void iq151_minigraf_device::device_stop()
if (filerr == osd_file::error::NONE)
{
static const rgb_t png_palette[] = { rgb_t::white, rgb_t::black };
static const rgb_t png_palette[] = { rgb_t::white(), rgb_t::black() };
// save the paper into a png
png_write_bitmap(file, nullptr, *m_paper, 2, png_palette);

2
src/devices/bus/iq151/ms151a.cpp
View File

@ -81,7 +81,7 @@ void iq151_ms151a_device::device_stop()
if (filerr == osd_file::error::NONE)
{
static const rgb_t png_palette[] = { rgb_t::white, rgb_t::black };
static const rgb_t png_palette[] = { rgb_t::white(), rgb_t::black() };
// save the paper into a png
png_write_bitmap(file, nullptr, *m_paper, 2, png_palette);

4
src/devices/bus/pet/hsg.cpp
View File

@ -87,7 +87,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_a )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 512)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1)
@ -108,7 +108,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_b )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update)
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)

2
src/devices/bus/svi3x8/slot/sv806.cpp
View File

@ -38,7 +38,7 @@ const tiny_rom_entry *sv806_device::device_rom_region() const
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( sv806 )
MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192)
MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)

4
src/devices/bus/wangpc/lvc.cpp
View File

@ -69,7 +69,7 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
if (column == cursor_x) color = 0x03;
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black;
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black();
data <<= 1;
}
@ -91,7 +91,7 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
if (column == cursor_x) color = 0x03;
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black;
bitmap.pix32(vbp + y, hbp + x) = de ? m_palette[color] : rgb_t::black();
data <<= 1;
}

4
src/devices/bus/wangpc/mvc.cpp
View File

@ -48,7 +48,7 @@
static const rgb_t PALETTE_MVC[] =
{
rgb_t::black,
rgb_t::black(),
rgb_t(0x00, 0x80, 0x00),
rgb_t(0x00, 0xff, 0x00)
};
@ -114,7 +114,7 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
int color = ((BIT(data, 9) & ~ATTR_BLANK) ^ ATTR_REVERSE);
if ((color | bitmap.pix32(vbp + y, hbp + x)) & ATTR_BOLD) color = 2;
if (color) bitmap.pix32(vbp + y, hbp + x) = de ? PALETTE_MVC[color] : rgb_t::black;
if (color) bitmap.pix32(vbp + y, hbp + x) = de ? PALETTE_MVC[color] : rgb_t::black();
data <<= 1;
}

2
src/devices/bus/wangpc/tig.cpp
View File

@ -110,7 +110,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels )
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( wangpc_tig )
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update)
MCFG_SCREEN_SIZE(80*10, 25*12)
MCFG_SCREEN_VISIBLE_AREA(0, 80*10-1, 0, 25*12-1)

2
src/devices/cpu/tms34010/tms34010.cpp
View File

@ -1035,7 +1035,7 @@ uint32_t tms340x0_device::tms340x0_ind16(screen_device &screen, bitmap_ind16 &bi
uint32_t tms340x0_device::tms340x0_rgb32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
pen_t blackpen = rgb_t::black;
pen_t blackpen = rgb_t::black();
tms34010_display_params params;
int x;

4
src/devices/machine/s3c24xx.hxx
View File

@ -187,11 +187,11 @@ rgb_t S3C24_CLASS_NAME::s3c24xx_get_color_stn_01(uint8_t data)
{
if ((data & 1) == 0)
{
return rgb_t::black;
return rgb_t::black();
}
else
{
return rgb_t::white;
return rgb_t::white();
}
}

4
src/devices/machine/terminal.cpp
View File

@ -258,7 +258,7 @@ uint32_t generic_terminal_device::update(screen_device &device, bitmap_rgb32 &bi
m_palette->set_pen_color(1, rgb_t(0xf7, 0xaa, 0x00));
break;
case 0x020:
m_palette->set_pen_color(1, rgb_t::white);
m_palette->set_pen_color(1, rgb_t::white());
break;
default:
m_palette->set_pen_color(1, rgb_t(0x00, 0xff, 0x00));
@ -323,7 +323,7 @@ WRITE8_MEMBER( generic_terminal_device::kbd_put )
***************************************************************************/
static MACHINE_CONFIG_FRAGMENT( generic_terminal )
MCFG_SCREEN_ADD_MONOCHROME(TERMINAL_SCREEN_TAG, RASTER, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME(TERMINAL_SCREEN_TAG, RASTER, rgb_t::white())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(TERMINAL_WIDTH*8, TERMINAL_HEIGHT*10)

2
src/devices/sound/cdp1864.cpp
View File

@ -414,7 +414,7 @@ uint32_t cdp1864_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
}
else
{
bitmap.fill(rgb_t::black, cliprect);
bitmap.erase(cliprect);
}
return 0;

4
src/devices/video/cdp1861.cpp
View File

@ -201,7 +201,7 @@ WRITE8_MEMBER( cdp1861_device::dma_w )
for (x = 0; x < 8; x++)
{
pen_t color = BIT(data, 7) ? rgb_t::white : rgb_t::black;
pen_t color = BIT(data, 7) ? rgb_t::white() : rgb_t::black();
m_bitmap.pix32(y, sx + x) = color;
data <<= 1;
}
@ -247,7 +247,7 @@ uint32_t cdp1861_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
}
else
{
bitmap.fill(rgb_t::black, cliprect);
bitmap.erase(cliprect);
}
return 0;
}

2
src/devices/video/crt9021.cpp
View File

@ -181,7 +181,7 @@ WRITE_LINE_MEMBER( crt9021_t::vsync_w )
uint32_t crt9021_t::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
m_bitmap.fill(rgb_t::black, cliprect);
m_bitmap.erase(cliprect);
return 0;
}

2
src/devices/video/hd66421.cpp
View File

@ -263,7 +263,7 @@ PALETTE_INIT_MEMBER(hd66421_device, hd66421)
// init palette
for (int i = 0; i < 4; i++)
{
palette.set_pen_color(i, rgb_t::white);
palette.set_pen_color(i, rgb_t::white());
#ifndef HD66421_BRIGHTNESS_DOES_NOT_WORK
palette.set_pen_contrast(i, 1.0 * i / (4 - 1));
#endif

2
src/devices/video/i8275.cpp
View File

@ -647,7 +647,7 @@ uint32_t i8275_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
{
if (!(m_status & ST_VE))
{
m_bitmap.fill(rgb_t::black);
m_bitmap.erase(cliprect);
}
copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);

4
src/devices/video/mc6845.cpp
View File

@ -1501,7 +1501,7 @@ machine_config_constructor mos8563_device::device_mconfig_additions() const
// VICE palette
PALETTE_INIT_MEMBER(mos8563_device, mos8563)
{
palette.set_pen_color(0, rgb_t::black);
palette.set_pen_color(0, rgb_t::black());
palette.set_pen_color(1, rgb_t(0x55, 0x55, 0x55));
palette.set_pen_color(2, rgb_t(0x00, 0x00, 0xaa));
palette.set_pen_color(3, rgb_t(0x55, 0x55, 0xff));
@ -1516,7 +1516,7 @@ PALETTE_INIT_MEMBER(mos8563_device, mos8563)
palette.set_pen_color(12, rgb_t(0xaa, 0x55, 0x00));
palette.set_pen_color(13, rgb_t(0xff, 0xff, 0x55));
palette.set_pen_color(14, rgb_t(0xaa, 0xaa, 0xaa));
palette.set_pen_color(15, rgb_t::white);
palette.set_pen_color(15, rgb_t::white());
}

2
src/devices/video/scn2674.cpp
View File

@ -776,7 +776,7 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
uint32_t scn2674_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
if (!m_display_enabled)
m_bitmap.fill(rgb_t::black);
m_bitmap.erase(cliprect);
else
copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);

2
src/devices/video/snes_ppu.cpp
View File

@ -1830,7 +1830,7 @@ void snes_ppu_device::refresh_scanline( bitmap_rgb32 &bitmap, uint16_t curline )
if (m_screen_disabled) /* screen is forced blank */
for (x = 0; x < SNES_SCR_WIDTH * 2; x++)
bitmap.pix32(curline, x) = rgb_t::black;
bitmap.pix32(curline, x) = rgb_t::black();
else
{
/* Update clip window masks if necessary */

6
src/devices/video/tms9928a.cpp
View File

@ -668,8 +668,8 @@ void tms9928a_device::set_palette()
*/
static const rgb_t tms9928a_palette[TMS9928A_PALETTE_SIZE] =
{
rgb_t::black,
rgb_t::black,
rgb_t::black(),
rgb_t::black(),
rgb_t(33, 200, 66),
rgb_t(94, 220, 120),
rgb_t(84, 85, 237),
@ -683,7 +683,7 @@ void tms9928a_device::set_palette()
rgb_t(33, 176, 59),
rgb_t(201, 91, 186),
rgb_t(204, 204, 204),
rgb_t::white
rgb_t::white()
};
/* copy default palette into working palette */

2
src/emu/crsshair.cpp
View File

@ -168,7 +168,7 @@ void render_crosshair::set_default_bitmap()
void render_crosshair::create_bitmap()
{
int x, y;
rgb_t color = m_player < ARRAY_LENGTH(crosshair_colors) ? crosshair_colors[m_player] : rgb_t::white;
rgb_t color = m_player < ARRAY_LENGTH(crosshair_colors) ? crosshair_colors[m_player] : rgb_t::white();
// if we have a bitmap and texture for this player, kill it
if (m_bitmap == nullptr)

2
src/emu/drivers/empty.cpp
View File

@ -32,7 +32,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bitmap.fill(rgb_t::black);
bitmap.erase(cliprect);
return 0;
}
};

20
src/emu/emupal.cpp
View File

@ -462,7 +462,7 @@ void palette_device::device_start()
for (int color = 0; color < m_indirect_entries; color++)
{
// alpha = 0 ensures change is detected the first time set_indirect_color() is called
m_indirect_colors[color] = rgb_t::transparent;
m_indirect_colors[color] = rgb_t::transparent();
}
m_indirect_pens.resize(m_entries);
@ -594,8 +594,8 @@ void palette_device::allocate_palette()
// 32-bit direct case
case BITMAP_FORMAT_RGB32:
m_black_pen = rgb_t::black;
m_white_pen = rgb_t::white;
m_black_pen = rgb_t::black();
m_white_pen = rgb_t::white();
break;
// screenless case
@ -742,7 +742,7 @@ void palette_device::palette_init_all_black(palette_device &palette)
{
for (int i = 0; i < palette.entries(); i++)
{
palette.set_pen_color(i, rgb_t::black);
palette.set_pen_color(i, rgb_t::black());
}
}
@ -753,8 +753,8 @@ void palette_device::palette_init_all_black(palette_device &palette)
void palette_device::palette_init_monochrome(palette_device &palette)
{
palette.set_pen_color(0, rgb_t::black);
palette.set_pen_color(1, rgb_t::white);
palette.set_pen_color(0, rgb_t::black());
palette.set_pen_color(1, rgb_t::white());
}
@ -764,8 +764,8 @@ void palette_device::palette_init_monochrome(palette_device &palette)
void palette_device::palette_init_monochrome_inverted(palette_device &palette)
{
palette.set_pen_color(0, rgb_t::white);
palette.set_pen_color(1, rgb_t::black);
palette.set_pen_color(0, rgb_t::white());
palette.set_pen_color(1, rgb_t::black());
}
@ -775,9 +775,9 @@ void palette_device::palette_init_monochrome_inverted(palette_device &palette)
void palette_device::palette_init_monochrome_highlight(palette_device &palette)
{
palette.set_pen_color(0, rgb_t::black);
palette.set_pen_color(0, rgb_t::black());
palette.set_pen_color(1, rgb_t(0xc0, 0xc0, 0xc0));
palette.set_pen_color(2, rgb_t::white);
palette.set_pen_color(2, rgb_t::white());
}

2
src/frontend/mame/cheat.cpp
View File

@ -1242,7 +1242,7 @@ void cheat_manager::render_text(mame_ui_manager &mui, render_container &containe
mui.draw_text_full(container, m_output[linenum].c_str(),
0.0f, (float)linenum * mui.get_line_height(), 1.0f,
m_justify[linenum], ui::text_layout::NEVER, mame_ui_manager::OPAQUE_,
rgb_t::white, rgb_t::black, nullptr, nullptr);
rgb_t::white(), rgb_t::black(), nullptr, nullptr);
}
}

4
src/frontend/mame/ui/custmenu.cpp
View File

@ -210,7 +210,7 @@ void menu_custom_filter::custom_render(void *selectedref, float top, float botto
// get the size of the text
ui().draw_text_full(container(), _("Select custom filters:"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
float maxwidth = std::max(width, origx2 - origx1);
@ -525,7 +525,7 @@ void menu_swcustom_filter::custom_render(void *selectedref, float top, float bot
// get the size of the text
ui().draw_text_full(container(), _("Select custom filters:"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
float maxwidth = std::max(width, origx2 - origx1);

20
src/frontend/mame/ui/custui.cpp
View File

@ -165,7 +165,7 @@ void menu_custom_ui::custom_render(void *selectedref, float top, float bottom, f
float width;
ui().draw_text_full(container(), _("Custom UI Settings"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);
@ -381,7 +381,7 @@ void menu_font_ui::custom_render(void *selectedref, float top, float bottom, flo
std::string topbuf(_("UI Fonts Settings"));
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);
@ -408,7 +408,7 @@ void menu_font_ui::custom_render(void *selectedref, float top, float bottom, flo
topbuf = _("Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::LEFT, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr, m_info_size);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr, m_info_size);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(origx2 - origx1, width);
@ -539,7 +539,7 @@ void menu_colors_ui::custom_render(void *selectedref, float top, float bottom, f
std::string topbuf(_("UI Colors Settings"));
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
@ -567,7 +567,7 @@ void menu_colors_ui::custom_render(void *selectedref, float top, float bottom, f
topbuf = string_format(_("Double click or press %1$s to change the color value"), ui_select_text);
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
@ -593,7 +593,7 @@ void menu_colors_ui::custom_render(void *selectedref, float top, float bottom, f
topbuf = _("Menu Preview");
ui().draw_text_full(container(), topbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
maxwidth = width + 2.0f * UI_BOX_LR_BORDER;
std::string sampletxt[5];
@ -607,7 +607,7 @@ void menu_colors_ui::custom_render(void *selectedref, float top, float bottom, f
for (auto & elem: sampletxt)
{
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
}
@ -880,7 +880,7 @@ void menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, floa
// top text
ui().draw_text_full(container(), m_title.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
@ -904,7 +904,7 @@ void menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, floa
std::string sampletxt(_("Color preview ="));
ui().draw_text_full(container(), sampletxt.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(origx2 - origx1, width);
@ -923,7 +923,7 @@ void menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, floa
// draw the normal text
ui().draw_text_full(container(), sampletxt.c_str(), x1, y1, width - UI_BOX_LR_BORDER, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NORMAL, rgb_t::white, rgb_t::black);
mame_ui_manager::NORMAL, rgb_t::white(), rgb_t::black());
x1 += width + UI_BOX_LR_BORDER;
y1 -= UI_BOX_TB_BORDER;

6
src/frontend/mame/ui/datmenu.cpp
View File

@ -296,7 +296,7 @@ void menu_dats_view::custom_render(void *selectedref, float top, float bottom, f
std::string driver = (m_issoft == true) ? m_swinfo->longname : m_driver->description;
ui().draw_text_full(container(), driver.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
@ -321,7 +321,7 @@ void menu_dats_view::custom_render(void *selectedref, float top, float bottom, f
for (auto & elem : m_items_list)
{
ui().draw_text_full(container(), elem.label.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
maxwidth += width;
}
@ -360,7 +360,7 @@ void menu_dats_view::custom_render(void *selectedref, float top, float bottom, f
// bottom
std::string revision;
revision.assign(_("Revision: ")).append(m_items_list[m_actual].revision);
ui().draw_text_full(container(), revision.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
ui().draw_text_full(container(), revision.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(origx2 - origx1, width);

12
src/frontend/mame/ui/dirmenu.cpp
View File

@ -117,7 +117,7 @@ void menu_directory::custom_render(void *selectedref, float top, float bottom, f
// get the size of the text
ui().draw_text_full(container(), _("Folders Setup"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
float maxwidth = std::max(width, origx2 - origx1);
@ -215,13 +215,13 @@ void menu_display_actual::custom_render(void *selectedref, float top, float bott
for (auto & elem : m_folders)
{
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::LEFT, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::LEFT, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
maxwidth = std::max(maxwidth, width);
}
// get the size of the text
ui().draw_text_full(container(), m_tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
ui().draw_text_full(container(), m_tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
maxwidth = std::max(width, maxwidth);
@ -492,7 +492,7 @@ void menu_add_change_folder::custom_render(void *selectedref, float top, float b
for (auto & elem : tempbuf)
{
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
maxwidth = std::max(width, maxwidth);
}
@ -523,7 +523,7 @@ void menu_add_change_folder::custom_render(void *selectedref, float top, float b
tempbuf[0] = _("Press TAB to set");
ui().draw_text_full(container(), tempbuf[0].c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
@ -628,7 +628,7 @@ void menu_remove_folder::custom_render(void *selectedref, float top, float botto
std::string tempbuf = string_format(_("Remove %1$s Folder"), _(s_folders[m_ref].name));
// get the size of the text
ui().draw_text_full(container(), tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
ui().draw_text_full(container(), tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
float maxwidth = std::max(width, origx2 - origx1);

8
src/frontend/mame/ui/menu.cpp
View File

@ -506,7 +506,7 @@ void menu::draw(uint32_t flags)
if (ui().show_fps_counter())
{
ui().draw_text_full(container(), machine().video().speed_text().c_str(), 0.0f, 0.0f, 1.0f,
ui::text_layout::RIGHT, ui::text_layout::WORD, mame_ui_manager::OPAQUE_, rgb_t::white, rgb_t::black, nullptr, nullptr);
ui::text_layout::RIGHT, ui::text_layout::WORD, mame_ui_manager::OPAQUE_, rgb_t::white(), rgb_t::black(), nullptr, nullptr);
}
bool const customonly = (flags & PROCESS_CUSTOM_ONLY);
@ -756,7 +756,7 @@ void menu::draw(uint32_t flags)
// compute the multi-line target width/height
ui().draw_text_full(container(), pitem.subtext.c_str(), 0, 0, visible_width * 0.75f,
ui::text_layout::RIGHT, ui::text_layout::WORD, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &target_width, &target_height);
ui::text_layout::RIGHT, ui::text_layout::WORD, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &target_width, &target_height);
// determine the target location
float const target_x = visible_left + visible_width - target_width - UI_BOX_LR_BORDER;
@ -801,7 +801,7 @@ void menu::draw_text_box()
// compute the multi-line target width/height
ui().draw_text_full(container(), text, 0, 0, 1.0f - 2.0f * UI_BOX_LR_BORDER - 2.0f * gutter_width,
ui::text_layout::LEFT, ui::text_layout::WORD, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &target_width, &target_height);
ui::text_layout::LEFT, ui::text_layout::WORD, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &target_width, &target_height);
target_height += 2.0f * line_height;
if (target_height > 1.0f - 2.0f * UI_BOX_TB_BORDER)
target_height = floorf((1.0f - 2.0f * UI_BOX_TB_BORDER) / line_height) * line_height;
@ -1226,7 +1226,7 @@ void menu::draw_background()
{
// draw background image if available
if (ui().options().use_background_image() && m_global_state->bgrnd_bitmap() && m_global_state->bgrnd_bitmap()->valid())
container().add_quad(0.0f, 0.0f, 1.0f, 1.0f, rgb_t::white, m_global_state->bgrnd_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container().add_quad(0.0f, 0.0f, 1.0f, 1.0f, rgb_t::white(), m_global_state->bgrnd_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}

4
src/frontend/mame/ui/miscmenu.cpp
View File

@ -814,7 +814,7 @@ void menu_machine_configure::custom_render(void *selectedref, float top, float b
for (auto & elem : text)
{
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
}
@ -960,7 +960,7 @@ void menu_plugins_configure::custom_render(void *selectedref, float top, float b
float width;
ui().draw_text_full(container(), _("Plugins"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);

2
src/frontend/mame/ui/optsmenu.cpp
View File

@ -297,7 +297,7 @@ void menu_game_options::custom_render(void *selectedref, float top, float bottom
{
float width;
ui().draw_text_full(container(), _("Settings"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);

4
src/frontend/mame/ui/selector.cpp
View File

@ -154,7 +154,7 @@ void menu_selector::custom_render(void *selectedref, float top, float bottom, fl
// get the size of the text
ui().draw_text_full(container(), tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += (2.0f * UI_BOX_LR_BORDER) + 0.01f;
float maxwidth = std::max(width, origx2 - origx1);
@ -182,7 +182,7 @@ void menu_selector::custom_render(void *selectedref, float top, float bottom, fl
tempbuf = string_format(_("Double click or press %1$s to select"), ui_select_text);
ui().draw_text_full(container(), tempbuf.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);

14
src/frontend/mame/ui/selmenu.cpp
View File

@ -212,7 +212,7 @@ void menu_select_launch::custom_render(void *selectedref, float top, float botto
{
float width;
ui().draw_text_full(container(), tempbuf[line].c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = (std::max)(width, maxwidth);
}
@ -366,7 +366,7 @@ void menu_select_launch::custom_render(void *selectedref, float top, float botto
{
float width;
ui().draw_text_full(container(), elem.c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::NEVER,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = (std::max)(maxwidth, width);
}
@ -567,7 +567,7 @@ void menu_select_launch::draw_toolbar(float x1, float y1, float x2, float y2)
if (mouse_hit && x1 <= mouse_x && x2 > mouse_x && y1 <= mouse_y && y2 > mouse_y)
{
hover = HOVER_B_FAV + z;
color = rgb_t::white;
color = rgb_t::white();
float ypos = y2 + ui().get_line_height() + 2.0f * UI_BOX_TB_BORDER;
ui().draw_text_box(container(), _(hover_msg[z]), ui::text_layout::CENTER, 0.5f, ypos, UI_BACKGROUND_COLOR);
}
@ -588,7 +588,7 @@ void menu_select_launch::draw_star(float x0, float y0)
{
float y1 = y0 + ui().get_line_height();
float x1 = x0 + ui().get_line_height() * container().manager().ui_aspect();
container().add_quad(x0, y0, x1, y1, rgb_t::white, m_cache->star_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_PACKABLE);
container().add_quad(x0, y0, x1, y1, rgb_t::white(), m_cache->star_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_PACKABLE);
}
@ -713,7 +713,7 @@ float menu_select_launch::draw_icon(int linenum, void *selectedref, float x0, fl
}
if (m_icons_bitmap[linenum] != nullptr && m_icons_bitmap[linenum]->valid())
container().add_quad(x0, y0, x1, y1, rgb_t::white, m_icons_texture[linenum], PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container().add_quad(x0, y0, x1, y1, rgb_t::white(), m_icons_texture[linenum], PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
return ud_arrow_width * 1.5f;
}
@ -1725,7 +1725,7 @@ std::string menu_select_launch::arts_render_common(float origx1, float origy1, f
float text_length;
ui().draw_text_full(container(),
_(arts_info[x].first), origx1, origy1, origx2 - origx1,
ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white, rgb_t::black,
ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(),
&text_length, nullptr);
title_size = (std::max)(text_length + 0.01f, title_size);
}
@ -1867,7 +1867,7 @@ void menu_select_launch::draw_snapx(float origx1, float origy1, float origx2, fl
float const y2 = origy2 - UI_BOX_TB_BORDER - line_height;
// apply texture
container().add_quad(x1, y1, x2, y2, rgb_t::white, m_cache->snapx_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container().add_quad(x1, y1, x2, y2, rgb_t::white(), m_cache->snapx_texture(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}
}

4
src/frontend/mame/ui/selsoft.cpp
View File

@ -1316,7 +1316,7 @@ void software_parts::custom_render(void *selectedref, float top, float bottom, f
{
float width;
ui().draw_text_full(container(), _("Software part selection:"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);
@ -1457,7 +1457,7 @@ void bios_selection::custom_render(void *selectedref, float top, float bottom, f
{
float width;
ui().draw_text_full(container(), _("Bios selection:"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);

4
src/frontend/mame/ui/simpleselgame.cpp
View File

@ -288,7 +288,7 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
// get the size of the text
ui().draw_text_full(container(), tempbuf[0].c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(width, origx2 - origx1);
@ -378,7 +378,7 @@ void simple_menu_select_game::custom_render(void *selectedref, float top, float
for (line = 0; line < 4; line++)
{
ui().draw_text_full(container(), tempbuf[line].c_str(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(maxwidth, width);
}

2
src/frontend/mame/ui/sliders.cpp
View File

@ -225,7 +225,7 @@ void menu_sliders::custom_render(void *selectedref, float top, float bottom, flo
// determine the text height
ui().draw_text_full(container(), tempstring.c_str(), 0, 0, x2 - x1 - 2.0f * UI_BOX_LR_BORDER,
ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white, rgb_t::black, nullptr, &text_height);
ui::text_layout::CENTER, ui::text_layout::TRUNCATE, mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), nullptr, &text_height);
// draw the thermometer
bar_left = x1 + UI_BOX_LR_BORDER;

2
src/frontend/mame/ui/sndmenu.cpp
View File

@ -146,7 +146,7 @@ void menu_sound_options::custom_render(void *selectedref, float top, float botto
{
float width;
ui().draw_text_full(container(), _("Sound Options"), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);

4
src/frontend/mame/ui/submenu.cpp
View File

@ -426,7 +426,7 @@ void submenu::custom_render(void *selectedref, float top, float bottom, float or
float width;
ui().draw_text_full(container(), _(m_options[0].description), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
float maxwidth = std::max(origx2 - origx1, width);
@ -454,7 +454,7 @@ void submenu::custom_render(void *selectedref, float top, float bottom, float or
if (selected_sm_option.entry != nullptr)
{
ui().draw_text_full(container(), selected_sm_option.entry->description(), 0.0f, 0.0f, 1.0f, ui::text_layout::CENTER, ui::text_layout::TRUNCATE,
mame_ui_manager::NONE, rgb_t::white, rgb_t::black, &width, nullptr);
mame_ui_manager::NONE, rgb_t::white(), rgb_t::black(), &width, nullptr);
width += 2 * UI_BOX_LR_BORDER;
maxwidth = std::max(origx2 - origx1, width);

2
src/frontend/mame/ui/text.h
View File

@ -65,7 +65,7 @@ public:
void restyle(size_t start, size_t span, rgb_t *fgcolor, rgb_t *bgcolor);
int get_wrap_info(std::vector<int> &xstart, std::vector<int> &xend) const;
void emit(render_container &container, float x, float y);
void add_text(const char *text, rgb_t fgcolor = rgb_t::white, rgb_t bgcolor = rgb_t::transparent, float size = 1.0)
void add_text(const char *text, rgb_t fgcolor = rgb_t::white(), rgb_t bgcolor = rgb_t::transparent(), float size = 1.0)
{
// create the style
char_style style = { 0, };

14
src/frontend/mame/ui/ui.cpp
View File

@ -581,7 +581,7 @@ void mame_ui_manager::draw_text_full(render_container &container, const char *or
layout.add_text(
origs,
fgcolor,
draw == OPAQUE_ ? bgcolor : rgb_t::transparent,
draw == OPAQUE_ ? bgcolor : rgb_t::transparent(),
text_size);
// and emit it (if we are asked to do so)
@ -938,7 +938,7 @@ void mame_ui_manager::paste()
void mame_ui_manager::draw_fps_counter(render_container &container)
{
draw_text_full(container, machine().video().speed_text().c_str(), 0.0f, 0.0f, 1.0f,
ui::text_layout::RIGHT, ui::text_layout::WORD, OPAQUE_, rgb_t::white, rgb_t::black, nullptr, nullptr);
ui::text_layout::RIGHT, ui::text_layout::WORD, OPAQUE_, rgb_t::white(), rgb_t::black(), nullptr, nullptr);
}
@ -950,7 +950,7 @@ void mame_ui_manager::draw_timecode_counter(render_container &container)
{
std::string tempstring;
draw_text_full(container, machine().video().timecode_text(tempstring).c_str(), 0.0f, 0.0f, 1.0f,
ui::text_layout::RIGHT, ui::text_layout::WORD, OPAQUE_, rgb_t(0xf0, 0xf0, 0x10, 0x10), rgb_t::black, nullptr, nullptr);
ui::text_layout::RIGHT, ui::text_layout::WORD, OPAQUE_, rgb_t(0xf0, 0xf0, 0x10, 0x10), rgb_t::black(), nullptr, nullptr);
}
@ -962,7 +962,7 @@ void mame_ui_manager::draw_timecode_total(render_container &container)
{
std::string tempstring;
draw_text_full(container, machine().video().timecode_total_text(tempstring).c_str(), 0.0f, 0.0f, 1.0f,
ui::text_layout::LEFT, ui::text_layout::WORD, OPAQUE_, rgb_t(0xf0, 0x10, 0xf0, 0x10), rgb_t::black, nullptr, nullptr);
ui::text_layout::LEFT, ui::text_layout::WORD, OPAQUE_, rgb_t(0xf0, 0x10, 0xf0, 0x10), rgb_t::black(), nullptr, nullptr);
}
@ -973,7 +973,7 @@ void mame_ui_manager::draw_timecode_total(render_container &container)
void mame_ui_manager::draw_profiler(render_container &container)
{
const char *text = g_profiler.text(machine());
draw_text_full(container, text, 0.0f, 0.0f, 1.0f, ui::text_layout::LEFT, ui::text_layout::WORD, OPAQUE_, rgb_t::white, rgb_t::black, nullptr, nullptr);
draw_text_full(container, text, 0.0f, 0.0f, 1.0f, ui::text_layout::LEFT, ui::text_layout::WORD, OPAQUE_, rgb_t::white(), rgb_t::black(), nullptr, nullptr);
}
@ -2144,8 +2144,8 @@ int mame_ui_manager::wrap_text(render_container &container, const char *origs, f
// add the text
layout.add_text(
origs,
rgb_t::black,
rgb_t::black,
rgb_t::black(),
rgb_t::black(),
text_size);
// and get the wrapping info

26
src/frontend/mame/ui/viewgfx.cpp
View File

@ -423,7 +423,7 @@ static void palette_handler(mame_ui_manager &mui, render_container &container, u
y0 = boxbounds.y0 + 0.5f * chheight;
for (auto ch : title)
{
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, ch);
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, ch);
x0 += ui_font->char_width(chheight, mui.machine().render().ui_aspect(), ch);
}
@ -433,12 +433,12 @@ static void palette_handler(mame_ui_manager &mui, render_container &container, u
{
x0 = boxbounds.x0 + 6.0f * chwidth + (float)x * cellwidth;
y0 = boxbounds.y0 + 2.0f * chheight;
container.add_char(x0 + 0.5f * (cellwidth - chwidth), y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, "0123456789ABCDEF"[x & 0xf]);
container.add_char(x0 + 0.5f * (cellwidth - chwidth), y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, "0123456789ABCDEF"[x & 0xf]);
// if we're skipping, draw a point between the character and the box to indicate which
// one it's referring to
if (skip != 0)
container.add_point(x0 + 0.5f * cellwidth, 0.5f * (y0 + chheight + cellboxbounds.y0), UI_LINE_WIDTH, rgb_t::white, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container.add_point(x0 + 0.5f * cellwidth, 0.5f * (y0 + chheight + cellboxbounds.y0), UI_LINE_WIDTH, rgb_t::white(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}
// draw the side column headers
@ -455,14 +455,14 @@ static void palette_handler(mame_ui_manager &mui, render_container &container, u
x0 = boxbounds.x0 + 5.5f * chwidth;
y0 = boxbounds.y0 + 3.5f * chheight + (float)y * cellheight;
if (skip != 0)
container.add_point(0.5f * (x0 + cellboxbounds.x0), y0 + 0.5f * cellheight, UI_LINE_WIDTH, rgb_t::white, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container.add_point(0.5f * (x0 + cellboxbounds.x0), y0 + 0.5f * cellheight, UI_LINE_WIDTH, rgb_t::white(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
// draw the row header
sprintf(buffer, "%5X", state.palette.offset + y * state.palette.columns);
for (x = 4; x >= 0; x--)
{
x0 -= ui_font->char_width(chheight, mui.machine().render().ui_aspect(), buffer[x]);
container.add_char(x0, y0 + 0.5f * (cellheight - chheight), chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, buffer[x]);
container.add_char(x0, y0 + 0.5f * (cellheight - chheight), chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, buffer[x]);
}
}
@ -717,7 +717,7 @@ static void gfxset_handler(mame_ui_manager &mui, render_container &container, ui
y0 = boxbounds.y0 + 0.5f * chheight;
for (auto ch : title)
{
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, ch);
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, ch);
x0 += ui_font->char_width(chheight, mui.machine().render().ui_aspect(), ch);
}
@ -727,12 +727,12 @@ static void gfxset_handler(mame_ui_manager &mui, render_container &container, ui
{
x0 = boxbounds.x0 + 6.0f * chwidth + (float)x * cellwidth;
y0 = boxbounds.y0 + 2.0f * chheight;
container.add_char(x0 + 0.5f * (cellwidth - chwidth), y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, "0123456789ABCDEF"[x & 0xf]);
container.add_char(x0 + 0.5f * (cellwidth - chwidth), y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, "0123456789ABCDEF"[x & 0xf]);
// if we're skipping, draw a point between the character and the box to indicate which
// one it's referring to
if (skip != 0)
container.add_point(x0 + 0.5f * cellwidth, 0.5f * (y0 + chheight + boxbounds.y0 + 3.5f * chheight), UI_LINE_WIDTH, rgb_t::white, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container.add_point(x0 + 0.5f * cellwidth, 0.5f * (y0 + chheight + boxbounds.y0 + 3.5f * chheight), UI_LINE_WIDTH, rgb_t::white(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}
// draw the side column headers
@ -749,14 +749,14 @@ static void gfxset_handler(mame_ui_manager &mui, render_container &container, ui
x0 = boxbounds.x0 + 5.5f * chwidth;
y0 = boxbounds.y0 + 3.5f * chheight + (float)y * cellheight;
if (skip != 0)
container.add_point(0.5f * (x0 + boxbounds.x0 + 6.0f * chwidth), y0 + 0.5f * cellheight, UI_LINE_WIDTH, rgb_t::white, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
container.add_point(0.5f * (x0 + boxbounds.x0 + 6.0f * chwidth), y0 + 0.5f * cellheight, UI_LINE_WIDTH, rgb_t::white(), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
// draw the row header
sprintf(buffer, "%5X", info.offset[set] + y * xcells);
for (x = 4; x >= 0; x--)
{
x0 -= ui_font->char_width(chheight, mui.machine().render().ui_aspect(), buffer[x]);
container.add_char(x0, y0 + 0.5f * (cellheight - chheight), chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, buffer[x]);
container.add_char(x0, y0 + 0.5f * (cellheight - chheight), chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, buffer[x]);
}
}
@ -765,7 +765,7 @@ static void gfxset_handler(mame_ui_manager &mui, render_container &container, ui
// add the final quad
container.add_quad(cellboxbounds.x0, cellboxbounds.y0, cellboxbounds.x1, cellboxbounds.y1,
rgb_t::white, state.texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
rgb_t::white(), state.texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
// handle keyboard navigation before drawing
gfxset_handle_keys(mui.machine(), state, xcells, ycells);
@ -1122,7 +1122,7 @@ static void tilemap_handler(mame_ui_manager &mui, render_container &container, u
y0 = boxbounds.y0 + 0.5f * chheight;
for (auto ch : title)
{
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white, *ui_font, ch);
container.add_char(x0, y0, chheight, mui.machine().render().ui_aspect(), rgb_t::white(), *ui_font, ch);
x0 += ui_font->char_width(chheight, mui.machine().render().ui_aspect(), ch);
}
@ -1132,7 +1132,7 @@ static void tilemap_handler(mame_ui_manager &mui, render_container &container, u
// add the final quad
container.add_quad(mapboxbounds.x0, mapboxbounds.y0,
mapboxbounds.x1, mapboxbounds.y1,
rgb_t::white, state.texture,
rgb_t::white(), state.texture,
PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXORIENT(state.tilemap.rotate));
// handle keyboard input

3
src/lib/util/bitmap.h
View File

@ -388,6 +388,9 @@ public:
// getters
bitmap_format format() const { return k_bitmap_format; }
// operations
void erase(const rectangle &rect) { fill(rgb_t::black(), rect); }
};
// BITMAP_FORMAT_ARGB32 bitmaps

27
src/lib/util/palette.cpp
View File

@ -16,19 +16,6 @@
#include <algorithm>
//**************************************************************************
// CONSTANTS
//**************************************************************************
const rgb_t rgb_t::black(0,0,0);
const rgb_t rgb_t::white(255,255,255);
const rgb_t rgb_t::transparent(0, 0, 0, 0);
// the colors below are commonly used screen colors
const rgb_t rgb_t::green(0, 255, 0);
const rgb_t rgb_t::amber(247, 170, 0);
//**************************************************************************
// INLINE FUNCTIONS
//**************************************************************************
@ -239,7 +226,7 @@ palette_t::palette_t(uint32_t numcolors, uint32_t numgroups)
// initialize the per-entry data
for (uint32_t index = 0; index < numcolors; index++)
{
m_entry_color[index] = rgb_t::black;
m_entry_color[index] = rgb_t::black();
m_entry_contrast[index] = 1.0f;
}
@ -253,15 +240,15 @@ palette_t::palette_t(uint32_t numcolors, uint32_t numgroups)
// initialize the expanded data
for (uint32_t index = 0; index < numcolors * numgroups; index++)
{
m_adjusted_color[index] = rgb_t::black;
m_adjusted_rgb15[index] = rgb_t::black.as_rgb15();
m_adjusted_color[index] = rgb_t::black();
m_adjusted_rgb15[index] = rgb_t::black().as_rgb15();
}
// add black and white as the last two colors
m_adjusted_color[numcolors * numgroups + 0] = rgb_t::black;
m_adjusted_rgb15[numcolors * numgroups + 0] = rgb_t::black.as_rgb15();
m_adjusted_color[numcolors * numgroups + 1] = rgb_t::white;
m_adjusted_rgb15[numcolors * numgroups + 1] = rgb_t::white.as_rgb15();
m_adjusted_color[numcolors * numgroups + 0] = rgb_t::black();
m_adjusted_rgb15[numcolors * numgroups + 0] = rgb_t::black().as_rgb15();
m_adjusted_color[numcolors * numgroups + 1] = rgb_t::white();
m_adjusted_rgb15[numcolors * numgroups + 1] = rgb_t::white().as_rgb15();
}

54
src/lib/util/palette.h
View File

@ -35,19 +35,19 @@ class rgb_t
{
public:
// construction/destruction
rgb_t(): m_data(0) { }
rgb_t(uint32_t data) { m_data = data; }
rgb_t(uint8_t r, uint8_t g, uint8_t b) { m_data = (255 << 24) | (r << 16) | (g << 8) | b; }
rgb_t(uint8_t a, uint8_t r, uint8_t g, uint8_t b) { m_data = (a << 24) | (r << 16) | (g << 8) | b; }
constexpr rgb_t() : m_data(0) { }
constexpr rgb_t(uint32_t data) : m_data(data) { }
constexpr rgb_t(uint8_t r, uint8_t g, uint8_t b) : m_data((255 << 24) | (r << 16) | (g << 8) | b) { }
constexpr rgb_t(uint8_t a, uint8_t r, uint8_t g, uint8_t b) : m_data((a << 24) | (r << 16) | (g << 8) | b) { }
// getters
uint8_t a() const { return m_data >> 24; }
uint8_t r() const { return m_data >> 16; }
uint8_t g() const { return m_data >> 8; }
uint8_t b() const { return m_data >> 0; }
rgb15_t as_rgb15() const { return ((r() >> 3) << 10) | ((g() >> 3) << 5) | ((b() >> 3) << 0); }
uint8_t brightness() const { return (r() * 222 + g() * 707 + b() * 71) / 1000; }
uint32_t const *ptr() const { return &m_data; }
constexpr uint8_t a() const { return m_data >> 24; }
constexpr uint8_t r() const { return m_data >> 16; }
constexpr uint8_t g() const { return m_data >> 8; }
constexpr uint8_t b() const { return m_data >> 0; }
constexpr rgb15_t as_rgb15() const { return ((r() >> 3) << 10) | ((g() >> 3) << 5) | ((b() >> 3) << 0); }
constexpr uint8_t brightness() const { return (r() * 222 + g() * 707 + b() * 71) / 1000; }
constexpr uint32_t const *ptr() const { return &m_data; }
// setters
rgb_t &set_a(uint8_t a) { m_data &= ~0xff000000; m_data |= a << 24; return *this; }
@ -56,31 +56,31 @@ public:
rgb_t &set_b(uint8_t b) { m_data &= ~0x000000ff; m_data |= b << 0; return *this; }
// implicit conversion operators
operator uint32_t() const { return m_data; }
constexpr operator uint32_t() const { return m_data; }
// operations
rgb_t &scale8(uint8_t scale) { m_data = rgb_t(clamphi((a() * scale) >> 8), clamphi((r() * scale) >> 8), clamphi((g() * scale) >> 8), clamphi((b() * scale) >> 8)); return *this; }
// assignment operators
rgb_t &operator=(uint32_t rhs) { m_data = rhs; return *this; }
rgb_t &operator+=(const rgb_t &rhs) { m_data = rgb_t(clamphi(a() + rhs.a()), clamphi(r() + rhs.r()), clamphi(g() + rhs.g()), clamphi(b() + rhs.b())); return *this; }
rgb_t &operator-=(const rgb_t &rhs) { m_data = rgb_t(clamplo(a() - rhs.a()), clamplo(r() - rhs.r()), clamplo(g() - rhs.g()), clamplo(b() - rhs.b())); return *this; }
rgb_t &operator+=(const rgb_t &rhs) { m_data = uint32_t(*this + rhs); return *this; }
rgb_t &operator-=(const rgb_t &rhs) { m_data = uint32_t(*this - rhs); return *this; }
// arithmetic operators
rgb_t operator+(const rgb_t &rhs) const { rgb_t result = *this; result += rhs; return result; }
rgb_t operator-(const rgb_t &rhs) const { rgb_t result = *this; result -= rhs; return result; }
constexpr rgb_t operator+(const rgb_t &rhs) const { return rgb_t(clamphi(a() + rhs.a()), clamphi(r() + rhs.r()), clamphi(g() + rhs.g()), clamphi(b() + rhs.b())); }
constexpr rgb_t operator-(const rgb_t &rhs) const { return rgb_t(clamplo(a() - rhs.a()), clamplo(r() - rhs.r()), clamplo(g() - rhs.g()), clamplo(b() - rhs.b())); }
// static helpers
static uint8_t clamp(int32_t value) { return (value < 0) ? 0 : (value > 255) ? 255 : value; }
static uint8_t clamphi(int32_t value) { return (value > 255) ? 255 : value; }
static uint8_t clamplo(int32_t value) { return (value < 0) ? 0 : value; }
static constexpr uint8_t clamp(int32_t value) { return (value < 0) ? 0 : (value > 255) ? 255 : value; }
static constexpr uint8_t clamphi(int32_t value) { return (value > 255) ? 255 : value; }
static constexpr uint8_t clamplo(int32_t value) { return (value < 0) ? 0 : value; }
// constants
static const rgb_t black;
static const rgb_t white;
static const rgb_t green;
static const rgb_t amber;
static const rgb_t transparent;
// constant factories
static constexpr rgb_t black() { return rgb_t(0, 0, 0); }
static constexpr rgb_t white() { return rgb_t(255, 255, 255); }
static constexpr rgb_t green() { return rgb_t(0, 255, 0); }
static constexpr rgb_t amber() { return rgb_t(247, 170, 0); }
static constexpr rgb_t transparent() { return rgb_t(0, 0, 0, 0); }
private:
uint32_t m_data;
@ -163,8 +163,8 @@ public:
void set_gamma(float gamma);
// entry getters
rgb_t entry_color(uint32_t index) const { return (index < m_numcolors) ? m_entry_color[index] : rgb_t::black; }
rgb_t entry_adjusted_color(uint32_t index) const { return (index < m_numcolors * m_numgroups) ? m_adjusted_color[index] : rgb_t::black; }
rgb_t entry_color(uint32_t index) const { return (index < m_numcolors) ? m_entry_color[index] : rgb_t::black(); }
rgb_t entry_adjusted_color(uint32_t index) const { return (index < m_numcolors * m_numgroups) ? m_adjusted_color[index] : rgb_t::black(); }
float entry_contrast(uint32_t index) const { return (index < m_numcolors) ? m_entry_contrast[index] : 1.0f; }
// entry setters

2
src/mame/drivers/alinvade.cpp
View File

@ -180,7 +180,7 @@ uint32_t alinvade_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
data = data >> 1;

2
src/mame/drivers/alto2.cpp
View File

@ -281,7 +281,7 @@ static MACHINE_CONFIG_START( alto2, alto2_state )
MCFG_CPU_IO_MAP(alto2_iomem_map)
// Video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white())
MCFG_SCREEN_RAW_PARAMS(XTAL_20_16MHz,
A2_DISP_TOTAL_WIDTH, 0, A2_DISP_WIDTH,
A2_DISP_TOTAL_HEIGHT, 0, A2_DISP_HEIGHT)

2
src/mame/drivers/amust.cpp
View File

@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( amust, amust_state )
MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(640, 480)

2
src/mame/drivers/anzterm.cpp
View File

@ -417,7 +417,7 @@ MACHINE_CONFIG_START( anzterm, anzterm_state )
MCFG_DEVICE_ADD("acia.ic17", ACIA6850, 0)
MCFG_DEVICE_ADD("acia.ic18", ACIA6850, 0)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(anzterm_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_RAW_PARAMS(15974400/4, 1024, 0, 104*8, 260, 0, 24*10) // this is totally wrong, it just stops a validation error

4
src/mame/drivers/apexc.cpp
View File

@ -504,8 +504,8 @@ INTERRUPT_GEN_MEMBER(apexc_state::apexc_interrupt)
static const rgb_t apexc_palette[] =
{
rgb_t::white,
rgb_t::black,
rgb_t::white(),
rgb_t::black(),
rgb_t(255, 0, 0),
rgb_t(50, 0, 0)
};

4
src/mame/drivers/apricot.cpp
View File

@ -284,7 +284,7 @@ uint32_t apricot_state::screen_update_apricot(screen_device &screen, bitmap_rgb3
if (!m_display_on)
m_crtc->screen_update(screen, bitmap, cliprect);
else
bitmap.fill(rgb_t::black, cliprect);
bitmap.erase(cliprect);
return 0;
}
@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state )
MCFG_RAM_DEFAULT_SIZE("256k")
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_SIZE(800, 400)
MCFG_SCREEN_VISIBLE_AREA(0, 800-1, 0, 400-1)
MCFG_SCREEN_REFRESH_RATE(72)

4
src/mame/drivers/arcadia.cpp
View File

@ -416,14 +416,14 @@ GFXDECODE_END
static const rgb_t arcadia_colors[] =
{
rgb_t::white, /* white */
rgb_t::white(), /* white */
rgb_t(0xff, 0xff, 0x00), /* yellow */
rgb_t(0x00, 0xff, 0xff), /* cyan */
rgb_t(0x00, 0xff, 0x00), /* green */
rgb_t(0xff, 0x00, 0xff), /* magenta */
rgb_t(0xff, 0x00, 0x00), /* red */
rgb_t(0x00, 0x00, 0xff), /* blue */
rgb_t::black /* black */
rgb_t::black() /* black */
};
static const unsigned short arcadia_palette[128+8] = /* bgnd, fgnd */

16
src/mame/drivers/astinvad.cpp
View File

@ -148,14 +148,14 @@ void astinvad_state::plot_byte( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint
{
uint8_t flip_xor = m_screen_flip & 7;
bitmap.pix32(y, x + (0 ^ flip_xor)) = (data & 0x01) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (1 ^ flip_xor)) = (data & 0x02) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (2 ^ flip_xor)) = (data & 0x04) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (3 ^ flip_xor)) = (data & 0x08) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (4 ^ flip_xor)) = (data & 0x10) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (5 ^ flip_xor)) = (data & 0x20) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (6 ^ flip_xor)) = (data & 0x40) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (7 ^ flip_xor)) = (data & 0x80) ? m_palette->pen_color(color) : rgb_t::black;
bitmap.pix32(y, x + (0 ^ flip_xor)) = (data & 0x01) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (1 ^ flip_xor)) = (data & 0x02) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (2 ^ flip_xor)) = (data & 0x04) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (3 ^ flip_xor)) = (data & 0x08) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (4 ^ flip_xor)) = (data & 0x10) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (5 ^ flip_xor)) = (data & 0x20) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (6 ^ flip_xor)) = (data & 0x40) ? m_palette->pen_color(color) : rgb_t::black();
bitmap.pix32(y, x + (7 ^ flip_xor)) = (data & 0x80) ? m_palette->pen_color(color) : rgb_t::black();
}

2
src/mame/drivers/attache.cpp
View File

@ -916,7 +916,7 @@ static MACHINE_CONFIG_START( attache, attache_state )
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(64)) /* not accurate */
MCFG_SCREEN_SIZE(640,240)

4
src/mame/drivers/avalnche.cpp
View File

@ -64,9 +64,9 @@ uint32_t avalnche_state::screen_update_avalnche(screen_device &screen, bitmap_rg
pen_t pen;
if (m_avalance_video_inverted)
pen = (data & 0x80) ? rgb_t::white : rgb_t::black;
pen = (data & 0x80) ? rgb_t::white() : rgb_t::black();
else
pen = (data & 0x80) ? rgb_t::black : rgb_t::white;
pen = (data & 0x80) ? rgb_t::black() : rgb_t::white();
bitmap.pix32(y, x) = pen;

2
src/mame/drivers/ax20.cpp
View File

@ -128,7 +128,7 @@ static MACHINE_CONFIG_START( ax20, ax20_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_COLOR(rgb_t::green)
MCFG_SCREEN_COLOR(rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(ax20_state, screen_update)

2
src/mame/drivers/beaminv.cpp
View File

@ -187,7 +187,7 @@ uint32_t beaminv_state::screen_update_beaminv(screen_device &screen, bitmap_rgb3
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
data = data >> 1;

2
src/mame/drivers/beehive.cpp
View File

@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( beehive, beehive_state )
MCFG_CPU_IO_MAP(beehive_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(beehive_state, screen_update)

4
src/mame/drivers/berzerk.cpp
View File

@ -485,7 +485,7 @@ uint32_t berzerk_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
for (i = 0; i < 4; i++)
{
rgb_t pen = (data & 0x80) ? pens[color >> 4] : rgb_t::black;
rgb_t pen = (data & 0x80) ? pens[color >> 4] : rgb_t::black();
bitmap.pix32(y, x) = pen;
x = x + 1;
@ -494,7 +494,7 @@ uint32_t berzerk_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
for (; i < 8; i++)
{
rgb_t pen = (data & 0x80) ? pens[color & 0x0f] : rgb_t::black;
rgb_t pen = (data & 0x80) ? pens[color & 0x0f] : rgb_t::black();
bitmap.pix32(y, x) = pen;
x = x + 1;

4
src/mame/drivers/binbug.cpp
View File

@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state )
MCFG_S2650_FLAG_HANDLER(WRITELINE(binbug_state, binbug_serial_w))
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update)
@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state )
MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update)

2
src/mame/drivers/bw12.cpp
View File

@ -547,7 +547,7 @@ static MACHINE_CONFIG_START( common, bw12_state )
MCFG_CPU_IO_MAP(bw12_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)

2
src/mame/drivers/c64dtv.cpp
View File

@ -16,7 +16,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bitmap.fill(rgb_t::black);
bitmap.erase(cliprect);
return 0;
}
};

2
src/mame/drivers/cbm2.cpp
View File

@ -2517,7 +2517,7 @@ static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state )
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(MC68B45_TAG, mc6845_device, screen_update)
MCFG_SCREEN_REFRESH_RATE(60)

8
src/mame/drivers/cgenie.cpp
View File

@ -376,7 +376,7 @@ MC6845_UPDATE_ROW( cgenie_state::crtc_update_row )
// how accurate are these colors?
const rgb_t cgenie_state::m_palette_bg[] =
{
rgb_t::black,
rgb_t::black(),
rgb_t(0x70, 0x28, 0x20), // dark orange
rgb_t(0x28, 0x70, 0x20), // dark green
rgb_t(0x48, 0x48, 0x48), // dark gray
@ -401,13 +401,13 @@ const rgb_t cgenie_state::m_palette_eu[] =
rgb_t(0x8c, 0x8c, 0x8c), // light gray
rgb_t(0x00, 0xfb, 0x8c), // turquoise
rgb_t(0xd2, 0x00, 0xff), // magenta
rgb_t::white // bright white
rgb_t::white() // bright white
};
// new zealand palette
const rgb_t cgenie_state::m_palette_nz[] =
{
rgb_t::white,
rgb_t::white(),
rgb_t(0x12, 0xff, 0xff),
rgb_t(0xff, 0x6f, 0xff),
rgb_t(0x31, 0x77, 0xff),
@ -422,7 +422,7 @@ const rgb_t cgenie_state::m_palette_nz[] =
rgb_t(0xff, 0xf9, 0x00),
rgb_t(0x00, 0xda, 0x00),
rgb_t(0xff, 0x22, 0x00),
rgb_t::black
rgb_t::black()
};

2
src/mame/drivers/clayshoo.cpp
View File

@ -184,7 +184,7 @@ uint32_t clayshoo_state::screen_update_clayshoo(screen_device &screen, bitmap_rg
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
data = data << 1;

2
src/mame/drivers/cmi.cpp
View File

@ -2771,7 +2771,7 @@ static MACHINE_CONFIG_START( cmi2x, cmi_state )
MCFG_DL1416_UPDATE_HANDLER(WRITE16(cmi_state, cmi_iix_update_dp3))
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBLANK_END, HBLANK_START, VTOTAL, VBLANK_END, VBLANK_START)
MCFG_SCREEN_UPDATE_DRIVER(cmi_state, screen_update_cmi2x)
MCFG_PALETTE_ADD_MONOCHROME("palette")

2
src/mame/drivers/dai3wksi.cpp
View File

@ -166,7 +166,7 @@ uint32_t dai3wksi_state::screen_update_dai3wksi(screen_device &screen, bitmap_rg
for (int i = 0; i <= 3; i++)
{
rgb_t pen = (data & (1 << i)) ? m_palette->pen_color(color) : rgb_t::black;
rgb_t pen = (data & (1 << i)) ? m_palette->pen_color(color) : rgb_t::black();
if (m_dai3wksi_flipscreen)
bitmap.pix32(255-y, 255-x) = pen;

2
src/mame/drivers/decwritr.cpp
View File

@ -40,7 +40,7 @@ public:
//required_device<generic_terminal_device> m_terminal;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bitmap.fill(rgb_t::black);
bitmap.erase(cliprect);
return 0;
}
DECLARE_READ8_MEMBER(la120_KBD_r);

2
src/mame/drivers/dvk_ksm.cpp
View File

@ -342,7 +342,7 @@ static MACHINE_CONFIG_START( ksm, ksm_state )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ksm_state, scanline_callback, "screen", 0, 1)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(ksm_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL_15_4MHz, KSM_TOTAL_HORZ, KSM_HORZ_START,
KSM_HORZ_START+KSM_DISP_HORZ, KSM_TOTAL_VERT, KSM_VERT_START,

2
src/mame/drivers/einstein.cpp
View File

@ -431,7 +431,7 @@ MACHINE_RESET_MEMBER(einstein_state,einstein2)
einstein_state::machine_reset();
/* 80 column card palette */
m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, rgb_t::black);
m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, rgb_t::black());
m_palette->set_pen_color(TMS9928A_PALETTE_SIZE + 1, rgb_t(0, 224, 0));
}

2
src/mame/drivers/electron.cpp
View File

@ -243,7 +243,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( btm2105, electron )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_COLOR(rgb_t::amber)
MCFG_SCREEN_COLOR(rgb_t::amber())
/* expansion port */
MCFG_DEVICE_MODIFY("exp")

2
src/mame/drivers/embargo.cpp
View File

@ -57,7 +57,7 @@ uint32_t embargo_state::screen_update_embargo(screen_device &screen, bitmap_rgb3
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x01) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x01) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
data = data >> 1;

2
src/mame/drivers/enigma2.cpp
View File

@ -329,7 +329,7 @@ uint32_t enigma2_state::screen_update_enigma2a(screen_device &screen, bitmap_rgb
video_data = video_data >> 1;
}
pen = bit ? rgb_t::white : rgb_t::black;
pen = bit ? rgb_t::white() : rgb_t::black();
bitmap.pix32(bitmap_y, x) = pen;
/* next pixel */

2
src/mame/drivers/fk1.cpp
View File

@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( fk1, fk1_state )
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(fk1_state, screen_update)

2
src/mame/drivers/h19.cpp
View File

@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( h19, h19_state )
//MCFG_DEVICE_PERIODIC_INT_DRIVER(h19_state, irq0_line_hold, 50) // for testing, causes a keyboard scan
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)

6
src/mame/drivers/homelab.cpp
View File

@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_SIZE(40*8, 25*8)
@ -770,7 +770,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state )
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_SIZE(64*8, 32*8)
@ -803,7 +803,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state )
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_SIZE(64*8, 32*8)

2
src/mame/drivers/hp64k.cpp
View File

@ -1350,7 +1350,7 @@ static MACHINE_CONFIG_START(hp64k , hp64k_state)
MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(720 , 390)

2
src/mame/drivers/hp9845.cpp
View File

@ -1063,7 +1063,7 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state )
MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845b_state , pa_w))
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(hp9845b_state, screen_update)
// These parameters are for alpha video
MCFG_SCREEN_RAW_PARAMS(VIDEO_PIXEL_CLOCK , VIDEO_HTOTAL , 0 , VIDEO_HBSTART , VIDEO_VTOTAL , 0 , VIDEO_ACTIVE_SCANLINES)

2
src/mame/drivers/hyperscan.cpp
View File

@ -515,7 +515,7 @@ uint32_t hyperscan_state::spg290_screen_update(screen_device &screen, bitmap_rgb
}
else
{
bitmap.fill(rgb_t::black, cliprect);
bitmap.erase(cliprect);
}
return 0;

4
src/mame/drivers/ie15.cpp
View File

@ -656,7 +656,7 @@ GFXDECODE_END
//PALETTE_INIT_MEMBER( ie15_state, ie15 )
//{
// palette.set_pen_color(0, rgb_t::black); // black
// palette.set_pen_color(0, rgb_t::black()); // black
// palette.set_pen_color(1, 0x00, 0xc0, 0x00); // green
//}
@ -670,7 +670,7 @@ static MACHINE_CONFIG_START( ie15, ie15_state )
//MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_30_8MHz/(2*IE15_HORZ_START)))
/* Video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(ie15_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz/2, IE15_TOTAL_HORZ, IE15_HORZ_START,
IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START,

2
src/mame/drivers/ipds.cpp
View File

@ -133,7 +133,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state )
MCFG_CPU_IO_MAP(ipds_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE("i8275", i8275_device, screen_update)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */

2
src/mame/drivers/iq151.cpp
View File

@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state )
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(iq151_state, screen_update)

6
src/mame/drivers/itt3030.cpp
View File

@ -656,9 +656,9 @@ SLOT_INTERFACE_END
PALETTE_INIT_MEMBER(itt3030_state, itt3030)
{
palette.set_pen_color(0,rgb_t::black);
palette.set_pen_color(1,rgb_t(215,229,82));
palette.set_pen_color(2,rgb_t::black);
palette.set_pen_color(0, rgb_t::black());
palette.set_pen_color(1, rgb_t(215, 229, 82));
palette.set_pen_color(2, rgb_t::black());
}
static MACHINE_CONFIG_START( itt3030, itt3030_state )

2
src/mame/drivers/k8915.cpp
View File

@ -156,7 +156,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state )
MCFG_CPU_IO_MAP(k8915_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(k8915_state, screen_update)

2
src/mame/drivers/kaypro.cpp
View File

@ -203,7 +203,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state )
MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro )
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(80*7, 24*10)

2
src/mame/drivers/laser3k.cpp
View File

@ -934,7 +934,7 @@ INPUT_PORTS_END
// actual laser3000 has a digital RGB palette...
static const rgb_t laser3k_palette[] =
{
rgb_t::black,
rgb_t::black(),
rgb_t(0xE3, 0x1E, 0x60), /* Dark Red */
rgb_t(0x60, 0x4E, 0xBD), /* Dark Blue */
rgb_t(0xFF, 0x44, 0xFD), /* Purple */

2
src/mame/drivers/m10.cpp
View File

@ -160,7 +160,7 @@ PALETTE_INIT_MEMBER(m10_state,m10)
if (i & 0x01)
color = rgb_t(pal1bit(~i >> 3), pal1bit(~i >> 2), pal1bit(~i >> 1));
else
color = rgb_t::black;
color = rgb_t::black();
palette.set_pen_color(i, color);
}

2
src/mame/drivers/m14.cpp
View File

@ -113,7 +113,7 @@ PALETTE_INIT_MEMBER(m14_state, m14)
if (i & 0x01)
color = rgb_t(pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 3));
else
color = (i & 0x10) ? rgb_t::white : rgb_t::black;
color = (i & 0x10) ? rgb_t::white() : rgb_t::black();
palette.set_pen_color(i, color);
}

2
src/mame/drivers/m79amb.cpp
View File

@ -79,7 +79,7 @@ uint32_t m79amb_state::screen_update_ramtek(screen_device &screen, bitmap_rgb32
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
x++;

2
src/mame/drivers/mgames.cpp
View File

@ -287,7 +287,7 @@ PALETTE_INIT_MEMBER(mgames_state, mgames)
if (i & 0x01)
color = rgb_t(pal2bit((i & 0x6) >> 1), pal2bit((i & 0x18) >> 3), pal2bit((i & 0x60) >> 5));
else
color = rgb_t::black;
color = rgb_t::black();
palette.set_pen_color(i, color);
}

2
src/mame/drivers/micral.cpp
View File

@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( micral, micral_state )
MCFG_MACHINE_RESET_OVERRIDE(micral_state, micral)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(250))
MCFG_SCREEN_UPDATE_DRIVER(micral_state, screen_update)

2
src/mame/drivers/minivadr.cpp
View File

@ -72,7 +72,7 @@ uint32_t minivadr_state::screen_update_minivadr(screen_device &screen, bitmap_rg
for (i = 0; i < 8; i++)
{
pen_t pen = (data & 0x80) ? rgb_t::white : rgb_t::black;
pen_t pen = (data & 0x80) ? rgb_t::white() : rgb_t::black();
bitmap.pix32(y, x) = pen;
data = data << 1;

18
src/mame/drivers/mmagic.cpp
View File

@ -215,15 +215,15 @@ uint32_t mmagic_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
{
uint8_t gfx = m_tiles[(code << 4) + tx];
bitmap.pix32(y * 12 + tx, x * 8 + 0) = BIT(gfx, 4) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 1) = BIT(gfx, 5) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 2) = BIT(gfx, 6) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 3) = BIT(gfx, 7) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 0) = BIT(gfx, 4) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 1) = BIT(gfx, 5) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 2) = BIT(gfx, 6) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 3) = BIT(gfx, 7) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 4) = BIT(gfx, 0) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 5) = BIT(gfx, 1) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 6) = BIT(gfx, 2) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 7) = BIT(gfx, 3) ? rgb_t::black : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 4) = BIT(gfx, 0) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 5) = BIT(gfx, 1) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 6) = BIT(gfx, 2) ? rgb_t::black() : m_palette->pen_color(color);
bitmap.pix32(y * 12 + tx, x * 8 + 7) = BIT(gfx, 3) ? rgb_t::black() : m_palette->pen_color(color);
}
}
}
@ -233,7 +233,7 @@ uint32_t mmagic_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
{
static const int BALL_SIZE = 4;
int ball_y = (m_ball_y >> 4) * 12 + (m_ball_y & 0x0f);
bitmap.plot_box(m_ball_x - BALL_SIZE + 1, ball_y - BALL_SIZE + 1, BALL_SIZE, BALL_SIZE, rgb_t::white);
bitmap.plot_box(m_ball_x - BALL_SIZE + 1, ball_y - BALL_SIZE + 1, BALL_SIZE, BALL_SIZE, rgb_t::white());
}
return 0;

2
src/mame/drivers/modellot.cpp
View File

@ -155,7 +155,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state )
MCFG_CPU_IO_MAP(modellot_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(64*8, 16*16)

2
src/mame/drivers/mx2178.cpp
View File

@ -162,7 +162,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state )
MCFG_CPU_IO_MAP(mx2178_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not correct
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)

2
src/mame/drivers/nokia_3310.cpp
View File

@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( noki3310, noki3310_state )
MCFG_CPU_PROGRAM_MAP(noki3310_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white)
MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white())
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MCFG_SCREEN_SIZE(84, 48)

2
src/mame/drivers/octopus.cpp
View File

@ -751,7 +751,7 @@ SCN2674_DRAW_CHARACTER_MEMBER(octopus_state::display_pixels)
uint8_t tile = m_vram[address & 0x0fff];
uint8_t data = m_fontram[(tile * 16) + linecount];
for (int z=0;z<8;z++)
bitmap.pix32(y,x + z) = BIT(data,z) ? rgb_t::white : rgb_t::black;
bitmap.pix32(y,x + z) = BIT(data,z) ? rgb_t::white() : rgb_t::black();
}
}

Some files were not shown because too many files have changed in this diff Show More