X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=fe29a86d8f8d3b4678e7cd2e6a77aa462a8b749b;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hp=d2b6adfa87016f91fc6386860b3120afeca1ac68;hpb=2d95edd9a2d09421e5eae56755bdf3105e12edf7;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 d2b6adf..fe29a86 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
@@ -12,7 +12,8 @@ using namespace std;
 #include "RipplingProvider.h"
 #include "FractalProvider.h"
 #include "NewtonProvider.h"
-
+#include "HeatTransfertProvider.h"
+#include "RayTracingProvider.h"
 
 template <class TOutput, class TProvider>
 class Viewer
@@ -36,14 +37,13 @@ class Viewer
 
 int mainGL(void)
     {
-    //Viewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);
-    //Viewer<Image, RipplingProvider> rippling0(true, true, 10, 10);
-    //Viewer<ImageFonctionel, MandelbrotProvider> fractalMandelbrot(true, true, 20, 20);
-    //Viewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 30, 30);
-
-
-    Viewer<ImageFonctionel, NewtonProvider> newtown(true, true, 20, 20);
-
+    // Viewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10);
+    // Viewer<Image, RipplingProvider> rippling0(true, true, 10, 10);
+    Viewer<ImageFonctionel, MandelbrotProvider> fractalMandelbrot(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