Changeset 4649 for vtkvis


Ignore:
Timestamp:
Oct 16, 2014 12:36:51 PM (6 years ago)
Author:
ldelgass
Message:

Support building with experimental VTK OpenGL2 rendering backend

Location:
vtkvis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • vtkvis/trunk/LIC.cpp

    r4060 r4649  
    9292    }
    9393
     94#ifdef HAVE_LIC
    9495    vtkImageData *imageData = vtkImageData::SafeDownCast(ds);
    9596    if (imageData != NULL) {
     
    332333
    333334    _mapper->Update();
     335#endif
    334336}
    335337
     
    456458        _volumeSlicer->SetVOI(voi);
    457459    }
    458 
     460#ifdef HAVE_LIC
    459461    if (_lic != NULL)
    460462        _lic->Update();
    461 
     463#endif
    462464    if (_mapper != NULL)
    463465        _mapper->Update();
  • vtkvis/trunk/LIC.h

    r4060 r4649  
    7373    vtkSmartPointer<vtkProbeFilter> _probeFilter;
    7474    vtkSmartPointer<vtkPlane> _cutPlane;
     75#ifdef HAVE_LIC
    7576    vtkSmartPointer<vtkImageDataLIC2D> _lic;
    7677    vtkSmartPointer<vtkSurfaceLICPainter> _painter;
     78#endif
    7779    vtkSmartPointer<vtkMapper> _mapper;
    7880};
  • vtkvis/trunk/Makefile.in

    r4364 r4649  
    55USE_GPU_RAYCASTING      = yes
    66USE_OFFSCREEN_RENDERING = #yes
     7USE_OPENGL2_BACKEND     = #yes
    78USE_THREADS             = yes
    89USE_CPU_LEGEND_RENDER   = yes
     
    6263                -lvtkInteractionStyle-$(VTK_VERSION) \
    6364                -lvtkInteractionWidgets-$(VTK_VERSION) \
    64                 -lvtkRenderingOpenGL-$(VTK_VERSION) \
    6565                -lvtkRenderingImage-$(VTK_VERSION) \
    66                 -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \
    6766                -lvtkRenderingFreeTypeFontConfig-$(VTK_VERSION) \
    6867                -lvtkRenderingFreeType-$(VTK_VERSION)  \
    69                 -lvtkRenderingVolumeOpenGL-$(VTK_VERSION) \
    7068                -lvtkRenderingVolume-$(VTK_VERSION) \
    7169                -lvtkRenderingLabel-$(VTK_VERSION) \
     
    8078                -lvtksys-$(VTK_VERSION)
    8179
     80ifdef USE_OPENGL2_BACKEND
     81VTK_LIB_SPEC += \
     82                -lvtkRenderingOpenGL2-$(VTK_VERSION) \
     83                -lvtkRenderingFreeTypeOpenGL2-$(VTK_VERSION) \
     84                -lvtkRenderingVolumeOpenGL2-$(VTK_VERSION)
     85else
     86VTK_LIB_SPEC += \
     87                -lvtkRenderingOpenGL-$(VTK_VERSION) \
     88                -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \
     89                -lvtkRenderingVolumeOpenGL-$(VTK_VERSION)
     90endif
     91
    8292ifeq ($(VTK_VERSION),6.0)
    8393VTK_LIB_SPEC += \
    8494                -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
    8595else
     96ifndef USE_OPENGL2_BACKEND
    8697VTK_LIB_SPEC += \
    8798                -lvtkRenderingLIC-$(VTK_VERSION)
     99endif
    88100endif
    89101
     
    134146DEFINES         += -DNEW_SCALAR_BAR
    135147endif
    136 
     148ifndef USE_OPENGL2_BACKEND
     149DEFINES         += -DHAVE_LIC
     150endif
     151
     152ifdef USE_OPENGL2_BACKEND
     153VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL2,vtkRenderingOpenGL2)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL2)"
     154else
    137155VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
     156endif
    138157DEFINES         += -DUSE_VTK6 $(VTK_MOD_DEFS)
    139158
  • vtkvis/trunk/Renderer.cpp

    r4640 r4649  
    1010#include <cassert>
    1111#include <cmath>
    12 
    13 #include <GL/gl.h>
    1412
    1513#ifdef WANT_TRACE
     
    3937#include <vtkOpenGLRenderWindow.h>
    4038#include <vtkVersion.h>
     39
     40#include <GL/gl.h>
    4141
    4242#include "Renderer.h"
Note: See TracChangeset for help on using the changeset viewer.