summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Sample.h4
-rw-r--r--src/simulation/Simulation.cpp2
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;
}