diff options
author | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
commit | 41216d5ad4c722e2ad9f15c968af454fc7566d5e (patch) | |
tree | f68fe3e1dd32a2d651b6678a1783e165ce2e70c8 /source/blender/blenkernel/intern/seqeffects.c | |
parent | cfdd902d2d5d560262d1218861ad1a4469c5259f (diff) |
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3808
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 8820340d6dc..ba2d2ef0d46 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1767,76 +1767,6 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f if (output != output) output = 1; if (wipe->forward) output = 1 - output; break; - /* BOX WIPE IS NOT WORKING YET */ - /* case DO_CROSS_WIPE: */ - /* BOX WIPE IS NOT WORKING YET */ -#if 0 - case DO_BOX_WIPE: - if (!wipe->forward) { - facf0 = 1.0f - facf0; /* Go the other direction */ - } - - width = (int)(wipe->edgeWidth * ((xo + yo) / 2.0)); - hwidth = (float)width / 2.0; - if (angle == 0) angle = 0.000001; - b1 = posy / 2 - (-angle) * posx / 2; - b3 = (yo - posy / 2) - (-angle) * (xo - posx / 2); - b2 = y - (-angle) * x; - - hyp = abs(angle * x + y + (-posy / 2 - angle * posx / 2)) * wipezone->pythangle; - hyp2 = abs(angle * x + y + (-(yo - posy / 2) - angle * (xo - posx / 2))) * wipezone->pythangle; - - temp1 = xo * (1 - facf0 / 2) - xo * facf0 / 2; - temp2 = yo * (1 - facf0 / 2) - yo * facf0 / 2; - pointdist = hypot(temp1, temp2); - - if (b2 < b1 && b2 < b3) { - if (hwidth < pointdist) - output = in_band(hwidth, hyp, 0, 1); - } - else if (b2 > b1 && b2 > b3) { - if (hwidth < pointdist) - output = in_band(hwidth, hyp2, 0, 1); - } - else { - if (hyp < hwidth && hyp2 > hwidth) - output = in_band(hwidth, hyp, 1, 1); - else if (hyp > hwidth && hyp2 < hwidth) - output = in_band(hwidth, hyp2, 1, 1); - else - output = in_band(hwidth, hyp2, 1, 1) * in_band(hwidth, hyp, 1, 1); - } - - if (!wipe->forward) { - facf0 = 1.0f - facf0; /* Go the other direction */ - } - angle = -1 / angle; - b1 = posy / 2 - (-angle) * posx / 2; - b3 = (yo - posy / 2) - (-angle) * (xo - posx / 2); - b2 = y - (-angle) * x; - - hyp = abs(angle * x + y + (-posy / 2 - angle * posx / 2)) * wipezone->pythangle; - hyp2 = abs(angle * x + y + (-(yo - posy / 2) - angle * (xo - posx / 2))) * wipezone->pythangle; - - if (b2 < b1 && b2 < b3) { - if (hwidth < pointdist) - output *= in_band(hwidth, hyp, 0, 1); - } - else if (b2 > b1 && b2 > b3) { - if (hwidth < pointdist) - output *= in_band(hwidth, hyp2, 0, 1); - } - else { - if (hyp < hwidth && hyp2 > hwidth) - output *= in_band(hwidth, hyp, 1, 1); - else if (hyp > hwidth && hyp2 < hwidth) - output *= in_band(hwidth, hyp2, 1, 1); - else - output *= in_band(hwidth, hyp2, 1, 1) * in_band(hwidth, hyp, 1, 1); - } - - break; -#endif case DO_IRIS_WIPE: if (xo > yo) yo = xo; else xo = yo; |