Implement a more generic "rasters" mode for CPC

This is similar to mode 5, but with less constraints:
- All inks can have split rasters
- Split rasters have a min width of 32 pixels

Note that this is nowhere near enough to make sure the image will be
renderable (number of colors should be limited, unless there is a span
without rasters allowing to reload registers with new colors, and
moving from one pen to another also has a cost). The goal is to offer no
over-restriction (everything that can be shown on the real machine is
drawable). Additional constraints may be checked from a lua script that
will generate the code and data for displaying the picture.
This commit is contained in:
Adrien Destugues
2018-06-29 11:02:34 +02:00
parent 1d71a0759f
commit 9d46d1e90f
6 changed files with 138 additions and 59 deletions

View File

@@ -3213,7 +3213,8 @@ byte Read_pixel_from_current_screen (word x,word y)
return *((y)*Main.image_width+(x)+Main.backups->Pages->Image[Main.current_layer].Pixels);
}
if (Main.backups->Pages->Image_mode == IMAGE_MODE_MODE5)
if (Main.backups->Pages->Image_mode == IMAGE_MODE_MODE5
|| Main.backups->Pages->Image_mode == IMAGE_MODE_RASTER)
if (Main.current_layer==4)
return *(Main.backups->Pages->Image[Main.current_layer].Pixels + x+y*Main.image_width);
@@ -3632,7 +3633,7 @@ void Update_pixel_renderer(void)
Pixel_in_current_screen = Pixel_in_screen_zx;
Pixel_in_current_screen_with_preview = Pixel_in_screen_zx_with_preview;
}
// Implicit else : Image_mode must be IMAGE_MODE_MODE5
// Implicit else : Image_mode must be IMAGE_MODE_MODE5 or IMAGE_MODE_RASTER
else if ( Main.current_layer == 4)
{
// overlay
@@ -3647,7 +3648,7 @@ void Update_pixel_renderer(void)
}
else
{
// layered (again, for layers > 4 in MODE5)
// layered (again, for layers > 4 in MODE5 and RASTER)
Pixel_in_current_screen = Pixel_in_screen_layered;
Pixel_in_current_screen_with_preview = Pixel_in_screen_layered_with_preview;
}