diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-06 20:02:21 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-06 20:02:21 (GMT) |
| commit | 5ae6b1867796597a3560c6cdd82c5d217188e582 (patch) | |
| tree | ea18cf043acb6bd50434fe89a566ecacfda55442 /src/simulation/Simulation.cpp | |
| parent | b594d6825858615c835d26510a6cc9a22bc239e2 (diff) | |
| download | powder-5ae6b1867796597a3560c6cdd82c5d217188e582.zip powder-5ae6b1867796597a3560c6cdd82c5d217188e582.tar.gz | |
GOLD changes photons to yellow
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 77cb586..5a5f3d6 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4273,21 +4273,22 @@ killed: // this should be replaced with a particle type attribute ("photwl" or something) if ((r & 0xFF) == PT_PSCN) parts[i].ctype = 0x00000000; - if ((r & 0xFF) == PT_NSCN) parts[i].ctype = 0x00000000; - if ((r & 0xFF) == PT_SPRK) parts[i].ctype = 0x00000000; - if ((r & 0xFF) == PT_COAL) parts[i].ctype = 0x00000000; - if ((r & 0xFF) == PT_BCOL) parts[i].ctype = 0x00000000; - if ((r & 0xFF) == PT_PLEX) parts[i].ctype &= 0x1F00003E; - if ((r & 0xFF) == PT_NITR) parts[i].ctype &= 0x0007C000; - if ((r & 0xFF) == PT_NBLE) parts[i].ctype &= 0x3FFF8000; - if ((r & 0xFF) == PT_LAVA) parts[i].ctype &= 0x3FF00000; - if ((r & 0xFF) == PT_ACID) parts[i].ctype &= 0x1FE001FE; - if ((r & 0xFF) == PT_DUST) parts[i].ctype &= 0x3FFFFFC0; - if ((r & 0xFF) == PT_SNOW) parts[i].ctype &= 0x03FFFFFF; - if ((r & 0xFF) == PT_GOO) parts[i].ctype &= 0x3FFAAA00; - if ((r & 0xFF) == PT_PLNT) parts[i].ctype &= 0x0007C000; - if ((r & 0xFF) == PT_PLUT) parts[i].ctype &= 0x001FCE00; - if ((r & 0xFF) == PT_URAN) parts[i].ctype &= 0x003FC000; + else if ((r & 0xFF) == PT_NSCN) parts[i].ctype = 0x00000000; + else if ((r & 0xFF) == PT_SPRK) parts[i].ctype = 0x00000000; + else if ((r & 0xFF) == PT_COAL) parts[i].ctype = 0x00000000; + else if ((r & 0xFF) == PT_BCOL) parts[i].ctype = 0x00000000; + else if ((r & 0xFF) == PT_PLEX) parts[i].ctype &= 0x1F00003E; + else if ((r & 0xFF) == PT_NITR) parts[i].ctype &= 0x0007C000; + else if ((r & 0xFF) == PT_NBLE) parts[i].ctype &= 0x3FFF8000; + else if ((r & 0xFF) == PT_LAVA) parts[i].ctype &= 0x3FF00000; + else if ((r & 0xFF) == PT_ACID) parts[i].ctype &= 0x1FE001FE; + else if ((r & 0xFF) == PT_DUST) parts[i].ctype &= 0x3FFFFFC0; + else if ((r & 0xFF) == PT_SNOW) parts[i].ctype &= 0x03FFFFFF; + else if ((r & 0xFF) == PT_GOO) parts[i].ctype &= 0x3FFAAA00; + else if ((r & 0xFF) == PT_PLNT) parts[i].ctype &= 0x0007C000; + else if ((r & 0xFF) == PT_PLUT) parts[i].ctype &= 0x001FCE00; + else if ((r & 0xFF) == PT_URAN) parts[i].ctype &= 0x003FC000; + else if ((r & 0xFF) == PT_GOLD) parts[i].ctype &= 0x3C038100; if (get_normal_interp(t, parts[i].x, parts[i].y, parts[i].vx, parts[i].vy, &nrx, &nry)) { dp = nrx*parts[i].vx + nry*parts[i].vy; |