X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=10a939372b5ec27039369b470d0a65712131c41b;hp=b15ca7b3423f9972d57c41cabc8dc25668f2daf9;hb=4182eb3a07b7143afb8ebebfe77e8ef8e8abc266;hpb=fd0031be0a39a5d902750affaff6322fcd5229b1

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
index b15ca7b..10a9393 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
@@ -14,44 +14,22 @@ using namespace std;
 #include "NewtonProvider.h"
 #include "HeatTransfertProvider.h"
 #include "RayTracingProvider.h"
+#include "ConvolutionProvider.h"
 
-template <class TOutput, class TProvider>
-class Viewer
-    {
-    private:
-        TOutput* ptrOutput;
-        GLUTImageViewers viewer;
-
-    public:
-        Viewer(bool isAnimation, bool isSelection, int pxFrame, int pyFrame):
-        ptrOutput(TProvider::createGL()),
-            viewer(ptrOutput, isAnimation, isSelection, pxFrame, pyFrame)
-            {
-            }
-
-        Viewer(TOutput* output, bool isAnimation, bool isSelection, int pxFrame, int pyFrame):
-            ptrOutput(output),
-            viewer(ptrOutput, isAnimation, isSelection, pxFrame, pyFrame)
-            {
-            }
-
-        ~Viewer()
-            {
-            delete this->ptrOutput;
-            }
-    };
+#include "Viewer.h"
 
 int mainGL(void)
     {
-    // Viewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);
-    // Viewer<Image, RipplingProvider> rippling0(true, true, 10, 10);
-    Viewer<ImageFonctionel, MandelbrotProvider> fractalMandelbrot(MandelbrotProvider::createGL(true), true, true, 20, 20);
-    // Viewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 30, 30);
-    // Viewer<ImageFonctionel, NewtonProvider> newtown(true, true, 20, 20);
-    // Viewer<Image, HeatTransfertProvider> heatTransfert(true, false, 20, 20);
-    // Viewer<ImageFonctionel, RayTracingProvider> rayTracing(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);
+
+    GLUTImageViewers::runALL(); // Bloquant, Tant qu'une fenêtre est ouverte.
 
     return EXIT_SUCCESS;
     }