X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=97952e73f1673e9c8704d8727136039768cb9ce1;hb=bd178531f80f8bc41c998d1c4588f9e18cc29389;hp=44ee7517441366796ea42cebcaf25bf6aadc6a16;hpb=8d08c12b29c2a14684f35c023ee39e694bb80d25;p=GPU.git

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