summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-07-12 02:43:36 (GMT)
committer jacob1 <jfu614@gmail.com>2013-07-12 02:43:36 (GMT)
commita06202c78f392db833733d621974af1edcdb1cec (patch)
tree14448710c9699662ca0ca72acb187c18dd1dc6ee /src/simulation/Simulation.h
parent4f5c4536439dc546c6ea0a7aadbeb9e481cf8031 (diff)
downloadpowder-a06202c78f392db833733d621974af1edcdb1cec.zip
powder-a06202c78f392db833733d621974af1edcdb1cec.tar.gz
fixes to wall and particle floodfill. Wall fill ignores particles and always goes to the edges, while particle fill will only ignore walls it can't exist in, and flood particle erase won't check for walls / edges at all
Diffstat (limited to 'src/simulation/Simulation.h')
-rw-r--r--src/simulation/Simulation.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 5369a5b..82adb6f 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -179,7 +179,7 @@ public:
int CreateWalls(int x, int y, int rx, int ry, int wall, Brush * cBrush = NULL, int flags = -1);
void CreateWallLine(int x1, int y1, int x2, int y2, int rx, int ry, int wall, Brush * cBrush = NULL, int flags = -1);
void CreateWallBox(int x1, int y1, int x2, int y2, int wall, int flags = -1);
- int FloodWalls(int x, int y, int wall, int cm, int bm, int flags = -1);
+ int FloodWalls(int x, int y, int wall, int bm, int flags = -1);
//Drawing Particles
int CreateParts(int positionX, int positionY, int c, Brush * cBrush, int flags = -1);
@@ -188,7 +188,7 @@ public:
void CreateLine(int x1, int y1, int x2, int y2, int c, Brush * cBrush, int flags = -1);
void CreateLine(int x1, int y1, int x2, int y2, int c);
void CreateBox(int x1, int y1, int x2, int y2, int c, int flags = -1);
- int FloodParts(int x, int y, int c, int cm, int bm, int flags = -1);
+ int FloodParts(int x, int y, int c, int cm, int flags = -1);
void GetGravityField(int x, int y, float particleGrav, float newtonGrav, float & pGravX, float & pGravY);