mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Fix bug in previous vignette variation.
This commit is contained in:
Person 2020-08-01 18:05:14 -07:00
parent 99cc597abc
commit 36b71278ec
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Source/Ember/Variations07.h
View File

@ -7583,11 +7583,10 @@ public:
T px = helper.In.x; T px = helper.In.x;
T py = helper.In.y; T py = helper.In.y;
T dist = std::sqrt((px - m_Posx) * (px - m_Posx) + (py - m_Posy) * (py - m_Posy)); T dist = std::sqrt((px - m_Posx) * (px - m_Posx) + (py - m_Posy) * (py - m_Posy));
helper.Out.z = DefaultZ(helper);
if (dist < m_InnerabsPrecalc) if (dist < m_InnerabsPrecalc)
{ {
helper.Out.z = DefaultZ(helper);
//middle part //middle part
if (m_Innerradius < 0.0) if (m_Innerradius < 0.0)
{ {
@ -7638,7 +7637,6 @@ public:
helper.Out.x = px * m_Weight; helper.Out.x = px * m_Weight;
helper.Out.y = py * m_Weight; helper.Out.y = py * m_Weight;
helper.Out.z = DefaultZ(helper);
} }
virtual string OpenCLString() const override virtual string OpenCLString() const override
@ -7662,57 +7660,59 @@ public:
<< "\t\treal_t py = vIn.y;\n" << "\t\treal_t py = vIn.y;\n"
<< "\t\treal_t dist = sqrt((px - " << posx << ") * (px - " << posx << ") + (py - " << posy << ") * (py - " << posy << "));\n" << "\t\treal_t dist = sqrt((px - " << posx << ") * (px - " << posx << ") + (py - " << posy << ") * (py - " << posy << "));\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl()
<< "\n"
<< "\t\tif (dist < " << innerabsprecalc << ")\n" << "\t\tif (dist < " << innerabsprecalc << ")\n"
<< "\t\t{\n" << "\t\t{\n"
<< "\t\t\tvOut.z = " << DefaultZCl()
<< "\n"
<< "\t\t\tif (" << innerradius << " < (real_t)(0.0))\n" << "\t\t\tif (" << innerradius << " < (real_t)(0.0))\n"
<< "\t\t\t{\n" << "\t\t\t{\n"
<< "\t\t\t\tvOut.x = (real_t)(0.0);\n" << "\t\t\t\tvOut.x = (real_t)(0.0);\n"
<< "\t\t\t\tvOut.y = (real_t)(0.0);\n" << "\t\t\t\tvOut.y = (real_t)(0.0);\n"
<< "\t\t\t\treturn;\n" << "\t\t\t}\n"
<< "\t\t\telse\n"
<< "\t\t\t{\n"
<< "\t\t\t\tvOut.x = px * " << weight << ";\n"
<< "\t\t\t\tvOut.y = py * " << weight << ";\n"
<< "\t\t\t}\n"
<< "\t\t}\n"
<< "\t\telse\n"
<< "\t\t{\n"
<< "\t\t\tdist = (dist - " << innerabsprecalc << ") / " << fadeabsprecalc << ";\n"
<< "\n"
<< "\t\t\treal_t fade = (real_t)(1.0) - pow(MwcNext01(mwc), " << powerhelperprecalc << ");\n"
<< "\t\t\treal_t blur_r = " << blur << " * pow(dist * MwcNext01(mwc), (real_t)(2.0));\n"
<< "\t\t\treal_t blur_a = MwcNext01(mwc) * M_2PI;\n"
<< "\n"
<< "\t\t\tif (" << faderadius << " > 0.0)\n"
<< "\t\t\t{\n"
<< "\t\t\t\tif (fade < dist)\n"
<< "\t\t\t\t{\n"
<< "\t\t\t\t\tpx = (real_t)(0.0);\n"
<< "\t\t\t\t\tpy = (real_t)(0.0);\n"
<< "\t\t\t\t}\n"
<< "\t\t\t\telse\n"
<< "\t\t\t\t{\n"
<< "\t\t\t\t\tpx += blur_r * cos(blur_a);\n"
<< "\t\t\t\t\tpy += blur_r * sin(blur_a);\n"
<< "\t\t\t\t}\n"
<< "\t\t\t}\n"
<< "\t\t\telse\n"
<< "\t\t\t{\n"
<< "\t\t\t\tif (1 - fade > dist)\n"
<< "\t\t\t\t{\n"
<< "\t\t\t\t\tpx = (real_t)(0.0);\n"
<< "\t\t\t\t\tpy = (real_t)(0.0);\n"
<< "\t\t\t\t}\n"
<< "\t\t\t\telse\n"
<< "\t\t\t\t{\n"
<< "\t\t\t\t\tpx += blur_r * cos(blur_a);\n"
<< "\t\t\t\t\tpy += blur_r * sin(blur_a);\n"
<< "\t\t\t\t}\n"
<< "\t\t\t}\n" << "\t\t\t}\n"
<< "\n" << "\n"
<< "\t\t\tvOut.x = px * " << weight << ";\n" << "\t\t\tvOut.x = px * " << weight << ";\n"
<< "\t\t\tvOut.y = py * " << weight << ";\n" << "\t\t\tvOut.y = py * " << weight << ";\n"
<< "\t\t}\n" << "\t\t}\n"
<< "\n"
<< "\t\tdist = (dist - " << innerabsprecalc << ") / " << fadeabsprecalc << ";\n"
<< "\n"
<< "\t\treal_t fade = (real_t)(1.0) - pow(MwcNext01(mwc), " << powerhelperprecalc << ");\n"
<< "\t\treal_t blur_r = " << blur << " * pow(dist * MwcNext01(mwc), (real_t)(2.0));\n"
<< "\t\treal_t blur_a = MwcNext01(mwc) * M_2PI;\n"
<< "\n"
<< "\t\tif (" << faderadius << " > 0.0)\n"
<< "\t\t{\n"
<< "\t\t\tif (fade < dist)\n"
<< "\t\t\t{\n"
<< "\t\t\t\tpx = (real_t)(0.0);\n"
<< "\t\t\t\tpy = (real_t)(0.0);\n"
<< "\t\t\t}\n"
<< "\t\t\telse\n"
<< "\t\t\t{\n"
<< "\t\t\t\tpx += blur_r * cos(blur_a);\n"
<< "\t\t\t\tpy += blur_r * sin(blur_a);\n"
<< "\t\t\t}\n"
<< "\t\t}\n"
<< "\t\telse\n"
<< "\t\t{\n"
<< "\t\t\tif (1 - fade > dist)\n"
<< "\t\t\t{\n"
<< "\t\t\t\tpx = (real_t)(0.0);\n"
<< "\t\t\t\tpy = (real_t)(0.0);\n"
<< "\t\t\t}\n"
<< "\t\t\telse\n"
<< "\t\t\t{\n"
<< "\t\t\t\tpx += blur_r * cos(blur_a);\n"
<< "\t\t\t\tpy += blur_r * sin(blur_a);\n"
<< "\t\t\t}\n"
<< "\t\t}\n"
<< "\n"
<< "\t\tvOut.x = px * " << weight << ";\n"
<< "\t\tvOut.y = py * " << weight << ";\n"
<< "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
return ss.str(); return ss.str();
} }