X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=13dd2db46dca34f24451d37a80e33509214bfedd;hp=d7a9fec300e5893b85641776d8769ae838163ded;hb=f8259dce248a4411c3bc64cecb9fc268c4fd81d6;hpb=d720146850389c8bbe75cb86e69d7e26629ff97f diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp index d7a9fec..13dd2db 100755 --- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp +++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp @@ -20,7 +20,7 @@ using namespace std; int mainGL(const vector& args) { - const string defaultCommand = "demo"; + const string defaultCommand = "raytracing"; const string command = args.size() > 0 ? args[0] : defaultCommand; // AutoViewer rippling0(true, true, 10, 10); // Warmup. @@ -40,6 +40,8 @@ int mainGL(const vector& args) AutoViewer newtown(true, true, 10, 10); else if (command == "heat-transfert") AutoViewer heatTransfert(true, false, 10, 10); + else if (command == "raytracing") + AutoViewer 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. @@ -60,7 +62,5 @@ int mainGL(const vector& args) cout << "Command unknown: " << command << endl; } - // AutoViewer rayTracing(true, true, 20, 20); // Commenté car projet approfondit. - return EXIT_SUCCESS; }