diff options
| author | jacob1 <jfu614@gmail.com> | 2012-10-04 16:35:11 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 15:33:12 (GMT) |
| commit | d2af4470a56265155f63cd9fe54ed3e33825fac7 (patch) | |
| tree | 4ec964e899da8bca92a3e583c426cf5f24b8de96 /src/simulation | |
| parent | 433a80b0990380d8ae4bc8a4c264336c1f12bae5 (diff) | |
| download | powder-d2af4470a56265155f63cd9fe54ed3e33825fac7.zip powder-d2af4470a56265155f63cd9fe54ed3e33825fac7.tar.gz | |
show # of parts, [GRID X], PIPE/PPIP with X, and molten X (with debug on) in HUD
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Sample.h | 4 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/simulation/Sample.h b/src/simulation/Sample.h index 0e67331..3605a5d 100644 --- a/src/simulation/Sample.h +++ b/src/simulation/Sample.h @@ -21,7 +21,9 @@ public: float GravityVelocityX; float GravityVelocityY; - SimulationSample() : PositionX(0), PositionY(0), ParticleID(0), particle(), AirPressure(0), AirVelocityX(0), AirVelocityY(0), WallType(0), Gravity(0), GravityVelocityX(0), GravityVelocityY(0), AirTemperature(0) {} + int NumParts; + + SimulationSample() : PositionX(0), PositionY(0), ParticleID(0), particle(), AirPressure(0), AirVelocityX(0), AirVelocityY(0), WallType(0), Gravity(0), GravityVelocityX(0), GravityVelocityY(0), AirTemperature(0), NumParts(0) {} }; #endif
\ No newline at end of file diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 7ad2250..be114e1 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -439,6 +439,8 @@ SimulationSample Simulation::Get(int x, int y) sample.GravityVelocityX = gravx[(y/CELL)*(XRES/CELL)+(x/CELL)]; sample.GravityVelocityY = gravy[(y/CELL)*(XRES/CELL)+(x/CELL)]; } + + sample.NumParts = NUM_PARTS; return sample; } |