RayTracing.

[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 d7a9fec..e353be7 100755 (executable)
--- 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.\r
 \r
     if (command == "rippling")\r
-        {\r
         AutoViewer<Image, RipplingProvider> rippling(true, true, 10, 10);\r
-        }\r
     else if (command == "mandelbrot")\r
         {\r
         const bool multiGPU = args.size() >= 2 && args[1] == "--mp";\r
@@ -40,6 +38,8 @@ int mainGL(const vector<string>& args)
         AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 10, 10);\r
     else if (command == "heat-transfert")\r
         AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 10, 10);\r
+    else if (command == "raytracing")\r
+        AutoViewer<Image, RayTracingProvider> rayTracing(true, true, 20, 20);\r
     else if (command == "convolution")\r
         {\r
         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.\r
@@ -53,6 +53,7 @@ int mainGL(const vector<string>& args)
         AutoViewer<ImageFonctionel, JuliaProvider> fractalJulia(true, true, 180, 80, false);\r
         AutoViewer<ImageFonctionel, NewtonProvider> newtown(true, true, 260, 120, false);\r
         AutoViewer<Image, HeatTransfertProvider> heatTransfert(true, false, 1200, 300, false);\r
+        AutoViewer<Image, RayTracingProvider> rayTracing(true, true, 200, 80);\r
         GLUTImageViewers::runALL();\r
         }\r
     else\r
@@ -60,7 +61,5 @@ int mainGL(const vector<string>& args)
         cout << "Command unknown: " << command << endl;\r
         }\r
 \r
-    // AutoViewer<ImageFonctionel, RayTracingProvider> rayTracing(true, true, 20, 20); // Commenté car projet approfondit.\r
-\r
     return EXIT_SUCCESS;\r
     }\r