Début du TP convolution. Pour l'instant uniquement lecture d'une vidéo.

[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 b15ca7b..10a9393 100755 (executable)
--- 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"\r
 #include "HeatTransfertProvider.h"\r
 #include "RayTracingProvider.h"\r
+#include "ConvolutionProvider.h"\r
 \r
-template <class TOutput, class TProvider>\r
-class Viewer\r
-    {\r
-    private:\r
-        TOutput* ptrOutput;\r
-        GLUTImageViewers viewer;\r
-\r
-    public:\r
-        Viewer(bool isAnimation, bool isSelection, int pxFrame, int pyFrame):\r
-        ptrOutput(TProvider::createGL()),\r
-            viewer(ptrOutput, isAnimation, isSelection, pxFrame, pyFrame)\r
-            {\r
-            }\r
-\r
-        Viewer(TOutput* output, bool isAnimation, bool isSelection, int pxFrame, int pyFrame):\r
-            ptrOutput(output),\r
-            viewer(ptrOutput, isAnimation, isSelection, pxFrame, pyFrame)\r
-            {\r
-            }\r
-\r
-        ~Viewer()\r
-            {\r
-            delete this->ptrOutput;\r
-            }\r
-    };\r
+#include "Viewer.h"\r
 \r
 int mainGL(void)\r
     {\r
-    // Viewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);\r
-    // Viewer<Image, RipplingProvider> rippling0(true, true, 10, 10);\r
-    Viewer<ImageFonctionel, MandelbrotProvider> fractalMandelbrot(MandelbrotProvider::createGL(true), true, true, 20, 20);\r
-    // Viewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 30, 30);\r
-    // Viewer<ImageFonctionel, NewtonProvider> newtown(true, true, 20, 20);\r
-    // Viewer<Image, HeatTransfertProvider> heatTransfert(true, false, 20, 20);\r
-    // Viewer<ImageFonctionel, RayTracingProvider> rayTracing(true, true, 20, 20);\r
-\r
-    GLUTImageViewers::runALL(); // Bloquant, Tant qu'une fenetre est ouverte.\r
+    // AutoViewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);\r
+    // AutoViewer<Image, RipplingProvider> rippling0(true, true, 10, 10);\r
+    // Viewer<ImageFonctionel> fractalMandelbrot(MandelbrotProvider::createGL(true), true, true, 20, 20);\r
+    // AutoViewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 30, 30);\r
+    // AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 20, 20);\r
+    // AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 20, 20);\r
+    // AutoViewer<ImageFonctionel, RayTracingProvider> rayTracing(true, true, 20, 20);\r
+    Viewer<Image> convolution(ConvolutionProvider::createGL("/media/Data/Video/nasaFHD_short.avi"), true, true, 20, 20);\r
+\r
+    GLUTImageViewers::runALL(); // Bloquant, Tant qu'une fenêtre est ouverte.\r
 \r
     return EXIT_SUCCESS;\r
     }\r