ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reworked Palette settings a bit

This commit is contained in:
thrust26 2021-04-28 23:16:29 +02:00
parent 7873bddee5
commit f37f841750
4 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/graphics/options_video_palettes.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

3
docs/index.html
View File

@ -3654,8 +3654,7 @@
<table border="1" cellpadding="4">
<tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">Command Line</a></th></tr>
<tr><td>Palette</td><td>Palette used for emulation mode</td><td>-palette</td></tr>
<tr><td>NTSC phase</td><td>Adjust phase shift of 'Custom' NTSC palette</td><td>-pal.phase_ntsc</td></tr>
<tr><td>PAL phase</td><td>Adjust phase shift of 'Custom' PAL palette</td><td>-pal.phase_pal</td></tr>
<tr><td>NTSC/PAL phase</td><td>Adjust phase shift of 'Custom' NTSC or PAL (depends on game) palette. </td><td>-pal.phase_ntsc, -pal.phase_pal</td></tr>
<tr><td>R</td><td>Adjust red scale and shift of 'Custom' palette</td><td>-pal.red_scale, -pal.red_shift</td></tr>
<tr><td>G</td><td>Adjust green scale and shift of 'Custom' palette</td><td>-pal.green_scale, -pal.green_shift</td></tr>
<tr><td>B</td><td>Adjust blue scale and shift of 'Custom' palette</td><td>-pal.blue_scale, -pal.blue_shift</td></tr>

85
src/gui/VideoAudioDialog.cxx
View File

