Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Carson Brownlee
VTK
Commits
c7a8244c
Commit
c7a8244c
authored
Mar 03, 2020
by
Carson Brownlee
Committed by
Carson Brownlee
Apr 29, 2020
Browse files
removing vtk lines temporarily due to crash
parent
f22f8f6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Rendering/RayTracing/vtkOSPRayPolyDataMapperNode.cxx
View file @
c7a8244c
...
@@ -998,11 +998,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
...
@@ -998,11 +998,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
}
else
else
{
{
this
->
GeometricModels
.
emplace_back
(
vtkosp
::
RenderAsCylinders
(
vertices
.
data
(),
conn
.
line_index
,
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
conn
.
line_reverse
,
lineWidth
,
scaleArray
,
scaleFunction
,
useCustomMaterial
,
oMaterial
,
// conn.line_index,
vColorTextureMap
,
numTextureCoordinates
,
(
float
*
)
textureCoordinates
.
data
(),
// conn.line_reverse, lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial,
numCellMaterials
,
cellMaterials
,
numPointColors
,
pointColors
.
data
(),
// vColorTextureMap, numTextureCoordinates, (float*)textureCoordinates.data(),
numPointValueTextureCoords
,
(
float
*
)
pointValueTextureCoords
.
data
(),
backend
));
// numCellMaterials, cellMaterials, numPointColors, pointColors.data(),
// numPointValueTextureCoords, (float*)pointValueTextureCoords.data(), backend));
}
}
}
}
...
@@ -1024,12 +1025,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
...
@@ -1024,12 +1025,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
}
case
VTK_WIREFRAME
:
case
VTK_WIREFRAME
:
{
{
this
->
GeometricModels
.
emplace_back
(
//
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(),
vtkosp
::
RenderAsCylinders
(
vertices
.
data
(),
conn
.
triangle_index
,
conn
.
triangle_reverse
,
// conn.triangle_index
,
lineWidth
,
scaleArray
,
scaleFunction
,
useCustomMaterial
,
oMaterial
,
vColorTextureMap
,
//
conn.triangle_reverse,
lineWidth, scaleArray, scaleFunction, useCustomMaterial,
numTextureCoordinates
,
(
float
*
)
textureCoordinates
.
data
(),
numCellMaterials
,
//
oMaterial, vColorTextureMap,
numTextureCoordinates, (float*)textureCoordinates.data(),
cellMaterials
,
numPointColors
,
pointColors
.
data
(),
numPointValueTextureCoords
,
//
numCellMaterials,
cellMaterials, numPointColors, pointColors.data(),
(
float
*
)
pointValueTextureCoords
.
data
(),
backend
));
//
numPointValueTextureCoords,
(float*)pointValueTextureCoords.data(), backend));
break
;
break
;
}
}
default:
default:
...
@@ -1046,12 +1047,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
...
@@ -1046,12 +1047,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
vtkosp
::
MakeActorMaterial
(
orn
,
oRenderer
,
property
,
eColor
,
eColor
,
specularf
,
opacity
);
vtkosp
::
MakeActorMaterial
(
orn
,
oRenderer
,
property
,
eColor
,
eColor
,
specularf
,
opacity
);
ospCommit
(
oMaterial2
);
ospCommit
(
oMaterial2
);
this
->
GeometricModels
.
emplace_back
(
//
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(),
vtkosp
::
RenderAsCylinders
(
vertices
.
data
(),
conn2
.
triangle_index
,
conn2
.
triangle_reverse
,
//
conn2.triangle_index, conn2.triangle_reverse,
lineWidth, scaleArray, scaleFunction,
lineWidth
,
scaleArray
,
scaleFunction
,
false
,
oMaterial2
,
vColorTextureMap
,
0
,
//
false, oMaterial2, vColorTextureMap, 0,
(float*)textureCoordinates.data(),
(
float
*
)
textureCoordinates
.
data
(),
numCellMaterials
,
cellMaterials
,
numPointColors
,
//
numCellMaterials, cellMaterials, numPointColors,
pointColors.data(), 0,
pointColors
.
data
(),
0
,
(
float
*
)
pointValueTextureCoords
.
data
(),
backend
));
//
(float*)pointValueTextureCoords.data(), backend));
uniqueMats
.
insert
(
oMaterial2
);
//
uniqueMats.insert(oMaterial2);
}
}
std
::
vector
<
osp
::
vec3f
>
normals
;
std
::
vector
<
osp
::
vec3f
>
normals
;
...
@@ -1120,12 +1121,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
...
@@ -1120,12 +1121,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
}
}
case
VTK_WIREFRAME
:
case
VTK_WIREFRAME
:
{
{
this
->
GeometricModels
.
emplace_back
(
//
this->GeometricModels.emplace_back(
vtkosp::RenderAsCylinders(vertices.data(),
vtkosp
::
RenderAsCylinders
(
vertices
.
data
(),
conn
.
strip_index
,
conn
.
strip_reverse
,
// conn.strip_index
,
lineWidth
,
scaleArray
,
scaleFunction
,
useCustomMaterial
,
oMaterial
,
vColorTextureMap
,
//
conn.strip_reverse,
lineWidth, scaleArray, scaleFunction, useCustomMaterial, oMaterial,
numTextureCoordinates
,
(
float
*
)
textureCoordinates
.
data
(),
numCellMaterials
,
//
vColorTextureMap,
numTextureCoordinates, (float*)textureCoordinates.data(),
cellMaterials
,
numPointColors
,
pointColors
.
data
(),
numPointValueTextureCoords
,
//
numCellMaterials,
cellMaterials, numPointColors, pointColors.data(),
(
float
*
)
pointValueTextureCoords
.
data
(),
backend
));
//
numPointValueTextureCoords,
(float*)pointValueTextureCoords.data(), backend));
break
;
break
;
}
}
default:
default:
...
@@ -1142,11 +1143,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
...
@@ -1142,11 +1143,12 @@ void vtkOSPRayPolyDataMapperNode::ORenderPoly(void* renderer, vtkOSPRayActorNode
vtkosp
::
MakeActorMaterial
(
orn
,
oRenderer
,
property
,
eColor
,
eColor
,
specularf
,
opacity
);
vtkosp
::
MakeActorMaterial
(
orn
,
oRenderer
,
property
,
eColor
,
eColor
,
specularf
,
opacity
);
ospCommit
(
oMaterial2
);
ospCommit
(
oMaterial2
);
this
->
GeometricModels
.
emplace_back
(
// this->GeometricModels.emplace_back(vtkosp::RenderAsCylinders(vertices.data(),
vtkosp
::
RenderAsCylinders
(
vertices
.
data
(),
conn2
.
strip_index
,
conn2
.
strip_reverse
,
// conn2.strip_index,
lineWidth
,
scaleArray
,
scaleFunction
,
false
,
oMaterial2
,
vColorTextureMap
,
0
,
// conn2.strip_reverse, lineWidth, scaleArray, scaleFunction, false, oMaterial2,
(
float
*
)
textureCoordinates
.
data
(),
numCellMaterials
,
cellMaterials
,
numPointColors
,
// vColorTextureMap, 0, (float*)textureCoordinates.data(), numCellMaterials,
pointColors
.
data
(),
0
,
(
float
*
)
pointValueTextureCoords
.
data
(),
backend
));
// cellMaterials, numPointColors, pointColors.data(), 0,
// (float*)pointValueTextureCoords.data(), backend));
uniqueMats
.
insert
(
oMaterial2
);
uniqueMats
.
insert
(
oMaterial2
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment