X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=e353be7cffd4be4bdad716c5c4bb7b0fae7ac647;hb=1c4b2276e7157acde9a3014b68d5d1667a7d6a44;hp=d7a9fec300e5893b85641776d8769ae838163ded;hpb=6664817ed89b0b616044da35a3eb8f715e0813d9;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 d7a9fec..e353be7 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp
@@ -26,9 +26,7 @@ int mainGL(const vector<string>& args)
     // AutoViewer<Rippling0Image, Rippling0Provider> rippling0(true, true, 10, 10); // Warmup.
 
     if (command == "rippling")
-        {
         AutoViewer<Image, RipplingProvider> rippling(true, true, 10, 10);
-        }
     else if (command == "mandelbrot")
         {
         const bool multiGPU = args.size() >= 2 && args[1] == "--mp";
@@ -40,6 +38,8 @@ int mainGL(const vector<string>& args)
         AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 10, 10);
     else if (command == "heat-transfert")
         AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 10, 10);
+    else if (command == "raytracing")
+        AutoViewer<Image, RayTracingProvider> rayTracing(true, true, 20, 20);
     else if (command == "convolution")
         {
         const string videoPath = args.size() >= 2 ? args[1] : "/media/Data/Video/nasaFHD_short.avi"; // Vidéo par défaut si pas donnée en paramètre.
@@ -53,6 +53,7 @@ int mainGL(const vector<string>& args)
         AutoViewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 180, 80, false);
         AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 260, 120, false);
         AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 1200, 300, false);
+        AutoViewer<Image, RayTracingProvider> rayTracing(true, true, 200, 80);
         GLUTImageViewers::runALL();
         }
     else
@@ -60,7 +61,5 @@ int mainGL(const vector<string>& args)
         cout << "Command unknown: " << command << endl;
         }
 
-    // AutoViewer<ImageFonctionel, RayTracingProvider> rayTracing(true, true, 20, 20); // Commenté car projet approfondit.
-
     return EXIT_SUCCESS;
     }