Added missing code for DeltaDE josKleinian. It fixed bug #627

buddhi1980 · Apr 27, 2019 · 02be968 · 02be968
1 parent ffe0f3d
commit 02be968
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/mandelbulber2/opencl/engines/calculate_distance.cl b/mandelbulber2/opencl/engines/calculate_distance.cl
@@ -221,6 +221,11 @@ formulaOut CalculateDistance(__constant sClInConstants *consts, float3 point,
 #elif DELTA_PSEUDO_KLEINIAN_DE
 			float rxy = native_sqrt(out.z.x * out.z.x + out.z.y * out.z.y);
 			out.distance = max(rxy - 0.92784f, fabs(rxy * out.z.z) / r) / d;
+#elif DELTA_JOS_KLEINIAN_DE
+			float4 z = out.z;
+			float rxy = native_sqrt(z.x * z.x + z.z * z.z);
+			out.distance = (fabs(rxy * z.y) / r) / d;
+			out.maxiter = false;
 #endif
 		}
 

diff --git a/mandelbulber2/opencl/engines/compute_fractal.cl b/mandelbulber2/opencl/engines/compute_fractal.cl
@@ -531,6 +531,12 @@ formulaOut Fractal(__constant sClInConstants *consts, float3 point, sClCalcParam
 	}
 #endif
 
+#ifdef DELTA_JOS_KLEINIAN_DE
+	// needed for JosKleinian fractal to calculate spheres in deltaDE mode
+	if (consts->fractal[sequence].transformCommon.spheresEnabled)
+		z.y = min(z.y, consts->fractal[sequence].transformCommon.foldingValue - z.y);
+#endif
+
 	// end
 	if (dist < 0.0f) dist = 0.0f;
 	out.distance = dist;

diff --git a/mandelbulber2/src/opencl_engine_render_fractal.cpp b/mandelbulber2/src/opencl_engine_render_fractal.cpp
@@ -366,6 +366,7 @@ void cOpenClEngineRenderFractal::SetParameters(const cParameterContainer *paramC
 	bool useLinearDEFunction = false;
 	bool useLogarithmicDEFunction = false;
 	bool usePseudoKleinianDEFunction = false;
+	bool useJosKleinianDEFunction = true;
 
 	if (fractals->IsHybrid())
 	{
@@ -393,6 +394,7 @@ void cOpenClEngineRenderFractal::SetParameters(const cParameterContainer *paramC
 				case fractal::linearDEFunction: useLinearDEFunction = true; break;
 				case fractal::logarithmicDEFunction: useLogarithmicDEFunction = true; break;
 				case fractal::pseudoKleinianDEFunction: usePseudoKleinianDEFunction = true; break;
+				case fractal::josKleinianDEFunction: useJosKleinianDEFunction = true; break;
 				default: break;
 			}
 		}
@@ -415,6 +417,7 @@ void cOpenClEngineRenderFractal::SetParameters(const cParameterContainer *paramC
 					case fractal::linearDEFunction: useLinearDEFunction = true; break;
 					case fractal::logarithmicDEFunction: useLogarithmicDEFunction = true; break;
 					case fractal::pseudoKleinianDEFunction: usePseudoKleinianDEFunction = true; break;
+					case fractal::josKleinianDEFunction: useJosKleinianDEFunction = true; break;
 					default: break;
 				}
 			}
@@ -426,6 +429,7 @@ void cOpenClEngineRenderFractal::SetParameters(const cParameterContainer *paramC
 	if (useLinearDEFunction) definesCollector += " -DDELTA_LINEAR_DE";
 	if (useLogarithmicDEFunction) definesCollector += " -DDELTA_LOG_DE";
 	if (usePseudoKleinianDEFunction) definesCollector += " -DDELTA_PSEUDO_KLEINIAN_DE";
+	if (useJosKleinianDEFunction) definesCollector += " -DDELTA_JOS_KLEINIAN_DE";
 
 	if (paramRender->limitsEnabled) definesCollector += " -DLIMITS_ENABLED";