From 8fe2adf28affc0477ee91689edef3b90168cd3ce Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 26 Nov 2023 15:43:19 +0100 Subject: [PATCH] worked on PAL palette (brighter) --- src/common/PaletteHandler.cxx | 40 +++++++++++++++++++++++++++++-- src/debugger/Debugger.cxx | 44 ++++++++++++++++------------------- src/gui/VideoAudioDialog.cxx | 2 +- src/gui/WhatsNewDialog.cxx | 28 ++++++++++------------ 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/src/common/PaletteHandler.cxx b/src/common/PaletteHandler.cxx index a3ae45231..23d091254 100644 --- a/src/common/PaletteHandler.cxx +++ b/src/common/PaletteHandler.cxx @@ -338,7 +338,8 @@ void PaletteHandler::setPalette() if(paletteType == PaletteType::Custom) generateCustomPalette(timing); - myOSystem.frameBuffer().setTIAPalette(adjustedPalette(*palette)); + //myOSystem.frameBuffer().setTIAPalette(adjustedPalette(*palette)); + myOSystem.frameBuffer().setTIAPalette(*palette); } } @@ -634,6 +635,7 @@ const PaletteArray PaletteHandler::ourNTSCPalette = { // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - const PaletteArray PaletteHandler::ourPALPalette = { +#if 0 0x000000, 0, 0x121212, 0, 0x242424, 0, 0x484848, 0, // 180 0 0x6c6c6c, 0, 0x909090, 0, 0xb4b4b4, 0, 0xd8d8d8, 0, // was 0x111111..0xcccccc 0x000000, 0, 0x121212, 0, 0x242424, 0, 0x484848, 0, // 198 1 @@ -641,7 +643,7 @@ const PaletteArray PaletteHandler::ourPALPalette = { 0x1d0f00, 0, 0x3f2700, 0, 0x614900, 0, 0x836b01, 0, // 1b0 2 0xa58d23, 0, 0xc7af45, 0, 0xe9d167, 0, 0xffe789, 0, // was ..0xfff389 0x002400, 0, 0x004600, 0, 0x216800, 0, 0x438a07, 0, // 1c8 3 - 0x65ac29, 0, 0x87ce4b, 0, 0xa9f06d, 0, 0xcbff8f, 0, + 0x65ac29, 0, 0x87ce4b, 0, 0xa9f06d, 0, 0xc8ff91, 0, 0x340000, 0, 0x561400, 0, 0x783602, 0, 0x9a5824, 0, // 1e0 4 0xbc7a46, 0, 0xde9c68, 0, 0xffbe8a, 0, 0xffd0ad, 0, // was ..0xffe0ac 0x002700, 0, 0x004900, 0, 0x0c6b0c, 0, 0x2e8d2e, 0, // 1f8 5 @@ -666,6 +668,40 @@ const PaletteArray PaletteHandler::ourPALPalette = { 0x6c6c6c, 0, 0x909090, 0, 0xb4b4b4, 0, 0xd8d8d8, 0, 0x000000, 0, 0x121212, 0, 0x242424, 0, 0x484848, 0, // 2e8 f 0x6c6c6c, 0, 0x909090, 0, 0xb4b4b4, 0, 0xd8d8d8, 0, +#else + 0x0b0b0b, 0, 0x333333, 0, 0x595959, 0, 0x7b7b7b, 0, // 0 + 0x8b8b8b, 0, 0xaaaaaa, 0, 0xc7c7c7, 0, 0xe3e3e3, 0, + 0x000000, 0, 0x272727, 0, 0x404040, 0, 0x696969, 0, // 1 + 0x8b8b8b, 0, 0xaaaaaa, 0, 0xc7c7c7, 0, 0xe3e3e3, 0, + 0x3b2400, 0, 0x664700, 0, 0x8b7000, 0, 0xac9200, 0, // 2 + 0xc5ae36, 0, 0xdec85e, 0, 0xf7e27f, 0, 0xfff19e, 0, + 0x004500, 0, 0x006f00, 0, 0x3b9200, 0, 0x65b009, 0, // 3 + 0x85ca3d, 0, 0xa3e364, 0, 0xbffc84, 0, 0xd5ffa5, 0, + 0x590000, 0, 0x802700, 0, 0xa15700, 0, 0xbc7937, 0, // 4 + 0xd6985f, 0, 0xeeb381, 0, 0xffce9e, 0, 0xffdcbd, 0, + 0x004900, 0, 0x007200, 0, 0x169216, 0, 0x45af45, 0, // 5 + 0x6bc96b, 0, 0x8be38b, 0, 0xa9fba9, 0, 0xc5ffc5, 0, + 0x640012, 0, 0x890821, 0, 0xa73d4d, 0, 0xc26472, 0, // 6 + 0xdc8491, 0, 0xf4a3ae, 0, 0xffbeca, 0, 0xffdae0, 0, + 0x003d29, 0, 0x006a48, 0, 0x048e63, 0, 0x3caa84, 0, // 7 + 0x62c5a2, 0, 0x83dfbe, 0, 0xa1f8d9, 0, 0xbeffe9, 0, + 0x550046, 0, 0x88006e, 0, 0xa5318d, 0, 0xc159aa, 0, // 8 + 0xda7cc5, 0, 0xf39adf, 0, 0xffb9f3, 0, 0xffd4f6, 0, + 0x003651, 0, 0x005a7d, 0, 0x117e9c, 0, 0x429cb8, 0, // 9 + 0x68b7d2, 0, 0x88d2eb, 0, 0xa6ebff, 0, 0xc3ffff, 0, + 0x4c007c, 0, 0x75009d, 0, 0x932eb8, 0, 0xaf57d2, 0, // A + 0xca7aeb, 0, 0xe499ff, 0, 0xecb7ff, 0, 0xf3d4ff, 0, + 0x002d83, 0, 0x003ea4, 0, 0x2d65bf, 0, 0x5685da, 0, // B + 0x79a2f2, 0, 0x99bfff, 0, 0xb7dbff, 0, 0xd3f5ff, 0, + 0x220096, 0, 0x5200b6, 0, 0x7538cf, 0, 0x945fe8, 0, // C + 0xb181ff, 0, 0xc5a0ff, 0, 0xd6bdff, 0, 0xe8daff, 0, + 0x00009a, 0, 0x241db6, 0, 0x504ad0, 0, 0x746fe9, 0, // D + 0x928eff, 0, 0xb1adff, 0, 0xcecaff, 0, 0xe9e5ff, 0, + 0x0b0b0b, 0, 0x333333, 0, 0x595959, 0, 0x7b7b7b, 0, // E + 0x999999, 0, 0xb6b6b6, 0, 0xcfcfcf, 0, 0xe6e6e6, 0, + 0x0b0b0b, 0, 0x333333, 0, 0x595959, 0, 0x7b7b7b, 0, // F + 0x999999, 0, 0xb6b6b6, 0, 0xcfcfcf, 0, 0xe6e6e6, 0, +#endif }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx index fdd9d645d..b01e9fd16 100644 --- a/src/debugger/Debugger.cxx +++ b/src/debugger/Debugger.cxx @@ -446,7 +446,6 @@ bool Debugger::writeTrap(uInt16 t) const // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Debugger::log(string_view triggerMsg) { - const CartDebug::Disassembly& disasm = myCartDebug->disassembly(); const int pc = myCpuDebug->pc(); if(myFirstLog) @@ -466,27 +465,14 @@ void Debugger::log(string_view triggerMsg) myFirstLog = false; } - // First find the lines in the range, and determine the longest string - const uInt16 start = pc & 0xFFF; - const size_t list_size = disasm.list.size(); - size_t pos = 0; - - for(pos = 0; pos < list_size; ++pos) - { - const CartDebug::DisassemblyTag& tag = disasm.list[pos]; - - if((tag.address & 0xfff) >= start) - break; - } - ostringstream msg; - msg << std::left << std::setw(10) << std::setfill(' ') << triggerMsg; - msg << Base::toString(myTiaDebug->frameCount(), Base::Fmt::_10_5) << " " + msg << std::left << std::setw(10) << std::setfill(' ') << triggerMsg + << Base::toString(myTiaDebug->frameCount(), Base::Fmt::_10_5) << " " << Base::toString(myTiaDebug->scanlines(), Base::Fmt::_10_3) << " " << Base::toString(myTiaDebug->clocksThisLine() / 3, Base::Fmt::_10_02) << " " - << Base::toString(myTiaDebug->clocksThisLine() - 68, Base::Fmt::_10_3) << " | "; - msg << (myCpuDebug->n() ? "N" : "n") + << Base::toString(myTiaDebug->clocksThisLine() - 68, Base::Fmt::_10_3) << " | " + << (myCpuDebug->n() ? "N" : "n") << (myCpuDebug->v() ? "V" : "v") << "-" << (myCpuDebug->b() ? "B" : "b") << (myCpuDebug->d() ? "D" : "d") @@ -508,16 +494,26 @@ void Debugger::log(string_view triggerMsg) else msg << " "; - if(disasm.list.size() > pos) + // First find the lines in the range, and determine the longest string + const CartDebug::Disassembly& disasm = myCartDebug->disassembly(); + const uInt16 start = pc & 0xFFF; + const size_t list_size = disasm.list.size(); + size_t pos = 0; + + for(pos = 0; pos < list_size; ++pos) { const CartDebug::DisassemblyTag& tag = disasm.list[pos]; - msg << Base::HEX4 << pc << " " - << std::left << std::setw(8) << std::setfill(' ') << tag.bytes << " " - << tag.disasm.substr(0, 7); + if((tag.address & 0xfff) >= start) + { + msg << Base::HEX4 << pc << " " + << std::left << std::setw(8) << std::setfill(' ') << tag.bytes << " " + << tag.disasm.substr(0, 7); - if(tag.disasm.length() > 8) - msg << tag.disasm.substr(8); + if(tag.disasm.length() > 8) + msg << tag.disasm.substr(8); + break; + } } Logger::log(msg.str()); } diff --git a/src/gui/VideoAudioDialog.cxx b/src/gui/VideoAudioDialog.cxx index 8a52ec9f5..c266519e1 100644 --- a/src/gui/VideoAudioDialog.cxx +++ b/src/gui/VideoAudioDialog.cxx @@ -456,7 +456,7 @@ void VideoAudioDialog::addBezelTab() // Enable bezels myBezelEnableCheckbox = new CheckboxWidget(myTab, _font, xpos, ypos, "Enable bezels", kBezelEnableChanged); - //myBezelEnableCheckbox->setToolTip(Event::BezelToggle); + myBezelEnableCheckbox->setToolTip(Event::ToggleBezel); wid.push_back(myBezelEnableCheckbox); xpos += INDENT; ypos += lineHeight + VGAP; diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx index 1b312d538..c3ccdd3c5 100644 --- a/src/gui/WhatsNewDialog.cxx +++ b/src/gui/WhatsNewDialog.cxx @@ -50,28 +50,24 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent, add(ypos, "extensively redesigned and enhanced file launcher"); add(ypos, "improved controller mappings for Paddles"); add(ypos, "improved controller mappings for Driving controllers"); - add(ypos, "enhanced support for CDFJ+ bankswitching type"); - add(ypos, "added MovieCart support"); add(ypos, "added keeping multiple dump files when dumping to SD"); add(ypos, "removed deadzone from USB game controllers"); add(ypos, "added opt-out for overclocking to the settings file"); + add(ypos, "enhanced ROM launcher to allow multiple images per ROM (heaps of additional images are available for download)"); + add(ypos, "added bezel support (incl. Sinden Lightgun)"); + add(ypos, "accelerated ARM emulation by ~15%"); #else - if(version < "6.6") + if(version < "6.7") { - add(ypos, "added tooltips to many UI items"); - add(ypos, "added sound to Time Machine playback"); - add(ypos, "moved settings, properties etc. to an SQLite database"); - add(ypos, "added context-sensitive help"); - add(ypos, "added PlusROMs support for saving high scores"); - add(ypos, "added MovieCart support"); - add(ypos, "added weblinks for many games"); + add(ypos, "extensively redesigned and enhanced ROM launcher"); } - add(ypos, "extensively redesigned and enhanced file launcher"); - add(ypos, "added automatic emulation pause when focus is lost"); - add(ypos, "added option to toggle autofire mode"); - add(ypos, "improved controller mappings for Paddles and Driving controllers"); - add(ypos, "added another oddball TIA glitch option for score mode color"); - add(ypos, "enhanced support for CDFJ+ bankswitching type"); + add(ypos, "enhanced ROM launcher to allow multiple images per ROM (heaps of additional images are available for download)"); + add(ypos, "added bezel support (incl. Sinden Lightgun)"); + add(ypos, "enhanced Kid Vid support to play tape audio"); + add(ypos, "added Joy2B+ controller support"); + add(ypos, "accelerated ARM emulation by ~15%"); + add(ypos, "fixed broken mouse and Stelladaptor input for Driving Controller"); + add(ypos, "added user defined CPU cycle timers to debugger"); add(ypos, ELLIPSIS + " (for a complete list see 'docs/Changes.txt')"); #endif