@ -233,24 +233,10 @@ void VideoAudioDialog::addPaletteTab()
const int pswidth = swidth - INDENT + lwidth - plWidth;
xpos += INDENT;
myPhaseShiftNtsc =
myPhaseShift =
new SliderWidget(myTab, _font, xpos, ypos - 1, pswidth, lineHeight,
"NTSC phase", plWidth, kNtscShiftChanged, fontWidth * 5);
myPhaseShiftNtsc->setMinValue((PaletteHandler::DEF_NTSC_SHIFT - PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShiftNtsc->setMaxValue((PaletteHandler::DEF_NTSC_SHIFT + PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShiftNtsc->setTickmarkIntervals(4);
myPhaseShiftNtsc->setToolTip("Adjust NTSC phase shift of 'Custom' palette.");
wid.push_back(myPhaseShiftNtsc);
ypos += lineHeight + VGAP;
myPhaseShiftPal =
new SliderWidget(myTab, _font, xpos, ypos - 1, pswidth, lineHeight,
"PAL phase", plWidth, kPalShiftChanged, fontWidth * 5);
myPhaseShiftPal->setMinValue((PaletteHandler::DEF_PAL_SHIFT - PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShiftPal->setMaxValue((PaletteHandler::DEF_PAL_SHIFT + PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShiftPal->setTickmarkIntervals(4);
myPhaseShiftPal->setToolTip("Adjust PAL phase shift of 'Custom' palette.");
wid.push_back(myPhaseShiftPal);
"NTSC phase", plWidth, kPhaseShiftChanged, fontWidth * 5);
wid.push_back(myPhaseShift);
ypos += lineHeight + VGAP;
const int rgblWidth = _font.getStringWidth("R ");
@ -312,7 +298,7 @@ void VideoAudioDialog::addPaletteTab()
myTVBlueShift->setTickmarkIntervals(2);
myTVBlueShift->setToolTip("Adjust blue shift of 'Custom' palette.");
wid.push_back(myTVBlueShift);
ypos += lineHeight + VGAP;
ypos += lineHeight + VGAP * 2;
xpos -= INDENT;
CREATE_CUSTOM_SLIDERS(Hue, "Hue ", kPaletteUpdated)
@ -322,7 +308,7 @@ void VideoAudioDialog::addPaletteTab()
CREATE_CUSTOM_SLIDERS(Gamma, "Gamma ", kPaletteUpdated)
// The resulting palette
xpos = myPhaseShiftNtsc->getRight() + fontWidth * 2;
xpos = myPhaseShift->getRight() + fontWidth * 2;
addPalette(xpos, VBORDER, _w - 2 * 2 - HBORDER - xpos,
myTVGamma->getBottom() - myTIAPalette->getTop());
@ -599,9 +585,29 @@ void VideoAudioDialog::loadConfig()
myTIAPalette->setSelected(myPalette, PaletteHandler::SETTING_STANDARD);
// Palette adjustables
bool isPAL = instance().hasConsole()
&& instance().console().timing() == ConsoleTiming::pal;
instance().frameBuffer().tiaSurface().paletteHandler().getAdjustables(myPaletteAdj);
myPhaseShiftNtsc->setValue(myPaletteAdj.phaseNtsc);
myPhaseShiftPal->setValue(myPaletteAdj.phasePal);
if(isPAL)
{
myPhaseShift->setLabel("PAL phase");
myPhaseShift->setMinValue((PaletteHandler::DEF_PAL_SHIFT - PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShift->setMaxValue((PaletteHandler::DEF_PAL_SHIFT + PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShift->setTickmarkIntervals(4);
myPhaseShift->setToolTip("Adjust PAL phase shift of 'Custom' palette.");
myPhaseShift->setValue(myPaletteAdj.phasePal);
}
else
{
myPhaseShift->setLabel("NTSC phase");
myPhaseShift->setMinValue((PaletteHandler::DEF_NTSC_SHIFT - PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShift->setMaxValue((PaletteHandler::DEF_NTSC_SHIFT + PaletteHandler::MAX_PHASE_SHIFT) * 10);
myPhaseShift->setTickmarkIntervals(4);
myPhaseShift->setToolTip("Adjust NTSC phase shift of 'Custom' palette.");
myPhaseShift->setValue(myPaletteAdj.phaseNtsc);
}
myTVRedScale->setValue(myPaletteAdj.redScale);
myTVRedShift->setValue(myPaletteAdj.redShift);
myTVGreenScale->setValue(myPaletteAdj.greenScale);
@ -846,9 +852,14 @@ void VideoAudioDialog::setDefaults()
}
case 1: // Palettes
{
bool isPAL = instance().hasConsole()
&& instance().console().timing() == ConsoleTiming::pal;
myTIAPalette->setSelected(PaletteHandler::SETTING_STANDARD);
myPhaseShiftNtsc->setValue(PaletteHandler::DEF_NTSC_SHIFT * 10);
myPhaseShiftPal->setValue(PaletteHandler::DEF_PAL_SHIFT * 10);
myPhaseShift->setValue(isPAL
? PaletteHandler::DEF_PAL_SHIFT * 10
: PaletteHandler::DEF_NTSC_SHIFT * 10);
myTVRedScale->setValue(50);
myTVRedShift->setValue(PaletteHandler::DEF_RGB_SHIFT);
myTVGreenScale->setValue(50);
@ -863,6 +874,7 @@ void VideoAudioDialog::setDefaults()
handlePaletteChange();
handlePaletteUpdate();
break;
}
case 2: // TV effects
{
@ -940,8 +952,7 @@ void VideoAudioDialog::handlePaletteChange()
{
bool enable = myTIAPalette->getSelectedTag().toString() == "custom";
myPhaseShiftNtsc->setEnabled(enable);
myPhaseShiftPal->setEnabled(enable);
myPhaseShift->setEnabled(enable);
myTVRedScale->setEnabled(enable);
myTVRedShift->setEnabled(enable);
myTVGreenScale->setEnabled(enable);
@ -969,8 +980,19 @@ void VideoAudioDialog::handlePaletteUpdate()
myTIAPalette->getSelectedTag().toString());
// Palette adjustables
PaletteHandler::Adjustable paletteAdj;
paletteAdj.phaseNtsc = myPhaseShiftNtsc->getValue();
paletteAdj.phasePal = myPhaseShiftPal->getValue();
bool isPAL = instance().hasConsole()
&& instance().console().timing() == ConsoleTiming::pal;
if(isPAL)
{
paletteAdj.phaseNtsc = myPaletteAdj.phaseNtsc; // unchanged
paletteAdj.phasePal = myPhaseShift->getValue();
}
else
{
paletteAdj.phaseNtsc = myPhaseShift->getValue();
paletteAdj.phasePal = myPaletteAdj.phasePal; // unchanged
}
paletteAdj.redScale = myTVRedScale->getValue();
paletteAdj.redShift = myTVRedShift->getValue();
paletteAdj.greenScale = myTVGreenScale->getValue();
@ -1057,12 +1079,8 @@ void VideoAudioDialog::handleCommand(CommandSender* sender, int cmd,
handlePaletteUpdate();
break;
case kNtscShiftChanged:
handleShiftChanged(myPhaseShiftNtsc);
break;
case kPalShiftChanged:
handleShiftChanged(myPhaseShiftPal);
case kPhaseShiftChanged:
handleShiftChanged(myPhaseShift);
break;
case kRedShiftChanged:
@ -1185,6 +1203,7 @@ void VideoAudioDialog::addPalette(int x, int y, int w, int h)
{
myColor[idx][lum] = new ColorWidget(myTab, _font, x + lwidth + lum * COLW, y + idx * COLH,
COLW + 1, COLH + 1, 0, false);
myColor[idx][lum]->clearFlags(FLAG_CLEARBG | FLAG_RETAIN_FOCUS | FLAG_MOUSE_FOCUS | FLAG_BORDER);
}
}
}

6
src/gui/VideoAudioDialog.hxx
View File

@ -104,8 +104,7 @@ class VideoAudioDialog : public Dialog
// Palettes
PopUpWidget* myTIAPalette{nullptr};
SliderWidget* myPhaseShiftNtsc{nullptr};
SliderWidget* myPhaseShiftPal{nullptr};
SliderWidget* myPhaseShift{nullptr};
SliderWidget* myTVRedScale{nullptr};
SliderWidget* myTVRedShift{nullptr};
SliderWidget* myTVGreenScale{nullptr};
@ -143,8 +142,7 @@ class VideoAudioDialog : public Dialog
kOverscanChanged = 'VDOv',
kPaletteChanged = 'VDpl',
kNtscShiftChanged = 'VDns',
kPalShiftChanged = 'VDps',
kPhaseShiftChanged = 'VDps',
kRedShiftChanged = 'VDrs',
kGreenShiftChanged = 'VDgs',
kBlueShiftChanged = 'VDbs',