m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support Amstrad CPC mode EGX2

Browse Source
This commit is contained in:
Adrien Destugues 2017-05-08 09:54:30 +02:00
parent 309538c190
commit 0b6e782f74
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buttons_effects.c
View File

@ -170,14 +170,14 @@ void Button_Constraint_mode()
{
int pixel;
if (Main_backups->Pages->Image_mode >= IMAGE_MODE_MODE5)
if (Main_backups->Pages->Image_mode > IMAGE_MODE_ANIMATION)
{
// Disable
Switch_layer_mode(IMAGE_MODE_LAYERED);
return;
}
if (Selected_Constraint_Mode < IMAGE_MODE_MODE5)
if (Selected_Constraint_Mode <= IMAGE_MODE_ANIMATION)
Selected_Constraint_Mode = IMAGE_MODE_EGX;
if (Selected_Constraint_Mode == IMAGE_MODE_MODE5)
@ -218,7 +218,7 @@ void Button_Constraint_menu(void)
//Window_dropdown_add_item(dropdown, IMAGE_MODE_ZX, "ZX Spectrum");
//Window_dropdown_add_item(dropdown, IMAGE_MODE_GBC, "Game Boy Color");
Window_dropdown_add_item(dropdown, IMAGE_MODE_EGX, "EGX (CPC)");
//Window_dropdown_add_item(dropdown, IMAGE_MODE_EGX2, "EGX2 (CPC)");
Window_dropdown_add_item(dropdown, IMAGE_MODE_EGX2, "EGX2 (CPC)");
Window_dropdown_add_item(dropdown, IMAGE_MODE_MODE5, "Mode 5 (CPC)");
Update_window_area(0,0,Window_width, Window_height);

23
src/graph.c
View File

@ -3005,24 +3005,40 @@ void Pixel_in_screen_layered_with_preview(word x,word y,byte color)
void Pixel_in_screen_egx(word x,word y,byte color)
{
uint8_t mask;
if (Main_backups->Pages->Image_mode == IMAGE_MODE_EGX)
{
mask = 0xF3;
} else {
mask = 0xFD;
}
if (y & 1)
{
Pixel_in_screen_layered(x & ~1,y,color);
Pixel_in_screen_layered(x | 1,y,color);
}
else
Pixel_in_screen_layered(x,y,color & 0xF3);
Pixel_in_screen_layered(x,y,color & mask);
}
void Pixel_in_screen_egx_with_preview(word x,word y,byte color)
{
uint8_t mask;
if (Main_backups->Pages->Image_mode == IMAGE_MODE_EGX)
{
mask = 0xF3;
} else {
mask = 0xFD;
}
if (y & 1)
{
Pixel_in_screen_layered_with_preview(x & ~1,y,color);
Pixel_in_screen_layered_with_preview(x | 1,y,color);
}
else
Pixel_in_screen_layered_with_preview(x,y,color & 0xF3);
Pixel_in_screen_layered_with_preview(x,y,color & mask);
}
/// Paint a a single pixel in image only : in a layer under one that acts as a layer-selector (mode 5).
@ -3131,7 +3147,8 @@ void Update_pixel_renderer(void)
Pixel_in_current_screen_with_preview = Pixel_in_screen_layered_with_preview;
}
else
if (Main_backups->Pages->Image_mode == IMAGE_MODE_EGX)
if (Main_backups->Pages->Image_mode == IMAGE_MODE_EGX
|| Main_backups->Pages->Image_mode == IMAGE_MODE_EGX2)
{
// layered
Pixel_in_current_screen = Pixel_in_screen_egx;