Merge branch 'master' of https://github.com/Ray-Tracing-Systems/Hydra…

…Core
Ray-Tracing-Systems · Nov 9, 2018 · cf00acc · cf00acc
2 parents e12edb0 + 1ee9074
commit cf00acc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,8 +10,8 @@
             "request": "launch",
             "program": "${workspaceFolder}/cmake-build-release/hydra_app/hydra",
             "args"   : ["-nowindow", "0", 
-                        "-saveinterval", "60",
-                        "-enable_mlt", "0"],
+                        "-saveinterval", "1800",
+                        "-enable_mlt", "1"],
             "stopAtEntry": false,
             "cwd"    : "${workspaceFolder}/hydra_app",
             "environment": [],
@@ -31,7 +31,7 @@
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/cmake-build-debug/hydra_app/hydra",
-            "args": ["-nowindow", "1",
+            "args": ["-nowindow", "0",
                      "-saveinterval", "300",
                      "-enable_mlt", "0"],
             "stopAtEntry": false,

diff --git a/hydra_app/input.cpp b/hydra_app/input.cpp
@@ -25,9 +25,10 @@ Input::Input()
   //inLibraryPath = "/home/frol/yandexdisk/Hydra/scenelib"; 
 
   //inLibraryPath = "D:/[archive]/2017/HydraAPP/hydra_app/tests/hydra_benchmark_07";
-  //inLibraryPath = "D:/[archive]/2017/HydraOldRepo/HydraAPP/hydra_app/tests/hydra_benchmark_07";
+  //inLibraryPath = "D:/[archive]/2017/HydraOldRepo/HydraAPP/home/frol/hydra/rendered_images/a_3602.png/hydra_app/tests/hydra_benchmark_07";
 
   //inLibraryPath = "C:/[Hydra]/pluginFiles/scenelib";
+  //inLibraryPath   = "/media/frol/6E0467C0046789C3/[Hydra]/pluginFiles/scenelib";
   //inLibraryPath = "D:/temp/scenelib/"; 
 
   inDevelopment = false; ///< recompile shaders each time; note that nvidia have their own shader cache!