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%2Fhost%2FFractal.h;h=5ad7b83809d618ebc731490c916e4dbc5f26d495;hp=d9b884196d85871c228a6af3d74d361a3012fb77;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hpb=f2c6a4fc79746e2d5c6678699bd2ca93ffc49bcc

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/host/Fractal.h b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/host/Fractal.h
index d9b8841..5ad7b83 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/host/Fractal.h
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/moo/host/Fractal.h
@@ -1,9 +1,13 @@
 #ifndef FRACTAL_H_
 #define FRACTAL_H_
 
+#include <vector>
+#include <string>
+
 #include "cudaTools.h"
 #include "AnimableFonctionel_I.h"
 #include "MathTools.h"
+#include "VariateurI.h"
 #include "VariateurF.h"
 
 class Fractal : public AnimableFonctionel_I
@@ -37,31 +41,36 @@ class Fractal : public AnimableFonctionel_I
 class FractalMandelbrot : public Fractal
     {
     public:
-        FractalMandelbrot(int w, int h, float dn);
+        FractalMandelbrot(int w, int h, int dn);
         void animationStep();
-        float getT() /*override*/;
+
+        std::vector<std::string> getNames();
+        void getValues(float* values);
 
     private:
         void runGPU(uchar4* ptrDevPixels, const DomaineMath& domaineMath) /*override*/;
 
-        VariateurF variateurAnimationN;
-
-        float n;
+        VariateurI variateurAnimationN;
+        int n;
     };
 
 class FractalJulia : public Fractal
     {
     public:
-        FractalJulia(int w, int h, float dn, float z_r_min, float z_r_max, float z_i_min, float z_i_max);
+        FractalJulia(int w, int h, int n, float z_r_min, float z_r_max, float z_i_min, float z_i_max);
         void animationStep();
-        float getT() /*override*/;
+
+        std::vector<std::string> getNames();
+        void getValues(float* values);
 
     private:
         void runGPU(uchar4* ptrDevPixels, const DomaineMath& domaineMath) /*override*/;
 
+        const int n;
+
         float z_r, z_i;
-        VariateurF variateurAnimationI;
-        VariateurF variateurAnimationR;
+        VariateurF variateurAnimationI; // Variateur pour z_i.
+        VariateurF variateurAnimationR; // Variateur pour z_r.
     };
 
 #endif