Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-16 21:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Support for PAL killing color-burst during TEXT video mode (#763, PR #823)

Browse Source 
tested with:
. AppleWin-Test repo -> Tests-Various.dsk (tests E, F)
. FT's ANSI STORY & TRIBU demos
This commit is contained in:
TomCh 2020-08-17 18:11:31 +01:00 committed by GitHub
parent e69a54832c
commit 21b0fbf97a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source/NTSC.cpp
View File

@ -691,7 +691,7 @@ void update7MonoPixels( uint16_t bits )
// NB. g_nLastColumnPixelNTSC = bits.b13 will be superseded by these parent funcs which use bits.b14:
// . updateScreenDoubleHires80(), updateScreenDoubleLores80(), updateScreenText80()
inline void updatePixels( uint16_t bits )
inline void updatePixels(uint16_t bits)
{
if (!GetColorBurst())
{
@ -808,6 +808,9 @@ inline void updateVideoScannerHorzEOL()
//===========================================================================
inline void updateVideoScannerAddress()
{
if (g_nVideoMixed && g_nVideoClockVert >= VIDEO_SCANNER_Y_MIXED && GetVideoRefreshRate() == VR_50HZ)
g_nColorBurstPixels = 0; // instantaneously kill color-burst!
g_pVideoAddress = g_nVideoClockVert < VIDEO_SCANNER_Y_DISPLAY ? g_pScanLines[2*g_nVideoClockVert] : g_pScanLines[0];
// Adjust, as these video styles have 2x 14M pixels of pre-render
@ -1143,24 +1146,28 @@ void updateMonochromeTables( uint16_t r, uint16_t g, uint16_t b )
static void updatePixelBnWMonitorSingleScanline (uint16_t compositeSignal)
{
updateFramebufferMonitorSingleScanline(compositeSignal, g_aBnWMonitorCustom);
updateColorPhase(); // Maintain color-phase, as could be switching graphics/text video modes mid-scanline
}
//===========================================================================
static void updatePixelBnWMonitorDoubleScanline (uint16_t compositeSignal)
{
updateFramebufferMonitorDoubleScanline(compositeSignal, g_aBnWMonitorCustom);
updateColorPhase(); // Maintain color-phase, as could be switching graphics/text video modes mid-scanline
}
//===========================================================================
static void updatePixelBnWColorTVSingleScanline (uint16_t compositeSignal)
{
updateFramebufferTVSingleScanline(compositeSignal, g_aBnWColorTVCustom);
updateColorPhase(); // Maintain color-phase, as could be switching graphics/text video modes mid-scanline
}
//===========================================================================
static void updatePixelBnWColorTVDoubleScanline (uint16_t compositeSignal)
{
updateFramebufferTVDoubleScanline(compositeSignal, g_aBnWColorTVCustom);
updateColorPhase(); // Maintain color-phase, as could be switching graphics/text video modes mid-scanline
}
//===========================================================================
@ -1601,7 +1608,6 @@ void updateScreenText40 (long cycles6502)
bits ^= g_nTextFlashMask;
updatePixels( bits );
}
}
updateVideoScannerHorzEOL();
@ -1642,6 +1648,7 @@ void updateScreenText80 (long cycles6502)
uint16_t bits = (main << 7) | (aux & 0x7f);
if (g_eVideoType != VT_COLOR_MONITOR_RGB) // No extra 14M bit needed for VT_COLOR_MONITOR_RGB
bits = (bits << 1) | g_nLastColumnPixelNTSC; // GH#555: Align TEXT80 chars with DHGR
updatePixels( bits );
g_nLastColumnPixelNTSC = (bits >> 14) & 1;
}
@ -1762,6 +1769,32 @@ void NTSC_SetVideoMode( uint32_t uVideoModeFlags, bool bDelay/*=false*/ )
}
}
if (GetVideoRefreshRate() == VR_50HZ)
{
if (uVideoModeFlags & VF_TEXT)
{
g_nColorBurstPixels = 0; // (For mid-line video mode change) Instantaneously kill color-burst! (not correct as TV's can take many lines)
// Switching mid-line from graphics to TEXT
if (g_eVideoType == VT_COLOR_MONITOR_NTSC &&
g_pFuncUpdateGraphicsScreen != updateScreenText40 && g_pFuncUpdateGraphicsScreen != updateScreenText80)
{
g_pVideoAddress += 2; // eg. FT's TRIBU demo & ANSI STORY (at "turn the disk over!")
}
}
else
{
g_nColorBurstPixels = 1024; // (For mid-line video mode change)
// Switching mid-line from TEXT to graphics
if (g_eVideoType == VT_COLOR_MONITOR_NTSC &&
(g_pFuncUpdateGraphicsScreen == updateScreenText40 || g_pFuncUpdateGraphicsScreen == updateScreenText80))
{
g_pVideoAddress -= 2; // eg. FT's TRIBU demo & ANSI STORY (at "turn the disk over!")
}
}
}
if (uVideoModeFlags & VF_TEXT)
{
if (uVideoModeFlags & VF_80COL)
@ -1821,9 +1854,10 @@ void NTSC_SetVideoMode( uint32_t uVideoModeFlags, bool bDelay/*=false*/ )
//===========================================================================
void NTSC_SetVideoStyle() // (int v, int s)
void NTSC_SetVideoStyle(void)
{
int half = IsVideoStyle(VS_HALF_SCANLINES);
const bool half = IsVideoStyle(VS_HALF_SCANLINES);
const VideoRefreshRate_e refresh = GetVideoRefreshRate();
uint8_t r, g, b;
switch ( g_eVideoType )
@ -1838,7 +1872,8 @@ void NTSC_SetVideoStyle() // (int v, int s)
g_pFuncUpdateBnWPixel = updatePixelBnWColorTVSingleScanline;
g_pFuncUpdateHuePixel = updatePixelHueColorTVSingleScanline;
}
else {
else
{
g_pFuncUpdateBnWPixel = updatePixelBnWColorTVDoubleScanline;
g_pFuncUpdateHuePixel = updatePixelHueColorTVDoubleScanline;
}
@ -1855,7 +1890,8 @@ void NTSC_SetVideoStyle() // (int v, int s)
g_pFuncUpdateBnWPixel = updatePixelBnWMonitorSingleScanline;
g_pFuncUpdateHuePixel = updatePixelHueMonitorSingleScanline;
}
else {
else
{
g_pFuncUpdateBnWPixel = updatePixelBnWMonitorDoubleScanline;
g_pFuncUpdateHuePixel = updatePixelHueMonitorDoubleScanline;
}
@ -1867,12 +1903,9 @@ void NTSC_SetVideoStyle() // (int v, int s)
b = 0xFF;
updateMonochromeTables( r, g, b ); // Custom Monochrome color
if (half)
{
g_pFuncUpdateBnWPixel = g_pFuncUpdateHuePixel = updatePixelBnWColorTVSingleScanline;
}
else {
else
g_pFuncUpdateBnWPixel = g_pFuncUpdateHuePixel = updatePixelBnWColorTVDoubleScanline;
}
break;
case VT_MONO_AMBER:
@ -1906,13 +1939,9 @@ void NTSC_SetVideoStyle() // (int v, int s)
_mono:
updateMonochromeTables( r, g, b ); // Custom Monochrome color
if (half)
{
g_pFuncUpdateBnWPixel = g_pFuncUpdateHuePixel = updatePixelBnWMonitorSingleScanline;
}
else
{
g_pFuncUpdateBnWPixel = g_pFuncUpdateHuePixel = updatePixelBnWMonitorDoubleScanline;
}
break;
}
}