From 09225c1cde9507710e7c71556432c20b5c793258 Mon Sep 17 00:00:00 2001 From: frol-msu-white-linux Date: Wed, 7 Aug 2019 16:39:22 +0300 Subject: [PATCH] fix test scenes --- hydra_app/input.cpp | 7 +- .../tests/test_223_small/change_00000.xml | 171 ------------ .../tests/test_223_small/statex_00000.xml | 8 - .../tests/test_223_small/statex_00001.xml | 4 +- hydra_app/tests/test_224/change_00000.xml | 171 ------------ hydra_app/tests/test_224/statex_00000.xml | 8 - hydra_app/tests/test_224/statex_00001.xml | 4 +- .../tests/test_224_sphere/statex_00001.xml | 8 +- .../statex_00001.xml | 8 +- hydra_app/tests/test_42/change_00000.xml | 163 ------------ hydra_app/tests/test_42/statex_00000.xml | 8 - hydra_app/tests/test_42/statex_00001.xml | 6 +- .../test_42_with_mirror/statex_00001.xml | 4 +- hydra_app/tests/test_pool/change_00000.xml | 248 ------------------ hydra_app/tests/test_pool/statex_00000.xml | 8 - hydra_app/tests/test_pool/statex_00001.xml | 4 +- 16 files changed, 22 insertions(+), 808 deletions(-) delete mode 100755 hydra_app/tests/test_223_small/change_00000.xml delete mode 100755 hydra_app/tests/test_223_small/statex_00000.xml delete mode 100644 hydra_app/tests/test_224/change_00000.xml delete mode 100644 hydra_app/tests/test_224/statex_00000.xml delete mode 100644 hydra_app/tests/test_42/change_00000.xml delete mode 100644 hydra_app/tests/test_42/statex_00000.xml delete mode 100644 hydra_app/tests/test_pool/change_00000.xml delete mode 100644 hydra_app/tests/test_pool/statex_00000.xml diff --git a/hydra_app/input.cpp b/hydra_app/input.cpp index f821c53..0f70f9c 100644 --- a/hydra_app/input.cpp +++ b/hydra_app/input.cpp @@ -10,18 +10,17 @@ Input::Input() //noWindow = false; ///< run 'console_main', else run 'window_main' inLibraryPath = "tests/test_42"; ///< cornell box with teapot - //inLibraryPath = "/home/frol/temp3/shadow_bug/01_0"; - //inLibraryPath = "/home/frol/PROG/HydraRepos/HydraAPI-tests/tests_f/test_162"; //inLibraryPath = "tests/test_42_with_mirror"; //inLibraryPath = "tests/test_223_small"; ///< cornell box with sphere + //inLibraryPath = "tests/test_224"; //inLibraryPath = "tests/test_224_sphere"; //inLibraryPath = "tests/test_224_sphere_microfacet"; //inLibraryPath = "tests/test_pool"; //inLibraryPath = "/home/frol/PROG/CLSP_gitlab/database/temp"; - inDevelopment = false; ///< recompile shaders each time; note that nvidia have their own shader cache! + inDevelopment = true; ///< recompile shaders each time; note that nvidia have their own shader cache! inDeviceId = 0; ///< opencl device id - cpuFB = false; ///< store frame buffer on CPU. Automaticly enabled if + cpuFB = true; ///< store frame buffer on CPU. Automaticly enabled if enableMLT = false; ///< if use MMLT, you MUST enable it early, when render process just started (here or via command line). boxMode = false; ///< special 'in the box' mode when render don't react to any commands diff --git a/hydra_app/tests/test_223_small/change_00000.xml b/hydra_app/tests/test_223_small/change_00000.xml deleted file mode 100755 index e8e85a7..0000000 --- a/hydra_app/tests/test_223_small/change_00000.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.75 0.75 0.75 - - - - - - 0.75 0.75 0.75 - - - - - - 0.1 0.1 0.75 - - - - - 0.75 0.75 0.25 - - - - - - 0.5 0.0 0.0 - - - - - 0.0 0.5 0.0 - - - - - 0.5 0.5 0.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 45 - 0.01 - 100.0 - 0 1 0 - 0 0 15 - 0 0 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1024 - 768 - pathtracing - pathtracing - pathtracing - pathtracing - 1 - 6 - 3 - 1 - 256 - 4096 - - - - - - - - - - - diff --git a/hydra_app/tests/test_223_small/statex_00000.xml b/hydra_app/tests/test_223_small/statex_00000.xml deleted file mode 100755 index 311f463..0000000 --- a/hydra_app/tests/test_223_small/statex_00000.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/hydra_app/tests/test_223_small/statex_00001.xml b/hydra_app/tests/test_223_small/statex_00001.xml index c5a8206..2070f8c 100755 --- a/hydra_app/tests/test_223_small/statex_00001.xml +++ b/hydra_app/tests/test_223_small/statex_00001.xml @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/hydra_app/tests/test_224/change_00000.xml b/hydra_app/tests/test_224/change_00000.xml deleted file mode 100644 index 4e162f8..0000000 --- a/hydra_app/tests/test_224/change_00000.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.75 0.75 0.75 - - - - - - 0.75 0.75 0.75 - - - - - - 0.1 0.1 0.75 - - - - - 0.75 0.75 0.25 - - - - - - 0.5 0.0 0.0 - - - - - 0.0 0.5 0.0 - - - - - 0.5 0.5 0.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 45 - 0.01 - 100.0 - 0 1 0 - 0 0 14 - 0 0 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 512 - 512 - IBPT - IBPT - IBPT - IBPT - 1 - 6 - 3 - 2048 - - - - - - - - - - - - - diff --git a/hydra_app/tests/test_224/statex_00000.xml b/hydra_app/tests/test_224/statex_00000.xml deleted file mode 100644 index 311f463..0000000 --- a/hydra_app/tests/test_224/statex_00000.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/hydra_app/tests/test_224/statex_00001.xml b/hydra_app/tests/test_224/statex_00001.xml index edccb37..37066d9 100644 --- a/hydra_app/tests/test_224/statex_00001.xml +++ b/hydra_app/tests/test_224/statex_00001.xml @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/hydra_app/tests/test_224_sphere/statex_00001.xml b/hydra_app/tests/test_224_sphere/statex_00001.xml index f9df10b..b275a83 100644 --- a/hydra_app/tests/test_224_sphere/statex_00001.xml +++ b/hydra_app/tests/test_224_sphere/statex_00001.xml @@ -71,12 +71,12 @@ - + - + @@ -85,13 +85,13 @@ - + - + diff --git a/hydra_app/tests/test_224_sphere_microfacet/statex_00001.xml b/hydra_app/tests/test_224_sphere_microfacet/statex_00001.xml index 952a82b..482bfbf 100644 --- a/hydra_app/tests/test_224_sphere_microfacet/statex_00001.xml +++ b/hydra_app/tests/test_224_sphere_microfacet/statex_00001.xml @@ -71,12 +71,12 @@ - + - + @@ -85,13 +85,13 @@ - + - + diff --git a/hydra_app/tests/test_42/change_00000.xml b/hydra_app/tests/test_42/change_00000.xml deleted file mode 100644 index d5a4e76..0000000 --- a/hydra_app/tests/test_42/change_00000.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - 0.5 0.75 0.5 - - - - - - 0.207843 0.188235 0 - - - 0.367059 0.345882 0 - 0.5 - - - - - 0.75 0.75 0.75 - - - - - - 0.75 0.75 0.75 - - - - - - 0.1 0.1 0.75 - - - - - 0.75 0.75 0.25 - - - - - - 0.5 0.0 0.0 - - - - - 0.0 0.5 0.0 - - - - - 0.5 0.5 0.5 - - - - - - - - - - - - - 1 1 1 - 10.0 - - - - - - 45 - 0.01 - 100.0 - 0 1 0 - 0 0 15 - 0 0 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1024 - 768 - pathtracing - pathtracing - pathtracing - pathtracing - 1 - 5 - 3 - 2 - 256 - 1024 - 1 - - - - - - - - - - - diff --git a/hydra_app/tests/test_42/statex_00000.xml b/hydra_app/tests/test_42/statex_00000.xml deleted file mode 100644 index 311f463..0000000 --- a/hydra_app/tests/test_42/statex_00000.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/hydra_app/tests/test_42/statex_00001.xml b/hydra_app/tests/test_42/statex_00001.xml index e6de37d..fbceffb 100644 --- a/hydra_app/tests/test_42/statex_00001.xml +++ b/hydra_app/tests/test_42/statex_00001.xml @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ 1 1 1 - 10.0 + 31.4 @@ -83,7 +83,7 @@ 0 1 0 0 0 15 0 0 0 - 1 + 0 0.25f diff --git a/hydra_app/tests/test_42_with_mirror/statex_00001.xml b/hydra_app/tests/test_42_with_mirror/statex_00001.xml index 8ffa76f..3bcafae 100644 --- a/hydra_app/tests/test_42_with_mirror/statex_00001.xml +++ b/hydra_app/tests/test_42_with_mirror/statex_00001.xml @@ -185,7 +185,7 @@ - + @@ -198,7 +198,7 @@ - + diff --git a/hydra_app/tests/test_pool/change_00000.xml b/hydra_app/tests/test_pool/change_00000.xml deleted file mode 100644 index df7cd45..0000000 --- a/hydra_app/tests/test_pool/change_00000.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - 0.078 0.0 0.156 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 45.2035904 - 0.00999999978 - 100 - 0.259378 0.720475 -0.643148 - -1.93895 4.64602 4.03138 - 1.21336 -3.46632 -3.78501 - 0 - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1024 - 1024 - pathtracing - pathtracing - pathtracing - pathtracing - 1 - 8 - 4 - 1 - 1024 - 2000000 - 4096 - 262144 - 0.906000018 - 1 - 1000000 - 1000000 - 0 - 0 - 1 - 0 - 0 - 0 - C:/[Hydra]/bin2/shaders - 2.20000005 - 0 - - - - - - - - - - - - - - diff --git a/hydra_app/tests/test_pool/statex_00000.xml b/hydra_app/tests/test_pool/statex_00000.xml deleted file mode 100644 index 311f463..0000000 --- a/hydra_app/tests/test_pool/statex_00000.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/hydra_app/tests/test_pool/statex_00001.xml b/hydra_app/tests/test_pool/statex_00001.xml index fdb312d..2336b2a 100644 --- a/hydra_app/tests/test_pool/statex_00001.xml +++ b/hydra_app/tests/test_pool/statex_00001.xml @@ -127,7 +127,7 @@ - + @@ -140,7 +140,7 @@ - +