X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F02_Mandelbrot_Julia%2Fmoo%2Fdevice%2FFractalDevice.cu;fp=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F02_Mandelbrot_Julia%2Fmoo%2Fdevice%2FFractalDevice.cu;h=1b326db65e6a6c2b1ca25cd5170cc53f92ea1b2d;hp=a98ed36ce58b7c547cd48e0ffdc47551dcc5d249;hb=fd0031be0a39a5d902750affaff6322fcd5229b1;hpb=2fd5d915e8a9de4d957d6031d2d68088784eac3c

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 a98ed36..1b326db 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
@@ -12,11 +12,11 @@
 using std::cout;
 using std::endl;
 
-__device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& domaineMath, int n, const FractalMath& fractalMath)
+__device__ void fractal(uchar4* ptrDevPixels, int w, int hFrom, int hTo, const DomaineMath& domaineMath, int n, const FractalMath& fractalMath)
     {
     const int TID = Indice2D::tid();
     const int NB_THREAD = Indice2D::nbThread();
-    const int WH = w * h;
+    const int WH = w * (hTo - hFrom);
 
     uchar4 color;
     color.z = 255; // Par défaut, l'image est opaque.
@@ -31,7 +31,7 @@ __device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& d
 
         // (i,j) domaine écran
         // (x,y) domaine math
-        domaineMath.toXY(pixelI, pixelJ, &x, &y); //  (i,j) -> (x,y)
+        domaineMath.toXY(pixelI + hFrom, pixelJ, &x, &y); //  (i,j) -> (x,y)
 
         fractalMath.colorXY(&color, x, y);
 
@@ -41,15 +41,15 @@ __device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& d
         }
     }
 
-__global__ void fractalMandelbrot(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n)
+__global__ void fractalMandelbrot(uchar4* ptrDevPixels, int w, int hFrom, int hTo, DomaineMath domaineMath, int n)
     {
     FractalMandelbrotMath fractalMath(n);
-    fractal(ptrDevPixels, w, h, domaineMath, n, fractalMath);
+    fractal(ptrDevPixels, w, hFrom, hTo, domaineMath, n, fractalMath);
     }
 
 __global__ void fractalJulia(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath, int n, float c_r, float c_i)
     {
     FractalJuliaMath fractalMath(n, c_r, c_i);
-    fractal(ptrDevPixels, w, h, domaineMath, n, fractalMath);
+    fractal(ptrDevPixels, w, 0, h, domaineMath, n, fractalMath);
     }