matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

triangle brush fixes

Browse Source
This commit is contained in:
Jacob1 2012-03-25 16:11:11 -04:00 committed by jacksonmj
parent 2c3a2e2519
commit 2d1c5696a4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics.c
View File

@ -3704,15 +3704,14 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry)
xor_pixel(x, j, vid); xor_pixel(x, j, vid);
else else
{ {
int tempy = y, i, j, jmax, oldy; int tempy = y, i, j, oldy;
if (CURRENT_BRUSH == TRI_BRUSH) if (CURRENT_BRUSH == TRI_BRUSH)
tempy = y + ry; tempy = y + ry - 1;
for (i = x - rx; i <= x; i++) { for (i = x - rx; i <= x; i++) {
oldy = tempy; oldy = tempy;
while (InCurrentBrush(i-x,tempy-y,rx,ry)) while (InCurrentBrush(i-x,tempy-y,rx,ry))
tempy = tempy - 1; tempy = tempy - 1;
tempy = tempy + 1; tempy = tempy + 1;
jmax = 2*y - tempy;
if (oldy != tempy && CURRENT_BRUSH != SQUARE_BRUSH) if (oldy != tempy && CURRENT_BRUSH != SQUARE_BRUSH)
oldy--; oldy--;
if (CURRENT_BRUSH == TRI_BRUSH) if (CURRENT_BRUSH == TRI_BRUSH)

10
src/powder.c
View File

@ -3082,17 +3082,17 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags, int fill)
{ {
int tempy = y, i, j, jmax, oldy; int tempy = y, i, j, jmax, oldy;
if (CURRENT_BRUSH == TRI_BRUSH) if (CURRENT_BRUSH == TRI_BRUSH)
tempy = y + ry; tempy = y + ry - 1;
for (i = x - rx; i <= x; i++) { for (i = x - rx; i <= x; i++) {
oldy = tempy; oldy = tempy;
while (InCurrentBrush(i-x,tempy-y,rx,ry)) while (InCurrentBrush(i-x,tempy-y,rx,ry))
tempy = tempy - 1; tempy = tempy - 1;
tempy = tempy + 1; tempy = tempy + 1;
if (fill)
{
jmax = 2*y - tempy; jmax = 2*y - tempy;
if (CURRENT_BRUSH == TRI_BRUSH) if (CURRENT_BRUSH == TRI_BRUSH)
jmax = y + ry; jmax = y + ry;
if (fill)
{
for (j = tempy; j <= jmax; j++) { for (j = tempy; j <= jmax; j++) {
if (create_parts2(fn,i,j,c,rx,ry,flags)) if (create_parts2(fn,i,j,c,rx,ry,flags))
f = 1; f = 1;
@ -3104,8 +3104,8 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags, int fill)
{ {
if ((oldy != tempy && CURRENT_BRUSH != SQUARE_BRUSH) || i == x-rx) if ((oldy != tempy && CURRENT_BRUSH != SQUARE_BRUSH) || i == x-rx)
oldy--; oldy--;
if (CURRENT_BRUSH == TRI_BRUSH) //if (CURRENT_BRUSH == TRI_BRUSH)
oldy = tempy; // oldy = tempy;
for (j = tempy; j <= oldy+1; j++) { for (j = tempy; j <= oldy+1; j++) {
int i2 = 2*x-i, j2 = 2*y-j; int i2 = 2*x-i, j2 = 2*y-j;
if (CURRENT_BRUSH == TRI_BRUSH) if (CURRENT_BRUSH == TRI_BRUSH)