diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-07 02:19:51 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-07 02:19:51 (GMT) |
| commit | 76b92952b12f0eeaedbf3f2e4231dbd72b6d902a (patch) | |
| tree | 018a6cb486c30c86d0818f6f1743dbdcbd63bd45 /src/simulation/tools | |
| parent | 5ae6b1867796597a3560c6cdd82c5d217188e582 (diff) | |
| download | powder-76b92952b12f0eeaedbf3f2e4231dbd72b6d902a.zip powder-76b92952b12f0eeaedbf3f2e4231dbd72b6d902a.tar.gz | |
adjust tool strengths a little, to make them a little faster
Diffstat (limited to 'src/simulation/tools')
| -rw-r--r-- | src/simulation/tools/AirTool.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/tools/Cool.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/tools/Heat.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/tools/NGrv.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/tools/PGrv.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/tools/Vac.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/simulation/tools/AirTool.cpp b/src/simulation/tools/AirTool.cpp index 4e7ebde..5d7f405 100644 --- a/src/simulation/tools/AirTool.cpp +++ b/src/simulation/tools/AirTool.cpp @@ -11,7 +11,7 @@ Tool_Air::Tool_Air() int Tool_Air::Perform(Simulation * sim, Particle * cpart, int x, int y, float strength) { - sim->air->pv[y/CELL][x/CELL] += 0.03f*strength; + sim->air->pv[y/CELL][x/CELL] += strength*0.05f; if(sim->air->pv[y/CELL][x/CELL] > 256.0f) sim->air->pv[y/CELL][x/CELL] = 256.0f; if(sim->air->pv[y/CELL][x/CELL] < -256.0f) diff --git a/src/simulation/tools/Cool.cpp b/src/simulation/tools/Cool.cpp index bc49634..16a7f91 100644 --- a/src/simulation/tools/Cool.cpp +++ b/src/simulation/tools/Cool.cpp @@ -13,9 +13,9 @@ int Tool_Cool::Perform(Simulation * sim, Particle * cpart, int x, int y, float s if(!cpart) return 0; if (cpart->type == PT_PUMP || cpart->type == PT_GPMP) - cpart->temp -= .1f*strength; + cpart->temp -= strength*.1f; else - cpart->temp -= strength; + cpart->temp -= strength*2.0f; if(cpart->temp > MAX_TEMP) cpart->temp = MAX_TEMP; if(cpart->temp < 0) diff --git a/src/simulation/tools/Heat.cpp b/src/simulation/tools/Heat.cpp index 903efe3..0d77d55 100644 --- a/src/simulation/tools/Heat.cpp +++ b/src/simulation/tools/Heat.cpp @@ -13,9 +13,9 @@ int Tool_Heat::Perform(Simulation * sim, Particle * cpart, int x, int y, float s if(!cpart) return 0; if (cpart->type == PT_PUMP || cpart->type == PT_GPMP) - cpart->temp += .1f*strength; + cpart->temp += strength*.1f; else - cpart->temp += strength; + cpart->temp += strength*2.0f; if(cpart->temp > MAX_TEMP) cpart->temp = MAX_TEMP; if(cpart->temp < 0) diff --git a/src/simulation/tools/NGrv.cpp b/src/simulation/tools/NGrv.cpp index 65530c5..89af1ea 100644 --- a/src/simulation/tools/NGrv.cpp +++ b/src/simulation/tools/NGrv.cpp @@ -11,7 +11,7 @@ Tool_NGrv::Tool_NGrv() int Tool_NGrv::Perform(Simulation * sim, Particle * cpart, int x, int y, float strength) { - sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] -= 0.03f*strength; + sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] = strength*-5.0f; return 1; } diff --git a/src/simulation/tools/PGrv.cpp b/src/simulation/tools/PGrv.cpp index cfa381c..e2c9fb0 100644 --- a/src/simulation/tools/PGrv.cpp +++ b/src/simulation/tools/PGrv.cpp @@ -11,7 +11,7 @@ Tool_PGrv::Tool_PGrv() int Tool_PGrv::Perform(Simulation * sim, Particle * cpart, int x, int y, float strength) { - sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] += 0.03f*strength; + sim->gravmap[((y/CELL)*(XRES/CELL))+(x/CELL)] = strength*5.0f; return 1; } diff --git a/src/simulation/tools/Vac.cpp b/src/simulation/tools/Vac.cpp index fbf7e85..86beb54 100644 --- a/src/simulation/tools/Vac.cpp +++ b/src/simulation/tools/Vac.cpp @@ -11,7 +11,7 @@ Tool_Vac::Tool_Vac() int Tool_Vac::Perform(Simulation * sim, Particle * cpart, int x, int y, float strength) { - sim->air->pv[y/CELL][x/CELL] -= 0.03f*strength; + sim->air->pv[y/CELL][x/CELL] -= strength*0.05f;; if(sim->air->pv[y/CELL][x/CELL] > 256.0f) sim->air->pv[y/CELL][x/CELL] = 256.0f; if(sim->air->pv[y/CELL][x/CELL] < -256.0f) |