Skip to content

Commit

Permalink
aux.color for transf spherefold parab
Browse files Browse the repository at this point in the history
  • Loading branch information
mclarekin committed Aug 22, 2017
1 parent 622e1da commit a207aca
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions mandelbulber2/src/fractal_formulas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8815,7 +8815,7 @@ void TransfSphericalFoldParabIteration(CVector4 &z, const sFractal *fractal, sEx
{
if (fractal->transformCommon.functionEnabledAyFalse && m > tempM) m = tempM + (tempM - m);
z *= m;
aux.DE *= m;
aux.DE = aux.DE * m + 1.0;
aux.r_dz *= m;
if (fractal->foldColor.auxColorEnabledFalse)
{
Expand All @@ -8828,7 +8828,7 @@ void TransfSphericalFoldParabIteration(CVector4 &z, const sFractal *fractal, sEx
double m = fractal->transformCommon.maxR2d1 / rr;
if (fractal->transformCommon.functionEnabledAyFalse && m > tempM) m = tempM + (tempM - m);
z *= m;
aux.DE *= m;
aux.DE = aux.DE * m + 1.0;
aux.r_dz *= m;
if (fractal->foldColor.auxColorEnabledFalse)
{
Expand Down Expand Up @@ -8858,16 +8858,24 @@ void TransfSphericalFoldParabIteration(CVector4 &z, const sFractal *fractal, sEx
m = 1.0 + (maxR2 - rr) * (maxR2 - rr) * factor;
if (fractal->transformCommon.functionEnabledAxFalse && m > tempM) m = tempM + (tempM - m);
z *= m;
aux.DE *= m;
aux.DE = aux.DE * m + 1.0;
aux.r_dz *= m;
if (fractal->foldColor.auxColorEnabledFalse)
{
aux.color += fractal->mandelbox.color.factorSp1;
}
}
else if (rr < maxR2)
{
m = 1.0 + (maxR2 - rr) * (maxR2 - rr) * factor;
if (fractal->transformCommon.functionEnabledAxFalse && m > tempM) m = tempM + (tempM - m);
z *= m;
aux.DE *= m;
aux.DE = aux.DE * m + 1.0;
aux.r_dz *= m;
if (fractal->foldColor.auxColorEnabledFalse)
{
aux.color += fractal->mandelbox.color.factorSp2;
}
}
}
z -= fractal->mandelbox.offset;
Expand Down

0 comments on commit a207aca

Please sign in to comment.