X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=10a939372b5ec27039369b470d0a65712131c41b;hb=4182eb3a07b7143afb8ebebfe77e8ef8e8abc266;hp=97952e73f1673e9c8704d8727136039768cb9ce1;hpb=bd178531f80f8bc41c998d1c4588f9e18cc29389;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 97952e7..10a9393 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
@@ -1,6 +1,7 @@
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
+using namespace std;
 
 #include "GLUTImageViewers.h"
 
@@ -9,70 +10,26 @@
 
 #include "Rippling0Provider.h"
 #include "RipplingProvider.h"
-
 #include "FractalProvider.h"
+#include "NewtonProvider.h"
+#include "HeatTransfertProvider.h"
+#include "RayTracingProvider.h"
+#include "ConvolutionProvider.h"
 
-using std::cout;
-using std::endl;
-using std::string;
-
-/*----------------------------------------------------------------------*\
- |*			Declaration 					*|
- \*---------------------------------------------------------------------*/
-
-/*--------------------------------------*\
- |*		Imported	 	*|
- \*-------------------------------------*/
-
-/*--------------------------------------*\
- |*		Public			*|
- \*-------------------------------------*/
-
-int mainGL(void);
-
-/*--------------------------------------*\
- |*		Private			*|
- \*-------------------------------------*/
-
-/*----------------------------------------------------------------------*\
- |*			Implementation 					*|
- \*---------------------------------------------------------------------*/
-
-/*--------------------------------------*\
- |*		Public			*|
- \*-------------------------------------*/
+#include "Viewer.h"
 
 int mainGL(void)
     {
-    //Rippling0Image* ptrRippling0 = Rippling0Provider::createGL();
-    //Image* ptrRippling = RipplingProvider::createGL();
-    //ImageFonctionel* ptrFractalMandelbrot = FractalProvider::createMandelbrotGL();
-    ImageFonctionel* ptrFractalJulia = FractalProvider::createJuliaGL();
-
-    const bool isAnimation = true;
-    const bool isSelection = true;
-
-    //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
+    // AutoViewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);
+    // AutoViewer<Image, RipplingProvider> rippling0(true, true, 10, 10);
+    // Viewer<ImageFonctionel> fractalMandelbrot(MandelbrotProvider::createGL(true), true, true, 20, 20);
+    // AutoViewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 30, 30);
+    // AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 20, 20);
+    // AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 20, 20);
+    // AutoViewer<ImageFonctionel, RayTracingProvider> rayTracing(true, true, 20, 20);
+    Viewer<Image> convolution(ConvolutionProvider::createGL("/media/Data/Video/nasaFHD_short.avi"), true, true, 20, 20);
 
-    // destruction
-    //delete ptrRippling0;
-    //delete ptrRippling;
-    //delete ptrFractalMandelbrot;
-    delete ptrFractalJulia;
+    GLUTImageViewers::runALL(); // Bloquant, Tant qu'une fenêtre est ouverte.
 
     return EXIT_SUCCESS;
     }
-
-/*--------------------------------------*\
- |*		Private			*|
- \*-------------------------------------*/
-
-/*----------------------------------------------------------------------*\
- |*			End	 					*|
- \*---------------------------------------------------------------------*/
-