X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F02_Mandelbrot_Julia%2Fmoo%2Fdevice%2FFractalDevice.cu;h=1b326db65e6a6c2b1ca25cd5170cc53f92ea1b2d;hb=fd0031be0a39a5d902750affaff6322fcd5229b1;hp=997b32bf1432b2dac3dea9688f43de85bea4a65f;hpb=8cb42977ea2d8904795381957474b65f15f46526;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 997b32b..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
@@ -1,8 +1,9 @@
+#include "FractalDevice.h"
+
 #include <iostream>
 
 #include "Indice2D.h"
 #include "IndiceTools.h"
-#include "DomaineMath.h"
 #include "cudaTools.h"
 #include "Device.h"
 
@@ -11,27 +12,11 @@
 using std::cout;
 using std::endl;
 
-__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);
-
-__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)
-    {
-    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)
+__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.
@@ -46,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);
 
@@ -55,3 +40,16 @@ __device__ void fractal(uchar4* ptrDevPixels, int w, int h, const DomaineMath& d
         s += NB_THREAD;
         }
     }
+
+__global__ void fractalMandelbrot(uchar4* ptrDevPixels, int w, int hFrom, int hTo, DomaineMath domaineMath, int n)
+    {
+    FractalMandelbrotMath fractalMath(n);
+    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, 0, h, domaineMath, n, fractalMath);
+    }
+