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

Check_block_Constraint: check ZX spectrum color intensity. And C64 Multi background color

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-28 15:46:32 +01:00
parent 740983a719
commit be5ead7a04
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/buttons_effects.c
View File

@ -171,15 +171,31 @@ void Menu_tag_colors(char * window_title, byte * table, byte * mode, byte can_ca
/// ///
/// This function count the number of colors in a block and reports errors /// This function count the number of colors in a block and reports errors
/// by marking the pixel in color 17 in layer 2. /// by marking the pixel in color 17 in layer 2.
/// @param block_width block width /// @param mode
/// @param block_height block height /// @return -1 if the mode is invalid
/// @param max_colors numbers of colors allowed in a block
/// @return the number of constraint errors detected /// @return the number of constraint errors detected
static int Check_block_constraints(int block_width, int block_height, int max_colors) static int Check_block_constraints(enum IMAGE_MODES mode)
{ {
int x, y, x2, y2; int x, y, x2, y2;
int block_width = 8, block_height = 8, max_colors = 2; // default values
int error_count = 0; int error_count = 0;
switch (mode)
{
case IMAGE_MODE_THOMSON:
block_height = 1;
break;
case IMAGE_MODE_ZX:
case IMAGE_MODE_C64HIRES:
break;
case IMAGE_MODE_C64MULTI:
block_width = 4;
max_colors = 3; // 3 + background color
break;
default:
return -1; // unsupported mode
}
for (y = 0; y <= Main.image_height - block_height; y += block_height) for (y = 0; y <= Main.image_height - block_height; y += block_height)
{ {
for (x = 0; x <= Main.image_width - block_width; x += block_width) for (x = 0; x <= Main.image_width - block_width; x += block_width)
@ -201,14 +217,32 @@ static int Check_block_constraints(int block_width, int block_height, int max_co
error_count++; error_count++;
continue; continue;
} }
if (mode == IMAGE_MODE_C64MULTI && col == 0) // Background color
continue;
// search color in already used ones // search color in already used ones
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
if (col == c[i]) if (col == c[i])
break; break;
// ZX Spectrum : consider both blacks as the same color
if (mode == IMAGE_MODE_ZX && (col & 7) == 0 && (c[i] & 7) == 0)
break;
} }
if (i >= count) // not found if (i >= count) // not found
{ {
// ZX Spectrum : check that both colors have same intensity (except black)
if (mode == IMAGE_MODE_ZX && count > 0)
{
if ((col & 8) != (c[0] & 8) && (col & 7) != 0 && (c[0] & 7) != 0)
{
GFX2_Log(GFX2_INFO, "Check_block_constraints() intensity error at (%d,%d) color=%d (other color=%d)\n", x+x2, y+y2, col, c[0]);
if (Main.backups->Pages->Nb_layers < 2)
Add_layer(Main.backups, 1);
Main.backups->Pages->Image[1].Pixels[x+x2 + (y+y2)*Main.image_width] = 17;
error_count++;
continue;
}
}
if (count >= max_colors) if (count >= max_colors)
{ {
// constraint error : add color 17 pixel in layer 2 // constraint error : add color 17 pixel in layer 2
@ -279,18 +313,8 @@ void Button_Constraint_mode(void)
} }
} }
break; break;
case IMAGE_MODE_THOMSON: default:
Check_block_constraints(8, 1, 2); Check_block_constraints(Selected_Constraint_Mode);
break;
case IMAGE_MODE_ZX: /// @todo check color intensities for ZX spectrum
case IMAGE_MODE_C64HIRES:
Check_block_constraints(8, 8, 2);
break;
case IMAGE_MODE_C64MULTI: /// @todo check common background color for C64 Multicolor
Check_block_constraints(4, 8, 4);
break;
default: // nothing to do.
break;
} }
/// Setting the palette is done in @ref Button_Constraint_menu (8-bit constraint window) /// Setting the palette is done in @ref Button_Constraint_menu (8-bit constraint window)