Changeset 3980 for trunk/packages/vizservers/vtkvis
- Timestamp:
- Oct 2, 2013 1:16:17 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/Volume.cpp
r3961 r3980 213 213 if (getVolume() != NULL) { 214 214 getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange)); 215 #ifdef USE_GPU_RAYCAST_MAPPER 216 getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, _opacity)); 217 #else 215 218 getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange)); 219 #endif 216 220 } 217 221 } … … 234 238 if (getVolume() != NULL) { 235 239 getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange)); 240 #ifdef USE_GPU_RAYCAST_MAPPER 241 getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, _opacity)); 242 #else 236 243 getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange)); 244 #endif 237 245 } 238 246 } … … 256 264 // 3D texture mapper, not the GPU raycast mapper 257 265 if (getVolume() != NULL) { 266 #ifdef USE_GPU_RAYCAST_MAPPER 267 getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, opacity)); 268 #else 258 269 if (opacity < 1.0e-6) 259 270 opacity = 1.0e-6; 260 271 getVolume()->GetProperty()->SetScalarOpacityUnitDistance(1.0/opacity); 272 #endif 261 273 } 262 274 }
Note: See TracChangeset
for help on using the changeset viewer.