mirror of
https://github.com/stevenrobertson/cuburn.git
synced 2025-02-05 11:40:04 -05:00
more fixes for variations...just about have all of the written ones validated.
This commit is contained in:
parent
6cd4f328f0
commit
3ee437d9b2
@ -769,7 +769,7 @@ var(69, 'oscope', """
|
|||||||
|
|
||||||
var(70, 'polar2', """
|
var(70, 'polar2', """
|
||||||
float p2v = w / M_PI;
|
float p2v = w / M_PI;
|
||||||
ox += p2v * atan2f(x,y);
|
ox += p2v * atan2f(tx,ty);
|
||||||
oy += 0.5f * p2v * logf(tx*tx + ty*ty);
|
oy += 0.5f * p2v * logf(tx*tx + ty*ty);
|
||||||
""")
|
""")
|
||||||
|
|
||||||
@ -794,14 +794,14 @@ var(73, 'separation', """
|
|||||||
float sy2 = {{px.get('xf.separation_y * xf.separation_y', 'sy2')}};
|
float sy2 = {{px.get('xf.separation_y * xf.separation_y', 'sy2')}};
|
||||||
|
|
||||||
if (tx > 0.0f)
|
if (tx > 0.0f)
|
||||||
ox += w * (sqrtf(tx*tx + sx2) - tx*{{ps.get('xf.separation_xinside')}});
|
ox += w * (sqrtf(tx*tx + sx2) - tx*{{px.get('xf.separation_xinside')}});
|
||||||
else
|
else
|
||||||
ox -= w * (sqrtf(tx*tx + sx2) + tx*{{ps.get('xf.separation_xinside')}});
|
ox -= w * (sqrtf(tx*tx + sx2) + tx*{{px.get('xf.separation_xinside')}});
|
||||||
|
|
||||||
if (ty > 0.0f)
|
if (ty > 0.0f)
|
||||||
oy += w * (sqrtf(ty*ty + sy2) - ty*{{ps.get('xf.separation_yinside')}});
|
oy += w * (sqrtf(ty*ty + sy2) - ty*{{px.get('xf.separation_yinside')}});
|
||||||
else
|
else
|
||||||
oy -= w * (sqrtf(ty*ty + sy2) + ty*{{ps.get('xf.separation_yinside')}});
|
oy -= w * (sqrtf(ty*ty + sy2) + ty*{{px.get('xf.separation_yinside')}});
|
||||||
""")
|
""")
|
||||||
|
|
||||||
var(74, 'split', """
|
var(74, 'split', """
|
||||||
@ -818,39 +818,39 @@ var(74, 'split', """
|
|||||||
|
|
||||||
var(75, 'splits', """
|
var(75, 'splits', """
|
||||||
if (tx >= 0.0f)
|
if (tx >= 0.0f)
|
||||||
ox += w*(tx + {{ps.get('xf.splits_x')}});
|
ox += w*(tx + {{px.get('xf.splits_x')}});
|
||||||
else
|
else
|
||||||
ox += w*(tx - {{ps.get('xf.splits_x')}});
|
ox += w*(tx - {{px.get('xf.splits_x')}});
|
||||||
|
|
||||||
if (f->ty >= 0)
|
if (ty >= 0)
|
||||||
oy += w*(ty + {{ps.get('xf.splits_y')}});
|
oy += w*(ty + {{px.get('xf.splits_y')}});
|
||||||
else
|
else
|
||||||
oy += w*(ty - {{ps.get('xf.splits_y')}});
|
oy += w*(ty - {{px.get('xf.splits_y')}});
|
||||||
""")
|
""")
|
||||||
|
|
||||||
var(76, 'stripes', """
|
var(76, 'stripes', """
|
||||||
float roundx = floorf(tx + 0.5f);
|
float roundx = floorf(tx + 0.5f);
|
||||||
float offsetx = tx - roundx;
|
float offsetx = tx - roundx;
|
||||||
ox += w * (offsetx * (1.0f - {{ps.get('xf.stripes_space')}}) + roundx);
|
ox += w * (offsetx * (1.0f - {{px.get('xf.stripes_space')}}) + roundx);
|
||||||
oy += w * (ty + offsetx*offsetx*{{ps.get('xf.stripes_warp')}});
|
oy += w * (ty + offsetx*offsetx*{{px.get('xf.stripes_warp')}});
|
||||||
""")
|
""")
|
||||||
|
|
||||||
var(77, 'wedge', """
|
var(77, 'wedge', """
|
||||||
float r = sqrtf(tx*tx + ty*ty);
|
float r = sqrtf(tx*tx + ty*ty);
|
||||||
float a = atan2f(ty, tx) + {{ps.get('xf.wedge_swirl')}} * r;
|
float a = atan2f(ty, tx) + {{px.get('xf.wedge_swirl')}} * r;
|
||||||
float wc = {{ps.get('xf.wedge_count')}};
|
float wc = {{px.get('xf.wedge_count')}};
|
||||||
float wa = {{ps.get('xf.wedge_angle')}};
|
float wa = {{px.get('xf.wedge_angle')}};
|
||||||
float c = floorf((wc * a + M_PI) * M_1_PI * 0.5f);
|
float c = floorf((wc * a + M_PI) * M_1_PI * 0.5f);
|
||||||
float comp_fac = 1 - wa * wc * M_1_PI * 0.5f;
|
float comp_fac = 1 - wa * wc * M_1_PI * 0.5f;
|
||||||
a = a * comp_fac + c * wa;
|
a = a * comp_fac + c * wa;
|
||||||
r = w * (r + {{ps.get('xf.wedge_hole')}});
|
r = w * (r + {{px.get('xf.wedge_hole')}});
|
||||||
ox += r * cosf(a);
|
ox += r * cosf(a);
|
||||||
oy += r * sinf(a);
|
oy += r * sinf(a);
|
||||||
""")
|
""")
|
||||||
|
|
||||||
var(81, 'waves2', """
|
var(81, 'waves2', """
|
||||||
ox += w*(tx + {{ps.get('xf.waves2_scalex')}}*sinf(ty * {{ps.get('xf.waves2_freqx')}}));
|
ox += w*(tx + {{px.get('xf.waves2_scalex')}}*sinf(ty * {{px.get('xf.waves2_freqx')}}));
|
||||||
oy += w*(ty + {{ps.get('xf.waves2_scaley')}}*sinf(tx * {{ps.get('xf.waves2_freqy')}}));
|
oy += w*(ty + {{px.get('xf.waves2_scaley')}}*sinf(tx * {{px.get('xf.waves2_freqy')}}));
|
||||||
""")
|
""")
|
||||||
|
|
||||||
var(82, 'exp', """
|
var(82, 'exp', """
|
||||||
|
Loading…
Reference in New Issue
Block a user