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

Start of tilemap. Only a togglable effect

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1856 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2011-11-06 19:03:27 +00:00
parent 59a20c6e3e
commit f1f658ded4
4 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/buttons.c
View File

@ -4493,7 +4493,8 @@ void Display_effect_states(void)
Display_effect_state(C2+23, 81, "Grid" ,Snap_mode); Display_effect_state(C2+23, 81, "Grid" ,Snap_mode);
Display_effect_state(C2+23,100, "Tiling" ,Tiling_mode); Display_effect_state(C2+23,100, "Tiling" ,Tiling_mode);
Display_effect_state(177+23,24, "8 bit" ,Constraint_mode); Display_effect_state(177+23,24, "8 bit" ,Constraint_mode);
Display_effect_state(177+23,43, "Tilemap",Tilemap_mode);
} }
@ -4526,6 +4527,7 @@ void Button_Effects(void)
Window_set_normal_button( 83,131,104,14,"Feedback: ",1,1,SDLK_f); // 13 Window_set_normal_button( 83,131,104,14,"Feedback: ",1,1,SDLK_f); // 13
Window_set_normal_button(177, 19, 16,16,"",0,1,Config_Key[SPECIAL_FORMAT_CHECKER_MENU][0]); // 14 Window_set_normal_button(177, 19, 16,16,"",0,1,Config_Key[SPECIAL_FORMAT_CHECKER_MENU][0]); // 14
Window_set_normal_button(177, 38, 16,16,"",0,1,KEY_NONE); // 15
Display_feedback_state(); Display_feedback_state();
Display_effect_sprite(EFFECTS_SPRITE_SHADE, 8,20); Display_effect_sprite(EFFECTS_SPRITE_SHADE, 8,20);
@ -4590,6 +4592,9 @@ void Button_Effects(void)
case 10: case 10:
Window_help(BUTTON_EFFECTS, "TILING"); Window_help(BUTTON_EFFECTS, "TILING");
break; break;
case 15:
Window_help(BUTTON_EFFECTS, "TILEMAP");
break;
default: default:
Window_help(BUTTON_EFFECTS, NULL); Window_help(BUTTON_EFFECTS, NULL);
} }
@ -4782,6 +4787,12 @@ void Button_Effects(void)
clicked_button = 11; clicked_button = 11;
} }
break; break;
case 15: // Tilemap
Button_Tilemap_mode();
Hide_cursor();
Display_effect_state(177+23,43, "Tilemap" ,Tilemap_mode);
Display_cursor();
break;
} }
} }
while (clicked_button!=11); while (clicked_button!=11);
@ -4791,7 +4802,7 @@ void Button_Effects(void)
else else
Hide_cursor(); Hide_cursor();
if (!(Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode||Constraint_mode)) if (!(Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode||Constraint_mode||Tilemap_mode))
Unselect_button(BUTTON_EFFECTS); Unselect_button(BUTTON_EFFECTS);
Display_cursor(); Display_cursor();

3
src/buttons.h
View File

@ -441,6 +441,9 @@ void Button_Tiling_menu(void);
void Button_Constraint_mode(void); void Button_Constraint_mode(void);
void Button_Constraint_menu(void); void Button_Constraint_menu(void);
void Button_Tilemap_mode(void);
void Button_Tilemap_menu(void);
/*! /*!
Callback for the command that turns off all drawaing effects. Callback for the command that turns off all drawaing effects.
*/ */

10
src/buttons_effects.c
View File

@ -189,6 +189,16 @@ void Button_Constraint_menu(void)
} }
// Tilemap mode
void Button_Tilemap_mode(void)
{
Tilemap_mode=!Tilemap_mode;
}
void Button_Tilemap_menu(void)
{
}
//--------------------------------- Stencil ---------------------------------- //--------------------------------- Stencil ----------------------------------
void Button_Stencil_mode(void) void Button_Stencil_mode(void)

12
src/global.h
View File

@ -726,9 +726,19 @@ GFX2_GLOBAL byte Mask_mode;
/// Array of booleans. True if the indexed color is protected by the mask. /// Array of booleans. True if the indexed color is protected by the mask.
GFX2_GLOBAL byte Mask_table[256]; GFX2_GLOBAL byte Mask_table[256];
// -- Constraint enforcer // -- Constraint mode
/// Constraint enforcer
GFX2_GLOBAL byte Constraint_mode; GFX2_GLOBAL byte Constraint_mode;
// -- Tilemap mode
/// Tilemap mode
GFX2_GLOBAL byte Tilemap_mode;
/// Tilemap allows swapped tiles : 0:No 1:Horizontal 2:Vertical 3:Both
GFX2_GLOBAL byte Tilemap_allow_swap;
// -- Magnifier data // -- Magnifier data
#ifdef GLOBAL_VARIABLES #ifdef GLOBAL_VARIABLES