Changeset 3305 for branches/nanovis2/packages/vizservers/vtkvis/RpGlyphs.h

Timestamp:

Feb 18, 2013, 2:32:14 PM (11 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RpGlyphs.h (modified) (5 diffs)

branches/nanovis2/packages/vizservers/vtkvis/RpGlyphs.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011, Purdue Research Foundation
+ * Copyright (C) 2004-2012  HUBzero Foundation, LLC
  *
  * Author: Leif Delgass <ldelgass@purdue.edu>
@@ -15 +15 @@
 #include <vtkActor.h>
 #include <vtkVersion.h>
-#if ((VTK_MAJOR_VERSION > 5) || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 8))
-#define HAVE_GLYPH3D_MAPPER
 #include <vtkGlyph3DMapper.h>
-#else
-#include <vtkGlyph3D.h>
-#endif
 #include <vtkLookupTable.h>
 #include <vtkPlaneCollection.h>
@@ -81 +76 @@
     void setOrient(bool state);
 
-#ifdef HAVE_GLYPH3D_MAPPER
     void setOrientMode(bool mode, const char *name);
 
@@ -87 +81 @@
 
     void setColorMode(ColorMode mode, const char *name, double range[2]);
-#endif
 
     void setScalingMode(ScalingMode mode);
@@ -142 +135 @@
     vtkSmartPointer<vtkLookupTable> _lut;
     vtkSmartPointer<vtkPolyDataAlgorithm> _glyphSource;
-#ifdef HAVE_GLYPH3D_MAPPER
     vtkSmartPointer<vtkGlyph3DMapper> _glyphMapper;
-#else
-    vtkSmartPointer<vtkGlyph3D> _glyphGenerator;
-    vtkSmartPointer<vtkPolyDataMapper> _pdMapper;
-#endif
 };