summaryrefslogtreecommitdiff
path: root/test/testing_src
diff options
context:
space:
mode:
authorJason Maskell <[email protected]>2016-05-16 16:31:40 +0200
committerJason Maskell <[email protected]>2016-05-16 16:31:40 +0200
commit35fb54cc684bd78ebb15ea64705396bcef53ff4f (patch)
treec437f7e2ce02fc7e98d2e7bd0943cdc92fe17b5d /test/testing_src
parentAdded the test_d3d11 app to the solution. Not compiling yet, mostly a paranoi... (diff)
downloadwaveworks_archive-35fb54cc684bd78ebb15ea64705396bcef53ff4f.tar.xz
waveworks_archive-35fb54cc684bd78ebb15ea64705396bcef53ff4f.zip
Added the ability to specify the "media" directory for the test project.
test_d3d11 now runs, but doesn't work yet. Converted foam.dds to 32 bit to let it actually load since it's 24 bit format was deprecated.
Diffstat (limited to 'test/testing_src')
-rw-r--r--test/testing_src/testing.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/testing_src/testing.h b/test/testing_src/testing.h
index 3537d3e..9620aa4 100644
--- a/test/testing_src/testing.h
+++ b/test/testing_src/testing.h
@@ -53,6 +53,7 @@ struct TestParams
bool UseReadbacks;
GFSDK_WaveWorks_Simulation_DetailLevel QualityMode;
std::string ScreenshotDirectory;
+ std::string MediaDirectory;
explicit TestParams(std::string strCommandLine)
: UseReadbacks(false)
@@ -108,6 +109,10 @@ struct TestParams
m_shouldTakeScreen = true;
ScreenshotDirectory = std::string(keyValuePair[1]);
}
+ else if (keyValuePair[0] == "mediadir")
+ {
+ MediaDirectory = std::string(keyValuePair[1]);
+ }
else if( keyValuePair[0] == "noaa" )
{
m_allowAA = false;