Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Colors in hires mode are incorrect #103

Closed
wants to merge 2 commits into from
Closed

Colors in hires mode are incorrect #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f41bae
Fixes #102 Colors in hires mode are incorrect
st3fan Dec 27, 2016
07bcaec
Add color and monochrome tests to scr_test
st3fan Dec 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/scr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ static uint16_t hgr_line_offsets[192] = {

static SDL_Color hgr_colors[16] = {
{ 0, 0, 0, 0 }, // 0 Black
{ 0, 0, 204, 0 }, // 1 Blue
{ 128, 0, 128, 0 }, // 2 Purple
{ 0, 100, 0, 0 }, // 3 Green
{ 0, 100, 0, 0 }, // 4 Red
{ 0, 150, 255, 0 }, // 1 Light Blue
{ 255, 64, 255, 0 }, // 2 Purple
{ 0, 249, 0, 0 }, // 3 Green
{ 255, 147, 0, 0 }, // 4 Orange
{ 255, 255, 255, 0 } // 5 White
};

Expand Down Expand Up @@ -225,7 +225,7 @@ static void inline scr_render_hgr_line_color(struct scr_t *scr, int line, uint16
}
} else {
if (c & 0x80) {
pixels[x] = 4; // Red
pixels[x] = 4; // Orange
} else {
pixels[x] = 3; // Green
}
Expand All @@ -245,6 +245,14 @@ static void inline scr_render_hgr_line_color(struct scr_t *scr, int line, uint16
}
}

// Fill black pixels with same neighbours

for (int i = 0; i < (280-1); i++) {
if (pixels[i] == pixels[i+2] && pixels[i] != 0) {
pixels[i+1] = pixels[i];
}
}

// Now draw them

for (x = 0; x < 280; x++) {
Expand Down
18 changes: 16 additions & 2 deletions src/scr_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,24 @@ void lgr_full_refresh_test(struct scr_t *scr) {
ewm_scr_update(scr, 0, 0);
}

void hgr_full_refresh_setup(struct scr_t *scr) {
void hgr_full_refresh_setup_monochrome(struct scr_t *scr) {
scr->two->screen_mode = EWM_A2P_SCREEN_MODE_GRAPHICS;
scr->two->screen_page = EWM_A2P_SCREEN_PAGE1;
scr->two->screen_graphics_mode = EWM_A2P_SCREEN_GRAPHICS_MODE_HGR;
scr->two->screen_graphics_style = EWM_A2P_SCREEN_GRAPHICS_STYLE_FULL;
scr->color_scheme = EWM_SCR_COLOR_SCHEME_MONOCHROME;

for (uint16_t a = 0x2000; a <= 0x5fff; a++) {
mem_set_byte(scr->two->cpu, a, rand());
}
}

void hgr_full_refresh_setup_color(struct scr_t *scr) {
scr->two->screen_mode = EWM_A2P_SCREEN_MODE_GRAPHICS;
scr->two->screen_page = EWM_A2P_SCREEN_PAGE1;
scr->two->screen_graphics_mode = EWM_A2P_SCREEN_GRAPHICS_MODE_HGR;
scr->two->screen_graphics_style = EWM_A2P_SCREEN_GRAPHICS_STYLE_FULL;
scr->color_scheme = EWM_SCR_COLOR_SCHEME_COLOR;

for (uint16_t a = 0x2000; a <= 0x5fff; a++) {
mem_set_byte(scr->two->cpu, a, rand());
Expand Down Expand Up @@ -120,7 +133,8 @@ int main() {

test(two->scr, "txt_full_refresh", txt_full_refresh_setup, txt_full_refresh_test);
test(two->scr, "lgr_full_refresh", lgr_full_refresh_setup, lgr_full_refresh_test);
test(two->scr, "hgr_full_refresh", hgr_full_refresh_setup, hgr_full_refresh_test);
test(two->scr, "hgr_full_refresh_mono", hgr_full_refresh_setup_monochrome, hgr_full_refresh_test);
test(two->scr, "hgr_full_refresh_color", hgr_full_refresh_setup_color, hgr_full_refresh_test);

// Destroy DSL things

Expand Down