Commit 5140a677 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'vtkm_lod_test_fix'

53b1c837 Rearrange test scene to fit smaller window.
9f0d9525 Fix indention issues.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !5011
parents 33715842 53b1c837
......@@ -462,7 +462,7 @@ int TestVTKMLevelOfDetail(int argc, char *argv[])
// Load file and make only triangles
//---------------------------------------------------
char* fname =
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp");
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp");
vtkNew<vtkXMLPolyDataReader> reader;
reader->SetFileName(fname);
delete[] fname;
......@@ -482,8 +482,8 @@ int TestVTKMLevelOfDetail(int argc, char *argv[])
std::vector< vtkNew<vtkPolyDataMapper> > mappers(4);
std::vector< vtkNew<vtkActor> > actors(4);
for(int i=0; i < 4; ++i)
{
for (int i=0; i < 4; ++i)
{
levelOfDetails[i]->SetInputConnection(clean->GetOutputPort());
//subdivision levels of 16, 32, 48, 64
levelOfDetails[i]->SetNumberOfXDivisions( ((i+1) * 16) );
......@@ -495,23 +495,23 @@ int TestVTKMLevelOfDetail(int argc, char *argv[])
mappers[i]->SetInputConnection(surfaces[i]->GetOutputPort());
actors[i]->SetMapper(mappers[i]);
actors[i]->SetPosition( i * 10, 0, 0);
actors[i]->SetPosition((i % 2) * 10, -(i / 2) * 10, 0);
ren->AddActor(actors[i]);
}
}
ren->SetBackground(0.1, 0.2, 0.4);
ren->ResetCamera();
ren->GetActiveCamera()->Zoom(6.);
renWin->SetSize(1600, 250);
ren->GetActiveCamera()->Zoom(1.3);
renWin->SetSize(600, 600);
renWin->Render();
int retVal = vtkRegressionTestImage(renWin);
if(retVal == vtkRegressionTester::DO_INTERACTOR)
{
iren->Start();
retVal = vtkRegressionTester::PASSED;
iren->Start();
retVal = vtkRegressionTester::PASSED;
}
return (!retVal);
}
e96dee63440b556807076219866d4172cc562ed42fd8c0291527a2724ebac10953e229dc9e29001c57689328c8965883700753e0e3f0776381e4eba07a31fe02
b763cc14592591f805136b8d1d28e18c50caa4291ad771b25b8a91b87be67414ddaf3e66961533af096ce6662c35cc2c16e5df9d17a5a293feeada64a05b5b11
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment