Ajout du squelette de Newton.

[GPU.git] / WCudaMSE / Student_Cuda_Image / src / cpp / core / mainGL.cpp

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
index 44ee751..f71dc78 100755 (executable)
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
@@ -10,6 +10,8 @@
 #include "Rippling0Provider.h"\r
 #include "RipplingProvider.h"\r
 \r
+#include "FractalProvider.h"\r
+\r
 using std::cout;\r
 using std::endl;\r
 using std::string;\r
@@ -42,27 +44,26 @@ int mainGL(void);
 \r
 int mainGL(void)\r
     {\r
-    Rippling0Image* ptrRippling0 = Rippling0Provider::createGL();\r
-    Image* ptrRippling = RipplingProvider::createGL();\r
-    // TODO : Insert  autres Images ...\r
+    //Rippling0Image* ptrRippling0 = Rippling0Provider::createGL();\r
+    //Image* ptrRippling = RipplingProvider::createGL();\r
+    //ImageFonctionel* ptrFractalMandelbrot = FractalProvider::createMandelbrotGL();\r
+    //ImageFonctionel* ptrFractalJulia = FractalProvider::createJuliaGL();\r
 \r
-    bool isAnimation = true;\r
-    bool isSelection = true;\r
+    const bool isAnimation = true;\r
+    const bool isSelection = true;\r
 \r
-    GLUTImageViewers rippling0Viewer(ptrRippling0, isAnimation, isSelection, 0, 0);\r
-    GLUTImageViewers ripplingViewer(ptrRippling, isAnimation, isSelection, 10, 10);\r
-    // TODO : Insert here autres ImageViewers ...\r
+    //GLUTImageViewers rippling0Viewer(ptrRippling0, isAnimation, isSelection, 0, 0);\r
+    //GLUTImageViewers ripplingViewer(ptrRippling, isAnimation, isSelection, 10, 10);\r
+    //GLUTImageViewers fractalMandelbrotViewer(ptrFractalMandelbrot, true, true, 20, 20);\r
+    //GLUTImageViewers fractalJuliaViewer(ptrFractalJulia, true, true, 20, 20);\r
 \r
     GLUTImageViewers::runALL(); // Bloquant, Tant qu'une fenetre est ouverte\r
 \r
     // destruction\r
-       {\r
-       delete ptrRippling0;\r
-       delete ptrRippling;\r
-\r
-       ptrRippling0 = NULL;\r
-       ptrRippling = NULL;\r
-       }\r
+    //delete ptrRippling0;\r
+    //delete ptrRippling;\r
+    //delete ptrFractalMandelbrot;\r
+    delete ptrFractalJulia;\r
 \r
     return EXIT_SUCCESS;\r
     }\r