Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-10 23:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix interpolated colors

Browse Source
This commit is contained in:
Aaron Culliney 2014-05-18 21:27:19 -07:00
parent 0cea462c29
commit 6af5eb8be8
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/display.c
View File

@ -730,19 +730,13 @@ static inline void _plot_pixels(uint8_t *dst, const uint8_t *src) {
// PlotByte
static inline void _plot_hires(uint16_t ea, uint8_t b, bool is_even, uint8_t *fb_ptr) {
uint8_t *hires_altbase = NULL;
uint8_t *interp_base = NULL;
uint8_t color_buf[DYNAMIC_SZ];
uint8_t *hires_ptr = NULL;
if (is_even) {
hires_ptr = (uint8_t *)&video__hires_even[b<<3];
hires_altbase = (uint8_t *)&video__hires_odd[0];
interp_base = (uint8_t *)&video__even_colors[0];
} else {
hires_ptr = (uint8_t *)&video__hires_odd[b<<3];
hires_altbase = (uint8_t *)&video__hires_even[0];
interp_base = (uint8_t *)&video__odd_colors[0];
}
*((uint32_t *)&color_buf[2]) = *((uint32_t *)(hires_ptr+0));
*((uint16_t *)&color_buf[6]) = *((uint16_t *)(hires_ptr+4));
@ -755,6 +749,13 @@ static inline void _plot_hires(uint16_t ea, uint8_t b, bool is_even, uint8_t *fb
// %eax = +8
if (color_mode != COLOR_NONE) {
uint8_t *hires_altbase = NULL;
if (is_even) {
hires_altbase = (uint8_t *)&video__hires_odd[0];
} else {
hires_altbase = (uint8_t *)&video__hires_even[0];
}
// if right-side color is not black, re-calculate edge values
if (color_buf[DYNAMIC_SZ-2] & 0xff) {
uint16_t pix16 = *((uint16_t *)&apple_ii_64k[0][ea]);
@ -780,11 +781,21 @@ static inline void _plot_hires(uint16_t ea, uint8_t b, bool is_even, uint8_t *fb
}
if (color_mode == COLOR_INTERP) {
uint8_t *interp_base = NULL;
uint8_t *interp_altbase = NULL;
if (is_even) {
interp_base = (uint8_t *)&video__even_colors[0];
interp_altbase = (uint8_t *)&video__odd_colors[0];
} else {
interp_base = (uint8_t *)&video__odd_colors[0];
interp_altbase = (uint8_t *)&video__even_colors[0];
}
// calculate interpolated/bleed colors
_calculate_interp_color(color_buf, 1, interp_base, ea-1);
_calculate_interp_color(color_buf, 1, interp_altbase, ea-1);
_calculate_interp_color(color_buf, 2, interp_base, ea);
_calculate_interp_color(color_buf, 8, interp_base, ea);
_calculate_interp_color(color_buf, 9, interp_base, ea+1);
_calculate_interp_color(color_buf, 9, interp_altbase, ea+1);
}
}