diff --git a/data/baseline/rendering/volume/rectilinear3D.png b/data/baseline/rendering/volume/rectilinear3D.png index b5889de5d..55dae9002 100644 --- a/data/baseline/rendering/volume/rectilinear3D.png +++ b/data/baseline/rendering/volume/rectilinear3D.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a24175a16a60f3e917170907546a52de15e703bd06017fecd9c6238db9d2726 -size 103177 +oid sha256:3f9bdb6825e859500308217228970c406b8f75c0ab16d0c2c8d704dfa9ae2e10 +size 116102 diff --git a/data/data/rectilinear/noise.vtk b/data/data/rectilinear/noise.vtk deleted file mode 100644 index 7f4eb0c53..000000000 --- a/data/data/rectilinear/noise.vtk +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c23821f7436bce6d71593698e3cb0047752b4dd671513f8c4e961d4489f199f -size 12110311 diff --git a/data/data/third_party/README.md b/data/data/third_party/README.md new file mode 100644 index 000000000..d59cbb591 --- /dev/null +++ b/data/data/third_party/README.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:362e59e70e65fd365bc64221decdea1096ac9fe4346e23126ec2d35836215832 +size 456 diff --git a/data/data/third_party/visit/README.md b/data/data/third_party/visit/README.md new file mode 100644 index 000000000..3f9fd0a9c --- /dev/null +++ b/data/data/third_party/visit/README.md @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:279231652c3bc23c31a8c7a6bf2e71f56afd11b6e09b5c05dca5dc48380ee0fb +size 1934 diff --git a/data/data/third_party/visit/example.vtk b/data/data/third_party/visit/example.vtk new file mode 100644 index 000000000..371b6a2cd --- /dev/null +++ b/data/data/third_party/visit/example.vtk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce56bb831ac66983f9689c2a73ec0dd7a7a91294f822ad19bf1caa093a8fba25 +size 11295710 diff --git a/data/data/uniform/noise b/data/data/third_party/visit/example_temp.bof similarity index 100% rename from data/data/uniform/noise rename to data/data/third_party/visit/example_temp.bof diff --git a/data/data/third_party/visit/example_temp.bov b/data/data/third_party/visit/example_temp.bov new file mode 100644 index 000000000..3bc9a8fa9 --- /dev/null +++ b/data/data/third_party/visit/example_temp.bov @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:724a6dce8f6f5d6478891a915c76c57c5881467240bb055c6001725631f7833a +size 350 diff --git a/data/data/uniform/noise.bov b/data/data/uniform/noise.bov deleted file mode 100644 index fde60e695..000000000 --- a/data/data/uniform/noise.bov +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2071da4365341303e401d20dc6e8bb35ebeccc24b801cc81ab87e75e3a4ef654 -size 339 diff --git a/data/data/unstructured/ucd3d.vtk b/data/data/unstructured/ucd3d.vtk deleted file mode 100644 index e4ff7c88a..000000000 --- a/data/data/unstructured/ucd3d.vtk +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a178b29073f2aa0d15375b07d0bdd28369422a352b5dcb5155cf67aebe54bbc -size 286099 diff --git a/examples/clipping/Clipping.cxx b/examples/clipping/Clipping.cxx index ddae3737b..1948bcb81 100644 --- a/examples/clipping/Clipping.cxx +++ b/examples/clipping/Clipping.cxx @@ -24,9 +24,9 @@ int main(int argc, char* argv[]) if ((argc < 4) || (argc > 5)) { std::cerr << "Usage: " << argv[0] << " in_data.vtk field_name clip_value [out_data.vtk]\n\n"; - std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n"; + std::cerr << "For example, you could use the example.vtk that comes with the VTK-m source:\n\n"; std::cerr << " " << argv[0] - << " /data/data/unstructured/ucd3d.vtk v 0.3\n"; + << " /data/data/third_party/visit/example.vtk temp 3.5\n"; return 1; } std::string infilename = argv[1]; diff --git a/examples/tetrahedra/Tetrahedralize.cxx b/examples/tetrahedra/Tetrahedralize.cxx index 0734565a3..e8e98fda8 100644 --- a/examples/tetrahedra/Tetrahedralize.cxx +++ b/examples/tetrahedra/Tetrahedralize.cxx @@ -24,8 +24,9 @@ int main(int argc, char* argv[]) if ((argc < 2) || (argc > 3)) { std::cerr << "Usage: " << argv[0] << " in_data.vtk [out_data.vtk]\n\n"; - std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n"; - std::cerr << " " << argv[0] << " /data/data/unstructured/ucd3d.vtk\n"; + std::cerr << "For example, you could use the example.vtk that comes with the VTK-m source:\n\n"; + std::cerr << " " << argv[0] + << " /data/data/third_party/visit/example.vtk\n"; return 1; } std::string infilename = argv[1]; diff --git a/vtkm/io/testing/UnitTestBOVDataSetReader.cxx b/vtkm/io/testing/UnitTestBOVDataSetReader.cxx index 606acd2de..46dec8eff 100644 --- a/vtkm/io/testing/UnitTestBOVDataSetReader.cxx +++ b/vtkm/io/testing/UnitTestBOVDataSetReader.cxx @@ -41,7 +41,8 @@ inline vtkm::cont::DataSet readBOVDataSet(const char* fname) void TestReadingBOVDataSet() { - std::string bovFile = vtkm::cont::testing::Testing::DataPath("uniform/noise.bov"); + std::string bovFile = + vtkm::cont::testing::Testing::DataPath("third_party/visit/example_temp.bov"); auto const& ds = readBOVDataSet(bovFile.data()); diff --git a/vtkm/rendering/testing/UnitTestMapperVolume.cxx b/vtkm/rendering/testing/UnitTestMapperVolume.cxx index d2058a6cc..c18dac035 100644 --- a/vtkm/rendering/testing/UnitTestMapperVolume.cxx +++ b/vtkm/rendering/testing/UnitTestMapperVolume.cxx @@ -26,8 +26,10 @@ namespace void RenderTests() { vtkm::cont::ColorTable colorTable = vtkm::cont::ColorTable::Preset::Inferno; - colorTable.AddPointAlpha(0.0, .01f); - colorTable.AddPointAlpha(1.0, .01f); + colorTable.AddPointAlpha(0.0, 0.01f); + colorTable.AddPointAlpha(0.4, 0.01f); + colorTable.AddPointAlpha(0.7, 0.2f); + colorTable.AddPointAlpha(1.0, 0.5f); vtkm::rendering::testing::RenderTestOptions options; options.Mapper = vtkm::rendering::testing::MapperType::Volume; @@ -35,7 +37,7 @@ void RenderTests() options.ColorTable = colorTable; vtkm::cont::DataSet rectDS, unsDS; - std::string rectfname = vtkm::cont::testing::Testing::DataPath("rectilinear/noise.vtk"); + std::string rectfname = vtkm::cont::testing::Testing::DataPath("third_party/visit/example.vtk"); vtkm::io::VTKDataSetReader rectReader(rectfname); try @@ -53,7 +55,7 @@ void RenderTests() } vtkm::rendering::testing::RenderTest( - rectDS, "hardyglobal", "rendering/volume/rectilinear3D.png", options); + rectDS, "temp", "rendering/volume/rectilinear3D.png", options); } } //namespace