Commit a75a3349 authored by Ken Martin's avatar Ken Martin

rename VBO mapper

Change-Id: I0eb4db5ea193a0afac896418425844cec81e975c
parent 48846dfa
......@@ -75,9 +75,9 @@ set(Module_SRCS
vtkOpenGLGlyph3DMapper.cxx
vtkOpenGLHardwareSelector.cxx
vtkOpenGLLight.cxx
vtkOpenGLPolyDataMapper.cxx
vtkOpenGLPolyDataMapper2D.cxx
vtkOpenGLProperty.cxx
vtkVBOPolyDataMapper.cxx
vtkOpenGLRenderWindow.cxx
vtkOpenGLRenderer.cxx
vtkOpenGLShaderCache.cxx
......@@ -169,12 +169,12 @@ set(opengl_overrides
ImageSliceMapper
Glyph3DMapper
Light
PolyDataMapper
PolyDataMapper2D
Property
Renderer
Texture
)
vtk_add_override(vtkPolyDataMapper vtkVBOPolyDataMapper)
foreach(_override ${opengl_overrides})
vtk_add_override(vtk${_override} vtkOpenGL${_override})
endforeach()
......
......@@ -18,7 +18,7 @@
#include "vtkActor.h"
#include "vtkCellArray.h"
#include "vtkPointData.h"
#include "vtkVBOPolyDataMapper.h"
#include "vtkPolyDataMapper.h"
#include "vtkPLYReader.h"
#include "vtkNew.h"
#include "vtkProperty.h"
......
......@@ -20,7 +20,7 @@
#include "vtkPointData.h"
#include "vtkPolyData.h"
#include "vtkCellArray.h"
#include "vtkVBOPolyDataMapper.h"
#include "vtkPolyDataMapper.h"
#include "vtkNew.h"
#include "vtkProperty.h"
#include "vtkTrivialProducer.h"
......@@ -33,7 +33,7 @@ int TestVBOPointsLines(int, char *[])
{
// Initialize everything
vtkNew<vtkActor> actor;
vtkNew<vtkVBOPolyDataMapper> mapper;
vtkNew<vtkPolyDataMapper> mapper;
vtkNew<vtkRenderer> renderer;
renderer->SetBackground(0.0, 0.0, 0.0);
vtkNew<vtkRenderWindow> renderWindow;
......
......@@ -24,7 +24,7 @@
#include "vtkHardwareSelector.h"
#include "vtkMath.h"
#include "vtkObjectFactory.h"
#include "vtkVBOPolyDataMapper.h"
#include "vtkOpenGLPolyDataMapper.h"
#include "vtkPointData.h"
#include "vtkProperty.h"
#include "vtkRenderer.h"
......@@ -85,7 +85,7 @@ vtkStandardNewMacro(vtkOpenGLGlyph3DMapper)
vtkOpenGLGlyph3DMapper::vtkOpenGLGlyph3DMapper()
{
this->GlyphValues = new vtkOpenGLGlyph3DMapper::vtkOpenGLGlyph3DMapperArray();
this->Mapper = vtkVBOPolyDataMapper::New();
this->Mapper = vtkOpenGLPolyDataMapper::New();
this->Mapper->SetPopulateSelectionSettings(0);
this->LastWindow = 0;
}
......@@ -112,7 +112,7 @@ vtkOpenGLGlyph3DMapper::~vtkOpenGLGlyph3DMapper()
// Send mapper ivars to sub-mapper.
// \pre mapper_exists: mapper!=0
void vtkOpenGLGlyph3DMapper::CopyInformationToSubMapper(
vtkVBOPolyDataMapper *mapper)
vtkOpenGLPolyDataMapper *mapper)
{
assert("pre: mapper_exists" && mapper!=0);
mapper->SetStatic(this->Static);
......
......@@ -32,7 +32,7 @@
#include "vtkWeakPointer.h" // needed for vtkWeakPointer.
#include "vtkNew.h" // For vtkNew
class vtkVBOPolyDataMapper;
class vtkOpenGLPolyDataMapper;
class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLGlyph3DMapper
: public vtkGlyph3DMapper
......@@ -62,7 +62,7 @@ protected:
// Description:
// Send mapper ivars to sub-mapper.
// \pre mapper_exists: mapper != 0
void CopyInformationToSubMapper(vtkVBOPolyDataMapper*);
void CopyInformationToSubMapper(vtkOpenGLPolyDataMapper*);
void SetupColorMapper();
......@@ -75,7 +75,7 @@ protected:
vtkWeakPointer<vtkWindow> LastWindow; // Window used for previous render.
vtkVBOPolyDataMapper *Mapper;
vtkOpenGLPolyDataMapper *Mapper;
vtkTimeStamp PainterUpdateTime;
......
......@@ -38,7 +38,7 @@
#include "vtkTexture.h"
#include "vtkPointData.h"
#include "vtkVBOPolyDataMapper.h"
#include "vtkOpenGLPolyDataMapper.h"
#include "vtkNew.h"
#include "vtkPolyData.h"
#include "vtkCellArray.h"
......@@ -74,7 +74,7 @@ vtkOpenGLImageSliceMapper::vtkOpenGLImageSliceMapper()
vtkNew<vtkTrivialProducer> prod;
prod->SetOutput(polydata.Get());
vtkNew<vtkVBOPolyDataMapper> polyDataMapper;
vtkNew<vtkOpenGLPolyDataMapper> polyDataMapper;
polyDataMapper->SetInputConnection(prod->GetOutputPort());
this->PolyDataActor = vtkActor::New();
this->PolyDataActor->SetMapper(polyDataMapper.Get());
......@@ -95,7 +95,7 @@ vtkOpenGLImageSliceMapper::vtkOpenGLImageSliceMapper()
vtkNew<vtkTrivialProducer> prod;
prod->SetOutput(polydata.Get());
vtkNew<vtkVBOPolyDataMapper> polyDataMapper;
vtkNew<vtkOpenGLPolyDataMapper> polyDataMapper;
polyDataMapper->SetInputConnection(prod->GetOutputPort());
this->BackingPolyDataActor = vtkActor::New();
this->BackingPolyDataActor->SetMapper(polyDataMapper.Get());
......@@ -113,7 +113,7 @@ vtkOpenGLImageSliceMapper::vtkOpenGLImageSliceMapper()
vtkNew<vtkTrivialProducer> prod;
prod->SetOutput(polydata.Get());
vtkNew<vtkVBOPolyDataMapper> polyDataMapper;
vtkNew<vtkOpenGLPolyDataMapper> polyDataMapper;
polyDataMapper->SetInputConnection(prod->GetOutputPort());
this->BackgroundPolyDataActor = vtkActor::New();
this->BackgroundPolyDataActor->SetMapper(polyDataMapper.Get());
......
......@@ -11,12 +11,12 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkVBOPolyDataMapper - PolyDataMapper using VBOs primarily to render.
// .NAME vtkOpenGLPolyDataMapper - PolyDataMapper using OpenGLs primarily to render.
// .SECTION Description
// PolyDataMapper that uses a VBOs to do the actual rendering.
// PolyDataMapper that uses a OpenGLs to do the actual rendering.
#ifndef __vtkVBOPolyDataMapper_h
#define __vtkVBOPolyDataMapper_h
#ifndef __vtkOpenGLPolyDataMapper_h
#define __vtkOpenGLPolyDataMapper_h
#include "vtkRenderingOpenGL2Module.h" // For export macro
#include "vtkPolyDataMapper.h"
......@@ -25,11 +25,11 @@ class vtkOpenGLTexture;
namespace vtkgl {struct CellBO; }
class VTKRENDERINGOPENGL2_EXPORT vtkVBOPolyDataMapper : public vtkPolyDataMapper
class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLPolyDataMapper : public vtkPolyDataMapper
{
public:
static vtkVBOPolyDataMapper* New();
vtkTypeMacro(vtkVBOPolyDataMapper, vtkPolyDataMapper)
static vtkOpenGLPolyDataMapper* New();
vtkTypeMacro(vtkOpenGLPolyDataMapper, vtkPolyDataMapper)
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......@@ -84,8 +84,8 @@ public:
protected:
vtkVBOPolyDataMapper();
~vtkVBOPolyDataMapper();
vtkOpenGLPolyDataMapper();
~vtkOpenGLPolyDataMapper();
// Description:
// Called in GetBounds(). When this method is called, the consider the input
......@@ -103,7 +103,7 @@ protected:
// Description:
// Update the scene when necessary.
void UpdateVBO(vtkActor *act);
void UpdateOpenGL(vtkActor *act);
// Description:
// Set the shader parameteres related to lighting
......@@ -123,7 +123,7 @@ protected:
Private *Internal;
bool UsingScalarColoring;
vtkTimeStamp VBOUpdateTime; // When was the VBO updated?
vtkTimeStamp OpenGLUpdateTime; // When was the OpenGL updated?
vtkOpenGLTexture* InternalColorTexture;
vtkMatrix4x4* ModelTransformMatrix;
......@@ -132,8 +132,8 @@ protected:
int PopulateSelectionSettings;
private:
vtkVBOPolyDataMapper(const vtkVBOPolyDataMapper&); // Not implemented.
void operator=(const vtkVBOPolyDataMapper&); // Not implemented.
vtkOpenGLPolyDataMapper(const vtkOpenGLPolyDataMapper&); // Not implemented.
void operator=(const vtkOpenGLPolyDataMapper&); // Not implemented.
};
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment