mirror-github-bspeice/cuburn
1
0
Fork 0
mirror of https://github.com/stevenrobertson/cuburn.git synced 2025-10-31 01:10:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed flawed lazysusan variation. added whorl variation.

Browse Source
This commit is contained in:
erik
2011-11-03 13:31:32 -06:00
parent 3badf0f826
commit 5179c98254
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cuburn/code/variations.py
View File

@ -731,16 +731,15 @@ var(65, 'lazysusan', """
if (r < w) { if (r < w) {
float a = atan2f(y,x) + {{pv.spin}} + {{pv.twist}} * (w - r); float a = atan2f(y,x) + {{pv.spin}} + {{pv.twist}} * (w - r);
r = w * r;
ox += r * cosf(a) + lx; ox += w * (r * cosf(a) + lx);
oy += r * sinf(a) - ly; oy += w * (r * sinf(a) - ly);
} else { } else {
r = w * (1.0f + {{pv.space}} / r); r = (1.0f + {{pv.space}} / r);
ox += r * x + lx; ox += w * (r * x + lx);
oy += r * y - ly; oy += w * (r * y - ly);
} }
""", 'x y twist space spin') """, 'x y twist space spin')
@ -877,6 +876,19 @@ var(77, 'wedge', """
oy += r * sinf(a); oy += r * sinf(a);
""", 'angle hole count=1 swirl') """, 'angle hole count=1 swirl')
var(80, 'whorl', """
float r = sqrtf(tx*tx + ty*ty);
float a = atan2f(ty,tx);
if (r < w)
a += {{pv.inside}} / (w - r);
else
a += {{pv.outside}} / (w - r);
ox += w * r * cosf(a);
oy += w * r * sinf(a);
""", 'inside outside')
var(81, 'waves2', """ var(81, 'waves2', """
ox += w*(tx + {{pv.scalex}}*sinf(ty * {{pv.freqx}})); ox += w*(tx + {{pv.scalex}}*sinf(ty * {{pv.freqx}}));
oy += w*(ty + {{pv.scaley}}*sinf(tx * {{pv.freqy}})); oy += w*(ty + {{pv.scaley}}*sinf(tx * {{pv.freqy}}));