mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 13:56:06 -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

21
Source/Ember/Variations02.h
View File

@ -4460,7 +4460,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr", "Zeps" };
return vector<string> { "Zeps" };
}
protected:
@ -5016,8 +5016,8 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{
T c0 = m_Ax / (1 + std::exp(m_Sx * helper.In.x));
T c1 = m_Ay / (1 + std::exp(m_Sy * helper.In.y));
T c0 = m_Ax / Zeps(1 + std::exp(m_Sx * helper.In.x));
T c1 = m_Ay / Zeps(1 + std::exp(m_Sy * helper.In.y));
T x = (2 * (c0 - T(0.5)));
T y = (2 * (c1 - T(0.5)));
helper.Out.x = m_Vv * x;
@ -5040,8 +5040,8 @@ public:
string ay = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string vv = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n"
<< "\t\treal_t c0 = " << ax << " / (1 + exp(" << sx << " * vIn.x));\n"
<< "\t\treal_t c1 = " << ay << " / (1 + exp(" << sy << " * vIn.y));\n"
<< "\t\treal_t c0 = " << ax << " / Zeps(1 + exp(" << sx << " * vIn.x));\n"
<< "\t\treal_t c1 = " << ay << " / Zeps(1 + exp(" << sy << " * vIn.y));\n"
<< "\t\treal_t x = (2 * (c0 - (real_t)(0.5)));\n"
<< "\t\treal_t y = (2 * (c1 - (real_t)(0.5)));\n"
<< "\n"
@ -5793,11 +5793,6 @@ public:
<< "\t}\n";
return ss.str();
}
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr" };
}
};
/// <summary>
@ -5813,7 +5808,7 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{
T d = m_Weight / helper.m_PrecalcSumSquares;
T d = m_Weight / Zeps(helper.m_PrecalcSumSquares);
T sinx = std::sin(helper.In.x);
T sinx2 = SQR(sinx);
T cosx = std::cos(helper.In.x);
@ -5829,7 +5824,7 @@ public:
intmax_t varIndex = IndexInXform();
string weight = WeightDefineString();
ss << "\t{\n"
<< "\t\treal_t d = " << weight << " / precalcSumSquares;\n"
<< "\t\treal_t d = " << weight << " / Zeps(precalcSumSquares);\n"
<< "\t\treal_t sinx = sin(vIn.x);\n"
<< "\t\treal_t sinx2 = SQR(sinx);\n"
<< "\t\treal_t cosx = cos(vIn.x);\n"
@ -5844,7 +5839,7 @@ public:
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Sqr" };
return vector<string> { "Zeps" };
}
};