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 
-Make the following variations match Chaotica: dust, sin, cos, tan, sec, csc, cot, sinh, cosh, tanh, sech, csch, coth.
This commit is contained in:
Person
2019-06-02 19:17:42 -07:00
parent a117432762
commit 714cfc633a
3 changed files with 153 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Ember/Variations07.h
View File

@ -3555,10 +3555,10 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{
T X = std::fmod(T(Floor(helper.In.x)), m_Zdens) / m_Zdens;
T Y = std::fmod(T(Floor(helper.In.y)), m_Zdens) / m_Zdens;
T random_x = VarFuncs<T>::HashShadertoy(X, Y, 0);
T random_y = VarFuncs<T>::HashShadertoy(Y, X, 0);
T X = std::fmod(T(Floor(std::abs(helper.In.x))), m_Zdens) / m_Zdens;
T Y = std::fmod(T(Floor(std::abs(helper.In.y))), m_Zdens) / m_Zdens;
T random_x = VarFuncs<T>::HashShadertoy(X, Y, 1);
T random_y = VarFuncs<T>::HashShadertoy(Y, X, 2);
T a = (X + random_x * m_Dist) * M_2PI;
T r = std::exp(std::log(Y + random_y * m_Dist) * m_Power);
helper.Out.x = m_Weight * std::cos(a) * r;
@ -3578,10 +3578,10 @@ public:
string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string zdens = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n"
<< "\t\treal_t X = fmod(floor(vIn.x), " << zdens << ") / " << zdens << ";\n"
<< "\t\treal_t Y = fmod(floor(vIn.y), " << zdens << ") / " << zdens << ";\n"
<< "\t\treal_t random_x = HashShadertoy(X, Y, (real_t)(0.0));\n"
<< "\t\treal_t random_y = HashShadertoy(Y, X, (real_t)(0.0));\n"
<< "\t\treal_t X = fmod(floor(fabs(vIn.x)), " << zdens << ") / " << zdens << ";\n"
<< "\t\treal_t Y = fmod(floor(fabs(vIn.y)), " << zdens << ") / " << zdens << ";\n"
<< "\t\treal_t random_x = HashShadertoy(X, Y, (real_t)(1.0));\n"
<< "\t\treal_t random_y = HashShadertoy(Y, X, (real_t)(2.0));\n"
<< "\t\treal_t a = fma(random_x, " << dist << ", X) * M_2PI;\n"
<< "\t\treal_t r = exp(log(fma(random_y, " << dist << ", Y)) * " << power << ");\n"
<< "\t\tvOut.x = " << weight << " * cos(a) * r;\n"