mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Numbering of rendered files was wrong.
 -Truchet_hex_fill was not compiling with some newer Nvidia drivers.

--Code changes
 -Update Wix installer to use VS 2019.
This commit is contained in:
Person
2021-08-08 15:20:09 -06:00
parent 2219ea755f
commit f476afa545
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/Variations02.h
View File

@ -86,7 +86,7 @@ public:
string holesweight = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n"
<< "\t\treal_t theta = precalcAtanyx;\n"
<< "\t\treal_t t = (!" << thicknessweight << " ? " << weight << " : MwcNext01(mwc) * " << thicknessweight << ") / cos(" << n << " * theta) - " << holesweight << ";\n"
<< "\t\treal_t t = (" << thicknessweight << " == (real_t)(0.0) ? " << weight << " : MwcNext01(mwc) * " << thicknessweight << ") / cos(" << n << " * theta) - " << holesweight << ";\n"
<< "\n"
<< "\t\tif (fabs(t) != 0)\n"
<< "\t\t{\n"

8
Source/Ember/Variations07.h
View File

@ -1597,8 +1597,8 @@ public:
<< "\n"
<< "\t\t//exponential to make a tiled circle\n"
<< "\t\treal_t rangle = floor(MwcNext01(mwc) * " << p3nprecalc << ") * M_2PI * " << p13nprecalc << ";\n"
<< "\t\treal_t y_aux = " << flipy << " ? (add ? vIn.y : -vIn.y) : vIn.y;\n"
<< "\t\treal_t x_aux = " << flipx << " ? (add ? vIn.x : -vIn.x) : vIn.x;\n"
<< "\t\treal_t y_aux = " << flipy << " != (real_t)(0.0) ? (add ? vIn.y : -vIn.y) : vIn.y;\n"
<< "\t\treal_t x_aux = " << flipx << " != (real_t)(0.0) ? (add ? vIn.x : -vIn.x) : vIn.x;\n"
<< "\t\treal_t FY = y_aux * " << p13nprecalc << ";\n"
<< "\t\treal_t FX = x_aux * " << p13nprecalc << ";\n"
<< "\t\treal_t ang = fma(FY, MPI, rangle);\n"
@ -7303,7 +7303,7 @@ public:
sinx = T(0.5) * (T(1.0) + std::sin(helper.In.y * m_Freqx));
}
T offsetx = std::pow(sinx, px) * m_Scalex;
T offsetx = T(std::pow(sinx, px) * m_Scalex);
if (m_Modey < T(0.5))
{
@ -7314,7 +7314,7 @@ public:
siny = T(0.5) * (T(1.0) + std::sin(helper.In.x * m_Freqy));
}
T offsety = std::pow(siny, py) * m_Scaley;
T offsety = T(std::pow(siny, py) * m_Scaley);
helper.Out.x = m_Weight * (helper.In.x + offsetx);
helper.Out.y = m_Weight * (helper.In.y + offsety);
helper.Out.z = DefaultZ(helper);