diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-13 21:24:19 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-13 21:31:24 (GMT) |
| commit | 9707443b243bafd4c65fd8c92fa97d99260a2e3c (patch) | |
| tree | 12b41b708a1315d09cda03873e2c7d5cb32862a3 /src/graphics.c | |
| parent | a23138fbbec43f31e265a908c935b700558e1467 (diff) | |
| download | powder-9707443b243bafd4c65fd8c92fa97d99260a2e3c.zip powder-9707443b243bafd4c65fd8c92fa97d99260a2e3c.tar.gz | |
Merge element state into ptypes.
All of the pstates array except .state was replaced by ptransitions.
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/graphics.c b/src/graphics.c index 6c0123f..b541711 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1668,10 +1668,10 @@ void draw_parts(pixel *vid) else if (t==PT_QRTZ || t==PT_PQRT) { int z = parts[i].tmp; - if (parts[i].temp>(pstates[t].ltemp-800.0f)) + if (parts[i].temp>(ptransitions[t].thv-800.0f)) { - float frequency = 3.1415/(2*pstates[t].ltemp-(pstates[t].ltemp-800.0f)); - int q = (parts[i].temp>pstates[t].ltemp)?pstates[t].ltemp-(pstates[t].ltemp-800.0f):parts[i].temp-(pstates[t].ltemp-800.0f); + float frequency = 3.1415/(2*ptransitions[t].thv-(ptransitions[t].thv-800.0f)); + int q = (parts[i].temp>ptransitions[t].thv)?ptransitions[t].thv-(ptransitions[t].thv-800.0f):parts[i].temp-(ptransitions[t].thv-800.0f); cr = sin(frequency*q) * 226 + (z * 16 + PIXR(ptypes[t].pcolors)); cg = sin(frequency*q*4.55 +3.14) * 34 + (z * 16 + PIXR(ptypes[t].pcolors)); cb = sin(frequency*q*2.22 +3.14) * 64 + (z * 16 + PIXR(ptypes[t].pcolors)); @@ -2530,10 +2530,10 @@ void draw_parts(pixel *vid) } } - else if (ptypes[t].properties&PROP_HOT_GLOW && parts[i].temp>(pstates[t].ltemp-800.0f)) + else if (ptypes[t].properties&PROP_HOT_GLOW && parts[i].temp>(ptransitions[t].thv-800.0f)) { - float frequency = 3.1415/(2*pstates[t].ltemp-(pstates[t].ltemp-800.0f)); - int q = (parts[i].temp>pstates[t].ltemp)?pstates[t].ltemp-(pstates[t].ltemp-800.0f):parts[i].temp-(pstates[t].ltemp-800.0f); + float frequency = 3.1415/(2*ptransitions[t].thv-(ptransitions[t].thv-800.0f)); + int q = (parts[i].temp>ptransitions[t].thv)?ptransitions[t].thv-(ptransitions[t].thv-800.0f):parts[i].temp-(ptransitions[t].thv-800.0f); cr = sin(frequency*q) * 226 + PIXR(ptypes[t].pcolors); cg = sin(frequency*q*4.55 +3.14) * 34 + PIXG(ptypes[t].pcolors); cb = sin(frequency*q*2.22 +3.14) * 64 + PIXB(ptypes[t].pcolors); |