mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-12 03:04:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.4.0.8 Beta 07/26/2014

Browse Source 
0.4.0.8 Beta 07/26/2014
--Bug Fixes
Fix falloff, falloff2, falloff3.
This commit is contained in:
mfeemster
2014-07-26 17:26:15 -07:00
parent d9d676393c
commit a5d69c75a2
16 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Ember/Variations04.h
View File

@ -4211,8 +4211,6 @@ public:
}
}
helper.Out.x = 0;//Needed because of possible sum below.
helper.Out.y = 0;
r = fabs(r0 - T(0.5)) * m_OneOverRmax;
if (r < 1)
@ -4220,6 +4218,11 @@ public:
helper.Out.x = m_Size * (x + Floor<T>(helper.In.x));
helper.Out.y = m_Size * (y + Floor<T>(helper.In.y));
}
else
{
helper.Out.x = 0;//Needed because of possible sum below.
helper.Out.y = 0;
}
r = fabs(r1 - T(0.5)) * m_OneOverRmax;
@ -4346,8 +4349,6 @@ public:
<< "\t\t }\n"
<< "\t\t}\n"
<< "\n"
<< "\t\tvOut.x = 0;\n"
<< "\t\tvOut.y = 0;\n"
<< "\t\tr = fabs(r0 - 0.5) * " << oneOverRmax << ";\n"
<< "\n"
<< "\t\tif (r < 1)\n"
@ -4355,6 +4356,11 @@ public:
<< "\t\t vOut.x = " << size << " * (x + floor(vIn.x));\n"
<< "\t\t vOut.y = " << size << " * (y + floor(vIn.y));\n"
<< "\t\t}\n"
<< "\t\telse\n"
<< "\t\t{\n"
<< "\t\t vOut.x = 0.0;\n"
<< "\t\t vOut.y = 0.0;\n"
<< "\t\t}\n"
<< "\n"
<< "\t\tr = fabs(r1 - 0.5) * " << oneOverRmax << ";\n"
<< "\n"