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

Fix deco smudge tool

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-24 15:56:01 +01:00
parent da77cb809b
commit d50d45ecff
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/simulation/Simulation.cpp
View File

@ -750,19 +750,20 @@ void Simulation::ApplyDecoration(int x, int y, int colR_, int colG_, int colB_,
{ {
if ((pmap[y+ry][x+rx]&0xFF) && parts[pmap[y+ry][x+rx]>>8].dcolour) if ((pmap[y+ry][x+rx]&0xFF) && parts[pmap[y+ry][x+rx]>>8].dcolour)
{ {
Particle part = parts[pmap[y+ry][x+rx]>>8];
num++; num++;
ta += float((parts[pmap[y+ry][x+rx]>>8].dcolour>>24)&0xFF)/255.0f; ta += float((part.dcolour>>24)&0xFF)/255.0f;
tr += float((parts[pmap[y+ry][x+rx]>>8].dcolour>>16)&0xFF)/255.0f; tr += float((part.dcolour>>16)&0xFF)/255.0f;
tg += float((parts[pmap[y+ry][x+rx]>>8].dcolour>>8)&0xFF)/255.0f; tg += float((part.dcolour>>8)&0xFF)/255.0f;
tb += float((parts[pmap[y+ry][x+rx]>>8].dcolour)&0xFF)/255.0f; tb += float((part.dcolour)&0xFF)/255.0f;
} }
} }
if (num == 0) if (num == 0)
return; return;
ta = ta/float(num)+0.5f; ta = ta/float(num+1);
tr = tr/float(num)+0.5f; tr = tr/float(num+1);
tg = tg/float(num)+0.5f; tg = tg/float(num+1);
tb = tb/float(num)+0.5f; tb = tb/float(num+1);
} }
colA_ = ta*255.0f; colA_ = ta*255.0f;