summaryrefslogtreecommitdiff
path: root/src/gui/game/EllipseBrush.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
commit981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch)
tree757bd699a23c1fad61e60700265a25feb1a3042c /src/gui/game/EllipseBrush.h
parentcbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff)
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip
powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/gui/game/EllipseBrush.h')
-rw-r--r--src/gui/game/EllipseBrush.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/game/EllipseBrush.h b/src/gui/game/EllipseBrush.h
index ad28766..a71b107 100644
--- a/src/gui/game/EllipseBrush.h
+++ b/src/gui/game/EllipseBrush.h
@@ -29,10 +29,10 @@ public:
}
else
{
- int yTop = ry, yBottom, i, j;
+ int yTop = ry+1, yBottom, i, j;
for (i = 0; i <= rx; i++)
{
- while (pow(i-rx,2.0f)*pow(ry,2.0f) + pow(yTop-ry,2.0f)*pow(rx,2.0f) <= pow(rx,2.0f)*pow(ry,2.0f))
+ while (pow(i-rx,2.0)*pow(ry,2.0) + pow(yTop-ry,2.0)*pow(rx,2.0) <= pow(rx,2.0)*pow(ry,2.0))
yTop++;
yBottom = 2*ry - yTop;
for (int j = 0; j <= ry*2; j++)