X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;fp=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2FmainGL.cpp;h=e353be7cffd4be4bdad716c5c4bb7b0fae7ac647;hp=13dd2db46dca34f24451d37a80e33509214bfedd;hb=1c4b2276e7157acde9a3014b68d5d1667a7d6a44;hpb=f8259dce248a4411c3bc64cecb9fc268c4fd81d6 diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp index 13dd2db..e353be7 100755 --- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp +++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/mainGL.cpp @@ -20,15 +20,13 @@ using namespace std; int mainGL(const vector& args) { - const string defaultCommand = "raytracing"; + const string defaultCommand = "demo"; const string command = args.size() > 0 ? args[0] : defaultCommand; // AutoViewer rippling0(true, true, 10, 10); // Warmup. if (command == "rippling") - { AutoViewer rippling(true, true, 10, 10); - } else if (command == "mandelbrot") { const bool multiGPU = args.size() >= 2 && args[1] == "--mp"; @@ -55,6 +53,7 @@ int mainGL(const vector& args) AutoViewer fractalJulia(true, true, 180, 80, false); AutoViewer newtown(true, true, 260, 120, false); AutoViewer heatTransfert(true, false, 1200, 300, false); + AutoViewer rayTracing(true, true, 200, 80); GLUTImageViewers::runALL(); } else