Video 7 RGB doesn't have NTSC artifacts on the mixed mode text
This commit is contained in:
parent
ddfc462927
commit
624374f344
|
@ -51,6 +51,7 @@ func snapshotByMode(vs VideoSource, videoMode uint16, screenMode int) *image.RGB
|
||||||
mixMode := videoMode & VideoMixTextMask
|
mixMode := videoMode & VideoMixTextMask
|
||||||
isSecondPage := (videoMode & VideoSecondPage) != 0
|
isSecondPage := (videoMode & VideoSecondPage) != 0
|
||||||
isAltText := (videoMode & VideoAltText) != 0
|
isAltText := (videoMode & VideoAltText) != 0
|
||||||
|
isRGBCard := (videoMode & VideoRGBCard) != 0
|
||||||
|
|
||||||
var lightColor color.Color = color.White
|
var lightColor color.Color = color.White
|
||||||
if screenMode == ScreenModeGreen {
|
if screenMode == ScreenModeGreen {
|
||||||
|
@ -99,7 +100,7 @@ func snapshotByMode(vs VideoSource, videoMode uint16, screenMode int) *image.RGB
|
||||||
|
|
||||||
if mixMode != 0 {
|
if mixMode != 0 {
|
||||||
var bottom *image.RGBA
|
var bottom *image.RGBA
|
||||||
applyNTSCFilter := screenMode != ScreenModeGreen
|
applyNTSCFilter := screenMode != ScreenModeGreen && !isRGBCard
|
||||||
switch mixMode {
|
switch mixMode {
|
||||||
case VideoMixText40:
|
case VideoMixText40:
|
||||||
bottom = snapshotText40(vs, isSecondPage, isAltText, lightColor)
|
bottom = snapshotText40(vs, isSecondPage, isAltText, lightColor)
|
||||||
|
|
|
@ -35,6 +35,7 @@ const (
|
||||||
VideoModifiersMask uint16 = 0xf000
|
VideoModifiersMask uint16 = 0xf000
|
||||||
VideoSecondPage uint16 = 0x1000
|
VideoSecondPage uint16 = 0x1000
|
||||||
VideoAltText uint16 = 0x2000
|
VideoAltText uint16 = 0x2000
|
||||||
|
VideoRGBCard uint16 = 0x4000
|
||||||
)
|
)
|
||||||
|
|
||||||
// VideoSource provides the info to build the video output
|
// VideoSource provides the info to build the video output
|
||||||
|
|
|
@ -89,6 +89,9 @@ func (a *Apple2) GetCurrentVideoMode() uint16 {
|
||||||
if isAltText {
|
if isAltText {
|
||||||
mode |= screen.VideoAltText
|
mode |= screen.VideoAltText
|
||||||
}
|
}
|
||||||
|
if isRGBCard {
|
||||||
|
mode |= screen.VideoRGBCard
|
||||||
|
}
|
||||||
|
|
||||||
return mode
|
return mode
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue