Changeset 4649 for vtkvis/trunk
- Timestamp:
- Oct 16, 2014 12:36:51 PM (9 years ago)
- Location:
- vtkvis/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
vtkvis/trunk/LIC.cpp
r4060 r4649 92 92 } 93 93 94 #ifdef HAVE_LIC 94 95 vtkImageData *imageData = vtkImageData::SafeDownCast(ds); 95 96 if (imageData != NULL) { … … 332 333 333 334 _mapper->Update(); 335 #endif 334 336 } 335 337 … … 456 458 _volumeSlicer->SetVOI(voi); 457 459 } 458 460 #ifdef HAVE_LIC 459 461 if (_lic != NULL) 460 462 _lic->Update(); 461 463 #endif 462 464 if (_mapper != NULL) 463 465 _mapper->Update(); -
vtkvis/trunk/LIC.h
r4060 r4649 73 73 vtkSmartPointer<vtkProbeFilter> _probeFilter; 74 74 vtkSmartPointer<vtkPlane> _cutPlane; 75 #ifdef HAVE_LIC 75 76 vtkSmartPointer<vtkImageDataLIC2D> _lic; 76 77 vtkSmartPointer<vtkSurfaceLICPainter> _painter; 78 #endif 77 79 vtkSmartPointer<vtkMapper> _mapper; 78 80 }; -
vtkvis/trunk/Makefile.in
r4364 r4649 5 5 USE_GPU_RAYCASTING = yes 6 6 USE_OFFSCREEN_RENDERING = #yes 7 USE_OPENGL2_BACKEND = #yes 7 8 USE_THREADS = yes 8 9 USE_CPU_LEGEND_RENDER = yes … … 62 63 -lvtkInteractionStyle-$(VTK_VERSION) \ 63 64 -lvtkInteractionWidgets-$(VTK_VERSION) \ 64 -lvtkRenderingOpenGL-$(VTK_VERSION) \65 65 -lvtkRenderingImage-$(VTK_VERSION) \ 66 -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \67 66 -lvtkRenderingFreeTypeFontConfig-$(VTK_VERSION) \ 68 67 -lvtkRenderingFreeType-$(VTK_VERSION) \ 69 -lvtkRenderingVolumeOpenGL-$(VTK_VERSION) \70 68 -lvtkRenderingVolume-$(VTK_VERSION) \ 71 69 -lvtkRenderingLabel-$(VTK_VERSION) \ … … 80 78 -lvtksys-$(VTK_VERSION) 81 79 80 ifdef USE_OPENGL2_BACKEND 81 VTK_LIB_SPEC += \ 82 -lvtkRenderingOpenGL2-$(VTK_VERSION) \ 83 -lvtkRenderingFreeTypeOpenGL2-$(VTK_VERSION) \ 84 -lvtkRenderingVolumeOpenGL2-$(VTK_VERSION) 85 else 86 VTK_LIB_SPEC += \ 87 -lvtkRenderingOpenGL-$(VTK_VERSION) \ 88 -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \ 89 -lvtkRenderingVolumeOpenGL-$(VTK_VERSION) 90 endif 91 82 92 ifeq ($(VTK_VERSION),6.0) 83 93 VTK_LIB_SPEC += \ 84 94 -lvtkRenderingHybridOpenGL-$(VTK_VERSION) 85 95 else 96 ifndef USE_OPENGL2_BACKEND 86 97 VTK_LIB_SPEC += \ 87 98 -lvtkRenderingLIC-$(VTK_VERSION) 99 endif 88 100 endif 89 101 … … 134 146 DEFINES += -DNEW_SCALAR_BAR 135 147 endif 136 148 ifndef USE_OPENGL2_BACKEND 149 DEFINES += -DHAVE_LIC 150 endif 151 152 ifdef USE_OPENGL2_BACKEND 153 VTK_MOD_DEFS = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL2,vtkRenderingOpenGL2)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL2)" 154 else 137 155 VTK_MOD_DEFS = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)" 156 endif 138 157 DEFINES += -DUSE_VTK6 $(VTK_MOD_DEFS) 139 158 -
vtkvis/trunk/Renderer.cpp
r4640 r4649 10 10 #include <cassert> 11 11 #include <cmath> 12 13 #include <GL/gl.h>14 12 15 13 #ifdef WANT_TRACE … … 39 37 #include <vtkOpenGLRenderWindow.h> 40 38 #include <vtkVersion.h> 39 40 #include <GL/gl.h> 41 41 42 42 #include "Renderer.h"
Note: See TracChangeset
for help on using the changeset viewer.