Commit 75e304f0 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'opengl-split' into master

15005ffa Fixed some annotation tests.
a1afa61d Split out the FreeType OpenGL rendering code
parents f33a8f58 15005ffa
......@@ -5,7 +5,7 @@ vtk_module(vtkRenderingAnnotation
vtkRenderingFreeType
vtkImagingColor
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingFreeTypeOpenGL
vtkTestingRendering
vtkInteractionStyle
vtkRenderingLOD
......
set(Module_SRCS
vtkOpenGLFreeTypeTextMapper.cxx
)
set(vtk_module_overrides "vtkTextMapper")
set(vtk_module_vtkTextMapper_override "vtkOpenGLFreeTypeTextMapper")
# Now we iterate and create that class file...
foreach(_class ${vtk_module_overrides})
set(_override ${vtk_module_${_class}_override})
set(_vtk_override_includes "${_vtk_override_includes}
#include \"${_override}.h\"")
set(_vtk_override_creates "${_vtk_override_creates}
VTK_CREATE_CREATE_FUNCTION(${_override})")
set(_vtk_override_do "${_vtk_override_do}
this->RegisterOverride(\"${_class}\",
\"${_override}\",
\"Override for ${vtk-module} module\", 1,
vtkObjectFactoryCreate${_override});")
endforeach()
# Now lets create the object factory classes
string(TOUPPER ${vtk-module} VTK-MODULE)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.h)
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(
${vtk-module}ObjectFactory.cxx
WRAP_EXCLUDE
)
vtk_module_library(${vtk-module} ${Module_SRCS})
vtk_module(vtkRenderingFreeTypeOpenGL
GROUPS
Rendering
IMPLEMENTS
vtkRenderingFreeType
DEPENDS
vtkRenderingOpenGL
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
)
......@@ -24,23 +24,11 @@
#ifndef __vtkOpenGLFreeTypeTextMapper_h
#define __vtkOpenGLFreeTypeTextMapper_h
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkRenderingFreeTypeOpenGLModule.h" // For export macro
#include "vtkTextMapper.h"
//#include <FTGL.h>
//
//#ifdef FTGL_USE_NAMESPACE
//namespace ftgl
//{
//#endif
//BTX
//class FTFont;
//ETX
//#ifdef FTGL_USE_NAMESPACE
//}
//#endif
class VTKRENDERINGOPENGL_EXPORT vtkOpenGLFreeTypeTextMapper : public vtkTextMapper
class VTKRENDERINGFREETYPEOPENGL_EXPORT vtkOpenGLFreeTypeTextMapper
: public vtkTextMapper
{
public:
vtkTypeMacro(vtkOpenGLFreeTypeTextMapper,vtkTextMapper);
......@@ -75,6 +63,4 @@ private:
void operator=(const vtkOpenGLFreeTypeTextMapper&); // Not implemented.
};
#endif
......@@ -45,11 +45,9 @@ set(Module_SRCS
vtkOpenGLCoincidentTopologyResolutionPainter.cxx
vtkOpenGLDisplayListPainter.cxx
vtkOpenGLExtensionManager.cxx
vtkOpenGLFreeTypeTextMapper.cxx
vtkOpenGLGlyph3DMapper.cxx
vtkOpenGLHardwareSupport.cxx
vtkOpenGLImageMapper.cxx
#vtkOpenGLImageResliceMapper.cxx
vtkOpenGLImageSliceMapper.cxx
vtkOpenGLLight.cxx
vtkOpenGLLightingPainter.cxx
......@@ -273,8 +271,6 @@ set(opengl_overrides
# Some that do not follow the naming scheme...
list(APPEND vtk_module_overrides "vtkPolyDataMapper")
set(vtk_module_vtkPolyDataMapper_override "vtkPainterPolyDataMapper")
list(APPEND vtk_module_overrides "vtkTextMapper")
set(vtk_module_vtkTextMapper_override "vtkOpenGLFreeTypeTextMapper")
# FIXME: Not sure that this is the best way to handle X...
if(VTK_USE_X)
......
......@@ -5,8 +5,6 @@ vtk_module(vtkRenderingOpenGL
vtkRenderingCore
DEPENDS
# These are likely to be removed soon - split Rendering/OpenGL further.
vtkRenderingFreeType # For vtkTextMapper
vtkIOImage # For vtkImageExport
vtkImagingHybrid # For vtkSampleFunction
COMPILE_DEPENDS
vtkParseOGLExt
......
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