Remove the RenderingFreeTypeOpenGL module.

This is not supported by the new OpenGL2 backend, and doesn't support new text features, like MathText, FontConfig, or custom font files. It only implements vtkTextMapper, which now will use a texture-based implementation, similar to vtkTextActor and friends.
Kitware · Apr 9, 2015 · 4f7460a · 4f7460a
1 parent 953d3b7
commit 4f7460a
Show file tree

Hide file tree

Showing 38 changed files with 11 additions and 1,481 deletions.
diff --git a/Examples/GUI/Cocoa/CMakeLists.txt b/Examples/GUI/Cocoa/CMakeLists.txt
@@ -56,7 +56,7 @@ add_executable(SimpleCocoaVTK MACOSX_BUNDLE ${SimpleCocoaVTK_SRCS} ${SimpleCocoa
 
 # Probably a better way to set the framework link libraries.
 target_link_libraries(SimpleCocoaVTK "-framework Cocoa -framework OpenGL"
-                      vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL vtkInteractionStyle )
+                      vtkRenderingOpenGL vtkInteractionStyle )
 
 # Set a custom plist file for the app bundle
 set_target_properties(SimpleCocoaVTK PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${SimpleCocoaVTK_SOURCE_DIR}/Info-CMake.plist)

diff --git a/Examples/GUI/Cocoa/PrefixHeader.pch b/Examples/GUI/Cocoa/PrefixHeader.pch
@@ -4,5 +4,5 @@
 // Required for proper object factory initialization.
 // It happens automatically when building with CMake,
 // but not when building with Xcode.
-#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)
+#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL)
 #define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL)
diff --git a/Examples/GUI/Qt/GraphicsView/CMakeLists.txt b/Examples/GUI/Qt/GraphicsView/CMakeLists.txt
@@ -20,7 +20,6 @@ find_package(VTK COMPONENTS
   vtkGUISupportQt
   vtkGUISupportQtOpenGL
   vtkIOInfovis
-  vtkRenderingFreeTypeOpenGL
   vtkViewsInfovis
 )
 include(${VTK_USE_FILE})

diff --git a/Examples/GUI/Qt/SimpleView/CMakeLists.txt b/Examples/GUI/Qt/SimpleView/CMakeLists.txt
@@ -18,7 +18,6 @@ find_package(VTK COMPONENTS
   vtkFiltersCore
   vtkInfovisCore
   vtkInteractionStyle
-  vtkRenderingFreeType${VTK_RENDERING_BACKEND}
   vtkViewsQt
 )
 include(${VTK_USE_FILE})

diff --git a/Examples/HyperTree/Cxx/Sphere/CMakeLists.txt b/Examples/HyperTree/Cxx/Sphere/CMakeLists.txt
@@ -23,4 +23,4 @@ set(HyperTreeGridSphere_SRCS
 
 # Add example showing use use of synthetic vtkHyperTreeGrid along with various filters
 add_executable(HyperTreeGridSphere ${HyperTreeGridSphere_SRCS})
-target_link_libraries(HyperTreeGridSphere vtkCommonCore vtkCommonSystem vtkCommonDataModel vtkCommonExecutionModel vtkIOCore vtkIOLegacy vtkFiltersCore vtkFiltersGeometry vtkFiltersHyperTree vtkInteractionStyle vtkRenderingCore vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
+target_link_libraries(HyperTreeGridSphere vtkCommonCore vtkCommonSystem vtkCommonDataModel vtkCommonExecutionModel vtkIOCore vtkIOLegacy vtkFiltersCore vtkFiltersGeometry vtkFiltersHyperTree vtkInteractionStyle vtkRenderingCore vtkRenderingOpenGL)
diff --git a/Filters/General/module.cmake b/Filters/General/module.cmake
@@ -10,7 +10,6 @@ vtk_module(vtkFiltersGeneral
     vtkImagingMath
     vtkInteractionStyle
     vtkRendering${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkRenderingAnnotation
     vtkRenderingLabel
     vtkTestingRendering

diff --git a/Filters/Generic/module.cmake b/Filters/Generic/module.cmake
@@ -8,7 +8,6 @@ vtk_module(vtkFiltersGeneric
     vtkIOXML
     vtkIOLegacy
     vtkRendering${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkFiltersModeling
     vtkRenderingLabel
     vtkTestingRendering

diff --git a/Filters/HyperTree/module.cmake b/Filters/HyperTree/module.cmake
@@ -10,7 +10,7 @@ vtk_module(vtkFiltersHyperTree
     vtkRenderingAnnotation
     vtkTestingRendering
     vtkInteractionStyle
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
+    vtkRendering${VTK_RENDERING_BACKEND}
   KIT
     vtkFilters
   )
diff --git a/Filters/Selection/module.cmake b/Filters/Selection/module.cmake
@@ -9,7 +9,6 @@ vtk_module(vtkFiltersSelection
     vtkIOLegacy
     vtkIOXML
     vtkRendering${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkRenderingAnnotation
     vtkTestingRendering
     vtkInteractionStyle

diff --git a/Filters/Sources/module.cmake b/Filters/Sources/module.cmake
@@ -9,7 +9,6 @@ vtk_module(vtkFiltersSources
     vtkTestingRendering
     vtkInteractionStyle
     vtkRendering${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkFiltersModeling
     vtkIOXML
   KIT

diff --git a/Geovis/Core/module.cmake b/Geovis/Core/module.cmake
@@ -14,7 +14,6 @@ vtk_module(vtkGeovisCore
     vtkViewsInfovis
     vtkRenderingCore
     vtkRendering${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkTestingRendering
     vtkInteractionStyle
   )
diff --git a/IO/Export/module.cmake b/IO/Export/module.cmake
@@ -26,7 +26,6 @@ vtk_module(vtkIOExport
     vtkTestingRendering
     vtkInteractionStyle
     vtkRenderingAnnotation
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkRenderingVolume${VTK_RENDERING_BACKEND}
     vtkRenderingContext${VTK_RENDERING_BACKEND}
     vtkViewsContext2D

diff --git a/Infovis/BoostGraphAlgorithms/module.cmake b/Infovis/BoostGraphAlgorithms/module.cmake
@@ -8,7 +8,6 @@ vtk_module(vtkInfovisBoostGraphAlgorithms
     vtkInteractionStyle
     vtkIOInfovis
     vtkViewsInfovis
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkChartsCore
     vtkViewsContext2D
   )
diff --git a/Interaction/Widgets/module.cmake b/Interaction/Widgets/module.cmake
@@ -14,7 +14,6 @@ vtk_module(vtkInteractionWidgets
     vtkIOLegacy
     vtkIOXML
     vtkRenderingVolume${VTK_RENDERING_BACKEND}
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
     vtkTestingRendering
     vtkInteractionImage
     vtkInteractionStyle

diff --git a/Rendering/Annotation/module.cmake b/Rendering/Annotation/module.cmake
@@ -8,7 +8,7 @@ vtk_module(vtkRenderingAnnotation
     vtkFiltersSources
   TEST_DEPENDS
     vtkIOGeometry
-    vtkRenderingFreeType${VTK_RENDERING_BACKEND}
+    vtkRendering${VTK_RENDERING_BACKEND}
     vtkTestingRendering
     vtkInteractionStyle
     vtkRenderingLOD

diff --git a/Rendering/Core/vtkTextMapper.h b/Rendering/Core/vtkTextMapper.h
@@ -22,13 +22,6 @@
 //
 // .SECTION See Also
 // vtkActor2D vtkTextActor vtkTextActor3D vtkTextProperty vtkTextRenderer
-//
-// .SECTION Note
-// This class will be overridden by the older vtkOpenGLFreeTypeTextMapper when
-// the vtkRenderingFreeTypeOpenGL library is linked into the executable. That
-// class provides legacy support for regression testing, but lacks many of the
-// newer features provided by this implementation (such as unicode and MathText
-// strings). Do not link with that library if such features are needed.
 
 #ifndef vtkTextMapper_h
 #define vtkTextMapper_h

diff --git a/Rendering/FreeTypeOpenGL/CMakeLists.txt b/Rendering/FreeTypeOpenGL/CMakeLists.txt
diff --git a/Rendering/FreeTypeOpenGL/module.cmake b/Rendering/FreeTypeOpenGL/module.cmake