notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

neaten up LOW_QUALITY_STAMP_OUTLINE support and make outlines flip/mirror/resize again

Browse source
This commit is contained in:
Albert Cahalan 2004-12-12 20:10:23 +00:00
parent 7cb34040b0
commit cc844b875e
1 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/tuxpaint.c
View file

@ -776,8 +776,20 @@ static void render_brush(void);
static void playsound(int chan, int s, int override); static void playsound(int chan, int s, int override);
static void line_xor(int x1, int y1, int x2, int y2); static void line_xor(int x1, int y1, int x2, int y2);
static void rect_xor(int x1, int y1, int x2, int y2); static void rect_xor(int x1, int y1, int x2, int y2);
static void update_stamp_xor(void);
#ifdef LOW_QUALITY_STAMP_OUTLINE
#define stamp_xor(x,y) rect_xor( \
(x) - (CUR_STAMP_W+1)/2, \
(y) - (CUR_STAMP_H+1)/2, \
(x) + (CUR_STAMP_W+1)/2, \
(y) + (CUR_STAMP_H+1)/2 \
)
#define update_stamp_xor()
#else
static void stamp_xor(int x1, int y1); static void stamp_xor(int x1, int y1);
static void update_stamp_xor(void);
#endif
static void do_eraser(int x, int y); static void do_eraser(int x, int y);
static void disable_avail_tools(void); static void disable_avail_tools(void);
static void enable_avail_tools(void); static void enable_avail_tools(void);
@ -1950,6 +1962,7 @@ static void mainloop(void)
} }
} }
} }
update_stamp_xor();
} }
@ -2153,15 +2166,7 @@ static void mainloop(void)
rec_undo_buffer(); rec_undo_buffer();
stamp_draw(old_x, old_y); stamp_draw(old_x, old_y);
#ifdef LOW_QUALITY_STAMP_OUTLINE
// the +1 is for rounding, probably needed only one side though
rect_xor(old_x - (CUR_STAMP_W+1)/2,
old_y - (CUR_STAMP_H+1)/2,
old_x + (CUR_STAMP_W+1)/2,
old_y + (CUR_STAMP_H+1)/2);
#else
stamp_xor(old_x, old_y); stamp_xor(old_x, old_y);
#endif
playsound(1, SND_STAMP, 1); playsound(1, SND_STAMP, 1);
draw_tux_text(TUX_GREAT, great_str(), 1); draw_tux_text(TUX_GREAT, great_str(), 1);
@ -2869,14 +2874,7 @@ static void mainloop(void)
{ {
if (cur_tool == TOOL_STAMP) if (cur_tool == TOOL_STAMP)
{ {
#ifndef LOW_QUALITY_STAMP_OUTLINE
stamp_xor(old_x, old_y); stamp_xor(old_x, old_y);
#else
rect_xor(old_x - (CUR_STAMP_W+1)/2,
old_y - (CUR_STAMP_H+1)/2,
old_x + (CUR_STAMP_W+1)/2,
old_y + (CUR_STAMP_H+1)/2);
#endif
update_screen(old_x - (CUR_STAMP_W+1)/2 + 96, update_screen(old_x - (CUR_STAMP_W+1)/2 + 96,
old_y - (CUR_STAMP_H+1)/2, old_y - (CUR_STAMP_H+1)/2,
@ -2898,14 +2896,7 @@ static void mainloop(void)
{ {
if (cur_tool == TOOL_STAMP) if (cur_tool == TOOL_STAMP)
{ {
#ifndef LOW_QUALITY_STAMP_OUTLINE
stamp_xor(new_x, new_y); stamp_xor(new_x, new_y);
#else
rect_xor(old_x - (CUR_STAMP_W+1)/2,
old_y - (CUR_STAMP_H+1)/2,
old_x + (CUR_STAMP_W+1)/2,
old_y + (CUR_STAMP_H+1)/2);
#endif
update_screen(old_x - (CUR_STAMP_W+1)/2 + 96, update_screen(old_x - (CUR_STAMP_W+1)/2 + 96,
old_y - (CUR_STAMP_H+1)/2, old_y - (CUR_STAMP_H+1)/2,
@ -12783,7 +12774,7 @@ static int current_language(void)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// stamp outline // stamp outline
#ifndef LOW_QUALITY_STAMP_OUTLINE
/* XOR-based outline of rubber stamp shapes /* XOR-based outline of rubber stamp shapes
(unused if LOW_QUALITY_STAMP_OUTLINE is #defined) */ (unused if LOW_QUALITY_STAMP_OUTLINE is #defined) */
@ -12961,7 +12952,7 @@ static void stamp_xor(int x, int y)
SDL_UnlockSurface(screen); SDL_UnlockSurface(screen);
} }
#endif
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
/* Returns whether a particular stamp can be colored: */ /* Returns whether a particular stamp can be colored: */