X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F02_Mandelbrot_Julia%2Fmoo%2Fdevice%2FFractalDevice.cu;h=f9a89262ac559f28fc371a755cc570f34f2de5f4;hb=bd178531f80f8bc41c998d1c4588f9e18cc29389;hp=8281489ecf2a55d6556146ddcef2b693cca41875;hpb=7798b7c27cf13aaeada22faae8648df8cb339f1b;p=GPU.git

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/device/FractalDevice.cu b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/device/FractalDevice.cu
index 8281489..f9a8926 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/device/FractalDevice.cu
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/device/FractalDevice.cu
@@ -23,7 +23,9 @@ using std::endl;
  |*		Public			*|
  \*-------------------------------------*/
 
-__global__ void fractal(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n, float t);
+__global__ void fractalMandelbrot(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n);
+__global__ void fractalJulia(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n, float c_r, float c_i);
+__device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& domaineMath, int n, const FractalMath& fractalMath);
 
 /*--------------------------------------*\
  |*		Private			*|
@@ -41,10 +43,21 @@ __global__ void fractal(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineM
  |*		Private			*|
  \*-------------------------------------*/
 
-__global__ void fractal(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n, float t)
+
+__global__ void fractalMandelbrot(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n)
+    {
+    FractalMandelbrotMath fractalMath(n);
+    fractal(ptrDevPixels, w, h, domaineMath, n, fractalMath);
+    }
+
+__global__ void fractalJulia(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n, float c_r, float c_i)
     {
-    FractalMath fractalMath(n);
+    FractalJuliaMath fractalMath(n, c_r, c_i);
+    fractal(ptrDevPixels, w, h, domaineMath, n, fractalMath);
+    }
 
+__device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& domaineMath, int n, const FractalMath& fractalMath)
+    {
     const int TID = Indice2D::tid();
     const int NB_THREAD = Indice2D::nbThread();
     const int WH = w * h;
@@ -57,19 +70,19 @@ __global__ void fractal(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineM
 
     int s = TID;
     while (s < WH)
-	{
-	IndiceTools::toIJ(s, w, &pixelI, &pixelJ); // update (pixelI, pixelJ)
+        {
+        IndiceTools::toIJ(s, w, &pixelI, &pixelJ); // update (pixelI, pixelJ)
 
-	// (i,j) domaine ecran
-	// (x,y) domaine math
-	domaineMath.toXY(pixelI, pixelJ, &x, &y); //  (i,j) -> (x,y)
+        // (i,j) domaine ecran
+        // (x,y) domaine math
+        domaineMath.toXY(pixelI, pixelJ, &x, &y); //  (i,j) -> (x,y)
 
-	fractalMath.colorXY(&color,x, y, t); // update color
+        fractalMath.colorXY(&color, x, y);
 
-	ptrDevPixels[s] = color;
+        ptrDevPixels[s] = color;
 
-	s += NB_THREAD;
-	}
+        s += NB_THREAD;
+        }
     }
 
 /*----------------------------------------------------------------------*\