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

Mirrored preview and outlines now use pre-drawn mirror image, if available.

Browse source
This commit is contained in:
William Kendrick 2003-09-29 06:31:05 +00:00
parent 2d76cbd06b
commit c537d9562d
1 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/tuxpaint.c
View file

@ -1464,7 +1464,7 @@ void mainloop(void)
if (cur_tool == TOOL_STAMP && !disable_stamp_controls) if (cur_tool == TOOL_STAMP && !disable_stamp_controls)
max = 10; max = 10;
if (num_things > 14 + TOOLOFFSET) if (num_things > max + TOOLOFFSET)
{ {
if (event.button.y < 40 + 24) if (event.button.y < 40 + 24)
{ {
@ -1519,7 +1519,7 @@ void mainloop(void)
event.button.y < event.button.y <
(48 * ((max - 2) / 2 + TOOLOFFSET / 2)) + 40 + 24 + 24) (48 * ((max - 2) / 2 + TOOLOFFSET / 2)) + 40 + 24 + 24)
{ {
if (thing_scroll < num_things - 12 - TOOLOFFSET) if (thing_scroll < num_things - (max - 2) - TOOLOFFSET)
{ {
thing_scroll = thing_scroll + 2; thing_scroll = thing_scroll + 2;
do_draw = 1; do_draw = 1;
@ -10736,11 +10736,27 @@ void stamp_xor(int x, int y)
{ {
int xx, yy, rx, ry; int xx, yy, rx, ry;
Uint8 r, g, b, a, olda, abovea; Uint8 r, g, b, a, olda, abovea;
SDL_Surface * surf_ptr;
SDL_LockSurface(img_stamps[cur_stamp]);
/* Use pre-mirrored stamp image, if applicable: */
if (state_stamps[cur_stamp]->mirrored &&
img_stamps_premirror[cur_stamp] != NULL)
{
surf_ptr = img_stamps_premirror[cur_stamp];
}
else
{
surf_ptr = img_stamps[cur_stamp];
}
SDL_LockSurface(surf_ptr);
SDL_LockSurface(screen); SDL_LockSurface(screen);
for (yy = (y % 2) + 1; yy < img_stamps[cur_stamp]->h; yy = yy + 2) for (yy = (y % 2) + 1; yy < surf_ptr->h; yy = yy + 2)
{ {
olda = 0; olda = 0;
@ -10748,25 +10764,30 @@ void stamp_xor(int x, int y)
/* Compensate for flip! */ /* Compensate for flip! */
if (state_stamps[cur_stamp]->flipped) if (state_stamps[cur_stamp]->flipped)
ry = img_stamps[cur_stamp]->h - 1 - yy; ry = surf_ptr->h - 1 - yy;
else else
ry = yy; ry = yy;
for (xx = (x % 2); xx < img_stamps[cur_stamp]->w; xx = xx + 2) for (xx = (x % 2); xx < surf_ptr->w; xx = xx + 2)
{ {
/* Compensate for mirror! */ /* Compensate for mirror! */
if (state_stamps[cur_stamp]->mirrored) if (state_stamps[cur_stamp]->mirrored &&
img_stamps_premirror[cur_stamp] == NULL)
{
rx = img_stamps[cur_stamp]->w - 1 - xx; rx = img_stamps[cur_stamp]->w - 1 - xx;
}
else else
{
rx = xx; rx = xx;
}
SDL_GetRGBA(getpixel(img_stamps[cur_stamp], rx, ry), SDL_GetRGBA(getpixel(surf_ptr, rx, ry),
img_stamps[cur_stamp]->format, &r, &g, &b, &a); surf_ptr->format, &r, &g, &b, &a);
SDL_GetRGBA(getpixel(img_stamps[cur_stamp], rx, ry - 1), SDL_GetRGBA(getpixel(surf_ptr, rx, ry - 1),
img_stamps[cur_stamp]->format, &r, &g, &b, &abovea); surf_ptr->format, &r, &g, &b, &abovea);
if ((a < 128 && olda >= 128) || if ((a < 128 && olda >= 128) ||
(a >= 128 && olda < 128) || (a >= 128 && olda < 128) ||
@ -10782,7 +10803,7 @@ void stamp_xor(int x, int y)
} }
SDL_UnlockSurface(screen); SDL_UnlockSurface(screen);
SDL_UnlockSurface(img_stamps[cur_stamp]); SDL_UnlockSurface(surf_ptr);
} }