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

--User changes

Browse Source 
-Add new variations waves22, waves23, waves42, waves3 and waves4 from user tatasz.
 -Add new stylesheet called lightdark.qss which gives a more modern look to the dark theme. Started by Michel Mastriani (triptychaos).
 --Included in the qmake and Wix installers.

--Code changes
 -Add a new C# project that attempts to convert Apophysis plugins to Fractorium style Variation classes. It's not entirely perfect, but gets most of the job done much more quickly than doing so manually.
 -Remove unused OpenCL functions from variations: elliptic, poincare, mask, bMod, bSwirl, bTransform, bCollide, farblur, popcorn2_3D, falloff, falloff2, falloff3, crackle2, waves2b, hypercrop, depth_gaussian2, depth_sine, depth_sine2, dust, asteria, vibration, vibration2, arctanh, smartshape, squares, starblur2, Truchet,.
 -Add code in EmberTester to automatically detect such unused functions.
This commit is contained in:
Person
2019-05-06 19:29:27 -07:00
parent 5faa8aa5bd
commit b4ba6d6a82
35 changed files with 2738 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Ember/Variations03.h
View File

@ -2286,9 +2286,10 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{
T e = 1 / helper.m_PrecalcSumSquares + SQR(T(M_2_PI));
helper.Out.x = m_Weight * (m_Weight / helper.m_PrecalcSumSquares * helper.In.x / e);
helper.Out.y = m_Weight * (m_Weight / helper.m_PrecalcSumSquares * helper.In.y / e);
T e = 1 / Zeps(helper.m_PrecalcSumSquares) + SQR(T(M_2_PI));
T temp = m_Weight / Zeps(helper.m_PrecalcSumSquares);
helper.Out.x = m_Weight * (temp * helper.In.x / e);
helper.Out.y = m_Weight * (temp * helper.In.y / e);
helper.Out.z = DefaultZ(helper);
}
@ -2298,10 +2299,11 @@ public:
intmax_t varIndex = IndexInXform();
string weight = WeightDefineString();
ss << "\t{\n"
<< "\t\treal_t e = fma(M2PI, M2PI, 1 / precalcSumSquares);\n"
<< "\t\treal_t e = fma(M2PI, M2PI, 1 / Zeps(precalcSumSquares));\n"
<< "\n"
<< "\t\tvOut.x = " << weight << " * (" << weight << " / precalcSumSquares * vIn.x / e);\n"
<< "\t\tvOut.y = " << weight << " * (" << weight << " / precalcSumSquares * vIn.y / e);\n"
<< "\t\treal_t temp = " << weight << " / Zeps(precalcSumSquares);\n"
<< "\t\tvOut.x = " << weight << " * (temp * vIn.x / e);\n"
<< "\t\tvOut.y = " << weight << " * (temp * vIn.y / e);\n"
<< "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n";
return ss.str();
@ -3804,7 +3806,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr", "Zeps" };
return vector<string> { "Zeps" };
}
protected:
@ -3877,7 +3879,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr", "Zeps" };
return vector<string> { "Zeps" };
}
protected:
@ -3963,7 +3965,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr", "Zeps" };
return vector<string> { "Zeps" };
}
protected:
@ -4054,7 +4056,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr", "Zeps" };
return vector<string> { "Zeps" };
}
virtual void Precalc() override