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

add PIXEL_MODE_TMS9918G2 (MSX, ColecoVision, etc.)

Browse Source
This commit is contained in:
Thomas Bernard 2020-01-09 23:11:40 +01:00
parent 6feb08649f
commit cad8658225
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/buttons_effects.c
View File

@ -189,6 +189,7 @@ static int Check_block_constraints(enum IMAGE_MODES mode)
switch (mode)
{
case IMAGE_MODE_TMS9918G2:
case IMAGE_MODE_THOMSON:
block_height = 1;
break;
@ -278,7 +279,13 @@ static int Check_block_constraints(enum IMAGE_MODES mode)
GFX2_Log(GFX2_INFO, "Check_block_constraints() constraint error at (%d,%d)\n", x+x2, y+y2);
if (Main.backups->Pages->Nb_layers < 2)
Add_layer(Main.backups, 1);
Pixel_in_layer(1, x+x2, y+y2, errcol);
if (mode == IMAGE_MODE_TMS9918G2)
{
Pixel_in_layer(1, x+x2, y+y2, col); // put color in sprite layer
Pixel_in_layer(0, x+x2, y+y2, c[0]); // put other color in picture layer
}
else
Pixel_in_layer(1, x+x2, y+y2, errcol);
error_count++;
}
else
@ -548,6 +555,13 @@ void Button_Constraint_mode(void)
else
Convert_to_dhgr();
break;
case IMAGE_MODE_TMS9918G2:
// switch to layer mode if needed
if (Main.backups->Pages->Image_mode != IMAGE_MODE_LAYERED)
Switch_layer_mode(IMAGE_MODE_LAYERED);
Main.backups->Pages->Transparent_color = 0;
Check_block_constraints(Selected_Constraint_Mode);
break;
default:
Check_block_constraints(Selected_Constraint_Mode);
}
@ -587,6 +601,7 @@ void Button_Constraint_menu(void)
{IMAGE_MODE_C64FLI, "C64 FLI", "improved multicolor ", 1}, // 160x200
{IMAGE_MODE_HGR, "Apple II HGR", "6 colors ", 1}, // 280x192
{IMAGE_MODE_DHGR, "Apple II DHGR", "\"Le Chat Mauve\" mode3 ", 1}, // 560x192
{IMAGE_MODE_TMS9918G2,"TMS9918 Mode 2","MSX Screen2, etc. ", 1}, // 256x192
};
Open_window(194,95+36,"8-bit constraints");
@ -711,6 +726,10 @@ void Button_Constraint_menu(void)
End_of_modification();
/// @todo enable TALL pixels when switching to 560x192
break;
case IMAGE_MODE_TMS9918G2:
Resize_image(256, 192);
End_of_modification();
break;
default:
break;
}
@ -736,6 +755,7 @@ void Button_Constraint_menu(void)
break;
case IMAGE_MODE_RASTER:
case IMAGE_MODE_THOMSON:
case IMAGE_MODE_TMS9918G2:
Snap_width = 8;
Snap_height = 999; // maximum value (3 digits)
break;
@ -871,6 +891,13 @@ void Button_Constraint_menu(void)
Fore_color = 15;
Back_color = 0;
break;
case IMAGE_MODE_TMS9918G2:
memset(Main.palette, 0, sizeof(T_Palette));
MSX_set_palette(Main.palette);
First_color_in_palette = 0;
Fore_color = 15; // White
Back_color = 1; // Black
break;
default:
break;
}

1
src/const.h
View File

@ -637,6 +637,7 @@ enum IMAGE_MODES
IMAGE_MODE_HGR, ///< Apple 2 HGR
IMAGE_MODE_DHGR, ///< Apple 2 DHGR
IMAGE_MODE_MEGADRIVE, ///< Sega Mega Drive / Genesis
IMAGE_MODE_TMS9918G2, ///< TMS9918 Mode 2 (MSX, ColecoVision, SC-3000, etc.)
};
/// Circle / Ellipse Modes

2
src/graph.c
View File

@ -3308,6 +3308,7 @@ static void Pixel_in_screen_egx_with_opt_preview(word x,word y,byte color,int pr
}
/// Paint a pixel in 40col Thomson MO/TO mode
/// or TMS9918 Graphics 2
///
/// Only 2 colors in a 8x1 pixel block
static void Pixel_in_screen_thomson_with_opt_preview(word x,word y,byte color,int preview)
@ -3918,6 +3919,7 @@ void Update_pixel_renderer(void)
Pixel_in_current_screen_with_opt_preview = Pixel_in_screen_egx_with_opt_preview;
break;
case IMAGE_MODE_THOMSON:
case IMAGE_MODE_TMS9918G2:
Pixel_in_current_screen_with_opt_preview = Pixel_in_screen_thomson_with_opt_preview;
break;
case IMAGE_MODE_GBC:

1
src/oldies.c
View File

@ -69,6 +69,7 @@ static const struct {
{ IMAGE_MODE_HGR, "APPLE2_HGR" },
{ IMAGE_MODE_DHGR, "APPLE2_DHGR" },
{ IMAGE_MODE_MEGADRIVE, "SEGAMEGADRIVE" },
{ IMAGE_MODE_TMS9918G2, "TMS9918_G2" },
};
const char * Constraint_mode_label(enum IMAGE_MODES mode)