Skip to content

address conflict between visualization and VTK head #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 21, 2018
Merged

address conflict between visualization and VTK head #2612

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1de5cd7
Merge pull request #2 from PointCloudLibrary/master
greenbrettmichael Nov 11, 2018
88f5e5b
address vtk 8.2 dev head issue with vtk/rendering/core introduced by …
greenbrettmichael Nov 11, 2018
8687c7c
better define for VTK behavior
greenbrettmichael Nov 20, 2018
ddf45e5
move define VTK version switch to original location
greenbrettmichael Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions visualization/src/pcl_visualizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3528,12 +3528,11 @@ pcl::visualization::PCLVisualizer::addTextureMesh (const pcl::TextureMesh &mesh,
std::size_t tex_id = 0;
while (tex_id < last_tex_id)
{
#if VTK_MAJOR_VERSION < 9
int tu = vtkProperty::VTK_TEXTURE_UNIT_0 + tex_id;
#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION > 8
const char *tu = mesh.tex_materials[tex_id].tex_name.c_str();
#else
const char *tu = mesh.tex_materials[tex_id].tex_name.c_str ();
int tu = vtkProperty::VTK_TEXTURE_UNIT_0 + tex_id;
#endif

vtkSmartPointer<vtkTexture> texture = vtkSmartPointer<vtkTexture>::New ();
if (textureFromTexMaterial (mesh.tex_materials[tex_id], texture))
{
Expand Down Expand Up @@ -3561,10 +3560,10 @@ pcl::visualization::PCLVisualizer::addTextureMesh (const pcl::TextureMesh &mesh,
else
for (std::size_t tc = 0; tc < mesh.tex_coordinates[t].size (); ++tc)
coordinates->InsertNextTuple2 (-1.0, -1.0);

mapper->MapDataArrayToMultiTextureAttribute(tu,
this_coordinates_name.c_str (),
vtkDataObject::FIELD_ASSOCIATION_POINTS);
this_coordinates_name.c_str(),
vtkDataObject::FIELD_ASSOCIATION_POINTS);

polydata->GetPointData ()->AddArray (coordinates);
actor->GetProperty ()->SetTexture (tu, texture);
++tex_id;
Expand Down