Cleanage.

[GPU.git] / WCudaMSE / Student_Cuda_Image / src / cpp / core / 02_Mandelbrot_Julia / moo / host / Fractal.h

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 (executable)
--- 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_\r
 #define FRACTAL_H_\r
 \r
+#include <vector>\r
+#include <string>\r
+\r
 #include "cudaTools.h"\r
 #include "AnimableFonctionel_I.h"\r
 #include "MathTools.h"\r
+#include "VariateurI.h"\r
 #include "VariateurF.h"\r
 \r
 class Fractal : public AnimableFonctionel_I\r
@@ -37,31 +41,36 @@ class Fractal : public AnimableFonctionel_I
 class FractalMandelbrot : public Fractal\r
     {\r
     public:\r
-        FractalMandelbrot(int w, int h, float dn);\r
+        FractalMandelbrot(int w, int h, int dn);\r
         void animationStep();\r
-        float getT() /*override*/;\r
+\r
+        std::vector<std::string> getNames();\r
+        void getValues(float* values);\r
 \r
     private:\r
         void runGPU(uchar4* ptrDevPixels, const DomaineMath& domaineMath) /*override*/;\r
 \r
-        VariateurF variateurAnimationN;\r
-\r
-        float n;\r
+        VariateurI variateurAnimationN;\r
+        int n;\r
     };\r
 \r
 class FractalJulia : public Fractal\r
     {\r
     public:\r
-        FractalJulia(int w, int h, float dn, float z_r_min, float z_r_max, float z_i_min, float z_i_max);\r
+        FractalJulia(int w, int h, int n, float z_r_min, float z_r_max, float z_i_min, float z_i_max);\r
         void animationStep();\r
-        float getT() /*override*/;\r
+\r
+        std::vector<std::string> getNames();\r
+        void getValues(float* values);\r
 \r
     private:\r
         void runGPU(uchar4* ptrDevPixels, const DomaineMath& domaineMath) /*override*/;\r
 \r
+        const int n;\r
+\r
         float z_r, z_i;\r
-        VariateurF variateurAnimationI;\r
-        VariateurF variateurAnimationR;\r
+        VariateurF variateurAnimationI; // Variateur pour z_i.\r
+        VariateurF variateurAnimationR; // Variateur pour z_r.\r
     };\r
 \r
 #endif\r