Commit 58d3f9e5 authored by Carson Brownlee's avatar Carson Brownlee
Browse files

removing vtk lines temporarily due to crash

parent 014c9292
......@@ -998,11 +998,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
else
{
this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(), conn.line_index,
conn.line_reverse, lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial,
vColorTextureMap, numTextureCoordinates, (float*)textureCoordinates.data(),
numCellMaterials, cellMaterials, numPointColors, pointColors.data(),
numPointValueTextureCoords, (float*)pointValueTextureCoords.data(), backend));
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
// conn.line_index,
// conn.line_reverse, lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial,
// vColorTextureMap, numTextureCoordinates, (float*)textureCoordinates.data(),
// numCellMaterials, cellMaterials, numPointColors, pointColors.data(),
// numPointValueTextureCoords, (float*)pointValueTextureCoords.data(), backend));
}
}
......@@ -1024,12 +1025,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
case VTK_WIREFRAME:
{
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(), conn.triangle_index, conn.triangle_reverse,
lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial, vColorTextureMap,
numTextureCoordinates, (float*)textureCoordinates.data(), numCellMaterials,
cellMaterials, numPointColors, pointColors.data(), numPointValueTextureCoords,
(float*)pointValueTextureCoords.data(), backend));
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
// conn.triangle_index,
// conn.triangle_reverse, lineWidth, scaleArray, scaleFunction, useCustomMaterial,
// oMaterial, vColorTextureMap, numTextureCoordinates, (float*)textureCoordinates.data(),
// numCellMaterials, cellMaterials, numPointColors, pointColors.data(),
// numPointValueTextureCoords, (float*)pointValueTextureCoords.data(), backend));
break;
}
default:
......@@ -1046,12 +1047,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
vtkosp::MakeActorMaterial(orn, oRenderer, property, eColor, eColor, specularf, opacity);
ospCommit(oMaterial2);
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(), conn2.triangle_index, conn2.triangle_reverse,
lineWidth, scaleArray, scaleFunction, false, oMaterial2, vColorTextureMap, 0,
(float*)textureCoordinates.data(), numCellMaterials, cellMaterials, numPointColors,
pointColors.data(), 0, (float*)pointValueTextureCoords.data(), backend));
uniqueMats.insert(oMaterial2);
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
// conn2.triangle_index, conn2.triangle_reverse, lineWidth, scaleArray, scaleFunction,
// false, oMaterial2, vColorTextureMap, 0, (float*)textureCoordinates.data(),
// numCellMaterials, cellMaterials, numPointColors, pointColors.data(), 0,
// (float*)pointValueTextureCoords.data(), backend));
// uniqueMats.insert(oMaterial2);
}
std::vector<osp::vec3f> normals;
......@@ -1120,12 +1121,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
case VTK_WIREFRAME:
{
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(), conn.strip_index, conn.strip_reverse,
lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial, vColorTextureMap,
numTextureCoordinates, (float*)textureCoordinates.data(), numCellMaterials,
cellMaterials, numPointColors, pointColors.data(), numPointValueTextureCoords,
(float*)pointValueTextureCoords.data(), backend));
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
// conn.strip_index,
// conn.strip_reverse, lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial,
// vColorTextureMap, numTextureCoordinates, (float*)textureCoordinates.data(),
// numCellMaterials, cellMaterials, numPointColors, pointColors.data(),
// numPointValueTextureCoords, (float*)pointValueTextureCoords.data(), backend));
break;
}
default:
......@@ -1142,11 +1143,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
vtkosp::MakeActorMaterial(orn, oRenderer, property, eColor, eColor, specularf, opacity);
ospCommit(oMaterial2);
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(), conn2.strip_index, conn2.strip_reverse,
lineWidth, scaleArray, scaleFunction, false, oMaterial2, vColorTextureMap, 0,
(float*)textureCoordinates.data(), numCellMaterials, cellMaterials, numPointColors,
pointColors.data(), 0, (float*)pointValueTextureCoords.data(), backend));
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
// conn2.strip_index,
// conn2.strip_reverse, lineWidth, scaleArray, scaleFunction, false, oMaterial2,
// vColorTextureMap, 0, (float*)textureCoordinates.data(), numCellMaterials,
// cellMaterials, numPointColors, pointColors.data(), 0,
// (float*)pointValueTextureCoords.data(), backend));
uniqueMats.insert(oMaterial2);
}
......
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