summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/Simulation.cpp')
-rw-r--r--src/simulation/Simulation.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 880d2b1..717eb80 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -351,10 +351,18 @@ int Simulation::flood_prop(int x, int y, size_t propoffset, void * propvalue, St
SimulationSample Simulation::Get(int x, int y)
{
SimulationSample sample;
+ sample.PositionX = x;
+ sample.PositionY = y;
if(pmap[y][x])
+ {
sample.particle = parts[pmap[y][x]>>8];
- if(photons[y][x])
+ sample.ParticleID = pmap[y][x]>>8;
+ }
+ else if(photons[y][x])
+ {
sample.particle = parts[photons[y][x]>>8];
+ sample.ParticleID = photons[y][x]>>8;
+ }
sample.AirPressure = pv[y/CELL][x/CELL];
sample.AirTemperature = hv[y/CELL][x/CELL];
sample.AirVelocityX = vx[y/CELL][x/CELL];