matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More FILT modes: XOR and NOT

Browse Source
This commit is contained in:
jacksonmj 2013-08-29 18:24:44 +01:00
parent bebe9bd8fd
commit 268158f1dd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/game/GameView.cpp
View File

@ -2071,8 +2071,8 @@ void GameView::OnDraw()
else if (sample.particle.type == PT_FILT) else if (sample.particle.type == PT_FILT)
{ {
sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype); sampleInfo << c->ElementResolve(sample.particle.type, sample.particle.ctype);
const char* filtModes[] = {"set colour", "AND", "OR", "subtract colour", "red shift", "blue shift", "no effect"}; const char* filtModes[] = {"set colour", "AND", "OR", "subtract colour", "red shift", "blue shift", "no effect", "XOR", "NOT"};
if (sample.particle.tmp>=0 && sample.particle.tmp<=6) if (sample.particle.tmp>=0 && sample.particle.tmp<=8)
sampleInfo << " (" << filtModes[sample.particle.tmp] << ")"; sampleInfo << " (" << filtModes[sample.particle.tmp] << ")";
else else
sampleInfo << " (unknown mode)"; sampleInfo << " (unknown mode)";

4
src/simulation/elements/FILT.cpp
View File

@ -100,6 +100,10 @@ int Element_FILT::interactWavelengths(Particle* cpart, int origWl)
} }
case 6: case 6:
return origWl; // No change return origWl; // No change
case 7:
return origWl ^ filtWl; // XOR colours
case 8:
return (~origWl) & mask; // Invert colours
default: default:
return filtWl; return filtWl;
} }