From 405cf80eb8dc2df8ae160aee70aef34052add24a Mon Sep 17 00:00:00 2001 From: Diego Borghetti Date: Tue, 5 May 2009 23:10:32 +0000 Subject: Big, big commit!! 1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2 2) Remove the old bmfont 3) Remove ftfont and bFTGL library 4) Implement a new BLF_draw_default function for place that still need/use the old BMF api. I try to update both, scons and cmake, but I only can test with make, so hope all work fine. MSVC is broken, but I don't have Windows, things to search and fix are any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont). Always have to link/include the freetype2 library Remove any reference to libbmfont Remove any reference to libftfont Remove any reference to libbftgl (or libbFTGL) --- CMake/macros.cmake | 4 +- CMakeLists.txt | 4 - SConstruct | 1 - blenderplayer/CMakeLists.txt | 3 - config/darwin-config.py | 5 - config/irix6-config.py | 5 - config/linux2-config.py | 5 - config/linuxcross-config.py | 5 - config/openbsd3-config.py | 5 - config/sunos5-config.py | 5 - config/win32-mingw-config.py | 5 - config/win32-vc-config.py | 5 - config/win64-vc-config.py | 5 - extern/Makefile | 4 - extern/bFTGL/CMakeLists.txt | 32 -- extern/bFTGL/COPYING.txt | 481 ---------------- extern/bFTGL/README.txt | 51 -- extern/bFTGL/SConscript | 12 - extern/bFTGL/cleanup | 4 - extern/bFTGL/include/FTBBox.h | 124 ---- extern/bFTGL/include/FTBitmapGlyph.h | 76 --- extern/bFTGL/include/FTBufferGlyph.h | 76 --- extern/bFTGL/include/FTCharToGlyphIndexMap.h | 130 ----- extern/bFTGL/include/FTCharmap.h | 136 ----- extern/bFTGL/include/FTContour.h | 88 --- extern/bFTGL/include/FTExtrdGlyph.h | 71 --- extern/bFTGL/include/FTFace.h | 149 ----- extern/bFTGL/include/FTFont.h | 260 --------- extern/bFTGL/include/FTGL.h | 100 ---- extern/bFTGL/include/FTGLBitmapFont.h | 65 --- extern/bFTGL/include/FTGLBufferFont.h | 76 --- extern/bFTGL/include/FTGLExtrdFont.h | 55 -- extern/bFTGL/include/FTGLOutlineFont.h | 64 --- extern/bFTGL/include/FTGLPixmapFont.h | 68 --- extern/bFTGL/include/FTGLPolygonFont.h | 53 -- extern/bFTGL/include/FTGLTextureFont.h | 151 ----- extern/bFTGL/include/FTGlyph.h | 89 --- extern/bFTGL/include/FTGlyphContainer.h | 127 ----- extern/bFTGL/include/FTLibrary.h | 97 ---- extern/bFTGL/include/FTList.h | 112 ---- extern/bFTGL/include/FTOutlineGlyph.h | 54 -- extern/bFTGL/include/FTPixmapGlyph.h | 68 --- extern/bFTGL/include/FTPoint.h | 85 --- extern/bFTGL/include/FTPolyGlyph.h | 55 -- extern/bFTGL/include/FTSize.h | 132 ----- extern/bFTGL/include/FTTextureGlyph.h | 89 --- extern/bFTGL/include/FTVector.h | 190 ------- extern/bFTGL/include/FTVectoriser.h | 275 --------- extern/bFTGL/license.txt | 27 - extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj | 406 -------------- extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj | 537 ------------------ extern/bFTGL/src/FTBitmapGlyph.cpp | 66 --- extern/bFTGL/src/FTBufferGlyph.cpp | 59 -- extern/bFTGL/src/FTCharmap.cpp | 62 -- extern/bFTGL/src/FTContour.cpp | 149 ----- extern/bFTGL/src/FTExtrdGlyph.cpp | 141 ----- extern/bFTGL/src/FTFace.cpp | 154 ----- extern/bFTGL/src/FTFont.cpp | 271 --------- extern/bFTGL/src/FTGLBitmapFont.cpp | 66 --- extern/bFTGL/src/FTGLBufferFont.cpp | 53 -- extern/bFTGL/src/FTGLExtrdFont.cpp | 35 -- extern/bFTGL/src/FTGLOutlineFont.cpp | 66 --- extern/bFTGL/src/FTGLPixmapFont.cpp | 68 --- extern/bFTGL/src/FTGLPolygonFont.cpp | 33 -- extern/bFTGL/src/FTGLTextureFont.cpp | 178 ------ extern/bFTGL/src/FTGlyph.cpp | 17 - extern/bFTGL/src/FTGlyphContainer.cpp | 93 --- extern/bFTGL/src/FTLibrary.cpp | 64 --- extern/bFTGL/src/FTOutlineGlyph.cpp | 57 -- extern/bFTGL/src/FTPixmapGlyph.cpp | 109 ---- extern/bFTGL/src/FTPoint.cpp | 14 - extern/bFTGL/src/FTPolyGlyph.cpp | 62 -- extern/bFTGL/src/FTSize.cpp | 105 ---- extern/bFTGL/src/FTTextureGlyph.cpp | 87 --- extern/bFTGL/src/FTVectoriser.cpp | 229 -------- extern/bFTGL/src/Makefile | 60 -- extern/bFTGL/win32_vcpp/README_WIN32.txt | 206 ------- extern/bFTGL/win32_vcpp/ftgl.dsw | 92 --- extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp | 357 ------------ .../win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp | 342 ----------- extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp | 168 ------ intern/CMakeLists.txt | 2 +- intern/Makefile | 2 +- intern/SConscript | 1 - intern/bmfont/BMF_Api.h | 162 ------ intern/bmfont/BMF_Fonts.h | 74 --- intern/bmfont/BMF_Settings.h | 67 --- intern/bmfont/CMakeLists.txt | 32 -- intern/bmfont/Makefile | 52 -- intern/bmfont/SConscript | 10 - intern/bmfont/intern/BDF2BMF.py | 177 ------ intern/bmfont/intern/BMF_Api.cpp | 183 ------ intern/bmfont/intern/BMF_BitmapFont.cpp | 323 ----------- intern/bmfont/intern/BMF_BitmapFont.h | 140 ----- intern/bmfont/intern/BMF_FontData.h | 55 -- intern/bmfont/intern/BMF_font_helv10.cpp | 494 ---------------- intern/bmfont/intern/BMF_font_helv12.cpp | 525 ----------------- intern/bmfont/intern/BMF_font_helvb10.cpp | 492 ---------------- intern/bmfont/intern/BMF_font_helvb12.cpp | 565 ------------------- intern/bmfont/intern/BMF_font_helvb14.cpp | 623 --------------------- intern/bmfont/intern/BMF_font_helvb8.cpp | 455 --------------- intern/bmfont/intern/BMF_font_scr12.cpp | 484 ---------------- intern/bmfont/intern/BMF_font_scr14.cpp | 510 ----------------- intern/bmfont/intern/BMF_font_scr15.cpp | 525 ----------------- intern/bmfont/intern/Makefile | 41 -- intern/bmfont/make/msvc_6_0/bmfont.dsp | 176 ------ intern/bmfont/make/msvc_6_0/bmfont.dsw | 29 - intern/bmfont/make/msvc_7_0/bmfont.sln | 21 - intern/bmfont/make/msvc_7_0/bmfont.vcproj | 314 ----------- intern/bmfont/make/msvc_9_0/bmfont.vcproj | 413 -------------- intern/bmfont/test/Makefile | 60 -- intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp | 109 ---- intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw | 44 -- intern/bmfont/test/simpletest/BMF_Test.cpp | 226 -------- intern/bmfont/test/simpletest/Makefile | 42 -- intern/ghost/test/multitest/Makefile | 2 - source/Makefile | 20 +- source/blender/blenfont/BLF_api.h | 25 +- source/blender/blenfont/CMakeLists.txt | 8 +- source/blender/blenfont/SConscript | 7 +- source/blender/blenfont/intern/Makefile | 5 - source/blender/blenfont/intern/blf.c | 149 +++-- source/blender/blenfont/intern/blf_dir.c | 4 - source/blender/blenfont/intern/blf_font.c | 20 - source/blender/blenfont/intern/blf_font_helv10.h | 487 ---------------- source/blender/blenfont/intern/blf_font_helv12.h | 519 ----------------- source/blender/blenfont/intern/blf_font_helvb10.h | 487 ---------------- source/blender/blenfont/intern/blf_font_helvb12.h | 559 ------------------ source/blender/blenfont/intern/blf_font_helvb8.h | 449 --------------- source/blender/blenfont/intern/blf_font_scr12.h | 479 ---------------- source/blender/blenfont/intern/blf_font_scr14.h | 504 ----------------- source/blender/blenfont/intern/blf_font_scr15.h | 519 ----------------- source/blender/blenfont/intern/blf_glyph.c | 69 ++- source/blender/blenfont/intern/blf_internal.c | 435 -------------- source/blender/blenfont/intern/blf_internal.h | 9 - .../blender/blenfont/intern/blf_internal_types.h | 21 - source/blender/blenfont/intern/blf_util.c | 102 +--- source/blender/blenkernel/BKE_global.h | 4 - source/blender/blenkernel/CMakeLists.txt | 6 +- source/blender/blenkernel/SConscript | 4 - source/blender/blenkernel/intern/Makefile | 10 +- source/blender/blenkernel/intern/depsgraph.c | 2 - source/blender/blenkernel/intern/font.c | 20 +- source/blender/blenkernel/intern/gpencil.c | 2 - source/blender/blenkernel/intern/image.c | 8 +- source/blender/blenlib/CMakeLists.txt | 4 - source/blender/blenlib/SConscript | 3 - source/blender/blenlib/intern/Makefile | 3 - source/blender/blenlib/intern/freetypefont.c | 6 - source/blender/editors/CMakeLists.txt | 4 +- source/blender/editors/armature/Makefile | 1 - source/blender/editors/armature/SConscript | 2 +- source/blender/editors/armature/editarmature.c | 2 - source/blender/editors/armature/reeb.c | 2 - source/blender/editors/curve/Makefile | 1 - source/blender/editors/curve/SConscript | 2 +- source/blender/editors/curve/editcurve.c | 2 - source/blender/editors/gpencil/Makefile | 1 - source/blender/editors/gpencil/SConscript | 2 +- source/blender/editors/gpencil/drawgpencil.c | 5 +- .../blender/editors/gpencil/editaction_gpencil.c | 2 - source/blender/editors/gpencil/gpencil_edit.c | 2 - source/blender/editors/interface/Makefile | 2 - source/blender/editors/interface/SConscript | 4 +- source/blender/editors/interface/interface_style.c | 15 +- source/blender/editors/interface/view2d.c | 5 +- source/blender/editors/mesh/Makefile | 1 - source/blender/editors/mesh/SConscript | 2 +- source/blender/editors/mesh/editmesh_tools.c | 2 - source/blender/editors/object/Makefile | 1 - source/blender/editors/object/SConscript | 2 +- source/blender/editors/object/object_edit.c | 2 - source/blender/editors/physics/Makefile | 1 - source/blender/editors/physics/SConscript | 2 +- source/blender/editors/preview/Makefile | 1 - source/blender/editors/preview/SConscript | 2 +- source/blender/editors/screen/CMakeLists.txt | 4 +- source/blender/editors/screen/Makefile | 2 +- source/blender/editors/screen/SConscript | 2 +- source/blender/editors/screen/area.c | 6 +- source/blender/editors/sculpt_paint/Makefile | 1 - source/blender/editors/sculpt_paint/SConscript | 2 +- source/blender/editors/space_file/Makefile | 1 - source/blender/editors/space_file/SConscript | 2 +- source/blender/editors/space_file/file_draw.c | 1 - source/blender/editors/space_node/Makefile | 1 - source/blender/editors/space_node/SConscript | 2 +- source/blender/editors/space_node/drawnode.c | 2 - source/blender/editors/space_node/node_draw.c | 1 - source/blender/editors/space_outliner/outliner.c | 3 + source/blender/editors/space_sequencer/Makefile | 2 +- source/blender/editors/space_sequencer/SConscript | 2 +- .../editors/space_sequencer/sequencer_draw.c | 19 +- source/blender/editors/space_text/SConscript | 2 +- source/blender/editors/space_text/text_intern.h | 1 - source/blender/editors/space_view3d/Makefile | 2 +- source/blender/editors/space_view3d/SConscript | 4 +- source/blender/editors/space_view3d/drawarmature.c | 21 +- source/blender/editors/space_view3d/drawobject.c | 55 +- source/blender/editors/space_view3d/view3d_draw.c | 25 +- .../blender/editors/space_view3d/view3d_header.c | 2 - source/blender/editors/transform/Makefile | 1 - source/blender/editors/transform/SConscript | 2 +- source/blender/nodes/CMakeLists.txt | 4 - source/blender/nodes/SConscript | 3 - source/blender/python/CMakeLists.txt | 5 - source/blender/python/intern/Makefile | 1 - source/blender/windowmanager/CMakeLists.txt | 4 +- source/blender/windowmanager/SConscript | 4 +- source/blender/windowmanager/intern/Makefile | 2 - source/blender/windowmanager/intern/wm_init_exit.c | 9 +- source/creator/CMakeLists.txt | 5 +- source/gameengine/BlenderRoutines/CMakeLists.txt | 1 - source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 11 +- source/gameengine/BlenderRoutines/Makefile | 1 - source/gameengine/BlenderRoutines/SConscript | 2 +- source/gameengine/Converter/CMakeLists.txt | 1 - source/gameengine/Converter/SConscript | 2 +- source/gameengine/GamePlayer/common/CMakeLists.txt | 1 - .../GamePlayer/common/GPC_RenderTools.cpp | 4 +- .../gameengine/GamePlayer/common/GPC_RenderTools.h | 4 +- source/gameengine/GamePlayer/common/Makefile | 1 - source/gameengine/GamePlayer/common/SConscript | 1 - source/gameengine/GamePlayer/common/unix/Makefile | 1 - .../gameengine/GamePlayer/common/windows/Makefile | 1 - source/gameengine/GamePlayer/ghost/CMakeLists.txt | 1 - source/gameengine/GamePlayer/ghost/Makefile | 1 - source/gameengine/GamePlayer/ghost/SConscript | 1 - source/gameengine/Ketsji/CMakeLists.txt | 1 - source/gameengine/Ketsji/SConscript | 2 +- source/nan_definitions.mk | 35 -- tools/Blender.py | 4 +- tools/btools.py | 8 +- 233 files changed, 330 insertions(+), 20597 deletions(-) delete mode 100644 extern/bFTGL/CMakeLists.txt delete mode 100644 extern/bFTGL/COPYING.txt delete mode 100644 extern/bFTGL/README.txt delete mode 100644 extern/bFTGL/SConscript delete mode 100755 extern/bFTGL/cleanup delete mode 100644 extern/bFTGL/include/FTBBox.h delete mode 100644 extern/bFTGL/include/FTBitmapGlyph.h delete mode 100644 extern/bFTGL/include/FTBufferGlyph.h delete mode 100644 extern/bFTGL/include/FTCharToGlyphIndexMap.h delete mode 100644 extern/bFTGL/include/FTCharmap.h delete mode 100644 extern/bFTGL/include/FTContour.h delete mode 100644 extern/bFTGL/include/FTExtrdGlyph.h delete mode 100644 extern/bFTGL/include/FTFace.h delete mode 100644 extern/bFTGL/include/FTFont.h delete mode 100644 extern/bFTGL/include/FTGL.h delete mode 100644 extern/bFTGL/include/FTGLBitmapFont.h delete mode 100644 extern/bFTGL/include/FTGLBufferFont.h delete mode 100644 extern/bFTGL/include/FTGLExtrdFont.h delete mode 100644 extern/bFTGL/include/FTGLOutlineFont.h delete mode 100644 extern/bFTGL/include/FTGLPixmapFont.h delete mode 100644 extern/bFTGL/include/FTGLPolygonFont.h delete mode 100644 extern/bFTGL/include/FTGLTextureFont.h delete mode 100644 extern/bFTGL/include/FTGlyph.h delete mode 100644 extern/bFTGL/include/FTGlyphContainer.h delete mode 100644 extern/bFTGL/include/FTLibrary.h delete mode 100644 extern/bFTGL/include/FTList.h delete mode 100644 extern/bFTGL/include/FTOutlineGlyph.h delete mode 100644 extern/bFTGL/include/FTPixmapGlyph.h delete mode 100644 extern/bFTGL/include/FTPoint.h delete mode 100644 extern/bFTGL/include/FTPolyGlyph.h delete mode 100644 extern/bFTGL/include/FTSize.h delete mode 100644 extern/bFTGL/include/FTTextureGlyph.h delete mode 100644 extern/bFTGL/include/FTVector.h delete mode 100644 extern/bFTGL/include/FTVectoriser.h delete mode 100644 extern/bFTGL/license.txt delete mode 100644 extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj delete mode 100644 extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj delete mode 100644 extern/bFTGL/src/FTBitmapGlyph.cpp delete mode 100644 extern/bFTGL/src/FTBufferGlyph.cpp delete mode 100644 extern/bFTGL/src/FTCharmap.cpp delete mode 100644 extern/bFTGL/src/FTContour.cpp delete mode 100644 extern/bFTGL/src/FTExtrdGlyph.cpp delete mode 100644 extern/bFTGL/src/FTFace.cpp delete mode 100644 extern/bFTGL/src/FTFont.cpp delete mode 100644 extern/bFTGL/src/FTGLBitmapFont.cpp delete mode 100644 extern/bFTGL/src/FTGLBufferFont.cpp delete mode 100644 extern/bFTGL/src/FTGLExtrdFont.cpp delete mode 100644 extern/bFTGL/src/FTGLOutlineFont.cpp delete mode 100644 extern/bFTGL/src/FTGLPixmapFont.cpp delete mode 100644 extern/bFTGL/src/FTGLPolygonFont.cpp delete mode 100644 extern/bFTGL/src/FTGLTextureFont.cpp delete mode 100644 extern/bFTGL/src/FTGlyph.cpp delete mode 100644 extern/bFTGL/src/FTGlyphContainer.cpp delete mode 100644 extern/bFTGL/src/FTLibrary.cpp delete mode 100644 extern/bFTGL/src/FTOutlineGlyph.cpp delete mode 100644 extern/bFTGL/src/FTPixmapGlyph.cpp delete mode 100644 extern/bFTGL/src/FTPoint.cpp delete mode 100644 extern/bFTGL/src/FTPolyGlyph.cpp delete mode 100644 extern/bFTGL/src/FTSize.cpp delete mode 100644 extern/bFTGL/src/FTTextureGlyph.cpp delete mode 100644 extern/bFTGL/src/FTVectoriser.cpp delete mode 100644 extern/bFTGL/src/Makefile delete mode 100644 extern/bFTGL/win32_vcpp/README_WIN32.txt delete mode 100644 extern/bFTGL/win32_vcpp/ftgl.dsw delete mode 100644 extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp delete mode 100644 extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp delete mode 100644 extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp delete mode 100644 intern/bmfont/BMF_Api.h delete mode 100644 intern/bmfont/BMF_Fonts.h delete mode 100644 intern/bmfont/BMF_Settings.h delete mode 100644 intern/bmfont/CMakeLists.txt delete mode 100644 intern/bmfont/Makefile delete mode 100644 intern/bmfont/SConscript delete mode 100644 intern/bmfont/intern/BDF2BMF.py delete mode 100644 intern/bmfont/intern/BMF_Api.cpp delete mode 100644 intern/bmfont/intern/BMF_BitmapFont.cpp delete mode 100644 intern/bmfont/intern/BMF_BitmapFont.h delete mode 100644 intern/bmfont/intern/BMF_FontData.h delete mode 100644 intern/bmfont/intern/BMF_font_helv10.cpp delete mode 100644 intern/bmfont/intern/BMF_font_helv12.cpp delete mode 100644 intern/bmfont/intern/BMF_font_helvb10.cpp delete mode 100644 intern/bmfont/intern/BMF_font_helvb12.cpp delete mode 100644 intern/bmfont/intern/BMF_font_helvb14.cpp delete mode 100644 intern/bmfont/intern/BMF_font_helvb8.cpp delete mode 100644 intern/bmfont/intern/BMF_font_scr12.cpp delete mode 100644 intern/bmfont/intern/BMF_font_scr14.cpp delete mode 100644 intern/bmfont/intern/BMF_font_scr15.cpp delete mode 100644 intern/bmfont/intern/Makefile delete mode 100644 intern/bmfont/make/msvc_6_0/bmfont.dsp delete mode 100644 intern/bmfont/make/msvc_6_0/bmfont.dsw delete mode 100644 intern/bmfont/make/msvc_7_0/bmfont.sln delete mode 100644 intern/bmfont/make/msvc_7_0/bmfont.vcproj delete mode 100644 intern/bmfont/make/msvc_9_0/bmfont.vcproj delete mode 100644 intern/bmfont/test/Makefile delete mode 100644 intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp delete mode 100644 intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw delete mode 100644 intern/bmfont/test/simpletest/BMF_Test.cpp delete mode 100644 intern/bmfont/test/simpletest/Makefile delete mode 100644 source/blender/blenfont/intern/blf_font_helv10.h delete mode 100644 source/blender/blenfont/intern/blf_font_helv12.h delete mode 100644 source/blender/blenfont/intern/blf_font_helvb10.h delete mode 100644 source/blender/blenfont/intern/blf_font_helvb12.h delete mode 100644 source/blender/blenfont/intern/blf_font_helvb8.h delete mode 100644 source/blender/blenfont/intern/blf_font_scr12.h delete mode 100644 source/blender/blenfont/intern/blf_font_scr14.h delete mode 100644 source/blender/blenfont/intern/blf_font_scr15.h delete mode 100644 source/blender/blenfont/intern/blf_internal.c diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 145e344509e..df8e7515e67 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -43,9 +43,9 @@ MACRO(SETUP_LIBDIRS) CMAKE_POLICY(SET CMP0003 NEW) endif(COMMAND cmake_policy) LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) + LINK_DIRECTORIES(${FREETYPE_LIBPATH}) IF(WITH_INTERNATIONAL) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) - LINK_DIRECTORIES(${FREETYPE_LIBPATH}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) @@ -62,6 +62,7 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions @@ -78,7 +79,6 @@ MACRO(SETUP_LIBLINKS ENDIF(WIN32) IF(WITH_INTERNATIONAL) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d11ea02aa4..f2bf65dfb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,10 +436,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") #----------------------------------------------------------------------------- # Common. -SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL) -SET(FTGL_INC ${FTGL}/include) -SET(FTGL_LIB extern_ftgl) - set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG_INC ${OPENJPEG}) set(OPENJPEG_LIb extern_libopenjpeg) diff --git a/SConstruct b/SConstruct index 63bc4cd1625..f7986ec8789 100644 --- a/SConstruct +++ b/SConstruct @@ -281,7 +281,6 @@ if 'blenderlite' in B.targets: target_env_defs['WITH_BF_QUICKTIME'] = False target_env_defs['WITH_BF_YAFRAY'] = False target_env_defs['WITH_BF_REDCODE'] = False - target_env_defs['WITH_BF_FTGL'] = False target_env_defs['WITH_BF_DDS'] = False target_env_defs['WITH_BF_ZLIB'] = False target_env_defs['WITH_BF_SDL'] = False diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt index b9ac3c7a8c6..5b13a5f4521 100644 --- a/blenderplayer/CMakeLists.txt +++ b/blenderplayer/CMakeLists.txt @@ -100,14 +100,11 @@ IF(UNIX) extern_bullet bf_guardedalloc bf_memutil - bf_bmfont bf_blenlib bf_cineon bf_openexr extern_libopenjpeg bf_dds - bf_ftfont - extern_ftgl bf_readblenfile blenkernel_blc bf_quicktime diff --git a/config/darwin-config.py b/config/darwin-config.py index 8ac83ce4a0d..78a8c71b7dd 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -138,11 +138,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=True WITH_BF_PLAYER=True diff --git a/config/irix6-config.py b/config/irix6-config.py index 711d16e623c..1ef271b5074 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -77,11 +77,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextpo intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE='false' WITH_BF_ODE = 'false' diff --git a/config/linux2-config.py b/config/linux2-config.py index d7c09258152..eb93d8084f1 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -71,11 +71,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 4214ca52aac..4b17224eacc 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -74,11 +74,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = False WITH_BF_ODE = True diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 3a36f8df663..6a7518a7928 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -59,11 +59,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl iconv' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 6fa9529e1cd..25f200fe346 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -67,11 +67,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 80082002b21..a579d21a544 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -75,11 +75,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = False WITH_BF_ODE = True diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index b5ad19890e1..b94a9c4effe 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -87,11 +87,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = True WITH_BF_PLAYER = True diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 62440baae56..945efecdc3c 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -90,11 +90,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = False -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = True WITH_BF_PLAYER = False diff --git a/extern/Makefile b/extern/Makefile index 38bec4b73dd..256837d660f 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -32,10 +32,6 @@ SOURCEDIR = extern DIR = $(OCGDIR)/extern DIRS = qhull/src solid glew/src -ifeq ($(WITH_FREETYPE2), true) - DIRS += bFTGL/src -endif - ifeq ($(WITH_FFMPEG), true) ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg) DIRS += ffmpeg diff --git a/extern/bFTGL/CMakeLists.txt b/extern/bFTGL/CMakeLists.txt deleted file mode 100644 index 529dc74a4d2..00000000000 --- a/extern/bFTGL/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -SET(INC include src ${FREETYPE_INC}) - -FILE(GLOB SRC src/*.cpp) -ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC) -BLENDERLIB(extern_ftgl "${SRC}" "${INC}") -#, libtype=['international','player'], priority=[5, 210]) diff --git a/extern/bFTGL/COPYING.txt b/extern/bFTGL/COPYING.txt deleted file mode 100644 index 92b8903ff3f..00000000000 --- a/extern/bFTGL/COPYING.txt +++ /dev/null @@ -1,481 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/extern/bFTGL/README.txt b/extern/bFTGL/README.txt deleted file mode 100644 index a679d86c22e..00000000000 --- a/extern/bFTGL/README.txt +++ /dev/null @@ -1,51 +0,0 @@ -FTGL 2.0.11 -16 August 2004 - -DESCRIPTION: - -FTGL is a free open source library to enable developers to use arbitrary -fonts in their OpenGL (www.opengl.org) applications. -Unlike other OpenGL font libraries FTGL uses standard font file formats -so doesn't need a preprocessing step to convert the high quality font data -into a lesser quality, proprietary format. -FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' -the fonts. It then takes that output and stores it in a format most efficient -for OpenGL rendering. - -Rendering modes supported are -- Bit maps -- Antialiased Pix maps -- Texture maps -- Outlines -- Polygon meshes -- Extruded polygon meshes - -FTGL is designed to be used in commercial quality software. It has been -written with performance, robustness and simplicity in mind. - -USAGE: - - FTGLPixmapFont font( "Fonts:Arial"); - - font.FaceSize( 72); - - font.render( "Hello World!"); - -This library was inspired by gltt, Copyright (C) 1998-1999 Stephane Rehel -(http://gltt.sourceforge.net) -Bezier curve code contributed by Jed Soane. -Demo, Linux port, extrusion code and gltt maintainance by Gerard Lanois -Linux port by Matthias Kretz -Windows port by Andrew Ellerton & Max Rheiner -Bug fixes by Robert Osfield, Marcelo E. Magallon, Markku Rontu, Mark A. Fox, -Patrick Rogers -Containers and optimisations by Sebastien Barre -Autoconf Marcelo E. Magallon. - - -Please contact me if you have any suggestions, feature requests, or problems. - -Henry Maddocks -ftgl@opengl.geek.nz -http://homepages.paradise.net.nz/henryj/ - diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript deleted file mode 100644 index 03a17a62a17..00000000000 --- a/extern/bFTGL/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python -import sys -import os - -Import('env') - -incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC'] -defs = '' - -sources = env.Glob('src/*.cpp') - -env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype=['extern'], priority=[5]) diff --git a/extern/bFTGL/cleanup b/extern/bFTGL/cleanup deleted file mode 100755 index c6d24edb287..00000000000 --- a/extern/bFTGL/cleanup +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -fx -# script to get rid of the grabage that MAC OSX drops in all the directories - -find . -name .DS_Store -print -exec rm {} \; diff --git a/extern/bFTGL/include/FTBBox.h b/extern/bFTGL/include/FTBBox.h deleted file mode 100644 index 7ff530166ca..00000000000 --- a/extern/bFTGL/include/FTBBox.h +++ /dev/null @@ -1,124 +0,0 @@ -#ifndef __FTBBox__ -#define __FTBBox__ - -#include -#include FT_FREETYPE_H -//#include FT_GLYPH_H -#include FT_OUTLINE_H - -#include "FTGL.h" -#include "FTPoint.h" - - -/** - * FTBBox is a convenience class for handling bounding boxes. - */ -class FTGL_EXPORT FTBBox -{ - public: - /** - * Default constructor. Bounding box is set to zero. - */ - FTBBox() - : lowerX(0.0f), - lowerY(0.0f), - lowerZ(0.0f), - upperX(0.0f), - upperY(0.0f), - upperZ(0.0f) - {} - - /** - * Constructor. - */ - FTBBox( float lx, float ly, float lz, float ux, float uy, float uz) - : lowerX(lx), - lowerY(ly), - lowerZ(lz), - upperX(ux), - upperY(uy), - upperZ(uz) - {} - - /** - * Constructor. Extracts a bounding box from a freetype glyph. Uses - * the control box for the glyph. FT_Glyph_Get_CBox() - * - * @param glyph A freetype glyph - */ - FTBBox( FT_GlyphSlot glyph) - : lowerX(0.0f), - lowerY(0.0f), - lowerZ(0.0f), - upperX(0.0f), - upperY(0.0f), - upperZ(0.0f) - { - FT_BBox bbox; - FT_Outline_Get_CBox( &(glyph->outline), &bbox); - - lowerX = static_cast( bbox.xMin) / 64.0f; - lowerY = static_cast( bbox.yMin) / 64.0f; - lowerZ = 0.0f; - upperX = static_cast( bbox.xMax) / 64.0f; - upperY = static_cast( bbox.yMax) / 64.0f; - upperZ = 0.0f; - - } - - /** - * Destructor - */ - ~FTBBox() - {} - - - /** - * Move the Bounding Box by a vector. - * - * @param distance The distance to move the bbox in 3D space. - */ - FTBBox& Move( FTPoint distance) - { - lowerX += distance.x; - lowerY += distance.y; - lowerZ += distance.z; - upperX += distance.x; - upperY += distance.y; - upperZ += distance.z; - return *this; - } - - FTBBox& operator += ( const FTBBox& bbox) - { - lowerX = bbox.lowerX < lowerX? bbox.lowerX: lowerX; - lowerY = bbox.lowerY < lowerY? bbox.lowerY: lowerY; - lowerZ = bbox.lowerZ < lowerZ? bbox.lowerZ: lowerZ; - upperX = bbox.upperX > upperX? bbox.upperX: upperX; - upperY = bbox.upperY > upperY? bbox.upperY: upperY; - upperZ = bbox.upperZ > upperZ? bbox.upperZ: upperZ; - - return *this; - } - - void SetDepth( float depth) - { - upperZ = lowerZ + depth; - } - - - /** - * The bounds of the box - */ - // Make these ftPoints & private - float lowerX, lowerY, lowerZ, upperX, upperY, upperZ; - protected: - - - private: - -}; - - -#endif // __FTBBox__ - diff --git a/extern/bFTGL/include/FTBitmapGlyph.h b/extern/bFTGL/include/FTBitmapGlyph.h deleted file mode 100644 index 89154a97fac..00000000000 --- a/extern/bFTGL/include/FTBitmapGlyph.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef __FTBitmapGlyph__ -#define __FTBitmapGlyph__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - - -/** - * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps. - * - * It provides the interface between Freetype glyphs and their openGL - * Renderable counterparts. This is an abstract class and derived classes - * must implement the Render function. - * - * @see FTGlyphContainer - * - */ -class FTGL_EXPORT FTBitmapGlyph : public FTGlyph -{ - public: - /** - * Constructor - * - * @param glyph The Freetype glyph to be processed - */ - FTBitmapGlyph( FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTBitmapGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - private: - /** - * The width of the glyph 'image' - */ - unsigned int destWidth; - - /** - * The height of the glyph 'image' - */ - unsigned int destHeight; - - /** - * The pitch of the glyph 'image' - */ - unsigned int destPitch; - - /** - * Vector from the pen position to the topleft corner of the bitmap - */ - FTPoint pos; - - /** - * Pointer to the 'image' data - */ - unsigned char* data; - -}; - - -#endif // __FTBitmapGlyph__ - diff --git a/extern/bFTGL/include/FTBufferGlyph.h b/extern/bFTGL/include/FTBufferGlyph.h deleted file mode 100644 index 9795f4de5d4..00000000000 --- a/extern/bFTGL/include/FTBufferGlyph.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef __FTBufferGlyph__ -#define __FTBufferGlyph__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - - -/** - * FTBufferGlyph is a specialisation of FTGlyph for creating pixmaps. - * - * @see FTGlyphContainer - * - */ -class FTGL_EXPORT FTBufferGlyph : public FTGlyph -{ - public: - /** - * Constructor - * - * @param glyph The Freetype glyph to be processed - */ - FTBufferGlyph( FT_GlyphSlot glyph, unsigned char* clientBuffer); - - /** - * Destructor - */ - virtual ~FTBufferGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - // attributes - - private: - /** - * The width of the glyph 'image' - */ - int destWidth; - - /** - * The height of the glyph 'image' - */ - int destHeight; - - /** - * The pitch of the glyph 'image' - */ - unsigned int destPitch; - - /** - * Vector from the pen position to the topleft corner of the pixmap - */ - FTPoint pos; - - /** - * Pointer to the 'image' data - */ - unsigned char* data; - - - unsigned char* buffer; - -}; - - -#endif // __FTBufferGlyph__ diff --git a/extern/bFTGL/include/FTCharToGlyphIndexMap.h b/extern/bFTGL/include/FTCharToGlyphIndexMap.h deleted file mode 100644 index 6e40d3c9574..00000000000 --- a/extern/bFTGL/include/FTCharToGlyphIndexMap.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef __FTCharToGlyphIndexMap__ -#define __FTCharToGlyphIndexMap__ - -#include - -#include "FTGL.h" - -/** - * Provides a non-STL alternative to the STL map - * which maps character codes to glyph indices inside FTCharmap. - * - * Implementation: - * - NumberOfBuckets buckets are considered. - * - Each bucket has BucketSize entries. - * - When the glyph index for the character code C has to be stored, the - * bucket this character belongs to is found using 'C div BucketSize'. - * If this bucket has not been allocated yet, do it now. - * The entry in the bucked is found using 'C mod BucketSize'. - * If it is set to IndexNotFound, then the glyph entry has not been set. - * - Try to mimic the calls made to the STL map API. - * - * Caveats: - * - The glyph index is now a signed long instead of unsigned long, so - * the special value IndexNotFound (= -1) can be used to specify that the - * glyph index has not been stored yet. - */ -class FTGL_EXPORT FTCharToGlyphIndexMap -{ - public: - - typedef unsigned long CharacterCode; - typedef signed long GlyphIndex; - - enum - { - NumberOfBuckets = 256, - BucketSize = 256, - IndexNotFound = -1 - }; - - FTCharToGlyphIndexMap() - { - this->Indices = 0; - } - - virtual ~FTCharToGlyphIndexMap() - { - if( this->Indices) - { - // Free all buckets - this->clear(); - - // Free main structure - delete [] this->Indices; - this->Indices = 0; - } - } - - void clear() - { - if(this->Indices) - { - for( int i = 0; i < FTCharToGlyphIndexMap::NumberOfBuckets; i++) - { - if( this->Indices[i]) - { - delete [] this->Indices[i]; - this->Indices[i] = 0; - } - } - } - } - - const GlyphIndex find( CharacterCode c) - { - if( !this->Indices) - { - return 0; - } - - // Find position of char code in buckets - div_t pos = div( c, FTCharToGlyphIndexMap::BucketSize); - - if( !this->Indices[pos.quot]) - { - return 0; - } - - const FTCharToGlyphIndexMap::GlyphIndex *ptr = &this->Indices[pos.quot][pos.rem]; - if( *ptr == FTCharToGlyphIndexMap::IndexNotFound) - { - return 0; - } - - return *ptr; - } - - void insert( CharacterCode c, GlyphIndex g) - { - if( !this->Indices) - { - this->Indices = new GlyphIndex* [FTCharToGlyphIndexMap::NumberOfBuckets]; - for( int i = 0; i < FTCharToGlyphIndexMap::NumberOfBuckets; i++) - { - this->Indices[i] = 0; - } - } - - // Find position of char code in buckets - div_t pos = div(c, FTCharToGlyphIndexMap::BucketSize); - - // Allocate bucket if does not exist yet - if( !this->Indices[pos.quot]) - { - this->Indices[pos.quot] = new GlyphIndex [FTCharToGlyphIndexMap::BucketSize]; - for( int i = 0; i < FTCharToGlyphIndexMap::BucketSize; i++) - { - this->Indices[pos.quot][i] = FTCharToGlyphIndexMap::IndexNotFound; - } - } - - this->Indices[pos.quot][pos.rem] = g; - } - - private: - GlyphIndex** Indices; -}; - - -#endif // __FTCharToGlyphIndexMap__ diff --git a/extern/bFTGL/include/FTCharmap.h b/extern/bFTGL/include/FTCharmap.h deleted file mode 100644 index 74ca6f2cacb..00000000000 --- a/extern/bFTGL/include/FTCharmap.h +++ /dev/null @@ -1,136 +0,0 @@ -#ifndef __FTCharmap__ -#define __FTCharmap__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTCharToGlyphIndexMap.h" - -#include "FTGL.h" - - -/** - * FTCharmap takes care of specifying the encoding for a font and mapping - * character codes to glyph indices. - * - * It doesn't preprocess all indices, only on an as needed basis. This may - * seem like a performance penalty but it is quicker than using the 'raw' - * freetype calls and will save significant amounts of memory when dealing - * with unicode encoding - * - * @see "Freetype 2 Documentation" - * - */ - -class FTFace; - -class FTGL_EXPORT FTCharmap -{ - public: - /** - * Constructor - */ - FTCharmap( FTFace* face); - - /** - * Destructor - */ - virtual ~FTCharmap(); - - /** - * Queries for the current character map code. - * - * @return The current character map code. - */ - FT_Encoding Encoding() const { return ftEncoding;} - - /** - * Sets the character map for the face. - * Valid encodings as at Freetype 2.0.4 - * ft_encoding_none - * ft_encoding_symbol - * ft_encoding_unicode - * ft_encoding_latin_2 - * ft_encoding_sjis - * ft_encoding_gb2312 - * ft_encoding_big5 - * ft_encoding_wansung - * ft_encoding_johab - * ft_encoding_adobe_standard - * ft_encoding_adobe_expert - * ft_encoding_adobe_custom - * ft_encoding_apple_roman - * - * @param encoding the Freetype encoding symbol. See above. - * @return true if charmap was valid and set - * correctly. If the requested encoding is - * unavailable it will be set to ft_encoding_none. - */ - bool CharMap( FT_Encoding encoding); - - /** - * Get the FTGlyphContainer index of the input character. - * - * @param characterCode The character code of the requested glyph in - * the current encoding eg apple roman. - * @return The FTGlyphContainer index for the character or zero - * if it wasn't found - */ - unsigned int GlyphListIndex( const unsigned int characterCode); - - /** - * Get the font glyph index of the input character. - * - * @param characterCode The character code of the requested glyph in - * the current encoding eg apple roman. - * @return The glyph index for the character. - */ - unsigned int FontIndex( const unsigned int characterCode); - - /** - * Set the FTGlyphContainer index of the character code. - * - * @param characterCode The character code of the requested glyph in - * the current encoding eg apple roman. - * @param containerIndex The index into the FTGlyphContainer of the - * character code. - */ - void InsertIndex( const unsigned int characterCode, const unsigned int containerIndex); - - /** - * Queries for errors. - * - * @return The current error code. Zero means no error. - */ - FT_Error Error() const { return err;} - - private: - /** - * Current character map code. - */ - FT_Encoding ftEncoding; - - /** - * The current Freetype face. - */ - const FT_Face ftFace; - - /** - * A structure that maps glyph indices to character codes - * - * < character code, face glyph index> - */ - typedef FTCharToGlyphIndexMap CharacterMap; - CharacterMap charMap; - - /** - * Current error code. - */ - FT_Error err; - -}; - - -#endif // __FTCharmap__ diff --git a/extern/bFTGL/include/FTContour.h b/extern/bFTGL/include/FTContour.h deleted file mode 100644 index 895d9edeff8..00000000000 --- a/extern/bFTGL/include/FTContour.h +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef __FTContour__ -#define __FTContour__ - -#include "FTPoint.h" -#include "FTVector.h" -#include "FTGL.h" - - -/** - * FTContour class is a container of points that describe a vector font - * outline. It is used as a container for the output of the bezier curve - * evaluator in FTVectoriser. - * - * @see FTOutlineGlyph - * @see FTPolyGlyph - * @see FTPoint - */ -class FTGL_EXPORT FTContour -{ - public: - /** - * Constructor - * - * @param contour - * @param pointTags - * @param numberOfPoints - */ - FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOfPoints); - - /** - * Destructor - */ - ~FTContour() - { - pointList.clear(); - } - - /** - * Return a point at index. - * - * @param index of the point in the curve. - * @return const point reference - */ - const FTPoint& Point( unsigned int index) const { return pointList[index];} - - /** - * How many points define this contour - * - * @return the number of points in this contour - */ - size_t PointCount() const { return pointList.size();} - - private: - /** - * Add a point to this contour. This function tests for duplicate - * points. - * - * @param point The point to be added to the contour. - */ - inline void AddPoint( FTPoint point); - - inline void AddPoint( float x, float y); - - /** - * De Casteljau (bezier) algorithm contributed by Jed Soane - * Evaluates a quadratic or conic (second degree) curve - */ - inline void evaluateQuadraticCurve(); - - /** - * De Casteljau (bezier) algorithm contributed by Jed Soane - * Evaluates a cubic (third degree) curve - */ - inline void evaluateCubicCurve(); - - /** - * The list of points in this contour - */ - typedef FTVector PointVector; - PointVector pointList; - - /** - * 2D array storing values of de Casteljau algorithm. - */ - float controlPoints[4][2]; -}; - -#endif // __FTContour__ diff --git a/extern/bFTGL/include/FTExtrdGlyph.h b/extern/bFTGL/include/FTExtrdGlyph.h deleted file mode 100644 index 01e7c9e1d76..00000000000 --- a/extern/bFTGL/include/FTExtrdGlyph.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef __FTExtrdGlyph__ -#define __FTExtrdGlyph__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - -class FTVectoriser; - -/** - * FTExtrdGlyph is a specialisation of FTGlyph for creating tessellated - * extruded polygon glyphs. - * - * @see FTGlyphContainer - * @see FTVectoriser - * - */ -class FTGL_EXPORT FTExtrdGlyph : public FTGlyph -{ - public: - /** - * Constructor. Sets the Error to Invalid_Outline if the glyphs isn't an outline. - * - * @param glyph The Freetype glyph to be processed - * @param depth The distance along the z axis to extrude the glyph - */ - FTExtrdGlyph( FT_GlyphSlot glyph, float depth); - - /** - * Destructor - */ - virtual ~FTExtrdGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - private: - /** - * Calculate the normal vector to 2 points. This is 2D and ignores - * the z component. The normal will be normalised - * - * @param a - * @param b - * @return - */ - FTPoint GetNormal( const FTPoint &a, const FTPoint &b); - - - /** - * OpenGL display list - */ - GLuint glList; - - /** - * Distance to extrude the glyph - */ - float depth; - -}; - - -#endif // __FTExtrdGlyph__ - diff --git a/extern/bFTGL/include/FTFace.h b/extern/bFTGL/include/FTFace.h deleted file mode 100644 index 26bb3966462..00000000000 --- a/extern/bFTGL/include/FTFace.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef __FTFace__ -#define __FTFace__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTPoint.h" -#include "FTSize.h" - -/** - * FTFace class provides an abstraction layer for the Freetype Face. - * - * @see "Freetype 2 Documentation" - * - */ -class FTGL_EXPORT FTFace -{ - public: - /** - * Opens and reads a face file. Error is set. - * - * @param filename font file name. - */ - FTFace( const char* filename); - - /** - * Read face data from an in-memory buffer. Error is set. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTFace( const unsigned char *pBufferBytes, size_t bufferSizeInBytes ); - - /** - * Destructor - * - * Disposes of the current Freetype Face. - */ - virtual ~FTFace(); - - /** - * Attach auxilliary file to font (e.g., font metrics). - * - * @param filename auxilliary font file name. - * @return true if file has opened - * successfully. - */ - bool Attach( const char* filename); - - /** - * Attach auxilliary data to font (e.g., font metrics) from memory - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - * @return true if file has opened - * successfully. - */ - bool Attach( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Disposes of the face - */ - void Close(); - - /** - * Get the freetype face object.. - * - * @return pointer to an FT_Face. - */ - FT_Face* Face() const { return ftFace;} - - /** - * Sets the char size for the current face. - * - * This doesn't guarantee that the size was set correctly. Clients - * should check errors. - * - * @param size the face size in points (1/72 inch) - * @param res the resolution of the target device. - * @return FTSize object - */ - const FTSize& Size( const unsigned int size, const unsigned int res); - - unsigned int UnitsPerEM() const; - - /** - * Get the number of character maps in this face. - * - * @return character map count. - */ - unsigned int CharMapCount(); - - /** - * Get a list of character maps in this face. - * - * @return pointer to the first encoding. - */ - FT_Encoding* CharMapList(); - - /** - * Gets the kerning vector between two glyphs - */ - FTPoint KernAdvance( unsigned int index1, unsigned int index2); - - /** - * Loads and creates a Freetype glyph. - */ - FT_GlyphSlot Glyph( unsigned int index, FT_Int load_flags); - - /** - * Gets the number of glyphs in the current face. - */ - unsigned int GlyphCount() const { return numGlyphs;} - - /** - * Queries for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err; } - - private: - /** - * The Freetype face - */ - FT_Face* ftFace; - - /** - * The size object associated with this face - */ - FTSize charSize; - - /** - * The number of glyphs in this face - */ - int numGlyphs; - - FT_Encoding* fontEncodingList; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; -}; - - -#endif // __FTFace__ diff --git a/extern/bFTGL/include/FTFont.h b/extern/bFTGL/include/FTFont.h deleted file mode 100644 index 5b3d9e46f68..00000000000 --- a/extern/bFTGL/include/FTFont.h +++ /dev/null @@ -1,260 +0,0 @@ -#ifndef __FTFont__ -#define __FTFont__ - -#include -#include FT_FREETYPE_H - -#include "FTFace.h" -#include "FTGL.h" - -class FTGlyphContainer; -class FTGlyph; - - -/** - * FTFont is the public interface for the FTGL library. - * - * Specific font classes are derived from this class. It uses the helper - * classes FTFace and FTSize to access the Freetype library. This class - * is abstract and deriving classes must implement the protected - * MakeGlyph function to create glyphs of the - * appropriate type. - * - * It is good practice after using these functions to test the error - * code returned. FT_Error Error() - * - * @see FTFace - * @see FTSize - * @see FTGlyphContainer - * @see FTGlyph - */ -class FTGL_EXPORT FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * The buffer is owned by the client and is NOT copied by FTGL. The - * pointer must be valid while using FTGL. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - virtual ~FTFont(); - - /** - * Attach auxilliary file to font e.g font metrics. - * - * Note: not all font formats implement this function. - * - * @param filename auxilliary font file name. - * @return true if file has been attached - * successfully. - */ - bool Attach( const char* filename); - - /** - * Attach auxilliary data to font e.g font metrics, from memory - * - * Note: not all font formats implement this function. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - * @return true if file has been attached - * successfully. - */ - bool Attach( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Set the character map for the face. - * - * @param encoding Freetype enumerate for char map code. - * @return true if charmap was valid and - * set correctly - */ - bool CharMap( FT_Encoding encoding ); - - /** - * Get the number of character maps in this face. - * - * @return character map count. - */ - unsigned int CharMapCount(); - - /** - * Get a list of character maps in this face. - * - * @return pointer to the first encoding. - */ - FT_Encoding* CharMapList(); - - /** - * Set the char size for the current face. - * - * @param size the face size in points (1/72 inch) - * @param res the resolution of the target device. - * @return true if size was set correctly - */ - virtual bool FaceSize( const unsigned int size, const unsigned int res = 72); - - /** - * Get the current face size in points. - * - * @return face size - */ - unsigned int FaceSize() const; - - /** - * Set the extrusion distance for the font. Only implemented by - * FTGLExtrdFont - * - * @param d The extrusion distance. - */ - virtual void Depth( float d){} - - /** - * Get the global ascender height for the face. - * - * @return Ascender height - */ - float Ascender() const; - - /** - * Gets the global descender height for the face. - * - * @return Descender height - */ - float Descender() const; - - /** - * Get the bounding box for a string. - * - * @param string a char string - * @param llx lower left near x coord - * @param lly lower left near y coord - * @param llz lower left near z coord - * @param urx upper right far x coord - * @param ury upper right far y coord - * @param urz upper right far z coord - */ - void BBox( const char* string, float& llx, float& lly, float& llz, float& urx, float& ury, float& urz); - - /** - * Get the bounding box for a string. - * - * @param string a wchar_t string - * @param llx lower left near x coord - * @param lly lower left near y coord - * @param llz lower left near z coord - * @param urx upper right far x coord - * @param ury upper right far y coord - * @param urz upper right far z coord - */ - void BBox( const wchar_t* string, float& llx, float& lly, float& llz, float& urx, float& ury, float& urz); - - /** - * Get the advance width for a string. - * - * @param string a wchar_t string - * @return advance width - */ - float Advance( const wchar_t* string); - - /** - * Get the advance width for a string. - * - * @param string a char string - * @return advance width - */ - float Advance( const char* string); - - /** - * Render a string of characters - * - * @param string 'C' style string to be output. - */ - virtual void Render( const char* string ); - - /** - * Render a string of characters - * - * @param string wchar_t string to be output. - */ - virtual void Render( const wchar_t* string ); - - /** - * Queries the Font for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err;} - - protected: - /** - * Construct a glyph of the correct type. - * - * Clients must overide the function and return their specialised - * FTGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FT****Glyph or null on failure. - */ - virtual FTGlyph* MakeGlyph( unsigned int g) = 0; - - /** - * Current face object - */ - FTFace face; - - /** - * Current size object - */ - FTSize charSize; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; - - private: - /** - * Render a character - * This function does an implicit conversion on it's arguments. - * - * @param chr current character - * @param nextChr next character - */ - inline void DoRender( const unsigned int chr, const unsigned int nextChr); - - /** - * Check that the glyph at chr exist. If not load it. - * - * @param chr character index - */ - inline void CheckGlyph( const unsigned int chr); - - /** - * An object that holds a list of glyphs - */ - FTGlyphContainer* glyphList; - - /** - * Current pen or cursor position; - */ - FTPoint pen; -}; - - -#endif // __FTFont__ - diff --git a/extern/bFTGL/include/FTGL.h b/extern/bFTGL/include/FTGL.h deleted file mode 100644 index 2b76de8b8bd..00000000000 --- a/extern/bFTGL/include/FTGL.h +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef __FTGL__ -#define __FTGL__ - - -typedef double FTGL_DOUBLE; -typedef float FTGL_FLOAT; - -// Fixes for deprecated identifiers in 2.1.5 -#ifndef FT_OPEN_MEMORY - #define FT_OPEN_MEMORY (FT_Open_Flags)1 -#endif - -#ifndef FT_RENDER_MODE_MONO - #define FT_RENDER_MODE_MONO ft_render_mode_mono -#endif - -#ifndef FT_RENDER_MODE_NORMAL - #define FT_RENDER_MODE_NORMAL ft_render_mode_normal -#endif - - -#ifdef WIN32 - - // Under windows avoid including is overrated. - // Sure, it can be avoided and "name space pollution" can be - // avoided, but why? It really doesn't make that much difference - // these days. - #define WIN32_LEAN_AND_MEAN - #include - - #ifndef __gl_h_ - #include - #include - #endif - -#else - - // Non windows platforms - don't require nonsense as seen above :-) - #ifndef __gl_h_ - #ifdef __APPLE_CC__ - #include - #include - #else - #include - #if defined (__sun__) && !defined (__sparc__) - #include - #else - #include - #endif - #endif - - #endif - - // Required for compatibility with glext.h style function definitions of - // OpenGL extensions, such as in src/osg/Point.cpp. - #ifndef APIENTRY - #define APIENTRY - #endif -#endif - -// Compiler-specific conditional compilation -#ifdef _MSC_VER // MS Visual C++ - - // Disable various warning. - // 4786: template name too long - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) - - // The following definitions control how symbols are exported. - // If the target is a static library ensure that FTGL_LIBRARY_STATIC - // is defined. If building a dynamic library (ie DLL) ensure the - // FTGL_LIBRARY macro is defined, as it will mark symbols for - // export. If compiling a project to _use_ the _dynamic_ library - // version of the library, no definition is required. - #ifdef FTGL_LIBRARY_STATIC // static lib - no special export required - # define FTGL_EXPORT - #elif FTGL_LIBRARY // dynamic lib - must export/import symbols appropriately. - # define FTGL_EXPORT __declspec(dllexport) - #else - # define FTGL_EXPORT __declspec(dllimport) - #endif - -#else - // Compiler that is not MS Visual C++. - // Ensure that the export symbol is defined (and blank) - #define FTGL_EXPORT -#endif - - -// lifted from glext.h, to remove dependancy on glext.h -#ifndef GL_EXT_texture_object - #define GL_TEXTURE_PRIORITY_EXT 0x8066 - #define GL_TEXTURE_RESIDENT_EXT 0x8067 - #define GL_TEXTURE_1D_BINDING_EXT 0x8068 - #define GL_TEXTURE_2D_BINDING_EXT 0x8069 - #define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#endif // __FTGL__ diff --git a/extern/bFTGL/include/FTGLBitmapFont.h b/extern/bFTGL/include/FTGLBitmapFont.h deleted file mode 100644 index 12feae00cb6..00000000000 --- a/extern/bFTGL/include/FTGLBitmapFont.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef __FTGLBitmapFont__ -#define __FTGLBitmapFont__ - -#include "FTFont.h" -#include "FTGL.h" - - -class FTGlyph; - -/** - * FTGLBitmapFont is a specialisation of the FTFont class for handling - * Bitmap fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLBitmapFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLBitmapFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLBitmapFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - ~FTGLBitmapFont(); - - /** - * Renders a string of characters - * - * @param string 'C' style string to be output. - */ - void Render( const char* string); - - /** - * Renders a string of characters - * - * @param string 'C' style wide string to be output. - */ - void Render( const wchar_t* string); - - // attributes - - private: - /** - * Construct a FTBitmapGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FTBitmapGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int g); - -}; -#endif // __FTGLBitmapFont__ diff --git a/extern/bFTGL/include/FTGLBufferFont.h b/extern/bFTGL/include/FTGLBufferFont.h deleted file mode 100644 index 2f74b5cdef9..00000000000 --- a/extern/bFTGL/include/FTGLBufferFont.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef __FTGLBufferFont__ -#define __FTGLBufferFont__ - - -#include "FTFont.h" -#include "FTGL.h" - - -class FTGlyph; - - -/** - * FTGLBufferFont is a specialisation of the FTFont class for handling - * Pixmap (Grey Scale) fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLBufferFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLBufferFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLBufferFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - - void SetClientBuffer( unsigned char* b) - { - buffer = b; - } - - - /** - * Destructor - */ - ~FTGLBufferFont(); - - /** - * Renders a string of characters - * - * @param string 'C' style string to be output. - */ - void Render( const char* string); - - /** - * Renders a string of characters - * - * @param string wchar_t string to be output. - */ - void Render( const wchar_t* string); - - private: - /** - * Construct a FTBufferGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FTBufferGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int g); - - unsigned char* buffer; -}; - - -#endif // __FTGLBufferFont__ - diff --git a/extern/bFTGL/include/FTGLExtrdFont.h b/extern/bFTGL/include/FTGLExtrdFont.h deleted file mode 100644 index dc784bbb5b0..00000000000 --- a/extern/bFTGL/include/FTGLExtrdFont.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef __FTGLExtrdFont__ -#define __FTGLExtrdFont__ - -#include "FTFont.h" -#include "FTGL.h" - -class FTGlyph; - -/** - * FTGLExtrdFont is a specialisation of the FTFont class for handling - * extruded Polygon fonts - * - * @see FTFont - * @see FTGLPolygonFont - */ -class FTGL_EXPORT FTGLExtrdFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLExtrdFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLExtrdFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - ~FTGLExtrdFont(); - - void Depth( float d) { depth = d;} - - private: - /** - * Construct a FTPolyGlyph. - * - * @param glyphIndex The glyph index NOT the char code. - * @return An FTExtrdGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int glyphIndex); - - float depth; -}; - - -#endif // __FTGLExtrdFont__ - diff --git a/extern/bFTGL/include/FTGLOutlineFont.h b/extern/bFTGL/include/FTGLOutlineFont.h deleted file mode 100644 index a7f4b23092d..00000000000 --- a/extern/bFTGL/include/FTGLOutlineFont.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef __FTGLOutlineFont__ -#define __FTGLOutlineFont__ - - -#include "FTFont.h" -#include "FTGL.h" - -class FTGlyph; - - -/** - * FTGLOutlineFont is a specialisation of the FTFont class for handling - * Vector Outline fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLOutlineFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLOutlineFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLOutlineFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - ~FTGLOutlineFont(); - - /** - * Renders a string of characters - * - * @param string 'C' style string to be output. - */ - void Render( const char* string); - - /** - * Renders a string of characters - * - * @param string wchar_t string to be output. - */ - void Render( const wchar_t* string); - - private: - /** - * Construct a FTOutlineGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FTOutlineGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int g); - -}; -#endif // __FTGLOutlineFont__ diff --git a/extern/bFTGL/include/FTGLPixmapFont.h b/extern/bFTGL/include/FTGLPixmapFont.h deleted file mode 100644 index f781ddf68dd..00000000000 --- a/extern/bFTGL/include/FTGLPixmapFont.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef __FTGLPixmapFont__ -#define __FTGLPixmapFont__ - - -#include "FTFont.h" -#include "FTGL.h" - - -class FTGlyph; - - -/** - * FTGLPixmapFont is a specialisation of the FTFont class for handling - * Pixmap (Grey Scale) fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLPixmapFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLPixmapFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLPixmapFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - ~FTGLPixmapFont(); - - /** - * Renders a string of characters - * - * @param string 'C' style string to be output. - */ - void Render( const char* string); - - /** - * Renders a string of characters - * - * @param string wchar_t string to be output. - */ - void Render( const wchar_t* string); - - private: - /** - * Construct a FTPixmapGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FTPixmapGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int g); - -}; - - -#endif // __FTGLPixmapFont__ - diff --git a/extern/bFTGL/include/FTGLPolygonFont.h b/extern/bFTGL/include/FTGLPolygonFont.h deleted file mode 100644 index 54e624a1893..00000000000 --- a/extern/bFTGL/include/FTGLPolygonFont.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef __FTGLPolygonFont__ -#define __FTGLPolygonFont__ - - -#include "FTFont.h" -#include "FTGL.h" - -class FTGlyph; - - -/** - * FTGLPolygonFont is a specialisation of the FTFont class for handling - * tesselated Polygon Mesh fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLPolygonFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLPolygonFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLPolygonFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - ~FTGLPolygonFont(); - - private: - /** - * Construct a FTPolyGlyph. - * - * @param g The glyph index NOT the char code. - * @return An FTPolyGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int g); - -}; - - -#endif // __FTGLPolygonFont__ - diff --git a/extern/bFTGL/include/FTGLTextureFont.h b/extern/bFTGL/include/FTGLTextureFont.h deleted file mode 100644 index f0575143f4b..00000000000 --- a/extern/bFTGL/include/FTGLTextureFont.h +++ /dev/null @@ -1,151 +0,0 @@ -#ifndef __FTGLTextureFont__ -#define __FTGLTextureFont__ - -#include "FTFont.h" -#include "FTVector.h" -#include "FTGL.h" - -class FTTextureGlyph; - - -/** - * FTGLTextureFont is a specialisation of the FTFont class for handling - * Texture mapped fonts - * - * @see FTFont - */ -class FTGL_EXPORT FTGLTextureFont : public FTFont -{ - public: - /** - * Open and read a font file. Sets Error flag. - * - * @param fontname font file name. - */ - FTGLTextureFont( const char* fontname); - - /** - * Open and read a font from a buffer in memory. Sets Error flag. - * - * @param pBufferBytes the in-memory buffer - * @param bufferSizeInBytes the length of the buffer in bytes - */ - FTGLTextureFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes); - - /** - * Destructor - */ - virtual ~FTGLTextureFont(); - - /** - * Set the char size for the current face. - * - * @param size the face size in points (1/72 inch) - * @param res the resolution of the target device. - * @return true if size was set correctly - */ - virtual bool FaceSize( const unsigned int size, const unsigned int res = 72); - - /** - * Renders a string of characters - * - * @param string 'C' style string to be output. - */ - virtual void Render( const char* string); - - /** - * Renders a string of characters - * - * @param string wchar_t string to be output. - */ - virtual void Render( const wchar_t* string); - - - private: - /** - * Construct a FTTextureGlyph. - * - * @param glyphIndex The glyph index NOT the char code. - * @return An FTTextureGlyph or null on failure. - */ - inline virtual FTGlyph* MakeGlyph( unsigned int glyphIndex); - - /** - * Get the size of a block of memory required to layout the glyphs - * - * Calculates a width and height based on the glyph sizes and the - * number of glyphs. It over estimates. - */ - inline void CalculateTextureSize(); - - /** - * Creates a 'blank' OpenGL texture object. - * - * The format is GL_ALPHA and the params are - * GL_TEXTURE_WRAP_S = GL_CLAMP - * GL_TEXTURE_WRAP_T = GL_CLAMP - * GL_TEXTURE_MAG_FILTER = GL_LINEAR - * GL_TEXTURE_MIN_FILTER = GL_LINEAR - * Note that mipmapping is NOT used - */ - inline GLuint CreateTexture(); - - /** - * The maximum texture dimension on this OpenGL implemetation - */ - GLsizei maxTextSize; - - /** - * The minimum texture width required to hold the glyphs - */ - GLsizei textureWidth; - - /** - * The minimum texture height required to hold the glyphs - */ - GLsizei textureHeight; - - /** - *An array of texture ids - */ - FTVector textureIDList; - - /** - * The max height for glyphs in the current font - */ - int glyphHeight; - - /** - * The max width for glyphs in the current font - */ - int glyphWidth; - - /** - * A value to be added to the height and width to ensure that - * glyphs don't overlap in the texture - */ - unsigned int padding; - - /** - * - */ - unsigned int numGlyphs; - - /** - */ - unsigned int remGlyphs; - - /** - */ - int xOffset; - - /** - */ - int yOffset; - -}; - - -#endif // __FTGLTextureFont__ - - diff --git a/extern/bFTGL/include/FTGlyph.h b/extern/bFTGL/include/FTGlyph.h deleted file mode 100644 index c38d51e728e..00000000000 --- a/extern/bFTGL/include/FTGlyph.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef __FTGlyph__ -#define __FTGlyph__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTBBox.h" -#include "FTPoint.h" -#include "FTGL.h" - - -/** - * FTGlyph is the base class for FTGL glyphs. - * - * It provides the interface between Freetype glyphs and their openGL - * renderable counterparts. This is an abstract class and derived classes - * must implement the render function. - * - * @see FTGlyphContainer - * @see FTBBox - * @see FTPoint - * - */ -class FTGL_EXPORT FTGlyph -{ - public: - /** - * Constructor - */ - FTGlyph( FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen) = 0; - - /** - * Return the advance width for this glyph. - * - * @return advance width. - */ - float Advance() const { return advance;} - - /** - * Return the bounding box for this glyph. - * - * @return bounding box. - */ - const FTBBox& BBox() const { return bBox;} - - /** - * Queries for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err;} - - protected: - /** - * The advance distance for this glyph - */ - float advance; - - /** - * The bounding box of this glyph. - */ - FTBBox bBox; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; - - private: - -}; - - -#endif // __FTGlyph__ - diff --git a/extern/bFTGL/include/FTGlyphContainer.h b/extern/bFTGL/include/FTGlyphContainer.h deleted file mode 100644 index de668b61dbd..00000000000 --- a/extern/bFTGL/include/FTGlyphContainer.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef __FTGlyphContainer__ -#define __FTGlyphContainer__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTBBox.h" -#include "FTPoint.h" -#include "FTVector.h" - -class FTFace; -class FTGlyph; -class FTCharmap; - -/** - * FTGlyphContainer holds the post processed FTGlyph objects. - * - * @see FTGlyph - */ -class FTGL_EXPORT FTGlyphContainer -{ - typedef FTVector GlyphVector; - public: - /** - * Constructor - * - * @param face The Freetype face - */ - FTGlyphContainer( FTFace* face); - - /** - * Destructor - */ - ~FTGlyphContainer(); - - /** - * Sets the character map for the face. - * - * @param encoding the Freetype encoding symbol. See above. - * @return true if charmap was valid - * and set correctly - */ - bool CharMap( FT_Encoding encoding); - - /** - * Get the font index of the input character. - * - * @param characterCode The character code of the requested glyph in the - * current encoding eg apple roman. - * @return The font index for the character. - */ - unsigned int FontIndex( const unsigned int characterCode ) const; - - /** - * Adds a glyph to this glyph list. - * - * @param glyph The FTGlyph to be inserted into the container - * @param characterCode The char code of the glyph NOT the glyph index. - */ - void Add( FTGlyph* glyph, const unsigned int characterCode); - - /** - * Get a glyph from the glyph list - * - * @param characterCode The char code of the glyph NOT the glyph index - * @return An FTGlyph or null is it hasn't been - * loaded. - */ - const FTGlyph* const Glyph( const unsigned int characterCode) const; - - /** - * Get the bounding box for a character. - * @param characterCode The char code of the glyph NOT the glyph index - */ - FTBBox BBox( const unsigned int characterCode) const; - - /** - * Returns the kerned advance width for a glyph. - * - * @param characterCode glyph index of the character - * @param nextCharacterCode the next glyph in a string - * @return advance width - */ - float Advance( const unsigned int characterCode, const unsigned int nextCharacterCode); - - /** - * Renders a character - * @param characterCode the glyph to be Rendered - * @param nextCharacterCode the next glyph in the string. Used for kerning. - * @param penPosition the position to Render the glyph - * @return The distance to advance the pen position after Rendering - */ - FTPoint Render( const unsigned int characterCode, const unsigned int nextCharacterCode, FTPoint penPosition); - - /** - * Queries the Font for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err;} - - private: - /** - * The FTGL face - */ - FTFace* face; - - /** - * The Character Map object associated with the current face - */ - FTCharmap* charMap; - - /** - * A structure to hold the glyphs - */ - GlyphVector glyphs; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; -}; - - -#endif // __FTGlyphContainer__ diff --git a/extern/bFTGL/include/FTLibrary.h b/extern/bFTGL/include/FTLibrary.h deleted file mode 100644 index 1e5ed6b1a08..00000000000 --- a/extern/bFTGL/include/FTLibrary.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef __FTLibrary__ -#define __FTLibrary__ - -#include -#include FT_FREETYPE_H -//#include FT_CACHE_H - -#include "FTGL.h" - - -/** - * FTLibrary class is the global accessor for the Freetype library. - * - * This class encapsulates the Freetype Library. This is a singleton class - * and ensures that only one FT_Library is in existence at any one time. - * All constructors are private therefore clients cannot create or - * instantiate this class themselves and must access it's methods via the - * static FTLibrary::Instance() function. - * - * Just because this class returns a valid FTLibrary object - * doesn't mean that the Freetype Library has been successfully initialised. - * Clients should check for errors. You can initialse the library AND check - * for errors using the following code... - * err = FTLibrary::Instance().Error(); - * - * @see "Freetype 2 Documentation" - * - */ -class FTGL_EXPORT FTLibrary -{ - public: - /** - * Global acces point to the single FTLibrary object. - * - * @return The global FTLibrary object. - */ - static FTLibrary& Instance(); - - /** - * Gets a pointer to the native Freetype library. - * - * @return A handle to a FreeType library instance. - */ - const FT_Library* const GetLibrary() const { return library;} - - /** - * Queries the library for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err;} - - /** - * Destructor - * - * Disposes of the Freetype library - */ - ~FTLibrary(); - - private: - /** - * Default constructors. - * - * Made private to stop clients creating there own FTLibrary - * objects. - */ - FTLibrary(); - FTLibrary( const FT_Library&){} - FTLibrary& operator=( const FT_Library&) { return *this; } - - /** - * Initialises the Freetype library - * - * Even though this function indicates success via the return value, - * clients can't see this so must check the error codes. This function - * is only ever called by the default c_stor - * - * @return true if the Freetype library was - * successfully initialised, false - * otherwise. - */ - bool Initialise(); - - /** - * Freetype library handle. - */ - FT_Library* library; -// FTC_Manager* manager; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; - -}; - -#endif // __FTLibrary__ diff --git a/extern/bFTGL/include/FTList.h b/extern/bFTGL/include/FTList.h deleted file mode 100644 index 34992168103..00000000000 --- a/extern/bFTGL/include/FTList.h +++ /dev/null @@ -1,112 +0,0 @@ -#ifndef __FTList__ -#define __FTList__ - -#include "FTGL.h" - -/** -* Provides a non-STL alternative to the STL list - */ -template -class FTGL_EXPORT FTList -{ - public: - typedef FT_LIST_ITEM_TYPE value_type; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef size_t size_type; - - /** - * Constructor - */ - FTList() - : listSize(0), - tail(0) - { - tail = NULL; - head = new Node; - } - - /** - * Destructor - */ - ~FTList() - { - Node* next; - - for( Node *walk = head; walk; walk = next) - { - next = walk->next; - delete walk; - } - } - - /** - * Get the number of items in the list - */ - size_type size() const - { - return listSize; - } - - /** - * Add an item to the end of the list - */ - void push_back( const value_type& item) - { - Node* node = new Node( item); - - if( head->next == NULL) - { - head->next = node; - } - - if( tail) - { - tail->next = node; - } - tail = node; - ++listSize; - } - - /** - * Get the item at the front of the list - */ - reference front() const - { - return head->next->payload; - } - - /** - * Get the item at the end of the list - */ - reference back() const - { - return tail->payload; - } - - private: - struct Node - { - Node() - : next(NULL) - {} - - Node( const value_type& item) - : next(NULL) - { - payload = item; - } - - Node* next; - - value_type payload; - }; - - size_type listSize; - - Node* head; - Node* tail; -}; - -#endif // __FTList__ - diff --git a/extern/bFTGL/include/FTOutlineGlyph.h b/extern/bFTGL/include/FTOutlineGlyph.h deleted file mode 100644 index 7dd0ba042b9..00000000000 --- a/extern/bFTGL/include/FTOutlineGlyph.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef __FTOutlineGlyph__ -#define __FTOutlineGlyph__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - -class FTVectoriser; - - -/** - * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines. - * - * @see FTGlyphContainer - * @see FTVectoriser - * - */ -class FTGL_EXPORT FTOutlineGlyph : public FTGlyph -{ - public: - /** - * Constructor. Sets the Error to Invalid_Outline if the glyphs isn't an outline. - * - * @param glyph The Freetype glyph to be processed - */ - FTOutlineGlyph( FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTOutlineGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - private: - /** - * OpenGL display list - */ - GLuint glList; - -}; - - -#endif // __FTOutlineGlyph__ - diff --git a/extern/bFTGL/include/FTPixmapGlyph.h b/extern/bFTGL/include/FTPixmapGlyph.h deleted file mode 100644 index 9d43d6c58b3..00000000000 --- a/extern/bFTGL/include/FTPixmapGlyph.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef __FTPixmapGlyph__ -#define __FTPixmapGlyph__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - - -/** - * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps. - * - * @see FTGlyphContainer - * - */ -class FTGL_EXPORT FTPixmapGlyph : public FTGlyph -{ - public: - /** - * Constructor - * - * @param glyph The Freetype glyph to be processed - */ - FTPixmapGlyph( FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTPixmapGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - // attributes - - private: - /** - * The width of the glyph 'image' - */ - int destWidth; - - /** - * The height of the glyph 'image' - */ - int destHeight; - - /** - * Vector from the pen position to the topleft corner of the pixmap - */ - FTPoint pos; - - /** - * Pointer to the 'image' data - */ - unsigned char* data; - -}; - - -#endif // __FTPixmapGlyph__ diff --git a/extern/bFTGL/include/FTPoint.h b/extern/bFTGL/include/FTPoint.h deleted file mode 100644 index bb1772c4c18..00000000000 --- a/extern/bFTGL/include/FTPoint.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef __FTPoint__ -#define __FTPoint__ - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" - -/** - * FTPoint class is a basic 3 dimensional point or vector. - */ -class FTGL_EXPORT FTPoint -{ - public: - /** - * Default constructor. Point is set to zero. - */ - FTPoint() - : x(0), y(0), z(0) - {} - - /** - * Constructor. - * - * @param X - * @param Y - * @param Z - */ - FTPoint( const FTGL_DOUBLE X, const FTGL_DOUBLE Y, const FTGL_DOUBLE Z) - : x(X), y(Y), z(Z) - {} - - /** - * Constructor. This converts an FT_Vector to an FT_Point - * - * @param ft_vector A freetype vector - */ - FTPoint( const FT_Vector& ft_vector) - : x(ft_vector.x), y(ft_vector.y), z(0) - {} - - /** - * Operator += - * - * @param point - * @return this plus point. - */ - FTPoint& operator += ( const FTPoint& point) - { - x += point.x; - y += point.y; - z += point.z; - - return *this; - } - - /** - * Operator == Tests for eqaulity - * - * @param a - * @param b - * @return - */ - friend bool operator == ( const FTPoint &a, const FTPoint &b); - - /** - * Operator != Tests for non equality - * - * @param a - * @param b - * @return - */ - friend bool operator != ( const FTPoint &a, const FTPoint &b); - - /** - * The point data - */ - FTGL_DOUBLE x, y, z; // FIXME make private - - private: -}; - -#endif // __FTPoint__ - diff --git a/extern/bFTGL/include/FTPolyGlyph.h b/extern/bFTGL/include/FTPolyGlyph.h deleted file mode 100644 index c8faeffceb6..00000000000 --- a/extern/bFTGL/include/FTPolyGlyph.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef __FTPolyGlyph__ -#define __FTPolyGlyph__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - -class FTVectoriser; - -/** - * FTPolyGlyph is a specialisation of FTGlyph for creating tessellated - * polygon glyphs. - * - * @see FTGlyphContainer - * @see FTVectoriser - * - */ -class FTGL_EXPORT FTPolyGlyph : public FTGlyph -{ - public: - /** - * Constructor. Sets the Error to Invalid_Outline if the glyphs isn't an outline. - * - * @param glyph The Freetype glyph to be processed - */ - FTPolyGlyph( FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTPolyGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - private: - /** - * OpenGL display list - */ - GLuint glList; - -}; - - -#endif // __FTPolyGlyph__ - diff --git a/extern/bFTGL/include/FTSize.h b/extern/bFTGL/include/FTSize.h deleted file mode 100644 index 31f6bb66db1..00000000000 --- a/extern/bFTGL/include/FTSize.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef __FTSize__ -#define __FTSize__ - - -#include -#include FT_FREETYPE_H - -#include "FTGL.h" - - - -/** - * FTSize class provides an abstraction layer for the Freetype Size. - * - * @see "Freetype 2 Documentation" - * - */ -class FTGL_EXPORT FTSize -{ - public: - /** - * Default Constructor - */ - FTSize(); - - /** - * Destructor - */ - virtual ~FTSize(); - - /** - * Sets the char size for the current face. - * - * This doesn't guarantee that the size was set correctly. Clients - * should check errors. - * - * @param face Parent face for this size object - * @param point_size the face size in points (1/72 inch) - * @param x_resolution the horizontal resolution of the target device. - * @param y_resolution the vertical resolution of the target device. - * @return true if the size has been set. Clients should check Error() for more information if this function returns false() - */ - bool CharSize( FT_Face* face, unsigned int point_size, unsigned int x_resolution, unsigned int y_resolution); - - /** - * get the char size for the current face. - * - * @return The char size in points - */ - unsigned int CharSize() const; - - /** - * Gets the global ascender height for the face in pixels. - * - * @return Ascender height - */ - float Ascender() const; - - /** - * Gets the global descender height for the face in pixels. - * - * @return Ascender height - */ - float Descender() const; - - /** - * Gets the global face height for the face. - * - * If the face is scalable this returns the height of the global - * bounding box which ensures that any glyph will be less than or - * equal to this height. If the font isn't scalable there is no - * guarantee that glyphs will not be taller than this value. - * - * @return height in pixels. - */ - float Height() const; - - /** - * Gets the global face width for the face. - * - * If the face is scalable this returns the width of the global - * bounding box which ensures that any glyph will be less than or - * equal to this width. If the font isn't scalable this value is - * the max_advance for the face. - * - * @return width in pixels. - */ - float Width() const; - - /** - * Gets the underline position for the face. - * - * @return underline position in pixels - */ - float Underline() const; - - unsigned int XPixelsPerEm() const; - - unsigned int YPixelsPerEm() const; - - /** - * Queries for errors. - * - * @return The current error code. - */ - FT_Error Error() const { return err; } - - private: - /** - * The current Freetype face that this FTSize object relates to. - */ - FT_Face* ftFace; - - /** - * The Freetype size. - */ - FT_Size ftSize; - - /** - * The size in points. - */ - unsigned int size; - - /** - * Current error code. Zero means no error. - */ - FT_Error err; - -}; - -#endif // __FTSize__ - diff --git a/extern/bFTGL/include/FTTextureGlyph.h b/extern/bFTGL/include/FTTextureGlyph.h deleted file mode 100644 index 389e6f778da..00000000000 --- a/extern/bFTGL/include/FTTextureGlyph.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef __FTTextureGlyph__ -#define __FTTextureGlyph__ - - -#include -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#include "FTGL.h" -#include "FTGlyph.h" - - -/** - * FTTextureGlyph is a specialisation of FTGlyph for creating texture - * glyphs. - * - * @see FTGlyphContainer - * - */ -class FTGL_EXPORT FTTextureGlyph : public FTGlyph -{ - public: - /** - * Constructor - * - * @param glyph The Freetype glyph to be processed - * @param id The id of the texture that this glyph will be - * drawn in - * @param xOffset The x offset into the parent texture to draw - * this glyph - * @param yOffset The y offset into the parent texture to draw - * this glyph - * @param width The width of the parent texture - * @param height The height (number of rows) of the parent texture - */ - FTTextureGlyph( FT_GlyphSlot glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height); - - /** - * Destructor - */ - virtual ~FTTextureGlyph(); - - /** - * Renders this glyph at the current pen position. - * - * @param pen The current pen position. - * @return The advance distance for this glyph. - */ - virtual float Render( const FTPoint& pen); - - private: - /** - * The width of the glyph 'image' - */ - int destWidth; - - /** - * The height of the glyph 'image' - */ - int destHeight; - - /** - * Vector from the pen position to the topleft corner of the pixmap - */ - FTPoint pos; - - /** - * The texture co-ords of this glyph within the texture. - */ - FTPoint uv[2]; - - /** - * The texture index that this glyph is contained in. - */ - int glTextureID; - - /** - * The texture index of the currently active texture - * - * We call glGetIntegerv( GL_TEXTURE_2D_BINDING, activeTextureID); - * to get the currently active texture to try to reduce the number - * of texture bind operations - */ - GLint activeTextureID; - -}; - - -#endif // __FTTextureGlyph__ diff --git a/extern/bFTGL/include/FTVector.h b/extern/bFTGL/include/FTVector.h deleted file mode 100644 index 6147f522c08..00000000000 --- a/extern/bFTGL/include/FTVector.h +++ /dev/null @@ -1,190 +0,0 @@ -#ifndef __FTVector__ -#define __FTVector__ - -#include "FTGL.h" - -/** - * Provides a non-STL alternative to the STL vector - */ -template -class FTGL_EXPORT FTVector -{ - public: - typedef FT_VECTOR_ITEM_TYPE value_type; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef value_type* iterator; - typedef const value_type* const_iterator; - typedef size_t size_type; - - FTVector() - { - Capacity = Size = 0; - Items = 0; - } - - - virtual ~FTVector() - { - clear(); - } - - FTVector& operator =(const FTVector& v) - { - reserve(v.capacity()); - - iterator ptr = begin(); - const_iterator vbegin = v.begin(); - const_iterator vend = v.end(); - - while( vbegin != vend) - { - *ptr++ = *vbegin++; - } - - Size = v.size(); - return *this; - } - - size_type size() const - { - return Size; - } - - size_type capacity() const - { - return Capacity; - } - - iterator begin() - { - return Items; - } - - const_iterator begin() const - { - return Items; - } - - iterator end() - { - return begin() + size(); - } - - const_iterator end() const - { - return begin() + size(); - } - - bool empty() const - { - return size() == 0; - } - - reference operator [](size_type pos) - { - return( *(begin() + pos)); - } - - const_reference operator []( size_type pos) const - { - return( *(begin() + pos)); - } - - void clear() - { - if( Capacity) - { - delete [] Items; - Capacity = Size = 0; - Items = 0; - } - } - - void reserve( size_type n) - { - if( capacity() < n) - { - expand(n); - } - } - - void push_back(const value_type& x) - { - if( size() == capacity()) - { - expand(); - } - - ( *this)[size()] = x; - ++Size; - } - - void resize(size_type n, value_type x) - { - if( n == size()) - { - return; - } - - reserve(n); - iterator begin, end; - - if( n >= Size) - { - begin = this->end(); - end = this->begin() + n; - } - else - { - begin = this->begin() + n; - end = this->end(); - } - - while( begin != end) - { - *begin++ = x; - } - - Size = n; - } - - - private: - void expand(size_type capacity_hint = 0) - { - size_type new_capacity =( capacity() == 0) ? 256 : capacity()* 2; - if( capacity_hint) - { - while( new_capacity < capacity_hint) - { - new_capacity *= 2; - } - } - - value_type *new_items = new value_type[new_capacity]; - - iterator begin = this->begin(); - iterator end = this->end(); - value_type *ptr = new_items; - - while( begin != end) - { - *ptr++ = *begin++; - } - - if( Capacity) - { - delete [] Items; - } - - Items = new_items; - Capacity = new_capacity; - } - - size_type Capacity; - size_type Size; - value_type* Items; -}; - -#endif // __FTVector__ diff --git a/extern/bFTGL/include/FTVectoriser.h b/extern/bFTGL/include/FTVectoriser.h deleted file mode 100644 index 7150560ce07..00000000000 --- a/extern/bFTGL/include/FTVectoriser.h +++ /dev/null @@ -1,275 +0,0 @@ -#ifndef __FTVectoriser__ -#define __FTVectoriser__ - - -#include "FTContour.h" -#include "FTList.h" -#include "FTPoint.h" -#include "FTVector.h" -#include "FTGL.h" - - -#ifndef CALLBACK -#define CALLBACK -#endif - - -/** - * FTTesselation captures points that are output by OpenGL's gluTesselator. - */ -class FTGL_EXPORT FTTesselation -{ - public: - /** - * Default constructor - */ - FTTesselation( GLenum m) - : meshType(m) - { - pointList.reserve( 128); - } - - /** - * Destructor - */ - ~FTTesselation() - { - pointList.clear(); - } - - /** - * Add a point to the mesh. - */ - void AddPoint( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z) - { - pointList.push_back( FTPoint( x, y, z)); - } - - /** - * The number of points in this mesh - */ - size_t PointCount() const { return pointList.size();} - - /** - * - */ - const FTPoint& Point( unsigned int index) const { return pointList[index];} - - /** - * Return the OpenGL polygon type. - */ - GLenum PolygonType() const { return meshType;} - - private: - /** - * Points generated by gluTesselator. - */ - typedef FTVector PointVector; - PointVector pointList; - - /** - * OpenGL primitive type from gluTesselator. - */ - GLenum meshType; -}; - - -/** - * FTMesh is a container of FTTesselation's that make up a polygon glyph - */ -class FTGL_EXPORT FTMesh -{ - typedef FTVector TesselationVector; - typedef FTList PointList; - - public: - /** - * Default constructor - */ - FTMesh(); - - /** - * Destructor - */ - ~FTMesh(); - - /** - * - */ - void AddPoint( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z); - - /** - * - */ - FTGL_DOUBLE* Combine( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z); - - /** - * - */ - void Begin( GLenum meshType); - - /** - * - */ - void End(); - - /** - * - */ - void Error( GLenum e) { err = e;} - - /** - * - */ - unsigned int TesselationCount() const { return tesselationList.size();} - - /** - * - */ - const FTTesselation* const Tesselation( unsigned int index) const; - - /** - * - */ - const PointList& TempPointList() const { return tempPointList;} - - /** - * Get the GL ERROR returned by the glu tesselator - */ - GLenum Error() const { return err;} - - private: - /** - * The current sub mesh that we are constructing. - */ - FTTesselation* currentTesselation; - - /** - * Holds each sub mesh that comprises this glyph. - */ - TesselationVector tesselationList; - - /** - * Holds extra points created by gluTesselator. See ftglCombine. - */ - PointList tempPointList; - - /** - * GL ERROR returned by the glu tesselator - */ - GLenum err; - -}; - -const FTGL_DOUBLE FTGL_FRONT_FACING = 1.0; -const FTGL_DOUBLE FTGL_BACK_FACING = -1.0; - -/** - * FTVectoriser class is a helper class that converts font outlines into - * point data. - * - * @see FTExtrdGlyph - * @see FTOutlineGlyph - * @see FTPolyGlyph - * @see FTContour - * @see FTPoint - * - */ -class FTGL_EXPORT FTVectoriser -{ - public: - /** - * Constructor - * - * @param glyph The freetype glyph to be processed - */ - FTVectoriser( const FT_GlyphSlot glyph); - - /** - * Destructor - */ - virtual ~FTVectoriser(); - - /** - * Build an FTMesh from the vector outline data. - * - * @param zNormal The direction of the z axis of the normal - * for this mesh - */ - void MakeMesh( FTGL_DOUBLE zNormal = FTGL_FRONT_FACING); - - /** - * Get the current mesh. - */ - const FTMesh* const GetMesh() const { return mesh;} - - /** - * Get the total count of points in this outline - * - * @return the number of points - */ - size_t PointCount(); - - /** - * Get the count of contours in this outline - * - * @return the number of contours - */ - size_t ContourCount() const { return ftContourCount;} - - /** - * Return a contour at index - * - * @return the number of contours - */ - const FTContour* const Contour( unsigned int index) const; - - /** - * Get the number of points in a specific contour in this outline - * - * @param c The contour index - * @return the number of points in contour[c] - */ - size_t ContourSize( int c) const { return contourList[c]->PointCount();} - - /** - * Get the flag for the tesselation rule for this outline - * - * @return The contour flag - */ - int ContourFlag() const { return contourFlag;} - - private: - /** - * Process the freetype outline data into contours of points - */ - void ProcessContours(); - - /** - * The list of contours in the glyph - */ - FTContour** contourList; - - /** - * A Mesh for tesselations - */ - FTMesh* mesh; - - /** - * The number of contours reported by Freetype - */ - short ftContourCount; - - /** - * A flag indicating the tesselation rule for the glyph - */ - int contourFlag; - - /** - * A Freetype outline - */ - FT_Outline outline; -}; - - -#endif // __FTVectoriser__ diff --git a/extern/bFTGL/license.txt b/extern/bFTGL/license.txt deleted file mode 100644 index b9fd0dbb580..00000000000 --- a/extern/bFTGL/license.txt +++ /dev/null @@ -1,27 +0,0 @@ -FTGL - -Herewith is a license. I've also chucked in a gnu (see COPYING.txt) license -for those that are that way inclined. Basically I want you to use this -software and if you think this license is preventing you from doing so -let me know. - -Copyright (C) 2001-3 Henry Maddocks - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj b/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj deleted file mode 100644 index a2dcf685ed2..00000000000 --- a/extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj b/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj deleted file mode 100644 index eefbecb3653..00000000000 --- a/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj +++ /dev/null @@ -1,537 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extern/bFTGL/src/FTBitmapGlyph.cpp b/extern/bFTGL/src/FTBitmapGlyph.cpp deleted file mode 100644 index 5db33f10c79..00000000000 --- a/extern/bFTGL/src/FTBitmapGlyph.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include - -#include "FTBitmapGlyph.h" - -FTBitmapGlyph::FTBitmapGlyph( FT_GlyphSlot glyph) -: FTGlyph( glyph), - destWidth(0), - destHeight(0), - data(0) -{ - err = FT_Render_Glyph( glyph, FT_RENDER_MODE_MONO); - if( err || ft_glyph_format_bitmap != glyph->format) - { - return; - } - - FT_Bitmap bitmap = glyph->bitmap; - - unsigned int srcWidth = bitmap.width; - unsigned int srcHeight = bitmap.rows; - unsigned int srcPitch = bitmap.pitch; - - destWidth = srcWidth; - destHeight = srcHeight; - destPitch = srcPitch; - - if( destWidth && destHeight) - { - data = new unsigned char[destPitch * destHeight]; - unsigned char* dest = data + (( destHeight - 1) * destPitch); - - unsigned char* src = bitmap.buffer; - - for( unsigned int y = 0; y < srcHeight; ++y) - { - memcpy( dest, src, srcPitch); - dest -= destPitch; - src += srcPitch; - } - } - - pos.x = glyph->bitmap_left; - pos.y = static_cast(srcHeight) - glyph->bitmap_top; -} - - -FTBitmapGlyph::~FTBitmapGlyph() -{ - delete [] data; -} - - -float FTBitmapGlyph::Render( const FTPoint& pen) -{ - if( data) - { - glBitmap( 0, 0, 0.0, 0.0, pen.x + pos.x, pen.y - pos.y, (const GLubyte*)0 ); - - glPixelStorei( GL_UNPACK_ROW_LENGTH, destPitch * 8); - glBitmap( destWidth, destHeight, 0.0f, 0.0, 0.0, 0.0, (const GLubyte*)data); - - glBitmap( 0, 0, 0.0, 0.0, -pen.x - pos.x, -pen.y + pos.y, (const GLubyte*)0 ); - } - - return advance; -} diff --git a/extern/bFTGL/src/FTBufferGlyph.cpp b/extern/bFTGL/src/FTBufferGlyph.cpp deleted file mode 100644 index 27310103152..00000000000 --- a/extern/bFTGL/src/FTBufferGlyph.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "FTBufferGlyph.h" - -FTBufferGlyph::FTBufferGlyph( FT_GlyphSlot glyph, unsigned char* b) -: FTGlyph( glyph), - destWidth(0), - destHeight(0), - data(0), - buffer(b) -{ - err = FT_Render_Glyph( glyph, FT_RENDER_MODE_NORMAL); - if( err || ft_glyph_format_bitmap != glyph->format) - { - return; - } - - FT_Bitmap bitmap = glyph->bitmap; - - unsigned int srcWidth = bitmap.width; - unsigned int srcHeight = bitmap.rows; - unsigned int srcPitch = bitmap.pitch; - - destWidth = srcWidth; - destHeight = srcHeight; - destPitch = srcPitch; - - if( destWidth && destHeight) - { - data = new unsigned char[destPitch * destHeight]; - unsigned char* dest = data + (( destHeight - 1) * destPitch); - - unsigned char* src = bitmap.buffer; - - for( unsigned int y = 0; y < srcHeight; ++y) - { - memcpy( dest, src, srcPitch); - dest -= destPitch; - src += srcPitch; - } - } - - pos.x = glyph->bitmap_left; - pos.y = srcHeight - glyph->bitmap_top; -} - - -FTBufferGlyph::~FTBufferGlyph() -{ - delete [] data; -} - - -float FTBufferGlyph::Render( const FTPoint& pen) -{ - if( data && buffer) - { - } - - return advance; -} diff --git a/extern/bFTGL/src/FTCharmap.cpp b/extern/bFTGL/src/FTCharmap.cpp deleted file mode 100644 index 00e8cfceca5..00000000000 --- a/extern/bFTGL/src/FTCharmap.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "FTFace.h" -#include "FTCharmap.h" - - -FTCharmap::FTCharmap( FTFace* face) -: ftFace( *(face->Face())), - err(0) -{ - if( !ftFace->charmap) - { - err = FT_Set_Charmap( ftFace, ftFace->charmaps[0]); - } - - ftEncoding = ftFace->charmap->encoding; -} - - -FTCharmap::~FTCharmap() -{ - charMap.clear(); -} - - -bool FTCharmap::CharMap( FT_Encoding encoding) -{ - if( ftEncoding == encoding) - { - return true; - } - - err = FT_Select_Charmap( ftFace, encoding ); - - if( !err) - { - ftEncoding = encoding; - } - else - { - ftEncoding = ft_encoding_none; - } - - charMap.clear(); - return !err; -} - - -unsigned int FTCharmap::GlyphListIndex( const unsigned int characterCode ) -{ - return charMap.find( characterCode); -} - - -unsigned int FTCharmap::FontIndex( const unsigned int characterCode ) -{ - return FT_Get_Char_Index( ftFace, characterCode); -} - - -void FTCharmap::InsertIndex( const unsigned int characterCode, const unsigned int containerIndex) -{ - charMap.insert( characterCode, containerIndex); -} diff --git a/extern/bFTGL/src/FTContour.cpp b/extern/bFTGL/src/FTContour.cpp deleted file mode 100644 index 6b0cf8a23e1..00000000000 --- a/extern/bFTGL/src/FTContour.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "FTContour.h" - -static const float BEZIER_STEP_SIZE = 0.2f; - - -void FTContour::AddPoint( FTPoint point) -{ - if( pointList.empty() || point != pointList[pointList.size() - 1]) - { - pointList.push_back( point); - } -} - - -void FTContour::AddPoint( float x, float y) -{ - AddPoint( FTPoint( x, y, 0.0f)); -} - - -void FTContour::evaluateQuadraticCurve() -{ - for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++) - { - float bezierValues[2][2]; - - float t = static_cast(i) * BEZIER_STEP_SIZE; - - bezierValues[0][0] = (1.0f - t) * controlPoints[0][0] + t * controlPoints[1][0]; - bezierValues[0][1] = (1.0f - t) * controlPoints[0][1] + t * controlPoints[1][1]; - - bezierValues[1][0] = (1.0f - t) * controlPoints[1][0] + t * controlPoints[2][0]; - bezierValues[1][1] = (1.0f - t) * controlPoints[1][1] + t * controlPoints[2][1]; - - bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0]; - bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1]; - - AddPoint( bezierValues[0][0], bezierValues[0][1]); - } -} - -void FTContour::evaluateCubicCurve() -{ - for( unsigned int i = 0; i <= ( 1.0f / BEZIER_STEP_SIZE); i++) - { - float bezierValues[3][2]; - - float t = static_cast(i) * BEZIER_STEP_SIZE; - - bezierValues[0][0] = (1.0f - t) * controlPoints[0][0] + t * controlPoints[1][0]; - bezierValues[0][1] = (1.0f - t) * controlPoints[0][1] + t * controlPoints[1][1]; - - bezierValues[1][0] = (1.0f - t) * controlPoints[1][0] + t * controlPoints[2][0]; - bezierValues[1][1] = (1.0f - t) * controlPoints[1][1] + t * controlPoints[2][1]; - - bezierValues[2][0] = (1.0f - t) * controlPoints[2][0] + t * controlPoints[3][0]; - bezierValues[2][1] = (1.0f - t) * controlPoints[2][1] + t * controlPoints[3][1]; - - bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0]; - bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1]; - - bezierValues[1][0] = (1.0f - t) * bezierValues[1][0] + t * bezierValues[2][0]; - bezierValues[1][1] = (1.0f - t) * bezierValues[1][1] + t * bezierValues[2][1]; - - bezierValues[0][0] = (1.0f - t) * bezierValues[0][0] + t * bezierValues[1][0]; - bezierValues[0][1] = (1.0f - t) * bezierValues[0][1] + t * bezierValues[1][1]; - - AddPoint( bezierValues[0][0], bezierValues[0][1]); - } -} - - -FTContour::FTContour( FT_Vector* contour, char* pointTags, unsigned int numberOfPoints) -{ - for( unsigned int pointIndex = 0; pointIndex < numberOfPoints; ++ pointIndex) - { - char pointTag = pointTags[pointIndex]; - - if( pointTag == FT_Curve_Tag_On || numberOfPoints < 2) - { - AddPoint( contour[pointIndex].x, contour[pointIndex].y); - continue; - } - - FTPoint controlPoint( contour[pointIndex]); - FTPoint previousPoint = ( 0 == pointIndex) - ? FTPoint( contour[numberOfPoints - 1]) - : pointList[pointList.size() - 1]; - - FTPoint nextPoint = ( pointIndex == numberOfPoints - 1) - ? pointList[0] - : FTPoint( contour[pointIndex + 1]); - - if( pointTag == FT_Curve_Tag_Conic) - { - char nextPointTag = ( pointIndex == numberOfPoints - 1) - ? pointTags[0] - : pointTags[pointIndex + 1]; - - while( nextPointTag == FT_Curve_Tag_Conic) - { - nextPoint = FTPoint( static_cast( controlPoint.x + nextPoint.x) * 0.5f, - static_cast( controlPoint.y + nextPoint.y) * 0.5f, - 0); - - controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y; - controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y; - controlPoints[2][0] = nextPoint.x; controlPoints[2][1] = nextPoint.y; - - evaluateQuadraticCurve(); - ++pointIndex; - - previousPoint = nextPoint; - controlPoint = FTPoint( contour[pointIndex]); - nextPoint = ( pointIndex == numberOfPoints - 1) - ? pointList[0] - : FTPoint( contour[pointIndex + 1]); - nextPointTag = ( pointIndex == numberOfPoints - 1) - ? pointTags[0] - : pointTags[pointIndex + 1]; - } - - controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y; - controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y; - controlPoints[2][0] = nextPoint.x; controlPoints[2][1] = nextPoint.y; - - evaluateQuadraticCurve(); - continue; - } - - if( pointTag == FT_Curve_Tag_Cubic) - { - FTPoint controlPoint2 = nextPoint; - - FTPoint nextPoint = ( pointIndex == numberOfPoints - 2) - ? pointList[0] - : FTPoint( contour[pointIndex + 2]); - - controlPoints[0][0] = previousPoint.x; controlPoints[0][1] = previousPoint.y; - controlPoints[1][0] = controlPoint.x; controlPoints[1][1] = controlPoint.y; - controlPoints[2][0] = controlPoint2.x; controlPoints[2][1] = controlPoint2.y; - controlPoints[3][0] = nextPoint.x; controlPoints[3][1] = nextPoint.y; - - evaluateCubicCurve(); - ++pointIndex; - continue; - } - } -} diff --git a/extern/bFTGL/src/FTExtrdGlyph.cpp b/extern/bFTGL/src/FTExtrdGlyph.cpp deleted file mode 100644 index 0b120e68709..00000000000 --- a/extern/bFTGL/src/FTExtrdGlyph.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include - -#include "FTExtrdGlyph.h" -#include "FTVectoriser.h" - - -FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d) -: FTGlyph( glyph), - glList(0), - depth(d) -{ - bBox.SetDepth( -depth); - - if( ft_glyph_format_outline != glyph->format) - { - err = 0x14; // Invalid_Outline - return; - } - - FTVectoriser vectoriser( glyph); - if ( ( vectoriser.ContourCount() < 1) || ( vectoriser.PointCount() < 3)) - { - return; - } - - unsigned int tesselationIndex; - glList = glGenLists(1); - glNewList( glList, GL_COMPILE); - - vectoriser.MakeMesh( 1.0); - glNormal3d(0.0, 0.0, 1.0); - - const FTMesh* mesh = vectoriser.GetMesh(); - for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex) - { - const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex); - unsigned int polyonType = subMesh->PolygonType(); - - glBegin( polyonType); - for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex) - { - glVertex3f( subMesh->Point( pointIndex).x / 64.0f, - subMesh->Point( pointIndex).y / 64.0f, - 0.0f); - } - glEnd(); - } - - vectoriser.MakeMesh( -1.0); - glNormal3d(0.0, 0.0, -1.0); - - mesh = vectoriser.GetMesh(); - for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex) - { - const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex); - unsigned int polyonType = subMesh->PolygonType(); - - glBegin( polyonType); - for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex) - { - glVertex3f( subMesh->Point( pointIndex).x / 64.0f, - subMesh->Point( pointIndex).y / 64.0f, - -depth); - } - glEnd(); - } - - int contourFlag = vectoriser.ContourFlag(); - - for( size_t c = 0; c < vectoriser.ContourCount(); ++c) - { - const FTContour* contour = vectoriser.Contour(c); - unsigned int numberOfPoints = contour->PointCount(); - - glBegin( GL_QUAD_STRIP); - for( unsigned int j = 0; j <= numberOfPoints; ++j) - { - unsigned int index = ( j == numberOfPoints) ? 0 : j; - unsigned int nextIndex = ( index == numberOfPoints - 1) ? 0 : index + 1; - - FTPoint normal = GetNormal( contour->Point(index), contour->Point(nextIndex)); - glNormal3f( normal.x, normal.y, 0.0f); - - if( contourFlag & ft_outline_reverse_fill) - { - glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, 0.0f); - glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, -depth); - } - else - { - glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, -depth); - glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, 0.0f); - } - } - glEnd(); - } - - glEndList(); -} - - -FTExtrdGlyph::~FTExtrdGlyph() -{ - glDeleteLists( glList, 1); -} - - -float FTExtrdGlyph::Render( const FTPoint& pen) -{ - if( glList) - { - glTranslatef( pen.x, pen.y, 0); - glCallList( glList); - glTranslatef( -pen.x, -pen.y, 0); - } - - return advance; -} - - -FTPoint FTExtrdGlyph::GetNormal( const FTPoint &a, const FTPoint &b) -{ - float vectorX = a.x - b.x; - float vectorY = a.y - b.y; - - float length = sqrt( vectorX * vectorX + vectorY * vectorY ); - - if( length > 0.0f) - { - length = 1 / length; - } - else - { - length = 0.0f; - } - - return FTPoint( -vectorY * length, - vectorX * length, - 0.0f); -} - diff --git a/extern/bFTGL/src/FTFace.cpp b/extern/bFTGL/src/FTFace.cpp deleted file mode 100644 index 0385e234d6c..00000000000 --- a/extern/bFTGL/src/FTFace.cpp +++ /dev/null @@ -1,154 +0,0 @@ -#include "FTFace.h" -#include "FTLibrary.h" - -#include FT_TRUETYPE_TABLES_H - -FTFace::FTFace( const char* filename) -: numGlyphs(0), - fontEncodingList(0), - err(0) -{ - const FT_Long DEFAULT_FACE_INDEX = 0; - ftFace = new FT_Face; - - err = FT_New_Face( *FTLibrary::Instance().GetLibrary(), filename, DEFAULT_FACE_INDEX, ftFace); - - if( err) - { - delete ftFace; - ftFace = 0; - } - else - { - numGlyphs = (*ftFace)->num_glyphs; - } -} - - -FTFace::FTFace( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: numGlyphs(0), - err(0) -{ - const FT_Long DEFAULT_FACE_INDEX = 0; - ftFace = new FT_Face; - - err = FT_New_Memory_Face( *FTLibrary::Instance().GetLibrary(), (FT_Byte *)pBufferBytes, bufferSizeInBytes, DEFAULT_FACE_INDEX, ftFace); - - if( err) - { - delete ftFace; - ftFace = 0; - } - else - { - numGlyphs = (*ftFace)->num_glyphs; - } -} - - -FTFace::~FTFace() -{ - Close(); -} - - -bool FTFace::Attach( const char* filename) -{ - err = FT_Attach_File( *ftFace, filename); - return !err; -} - - -bool FTFace::Attach( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -{ - FT_Open_Args open; - - open.flags = FT_OPEN_MEMORY; - open.memory_base = (FT_Byte *)pBufferBytes; - open.memory_size = bufferSizeInBytes; - - err = FT_Attach_Stream( *ftFace, &open); - return !err; -} - - -void FTFace::Close() -{ - if( ftFace) - { - FT_Done_Face( *ftFace); - delete ftFace; - ftFace = 0; - } -} - - -const FTSize& FTFace::Size( const unsigned int size, const unsigned int res) -{ - charSize.CharSize( ftFace, size, res, res); - err = charSize.Error(); - - return charSize; -} - - -unsigned int FTFace::CharMapCount() -{ - return (*ftFace)->num_charmaps; -} - - -FT_Encoding* FTFace::CharMapList() -{ - if( 0 == fontEncodingList) - { - fontEncodingList = new FT_Encoding[CharMapCount()]; - for( size_t encodingIndex = 0; encodingIndex < CharMapCount(); ++encodingIndex) - { - fontEncodingList[encodingIndex] = (*ftFace)->charmaps[encodingIndex]->encoding; - } - } - - return fontEncodingList; -} - - -unsigned int FTFace::UnitsPerEM() const -{ - return (*ftFace)->units_per_EM; -} - - -FTPoint FTFace::KernAdvance( unsigned int index1, unsigned int index2) -{ - float x, y; - x = y = 0.0f; - - if( FT_HAS_KERNING((*ftFace)) && index1 && index2) - { - FT_Vector kernAdvance; - kernAdvance.x = kernAdvance.y = 0; - - err = FT_Get_Kerning( *ftFace, index1, index2, ft_kerning_unfitted, &kernAdvance); - if( !err) - { - x = static_cast( kernAdvance.x) / 64.0f; - y = static_cast( kernAdvance.y) / 64.0f; - } - } - - return FTPoint( x, y, 0.0); -} - - -FT_GlyphSlot FTFace::Glyph( unsigned int index, FT_Int load_flags) -{ - err = FT_Load_Glyph( *ftFace, index, load_flags); - if( err) - { - return NULL; - } - - return (*ftFace)->glyph; -} - diff --git a/extern/bFTGL/src/FTFont.cpp b/extern/bFTGL/src/FTFont.cpp deleted file mode 100644 index c06d883104b..00000000000 --- a/extern/bFTGL/src/FTFont.cpp +++ /dev/null @@ -1,271 +0,0 @@ -#include "FTFace.h" -#include "FTFont.h" -#include "FTGlyphContainer.h" -#include "FTBBox.h" - - -FTFont::FTFont( const char* fontname) -: face( fontname), - glyphList(0) -{ - err = face.Error(); - if( err == 0) - { - glyphList = new FTGlyphContainer( &face); - } -} - - -FTFont::FTFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: face( pBufferBytes, bufferSizeInBytes), - glyphList(0) -{ - err = face.Error(); - if( err == 0) - { - glyphList = new FTGlyphContainer( &face); - } -} - - -FTFont::~FTFont() -{ - delete glyphList; -} - - -bool FTFont::Attach( const char* filename) -{ - if( face.Attach( filename)) - { - err = 0; - return true; - } - else - { - err = face.Error(); - return false; - } -} - - -bool FTFont::Attach( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -{ - if( face.Attach( pBufferBytes, bufferSizeInBytes)) - { - err = 0; - return true; - } - else - { - err = face.Error(); - return false; - } -} - - -bool FTFont::FaceSize( const unsigned int size, const unsigned int res ) -{ - charSize = face.Size( size, res); - - if( face.Error()) - { - return false; - } - - if( glyphList != NULL) - { - delete glyphList; - } - - glyphList = new FTGlyphContainer( &face); - return true; -} - - -unsigned int FTFont::FaceSize() const -{ - return charSize.CharSize(); -} - - -bool FTFont::CharMap( FT_Encoding encoding) -{ - bool result = glyphList->CharMap( encoding); - err = glyphList->Error(); - return result; -} - - -unsigned int FTFont::CharMapCount() -{ - return face.CharMapCount(); -} - - -FT_Encoding* FTFont::CharMapList() -{ - return face.CharMapList(); -} - - -float FTFont::Ascender() const -{ - return charSize.Ascender(); -} - - -float FTFont::Descender() const -{ - return charSize.Descender(); -} - - -void FTFont::BBox( const char* string, - float& llx, float& lly, float& llz, float& urx, float& ury, float& urz) -{ - FTBBox totalBBox; - - if((NULL != string) && ('\0' != *string)) - { - const unsigned char* c = (unsigned char*)string; - - CheckGlyph( *c); - - totalBBox = glyphList->BBox( *c); - float advance = glyphList->Advance( *c, *(c + 1)); - ++c; - - while( *c) - { - CheckGlyph( *c); - FTBBox tempBBox = glyphList->BBox( *c); - tempBBox.Move( FTPoint( advance, 0.0f, 0.0f)); - totalBBox += tempBBox; - advance += glyphList->Advance( *c, *(c + 1)); - ++c; - } - } - - llx = totalBBox.lowerX; - lly = totalBBox.lowerY; - llz = totalBBox.lowerZ; - urx = totalBBox.upperX; - ury = totalBBox.upperY; - urz = totalBBox.upperZ; -} - - -void FTFont::BBox( const wchar_t* string, - float& llx, float& lly, float& llz, float& urx, float& ury, float& urz) -{ - FTBBox totalBBox; - - if((NULL != string) && ('\0' != *string)) - { - const wchar_t* c = string; - - CheckGlyph( *c); - - totalBBox = glyphList->BBox( *c); - float advance = glyphList->Advance( *c, *(c + 1)); - ++c; - - while( *c) - { - CheckGlyph( *c); - FTBBox tempBBox = glyphList->BBox( *c); - tempBBox.Move( FTPoint( advance, 0.0f, 0.0f)); - totalBBox += tempBBox; - advance += glyphList->Advance( *c, *(c + 1)); - ++c; - } - } - - llx = totalBBox.lowerX; - lly = totalBBox.lowerY; - llz = totalBBox.lowerZ; - urx = totalBBox.upperX; - ury = totalBBox.upperY; - urz = totalBBox.upperZ; -} - - -float FTFont::Advance( const wchar_t* string) -{ - const wchar_t* c = string; - float width = 0.0f; - - while( *c) - { - CheckGlyph( *c); - width += glyphList->Advance( *c, *(c + 1)); - ++c; - } - - return width; -} - - -float FTFont::Advance( const char* string) -{ - const unsigned char* c = (unsigned char*)string; - float width = 0.0f; - - while( *c) - { - CheckGlyph( *c); - width += glyphList->Advance( *c, *(c + 1)); - ++c; - } - - return width; -} - - -void FTFont::Render( const char* string ) -{ - const unsigned char* c = (unsigned char*)string; - pen.x = 0; pen.y = 0; - - while( *c) - { - DoRender( *c, *(c + 1)); - ++c; - } -} - - -void FTFont::Render( const wchar_t* string ) -{ - const wchar_t* c = string; - pen.x = 0; pen.y = 0; - - while( *c) - { - DoRender( *c, *(c + 1)); - ++c; - } -} - - -void FTFont::DoRender( const unsigned int chr, const unsigned int nextChr) -{ - CheckGlyph( chr); - - FTPoint kernAdvance = glyphList->Render( chr, nextChr, pen); - - pen.x += kernAdvance.x; - pen.y += kernAdvance.y; -} - - -void FTFont::CheckGlyph( const unsigned int characterCode) -{ - if( NULL == glyphList->Glyph( characterCode)) - { - unsigned int glyphIndex = glyphList->FontIndex( characterCode); - glyphList->Add( MakeGlyph( glyphIndex), characterCode); - } -} - diff --git a/extern/bFTGL/src/FTGLBitmapFont.cpp b/extern/bFTGL/src/FTGLBitmapFont.cpp deleted file mode 100644 index 7e982a608da..00000000000 --- a/extern/bFTGL/src/FTGLBitmapFont.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "FTGLBitmapFont.h" -#include "FTBitmapGlyph.h" - - -FTGLBitmapFont::FTGLBitmapFont( const char* fontname) -: FTFont( fontname) -{} - - -FTGLBitmapFont::FTGLBitmapFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes) -{} - - -FTGLBitmapFont::~FTGLBitmapFont() -{} - - -FTGlyph* FTGLBitmapFont::MakeGlyph( unsigned int g) -{ - FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT); - - if( ftGlyph) - { - FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( ftGlyph); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - -void FTGLBitmapFont::Render( const char* string) -{ - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT); - glPushAttrib( GL_ENABLE_BIT); - - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1); - - glDisable( GL_BLEND); - - FTFont::Render( string); - - glPopAttrib(); - glPopClientAttrib(); -} - - -void FTGLBitmapFont::Render( const wchar_t* string) -{ - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT); - glPushAttrib( GL_ENABLE_BIT); - - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1); - - glDisable( GL_BLEND); - - FTFont::Render( string); - - glPopAttrib(); - glPopClientAttrib(); -} - diff --git a/extern/bFTGL/src/FTGLBufferFont.cpp b/extern/bFTGL/src/FTGLBufferFont.cpp deleted file mode 100644 index b8af0fcb05f..00000000000 --- a/extern/bFTGL/src/FTGLBufferFont.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include "FTGLBufferFont.h" -#include "FTBufferGlyph.h" - - -FTGLBufferFont::FTGLBufferFont( const char* fontname) -: FTFont( fontname), - buffer(0) -{} - - -FTGLBufferFont::FTGLBufferFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes), - buffer(0) -{} - - -FTGLBufferFont::~FTGLBufferFont() -{} - - -FTGlyph* FTGLBufferFont::MakeGlyph( unsigned int g) -{ - FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING); - - if( ftGlyph) - { - FTBufferGlyph* tempGlyph = new FTBufferGlyph( ftGlyph, buffer); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - -void FTGLBufferFont::Render( const char* string) -{ - if( NULL != buffer) - { - FTFont::Render( string); - } -} - - -void FTGLBufferFont::Render( const wchar_t* string) -{ - if( NULL != buffer) - { - FTFont::Render( string); - } -} - - diff --git a/extern/bFTGL/src/FTGLExtrdFont.cpp b/extern/bFTGL/src/FTGLExtrdFont.cpp deleted file mode 100644 index 37d89333a60..00000000000 --- a/extern/bFTGL/src/FTGLExtrdFont.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "FTGLExtrdFont.h" -#include "FTExtrdGlyph.h" - - -FTGLExtrdFont::FTGLExtrdFont( const char* fontname) -: FTFont( fontname), - depth( 0.0f) -{} - - -FTGLExtrdFont::FTGLExtrdFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes), - depth( 0.0f) -{} - - -FTGLExtrdFont::~FTGLExtrdFont() -{} - - -FTGlyph* FTGLExtrdFont::MakeGlyph( unsigned int glyphIndex) -{ - FT_GlyphSlot ftGlyph = face.Glyph( glyphIndex, FT_LOAD_NO_HINTING); - - if( ftGlyph) - { - FTExtrdGlyph* tempGlyph = new FTExtrdGlyph( ftGlyph, depth); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - diff --git a/extern/bFTGL/src/FTGLOutlineFont.cpp b/extern/bFTGL/src/FTGLOutlineFont.cpp deleted file mode 100644 index b9fd187e862..00000000000 --- a/extern/bFTGL/src/FTGLOutlineFont.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "FTGLOutlineFont.h" -#include "FTOutlineGlyph.h" - - -FTGLOutlineFont::FTGLOutlineFont( const char* fontname) -: FTFont( fontname) -{} - - -FTGLOutlineFont::FTGLOutlineFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes) -{} - - -FTGLOutlineFont::~FTGLOutlineFont() -{} - - -FTGlyph* FTGLOutlineFont::MakeGlyph( unsigned int g) -{ - FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING); - - if( ftGlyph) - { - FTOutlineGlyph* tempGlyph = new FTOutlineGlyph( ftGlyph); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - -void FTGLOutlineFont::Render( const char* string) -{ - glPushAttrib( GL_ENABLE_BIT | GL_HINT_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT); - - glDisable( GL_TEXTURE_2D); - - glEnable( GL_LINE_SMOOTH); - glHint( GL_LINE_SMOOTH_HINT, GL_DONT_CARE); - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE - - FTFont::Render( string); - - glPopAttrib(); -} - - -void FTGLOutlineFont::Render( const wchar_t* string) -{ - glPushAttrib( GL_ENABLE_BIT | GL_HINT_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT); - - glDisable( GL_TEXTURE_2D); - - glEnable( GL_LINE_SMOOTH); - glHint( GL_LINE_SMOOTH_HINT, GL_DONT_CARE); - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE - - FTFont::Render( string); - - glPopAttrib(); -} - diff --git a/extern/bFTGL/src/FTGLPixmapFont.cpp b/extern/bFTGL/src/FTGLPixmapFont.cpp deleted file mode 100644 index 2654b85e31e..00000000000 --- a/extern/bFTGL/src/FTGLPixmapFont.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "FTGLPixmapFont.h" -#include "FTPixmapGlyph.h" - - -FTGLPixmapFont::FTGLPixmapFont( const char* fontname) -: FTFont( fontname) -{} - - -FTGLPixmapFont::FTGLPixmapFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes) -{} - - -FTGLPixmapFont::~FTGLPixmapFont() -{} - - -FTGlyph* FTGLPixmapFont::MakeGlyph( unsigned int g) -{ - FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP); - - if( ftGlyph) - { - FTPixmapGlyph* tempGlyph = new FTPixmapGlyph( ftGlyph); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - -void FTGLPixmapFont::Render( const char* string) -{ - glPushAttrib( GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT); - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT); - - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glDisable( GL_TEXTURE_2D); - - FTFont::Render( string); - - glPopClientAttrib(); - glPopAttrib(); -} - - -void FTGLPixmapFont::Render( const wchar_t* string) -{ - //glPushAttrib( GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT); - // glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT); - - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glDisable( GL_TEXTURE_2D); - - FTFont::Render( string); - - glDisable(GL_BLEND); - // glPopClientAttrib(); - // glPopAttrib(); -} - - diff --git a/extern/bFTGL/src/FTGLPolygonFont.cpp b/extern/bFTGL/src/FTGLPolygonFont.cpp deleted file mode 100644 index 2d4dfa1f26a..00000000000 --- a/extern/bFTGL/src/FTGLPolygonFont.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "FTGLPolygonFont.h" -#include "FTPolyGlyph.h" - - -FTGLPolygonFont::FTGLPolygonFont( const char* fontname) -: FTFont( fontname) -{} - - -FTGLPolygonFont::FTGLPolygonFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes) -{} - - -FTGLPolygonFont::~FTGLPolygonFont() -{} - - -FTGlyph* FTGLPolygonFont::MakeGlyph( unsigned int g) -{ - FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING); - - if( ftGlyph) - { - FTPolyGlyph* tempGlyph = new FTPolyGlyph( ftGlyph); - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - diff --git a/extern/bFTGL/src/FTGLTextureFont.cpp b/extern/bFTGL/src/FTGLTextureFont.cpp deleted file mode 100644 index 92f14be50f2..00000000000 --- a/extern/bFTGL/src/FTGLTextureFont.cpp +++ /dev/null @@ -1,178 +0,0 @@ -#include // For memset - -#include "FTGLTextureFont.h" -#include "FTTextureGlyph.h" - - -inline GLuint NextPowerOf2( GLuint in) -{ - in -= 1; - - in |= in >> 16; - in |= in >> 8; - in |= in >> 4; - in |= in >> 2; - in |= in >> 1; - - return in + 1; -} - - -FTGLTextureFont::FTGLTextureFont( const char* fontname) -: FTFont( fontname), - maxTextSize(0), - textureWidth(0), - textureHeight(0), - glyphHeight(0), - glyphWidth(0), - padding(3), - xOffset(0), - yOffset(0) -{ - remGlyphs = numGlyphs = face.GlyphCount(); -} - - -FTGLTextureFont::FTGLTextureFont( const unsigned char *pBufferBytes, size_t bufferSizeInBytes) -: FTFont( pBufferBytes, bufferSizeInBytes), - maxTextSize(0), - textureWidth(0), - textureHeight(0), - glyphHeight(0), - glyphWidth(0), - padding(3), - xOffset(0), - yOffset(0) -{ - remGlyphs = numGlyphs = face.GlyphCount(); -} - - -FTGLTextureFont::~FTGLTextureFont() -{ - glDeleteTextures( textureIDList.size(), (const GLuint*)&textureIDList[0]); -} - - -FTGlyph* FTGLTextureFont::MakeGlyph( unsigned int glyphIndex) -{ - FT_GlyphSlot ftGlyph = face.Glyph( glyphIndex, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP); - - if( ftGlyph) - { - glyphHeight = static_cast( charSize.Height()); - glyphWidth = static_cast( charSize.Width()); - - if( textureIDList.empty()) - { - textureIDList.push_back( CreateTexture()); - xOffset = yOffset = padding; - } - - if( xOffset > ( textureWidth - glyphWidth)) - { - xOffset = padding; - yOffset += glyphHeight; - - if( yOffset > ( textureHeight - glyphHeight)) - { - textureIDList.push_back( CreateTexture()); - yOffset = padding; - } - } - - FTTextureGlyph* tempGlyph = new FTTextureGlyph( ftGlyph, textureIDList[textureIDList.size() - 1], - xOffset, yOffset, textureWidth, textureHeight); - xOffset += static_cast( tempGlyph->BBox().upperX - tempGlyph->BBox().lowerX + padding); - - --remGlyphs; - return tempGlyph; - } - - err = face.Error(); - return NULL; -} - - -void FTGLTextureFont::CalculateTextureSize() -{ - if( !maxTextSize) - { - glGetIntegerv( GL_MAX_TEXTURE_SIZE, (GLint*)&maxTextSize); - } - - textureWidth = NextPowerOf2( (remGlyphs * glyphWidth) + ( padding * 2)); - if( textureWidth > maxTextSize) - { - textureWidth = maxTextSize; - } - - int h = static_cast( (textureWidth - ( padding * 2)) / glyphWidth); - - textureHeight = NextPowerOf2( (( numGlyphs / h) + 1) * glyphHeight); - textureHeight = textureHeight > maxTextSize ? maxTextSize : textureHeight; -} - - -GLuint FTGLTextureFont::CreateTexture() -{ - CalculateTextureSize(); - - int totalMemory = textureWidth * textureHeight; - unsigned char* textureMemory = new unsigned char[totalMemory]; - memset( textureMemory, 0, totalMemory); - - GLuint textID; - glGenTextures( 1, (GLuint*)&textID); - - glBindTexture( GL_TEXTURE_2D, textID); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexImage2D( GL_TEXTURE_2D, 0, GL_ALPHA, textureWidth, textureHeight, 0, GL_ALPHA, GL_UNSIGNED_BYTE, textureMemory); - - delete [] textureMemory; - - return textID; -} - - -bool FTGLTextureFont::FaceSize( const unsigned int size, const unsigned int res) -{ - if( !textureIDList.empty()) - { - glDeleteTextures( textureIDList.size(), (const GLuint*)&textureIDList[0]); - remGlyphs = numGlyphs = face.GlyphCount(); - } - - return FTFont::FaceSize( size, res); -} - - -void FTGLTextureFont::Render( const char* string) -{ -// glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT); - - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE - - FTFont::Render( string); - -// glPopAttrib(); -} - - -void FTGLTextureFont::Render( const wchar_t* string) -{ -// glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT); - - glEnable(GL_BLEND); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE - - FTFont::Render( string); - -// glPopAttrib(); -} - diff --git a/extern/bFTGL/src/FTGlyph.cpp b/extern/bFTGL/src/FTGlyph.cpp deleted file mode 100644 index c68632949c2..00000000000 --- a/extern/bFTGL/src/FTGlyph.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "FTGlyph.h" - - -FTGlyph::FTGlyph( FT_GlyphSlot glyph) -: advance(0.0f), - err(0) -{ - if( glyph) - { - bBox = FTBBox( glyph); - advance = static_cast( glyph->advance.x) / 64.0f; - } -} - - -FTGlyph::~FTGlyph() -{} diff --git a/extern/bFTGL/src/FTGlyphContainer.cpp b/extern/bFTGL/src/FTGlyphContainer.cpp deleted file mode 100644 index 2c1881bbfff..00000000000 --- a/extern/bFTGL/src/FTGlyphContainer.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "FTGlyphContainer.h" -#include "FTGlyph.h" -#include "FTFace.h" -#include "FTCharmap.h" - - -FTGlyphContainer::FTGlyphContainer( FTFace* f) -: face(f), - err(0) -{ - glyphs.push_back( NULL); - charMap = new FTCharmap( face); -} - - -FTGlyphContainer::~FTGlyphContainer() -{ - GlyphVector::iterator glyphIterator; - for( glyphIterator = glyphs.begin(); glyphIterator != glyphs.end(); ++glyphIterator) - { - delete *glyphIterator; - } - - glyphs.clear(); - delete charMap; -} - - -bool FTGlyphContainer::CharMap( FT_Encoding encoding) -{ - bool result = charMap->CharMap( encoding); - err = charMap->Error(); - return result; -} - - -unsigned int FTGlyphContainer::FontIndex( const unsigned int characterCode) const -{ - return charMap->FontIndex( characterCode); -} - - -void FTGlyphContainer::Add( FTGlyph* tempGlyph, const unsigned int characterCode) -{ - charMap->InsertIndex( characterCode, glyphs.size()); - glyphs.push_back( tempGlyph); -} - - -const FTGlyph* const FTGlyphContainer::Glyph( const unsigned int characterCode) const -{ - signed int index = charMap->GlyphListIndex( characterCode); - return glyphs[index]; -} - - -FTBBox FTGlyphContainer::BBox( const unsigned int characterCode) const -{ - return glyphs[charMap->GlyphListIndex( characterCode)]->BBox(); -} - - -float FTGlyphContainer::Advance( const unsigned int characterCode, const unsigned int nextCharacterCode) -{ - unsigned int left = charMap->FontIndex( characterCode); - unsigned int right = charMap->FontIndex( nextCharacterCode); - - float width = face->KernAdvance( left, right).x; - width += glyphs[charMap->GlyphListIndex( characterCode)]->Advance(); - - return width; -} - - -FTPoint FTGlyphContainer::Render( const unsigned int characterCode, const unsigned int nextCharacterCode, FTPoint penPosition) -{ - FTPoint kernAdvance; - float advance = 0; - - unsigned int left = charMap->FontIndex( characterCode); - unsigned int right = charMap->FontIndex( nextCharacterCode); - - kernAdvance = face->KernAdvance( left, right); - - if( !face->Error()) - { - advance = glyphs[charMap->GlyphListIndex( characterCode)]->Render( penPosition); - } - - kernAdvance.x = advance + kernAdvance.x; -// kernAdvance.y = advance.y + kernAdvance.y; - return kernAdvance; -} diff --git a/extern/bFTGL/src/FTLibrary.cpp b/extern/bFTGL/src/FTLibrary.cpp deleted file mode 100644 index 29ab5ae2693..00000000000 --- a/extern/bFTGL/src/FTLibrary.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "FTLibrary.h" - - -FTLibrary& FTLibrary::Instance() -{ - static FTLibrary ftlib; - return ftlib; -} - - -FTLibrary::~FTLibrary() -{ - if( library != 0) - { - FT_Done_FreeType( *library); - - delete library; - library= 0; - } - -// if( manager != 0) -// { -// FTC_Manager_Done( manager ); -// -// delete manager; -// manager= 0; -// } -} - - -FTLibrary::FTLibrary() -: library(0), - err(0) -{ - Initialise(); -} - - -bool FTLibrary::Initialise() -{ - if( library != 0) - return true; - - library = new FT_Library; - - err = FT_Init_FreeType( library); - if( err) - { - delete library; - library = 0; - return false; - } - -// FTC_Manager* manager; -// -// if( FTC_Manager_New( lib, 0, 0, 0, my_face_requester, 0, manager ) -// { -// delete manager; -// manager= 0; -// return false; -// } - - return true; -} diff --git a/extern/bFTGL/src/FTOutlineGlyph.cpp b/extern/bFTGL/src/FTOutlineGlyph.cpp deleted file mode 100644 index 340c7804140..00000000000 --- a/extern/bFTGL/src/FTOutlineGlyph.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "FTOutlineGlyph.h" -#include "FTVectoriser.h" - - -FTOutlineGlyph::FTOutlineGlyph( FT_GlyphSlot glyph) -: FTGlyph( glyph), - glList(0) -{ - if( ft_glyph_format_outline != glyph->format) - { - err = 0x14; // Invalid_Outline - return; - } - - FTVectoriser vectoriser( glyph); - - size_t numContours = vectoriser.ContourCount(); - if ( ( numContours < 1) || ( vectoriser.PointCount() < 3)) - { - return; - } - - glList = glGenLists(1); - glNewList( glList, GL_COMPILE); - for( unsigned int c = 0; c < numContours; ++c) - { - const FTContour* contour = vectoriser.Contour(c); - - glBegin( GL_LINE_LOOP); - for( unsigned int p = 0; p < contour->PointCount(); ++p) - { - glVertex2f( contour->Point(p).x / 64.0f, contour->Point(p).y / 64.0f); - } - glEnd(); - } - glEndList(); -} - - -FTOutlineGlyph::~FTOutlineGlyph() -{ - glDeleteLists( glList, 1); -} - - -float FTOutlineGlyph::Render( const FTPoint& pen) -{ - if( glList) - { - glTranslatef( pen.x, pen.y, 0); - glCallList( glList); - glTranslatef( -pen.x, -pen.y, 0); - } - - return advance; -} - diff --git a/extern/bFTGL/src/FTPixmapGlyph.cpp b/extern/bFTGL/src/FTPixmapGlyph.cpp deleted file mode 100644 index b051a06b6e3..00000000000 --- a/extern/bFTGL/src/FTPixmapGlyph.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include "FTPixmapGlyph.h" - -FTPixmapGlyph::FTPixmapGlyph( FT_GlyphSlot glyph) -: FTGlyph( glyph), - destWidth(0), - destHeight(0), - data(0) -{ - err = FT_Render_Glyph( glyph, FT_RENDER_MODE_NORMAL); - if( err || ft_glyph_format_bitmap != glyph->format) - { - return; - } - - FT_Bitmap bitmap = glyph->bitmap; - - //check the pixel mode - //ft_pixel_mode_grays - - int srcWidth = bitmap.width; - int srcHeight = bitmap.rows; - - // FIXME What about dest alignment? - destWidth = srcWidth; - destHeight = srcHeight; - - if( destWidth && destHeight) - { - data = new unsigned char[destWidth * destHeight * 4]; - - // Get the current glColor. - float ftglColour[4]; -// glGetFloatv( GL_CURRENT_COLOR, ftglColour); - ftglColour[0] = ftglColour[1] = ftglColour[2] = ftglColour[3] = 1.0; - - unsigned char redComponent = static_cast( ftglColour[0] * 255.0f); - unsigned char greenComponent = static_cast( ftglColour[1] * 255.0f); - unsigned char blueComponent = static_cast( ftglColour[2] * 255.0f); - - unsigned char* src = bitmap.buffer; - - unsigned char* dest = data + ((destHeight - 1) * destWidth) * 4; - size_t destStep = destWidth * 4 * 2; - - if( ftglColour[3] == 1.0f) - { - for( int y = 0; y < srcHeight; ++y) - { - for( int x = 0; x < srcWidth; ++x) - { - *dest++ = redComponent; - *dest++ = greenComponent; - *dest++ = blueComponent; - *dest++ = *src++; - } - dest -= destStep; - } - } - else - { - for( int y = 0; y < srcHeight; ++y) - { - for( int x = 0; x < srcWidth; ++x) - { - *dest++ = redComponent; - *dest++ = greenComponent; - *dest++ = blueComponent; - *dest++ = static_cast(ftglColour[3] * *src++); - } - dest -= destStep; - } - } - - destHeight = srcHeight; - } - - pos.x = glyph->bitmap_left; - pos.y = srcHeight - glyph->bitmap_top; -} - - -FTPixmapGlyph::~FTPixmapGlyph() -{ - delete [] data; -} - -#include -float FTPixmapGlyph::Render( const FTPoint& pen) -{ - if( data) - { - float dx, dy; - - dx= floor( (pen.x + pos.x ) ); - dy= ( (pen.y - pos.y ) ); - - // Move the glyph origin - glBitmap( 0, 0, 0.0f, 0.0f, dx, dy, (const GLubyte*)0); - - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0); - - glDrawPixels( destWidth, destHeight, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid*)data); - - // Restore the glyph origin - glBitmap( 0, 0, 0.0f, 0.0f, -dx, -dy, (const GLubyte*)0); - } - - return advance; -} diff --git a/extern/bFTGL/src/FTPoint.cpp b/extern/bFTGL/src/FTPoint.cpp deleted file mode 100644 index e4678bc9564..00000000000 --- a/extern/bFTGL/src/FTPoint.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "FTPoint.h" - - -bool operator == ( const FTPoint &a, const FTPoint &b) -{ - return((a.x == b.x) && (a.y == b.y) && (a.z == b.z)); -} - -bool operator != ( const FTPoint &a, const FTPoint &b) -{ - return((a.x != b.x) || (a.y != b.y) || (a.z != b.z)); -} - - diff --git a/extern/bFTGL/src/FTPolyGlyph.cpp b/extern/bFTGL/src/FTPolyGlyph.cpp deleted file mode 100644 index 7e0d695493c..00000000000 --- a/extern/bFTGL/src/FTPolyGlyph.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "FTPolyGlyph.h" -#include "FTVectoriser.h" - - -FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph) -: FTGlyph( glyph), - glList(0) -{ - if( ft_glyph_format_outline != glyph->format) - { - err = 0x14; // Invalid_Outline - return; - } - - FTVectoriser vectoriser( glyph); - - if(( vectoriser.ContourCount() < 1) || ( vectoriser.PointCount() < 3)) - { - return; - } - - vectoriser.MakeMesh( 1.0); - - glList = glGenLists( 1); - glNewList( glList, GL_COMPILE); - - const FTMesh* mesh = vectoriser.GetMesh(); - for( unsigned int index = 0; index < mesh->TesselationCount(); ++index) - { - const FTTesselation* subMesh = mesh->Tesselation( index); - unsigned int polyonType = subMesh->PolygonType(); - - glBegin( polyonType); - for( unsigned int x = 0; x < subMesh->PointCount(); ++x) - { - glVertex3f( subMesh->Point(x).x / 64.0f, - subMesh->Point(x).y / 64.0f, - 0.0f); - } - glEnd(); - } - glEndList(); -} - - -FTPolyGlyph::~FTPolyGlyph() -{ - glDeleteLists( glList, 1); -} - - -float FTPolyGlyph::Render( const FTPoint& pen) -{ - if( glList) - { - glTranslatef( pen.x, pen.y, 0); - glCallList( glList); - glTranslatef( -pen.x, -pen.y, 0); - } - - return advance; -} diff --git a/extern/bFTGL/src/FTSize.cpp b/extern/bFTGL/src/FTSize.cpp deleted file mode 100644 index 5fb8ffba157..00000000000 --- a/extern/bFTGL/src/FTSize.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "FTSize.h" - - -FTSize::FTSize() -: ftFace(0), - ftSize(0), - size(0), - err(0) -{} - - -FTSize::~FTSize() -{} - - -bool FTSize::CharSize( FT_Face* face, unsigned int point_size, unsigned int x_resolution, unsigned int y_resolution ) -{ - err = FT_Set_Char_Size( *face, 0L, point_size * 64, x_resolution, y_resolution); - - if( !err) - { - ftFace = face; - size = point_size; - ftSize = (*ftFace)->size; - } - else - { - ftFace = 0; - size = 0; - ftSize = 0; - } - - return !err; -} - - -unsigned int FTSize::CharSize() const -{ - return size; -} - - -float FTSize::Ascender() const -{ - return ftSize == 0 ? 0.0f : static_cast( ftSize->metrics.ascender) / 64.0f; -} - - -float FTSize::Descender() const -{ - return ftSize == 0 ? 0.0f : static_cast( ftSize->metrics.descender) / 64.0f; -} - - -float FTSize::Height() const -{ - if( 0 == ftSize) - { - return 0.0f; - } - - if( FT_IS_SCALABLE((*ftFace))) - { - return ( (*ftFace)->bbox.yMax - (*ftFace)->bbox.yMin) * ( (float)ftSize->metrics.y_ppem / (float)(*ftFace)->units_per_EM); - } - else - { - return static_cast( ftSize->metrics.height) / 64.0f; - } -} - - -float FTSize::Width() const -{ - if( 0 == ftSize) - { - return 0.0f; - } - - if( FT_IS_SCALABLE((*ftFace))) - { - return ( (*ftFace)->bbox.xMax - (*ftFace)->bbox.xMin) * ( static_cast(ftSize->metrics.x_ppem) / static_cast((*ftFace)->units_per_EM)); - } - else - { - return static_cast( ftSize->metrics.max_advance) / 64.0f; - } -} - - -float FTSize::Underline() const -{ - return 0.0f; -} - -unsigned int FTSize::XPixelsPerEm() const -{ - return ftSize == 0 ? 0 : ftSize->metrics.x_ppem; -} - -unsigned int FTSize::YPixelsPerEm() const -{ - return ftSize == 0 ? 0 : ftSize->metrics.y_ppem; -} - diff --git a/extern/bFTGL/src/FTTextureGlyph.cpp b/extern/bFTGL/src/FTTextureGlyph.cpp deleted file mode 100644 index b8267dcce89..00000000000 --- a/extern/bFTGL/src/FTTextureGlyph.cpp +++ /dev/null @@ -1,87 +0,0 @@ -#include "FTTextureGlyph.h" - - -FTTextureGlyph::FTTextureGlyph( FT_GlyphSlot glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height) -: FTGlyph( glyph), - destWidth(0), - destHeight(0), - glTextureID(id), - activeTextureID(0) -{ - err = FT_Render_Glyph( glyph, FT_RENDER_MODE_NORMAL); - if( err || glyph->format != ft_glyph_format_bitmap) - { - return; - } - - FT_Bitmap bitmap = glyph->bitmap; - - destWidth = bitmap.width; - destHeight = bitmap.rows; - - if( destWidth && destHeight) - { - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT); - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1); - - glBindTexture( GL_TEXTURE_2D, glTextureID); - glTexSubImage2D( GL_TEXTURE_2D, 0, xOffset, yOffset, destWidth, destHeight, GL_ALPHA, GL_UNSIGNED_BYTE, bitmap.buffer); - - glPopClientAttrib(); - } - - -// 0 -// +----+ -// | | -// | | -// | | -// +----+ -// 1 - - uv[0].x = static_cast(xOffset) / static_cast(width); - uv[0].y = static_cast(yOffset) / static_cast(height); - uv[1].x = static_cast( xOffset + destWidth) / static_cast(width); - uv[1].y = static_cast( yOffset + destHeight) / static_cast(height); - - pos.x = glyph->bitmap_left; - pos.y = glyph->bitmap_top; -} - - -FTTextureGlyph::~FTTextureGlyph() -{} - -#include - -float FTTextureGlyph::Render( const FTPoint& pen) -{ - float dx; - - glGetIntegerv( GL_TEXTURE_2D_BINDING_EXT, &activeTextureID); - if( activeTextureID != glTextureID) - { - glBindTexture( GL_TEXTURE_2D, (GLuint)glTextureID); - } - - dx= floor( (pen.x + pos.x ) ); - - glBegin( GL_QUADS); - glTexCoord2f( uv[0].x, uv[0].y); - glVertex2f( dx, pen.y + pos.y); - - glTexCoord2f( uv[0].x, uv[1].y); - glVertex2f( dx, pen.y + pos.y - destHeight); - - glTexCoord2f( uv[1].x, uv[1].y); - glVertex2f( dx + destWidth, pen.y + pos.y - destHeight); - - glTexCoord2f( uv[1].x, uv[0].y); - glVertex2f( dx + destWidth, pen.y + pos.y); - glEnd(); - - return advance; -} - diff --git a/extern/bFTGL/src/FTVectoriser.cpp b/extern/bFTGL/src/FTVectoriser.cpp deleted file mode 100644 index 82dcb0c0f51..00000000000 --- a/extern/bFTGL/src/FTVectoriser.cpp +++ /dev/null @@ -1,229 +0,0 @@ -#include "FTVectoriser.h" -#include "FTGL.h" - -#ifndef CALLBACK -#define CALLBACK -#endif - -#if defined(__APPLE_CC__) - #if __APPLE_CC__ >= 5465 - typedef GLvoid (*GLUTesselatorFunction)(); - #else - typedef GLvoid (*GLUTesselatorFunction)(...); - #endif -#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) - typedef GLvoid (*GLUTesselatorFunction)(); -#elif defined ( WIN32) - typedef GLvoid (CALLBACK *GLUTesselatorFunction)( ); -#else - #error "Error - need to define type GLUTesselatorFunction for this platform/compiler" -#endif - - -void CALLBACK ftglError( GLenum errCode, FTMesh* mesh) -{ - mesh->Error( errCode); -} - - -void CALLBACK ftglVertex( void* data, FTMesh* mesh) -{ - FTGL_DOUBLE* vertex = static_cast(data); - mesh->AddPoint( vertex[0], vertex[1], vertex[2]); -} - - -void CALLBACK ftglCombine( FTGL_DOUBLE coords[3], void* vertex_data[4], GLfloat weight[4], void** outData, FTMesh* mesh) -{ - FTGL_DOUBLE* vertex = static_cast(coords); - *outData = mesh->Combine( vertex[0], vertex[1], vertex[2]); -} - - -void CALLBACK ftglBegin( GLenum type, FTMesh* mesh) -{ - mesh->Begin( type); -} - - -void CALLBACK ftglEnd( FTMesh* mesh) -{ - mesh->End(); -} - - -FTMesh::FTMesh() -: currentTesselation(0), - err(0) -{ - tesselationList.reserve( 16); -} - - -FTMesh::~FTMesh() -{ - for( size_t t = 0; t < tesselationList.size(); ++t) - { - delete tesselationList[t]; - } - - tesselationList.clear(); -} - - -void FTMesh::AddPoint( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z) -{ - currentTesselation->AddPoint( x, y, z); -} - - -FTGL_DOUBLE* FTMesh::Combine( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z) -{ - tempPointList.push_back( FTPoint( x, y,z)); - return &tempPointList.back().x; -} - - -void FTMesh::Begin( GLenum meshType) -{ - currentTesselation = new FTTesselation( meshType); -} - - -void FTMesh::End() -{ - tesselationList.push_back( currentTesselation); -} - - -const FTTesselation* const FTMesh::Tesselation( unsigned int index) const -{ - return ( index < tesselationList.size()) ? tesselationList[index] : NULL; -} - - -FTVectoriser::FTVectoriser( const FT_GlyphSlot glyph) -: contourList(0), - mesh(0), - ftContourCount(0), - contourFlag(0) -{ - if( glyph) - { - outline = glyph->outline; - - ftContourCount = outline.n_contours;; - contourList = 0; - contourFlag = outline.flags; - - ProcessContours(); - } -} - - -FTVectoriser::~FTVectoriser() -{ - for( size_t c = 0; c < ContourCount(); ++c) - { - delete contourList[c]; - } - - delete [] contourList; - delete mesh; -} - - -void FTVectoriser::ProcessContours() -{ - short contourLength = 0; - short startIndex = 0; - short endIndex = 0; - - contourList = new FTContour*[ftContourCount]; - - for( short contourIndex = 0; contourIndex < ftContourCount; ++contourIndex) - { - FT_Vector* pointList = &outline.points[startIndex]; - char* tagList = &outline.tags[startIndex]; - - endIndex = outline.contours[contourIndex]; - contourLength = ( endIndex - startIndex) + 1; - - FTContour* contour = new FTContour( pointList, tagList, contourLength); - - contourList[contourIndex] = contour; - - startIndex = endIndex + 1; - } -} - - -size_t FTVectoriser::PointCount() -{ - size_t s = 0; - for( size_t c = 0; c < ContourCount(); ++c) - { - s += contourList[c]->PointCount(); - } - - return s; -} - - -const FTContour* const FTVectoriser::Contour( unsigned int index) const -{ - return ( index < ContourCount()) ? contourList[index] : NULL; -} - - -void FTVectoriser::MakeMesh( FTGL_DOUBLE zNormal) -{ - if( mesh) - { - delete mesh; - } - - mesh = new FTMesh; - - GLUtesselator* tobj = gluNewTess(); - - gluTessCallback( tobj, GLU_TESS_BEGIN_DATA, (GLUTesselatorFunction)ftglBegin); - gluTessCallback( tobj, GLU_TESS_VERTEX_DATA, (GLUTesselatorFunction)ftglVertex); - gluTessCallback( tobj, GLU_TESS_COMBINE_DATA, (GLUTesselatorFunction)ftglCombine); - gluTessCallback( tobj, GLU_TESS_END_DATA, (GLUTesselatorFunction)ftglEnd); - gluTessCallback( tobj, GLU_TESS_ERROR_DATA, (GLUTesselatorFunction)ftglError); - - if( contourFlag & ft_outline_even_odd_fill) // ft_outline_reverse_fill - { - gluTessProperty( tobj, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_ODD); - } - else - { - gluTessProperty( tobj, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_NONZERO); - } - - - gluTessProperty( tobj, GLU_TESS_TOLERANCE, 0); - gluTessNormal( tobj, 0.0f, 0.0f, zNormal); - gluTessBeginPolygon( tobj, mesh); - - for( size_t c = 0; c < ContourCount(); ++c) - { - const FTContour* contour = contourList[c]; - - gluTessBeginContour( tobj); - - for( size_t p = 0; p < contour->PointCount(); ++p) - { - FTGL_DOUBLE* d = const_cast(&contour->Point(p).x); - gluTessVertex( tobj, d, d); - } - - gluTessEndContour( tobj); - } - - gluTessEndPolygon( tobj); - - gluDeleteTess( tobj); -} - diff --git a/extern/bFTGL/src/Makefile b/extern/bFTGL/src/Makefile deleted file mode 100644 index d91bcb2559d..00000000000 --- a/extern/bFTGL/src/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): GSR -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = ftgl -DIR = $(OCGDIR)/extern/$(LIBNAME) - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CSRCS = -CCSRCS = FTBitmapGlyph.cpp FTCharmap.cpp FTContour.cpp FTExtrdGlyph.cpp \ - FTFace.cpp FTFont.cpp FTGLBitmapFont.cpp FTGLExtrdFont.cpp \ - FTGLOutlineFont.cpp FTGLPixmapFont.cpp FTGLPolygonFont.cpp \ - FTGLTextureFont.cpp FTGlyph.cpp FTGlyphContainer.cpp FTLibrary.cpp \ - FTOutlineGlyph.cpp FTPixmapGlyph.cpp FTPoint.cpp FTPolyGlyph.cpp \ - FTSize.cpp FTTextureGlyph.cpp FTVectoriser.cpp - -include nan_compile.mk -CPPFLAGS += -I../include -CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2 -CPPFLAGS += -I$(OPENGL_HEADERS) - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL) - @[ -d $(NAN_FTGL)/include ] || mkdir -p $(NAN_FTGL)/include - @[ -d $(NAN_FTGL)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_FTGL)/lib/$(DEBUG_DIR) - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_FTGL)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_FTGL)/lib/$(DEBUG_DIR)lib$(LIBNAME).a -endif - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/*.h $(NAN_FTGL)/include/ - diff --git a/extern/bFTGL/win32_vcpp/README_WIN32.txt b/extern/bFTGL/win32_vcpp/README_WIN32.txt deleted file mode 100644 index bc92bbb9591..00000000000 --- a/extern/bFTGL/win32_vcpp/README_WIN32.txt +++ /dev/null @@ -1,206 +0,0 @@ -FTGL 1.31 - -NOTES FOR COMPILING ON WINDOWS - -14 Feb 2002 - -Ellers, ellers@iinet.net.au - - - - - -SUPPORTED COMPILERS - - - -I have rebuilt the FTGL project files for Visual C++ (version 6). There are - -presently no other compilers or environments supported but feel free to - -contribute them. - - - - - -QUICK GUIDE: COMPILING FTGL - - - - - Start up MSVC++ with ftgl.dsw. - - - Tell MSVC++ where FreeType is. You'll need to do something like this: - - - - * select Project>Settings - - * select ftgl_static (for a start) - - * select "All Configurations" - - * go to the tab C++ > PreProcessor - - * Set additional include directories appropriately. For me it is: - - D:\cots\freetype-2.0.5\include - - * repeat for all configurations of ftgl_dll - - - - - -QUICK GUIDE: COMPILING/RUNNING SUPPLIED DEMO PROGRAM - - - - - The program expects the first argument to be the name of a truetype file. - - I copied timesbi.ttf from the windows directory to C:\TEMP and then edit - - the settings of the project: - - - - * select Project>Settings - - * select Demo project - - * select panel Debug>General - - * set Program Arguments to be "C:\TEMP\timesbi.ttf" - - - - - -QUICK GUIDE: COMPILING YOUR PROGRAM TO USE FTGL - - - - - Choose dynamic or static library linkage - - * if you want to link to a static FTGL library ensure that - - FTGL_LIBRARY_STATIC is defined in the preprocessor section - - - - - -CONFIGURATION / CODE GENERATION / C LIBRARIES - - - -FTGL can be built in various configurations (inspired by Freetype and libpng): - - - - - static library (.lib) - - - dynamic library (.dll) - - - -MSVC++ requires selection of "code generation" option, which seems to be - -mostly to do with which version of the Standard C library is linked with the - -library. - - - -The following modes are supported: - - - - - static/dynamic - - - single threaded (ST) or multithreaded (MT) - - NOTE: the multithreaded DLL (MD) mode was NOT included, as freetype itself - - doesn't support that mode so I figure there's no point yet. - - - debug/release (debug has _d suffix) - - - -So the static multithreaded release library is: - - - - ftgl_static_MT.lib - - - -The same library built in DEBUG mode: - - - - ftgl_static_MT_d.lib - - - -If you're not sure which one is appropriate (and if you're a novice don't - -been too put off...) start with making the decision about debug or release. - -This should be easy because if you're building the debug version of your - -app its probably a good idea to link with the debug version of FTGL (but - -not compulsory). Once thats done, you may get errors like: - - - - LIBCMTD.lib(crt0init.obj) : warning LNK4098: defaultlib "libcmt.lib" conflicts with use of other libs; use /NODEFAULTLIB:library - - - -This will happen, for example, when you link a glut app with an FTGL library - -compiled with different codegen options than the GLUT library. - - - -MSVC++ "sort of" - -requires that all libs be linked with the same codegen option. GLUT is built - -in XXX mode, so if you're linking with GLUT, you can get rid of the warning - -by linking with the XXX version of FTGL. The various versions are particularly - -useful if you're doing std C stuff, like printf etc. - - - - - - - -FAQ - - - -Q: "But... do I HAVE to use all these DIFFERENT build modes, like multi- - - threaded, debug single threaded, etc?" - - - -A: No. Sometimes library makers only generate one style anyway. It depends - - on your needs. Unless you're linking with standard C stuff (e.g. printf) - - then it probably won't make a great deal of difference. If you get - - warnings about "default lib libcmt.lib conflicts" etc, then you can make - - use of the different libraries. - - - diff --git a/extern/bFTGL/win32_vcpp/ftgl.dsw b/extern/bFTGL/win32_vcpp/ftgl.dsw deleted file mode 100644 index 17b8fbe6f12..00000000000 --- a/extern/bFTGL/win32_vcpp/ftgl.dsw +++ /dev/null @@ -1,92 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ftgl_demo"=".\ftgl_demo\ftgl_demo.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ftgl_dll - End Project Dependency - Begin Project Dependency - Project_Dep_Name ftgl_static_lib - End Project Dependency -}}} - -############################################################################### - -Project: "ftgl_demo_2"=".\ftgl_demo\ftgl_demo_2.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ftgl_dll - End Project Dependency - Begin Project Dependency - Project_Dep_Name ftgl_static_lib - End Project Dependency -}}} - -############################################################################### - -Project: "ftgl_dll"=".\ftgl_dll\ftgl_dll.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ftgl_static_lib"=".\ftgl_static_lib\ftgl_static_lib.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "unit_tests"=".\unit_tests\unit_tests.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ftgl_static_lib - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp b/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp deleted file mode 100644 index 7e297df9111..00000000000 --- a/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp +++ /dev/null @@ -1,357 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftgl_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ftgl_dll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftgl_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftgl_dll.mak" CFG="ftgl_dll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftgl_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ftgl_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ftgl_dll - Win32 Release MT" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ftgl_dll - Win32 Debug MT" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftgl_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_ST" -# PROP BASE Intermediate_Dir "Release_ST" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Build" -# PROP Intermediate_Dir "Release_ST" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "../Build" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204.lib /nologo /dll /machine:I386 /out:"../Build/ftgl_dynamic_MT.dll" /libpath:"D:\cots\freetype-2.0.5\objs" - -!ELSEIF "$(CFG)" == "ftgl_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_ST" -# PROP BASE Intermediate_Dir "Debug_ST" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Build" -# PROP Intermediate_Dir "Debug_ST" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "../Build" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204_D.lib /nologo /dll /pdb:"Debug_ST/ftgl_dynamic_ST_d.pdb" /debug /machine:I386 /out:"../Build/ftgl_dynamic_MT_d.dll" /pdbtype:sept /libpath:"D:\cots\freetype-2.0.5\objs" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ftgl_dll - Win32 Release MT" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_MT" -# PROP BASE Intermediate_Dir "Release_MT" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Build" -# PROP Intermediate_Dir "Release_MT" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "../Build" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204MT.lib /nologo /dll /machine:I386 /out:"../Build/ftgl_dynamic_MTD.dll" /libpath:"D:\cots\freetype-2.0.5\objs" - -!ELSEIF "$(CFG)" == "ftgl_dll - Win32 Debug MT" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_MT" -# PROP BASE Intermediate_Dir "Debug_MT" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Build" -# PROP Intermediate_Dir "Debug_MT" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "../Build" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204MT_D.lib /nologo /dll /pdb:"Debug_ST/ftgl_dynamic_MT_d.pdb" /debug /machine:I386 /out:"../Build/ftgl_dynamic_MTD_d.dll" /pdbtype:sept /libpath:"D:\cots\freetype-2.0.5\objs" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "ftgl_dll - Win32 Release" -# Name "ftgl_dll - Win32 Debug" -# Name "ftgl_dll - Win32 Release MT" -# Name "ftgl_dll - Win32 Debug MT" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\FTBitmapGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTCharmap.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTContour.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTExtrdGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTFace.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLBitmapFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLExtrdFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLOutlineFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLPixmapFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLPolygonFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLTextureFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGlyphContainer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTLibrary.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTOutlineGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPixmapGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPoint.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPolyGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTSize.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTTextureGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTVectoriser.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\FTBBox.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTBitmapGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTCharmap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTCharToGlyphIndexMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTContour.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTExtrdGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTFace.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGL.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLBitmapFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLExtrdFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLOutlineFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLPixmapFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLPolygonFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLTextureFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGlyphContainer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTLibrary.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTList.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTOutlineGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPixmapGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPoint.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPolyGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTSize.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTTextureGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTVector.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTVectoriser.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp b/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp deleted file mode 100644 index bc2c77cb0b6..00000000000 --- a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp +++ /dev/null @@ -1,342 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftgl_static_lib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=ftgl_static_lib - Win32 Debug MT -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftgl_static_lib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftgl_static_lib.mak" CFG="ftgl_static_lib - Win32 Debug MT" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftgl_static_lib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ftgl_static_lib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "ftgl_static_lib - Win32 Debug MT" (based on "Win32 (x86) Static Library") -!MESSAGE "ftgl_static_lib - Win32 Release MT" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftgl_static_lib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_ST" -# PROP BASE Intermediate_Dir "Release_ST" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_ST" -# PROP Intermediate_Dir "Release_ST" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\include" /I "..\..\..\..\..\lib\windows\freetype\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\Build\ftgl_static_ST.lib" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=ECHO Copying lib to lib\windows\ftgl\lib XCOPY /Y ..\Build\*lib ..\..\..\..\..\lib\windows\ftgl\lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ftgl_static_lib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_ST" -# PROP BASE Intermediate_Dir "Debug_ST" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_ST" -# PROP Intermediate_Dir "Debug_ST" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MT_d.lib" - -!ELSEIF "$(CFG)" == "ftgl_static_lib - Win32 Debug MT" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_MT" -# PROP BASE Intermediate_Dir "Debug_MT" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_MT" -# PROP Intermediate_Dir "Debug_MT" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MTD_d.lib" - -!ELSEIF "$(CFG)" == "ftgl_static_lib - Win32 Release MT" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_MT" -# PROP BASE Intermediate_Dir "Release_MT" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_MT" -# PROP Intermediate_Dir "Release_MT" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MTD.lib" - -!ENDIF - -# Begin Target - -# Name "ftgl_static_lib - Win32 Release" -# Name "ftgl_static_lib - Win32 Debug" -# Name "ftgl_static_lib - Win32 Debug MT" -# Name "ftgl_static_lib - Win32 Release MT" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\FTBitmapGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTCharmap.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTContour.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTExtrdGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTFace.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLBitmapFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLExtrdFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLOutlineFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLPixmapFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLPolygonFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGLTextureFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTGlyphContainer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTLibrary.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTOutlineGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPixmapGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPoint.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTPolyGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTSize.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTTextureGlyph.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\FTVectoriser.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\FTBBox.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTBitmapGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTCharmap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTCharToGlyphIndexMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTContour.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTExtrdGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTFace.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGL.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLBitmapFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLExtrdFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLOutlineFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLPixmapFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLPolygonFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGLTextureFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTGlyphContainer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTLibrary.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTList.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTOutlineGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPixmapGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPoint.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTPolyGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTSize.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTTextureGlyph.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTVector.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\FTVectoriser.h -# End Source File -# End Group -# End Target -# End Project diff --git a/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp b/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp deleted file mode 100644 index f68dfe9b2d8..00000000000 --- a/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp +++ /dev/null @@ -1,168 +0,0 @@ -# Microsoft Developer Studio Project File - Name="unit_tests" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=unit_tests - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "unit_tests.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "unit_tests.mak" CFG="unit_tests - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "unit_tests - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "unit_tests - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "unit_tests - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(MIC_COTS_CPPUNIT_DIR)/include" /I "../../include" /I "../../extras" /I "D:\cots\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "FTGL_LIBRARY_STATIC" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 freetype204MT.lib ftgl_static_MT.lib cppunit.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Build" /libpath:"D:\cots\freetype-2.0.5\objs" /libpath:"D:\cots\cppunit-1.9.8\lib" - -!ELSEIF "$(CFG)" == "unit_tests - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(MIC_COTS_CPPUNIT_DIR)/include" /I "../../include" /I "../../extras" /I "D:\cots\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "FTGL_LIBRARY_STATIC" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 freetype204MT_D.lib ftgl_static_MT_d.lib cppunitd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Build" /libpath:"D:\cots\freetype-2.0.5\objs" /libpath:"D:\cots\cppunit-1.9.8\lib" - -!ENDIF - -# Begin Target - -# Name "unit_tests - Win32 Release" -# Name "unit_tests - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\..\test\FTBBox-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTCharmap-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTContour-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTFace-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTFont-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTGlyphContainer-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTLibrary-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTList-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTMesh-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTPoint-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTSize-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTTesselation-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTVector-Test.cpp" -# End Source File -# Begin Source File - -SOURCE="..\..\test\FTVectoriser-Test.cpp" -# End Source File -# Begin Source File - -SOURCE=..\..\test\HPGCalc_afm.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\test\HPGCalc_pfb.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\test\TestMain.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\test\Fontdefs.h -# End Source File -# End Group -# End Target -# End Project diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 81ef8c121d1..1c0d795448c 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(SoundSystem string ghost guardedalloc bmfont moto container memutil decimation iksolver boolop opennl) +SUBDIRS(SoundSystem string ghost guardedalloc moto container memutil decimation iksolver boolop opennl) IF(WITH_ELBEEM) SUBDIRS(elbeem) diff --git a/intern/Makefile b/intern/Makefile index 357e28309e3..995dc56c7d3 100644 --- a/intern/Makefile +++ b/intern/Makefile @@ -31,7 +31,7 @@ SOURCEDIR = intern # include nan_subdirs.mk -ALLDIRS = string ghost guardedalloc bmfont moto container memutil +ALLDIRS = string ghost guardedalloc moto container memutil ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop all:: diff --git a/intern/SConscript b/intern/SConscript index 82c7739bf42..bb8525d5ce5 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -5,7 +5,6 @@ SConscript(['SoundSystem/SConscript', 'string/SConscript', 'ghost/SConscript', 'guardedalloc/SConscript', - 'bmfont/SConscript', 'moto/SConscript', 'container/SConscript', 'memutil/SConscript/', diff --git a/intern/bmfont/BMF_Api.h b/intern/bmfont/BMF_Api.h deleted file mode 100644 index 252f60623a7..00000000000 --- a/intern/bmfont/BMF_Api.h +++ /dev/null @@ -1,162 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * - * API of the OpenGL bitmap font library. - * Currently draws fonts using the glBitmap routine. - * This implies that drawing speed is heavyly dependant on - * the 2D capabilities of the graphics card. - */ - -#ifndef __BMF_API_H -#define __BMF_API_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "BMF_Fonts.h" - -/** - * Returns the font for a given font type. - * @param font The font to retrieve. - * @return The font (or nil if not found). - */ -BMF_Font* BMF_GetFont(BMF_FontType font); - -/** - * Draws a character at the current raster position. - * @param font The font to use. - * @param c The character to draw. - * @return Indication of success (0 == error). - */ -int BMF_DrawCharacter(BMF_Font* font, char c); - -/** - * Draws a string at the current raster position. - * @param font The font to use. - * @param str The string to draw. - * @return Indication of success (0 == error). - */ -int BMF_DrawString(BMF_Font* font, char* str); - -/** - * Returns the width of a character in pixels. - * @param font The font to use. - * @param c The character. - * @return The length. - */ -int BMF_GetCharacterWidth(BMF_Font* font, char c); - -/** - * Returns the width of a string of characters. - * @param font The font to use. - * @param str The string. - * @return The length. - */ -int BMF_GetStringWidth(BMF_Font* font, char* str); - -/** - * Returns the bounding box of a string of characters. - * @param font The font to use. - * @param str The string. - * @param llx Lower left x coord - * @param lly Lower left y coord - * @param urx Upper right x coord - * @param ury Upper right y coord - */ -void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury); - - -/** - * Returns the bounding box of the font. The width and - * height represent the bounding box of the union of - * all glyps. The minimum and maximum values of the - * box represent the extent of the font and its positioning - * about the origin. - */ -void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r); - -/** - * Same as GetFontBoundingBox but only returns the height - */ -int BMF_GetFontHeight(BMF_Font* font); - -/** - * Convert the given @a font to a texture, and return the GL texture - * ID of the texture. If the texture ID is bound, text can - * be drawn using the texture by calling DrawStringTexture. - * - * @param font The font to create the texture from. - * @return The GL texture ID of the new texture, or -1 if unable - * to create. - */ -int BMF_GetFontTexture(BMF_Font* font); - -/** - * Draw the given @a str at the point @a x, @a y, @a z, using - * texture coordinates. This assumes that an appropriate texture - * has been bound, see BMF_BitmapFont::GetTexture(). The string - * is drawn along the positive X axis. - * - * @param font The font to draw with. - * @param string The c-string to draw. - * @param x The x coordinate to start drawing at. - * @param y The y coordinate to start drawing at. - * @param z The z coordinate to start drawing at. - */ -void BMF_DrawStringTexture(BMF_Font* font, char* string, float x, float y, float z); - - /** - * Draw the given @a string at the point @a xpos, @a ypos using - * char and float buffers. - * - * @param string The c-string to draw. - * @param xpos The x coordinate to start drawing at. - * @param ypos The y coordinate to start drawing at. - * @param fgcol The forground color. - * @param bgcol The background color. - * @param buf Unsigned char image buffer, when NULL to not operate on it. - * @param fbuf float image buffer, when NULL to not operate on it. - * @param w image buffer width. - * @param h image buffer height. - * @param channels number of channels in the image (3 or 4 - currently) - */ -void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels); - - -#ifdef __cplusplus -} -#endif - -#endif /* __BMF_API_H */ - diff --git a/intern/bmfont/BMF_Fonts.h b/intern/bmfont/BMF_Fonts.h deleted file mode 100644 index 00a902573fb..00000000000 --- a/intern/bmfont/BMF_Fonts.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Defines the names of the fonts in the library. - */ - -#ifndef __BMF_FONTS_H -#define __BMF_FONTS_H - -#include "BMF_Settings.h" - -typedef enum -{ - BMF_kHelvetica10 = 0, -#if BMF_INCLUDE_HELV12 - BMF_kHelvetica12, -#endif -#if BMF_INCLUDE_HELVB8 - BMF_kHelveticaBold8, -#endif -#if BMF_INCLUDE_HELVB10 - BMF_kHelveticaBold10, -#endif -#if BMF_INCLUDE_HELVB12 - BMF_kHelveticaBold12, -#endif -#if BMF_INCLUDE_HELVB14 - BMF_kHelveticaBold14, -#endif -#if BMF_INCLUDE_SCR12 - BMF_kScreen12, -#endif -#if BMF_INCLUDE_SCR14 - BMF_kScreen14, -#endif -#if BMF_INCLUDE_SCR15 - BMF_kScreen15, -#endif - BMF_kNumFonts -} BMF_FontType; - -typedef struct BMF_Font BMF_Font; - -#endif /* __BMF_FONTS_H */ - diff --git a/intern/bmfont/BMF_Settings.h b/intern/bmfont/BMF_Settings.h deleted file mode 100644 index b599c97d6ee..00000000000 --- a/intern/bmfont/BMF_Settings.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Allows you to determine which fonts to include in the library. - */ - -#ifndef __BMF_SETTINGS_H -#define __BMF_SETTINGS_H - -/* This font is included always */ -#define BMF_INCLUDE_HELV10 1 - -#ifndef BMF_MINIMAL - -/* These fonts are included with the minimal setting defined */ -#define BMF_INCLUDE_HELV12 1 -#define BMF_INCLUDE_HELVB8 1 -#define BMF_INCLUDE_HELVB10 1 -#define BMF_INCLUDE_HELVB12 1 -#define BMF_INCLUDE_HELVB14 1 -#define BMF_INCLUDE_SCR12 1 -#define BMF_INCLUDE_SCR14 1 -#define BMF_INCLUDE_SCR15 1 - -#else /* BMF_MINIMAL */ -#define BMF_INCLUDE_HELV12 0 -#define BMF_INCLUDE_HELVB8 0 -#define BMF_INCLUDE_HELVB10 0 -#define BMF_INCLUDE_HELVB12 0 -#define BMF_INCLUDE_HELVB14 0 -#define BMF_INCLUDE_SCR12 0 -#define BMF_INCLUDE_SCR14 0 -#define BMF_INCLUDE_SCR15 0 - -#endif /* BMF_MINIMAL */ - -#endif /* __BMF_SETTINGS_H */ - diff --git a/intern/bmfont/CMakeLists.txt b/intern/bmfont/CMakeLists.txt deleted file mode 100644 index 3ae636a6097..00000000000 --- a/intern/bmfont/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -SET(INC . intern) - -FILE(GLOB SRC intern/*.cpp) - -BLENDERLIB(bf_bmfont "${SRC}" "${INC}") -#, libtype=['intern','player'], priority = [20, 185] ) diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile deleted file mode 100644 index de0fc715884..00000000000 --- a/intern/bmfont/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# bmfont main makefile. -# - -include nan_definitions.mk - -LIBNAME = bmfont -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not ready yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_BMFONT) ] || mkdir $(NAN_BMFONT) - @[ -d $(NAN_BMFONT)/include ] || mkdir $(NAN_BMFONT)/include - @[ -d $(NAN_BMFONT)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BMFONT)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbmfont.a $(NAN_BMFONT)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a -endif - @../tools/cpifdiff.sh *.h $(NAN_BMFONT)/include/ - diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript deleted file mode 100644 index 4febe2735e7..00000000000 --- a/intern/bmfont/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/python -Import ('env') - -sources = env.Glob('intern/*.cpp') - -incs = '. intern' -incs += ' ' + env['BF_OPENGL_INC'] -defs = '' - -env.BlenderLib ('bf_bmfont', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [20, 185] ) diff --git a/intern/bmfont/intern/BDF2BMF.py b/intern/bmfont/intern/BDF2BMF.py deleted file mode 100644 index 15b9e5b8eb4..00000000000 --- a/intern/bmfont/intern/BDF2BMF.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/python - -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- - -HELP_TXT = \ -''' -Convert BDF pixmap fonts into C++ files Blender can read. -Use to replace bitmap fonts or add new ones. - -Usage - python bdf2bmf.py -name=SomeName myfile.bdf - -Blender currently supports fonts with a maximum width of 8 pixels. -''' - -# -------- Simple BDF parser -import sys -def parse_bdf(f, MAX_CHARS=256): - lines = [l.strip().upper().split() for l in f.readlines()] - - is_bitmap = False - dummy = {'BITMAP':[]} - char_data = [dummy.copy() for i in xrange(MAX_CHARS)] - context_bitmap = [] - - for l in lines: - if l[0]=='ENCODING': enc = int(l[1]) - elif l[0]=='BBX': bbx = [int(c) for c in l[1:]] - elif l[0]=='DWIDTH': dwidth = int(l[1]) - elif l[0]=='BITMAP': is_bitmap = True - elif l[0]=='ENDCHAR': - if enc < MAX_CHARS: - char_data[enc]['BBX'] = bbx - char_data[enc]['DWIDTH'] = dwidth - char_data[enc]['BITMAP'] = context_bitmap - - context_bitmap = [] - enc = bbx = None - is_bitmap = False - else: - # None of the above, Ok, were reading a bitmap - if is_bitmap and enc < MAX_CHARS: - context_bitmap.append( int(l[0], 16) ) - - return char_data -# -------- end simple BDF parser - -def bdf2cpp_name(path): - return path.split('.')[0] + '.cpp' - -def convert_to_blender(bdf_dict, font_name, origfilename, MAX_CHARS=256): - - # first get a global width/height, also set the offsets - xmin = ymin = 10000000 - xmax = ymax = -10000000 - - bitmap_offsets = [-1] * MAX_CHARS - bitmap_tot = 0 - for i, c in enumerate(bdf_dict): - if c.has_key('BBX'): - bbx = c['BBX'] - xmax = max(bbx[0], xmax) - ymax = max(bbx[1], ymax) - xmin = min(bbx[2], xmin) - ymin = min(bbx[3], ymin) - - bitmap_offsets[i] = bitmap_tot - bitmap_tot += len(c['BITMAP']) - - c['BITMAP'].reverse() - - # Now we can write. Ok if we have no .'s in the path. - f = open(bdf2cpp_name(origfilename), 'w') - - f.write(''' -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" - -#include "BMF_Settings.h" -''') - - f.write('#if BMF_INCLUDE_%s\n\n' % font_name.upper()) - f.write('static unsigned char bitmap_data[]= {') - newline = 8 - - for i, c in enumerate(bdf_dict): - - for cdata in c['BITMAP']: - # Just formatting - newline+=1 - if newline >= 8: - newline = 0 - f.write('\n\t') - # End formatting - - f.write('0x%.2hx,' % cdata) # 0x80 <- format - - f.write("\n};\n") - - f.write("BMF_FontData BMF_font_%s = {\n" % font_name) - f.write('\t%d, %d,\n' % (xmin, ymin)) - f.write('\t%d, %d,\n' % (xmax, ymax)) - - f.write('\t{\n') - - - for i, c in enumerate(bdf_dict): - if bitmap_offsets[i] == -1 or c.has_key('BBX') == False: - f.write('\t\t{0,0,0,0,0, -1},\n') - else: - bbx = c['BBX'] - f.write('\t\t{%d,%d,%d,%d,%d, %d},\n' % (bbx[0], bbx[1], -bbx[2], -bbx[3], c['DWIDTH'], bitmap_offsets[i])) - - f.write(''' - }, - bitmap_data -}; - -#endif -''') - -def main(): - # replace "[-name=foo]" with "[-name] [foo]" - args = [] - for arg in sys.argv: - for a in arg.replace('=', ' ').split(): - args.append(a) - - name = 'untitled' - done_anything = False - for i, arg in enumerate(args): - if arg == '-name': - if i==len(args)-1: - print 'no arg given for -name, aborting' - return - else: - name = args[i+1] - - elif arg.lower().endswith('.bdf'): - try: - f = open(arg) - print '...Writing to:', bdf2cpp_name(arg) - except: - print 'could not open "%s", aborting' % arg - - - bdf_dict = parse_bdf(f) - convert_to_blender(bdf_dict, name, arg) - done_anything = True - - if not done_anything: - print HELP_TXT - print '...nothing to do' - -if __name__ == '__main__': - main() - diff --git a/intern/bmfont/intern/BMF_Api.cpp b/intern/bmfont/intern/BMF_Api.cpp deleted file mode 100644 index 1699393e53d..00000000000 --- a/intern/bmfont/intern/BMF_Api.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * - * Implementation of the API of the OpenGL bitmap font library. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_Api.h" - -#include "BMF_BitmapFont.h" - - -#if BMF_INCLUDE_HELV10 -extern BMF_FontData BMF_font_helv10; -static BMF_BitmapFont bmfHelv10(&BMF_font_helv10); -#endif // BMF_INCLUDE_HELV10 -#if BMF_INCLUDE_HELV12 -extern BMF_FontData BMF_font_helv12; -static BMF_BitmapFont bmfHelv12(&BMF_font_helv12); -#endif // BMF_INCLUDE_HELV12 -#if BMF_INCLUDE_HELVB8 -extern BMF_FontData BMF_font_helvb8; -static BMF_BitmapFont bmfHelvb8(&BMF_font_helvb8); -#endif // BMF_INCLUDE_HELVB8 -#if BMF_INCLUDE_HELVB10 -extern BMF_FontData BMF_font_helvb10; -static BMF_BitmapFont bmfHelvb10(&BMF_font_helvb10); -#endif // BMF_INCLUDE_HELVB10 -#if BMF_INCLUDE_HELVB12 -extern BMF_FontData BMF_font_helvb12; -static BMF_BitmapFont bmfHelvb12(&BMF_font_helvb12); -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_HELVB14 -extern BMF_FontData BMF_font_helvb14; -static BMF_BitmapFont bmfHelvb14(&BMF_font_helvb14); -#endif // BMF_INCLUDE_HELVB14 -#if BMF_INCLUDE_SCR12 -extern BMF_FontData BMF_font_scr12; -static BMF_BitmapFont bmfScreen12(&BMF_font_scr12); -#endif // BMF_INCLUDE_SCR12 -#if BMF_INCLUDE_SCR14 -extern BMF_FontData BMF_font_scr14; -static BMF_BitmapFont bmfScreen14(&BMF_font_scr14); -#endif // BMF_INCLUDE_SCR14 -#if BMF_INCLUDE_SCR15 -extern BMF_FontData BMF_font_scr15; -static BMF_BitmapFont bmfScreen15(&BMF_font_scr15); -#endif // BMF_INCLUDE_SCR15 - - -BMF_Font* BMF_GetFont(BMF_FontType font) -{ - switch (font) - { -#if BMF_INCLUDE_HELV10 - case BMF_kHelvetica10: return (BMF_Font*) &bmfHelv10; -#endif // BMF_INCLUDE_HELV10 -#if BMF_INCLUDE_HELV12 - case BMF_kHelvetica12: return (BMF_Font*) &bmfHelv12; -#endif // BMF_INCLUDE_HELV12 -#if BMF_INCLUDE_HELVB8 - case BMF_kHelveticaBold8: return (BMF_Font*) &bmfHelvb8; -#endif // BMF_INCLUDE_HELVB8 -#if BMF_INCLUDE_HELVB10 - case BMF_kHelveticaBold10: return (BMF_Font*) &bmfHelvb10; -#endif // BMF_INCLUDE_HELVB10 -#if BMF_INCLUDE_HELVB12 - case BMF_kHelveticaBold12: return (BMF_Font*) &bmfHelvb12; -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_HELVB14 - case BMF_kHelveticaBold14: return (BMF_Font*) &bmfHelvb14; -#endif // BMF_INCLUDE_HELVB12 -#if BMF_INCLUDE_SCR12 - case BMF_kScreen12: return (BMF_Font*) &bmfScreen12; -#endif // BMF_INCLUDE_SCR12 -#if BMF_INCLUDE_SCR14 - case BMF_kScreen14: return (BMF_Font*) &bmfScreen14; -#endif // BMF_INCLUDE_SCR14 -#if BMF_INCLUDE_SCR15 - case BMF_kScreen15: return (BMF_Font*) &bmfScreen15; -#endif // BMF_INCLUDE_SCR15 - default: - break; - } - return 0; -} - - -int BMF_DrawCharacter(BMF_Font* font, char c) -{ - char str[2] = {c, '\0'}; - return BMF_DrawString(font, str); -} - - -int BMF_DrawString(BMF_Font* font, char* str) -{ - if (!font) return 0; - ((BMF_BitmapFont*)font)->DrawString(str); - return 1; -} - - -int BMF_GetCharacterWidth(BMF_Font* font, char c) -{ - char str[2] = {c, '\0'}; - return BMF_GetStringWidth(font, str); -} - - -int BMF_GetStringWidth(BMF_Font* font, char* str) -{ - if (!font) return 0; - return ((BMF_BitmapFont*)font)->GetStringWidth(str); -} - -void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury){ - if (!font){ - *llx = *lly = *urx = *ury = 0; - }else{ - ((BMF_BitmapFont*)font)->GetStringBoundingBox(str, llx, lly, urx, ury); - } -} - -void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r) -{ - if (!font) return; - ((BMF_BitmapFont*)font)->GetFontBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r); -} - -int BMF_GetFontHeight(BMF_Font* font) -{ - if (!font) return -1; - return ((BMF_BitmapFont*)font)->GetFontHeight(); -} - -int BMF_GetFontTexture(BMF_Font* font) { - if (!font) return -1; - return ((BMF_BitmapFont*)font)->GetTexture(); -} - -void BMF_DrawStringTexture(BMF_Font* font, char *string, float x, float y, float z) { - if (!font) return; - ((BMF_BitmapFont*)font)->DrawStringTexture(string, x, y, z); -} - -void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels) { - if (!font) return; - ((BMF_BitmapFont*)font)->DrawStringBuf(str, posx, posy, col, buf, fbuf, w, h, channels); -} diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp deleted file mode 100644 index 0111e9c3f93..00000000000 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ /dev/null @@ -1,323 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - */ - - -#include - - - -#include - -#ifdef HAVE_CONFIG_H -#include -#endif - -#if defined(WIN32) || defined(__APPLE__) - #ifdef WIN32 - #if !defined(__CYGWIN32__) - #pragma warning(disable:4244) - #endif /* __CYGWIN32__ */ - #include - #include - #else // WIN32 - // __APPLE__ is defined - #include - #endif // WIN32 -#else // defined(WIN32) || defined(__APPLE__) - #include -#endif // defined(WIN32) || defined(__APPLE__) - -#include "BMF_BitmapFont.h" - - -BMF_BitmapFont::BMF_BitmapFont(BMF_FontData* fontData) -: m_fontData(fontData) -{ -} - - -BMF_BitmapFont::~BMF_BitmapFont(void) -{ -} - -void BMF_BitmapFont::DrawString(char* str) -{ - GLint alignment; - unsigned char c; - - glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - - while ( (c = (unsigned char) *str++) ) { - BMF_CharData & cd = m_fontData->chars[c]; - - if (cd.data_offset==-1) { - GLubyte nullBitmap = 0; - - glBitmap(1, 1, 0, 0, cd.advance, 0, &nullBitmap); - } else { - GLubyte *bitmap = &m_fontData->bitmap_data[cd.data_offset]; - - glBitmap(cd.width, cd.height, cd.xorig, cd.yorig, cd.advance, 0, bitmap); - } - } - - glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); -} - - -int BMF_BitmapFont::GetStringWidth(char* str) -{ - unsigned char c; - int length = 0; - - while ( (c = (unsigned char) *str++) ) { - length += m_fontData->chars[c].advance; - } - - return length; -} - -void BMF_BitmapFont::GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax) -{ - xMin = m_fontData->xmin; - yMin = m_fontData->ymin; - xMax = m_fontData->xmax; - yMax = m_fontData->ymax; -} - -int BMF_BitmapFont::GetFontHeight( void ) -{ - return m_fontData->ymax - m_fontData->ymin; -} - -void BMF_BitmapFont::GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury) -{ - unsigned char c; - int length = 0; - int ascent = 0; - int descent = 0; - - while ( (c = (unsigned char) *str++) ) { - length += m_fontData->chars[c].advance; - int d = m_fontData->chars[c].yorig; - int a = m_fontData->chars[c].height - m_fontData->chars[c].yorig; - if(a > ascent) ascent = a; - if(d > descent) descent = d; - } - *llx = (float)0; - *lly = (float)-descent; - *urx = (float)length; - *ury = (float)ascent; -} - - -int BMF_BitmapFont::GetTexture() -{ - int fWidth = m_fontData->xmax - m_fontData->xmin; - int fHeight = m_fontData->ymax - m_fontData->ymin; - - if (fWidth>=16 || fHeight>=16) { - return -1; - } - - int cRows = 16, cCols = 16; - int cWidth = 16, cHeight = 16; - int iWidth = cCols*cWidth; - int iHeight = cRows*cHeight; - GLubyte *img = new GLubyte [iHeight*iWidth]; - GLuint texId; - - int baseLine = -(m_fontData->ymin); - - memset(img, 0, iHeight*iWidth); - for (int i = 0; i<256; i++) { - BMF_CharData & cd = m_fontData->chars[i]; - - if (cd.data_offset != -1) { - int cellX = i%16; - int cellY = i/16; - - for (int y = 0; ybitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; - - for (int x = 0; xymin); - - glBegin(GL_QUADS); - while ( (c = (unsigned char) *str++) ) { - BMF_CharData & cd = m_fontData->chars[c]; - - if (cd.data_offset != -1) { - float cellX = (c%16)/16.0; - float cellY = (c/16)/16.0; - - glTexCoord2f(cellX + 1.0/16.0, cellY); - glVertex3f(x + pos + 16.0, -baseLine + y + 0.0, z); - - glTexCoord2f(cellX + 1.0/16.0, cellY + 1.0/16.0); - glVertex3f(x + pos + 16.0, -baseLine + y + 16.0, z); - - glTexCoord2f(cellX, cellY + 1.0/16.0); - glVertex3f(x + pos + 0.0, -baseLine + y + 16.0, z); - - glTexCoord2f(cellX, cellY); - glVertex3f(x + pos + 0.0, -baseLine + y + 0.0, z); - } - - pos += cd.advance; - } - glEnd(); -} - -#define FTOCHAR(val) val<=0.0f?0: (val>=1.0f?255: (char)(255.0f*val)) -void BMF_BitmapFont::DrawStringBuf(char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h, int channels) -{ - int x, y; - - if (buf==0 && fbuf==0) - return; - - /*offset for font*/ - posx -= m_fontData->xmin; - posy -= m_fontData->ymin; - - if (buf) { - unsigned char colch[4]; - unsigned char *max, *pixel; - unsigned char c; - - for (x=0; x<4; x++) { - colch[x] = FTOCHAR(col[x]); - } - - max = buf + (4 * (w * h)); - while ((c = (unsigned char) *str++)) { - BMF_CharData & cd = m_fontData->chars[c]; - if (cd.data_offset != -1) { - for (y = 0; y < cd.height; y++) { - unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y]; - for (x = cd.xorig; x < cd.width; x++) { - pixel = buf + 4 * (((posy + y - cd.yorig) * w) + (posx + x)); - if ((pixel < max) && (pixel > buf)) { - int byteIdx = x/8; - int bitIdx = 7 - (x%8); - - if (chrRow[byteIdx]&(1<chars[c]; - if (cd.data_offset != -1) { - for (yi = 0; yi < cd.height; yi++) { - unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi]; - for (xi = cd.xorig; xi < cd.width; xi++) { - pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi)); - if ((pixel < max) && (pixel > fbuf)) { - int byteIdx = xi/8; - int bitIdx = 7 - (xi%8); - - if (chrRow[byteIdx]&(1< -#endif - -#include "BMF_FontData.h" - -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELV10 - -static unsigned char bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0x50,0x50,0xf8,0x28,0x7c,0x28, - 0x28,0x20,0x70,0xa8,0x28,0x70,0xa0,0xa8, - 0x70,0x20,0x26,0x29,0x16,0x10,0x08,0x68, - 0x94,0x64,0x64,0x98,0x98,0xa4,0x60,0x50, - 0x50,0x20,0x80,0x40,0x40,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x40,0x40,0x20,0x80, - 0x40,0x40,0x20,0x20,0x20,0x20,0x40,0x40, - 0x80,0xa0,0x40,0xa0,0x20,0x20,0xf8,0x20, - 0x20,0x80,0x40,0x40,0xf8,0x80,0x80,0x80, - 0x40,0x40,0x40,0x40,0x20,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x40,0x40, - 0x40,0x40,0x40,0x40,0xc0,0x40,0xf8,0x80, - 0x40,0x30,0x08,0x08,0x88,0x70,0x70,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x10,0x10, - 0xf8,0x90,0x50,0x50,0x30,0x10,0x70,0x88, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0xc8,0xb0,0x80,0x88,0x70,0x40,0x40, - 0x20,0x20,0x10,0x10,0x08,0xf8,0x70,0x88, - 0x88,0x88,0x70,0x88,0x88,0x70,0x70,0x88, - 0x08,0x68,0x98,0x88,0x88,0x70,0x80,0x00, - 0x00,0x00,0x00,0x80,0x80,0x40,0x40,0x00, - 0x00,0x00,0x00,0x40,0x20,0x40,0x80,0x40, - 0x20,0xf0,0x00,0xf0,0x80,0x40,0x20,0x40, - 0x80,0x40,0x00,0x40,0x40,0x20,0x10,0x90, - 0x60,0x3e,0x00,0x40,0x00,0x9b,0x00,0xa4, - 0x80,0xa4,0x80,0xa2,0x40,0x92,0x40,0x4d, - 0x40,0x20,0x80,0x1f,0x00,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0xf0,0x88,0x88, - 0x88,0xf0,0x88,0x88,0xf0,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf0,0x88,0x84, - 0x84,0x84,0x84,0x88,0xf0,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x80,0x80,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x74,0x8c,0x84, - 0x8c,0x80,0x80,0x84,0x78,0x84,0x84,0x84, - 0x84,0xfc,0x84,0x84,0x84,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x60,0x90,0x10, - 0x10,0x10,0x10,0x10,0x10,0x88,0x88,0x90, - 0x90,0xe0,0xa0,0x90,0x88,0xf0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x92,0x92,0x92, - 0xaa,0xaa,0xc6,0xc6,0x82,0x8c,0x8c,0x94, - 0x94,0xa4,0xa4,0xc4,0xc4,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x80,0x80,0x80, - 0x80,0xf0,0x88,0x88,0xf0,0x02,0x7c,0x8c, - 0x94,0x84,0x84,0x84,0x84,0x78,0x88,0x88, - 0x88,0x88,0xf0,0x88,0x88,0xf0,0x70,0x88, - 0x88,0x08,0x70,0x80,0x88,0x70,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x10,0x28, - 0x28,0x44,0x44,0x44,0x82,0x82,0x22,0x00, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x88,0x88, - 0x50,0x50,0x20,0x50,0x88,0x88,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0xf8,0x80, - 0x40,0x20,0x20,0x10,0x08,0xf8,0xc0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xc0, - 0x20,0x20,0x40,0x40,0x40,0x40,0x80,0x80, - 0xc0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x88,0x50,0x50,0x20,0x20,0xfc, - 0x80,0x80,0x40,0x68,0x90,0x90,0x70,0x10, - 0xe0,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x80, - 0x80,0x60,0x90,0x80,0x80,0x90,0x60,0x68, - 0x98,0x88,0x88,0x98,0x68,0x08,0x08,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x40,0x30,0x70,0x08,0x68, - 0x98,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x90,0x90, - 0xa0,0xc0,0xa0,0x90,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x92,0x92, - 0x92,0x92,0x92,0xec,0x88,0x88,0x88,0x88, - 0xc8,0xb0,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0, - 0x08,0x08,0x68,0x98,0x88,0x88,0x98,0x68, - 0x80,0x80,0x80,0x80,0xc0,0xa0,0x60,0x90, - 0x10,0x60,0x90,0x60,0x60,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x20,0x20,0x50,0x50,0x88,0x88, - 0x28,0x28,0x54,0x54,0x92,0x92,0x88,0x88, - 0x50,0x20,0x50,0x88,0x80,0x40,0x40,0x60, - 0xa0,0xa0,0x90,0x90,0xf0,0x80,0x40,0x20, - 0x10,0xf0,0x20,0x40,0x40,0x40,0x40,0x80, - 0x40,0x40,0x40,0x20,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40, - 0x40,0x40,0x40,0x20,0x40,0x40,0x40,0x80, - 0x98,0x64,0x80,0x80,0x80,0x80,0x80,0x80, - 0x00,0x80,0x40,0x70,0xa8,0xa0,0xa0,0xa8, - 0x70,0x10,0xb0,0x48,0x40,0x40,0xe0,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0xf8,0x20,0xf8,0x50,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x18,0x70,0xc8,0x98, - 0x70,0xc0,0x88,0x70,0xa0,0x38,0x44,0x9a, - 0xa2,0x9a,0x44,0x38,0xe0,0x00,0xa0,0x20, - 0xe0,0x28,0x50,0xa0,0x50,0x28,0x08,0x08, - 0xf8,0xe0,0x38,0x44,0xaa,0xb2,0xba,0x44, - 0x38,0xe0,0x60,0x90,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0xa0, - 0x60,0xc0,0x20,0x40,0xe0,0x80,0x40,0x80, - 0x80,0xf0,0x90,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x28,0x68,0xe8,0xe8,0xe8, - 0x7c,0xc0,0xc0,0x40,0x40,0x40,0xc0,0x40, - 0xe0,0x00,0xe0,0xa0,0xe0,0xa0,0x50,0x28, - 0x50,0xa0,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0x48,0x00,0x44,0x00,0xc4,0x00, - 0x42,0x00,0x27,0x12,0x15,0x0b,0x48,0x44, - 0xc4,0x42,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0xc8,0x00,0x24,0x00,0x44,0x00, - 0xe2,0x00,0x60,0x90,0x80,0x40,0x20,0x20, - 0x00,0x20,0x82,0x82,0x7c,0x44,0x28,0x28, - 0x10,0x10,0x00,0x10,0x20,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0x00,0x10,0x08, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x00,0x28,0x10,0x82,0x82,0x7c,0x44,0x28, - 0x28,0x10,0x10,0x00,0x28,0x14,0x82,0x82, - 0x7c,0x44,0x28,0x28,0x10,0x10,0x00,0x28, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x10,0x28,0x10,0x8f,0x80,0x88,0x00,0x78, - 0x00,0x48,0x00,0x2f,0x80,0x28,0x00,0x18, - 0x00,0x1f,0x80,0x30,0x10,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x00,0x20,0x40, - 0xf8,0x80,0x80,0x80,0xf8,0x80,0x80,0xf8, - 0x00,0x20,0x10,0xf8,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0x80,0xf8,0x80,0x80,0xf8,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x00,0xa0,0x78,0x44,0x42,0x42,0xf2, - 0x42,0x44,0x78,0x8c,0x8c,0x94,0x94,0xa4, - 0xa4,0xc4,0xc4,0x00,0x50,0x28,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x10, - 0x20,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x10,0x08,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x78,0x00,0x28,0x10,0x78, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x50,0x28,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x48,0x88,0x50,0x20,0x50, - 0x88,0x80,0x78,0xc4,0xa4,0xa4,0x94,0x94, - 0x8c,0x78,0x04,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x20,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x20, - 0x10,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x28,0x10,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x00,0x48,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0x00,0x10, - 0x08,0x80,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0x90,0xa0,0x90,0x90, - 0x60,0x68,0x90,0x90,0x70,0x10,0xe0,0x00, - 0x20,0x40,0x68,0x90,0x90,0x70,0x10,0xe0, - 0x00,0x20,0x10,0x68,0x90,0x90,0x70,0x10, - 0xe0,0x00,0x50,0x20,0x68,0x90,0x90,0x70, - 0x10,0xe0,0x00,0xa0,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x00,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x20,0x50,0x20,0x6c,0x92, - 0x90,0x7e,0x12,0xec,0x60,0x20,0x60,0x90, - 0x80,0x80,0x90,0x60,0x60,0x90,0x80,0xf0, - 0x90,0x60,0x00,0x20,0x40,0x60,0x90,0x80, - 0xf0,0x90,0x60,0x00,0x40,0x20,0x60,0x90, - 0x80,0xf0,0x90,0x60,0x00,0x50,0x20,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x00,0x50,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x88,0x78, - 0x90,0x60,0x50,0x90,0x90,0x90,0x90,0x90, - 0xe0,0x00,0xa0,0x50,0x70,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x70,0x00,0x20,0x10,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x50,0x28, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x00,0xf8,0x00,0x20,0x70,0x88,0xc8, - 0xa8,0x98,0x74,0x70,0x90,0x90,0x90,0x90, - 0x90,0x00,0x20,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x00,0x40,0x20,0x70,0x90,0x90, - 0x90,0x90,0x90,0x00,0x50,0x20,0x70,0x90, - 0x90,0x90,0x90,0x90,0x00,0x50,0x80,0x40, - 0x40,0x60,0xa0,0xa0,0x90,0x90,0x00,0x20, - 0x10,0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x40,0x40,0x60,0xa0, - 0xa0,0x90,0x90,0x00,0x50, -}; - -BMF_FontData BMF_font_helv10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 0, 3, 0}, - {3, 2, -1, -6, 4, 8}, - {6, 7, 0, 0, 6, 10}, - {5, 9, 0, 1, 6, 17}, - {8, 8, 0, 0, 9, 26}, - {6, 8, -1, 0, 8, 34}, - {2, 3, -1, -5, 3, 42}, - {3, 10, 0, 2, 4, 45}, - {3, 10, -1, 2, 4, 55}, - {3, 3, 0, -5, 4, 65}, - {5, 5, 0, -1, 6, 68}, - {2, 3, 0, 2, 3, 73}, - {5, 1, -1, -3, 7, 76}, - {1, 1, -1, 0, 3, 77}, - {3, 8, 0, 0, 3, 78}, - {5, 8, 0, 0, 6, 86}, - {2, 8, -1, 0, 6, 94}, - {5, 8, 0, 0, 6, 102}, - {5, 8, 0, 0, 6, 110}, - {5, 8, 0, 0, 6, 118}, - {5, 8, 0, 0, 6, 126}, - {5, 8, 0, 0, 6, 134}, - {5, 8, 0, 0, 6, 142}, - {5, 8, 0, 0, 6, 150}, - {5, 8, 0, 0, 6, 158}, - {1, 6, -1, 0, 3, 166}, - {2, 8, 0, 2, 3, 172}, - {3, 5, -1, -1, 6, 180}, - {4, 3, 0, -2, 5, 185}, - {3, 5, -1, -1, 6, 188}, - {4, 8, -1, 0, 6, 193}, - {10, 10, 0, 2, 11, 201}, - {7, 8, 0, 0, 7, 221}, - {5, 8, -1, 0, 7, 229}, - {6, 8, -1, 0, 8, 237}, - {6, 8, -1, 0, 8, 245}, - {5, 8, -1, 0, 7, 253}, - {5, 8, -1, 0, 6, 261}, - {6, 8, -1, 0, 8, 269}, - {6, 8, -1, 0, 8, 277}, - {1, 8, -1, 0, 3, 285}, - {4, 8, 0, 0, 5, 293}, - {5, 8, -1, 0, 7, 301}, - {4, 8, -1, 0, 6, 309}, - {7, 8, -1, 0, 9, 317}, - {6, 8, -1, 0, 8, 325}, - {6, 8, -1, 0, 8, 333}, - {5, 8, -1, 0, 7, 341}, - {7, 9, -1, 1, 8, 349}, - {5, 8, -1, 0, 7, 358}, - {5, 8, -1, 0, 7, 366}, - {5, 8, 0, 0, 5, 374}, - {6, 8, -1, 0, 8, 382}, - {7, 8, 0, 0, 7, 390}, - {9, 8, 0, 0, 9, 398}, - {5, 8, -1, 0, 7, 414}, - {7, 8, 0, 0, 7, 422}, - {5, 8, -1, 0, 7, 430}, - {2, 10, -1, 2, 3, 438}, - {3, 8, 0, 0, 3, 448}, - {2, 10, 0, 2, 3, 456}, - {5, 5, 0, -3, 6, 466}, - {6, 1, 0, 2, 6, 471}, - {2, 3, 0, -5, 3, 472}, - {5, 6, 0, 0, 5, 475}, - {5, 8, 0, 0, 6, 481}, - {4, 6, 0, 0, 5, 489}, - {5, 8, 0, 0, 6, 495}, - {4, 6, 0, 0, 5, 503}, - {4, 8, 0, 0, 4, 509}, - {5, 8, 0, 2, 6, 517}, - {5, 8, 0, 0, 6, 525}, - {1, 8, 0, 0, 2, 533}, - {1, 9, 0, 1, 2, 541}, - {4, 8, 0, 0, 5, 550}, - {1, 8, 0, 0, 2, 558}, - {7, 6, 0, 0, 8, 566}, - {5, 6, 0, 0, 6, 572}, - {5, 6, 0, 0, 6, 578}, - {5, 8, 0, 2, 6, 584}, - {5, 8, 0, 2, 6, 592}, - {3, 6, 0, 0, 4, 600}, - {4, 6, 0, 0, 5, 606}, - {3, 8, 0, 0, 4, 612}, - {4, 6, 0, 0, 5, 620}, - {5, 6, 0, 0, 6, 626}, - {7, 6, 0, 0, 8, 632}, - {5, 6, 0, 0, 6, 638}, - {4, 8, 0, 2, 5, 644}, - {4, 6, 0, 0, 5, 652}, - {3, 10, 0, 2, 3, 658}, - {1, 10, -1, 2, 3, 668}, - {3, 10, 0, 2, 3, 678}, - {6, 2, 0, -3, 7, 688}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 2, 3, 690}, - {5, 8, 0, 1, 6, 698}, - {5, 8, 0, 0, 6, 706}, - {4, 6, 0, -1, 5, 714}, - {5, 8, 0, 0, 6, 720}, - {1, 10, -1, 2, 3, 728}, - {5, 10, 0, 2, 6, 738}, - {3, 1, 0, -7, 3, 748}, - {7, 7, -1, 0, 9, 749}, - {3, 5, 0, -3, 4, 756}, - {5, 5, 0, 0, 6, 761}, - {5, 3, -1, -2, 7, 766}, - {3, 1, 0, -3, 4, 769}, - {7, 7, -1, 0, 9, 770}, - {3, 1, 0, -7, 3, 777}, - {4, 4, 0, -3, 4, 778}, - {5, 7, 0, 0, 6, 782}, - {3, 4, 0, -3, 3, 789}, - {3, 4, 0, -3, 3, 793}, - {2, 2, 0, -6, 3, 797}, - {4, 8, 0, 2, 5, 799}, - {6, 10, 0, 2, 6, 807}, - {2, 1, 0, -3, 3, 817}, - {2, 2, 0, 2, 3, 818}, - {2, 4, 0, -3, 3, 820}, - {3, 5, 0, -3, 4, 824}, - {5, 5, 0, 0, 6, 829}, - {9, 8, 0, 0, 9, 834}, - {8, 8, 0, 0, 9, 850}, - {9, 8, 0, 0, 9, 858}, - {4, 8, -1, 2, 6, 874}, - {7, 11, 0, 0, 7, 882}, - {7, 11, 0, 0, 7, 893}, - {7, 11, 0, 0, 7, 904}, - {7, 11, 0, 0, 7, 915}, - {7, 10, 0, 0, 7, 926}, - {7, 11, 0, 0, 7, 936}, - {9, 8, 0, 0, 10, 947}, - {6, 10, -1, 2, 8, 963}, - {5, 11, -1, 0, 7, 973}, - {5, 11, -1, 0, 7, 984}, - {5, 11, -1, 0, 7, 995}, - {5, 10, -1, 0, 7, 1006}, - {2, 11, 0, 0, 3, 1016}, - {2, 11, -1, 0, 3, 1027}, - {3, 11, 0, 0, 3, 1038}, - {3, 10, 0, 0, 3, 1049}, - {7, 8, 0, 0, 8, 1059}, - {6, 11, -1, 0, 8, 1067}, - {6, 11, -1, 0, 8, 1078}, - {6, 11, -1, 0, 8, 1089}, - {6, 11, -1, 0, 8, 1100}, - {6, 11, -1, 0, 8, 1111}, - {6, 10, -1, 0, 8, 1122}, - {5, 5, 0, -1, 6, 1132}, - {6, 10, -1, 1, 8, 1137}, - {6, 11, -1, 0, 8, 1147}, - {6, 11, -1, 0, 8, 1158}, - {6, 11, -1, 0, 8, 1169}, - {6, 10, -1, 0, 8, 1180}, - {7, 11, 0, 0, 7, 1190}, - {5, 8, -1, 0, 7, 1201}, - {4, 8, 0, 0, 5, 1209}, - {5, 9, 0, 0, 5, 1217}, - {5, 9, 0, 0, 5, 1226}, - {5, 9, 0, 0, 5, 1235}, - {5, 9, 0, 0, 5, 1244}, - {5, 8, 0, 0, 5, 1253}, - {5, 9, 0, 0, 5, 1261}, - {7, 6, 0, 0, 8, 1270}, - {4, 8, 0, 2, 5, 1276}, - {4, 9, 0, 0, 5, 1284}, - {4, 9, 0, 0, 5, 1293}, - {4, 9, 0, 0, 5, 1302}, - {4, 8, 0, 0, 5, 1311}, - {2, 9, 1, 0, 2, 1319}, - {2, 9, 0, 0, 2, 1328}, - {3, 9, 1, 0, 2, 1337}, - {3, 8, 0, 0, 2, 1346}, - {5, 9, 0, 0, 6, 1354}, - {4, 9, 0, 0, 5, 1363}, - {5, 9, 0, 0, 6, 1372}, - {5, 9, 0, 0, 6, 1381}, - {5, 9, 0, 0, 6, 1390}, - {5, 9, 0, 0, 6, 1399}, - {5, 8, 0, 0, 6, 1408}, - {5, 5, 0, -1, 6, 1416}, - {6, 6, 0, 0, 6, 1421}, - {4, 9, 0, 0, 5, 1427}, - {4, 9, 0, 0, 5, 1436}, - {4, 9, 0, 0, 5, 1445}, - {4, 8, 0, 0, 5, 1454}, - {4, 11, 0, 2, 5, 1462}, - {5, 10, 0, 2, 6, 1473}, - {4, 10, 0, 2, 5, 1483}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helv12.cpp b/intern/bmfont/intern/BMF_font_helv12.cpp deleted file mode 100644 index 29b08b659ee..00000000000 --- a/intern/bmfont/intern/BMF_font_helv12.cpp +++ /dev/null @@ -1,525 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELV12 - -static unsigned char bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0x50,0x50,0x50,0xfc, - 0x28,0xfc,0x28,0x28,0x20,0x70,0xa8,0xa8, - 0x28,0x70,0xa0,0xa8,0x70,0x20,0x23,0x00, - 0x14,0x80,0x14,0x80,0x13,0x00,0x08,0x00, - 0x68,0x00,0x94,0x00,0x94,0x00,0x62,0x00, - 0x72,0x8c,0x84,0x8a,0x50,0x30,0x48,0x48, - 0x30,0x80,0x40,0xc0,0x20,0x40,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x80,0x40,0x40,0x20,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0xa0,0x40,0xa0,0x20, - 0x20,0xf8,0x20,0x20,0x80,0x40,0x40,0xf8, - 0x80,0x80,0x80,0x40,0x40,0x40,0x20,0x20, - 0x10,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf8,0x80,0x80,0x40, - 0x20,0x10,0x08,0x88,0x70,0x70,0x88,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x08,0x08, - 0xfc,0x88,0x48,0x28,0x28,0x18,0x08,0x70, - 0x88,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xc8,0xb0,0x80,0x88, - 0x70,0x40,0x40,0x20,0x20,0x20,0x10,0x10, - 0x08,0xf8,0x70,0x88,0x88,0x88,0x88,0x70, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x78, - 0x88,0x88,0x88,0x70,0x80,0x00,0x00,0x00, - 0x00,0x80,0x80,0x40,0x40,0x00,0x00,0x00, - 0x00,0x40,0x0c,0x30,0xc0,0x30,0x0c,0xf8, - 0x00,0xf8,0xc0,0x30,0x0c,0x30,0xc0,0x20, - 0x00,0x20,0x20,0x10,0x10,0x88,0x88,0x70, - 0x3e,0x00,0x40,0x00,0x9b,0x00,0xa6,0x80, - 0xa2,0x40,0xa2,0x40,0x92,0x40,0x4d,0x40, - 0x60,0x80,0x1f,0x00,0x82,0x82,0x82,0x7c, - 0x44,0x44,0x28,0x28,0x10,0xf8,0x84,0x84, - 0x84,0xf8,0x84,0x84,0x84,0xf8,0x3c,0x42, - 0x80,0x80,0x80,0x80,0x80,0x42,0x3c,0xf8, - 0x84,0x82,0x82,0x82,0x82,0x82,0x84,0xf8, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0x80,0xf8,0x80,0x80, - 0x80,0xfc,0x3a,0x46,0x82,0x82,0x8e,0x80, - 0x80,0x42,0x3c,0x82,0x82,0x82,0x82,0xfe, - 0x82,0x82,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x70,0x88,0x88, - 0x08,0x08,0x08,0x08,0x08,0x08,0x82,0x84, - 0x88,0x90,0xe0,0xa0,0x90,0x88,0x84,0xf8, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x88,0x80,0x88,0x80,0x94,0x80,0x94,0x80, - 0xa2,0x80,0xa2,0x80,0xc1,0x80,0xc1,0x80, - 0x80,0x80,0x82,0x86,0x8a,0x8a,0x92,0xa2, - 0xa2,0xc2,0x82,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x80,0x80,0x80,0x80, - 0xf8,0x84,0x84,0x84,0xf8,0x3d,0x42,0x85, - 0x89,0x81,0x81,0x81,0x42,0x3c,0x84,0x84, - 0x84,0x88,0xf8,0x84,0x84,0x84,0xf8,0x78, - 0x84,0x84,0x04,0x18,0x60,0x80,0x84,0x78, - 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0xfe,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x10,0x10,0x28,0x28,0x44,0x44, - 0x44,0x82,0x82,0x22,0x00,0x22,0x00,0x22, - 0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x88, - 0x80,0x88,0x80,0x88,0x80,0x82,0x44,0x44, - 0x28,0x10,0x28,0x44,0x44,0x82,0x10,0x10, - 0x10,0x10,0x28,0x44,0x44,0x82,0x82,0xfe, - 0x80,0x40,0x20,0x10,0x08,0x04,0x02,0xfe, - 0xc0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x10,0x10,0x20,0x20, - 0x20,0x40,0x40,0x80,0x80,0xc0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xfe,0xc0,0x80,0x40, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x08,0x08, - 0x70,0x88,0x80,0xf8,0x88,0x88,0x70,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x40,0x30, - 0x70,0x88,0x08,0x68,0x98,0x88,0x88,0x88, - 0x98,0x68,0x88,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x80,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x88,0x90,0xa0,0xc0,0xc0,0xa0,0x90,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x92,0x92,0x92,0x92,0x92,0xda, - 0xa4,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x08,0x08,0x08,0x68,0x98,0x88,0x88, - 0x88,0x98,0x68,0x80,0x80,0x80,0x80,0x80, - 0xc0,0xa0,0x60,0x90,0x10,0x60,0x80,0x90, - 0x60,0x60,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x40,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x20,0x20,0x50,0x50,0x88,0x88,0x88, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x84,0x84, - 0x48,0x30,0x30,0x48,0x84,0x80,0x40,0x20, - 0x20,0x50,0x50,0x90,0x88,0x88,0x88,0xf0, - 0x80,0x40,0x40,0x20,0x10,0xf0,0x30,0x40, - 0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40, - 0x40,0x30,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0xc0,0x20, - 0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20, - 0x20,0xc0,0x98,0x64,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x70, - 0xc8,0xa0,0xa0,0xa0,0xa8,0x70,0x10,0xb0, - 0x48,0x20,0x20,0xf0,0x40,0x40,0x48,0x30, - 0x84,0x78,0x48,0x48,0x78,0x84,0x20,0x20, - 0xf8,0x20,0xf8,0x20,0x50,0x88,0x88,0x80, - 0x80,0x80,0x80,0x00,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x08,0x30,0x48,0x88, - 0x88,0x90,0x60,0x80,0x88,0x70,0xa0,0x3e, - 0x00,0x41,0x00,0x9c,0x80,0xa2,0x80,0xa0, - 0x80,0xa2,0x80,0x9c,0x80,0x41,0x00,0x3e, - 0x00,0xe0,0x00,0xa0,0x20,0xe0,0x28,0x50, - 0xa0,0x50,0x28,0x04,0x04,0x04,0xfc,0xf0, - 0x3e,0x00,0x41,0x00,0x94,0x80,0x94,0x80, - 0x98,0x80,0x94,0x80,0x9c,0x80,0x41,0x00, - 0x3e,0x00,0xf0,0x60,0x90,0x90,0x60,0xf8, - 0x00,0x20,0x20,0xf8,0x20,0x20,0xf0,0x40, - 0x20,0x90,0x60,0xc0,0x20,0x40,0x20,0xe0, - 0x80,0x40,0x80,0x80,0x80,0xe8,0x98,0x88, - 0x88,0x88,0x88,0x88,0x28,0x28,0x28,0x28, - 0x28,0x28,0x68,0xe8,0xe8,0xe8,0x68,0x3c, - 0x80,0xc0,0x20,0x20,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0,0xa0, - 0x50,0x28,0x50,0xa0,0x41,0x00,0x27,0x80, - 0x15,0x00,0x13,0x00,0x49,0x00,0x44,0x00, - 0x44,0x00,0xc2,0x00,0x41,0x00,0x47,0x80, - 0x22,0x00,0x11,0x00,0x14,0x80,0x4b,0x00, - 0x48,0x00,0x44,0x00,0xc2,0x00,0x41,0x00, - 0x21,0x00,0x17,0x80,0x15,0x00,0x0b,0x00, - 0xc9,0x00,0x24,0x00,0x44,0x00,0x22,0x00, - 0xe1,0x00,0x70,0x88,0x88,0x40,0x40,0x20, - 0x20,0x00,0x20,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x10,0x20,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x10,0x08,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x10,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x28,0x14,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x82,0x82, - 0x82,0x7c,0x44,0x44,0x28,0x10,0x10,0x10, - 0x28,0x10,0x8f,0x80,0x88,0x00,0x88,0x00, - 0x78,0x00,0x4f,0x80,0x48,0x00,0x28,0x00, - 0x28,0x00,0x1f,0x80,0x30,0x08,0x08,0x3c, - 0x42,0x80,0x80,0x80,0x80,0x80,0x42,0x3c, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x10,0x20,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x10,0x08, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x28,0x10,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x28,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x7c,0x42, - 0x41,0x41,0xf1,0x41,0x41,0x42,0x7c,0x82, - 0x86,0x8a,0x8a,0x92,0xa2,0xa2,0xc2,0x82, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x08,0x10,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x08,0x04,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x14,0x08,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x24,0x88,0x50, - 0x20,0x50,0x88,0x80,0x00,0x5e,0x00,0x21, - 0x00,0x50,0x80,0x48,0x80,0x44,0x80,0x44, - 0x80,0x42,0x80,0x21,0x00,0x1e,0x80,0x00, - 0x40,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x10,0x20,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x10, - 0x08,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x28,0x10,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x10,0x10,0x10,0x10,0x28,0x44,0x44,0x82, - 0x82,0x00,0x10,0x08,0x80,0x80,0xf8,0x84, - 0x84,0x84,0xf8,0x80,0x80,0xb0,0x88,0x88, - 0x88,0xb0,0x88,0x88,0x88,0x70,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x10,0x20, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x50,0x28,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x50,0x74, - 0x88,0x88,0x78,0x08,0x88,0x70,0x30,0x48, - 0x30,0x77,0x00,0x88,0x80,0x88,0x00,0x7f, - 0x80,0x08,0x80,0x88,0x80,0x77,0x00,0x60, - 0x10,0x20,0x70,0x88,0x80,0x80,0x80,0x88, - 0x70,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x10,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x00,0x80,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x00,0xa0,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x88,0x88,0x88,0x88,0x78,0x08,0x50,0x30, - 0x68,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x50,0x20,0x00,0xf8,0x00, - 0x20,0xb8,0x44,0x64,0x54,0x4c,0x44,0x3a, - 0x68,0x98,0x88,0x88,0x88,0x88,0x88,0x00, - 0x20,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0x00,0x50,0x20,0x68,0x98, - 0x88,0x88,0x88,0x88,0x88,0x00,0x50,0x80, - 0x40,0x20,0x20,0x50,0x50,0x90,0x88,0x88, - 0x88,0x00,0x20,0x10,0x80,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0xc0,0x20,0x20,0x20,0x30,0x50,0x50,0x48, - 0x88,0x88,0x00,0x50, -}; - -BMF_FontData BMF_font_helv12 = { - 0, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 9, -1, 0, 3, 0}, - {3, 3, -1, -6, 5, 9}, - {6, 8, 0, 0, 7, 12}, - {5, 10, -1, 1, 7, 20}, - {9, 9, -1, 0, 11, 30}, - {7, 9, -1, 0, 9, 48}, - {2, 3, -1, -6, 3, 57}, - {3, 12, -1, 3, 4, 60}, - {3, 12, 0, 3, 4, 72}, - {3, 3, -1, -6, 5, 84}, - {5, 5, -1, -1, 7, 87}, - {2, 3, -1, 2, 4, 92}, - {5, 1, -1, -3, 8, 95}, - {1, 1, -1, 0, 3, 96}, - {4, 9, 0, 0, 4, 97}, - {5, 9, -1, 0, 7, 106}, - {3, 9, -1, 0, 7, 115}, - {5, 9, -1, 0, 7, 124}, - {5, 9, -1, 0, 7, 133}, - {6, 9, 0, 0, 7, 142}, - {5, 9, -1, 0, 7, 151}, - {5, 9, -1, 0, 7, 160}, - {5, 9, -1, 0, 7, 169}, - {5, 9, -1, 0, 7, 178}, - {5, 9, -1, 0, 7, 187}, - {1, 6, -1, 0, 3, 196}, - {2, 8, 0, 2, 3, 202}, - {6, 5, 0, -1, 7, 210}, - {5, 3, -1, -2, 7, 215}, - {6, 5, -1, -1, 7, 218}, - {5, 9, -1, 0, 7, 223}, - {10, 10, -1, 1, 12, 232}, - {7, 9, -1, 0, 9, 252}, - {6, 9, -1, 0, 8, 261}, - {7, 9, -1, 0, 9, 270}, - {7, 9, -1, 0, 9, 279}, - {6, 9, -1, 0, 8, 288}, - {6, 9, -1, 0, 8, 297}, - {7, 9, -1, 0, 9, 306}, - {7, 9, -1, 0, 9, 315}, - {1, 9, -1, 0, 3, 324}, - {5, 9, -1, 0, 7, 333}, - {7, 9, -1, 0, 8, 342}, - {5, 9, -1, 0, 7, 351}, - {9, 9, -1, 0, 11, 360}, - {7, 9, -1, 0, 9, 378}, - {8, 9, -1, 0, 10, 387}, - {6, 9, -1, 0, 8, 396}, - {8, 9, -1, 0, 10, 405}, - {6, 9, -1, 0, 8, 414}, - {6, 9, -1, 0, 8, 423}, - {7, 9, 0, 0, 7, 432}, - {6, 9, -1, 0, 8, 441}, - {7, 9, -1, 0, 9, 450}, - {9, 9, -1, 0, 11, 459}, - {7, 9, -1, 0, 9, 477}, - {7, 9, -1, 0, 9, 486}, - {7, 9, -1, 0, 9, 495}, - {2, 12, -1, 3, 3, 504}, - {4, 9, 0, 0, 4, 516}, - {2, 12, 0, 3, 3, 525}, - {5, 3, 0, -5, 6, 537}, - {7, 1, 0, 2, 7, 540}, - {2, 3, 0, -6, 3, 541}, - {6, 7, -1, 0, 7, 544}, - {5, 9, -1, 0, 7, 551}, - {5, 7, -1, 0, 7, 560}, - {5, 9, -1, 0, 7, 567}, - {5, 7, -1, 0, 7, 576}, - {4, 9, 0, 0, 3, 583}, - {5, 10, -1, 3, 7, 592}, - {5, 9, -1, 0, 7, 602}, - {1, 9, -1, 0, 3, 611}, - {2, 12, 0, 3, 3, 620}, - {5, 9, -1, 0, 6, 632}, - {1, 9, -1, 0, 3, 641}, - {7, 7, -1, 0, 9, 650}, - {5, 7, -1, 0, 7, 657}, - {5, 7, -1, 0, 7, 664}, - {5, 10, -1, 3, 7, 671}, - {5, 10, -1, 3, 7, 681}, - {3, 7, -1, 0, 4, 691}, - {4, 7, -1, 0, 6, 698}, - {3, 9, 0, 0, 3, 705}, - {5, 7, -1, 0, 7, 714}, - {5, 7, -1, 0, 7, 721}, - {9, 7, 0, 0, 9, 728}, - {6, 7, 0, 0, 6, 742}, - {5, 10, -1, 3, 7, 749}, - {4, 7, -1, 0, 6, 759}, - {4, 12, 0, 3, 4, 766}, - {1, 12, -1, 3, 3, 778}, - {4, 12, 0, 3, 4, 790}, - {6, 2, 0, -3, 7, 802}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 10, -1, 3, 3, 804}, - {5, 9, -1, 1, 7, 814}, - {5, 9, -1, 0, 7, 823}, - {6, 6, 0, -1, 7, 832}, - {5, 9, -1, 0, 7, 838}, - {1, 11, -1, 2, 3, 847}, - {5, 12, 0, 3, 6, 858}, - {3, 1, 0, -8, 3, 870}, - {9, 9, -1, 0, 11, 871}, - {3, 5, -1, -4, 5, 889}, - {5, 5, -1, -1, 7, 894}, - {6, 4, -1, -2, 8, 899}, - {4, 1, 0, -3, 5, 903}, - {9, 9, -1, 0, 11, 904}, - {4, 1, 0, -8, 4, 922}, - {4, 4, 0, -4, 5, 923}, - {5, 7, -1, 0, 7, 927}, - {4, 5, 0, -3, 4, 934}, - {3, 5, 0, -3, 4, 939}, - {2, 2, 0, -8, 2, 944}, - {5, 10, -1, 3, 7, 946}, - {6, 12, 0, 3, 7, 956}, - {1, 1, -1, -3, 3, 968}, - {3, 4, 0, 3, 3, 969}, - {2, 5, -1, -3, 4, 973}, - {3, 5, -1, -4, 5, 978}, - {5, 5, -1, -1, 7, 983}, - {9, 9, 0, 0, 10, 988}, - {9, 9, 0, 0, 10, 1006}, - {9, 9, 0, 0, 10, 1024}, - {5, 9, -1, 3, 7, 1042}, - {7, 12, -1, 0, 9, 1051}, - {7, 12, -1, 0, 9, 1063}, - {7, 12, -1, 0, 9, 1075}, - {7, 12, -1, 0, 9, 1087}, - {7, 11, -1, 0, 9, 1099}, - {7, 12, -1, 0, 9, 1110}, - {9, 9, -1, 0, 11, 1122}, - {7, 12, -1, 3, 9, 1140}, - {6, 12, -1, 0, 8, 1152}, - {6, 12, -1, 0, 8, 1164}, - {6, 12, -1, 0, 8, 1176}, - {6, 11, -1, 0, 8, 1188}, - {2, 12, 0, 0, 3, 1199}, - {2, 12, -1, 0, 3, 1211}, - {3, 12, 0, 0, 3, 1223}, - {3, 11, 0, 0, 3, 1235}, - {8, 9, 0, 0, 9, 1246}, - {7, 12, -1, 0, 9, 1255}, - {8, 12, -1, 0, 10, 1267}, - {8, 12, -1, 0, 10, 1279}, - {8, 12, -1, 0, 10, 1291}, - {8, 12, -1, 0, 10, 1303}, - {8, 11, -1, 0, 10, 1315}, - {5, 5, -1, -1, 7, 1326}, - {10, 11, 0, 1, 10, 1331}, - {6, 12, -1, 0, 8, 1353}, - {6, 12, -1, 0, 8, 1365}, - {6, 12, -1, 0, 8, 1377}, - {6, 11, -1, 0, 8, 1389}, - {7, 12, -1, 0, 9, 1400}, - {6, 9, -1, 0, 8, 1412}, - {5, 9, -1, 0, 7, 1421}, - {6, 10, -1, 0, 7, 1430}, - {6, 10, -1, 0, 7, 1440}, - {6, 10, -1, 0, 7, 1450}, - {6, 10, -1, 0, 7, 1460}, - {6, 9, -1, 0, 7, 1470}, - {6, 10, -1, 0, 7, 1479}, - {9, 7, -1, 0, 11, 1489}, - {5, 10, -1, 3, 7, 1503}, - {5, 10, -1, 0, 7, 1513}, - {5, 10, -1, 0, 7, 1523}, - {5, 10, -1, 0, 7, 1533}, - {5, 9, -1, 0, 7, 1543}, - {2, 10, 0, 0, 3, 1552}, - {2, 10, -1, 0, 3, 1562}, - {3, 10, 0, 0, 3, 1572}, - {3, 9, 0, 0, 3, 1582}, - {5, 10, -1, 0, 7, 1591}, - {5, 10, -1, 0, 7, 1601}, - {5, 10, -1, 0, 7, 1611}, - {5, 10, -1, 0, 7, 1621}, - {5, 10, -1, 0, 7, 1631}, - {5, 10, -1, 0, 7, 1641}, - {5, 9, -1, 0, 7, 1651}, - {5, 5, -1, -1, 7, 1660}, - {7, 7, 0, 0, 7, 1665}, - {5, 10, -1, 0, 7, 1672}, - {5, 10, -1, 0, 7, 1682}, - {5, 10, -1, 0, 7, 1692}, - {5, 9, -1, 0, 7, 1702}, - {5, 13, -1, 3, 7, 1711}, - {5, 12, -1, 3, 7, 1724}, - {5, 12, -1, 3, 7, 1736}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb10.cpp b/intern/bmfont/intern/BMF_font_helvb10.cpp deleted file mode 100644 index cdd3656c5c0..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb10.cpp +++ /dev/null @@ -1,492 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB10 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0x00,0x80,0x80,0xc0,0xc0,0xc0, - 0xc0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x7e,0x28,0x28,0x20,0x70,0xa8,0x28,0x38, - 0x70,0xe0,0xa8,0x70,0x20,0x8c,0x56,0x2c, - 0x10,0x10,0x68,0xb4,0x62,0x76,0xdc,0xcc, - 0xde,0x70,0xd8,0xd8,0x70,0x80,0x40,0xc0, - 0xc0,0x20,0x60,0x40,0xc0,0xc0,0xc0,0xc0, - 0x40,0x60,0x20,0x80,0xc0,0x40,0x60,0x60, - 0x60,0x60,0x40,0xc0,0x80,0xa0,0x40,0xa0, - 0x30,0x30,0xfc,0x30,0x30,0x80,0x40,0xc0, - 0xc0,0xf8,0xc0,0xc0,0x80,0x80,0x40,0x40, - 0x20,0x20,0x10,0x10,0x70,0xd8,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x70,0x60,0x60,0x60,0x60, - 0x60,0x60,0xe0,0x60,0xf8,0xc0,0x60,0x30, - 0x18,0x18,0xd8,0x70,0x70,0xd8,0x18,0x18, - 0x30,0x18,0xd8,0x70,0x18,0x18,0xfc,0x98, - 0x58,0x38,0x18,0x08,0x70,0xd8,0x98,0x18, - 0xf0,0xc0,0xc0,0xf8,0x70,0xd8,0xd8,0xd8, - 0xf0,0xc0,0xd8,0x70,0x60,0x60,0x60,0x30, - 0x30,0x18,0x18,0xf8,0x70,0xd8,0xd8,0xd8, - 0x70,0xd8,0xd8,0x70,0x70,0xd8,0x18,0x78, - 0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x30,0x60,0xc0,0x60,0x30,0xf8, - 0x00,0xf8,0xc0,0x60,0x30,0x60,0xc0,0x60, - 0x00,0x60,0x60,0x30,0x18,0xd8,0x70,0x3e, - 0x00,0x40,0x00,0x9b,0x00,0xa4,0x80,0xa2, - 0x40,0x92,0x40,0x4d,0x40,0x60,0x80,0x1f, - 0x00,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0xf8,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xf8,0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66, - 0x3c,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xd8, - 0xf0,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0xc0,0xc0,0xc0,0xc0,0xf0,0xc0,0xc0, - 0xf8,0x3a,0x66,0xc6,0xce,0xc0,0xc2,0x66, - 0x3c,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc, - 0xcc,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x70,0xd8,0x18,0x18,0x18,0x18,0x18, - 0x18,0xc6,0xcc,0xd8,0xf0,0xe0,0xf0,0xd8, - 0xcc,0xf8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc9,0x80,0xc9,0x80,0xdd,0x80,0xd5, - 0x80,0xf7,0x80,0xe3,0x80,0xe3,0x80,0xc1, - 0x80,0xc6,0xce,0xce,0xd6,0xd6,0xe6,0xe6, - 0xc6,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0xc0,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0x02,0x3c,0x6c,0xd6,0xc6,0xc6,0xc6, - 0x6c,0x38,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xcc,0xf8,0x78,0xcc,0x8c,0x1c,0x78,0xe0, - 0xcc,0x78,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xfc,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x10,0x38,0x38,0x6c,0x6c,0x6c, - 0xc6,0xc6,0x33,0x00,0x33,0x00,0x7f,0x80, - 0x6d,0x80,0x6d,0x80,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xc6,0xc6,0x6c,0x38,0x38,0x6c, - 0xc6,0xc6,0x18,0x18,0x18,0x3c,0x66,0x66, - 0xc3,0xc3,0xfc,0xc0,0x60,0x70,0x30,0x18, - 0x0c,0xfc,0xe0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xe0,0x10,0x10,0x20,0x20, - 0x40,0x40,0x80,0x80,0xe0,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x90,0x90, - 0xf0,0x60,0xfc,0xc0,0xc0,0x80,0x40,0x6c, - 0xd8,0xd8,0x78,0x98,0x70,0xf0,0xd8,0xd8, - 0xd8,0xd8,0xf0,0xc0,0xc0,0x70,0xd0,0xc0, - 0xc0,0xd0,0x70,0x78,0xd8,0xd8,0xd8,0xd8, - 0x78,0x18,0x18,0x70,0xd8,0xc0,0xf8,0xd8, - 0x70,0x60,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x38,0x70,0x18,0x78,0xd8,0xd8,0xd8,0xd8, - 0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0xf0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0xcc,0xd8,0xf0,0xe0,0xf0, - 0xd8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xdb,0xdb,0xdb,0xdb,0xdb, - 0xb6,0xd8,0xd8,0xd8,0xd8,0xd8,0xb0,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0xf0, - 0xd8,0xd8,0xd8,0xd8,0xb0,0x18,0x18,0x78, - 0xd8,0xd8,0xd8,0xd8,0x68,0xc0,0xc0,0xc0, - 0xc0,0xe0,0xb0,0x70,0xd8,0x18,0x70,0xd8, - 0x70,0x30,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x60,0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0x20, - 0x70,0x50,0xd8,0xd8,0xd8,0x6c,0x6c,0x6c, - 0xd6,0xd6,0xd6,0xcc,0xcc,0x78,0x30,0x78, - 0xcc,0x60,0x30,0x30,0x78,0xd8,0xd8,0xd8, - 0xd8,0xf8,0xc0,0x60,0x30,0x18,0xf8,0x30, - 0x60,0x60,0x60,0x60,0xc0,0x60,0x60,0x60, - 0x30,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x60,0x60,0x60,0x60, - 0x30,0x60,0x60,0x60,0xc0,0xb0,0x68,0x00, - 0xc0,0xc0,0xc0,0xc0,0x40,0x40,0x00,0xc0, - 0x40,0x70,0xd8,0xa0,0xa0,0xd8,0x70,0x10, - 0xd8,0x68,0x60,0x60,0xf0,0x60,0x68,0x38, - 0x84,0x78,0x48,0x48,0x78,0x84,0x30,0xfc, - 0x30,0xfc,0x48,0xcc,0x84,0x84,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x70,0x98,0x38,0x70,0xc8,0x98,0x70,0xe0, - 0xc8,0x70,0xa0,0x3c,0x42,0x9d,0xa1,0xa5, - 0x99,0x42,0x3c,0xe0,0x00,0xa0,0x20,0xe0, - 0x6c,0xd8,0x6c,0x08,0x08,0xf8,0xf0,0x3c, - 0x42,0xa5,0xb9,0xa5,0xbd,0x42,0x3c,0xe0, - 0xc0,0xa0,0x60,0xfc,0x00,0x30,0x30,0xfc, - 0x30,0x30,0xe0,0x40,0xa0,0x60,0xc0,0x20, - 0x40,0xe0,0x80,0x40,0xc0,0xc0,0xe8,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x28,0x28,0x28,0x28, - 0x28,0x68,0xe8,0xe8,0xe8,0x7c,0xc0,0xc0, - 0x40,0x40,0x40,0xc0,0x40,0xe0,0x00,0xe0, - 0xa0,0xe0,0xd8,0x6c,0xd8,0x42,0x2f,0x26, - 0x12,0x48,0x48,0xc4,0x44,0x4e,0x24,0x2a, - 0x16,0x48,0x48,0xc4,0x44,0x42,0x2f,0x26, - 0x12,0xc8,0x28,0x44,0xe4,0x70,0xd8,0xc0, - 0x60,0x30,0x30,0x00,0x30,0xc6,0xc6,0xfe, - 0x6c,0x6c,0x6c,0x38,0x38,0x00,0x10,0x20, - 0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38,0x38, - 0x00,0x10,0x08,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x00,0x28,0x10,0xc6,0xc6, - 0xfe,0x6c,0x6c,0x6c,0x38,0x38,0x00,0x28, - 0x14,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0x00,0x28,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x10,0x28,0x10,0xcf,0x80, - 0xcc,0x00,0xfc,0x00,0x6c,0x00,0x6f,0x80, - 0x6c,0x00,0x3c,0x00,0x3f,0x80,0x30,0x10, - 0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66,0x3c, - 0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0,0xf8, - 0x00,0x20,0x40,0xf8,0xc0,0xc0,0xc0,0xf8, - 0xc0,0xc0,0xf8,0x00,0x20,0x10,0xf8,0xc0, - 0xc0,0xc0,0xf8,0xc0,0xc0,0xf8,0x00,0x50, - 0x20,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0x00,0x50,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x00,0x40,0x80,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x80, - 0x40,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xa0,0x40,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x00,0x90,0x78,0x6c, - 0x66,0x66,0xf6,0x66,0x6c,0x78,0xc6,0xce, - 0xce,0xd6,0xd6,0xe6,0xe6,0xc6,0x00,0x28, - 0x14,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0x00,0x08,0x10,0x38,0x6c,0xc6,0xc6, - 0xc6,0xc6,0x6c,0x38,0x00,0x10,0x08,0x38, - 0x6c,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00, - 0x28,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xc6, - 0x6c,0x38,0x00,0x28,0x14,0x38,0x6c,0xc6, - 0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x28,0xcc, - 0x78,0x30,0x78,0xcc,0xb8,0x6c,0xe6,0xd6, - 0xd6,0xce,0x6c,0x3a,0x78,0xcc,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x10,0x20,0x78, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, - 0x10,0x08,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x00,0x50,0x20,0x78,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x48,0x18, - 0x18,0x18,0x3c,0x66,0x66,0xc3,0xc3,0x00, - 0x08,0x04,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0xc0,0xd0,0xc8,0xc8,0xc8,0xd0,0xc8, - 0xc8,0x70,0x6c,0xd8,0xd8,0x78,0x98,0x70, - 0x00,0x10,0x20,0x6c,0xd8,0xd8,0x78,0x98, - 0x70,0x00,0x20,0x10,0x6c,0xd8,0xd8,0x78, - 0x98,0x70,0x00,0x50,0x20,0x6c,0xd8,0xd8, - 0x78,0x98,0x70,0x00,0x50,0x28,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x00,0x50,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x20,0x50,0x20,0x6e, - 0xdb,0xd8,0x7f,0x9b,0x7e,0x60,0x20,0x70, - 0xd0,0xc0,0xc0,0xd0,0x70,0x70,0xd8,0xc0, - 0xf8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xc0,0xf8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x40, - 0x80,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0x80,0x40,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x00,0xa0,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x00,0xa0,0x70,0xd8,0xd8,0xd8,0xd8, - 0x70,0xa0,0x60,0x50,0xd8,0xd8,0xd8,0xd8, - 0xd8,0xb0,0x00,0xa0,0x50,0x70,0xd8,0xd8, - 0xd8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xd8,0xd8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0xa0, - 0x50,0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00, - 0x50,0x30,0x00,0xfc,0x00,0x30,0xb8,0x6c, - 0x6c,0x7c,0x6c,0x3a,0x68,0xd8,0xd8,0xd8, - 0xd8,0xd8,0x00,0x20,0x40,0x68,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x00,0x20,0x10,0x68,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x20,0x68, - 0xd8,0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x60, - 0x30,0x30,0x78,0xd8,0xd8,0xd8,0xd8,0x00, - 0x20,0x10,0xc0,0xc0,0xf0,0xd8,0xc8,0xc8, - 0xd8,0xf0,0xc0,0xc0,0x60,0x30,0x30,0x78, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50, -}; - -BMF_FontData BMF_font_helvb10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 8, -1, 0, 4, 1}, - {3, 3, -1, -5, 5, 9}, - {7, 7, 1, 0, 6, 12}, - {5, 10, 0, 1, 6, 19}, - {7, 8, 0, 0, 8, 29}, - {7, 8, 0, 0, 8, 37}, - {2, 4, 0, -4, 3, 45}, - {3, 10, 0, 2, 4, 49}, - {3, 10, 0, 2, 4, 59}, - {3, 3, 0, -5, 4, 69}, - {6, 5, 0, -1, 6, 72}, - {2, 4, 0, 2, 3, 77}, - {5, 1, -1, -3, 7, 81}, - {2, 2, 0, 0, 3, 82}, - {4, 8, 0, 0, 4, 84}, - {5, 8, 0, 0, 6, 92}, - {3, 8, -1, 0, 6, 100}, - {5, 8, 0, 0, 6, 108}, - {5, 8, 0, 0, 6, 116}, - {6, 8, 0, 0, 6, 124}, - {5, 8, 0, 0, 6, 132}, - {5, 8, 0, 0, 6, 140}, - {5, 8, 0, 0, 6, 148}, - {5, 8, 0, 0, 6, 156}, - {5, 8, 0, 0, 6, 164}, - {2, 6, 0, 0, 3, 172}, - {2, 8, 0, 2, 3, 178}, - {4, 5, 0, -1, 5, 186}, - {5, 3, 0, -2, 6, 191}, - {4, 5, 0, -1, 5, 194}, - {5, 8, 0, 0, 6, 199}, - {10, 9, 0, 1, 11, 207}, - {7, 8, 0, 0, 8, 225}, - {6, 8, 0, 0, 7, 233}, - {7, 8, 0, 0, 8, 241}, - {6, 8, 0, 0, 7, 249}, - {5, 8, 0, 0, 6, 257}, - {5, 8, 0, 0, 6, 265}, - {7, 8, 0, 0, 8, 273}, - {6, 8, 0, 0, 7, 281}, - {2, 8, 0, 0, 3, 289}, - {5, 8, 0, 0, 6, 297}, - {7, 8, 0, 0, 7, 305}, - {5, 8, 0, 0, 6, 313}, - {9, 8, 0, 0, 10, 321}, - {7, 8, 0, 0, 8, 337}, - {7, 8, 0, 0, 8, 345}, - {6, 8, 0, 0, 7, 353}, - {7, 9, 0, 1, 8, 361}, - {6, 8, 0, 0, 7, 370}, - {6, 8, 0, 0, 7, 378}, - {6, 8, 0, 0, 7, 386}, - {6, 8, 0, 0, 7, 394}, - {7, 8, 0, 0, 8, 402}, - {10, 8, 0, 0, 11, 410}, - {7, 8, 0, 0, 8, 426}, - {8, 8, 0, 0, 9, 434}, - {6, 8, 0, 0, 7, 442}, - {3, 10, 0, 2, 4, 450}, - {4, 8, 0, 0, 4, 460}, - {3, 10, 0, 2, 4, 468}, - {4, 4, 0, -4, 5, 478}, - {6, 1, 0, 2, 6, 482}, - {2, 4, 0, -4, 3, 483}, - {6, 6, 0, 0, 6, 487}, - {5, 8, 0, 0, 6, 493}, - {4, 6, 0, 0, 5, 501}, - {5, 8, 0, 0, 6, 507}, - {5, 6, 0, 0, 6, 515}, - {5, 8, 1, 0, 4, 521}, - {5, 8, 0, 2, 6, 529}, - {5, 8, 0, 0, 6, 537}, - {2, 8, 0, 0, 3, 545}, - {3, 10, 1, 2, 3, 553}, - {6, 8, 0, 0, 6, 563}, - {2, 8, 0, 0, 3, 571}, - {8, 6, 0, 0, 9, 579}, - {5, 6, 0, 0, 6, 585}, - {5, 6, 0, 0, 6, 591}, - {5, 8, 0, 2, 6, 597}, - {5, 8, 0, 2, 6, 605}, - {4, 6, 0, 0, 4, 613}, - {5, 6, 0, 0, 6, 619}, - {4, 8, 1, 0, 4, 625}, - {5, 6, 0, 0, 6, 633}, - {5, 6, 0, 0, 6, 639}, - {7, 6, 0, 0, 8, 645}, - {6, 6, 0, 0, 7, 651}, - {5, 8, 0, 2, 6, 657}, - {5, 6, 0, 0, 6, 665}, - {4, 10, 0, 2, 5, 671}, - {1, 10, -1, 2, 3, 681}, - {4, 10, 0, 2, 5, 691}, - {5, 2, 0, -3, 6, 701}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 703}, - {2, 8, -1, 2, 4, 704}, - {5, 8, 0, 1, 6, 712}, - {5, 8, 0, 0, 6, 720}, - {6, 6, 0, -1, 6, 728}, - {6, 8, 0, 0, 7, 734}, - {1, 10, -1, 2, 3, 742}, - {5, 10, 0, 2, 6, 752}, - {3, 1, 0, -7, 3, 762}, - {8, 8, -1, 0, 10, 763}, - {3, 5, -1, -3, 5, 771}, - {6, 3, 0, -1, 7, 776}, - {5, 3, -1, -2, 7, 779}, - {4, 1, 0, -3, 5, 782}, - {8, 8, -1, 0, 10, 783}, - {3, 1, 0, -7, 3, 791}, - {3, 3, 0, -5, 4, 792}, - {6, 7, 0, 0, 6, 795}, - {3, 4, 0, -4, 3, 802}, - {3, 4, 0, -4, 3, 806}, - {2, 2, 0, -7, 3, 810}, - {5, 8, 0, 2, 6, 812}, - {6, 10, 0, 2, 6, 820}, - {2, 1, 0, -3, 3, 830}, - {2, 2, 0, 2, 3, 831}, - {2, 4, 0, -4, 3, 833}, - {3, 5, -1, -3, 5, 837}, - {6, 3, 0, -1, 7, 842}, - {8, 8, 0, 0, 9, 845}, - {7, 8, 0, 0, 9, 853}, - {8, 8, 0, 0, 9, 861}, - {5, 8, 0, 2, 6, 869}, - {7, 11, 0, 0, 8, 877}, - {7, 11, 0, 0, 8, 888}, - {7, 11, 0, 0, 8, 899}, - {7, 11, 0, 0, 8, 910}, - {7, 10, 0, 0, 8, 921}, - {7, 11, 0, 0, 8, 931}, - {9, 8, 0, 0, 10, 942}, - {7, 10, 0, 2, 8, 958}, - {5, 11, 0, 0, 6, 968}, - {5, 11, 0, 0, 6, 979}, - {5, 11, 0, 0, 6, 990}, - {5, 10, 0, 0, 6, 1001}, - {2, 11, 0, 0, 3, 1011}, - {2, 11, 0, 0, 3, 1022}, - {3, 11, 1, 0, 3, 1033}, - {4, 10, 1, 0, 3, 1044}, - {7, 8, 1, 0, 7, 1054}, - {7, 11, 0, 0, 8, 1062}, - {7, 11, 0, 0, 8, 1073}, - {7, 11, 0, 0, 8, 1084}, - {7, 11, 0, 0, 8, 1095}, - {7, 11, 0, 0, 8, 1106}, - {7, 10, 0, 0, 8, 1117}, - {6, 5, 0, -1, 6, 1127}, - {7, 8, 0, 0, 8, 1132}, - {6, 11, 0, 0, 7, 1140}, - {6, 11, 0, 0, 7, 1151}, - {6, 11, 0, 0, 7, 1162}, - {6, 10, 0, 0, 7, 1173}, - {8, 11, 0, 0, 9, 1183}, - {6, 8, 0, 0, 7, 1194}, - {5, 8, 0, 0, 6, 1202}, - {6, 9, 0, 0, 6, 1210}, - {6, 9, 0, 0, 6, 1219}, - {6, 9, 0, 0, 6, 1228}, - {6, 9, 0, 0, 6, 1237}, - {6, 8, 0, 0, 6, 1246}, - {6, 9, 0, 0, 6, 1254}, - {8, 6, 0, 0, 9, 1263}, - {4, 8, 0, 2, 5, 1269}, - {5, 9, 0, 0, 6, 1277}, - {5, 9, 0, 0, 6, 1286}, - {5, 9, 0, 0, 6, 1295}, - {5, 8, 0, 0, 6, 1304}, - {2, 9, 0, 0, 3, 1312}, - {2, 9, 0, 0, 3, 1321}, - {3, 9, 0, 0, 3, 1330}, - {3, 8, 0, 0, 3, 1339}, - {5, 9, 0, 0, 6, 1347}, - {5, 9, 0, 0, 6, 1356}, - {5, 9, 0, 0, 6, 1365}, - {5, 9, 0, 0, 6, 1374}, - {5, 9, 0, 0, 6, 1383}, - {5, 9, 0, 0, 6, 1392}, - {5, 8, 0, 0, 6, 1401}, - {6, 5, 0, -1, 6, 1409}, - {7, 6, 1, 0, 6, 1414}, - {5, 9, 0, 0, 6, 1420}, - {5, 9, 0, 0, 6, 1429}, - {5, 9, 0, 0, 6, 1438}, - {5, 8, 0, 0, 6, 1447}, - {5, 11, 0, 2, 6, 1455}, - {5, 10, 0, 2, 6, 1466}, - {5, 10, 0, 2, 6, 1476}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb12.cpp b/intern/bmfont/intern/BMF_font_helvb12.cpp deleted file mode 100644 index 8b56bdceee7..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb12.cpp +++ /dev/null @@ -1,565 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB12 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xa0,0xa0,0xa0,0x6c, - 0x00,0x6c,0x00,0x6c,0x00,0xff,0x00,0x36, - 0x00,0x36,0x00,0x36,0x00,0x7f,0x80,0x1b, - 0x00,0x1b,0x00,0x1b,0x00,0x30,0x30,0x78, - 0xec,0xac,0x3c,0x38,0x70,0xf0,0xd4,0xdc, - 0x78,0x30,0x63,0x80,0x37,0xc0,0x36,0xc0, - 0x1f,0xc0,0x1b,0x80,0x0c,0x00,0x76,0x00, - 0xfe,0x00,0xdb,0x00,0xfb,0x00,0x71,0x80, - 0x73,0x80,0xff,0x00,0xce,0x00,0xcf,0x00, - 0xdd,0x80,0x79,0x80,0x38,0x00,0x6c,0x00, - 0x6c,0x00,0x7c,0x00,0x38,0x00,0x80,0x40, - 0xc0,0xc0,0x30,0x60,0x60,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x30, - 0xc0,0x60,0x60,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x60,0x60,0xc0,0xd8,0x70, - 0x70,0xf8,0x20,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x80,0x40,0xc0,0xc0,0xfc,0xfc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x60,0x20, - 0x30,0x30,0x30,0x18,0x18,0x18,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xf0,0xf0,0x30,0xfc,0xfc,0xc0,0x60, - 0x70,0x38,0x18,0xcc,0xcc,0xfc,0x78,0x78, - 0xfc,0xcc,0xcc,0x0c,0x38,0x38,0x0c,0xcc, - 0xfc,0x78,0x0c,0x0c,0xfe,0xfe,0xcc,0x6c, - 0x6c,0x3c,0x3c,0x1c,0x1c,0x78,0xfc,0xcc, - 0xcc,0x0c,0xfc,0xf8,0xc0,0xc0,0xfc,0xfc, - 0x78,0xfc,0xcc,0xcc,0xcc,0xfc,0xf8,0xc0, - 0xcc,0xfc,0x78,0x60,0x60,0x60,0x30,0x30, - 0x30,0x18,0x18,0x0c,0xfc,0xfc,0x78,0xfc, - 0xcc,0xcc,0xcc,0x78,0x78,0xcc,0xcc,0xfc, - 0x78,0x78,0xfc,0xcc,0x0c,0x7c,0xfc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xc0,0xc0,0x00,0x00, - 0x00,0x00,0xc0,0xc0,0x80,0x40,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x0c,0x38, - 0xe0,0xe0,0x38,0x0c,0xfc,0xfc,0x00,0xfc, - 0xfc,0xc0,0x70,0x1c,0x1c,0x70,0xc0,0x30, - 0x30,0x00,0x30,0x30,0x38,0x1c,0xcc,0xcc, - 0xfc,0x78,0x1f,0x00,0x71,0x80,0x40,0x00, - 0xdd,0x80,0xb6,0xc0,0xb2,0x40,0xb3,0x60, - 0xdb,0x20,0x4d,0xa0,0x60,0x40,0x39,0xc0, - 0x0f,0x00,0xc3,0xc3,0xff,0x7e,0x66,0x66, - 0x3c,0x3c,0x3c,0x18,0x18,0xf8,0xfc,0xcc, - 0xcc,0xcc,0xf8,0xf8,0xcc,0xcc,0xfc,0xf8, - 0x78,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xcc,0xfc,0x78,0xf8,0xfc,0xce,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xce,0xfc,0xf8,0xfc,0xfc, - 0xc0,0xc0,0xc0,0xf8,0xf8,0xc0,0xc0,0xfc, - 0xfc,0xc0,0xc0,0xc0,0xc0,0xc0,0xf8,0xf8, - 0xc0,0xc0,0xfc,0xfc,0x76,0xfe,0xc6,0xc6, - 0xde,0xde,0xc0,0xc0,0xc6,0xfe,0x7c,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xfe,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x70,0xf8,0xd8, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, - 0xc6,0xce,0xcc,0xd8,0xf8,0xf0,0xf0,0xd8, - 0xcc,0xcc,0xc6,0xfc,0xfc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc9,0x80, - 0xc9,0x80,0xdd,0x80,0xdd,0x80,0xf7,0x80, - 0xf7,0x80,0xe3,0x80,0xe3,0x80,0xe3,0x80, - 0xc1,0x80,0xc1,0x80,0xc6,0xc6,0xce,0xce, - 0xde,0xd6,0xf6,0xe6,0xe6,0xc6,0xc6,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xfe,0x7c,0xc0,0xc0,0xc0,0xc0,0xfc,0xfe, - 0xc6,0xc6,0xc6,0xfe,0xfc,0x06,0x7e,0xfc, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xfe, - 0x7c,0xc6,0xc6,0xc6,0xce,0xfc,0xfc,0xc6, - 0xc6,0xc6,0xfe,0xfc,0x78,0xfc,0xcc,0x0c, - 0x1c,0x78,0xe0,0xc0,0xcc,0xfc,0x78,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0xfc,0xfc,0x7c,0xfe,0xc6,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xc6,0x18,0x18,0x18, - 0x3c,0x3c,0x3c,0x66,0x66,0x66,0xc3,0xc3, - 0x33,0x00,0x33,0x00,0x33,0x00,0x3b,0x00, - 0x7f,0x80,0x6d,0x80,0x6d,0x80,0x6d,0x80, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xc3,0xc3, - 0x66,0x7e,0x3c,0x18,0x3c,0x7e,0x66,0xc3, - 0xc3,0x18,0x18,0x18,0x18,0x18,0x3c,0x3c, - 0x66,0x66,0xc3,0xc3,0xfe,0xfe,0xc0,0x60, - 0x60,0x30,0x18,0x18,0x0c,0xfe,0xfe,0xe0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xe0,0x30,0x30,0x30, - 0x70,0x60,0x60,0x60,0xe0,0xc0,0xc0,0xc0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x88,0xd8, - 0x70,0x70,0x20,0xfe,0xc0,0xc0,0x80,0x40, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0xd8, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xc0,0xc0, - 0xcc,0xfc,0x78,0x6c,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x6c,0x0c,0x0c,0x0c,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xec,0xfc,0xd8,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0xc0,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x60, - 0xcc,0xd8,0xd8,0xf0,0xe0,0xf0,0xd8,0xcc, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xee,0xc0,0xff,0xc0,0xbb,0x80,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0x0c,0x0c,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xb0,0x78,0xfc,0xcc,0x1c, - 0x78,0xe0,0xfc,0x78,0x30,0x70,0x60,0x60, - 0x60,0x60,0xf0,0xf0,0x60,0x60,0x6c,0xfc, - 0xdc,0xcc,0xcc,0xcc,0xcc,0xcc,0x30,0x30, - 0x78,0x78,0x78,0xcc,0xcc,0xcc,0x24,0x24, - 0x76,0x76,0x7e,0xdb,0xdb,0xdb,0xcc,0xcc, - 0x78,0x38,0x70,0x78,0xcc,0xcc,0xe0,0xf0, - 0x30,0x30,0x38,0x78,0x78,0x48,0xcc,0xcc, - 0xcc,0xfc,0xfc,0x60,0x30,0x30,0x18,0xfc, - 0xfc,0x30,0x60,0x60,0x60,0x60,0x60,0x40, - 0x80,0x40,0x60,0x60,0x60,0x60,0x30,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x60,0x60,0x60, - 0x60,0x60,0x20,0x10,0x20,0x60,0x60,0x60, - 0x60,0xc0,0x98,0xfc,0x64,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0xc0, - 0xc0,0x78,0xfc,0xec,0xe0,0xd0,0xd4,0xfc, - 0x78,0x0c,0xdc,0xfe,0x60,0x30,0x30,0xfc, - 0x30,0x60,0x64,0x7c,0x38,0xcc,0x78,0xcc, - 0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e,0x18, - 0x7e,0x3c,0x66,0x66,0xc3,0xc3,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x80,0x78,0xfc,0xcc,0x1c,0x38, - 0x6c,0xcc,0xcc,0xd8,0x70,0xe0,0xcc,0xfc, - 0x78,0xd8,0xd8,0x1f,0x00,0x71,0xc0,0x6e, - 0xc0,0xdb,0x60,0xdb,0x60,0xd8,0x60,0xdb, - 0x60,0xdb,0x60,0x6e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60, - 0x36,0x6c,0xd8,0x6c,0x36,0x0c,0x0c,0xfc, - 0xfc,0xe0,0xe0,0x1f,0x00,0x71,0xc0,0x7b, - 0xc0,0xdb,0x60,0xdf,0x60,0xde,0x60,0xdb, - 0x60,0xdb,0x60,0x7e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0xf0,0x60,0x90,0x90,0x60,0xfc, - 0xfc,0x00,0x30,0x30,0xfc,0xfc,0x30,0x30, - 0xf0,0x40,0x20,0x10,0x90,0x60,0x60,0x90, - 0x10,0x20,0x90,0x60,0xc0,0x70,0x30,0xc0, - 0xc0,0xc0,0xec,0xfc,0xdc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x36,0x36,0x36,0x36,0x36,0x36, - 0x36,0x36,0x76,0xf6,0xf6,0xf6,0xfe,0x7e, - 0xc0,0xc0,0xc0,0x60,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf8,0x00,0x70,0xd8,0xd8, - 0xd8,0x70,0xd8,0x6c,0x36,0x6c,0xd8,0x20, - 0x80,0x27,0xc0,0x12,0x80,0x12,0x80,0x09, - 0x80,0x4c,0x80,0x44,0x00,0x42,0x00,0x42, - 0x00,0xc1,0x00,0x41,0x00,0x23,0xc0,0x21, - 0x00,0x10,0x80,0x10,0x40,0x0a,0x40,0x4d, - 0x80,0x44,0x00,0x42,0x00,0x42,0x00,0xc1, - 0x00,0x41,0x00,0x20,0x80,0x27,0xc0,0x12, - 0x80,0x12,0x80,0x09,0x80,0x6c,0x80,0x94, - 0x00,0x12,0x00,0x22,0x00,0x91,0x00,0x61, - 0x00,0x78,0xfc,0xcc,0xcc,0xe0,0x70,0x30, - 0x30,0x00,0x30,0x30,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x0c,0x38,0x30, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x30,0x1c,0x0c,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x66,0x3c,0x18, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x2c,0x3e,0x1a,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x6c,0x6c,0xc3, - 0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18,0x00, - 0x18,0x34,0x18,0xc7,0xe0,0xc7,0xe0,0xfe, - 0x00,0x7e,0x00,0x66,0x00,0x67,0xc0,0x37, - 0xc0,0x36,0x00,0x3e,0x00,0x1f,0xe0,0x1f, - 0xe0,0x60,0x30,0x20,0x78,0xfc,0xcc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xfc,0x78,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0x18,0x70,0x60,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0x60,0x38,0x18,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0xcc,0x78,0x30,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0xd8,0xd8,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x30, - 0xe0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0xc0,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xcc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0xd8,0x7c,0x7e,0x67, - 0x63,0x63,0xfb,0xfb,0x63,0x67,0x7e,0x7c, - 0xc6,0xce,0xce,0xde,0xf6,0xe6,0xe6,0xc6, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x18,0x70,0x60, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0xcc,0x78,0x30, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x6c,0x6c,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xde,0x00,0x7f, - 0x00,0x63,0x00,0x73,0x00,0x7b,0x00,0x6b, - 0x00,0x6f,0x00,0x67,0x00,0x63,0x00,0x7f, - 0x00,0x3d,0x80,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x18,0x70,0x60,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0xcc,0x78,0x30,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x6c,0x18,0x18,0x18,0x18,0x3c,0x7e, - 0xe7,0xc3,0x00,0x30,0x1c,0x0c,0xc0,0xc0, - 0xfc,0xfe,0xc6,0xc6,0xc6,0xfe,0xfc,0xc0, - 0xc0,0xd8,0xdc,0xcc,0xcc,0xcc,0xd8,0xd8, - 0xcc,0xcc,0xfc,0x78,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0x18,0x70,0x60, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x60,0x38,0x18,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xcc,0x78,0x30, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x58,0x7c,0x34,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xd8,0xd8,0x76, - 0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78,0x00, - 0x30,0x68,0x30,0x77,0x80,0xff,0xc0,0xcc, - 0x00,0xff,0xc0,0x7f,0xc0,0x8c,0xc0,0xff, - 0xc0,0x7b,0x80,0x60,0x30,0x20,0x78,0xfc, - 0xcc,0xc0,0xc0,0xcc,0xfc,0x78,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0x18, - 0x70,0x60,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0x60,0x38,0x18,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0xcc, - 0x78,0x30,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0xd8,0xd8,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x30,0xe0, - 0xc0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xc0,0x70,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x00,0xcc,0x78, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x78,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xb0,0x60,0xd0,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0x18,0x70,0x60,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0x60,0x38,0x18,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xcc,0x78,0x30,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x30,0x30, - 0x00,0xfc,0xfc,0x00,0x30,0x30,0xc0,0x78, - 0xfc,0xcc,0xec,0xdc,0xcc,0xfc,0x78,0x0c, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0x18,0x70,0x60,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x60,0x38,0x18, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0xcc,0x78,0x30,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0xd8,0xd8,0xe0, - 0xf0,0x30,0x30,0x38,0x78,0x78,0x48,0xcc, - 0xcc,0xcc,0x00,0x60,0x38,0x18,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0xc0,0xc0,0xc0,0xe0,0xf0,0x30,0x30, - 0x38,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x00, - 0xd8,0xd8, -}; - -BMF_FontData BMF_font_helvb12 = { - -1, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 11, -1, 0, 4, 1}, - {3, 3, 0, -8, 4, 12}, - {9, 11, 1, 0, 7, 15}, - {6, 13, 0, 2, 7, 37}, - {10, 11, 0, 0, 11, 50}, - {9, 11, 0, 0, 9, 72}, - {2, 4, 0, -7, 3, 94}, - {4, 14, 0, 3, 4, 98}, - {4, 14, 1, 3, 4, 112}, - {5, 5, 0, -6, 6, 126}, - {6, 6, 0, -1, 7, 131}, - {2, 4, 0, 2, 3, 137}, - {6, 2, -1, -3, 9, 141}, - {2, 2, 0, 0, 3, 143}, - {5, 13, 1, 2, 4, 145}, - {6, 11, 0, 0, 7, 158}, - {4, 11, 0, 0, 6, 169}, - {6, 11, 0, 0, 7, 180}, - {6, 11, 0, 0, 7, 191}, - {7, 11, 0, 0, 7, 202}, - {6, 11, 0, 0, 7, 213}, - {6, 11, 0, 0, 7, 224}, - {6, 11, 0, 0, 7, 235}, - {6, 11, 0, 0, 7, 246}, - {6, 11, 0, 0, 7, 257}, - {2, 8, -1, 0, 4, 268}, - {2, 10, -1, 2, 4, 276}, - {6, 6, 0, -1, 7, 286}, - {6, 5, 0, -2, 7, 292}, - {6, 6, 0, -1, 7, 297}, - {6, 11, 0, 0, 7, 303}, - {11, 12, 0, 1, 12, 314}, - {8, 11, 0, 0, 8, 338}, - {6, 11, -1, 0, 8, 349}, - {6, 11, -1, 0, 8, 360}, - {7, 11, -1, 0, 9, 371}, - {6, 11, -1, 0, 8, 382}, - {6, 11, -1, 0, 7, 393}, - {7, 11, -1, 0, 9, 404}, - {7, 11, -1, 0, 9, 415}, - {2, 11, -2, 0, 6, 426}, - {5, 11, 0, 0, 6, 437}, - {7, 11, -1, 0, 8, 448}, - {6, 11, -1, 0, 7, 459}, - {9, 11, -1, 0, 11, 470}, - {7, 11, -1, 0, 9, 492}, - {7, 11, -1, 0, 9, 503}, - {7, 11, -1, 0, 9, 514}, - {7, 12, -1, 1, 9, 525}, - {7, 11, -1, 0, 9, 537}, - {6, 11, -1, 0, 8, 548}, - {6, 11, 0, 0, 6, 559}, - {7, 11, -1, 0, 9, 570}, - {8, 11, 0, 0, 8, 581}, - {10, 11, 0, 0, 10, 592}, - {8, 11, 0, 0, 8, 614}, - {8, 11, 0, 0, 8, 625}, - {7, 11, 0, 0, 7, 636}, - {3, 14, 0, 3, 4, 647}, - {4, 11, 0, 0, 5, 661}, - {3, 14, 0, 3, 4, 672}, - {5, 5, 0, -6, 7, 686}, - {7, 1, 0, 2, 7, 691}, - {2, 4, 0, -7, 3, 692}, - {7, 8, 0, 0, 7, 696}, - {6, 11, 0, 0, 7, 704}, - {6, 8, 0, 0, 7, 715}, - {6, 11, 0, 0, 7, 723}, - {6, 8, 0, 0, 7, 734}, - {4, 11, 0, 0, 5, 742}, - {6, 11, 0, 3, 7, 753}, - {6, 11, 0, 0, 7, 764}, - {2, 11, -1, 0, 5, 775}, - {3, 14, 0, 3, 5, 786}, - {6, 11, 0, 0, 6, 800}, - {2, 11, -1, 0, 5, 811}, - {10, 8, 0, 0, 11, 822}, - {6, 8, 0, 0, 7, 838}, - {6, 8, 0, 0, 7, 846}, - {6, 11, 0, 3, 7, 854}, - {6, 11, 0, 3, 7, 865}, - {4, 8, 0, 0, 4, 876}, - {6, 8, 0, 0, 7, 884}, - {4, 10, 0, 0, 5, 892}, - {6, 8, 0, 0, 7, 902}, - {6, 8, 0, 0, 7, 910}, - {8, 8, 0, 0, 9, 918}, - {6, 8, 0, 0, 7, 926}, - {6, 11, 0, 3, 7, 934}, - {6, 8, 0, 0, 7, 945}, - {4, 14, 0, 3, 4, 953}, - {1, 13, -1, 2, 3, 967}, - {4, 14, 0, 3, 4, 980}, - {6, 3, 0, -3, 7, 994}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 11, 0, 3, 3, 997}, - {6, 10, 0, 1, 7, 1008}, - {7, 11, 0, 0, 7, 1018}, - {6, 6, 0, -3, 7, 1029}, - {8, 11, 1, 0, 7, 1035}, - {1, 13, -1, 2, 3, 1046}, - {6, 14, 0, 3, 7, 1059}, - {5, 2, 0, -9, 5, 1073}, - {11, 11, 0, 0, 12, 1075}, - {4, 7, 0, -4, 5, 1097}, - {7, 5, 0, -2, 8, 1104}, - {6, 4, -1, -3, 9, 1109}, - {3, 2, 0, -3, 4, 1113}, - {11, 11, 0, 0, 12, 1115}, - {4, 2, 0, -9, 4, 1137}, - {4, 4, -1, -7, 6, 1139}, - {6, 9, 0, -1, 7, 1143}, - {4, 6, 0, -5, 4, 1152}, - {4, 6, 0, -5, 4, 1158}, - {4, 3, -1, -9, 4, 1164}, - {6, 11, 0, 3, 7, 1167}, - {7, 14, -1, 3, 10, 1178}, - {2, 2, 0, -5, 3, 1192}, - {3, 3, -1, 3, 5, 1194}, - {2, 6, 0, -5, 4, 1197}, - {5, 7, 0, -4, 6, 1203}, - {7, 5, 0, -2, 8, 1210}, - {10, 11, 0, 0, 11, 1215}, - {10, 11, 0, 0, 11, 1237}, - {10, 11, 0, 0, 11, 1259}, - {6, 11, 0, 3, 7, 1281}, - {8, 12, 0, 0, 8, 1292}, - {8, 12, 0, 0, 8, 1304}, - {8, 12, 0, 0, 8, 1316}, - {8, 12, 0, 0, 8, 1328}, - {8, 11, 0, 0, 8, 1340}, - {8, 12, 0, 0, 8, 1351}, - {11, 11, 0, 0, 12, 1363}, - {6, 14, -1, 3, 8, 1385}, - {6, 12, -1, 0, 8, 1399}, - {6, 12, -1, 0, 8, 1411}, - {6, 12, -1, 0, 8, 1423}, - {6, 11, -1, 0, 8, 1435}, - {4, 12, -1, 0, 6, 1446}, - {4, 12, -1, 0, 6, 1458}, - {6, 12, 0, 0, 6, 1470}, - {5, 11, 0, 0, 6, 1482}, - {8, 11, 0, 0, 9, 1493}, - {7, 12, -1, 0, 9, 1504}, - {7, 12, -1, 0, 9, 1516}, - {7, 12, -1, 0, 9, 1528}, - {7, 12, -1, 0, 9, 1540}, - {7, 12, -1, 0, 9, 1552}, - {7, 11, -1, 0, 9, 1564}, - {6, 6, 0, -1, 7, 1575}, - {9, 11, 0, 0, 9, 1581}, - {7, 12, -1, 0, 9, 1603}, - {7, 12, -1, 0, 9, 1615}, - {7, 12, -1, 0, 9, 1627}, - {7, 11, -1, 0, 9, 1639}, - {8, 12, 0, 0, 8, 1650}, - {7, 11, -1, 0, 9, 1662}, - {6, 11, 0, 0, 7, 1673}, - {7, 12, 0, 0, 7, 1684}, - {7, 12, 0, 0, 7, 1696}, - {7, 12, 0, 0, 7, 1708}, - {7, 12, 0, 0, 7, 1720}, - {7, 11, 0, 0, 7, 1732}, - {7, 12, 0, 0, 7, 1743}, - {10, 8, 0, 0, 11, 1755}, - {6, 11, 0, 3, 7, 1771}, - {6, 12, 0, 0, 7, 1782}, - {6, 12, 0, 0, 7, 1794}, - {6, 12, 0, 0, 7, 1806}, - {6, 11, 0, 0, 7, 1818}, - {4, 12, 0, 0, 5, 1829}, - {4, 12, 0, 0, 5, 1841}, - {6, 12, 1, 0, 5, 1853}, - {5, 11, 1, 0, 5, 1865}, - {6, 11, 0, 0, 7, 1876}, - {6, 12, 0, 0, 7, 1887}, - {6, 12, 0, 0, 7, 1899}, - {6, 12, 0, 0, 7, 1911}, - {6, 12, 0, 0, 7, 1923}, - {6, 12, 0, 0, 7, 1935}, - {6, 11, 0, 0, 7, 1947}, - {6, 8, 0, 0, 7, 1958}, - {6, 10, 0, 1, 7, 1966}, - {6, 12, 0, 0, 7, 1976}, - {6, 12, 0, 0, 7, 1988}, - {6, 12, 0, 0, 7, 2000}, - {6, 11, 0, 0, 7, 2012}, - {6, 15, 0, 3, 7, 2023}, - {6, 14, 0, 3, 7, 2038}, - {6, 14, 0, 3, 7, 2052}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb14.cpp b/intern/bmfont/intern/BMF_font_helvb14.cpp deleted file mode 100644 index c6d3e0ec701..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb14.cpp +++ /dev/null @@ -1,623 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB14 - -static unsigned char bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0x00,0x80,0x80,0x80, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x90,0xd8,0xd8, - 0xd8,0x48,0x48,0x48,0xfe,0xfe,0x24,0x24, - 0x7f,0x7f,0x12,0x12,0x12,0x10,0x10,0x38, - 0x7c,0xd6,0xd6,0x16,0x3c,0x78,0xd0,0xd6, - 0xd6,0x7c,0x38,0x10,0x30,0xc0,0x11,0xe0, - 0x19,0x20,0x09,0x20,0x0d,0xe0,0x64,0xc0, - 0xf6,0x00,0x92,0x00,0x93,0x00,0xf1,0x00, - 0x61,0x80,0x71,0x80,0xff,0x00,0xce,0x00, - 0xc6,0x00,0xcf,0x00,0x79,0x00,0x30,0x00, - 0x38,0x00,0x6c,0x00,0x6c,0x00,0x7c,0x00, - 0x38,0x00,0x80,0x40,0xc0,0xc0,0x30,0x20, - 0x60,0x40,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x40,0x40,0x60,0x20,0x30,0xc0,0x40,0x60, - 0x20,0x20,0x30,0x30,0x30,0x30,0x30,0x20, - 0x20,0x60,0x40,0xc0,0xd8,0x50,0x20,0xf8, - 0x20,0x20,0x30,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x30,0x80,0x40,0x40,0xc0,0xc0,0xfe, - 0xfe,0xc0,0xc0,0x80,0x80,0xc0,0x40,0x40, - 0x60,0x20,0x20,0x30,0x10,0x10,0x30,0x78, - 0x48,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x48, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0xf0,0x30,0x10,0xfc,0xfc, - 0x60,0x60,0x30,0x18,0x18,0x0c,0xcc,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xcc,0x0c,0x38, - 0x38,0x0c,0xcc,0xcc,0x78,0x30,0x18,0x18, - 0xfc,0xfc,0x98,0x58,0x58,0x38,0x38,0x38, - 0x18,0x18,0x70,0xf8,0xcc,0x0c,0x0c,0xcc, - 0xfc,0xd8,0x60,0x60,0x7c,0x7c,0x30,0x78, - 0xcc,0xcc,0xcc,0xcc,0xfc,0xd8,0xc0,0x4c, - 0x7c,0x38,0x60,0x60,0x60,0x20,0x30,0x30, - 0x10,0x18,0x08,0x0c,0xfc,0xfc,0x70,0xf8, - 0xcc,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc, - 0x7c,0x38,0x70,0xf8,0xc8,0x0c,0x6c,0xfc, - 0xcc,0xcc,0xcc,0xcc,0x78,0x30,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x80,0x40, - 0x40,0xc0,0xc0,0x00,0x00,0x00,0x00,0xc0, - 0xc0,0x02,0x0e,0x3c,0xf0,0xf0,0x3c,0x0e, - 0x02,0xfc,0xfc,0x00,0x00,0xfc,0xfc,0x80, - 0xe0,0x78,0x1e,0x1e,0x78,0xe0,0x80,0x30, - 0x30,0x00,0x30,0x30,0x18,0x18,0x0c,0xcc, - 0xcc,0x7c,0x38,0x0f,0x80,0x38,0x60,0x60, - 0x00,0x4d,0xc0,0xd3,0x20,0x93,0x30,0x91, - 0x10,0x91,0x90,0xc9,0x90,0x46,0x90,0x60, - 0x30,0x30,0x20,0x1c,0xc0,0x07,0x80,0xe1, - 0xc0,0x61,0x80,0x7f,0x80,0x7f,0x80,0x33, - 0x00,0x33,0x00,0x33,0x00,0x1e,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0xfc, - 0xfe,0xc7,0xc3,0xc7,0xfe,0xfc,0xc6,0xc3, - 0xc7,0xfe,0xfc,0x3c,0x7e,0x63,0xc3,0xc0, - 0xc0,0xc0,0xc0,0xc3,0x63,0x7e,0x3c,0xfc, - 0xfe,0xc6,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc6,0xfe,0xfc,0xfe,0xfe,0xc0,0xc0,0xc0, - 0xfe,0xfe,0xc0,0xc0,0xc0,0xfe,0xfe,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xfc,0xfc,0xc0,0xc0, - 0xc0,0xfe,0xfe,0x3e,0x80,0x7f,0x80,0x63, - 0x80,0xc1,0x80,0xc7,0x80,0xc7,0x80,0xc0, - 0x00,0xc0,0x00,0xc1,0x80,0x63,0x80,0x7f, - 0x00,0x3e,0x00,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xff,0xff,0xc3,0xc3,0xc3,0xc3,0xc3,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xcc,0xcc, - 0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0xc3, - 0x80,0xc7,0x00,0xc6,0x00,0xcc,0x00,0xdc, - 0x00,0xf8,0x00,0xf0,0x00,0xd8,0x00,0xcc, - 0x00,0xce,0x00,0xc7,0x00,0xc3,0x00,0xfe, - 0xfe,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc, - 0xc0,0xde,0xc0,0xde,0xc0,0xd2,0xc0,0xd2, - 0xc0,0xf3,0xc0,0xf3,0xc0,0xe1,0xc0,0xe1, - 0xc0,0xe1,0xc0,0xc3,0xc7,0xc7,0xcf,0xcf, - 0xdb,0xdb,0xf3,0xf3,0xe3,0xe3,0xc3,0x3e, - 0x00,0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1, - 0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1, - 0x80,0x63,0x00,0x7f,0x00,0x3e,0x00,0xc0, - 0xc0,0xc0,0xc0,0xf8,0xfc,0xce,0xc6,0xc6, - 0xce,0xfc,0xf8,0x01,0x80,0x3d,0x80,0x7f, - 0x00,0x67,0x00,0xcd,0x80,0xcd,0x80,0xc1, - 0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63, - 0x00,0x7f,0x00,0x3e,0x00,0xc3,0xc3,0xc3, - 0xc3,0xc7,0xfe,0xfe,0xc7,0xc3,0xc7,0xfe, - 0xfc,0x3c,0x7e,0xe7,0xc3,0x07,0x1e,0x78, - 0xe0,0xc3,0xe7,0x7e,0x3c,0x18,0x18,0x18, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff, - 0xff,0x3c,0x7e,0xe7,0xc3,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0x18,0x18,0x18, - 0x3c,0x3c,0x24,0x66,0x66,0x66,0xc3,0xc3, - 0xc3,0x30,0xc0,0x30,0xc0,0x30,0xc0,0x39, - 0xc0,0x79,0xe0,0x69,0x60,0x6f,0x60,0x6f, - 0x60,0xc6,0x30,0xc6,0x30,0xc6,0x30,0xc6, - 0x30,0xe3,0x80,0x63,0x00,0x63,0x00,0x36, - 0x00,0x36,0x00,0x1c,0x00,0x1c,0x00,0x36, - 0x00,0x36,0x00,0x63,0x00,0x63,0x00,0xe3, - 0x80,0x0c,0x00,0x0c,0x00,0x0c,0x00,0x0c, - 0x00,0x0c,0x00,0x1e,0x00,0x1e,0x00,0x33, - 0x00,0x33,0x00,0x61,0x80,0x61,0x80,0xe1, - 0xc0,0xff,0xff,0x60,0x70,0x30,0x18,0x18, - 0x0c,0x0e,0x06,0xff,0xff,0xe0,0xe0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xe0,0x10,0x10,0x30,0x20, - 0x20,0x60,0x40,0x40,0xc0,0x80,0x80,0xe0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0xe0,0xe0,0xcc,0xcc, - 0x48,0x78,0x78,0x30,0x30,0xfe,0xc0,0xc0, - 0x80,0x40,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0xd8,0xfc,0xee,0xc6,0xc6, - 0xc6,0xee,0xfc,0xd8,0xc0,0xc0,0xc0,0x38, - 0x7c,0xec,0xc0,0xc0,0xc0,0xec,0x7c,0x38, - 0x36,0x7e,0xee,0xc6,0xc6,0xc6,0xee,0x7e, - 0x36,0x06,0x06,0x06,0x38,0x7c,0xcc,0xc0, - 0xfc,0xcc,0xcc,0x78,0x30,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0xc6,0x36,0x7e,0xee,0xc6, - 0xc6,0xc6,0xee,0x7e,0x36,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xe0,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0x60,0xce,0xcc,0xd8,0xd8, - 0xf0,0xf0,0xd8,0xd8,0xcc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xff,0xc0,0xdb,0x80,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0x38, - 0x7c,0xee,0xc6,0xc6,0xc6,0xee,0x7c,0x38, - 0xc0,0xc0,0xc0,0xd8,0xfc,0xee,0xc6,0xc6, - 0xc6,0xee,0xfc,0xd8,0x06,0x06,0x06,0x36, - 0x7e,0xee,0xc6,0xc6,0xc6,0xee,0x7e,0x36, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xe0,0xf8, - 0xd0,0x78,0xfc,0xcc,0x1c,0x78,0xe0,0xcc, - 0xfc,0x78,0x30,0x70,0x60,0x60,0x60,0x60, - 0x60,0xf0,0xf0,0x60,0x60,0x76,0xfe,0xce, - 0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x30,0x30, - 0x30,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x33, - 0x00,0x33,0x00,0x33,0x00,0x73,0x80,0x7f, - 0x80,0x4c,0x80,0x4c,0x80,0xcc,0xc0,0xcc, - 0xc0,0xc6,0xee,0x6c,0x38,0x38,0x38,0x6c, - 0xee,0xc6,0x60,0x70,0x10,0x18,0x38,0x38, - 0x2c,0x6c,0x6c,0xc6,0xc6,0xc6,0xfc,0xfc, - 0x60,0x60,0x30,0x18,0x18,0xfc,0xfc,0x30, - 0x70,0x60,0x60,0x60,0x60,0x60,0xc0,0x60, - 0x60,0x60,0x60,0x60,0x70,0x30,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xc0,0xe0,0x60, - 0x60,0x60,0x60,0x60,0x30,0x60,0x60,0x60, - 0x60,0x60,0xe0,0xc0,0x98,0xfc,0x64,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x80,0x80,0x80,0x00, - 0x00,0xc0,0xc0,0x20,0x20,0x38,0x7c,0xec, - 0xe0,0xd0,0xd0,0xdc,0x7c,0x38,0x08,0x08, - 0xcc,0xfe,0x70,0x30,0x30,0xf8,0x60,0xc0, - 0xcc,0xcc,0x7c,0x38,0xcc,0x78,0xcc,0xcc, - 0xcc,0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e, - 0x18,0x7e,0x18,0x3c,0x24,0x66,0x42,0xc3, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00, - 0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x38, - 0x7c,0x6c,0x0c,0x18,0x7c,0xe6,0xc6,0xce, - 0x7c,0x30,0x60,0x6c,0x7c,0x38,0xd8,0xd8, - 0x1e,0x00,0x33,0x00,0x40,0x80,0xde,0xc0, - 0xb3,0x40,0xa0,0x40,0xa0,0x40,0xb3,0x40, - 0xde,0xc0,0x40,0x80,0x33,0x00,0x1e,0x00, - 0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60,0x24, - 0x6c,0xd8,0xd8,0x6c,0x24,0x06,0x06,0x06, - 0xfe,0xfe,0xe0,0xe0,0x1e,0x00,0x33,0x00, - 0x40,0x80,0xd2,0xc0,0x96,0x40,0x9c,0x40, - 0x92,0x40,0x92,0x40,0xdc,0xc0,0x40,0x80, - 0x33,0x00,0x1e,0x00,0xf0,0x60,0x90,0x90, - 0x90,0x60,0xfc,0xfc,0x00,0x30,0x30,0x30, - 0xfc,0xfc,0x30,0x30,0x30,0xf0,0x80,0x40, - 0x20,0x90,0xb0,0x60,0x60,0xb0,0x10,0x60, - 0x30,0x90,0x60,0xc0,0x60,0xc0,0xc0,0xc0, - 0xf6,0xfe,0xce,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xc6,0x14,0x14,0x14,0x14,0x14,0x14,0x14, - 0x14,0x74,0xf4,0xf4,0xf4,0xf4,0x74,0x3e, - 0xc0,0xc0,0xc0,0x60,0x40,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf0,0x00,0x60,0x90, - 0x90,0x90,0x60,0x90,0xd8,0x6c,0x6c,0xd8, - 0x90,0x20,0x40,0x10,0x40,0x13,0xe0,0x0a, - 0x40,0x09,0x40,0x24,0xc0,0x24,0x40,0x22, - 0x00,0x22,0x00,0x21,0x00,0xe1,0x00,0x20, - 0x80,0x21,0xe0,0x11,0x00,0x10,0x80,0x08, - 0x40,0x09,0x20,0x25,0x60,0x24,0xc0,0x22, - 0x00,0x22,0x00,0x21,0x00,0xe1,0x00,0x20, - 0x80,0x20,0x40,0x10,0x40,0x13,0xe0,0x0a, - 0x40,0x09,0x40,0x64,0xc0,0xb4,0x40,0x12, - 0x00,0x62,0x00,0x31,0x00,0x91,0x00,0x60, - 0x80,0x70,0xf8,0xcc,0xcc,0xc0,0x60,0x60, - 0x30,0x30,0x00,0x30,0x30,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x0c,0x00,0x18, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x00, - 0x00,0x0c,0x00,0x06,0x00,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x36,0x00,0x1c, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x00, - 0x00,0x16,0x00,0x0d,0x00,0xe1,0xc0,0x61, - 0x80,0x7f,0x80,0x3f,0x00,0x33,0x00,0x33, - 0x00,0x12,0x00,0x1e,0x00,0x1e,0x00,0x0c, - 0x00,0x0c,0x00,0x00,0x00,0x36,0x00,0x36, - 0x00,0xe1,0xc0,0x61,0x80,0x7f,0x80,0x3f, - 0x00,0x33,0x00,0x33,0x00,0x12,0x00,0x1e, - 0x00,0x1e,0x00,0x0c,0x00,0x0c,0x00,0x0c, - 0x00,0x0a,0x00,0x06,0x00,0xe3,0xf8,0x63, - 0xf8,0x7f,0x00,0x7f,0x00,0x33,0x00,0x33, - 0xf8,0x3b,0xf8,0x1b,0x00,0x1b,0x00,0x1f, - 0x00,0x0f,0xf8,0x0f,0xf8,0x18,0x0c,0x08, - 0x3c,0x7e,0x63,0xc3,0xc0,0xc0,0xc0,0xc0, - 0xc3,0x63,0x7e,0x3c,0xfe,0xfe,0xc0,0xc0, - 0xc0,0xfe,0xfe,0xc0,0xc0,0xfe,0xfe,0x00, - 0x18,0x30,0xfe,0xfe,0xc0,0xc0,0xc0,0xfe, - 0xfe,0xc0,0xc0,0xfe,0xfe,0x00,0x18,0x0c, - 0xfe,0xfe,0xc0,0xc0,0xc0,0xfe,0xfe,0xc0, - 0xc0,0xfe,0xfe,0x00,0x6c,0x38,0xfe,0xfe, - 0xc0,0xc0,0xc0,0xfe,0xfe,0xc0,0xc0,0xfe, - 0xfe,0x00,0x6c,0x6c,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00, - 0x60,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0x60, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x00,0xd8,0x70,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x7e,0x00,0x7f,0x00, - 0x63,0x00,0x61,0x80,0x61,0x80,0xf9,0x80, - 0xf9,0x80,0x61,0x80,0x61,0x80,0x63,0x00, - 0x7f,0x00,0x7e,0x00,0xc3,0xc7,0xc7,0xcf, - 0xcb,0xdb,0xd3,0xf3,0xe3,0xe3,0xc3,0x00, - 0x2c,0x1a,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x0c,0x00,0x18,0x00,0x3e,0x00, - 0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63,0x00, - 0x7f,0x00,0x3e,0x00,0x00,0x00,0x18,0x00, - 0x0c,0x00,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x36,0x00,0x1c,0x00,0x3e,0x00, - 0x7f,0x00,0x63,0x00,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0x63,0x00, - 0x7f,0x00,0x3e,0x00,0x00,0x00,0x2c,0x00, - 0x1a,0x00,0x3e,0x00,0x7f,0x00,0x63,0x00, - 0xc1,0x80,0xc1,0x80,0xc1,0x80,0xc1,0x80, - 0xc1,0x80,0x63,0x00,0x7f,0x00,0x3e,0x00, - 0x00,0x00,0x36,0x00,0x36,0x00,0x84,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0x84,0xbe,0x00, - 0xff,0x00,0x63,0x00,0xf1,0x80,0xd1,0x80, - 0xc9,0x80,0xc9,0x80,0xc5,0x80,0xc7,0x80, - 0x63,0x00,0x7f,0x80,0x3e,0x80,0x3c,0x7e, - 0xe7,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc3,0x00,0x18,0x30,0x3c,0x7e,0xe7,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0x00, - 0x18,0x0c,0x3c,0x7e,0xe7,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0xc3,0xc3,0x00,0x6c,0x38, - 0x3c,0x7e,0xe7,0xc3,0xc3,0xc3,0xc3,0xc3, - 0xc3,0xc3,0xc3,0x00,0x6c,0x6c,0x0c,0x00, - 0x0c,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00, - 0x1e,0x00,0x1e,0x00,0x33,0x00,0x33,0x00, - 0x61,0x80,0xe1,0xc0,0x00,0x00,0x0c,0x00, - 0x06,0x00,0xc0,0xc0,0xf8,0xfc,0xce,0xc6, - 0xc6,0xce,0xfc,0xf8,0xc0,0xc0,0xd8,0xdc, - 0xc6,0xc6,0xc6,0xdc,0xd8,0xcc,0xcc,0xcc, - 0x7c,0x38,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0x30,0x60,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x30,0x18,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0xd8,0x70,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x58,0x34,0x6c,0xfc,0xcc,0xcc,0x7c,0x1c, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x6c,0xfc, - 0xcc,0xcc,0x7c,0x1c,0xcc,0xfc,0x78,0x00, - 0x30,0x28,0x18,0x73,0x80,0xff,0xc0,0xcc, - 0xc0,0xcc,0x00,0x7f,0xc0,0x1c,0xc0,0xcc, - 0xc0,0xff,0xc0,0x73,0x80,0x30,0x18,0x10, - 0x38,0x7c,0xec,0xc0,0xc0,0xc0,0xec,0x7c, - 0x38,0x38,0x7c,0xcc,0xc0,0xfc,0xcc,0xcc, - 0x78,0x30,0x00,0x30,0x60,0x38,0x7c,0xcc, - 0xc0,0xfc,0xcc,0xcc,0x78,0x30,0x00,0x30, - 0x18,0x38,0x7c,0xcc,0xc0,0xfc,0xcc,0xcc, - 0x78,0x30,0x00,0x6c,0x38,0x38,0x7c,0xcc, - 0xc0,0xfc,0xcc,0xcc,0x78,0x30,0x00,0xd8, - 0xd8,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0x60,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0, - 0x60,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xd8, - 0xd8,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x3c,0xf8,0x38,0x6c,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xe6,0xfe,0xdc,0x00,0x58, - 0x34,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x18,0x30,0x38,0x7c,0xee, - 0xc6,0xc6,0xc6,0xee,0x7c,0x38,0x00,0x30, - 0x18,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x6c,0x38,0x38,0x7c,0xee, - 0xc6,0xc6,0xc6,0xee,0x7c,0x38,0x00,0x58, - 0x34,0x38,0x7c,0xee,0xc6,0xc6,0xc6,0xee, - 0x7c,0x38,0x00,0x6c,0x6c,0x30,0x30,0x00, - 0xfc,0xfc,0x00,0x30,0x30,0xb8,0x7c,0xee, - 0xe6,0xd6,0xce,0xee,0x7c,0x3a,0x76,0xfe, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x18,0x30,0x76,0xfe,0xce,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x30,0x18,0x76,0xfe, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x38,0x76,0xfe,0xce,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x6c,0x6c,0x60,0x70, - 0x10,0x18,0x38,0x38,0x2c,0x6c,0x6c,0xc6, - 0xc6,0xc6,0x00,0x30,0x18,0xc0,0xc0,0xc0, - 0xd8,0xfc,0xee,0xc6,0xc6,0xc6,0xee,0xfc, - 0xd8,0xc0,0xc0,0xc0,0x60,0x70,0x10,0x18, - 0x38,0x38,0x2c,0x6c,0x6c,0xc6,0xc6,0xc6, - 0x00,0x6c,0x6c, -}; - -BMF_FontData BMF_font_helvb14 = { - -2, -3, - 12, 14, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 12, -1, 0, 4, 1}, - {5, 4, 0, -8, 6, 13}, - {8, 12, 1, 0, 7, 17}, - {7, 15, 0, 2, 7, 29}, - {11, 11, 0, 0, 12, 44}, - {9, 12, 0, 0, 9, 66}, - {2, 4, -1, -8, 4, 90}, - {4, 15, 0, 3, 4, 94}, - {4, 15, 1, 3, 4, 109}, - {5, 6, 0, -6, 5, 124}, - {6, 8, -1, 0, 8, 130}, - {2, 5, 0, 3, 3, 138}, - {7, 2, 0, -3, 8, 143}, - {2, 2, 0, 0, 3, 145}, - {4, 11, 0, 0, 4, 147}, - {6, 12, 0, 0, 7, 158}, - {4, 12, 0, 0, 7, 170}, - {6, 12, 0, 0, 7, 182}, - {6, 12, 0, 0, 7, 194}, - {6, 12, 0, 0, 7, 206}, - {6, 12, 0, 0, 7, 218}, - {6, 12, 0, 0, 7, 230}, - {6, 12, 0, 0, 7, 242}, - {6, 12, 0, 0, 7, 254}, - {6, 12, 0, 0, 7, 266}, - {2, 8, -1, 0, 4, 278}, - {2, 11, -1, 3, 4, 286}, - {7, 8, 0, 0, 8, 297}, - {6, 6, -1, -1, 8, 305}, - {7, 8, 0, 0, 8, 311}, - {6, 12, -1, 0, 8, 319}, - {12, 14, 0, 2, 13, 331}, - {10, 12, 1, 0, 9, 359}, - {8, 12, 0, 0, 9, 383}, - {8, 12, 0, 0, 9, 395}, - {8, 12, 0, 0, 9, 407}, - {7, 12, 0, 0, 8, 419}, - {7, 12, -1, 0, 8, 431}, - {9, 12, 0, 0, 10, 443}, - {8, 12, 0, 0, 9, 467}, - {2, 12, -1, 0, 5, 479}, - {6, 12, 0, 0, 7, 491}, - {9, 12, -1, 0, 10, 503}, - {7, 12, -1, 0, 8, 527}, - {10, 12, 0, 0, 11, 539}, - {8, 12, 0, 0, 9, 563}, - {9, 12, 0, 0, 10, 575}, - {7, 12, -1, 0, 9, 599}, - {9, 13, 0, 1, 10, 611}, - {8, 12, 0, 0, 9, 637}, - {8, 12, 0, 0, 9, 649}, - {8, 12, 0, 0, 9, 661}, - {8, 12, 0, 0, 9, 673}, - {8, 12, 0, 0, 9, 685}, - {12, 12, 0, 0, 13, 697}, - {9, 12, 0, 0, 10, 721}, - {10, 12, 1, 0, 9, 745}, - {8, 12, 0, 0, 9, 769}, - {3, 15, 0, 3, 4, 781}, - {4, 11, 0, 0, 4, 796}, - {3, 15, 0, 3, 4, 807}, - {6, 7, -1, -4, 8, 822}, - {7, 1, 0, 3, 7, 829}, - {2, 4, -1, -8, 4, 830}, - {6, 9, 0, 0, 7, 834}, - {7, 12, 0, 0, 8, 843}, - {6, 9, 0, 0, 7, 855}, - {7, 12, 0, 0, 8, 864}, - {6, 9, 0, 0, 7, 876}, - {4, 12, 0, 0, 5, 885}, - {7, 12, 0, 3, 8, 897}, - {7, 12, 0, 0, 8, 909}, - {2, 12, 0, 0, 3, 921}, - {3, 15, 1, 3, 3, 933}, - {7, 12, 0, 0, 7, 948}, - {2, 12, 0, 0, 3, 960}, - {10, 9, 0, 0, 11, 972}, - {7, 9, 0, 0, 8, 990}, - {7, 9, 0, 0, 8, 999}, - {7, 12, 0, 3, 8, 1008}, - {7, 12, 0, 3, 8, 1020}, - {5, 9, 0, 0, 5, 1032}, - {6, 9, 0, 0, 7, 1041}, - {4, 11, 0, 0, 5, 1050}, - {7, 9, 0, 0, 8, 1061}, - {6, 9, 0, 0, 7, 1070}, - {10, 9, 0, 0, 11, 1079}, - {7, 9, 0, 0, 8, 1097}, - {7, 12, 0, 3, 8, 1106}, - {6, 9, 0, 0, 7, 1118}, - {4, 15, 0, 3, 5, 1127}, - {1, 15, -1, 3, 4, 1142}, - {4, 15, 0, 3, 5, 1157}, - {6, 3, -1, -3, 8, 1172}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 12, -1, 3, 4, 1175}, - {6, 13, 0, 2, 7, 1187}, - {7, 12, 0, 0, 7, 1200}, - {6, 8, 0, -2, 7, 1212}, - {8, 12, 1, 0, 7, 1220}, - {1, 15, -1, 3, 4, 1232}, - {7, 15, 0, 3, 7, 1247}, - {5, 2, 1, -10, 4, 1262}, - {10, 12, 0, 0, 10, 1264}, - {4, 7, 0, -5, 5, 1288}, - {6, 6, 0, -1, 7, 1295}, - {7, 5, 0, -2, 8, 1301}, - {3, 2, 0, -3, 4, 1306}, - {10, 12, 0, 0, 10, 1308}, - {4, 1, 0, -11, 4, 1332}, - {4, 5, 0, -7, 5, 1333}, - {6, 11, -1, 0, 8, 1338}, - {4, 7, 0, -5, 4, 1349}, - {4, 7, 0, -5, 4, 1356}, - {3, 2, -1, -10, 4, 1363}, - {7, 12, 0, 3, 8, 1365}, - {7, 15, 0, 3, 7, 1377}, - {2, 2, 0, -5, 3, 1392}, - {3, 3, 0, 3, 4, 1394}, - {3, 7, 0, -5, 4, 1397}, - {4, 7, 0, -5, 5, 1404}, - {6, 6, 0, -1, 7, 1411}, - {11, 12, 1, 0, 11, 1417}, - {11, 12, 1, 0, 11, 1441}, - {11, 12, 0, 0, 11, 1465}, - {6, 12, -1, 3, 8, 1489}, - {10, 14, 1, 0, 9, 1501}, - {10, 14, 1, 0, 9, 1529}, - {10, 14, 1, 0, 9, 1557}, - {10, 14, 1, 0, 9, 1585}, - {10, 14, 1, 0, 9, 1613}, - {10, 14, 1, 0, 9, 1641}, - {13, 12, 1, 0, 13, 1669}, - {8, 15, 0, 3, 9, 1693}, - {7, 14, 0, 0, 8, 1708}, - {7, 14, 0, 0, 8, 1722}, - {7, 14, 0, 0, 8, 1736}, - {7, 14, 0, 0, 8, 1750}, - {3, 14, 0, 0, 5, 1764}, - {3, 14, -1, 0, 5, 1778}, - {5, 14, 1, 0, 5, 1792}, - {5, 14, 1, 0, 5, 1806}, - {9, 12, 1, 0, 9, 1820}, - {8, 14, 0, 0, 9, 1844}, - {9, 14, 0, 0, 10, 1858}, - {9, 14, 0, 0, 10, 1886}, - {9, 14, 0, 0, 10, 1914}, - {9, 14, 0, 0, 10, 1942}, - {9, 14, 0, 0, 10, 1970}, - {6, 8, -1, 0, 8, 1998}, - {9, 12, 0, 0, 10, 2006}, - {8, 14, 0, 0, 9, 2030}, - {8, 14, 0, 0, 9, 2044}, - {8, 14, 0, 0, 9, 2058}, - {8, 14, 0, 0, 9, 2072}, - {10, 14, 1, 0, 9, 2086}, - {7, 12, -1, 0, 9, 2114}, - {7, 12, 0, 0, 8, 2126}, - {6, 12, 0, 0, 7, 2138}, - {6, 12, 0, 0, 7, 2150}, - {6, 12, 0, 0, 7, 2162}, - {6, 12, 0, 0, 7, 2174}, - {6, 12, 0, 0, 7, 2186}, - {6, 13, 0, 0, 7, 2198}, - {10, 9, 0, 0, 11, 2211}, - {6, 12, 0, 3, 7, 2229}, - {6, 12, 0, 0, 7, 2241}, - {6, 12, 0, 0, 7, 2253}, - {6, 12, 0, 0, 7, 2265}, - {6, 12, 0, 0, 7, 2277}, - {3, 12, 1, 0, 3, 2289}, - {3, 12, 0, 0, 3, 2301}, - {5, 12, 2, 0, 3, 2313}, - {5, 12, 2, 0, 3, 2325}, - {7, 12, 0, 0, 8, 2337}, - {7, 12, 0, 0, 8, 2349}, - {7, 12, 0, 0, 8, 2361}, - {7, 12, 0, 0, 8, 2373}, - {7, 12, 0, 0, 8, 2385}, - {7, 12, 0, 0, 8, 2397}, - {7, 12, 0, 0, 8, 2409}, - {6, 8, -1, 0, 8, 2421}, - {7, 9, 0, 0, 8, 2429}, - {7, 12, 0, 0, 8, 2438}, - {7, 12, 0, 0, 8, 2450}, - {7, 12, 0, 0, 8, 2462}, - {7, 12, 0, 0, 8, 2474}, - {7, 15, 0, 3, 8, 2486}, - {7, 15, 0, 3, 8, 2501}, - {7, 15, 0, 3, 8, 2516}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_helvb8.cpp b/intern/bmfont/intern/BMF_font_helvb8.cpp deleted file mode 100644 index fb56049c8fe..00000000000 --- a/intern/bmfont/intern/BMF_font_helvb8.cpp +++ /dev/null @@ -1,455 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_HELVB8 - -static unsigned char bitmap_data[]= { - 0x00,0x80,0x00,0x80,0x80,0x80,0x80,0xa0, - 0xa0,0xa0,0x50,0xf8,0x50,0xf8,0x50,0x40, - 0xe0,0x10,0x60,0x80,0x70,0x20,0x5c,0x54, - 0x2c,0xd0,0xa8,0xe8,0x58,0xb0,0xa8,0x48, - 0xa0,0x40,0x80,0x80,0x80,0x40,0x80,0x80, - 0x80,0x80,0x80,0x40,0x80,0x40,0x40,0x40, - 0x40,0x40,0x80,0x40,0xe0,0x40,0x20,0x20, - 0xf8,0x20,0x20,0x80,0x40,0x40,0xf0,0x80, - 0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x60, - 0x90,0x90,0x90,0x90,0x60,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf0,0x40,0x20,0x10,0x90, - 0x60,0xc0,0x20,0x20,0xc0,0x20,0xc0,0x20, - 0x20,0xf0,0x60,0x20,0x20,0xc0,0x20,0x20, - 0xc0,0x80,0xe0,0x60,0x90,0x90,0xe0,0x80, - 0x70,0x40,0x40,0x40,0x20,0x10,0xf0,0x60, - 0x90,0x90,0x60,0x90,0x60,0x60,0x10,0x70, - 0x90,0x90,0x60,0x80,0x00,0x00,0x80,0x80, - 0x40,0x40,0x00,0x00,0x40,0x20,0x40,0x80, - 0x40,0x20,0xe0,0x00,0xe0,0x80,0x40,0x20, - 0x40,0x80,0x40,0x00,0x40,0x20,0xc0,0x78, - 0x80,0x9e,0xa5,0x99,0x41,0x3e,0x88,0x88, - 0x70,0x50,0x20,0x20,0xe0,0x90,0x90,0xe0, - 0x90,0xe0,0x70,0x88,0x80,0x80,0x88,0x70, - 0xf0,0x88,0x88,0x88,0x88,0xf0,0xf0,0x80, - 0x80,0xe0,0x80,0xf0,0x80,0x80,0x80,0xe0, - 0x80,0xf0,0x70,0x88,0x88,0x98,0x80,0x70, - 0x88,0x88,0x88,0xf8,0x88,0x88,0x80,0x80, - 0x80,0x80,0x80,0x80,0x40,0xa0,0x20,0x20, - 0x20,0x20,0x90,0x90,0xe0,0xc0,0xa0,0x90, - 0xe0,0x80,0x80,0x80,0x80,0x80,0xa8,0xa8, - 0xa8,0xa8,0xd8,0x88,0x88,0x98,0xa8,0xa8, - 0xc8,0x88,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xe0,0x90,0x90,0xe0,0x10,0x20, - 0x70,0x88,0x88,0x88,0x88,0x70,0x90,0x90, - 0xe0,0x90,0x90,0xe0,0xe0,0x10,0x10,0xe0, - 0x80,0x70,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x40,0xa0, - 0x90,0x90,0x90,0x90,0x48,0x48,0x6c,0x92, - 0x92,0x92,0x90,0x90,0x60,0x60,0x90,0x90, - 0x20,0x20,0x30,0x48,0x48,0xc8,0xf0,0x80, - 0x40,0x20,0x10,0xf0,0xc0,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xf8,0x80,0x80,0x80, - 0xd0,0xa0,0xe0,0x20,0xc0,0xe0,0x90,0x90, - 0x90,0xe0,0x80,0x80,0x60,0x80,0x80,0x80, - 0x60,0x70,0x90,0x90,0x90,0x70,0x10,0x10, - 0x60,0x80,0xe0,0xa0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x20,0x60,0x10,0x70,0x90, - 0x90,0x70,0x90,0x90,0x90,0x90,0xe0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0xa0,0xa0,0xc0,0xc0,0xa0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xa8, - 0xa8,0xa8,0xa8,0xf0,0x90,0x90,0x90,0x90, - 0xe0,0x60,0x90,0x90,0x90,0x60,0x80,0xe0, - 0x90,0x90,0x90,0xe0,0x10,0x70,0x90,0x90, - 0x90,0x70,0x80,0x80,0x80,0xc0,0xa0,0xc0, - 0x20,0x60,0x80,0x60,0x40,0x40,0x40,0x40, - 0xe0,0x40,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x40,0xa0,0x90,0x90,0x90,0x50,0x50,0xa8, - 0xa8,0xa8,0x90,0x90,0x60,0x90,0x90,0x80, - 0x40,0x60,0x90,0x90,0x90,0xe0,0x80,0x40, - 0x20,0xe0,0x20,0x40,0x40,0xc0,0x40,0x40, - 0x20,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x40,0x40,0x60,0x40,0x40,0x80,0xb0, - 0x48,0x00,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x40,0x40,0xa0,0x80,0xa0,0x40,0x40, - 0xf0,0x40,0x40,0xe0,0x40,0x30,0x88,0x70, - 0x50,0x70,0x88,0x20,0x20,0xf8,0x50,0x88, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0xe0, - 0x10,0x30,0x60,0x90,0x60,0x80,0x70,0x90, - 0x78,0x84,0xb4,0xa4,0xb4,0x84,0x78,0xe0, - 0x00,0xe0,0x20,0xc0,0x50,0xa0,0x50,0x10, - 0x10,0xf0,0xc0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x40,0xa0,0x40,0xf0,0x00, - 0x20,0xf0,0x20,0xc0,0x80,0x40,0x80,0xc0, - 0x20,0x60,0xe0,0x80,0x40,0x80,0x80,0xe0, - 0xa0,0xa0,0xa0,0x50,0x50,0x50,0x50,0xd0, - 0xd0,0xd0,0x78,0x80,0x80,0x80,0x40,0x40, - 0x40,0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0, - 0xa0,0x50,0xa0,0x04,0x5e,0x2c,0x54,0x48, - 0xc4,0x40,0x0e,0x44,0x22,0x5c,0x48,0xc4, - 0x40,0x04,0x5e,0x2c,0xd4,0x28,0x64,0xe0, - 0x60,0x90,0x40,0x20,0x00,0x20,0x88,0x88, - 0x70,0x50,0x20,0x20,0x00,0x20,0x40,0x88, - 0x88,0x70,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0x70,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0x70,0x50,0x20,0x20,0x00, - 0x50,0x28,0x88,0x88,0x70,0x50,0x20,0x20, - 0x00,0x50,0x88,0x88,0x70,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9e,0x90,0x7c,0x50,0x30, - 0x3e,0x80,0x40,0x70,0x88,0x80,0x88,0x88, - 0x70,0xf0,0x80,0x80,0xe0,0x80,0xf0,0x00, - 0x20,0x40,0xf0,0x80,0x80,0xe0,0x80,0xf0, - 0x00,0x40,0x20,0xf0,0x80,0x80,0xe0,0x80, - 0xf0,0x00,0xa0,0x40,0xf0,0x80,0x80,0xe0, - 0x80,0xf0,0x00,0xa0,0x40,0x40,0x40,0x40, - 0x40,0x40,0x00,0x40,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x48,0x48,0xe8,0x48,0x70,0x88,0x98,0xa8, - 0xa8,0xc8,0x88,0x00,0x50,0x28,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x28,0x70,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x90,0x60,0x60,0x90,0x80,0xf0, - 0xc8,0xa8,0x98,0x88,0x78,0x08,0x70,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x00, - 0x50,0x20,0x20,0x30,0x48,0x48,0xc8,0x00, - 0x10,0x08,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0xa0,0x90,0x60,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x80,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x20,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0x40,0x68, - 0x50,0x70,0x10,0x60,0x00,0xb0,0x68,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0xd0,0xa0, - 0xe0,0x20,0xc0,0x40,0xa0,0x40,0xd8,0xa0, - 0xf8,0x28,0xd0,0x80,0x40,0x60,0x80,0x80, - 0x80,0x60,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x20,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x40,0x20,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x60,0x90,0x90,0x90,0x70,0xa0,0x60,0x90, - 0x90,0x90,0x90,0x90,0xe0,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x10, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x90,0x20, - 0x00,0xf0,0x00,0x20,0x80,0x70,0x68,0x58, - 0x48,0x3c,0x02,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x80,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x20,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x20,0x10,0x80,0xe0,0x90,0x90,0x90, - 0xe0,0x80,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x50, -}; - -BMF_FontData BMF_font_helvb8 = { - 0, -2, - 9, 9, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 0}, - {1, 6, -1, 0, 2, 1}, - {3, 3, -1, -3, 3, 7}, - {5, 5, 0, 0, 5, 10}, - {4, 7, -1, 1, 5, 15}, - {6, 6, -1, 0, 7, 22}, - {5, 6, -1, 0, 6, 28}, - {1, 3, -1, -3, 2, 34}, - {2, 7, -1, 1, 3, 37}, - {2, 7, -1, 1, 3, 44}, - {3, 3, -1, -2, 3, 51}, - {5, 5, -1, 0, 5, 54}, - {2, 3, 0, 2, 2, 59}, - {4, 1, -2, -2, 6, 62}, - {1, 1, -1, 0, 2, 63}, - {2, 7, -1, 1, 2, 64}, - {4, 6, -1, 0, 5, 71}, - {2, 6, -2, 0, 5, 77}, - {4, 6, -1, 0, 5, 83}, - {3, 6, -2, 0, 5, 89}, - {4, 6, -1, 0, 5, 95}, - {3, 6, -2, 0, 5, 101}, - {4, 6, -1, 0, 5, 107}, - {4, 6, -1, 0, 5, 113}, - {4, 6, -1, 0, 5, 119}, - {4, 6, -1, 0, 5, 125}, - {1, 4, -1, 0, 2, 131}, - {2, 6, 0, 2, 2, 135}, - {3, 5, -1, 0, 5, 141}, - {3, 3, -1, -1, 4, 146}, - {3, 5, -2, 0, 5, 149}, - {3, 5, -2, 0, 5, 154}, - {8, 7, -1, 1, 9, 159}, - {5, 6, -1, 0, 6, 166}, - {4, 6, -2, 0, 6, 172}, - {5, 6, -1, 0, 6, 178}, - {5, 6, -1, 0, 6, 184}, - {4, 6, -2, 0, 6, 190}, - {4, 6, -2, 0, 5, 196}, - {5, 6, -1, 0, 6, 202}, - {5, 6, -1, 0, 6, 208}, - {1, 6, -1, 0, 2, 214}, - {3, 6, -1, 0, 4, 220}, - {4, 6, -2, 0, 6, 226}, - {3, 6, -2, 0, 5, 232}, - {5, 6, -2, 0, 7, 238}, - {5, 6, -1, 0, 6, 244}, - {5, 6, -1, 0, 6, 250}, - {4, 6, -2, 0, 6, 256}, - {5, 8, -1, 2, 6, 262}, - {4, 6, -2, 0, 6, 270}, - {4, 6, -2, 0, 6, 276}, - {3, 6, -1, 0, 4, 282}, - {5, 6, -1, 0, 6, 288}, - {4, 6, -2, 0, 6, 294}, - {7, 6, -1, 0, 7, 300}, - {4, 6, -2, 0, 6, 306}, - {5, 6, -1, 0, 6, 312}, - {4, 6, -2, 0, 6, 318}, - {2, 7, -1, 1, 2, 324}, - {2, 7, 0, 1, 2, 331}, - {2, 7, 0, 1, 2, 338}, - {5, 3, 0, -2, 5, 345}, - {5, 1, 0, 1, 5, 348}, - {1, 3, -1, -3, 2, 349}, - {4, 5, -1, 0, 4, 352}, - {4, 7, -1, 0, 5, 357}, - {3, 5, -1, 0, 4, 364}, - {4, 7, -1, 0, 5, 369}, - {3, 5, -1, 0, 4, 376}, - {3, 7, -1, 0, 3, 381}, - {4, 6, -1, 1, 5, 388}, - {4, 7, -1, 0, 5, 394}, - {1, 7, -1, 0, 2, 401}, - {2, 9, 0, 2, 2, 408}, - {3, 7, -1, 0, 4, 417}, - {1, 7, -1, 0, 2, 424}, - {5, 5, -1, 0, 6, 431}, - {4, 5, -1, 0, 5, 436}, - {4, 5, -1, 0, 5, 441}, - {4, 6, -1, 1, 5, 446}, - {4, 6, -1, 1, 5, 452}, - {3, 5, -1, 0, 3, 458}, - {3, 5, -1, 0, 4, 463}, - {3, 7, -1, 0, 3, 468}, - {3, 5, -1, 0, 4, 475}, - {4, 5, -1, 0, 5, 480}, - {5, 5, -1, 0, 6, 485}, - {4, 5, -1, 0, 5, 490}, - {4, 6, -1, 1, 4, 495}, - {3, 5, -1, 0, 4, 501}, - {3, 7, 0, 1, 2, 506}, - {1, 7, -1, 1, 2, 513}, - {3, 7, 0, 1, 2, 520}, - {5, 2, -1, -2, 6, 527}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 529}, - {1, 7, -1, 2, 2, 530}, - {3, 7, -1, 1, 5, 537}, - {4, 6, -1, 0, 5, 544}, - {5, 5, 0, 0, 4, 550}, - {5, 5, -1, 0, 6, 555}, - {1, 7, -1, 1, 2, 560}, - {4, 8, -1, 2, 5, 567}, - {4, 1, 0, -5, 2, 575}, - {6, 7, -1, 1, 7, 576}, - {3, 5, 0, -1, 3, 583}, - {4, 3, -1, -1, 5, 588}, - {4, 3, -1, -1, 6, 591}, - {2, 1, 0, -2, 3, 594}, - {6, 7, -1, 1, 7, 595}, - {3, 1, 0, -5, 2, 602}, - {3, 3, -1, -3, 3, 603}, - {4, 5, -1, 0, 5, 606}, - {2, 4, -1, -2, 2, 611}, - {3, 4, 0, -2, 2, 615}, - {2, 2, 0, -4, 2, 619}, - {3, 6, -1, 2, 4, 621}, - {5, 8, 0, 2, 5, 627}, - {1, 2, -1, -1, 2, 635}, - {2, 2, 0, 2, 2, 637}, - {2, 4, 0, -2, 2, 639}, - {3, 5, 0, -1, 3, 643}, - {4, 3, -1, -1, 5, 648}, - {7, 7, 0, 1, 7, 651}, - {7, 7, 0, 1, 7, 658}, - {7, 7, 0, 1, 7, 665}, - {4, 6, -1, 1, 5, 672}, - {5, 9, -1, 0, 6, 678}, - {5, 9, -1, 0, 6, 687}, - {5, 9, -1, 0, 6, 696}, - {5, 9, -1, 0, 6, 705}, - {5, 8, -1, 0, 6, 714}, - {5, 9, -1, 0, 6, 722}, - {7, 6, -1, 0, 8, 731}, - {5, 8, -1, 2, 6, 737}, - {4, 9, -2, 0, 6, 745}, - {4, 9, -2, 0, 6, 754}, - {4, 9, -2, 0, 6, 763}, - {4, 8, -2, 0, 6, 772}, - {2, 9, 0, 0, 2, 780}, - {2, 9, -1, 0, 2, 789}, - {3, 9, 0, 0, 2, 798}, - {3, 8, 0, 0, 2, 807}, - {5, 6, -1, 0, 6, 815}, - {5, 9, -1, 0, 6, 821}, - {5, 9, -1, 0, 6, 830}, - {5, 9, -1, 0, 6, 839}, - {5, 9, -1, 0, 6, 848}, - {5, 9, -1, 0, 6, 857}, - {5, 8, -1, 0, 6, 866}, - {4, 4, -1, 0, 5, 874}, - {5, 8, -1, 1, 6, 878}, - {5, 9, -1, 0, 6, 886}, - {5, 9, -1, 0, 6, 895}, - {5, 9, -1, 0, 6, 904}, - {5, 8, -1, 0, 6, 913}, - {5, 9, -1, 0, 6, 921}, - {5, 6, -1, 0, 6, 930}, - {4, 7, -2, 1, 6, 936}, - {4, 8, -1, 0, 4, 943}, - {4, 8, -1, 0, 4, 951}, - {4, 8, -1, 0, 4, 959}, - {5, 8, 0, 0, 4, 967}, - {4, 7, -1, 0, 4, 975}, - {4, 8, -1, 0, 4, 982}, - {5, 5, -1, 0, 6, 990}, - {3, 7, -1, 2, 4, 995}, - {3, 8, -1, 0, 4, 1002}, - {3, 8, -1, 0, 4, 1010}, - {3, 8, -1, 0, 4, 1018}, - {3, 7, -1, 0, 4, 1026}, - {2, 8, 0, 0, 2, 1033}, - {2, 8, -1, 0, 2, 1041}, - {3, 8, 0, 0, 2, 1049}, - {3, 7, 0, 0, 2, 1057}, - {4, 8, -1, 0, 5, 1064}, - {4, 8, -1, 0, 5, 1072}, - {4, 8, -1, 0, 5, 1080}, - {4, 8, -1, 0, 5, 1088}, - {4, 8, -1, 0, 5, 1096}, - {4, 8, -1, 0, 5, 1104}, - {4, 7, -1, 0, 5, 1112}, - {4, 5, -1, 0, 5, 1119}, - {7, 7, 0, 1, 5, 1124}, - {3, 8, -1, 0, 4, 1131}, - {3, 8, -1, 0, 4, 1139}, - {3, 8, -1, 0, 4, 1147}, - {3, 7, -1, 0, 4, 1155}, - {4, 9, -1, 1, 4, 1162}, - {4, 7, -1, 1, 5, 1171}, - {4, 8, -1, 1, 4, 1178}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr12.cpp b/intern/bmfont/intern/BMF_font_scr12.cpp deleted file mode 100644 index be0be544474..00000000000 --- a/intern/bmfont/intern/BMF_font_scr12.cpp +++ /dev/null @@ -1,484 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR12 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x28,0x7e,0x14,0x14,0x20,0x70,0xa8,0x28, - 0x70,0xa0,0xa8,0x70,0x20,0x98,0x54,0x54, - 0x2c,0xd0,0xa8,0xa8,0x64,0x74,0x88,0x8c, - 0x50,0x20,0x50,0x48,0x30,0x80,0x40,0x20, - 0x20,0x20,0x40,0x40,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x80,0x40,0x40,0x20,0x20, - 0x20,0x20,0x40,0x40,0x80,0x20,0xa8,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x70, - 0xe0,0x40,0x40,0x40,0x40,0x40,0xc0,0x40, - 0xf8,0x80,0x40,0x20,0x10,0x08,0x88,0x70, - 0x70,0x88,0x08,0x08,0x70,0x08,0x88,0x70, - 0x10,0x10,0x10,0xf8,0x90,0x50,0x30,0x10, - 0x70,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xf0,0x80,0x88,0x70, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x70, - 0x70,0x88,0x08,0x78,0x88,0x88,0x88,0x70, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x40, - 0x40,0xc0,0x00,0x00,0x40,0x40,0x08,0x10, - 0x20,0x40,0x80,0x40,0x20,0x10,0x08,0xf8, - 0x00,0xf8,0x80,0x40,0x20,0x10,0x08,0x10, - 0x20,0x40,0x80,0x20,0x00,0x20,0x20,0x10, - 0x88,0x88,0x70,0x38,0x40,0x98,0xa8,0xa8, - 0x98,0x48,0x30,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0xf0,0x88,0x88,0x88,0xf0, - 0x88,0x88,0xf0,0x70,0x88,0x80,0x80,0x80, - 0x80,0x88,0x70,0xf0,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x80,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x68,0x98,0x88,0x88,0x98, - 0x80,0x88,0x70,0x88,0x88,0x88,0x88,0xf8, - 0x88,0x88,0x88,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x88,0x88,0x90,0xa0,0xc0, - 0xa0,0x90,0x88,0xf8,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0xa8,0xa8,0xd8, - 0xd8,0x88,0x88,0x88,0x98,0x98,0xa8,0xa8, - 0xc8,0xc8,0x88,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x80,0x80,0x80,0x80,0xf0, - 0x88,0x88,0xf0,0x08,0x10,0x70,0xa8,0x88, - 0x88,0x88,0x88,0x88,0x70,0x88,0x90,0x90, - 0xa0,0xf0,0x88,0x88,0xf0,0x70,0x88,0x88, - 0x08,0x70,0x80,0x88,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x20,0x20,0x50, - 0x50,0x50,0x88,0x88,0x88,0x50,0x50,0xf8, - 0xa8,0xa8,0xa8,0x88,0x88,0x88,0x88,0x50, - 0x20,0x20,0x50,0x88,0x88,0x20,0x20,0x20, - 0x20,0x50,0x50,0x88,0x88,0xf8,0x80,0x40, - 0x40,0x20,0x10,0x08,0xf8,0xe0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xe0,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x88,0x50,0x20,0xfe,0x20,0x40,0x80, - 0x80,0x68,0x98,0x88,0x78,0x08,0x70,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0x70, - 0x88,0x80,0x80,0x88,0x70,0x68,0x98,0x88, - 0x88,0x98,0x68,0x08,0x08,0x70,0x88,0x80, - 0xf8,0x88,0x70,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x98,0x68,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x60,0x90,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0x10,0x88,0x90,0xa0, - 0xc0,0xa0,0x90,0x80,0x80,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x70,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x08, - 0x08,0x68,0x98,0x88,0x88,0x98,0x68,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x10, - 0x60,0x88,0x70,0x30,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x20,0x20,0x50,0x50,0x88,0x88,0x50,0xa8, - 0xa8,0xa8,0x88,0x88,0x88,0x88,0x50,0x20, - 0x50,0x88,0xf0,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0xf8,0x80,0x40,0x20,0x10,0xf8, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x20,0x20, - 0x20,0x18,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x20,0x20,0x20, - 0x20,0x18,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x20,0x20,0x70,0x88,0x80,0x88,0x70, - 0x20,0x20,0xb0,0x48,0x40,0xf0,0x40,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0x70,0x20,0x70,0x20,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x10,0x28,0x48,0x90, - 0xa0,0x40,0x88,0x70,0xa0,0x78,0x84,0xb4, - 0xa4,0xb4,0x84,0x78,0xf0,0x90,0x70,0x10, - 0x60,0x14,0x28,0x50,0xa0,0x50,0x28,0x14, - 0x08,0xf8,0xf0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x60,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0x20, - 0xa0,0x40,0xc0,0x20,0x40,0x20,0xc0,0x80, - 0x40,0x80,0xe8,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x68,0xa8,0xa8,0xa8,0x7c, - 0x80,0x80,0xc0,0x40,0xe0,0x40,0x40,0xc0, - 0x40,0xf0,0x60,0x90,0x90,0x60,0xa0,0x50, - 0x28,0x14,0x28,0x50,0xa0,0x08,0x38,0xa8, - 0x58,0x28,0xf0,0x48,0x40,0xc0,0x40,0x38, - 0x10,0x88,0x68,0x30,0xf0,0x48,0x40,0xc0, - 0x40,0x08,0x38,0xa8,0x58,0x28,0xd0,0x28, - 0x40,0x20,0xc0,0x70,0x88,0x88,0x40,0x20, - 0x20,0x00,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x50,0x50,0x20,0x20,0x00,0x20,0x10,0x88, - 0x88,0xf8,0x50,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0xf8,0x50,0x50,0x20,0x20, - 0x00,0xb0,0x68,0x88,0x88,0xf8,0x50,0x50, - 0x20,0x20,0x00,0x50,0x88,0x88,0xf8,0x50, - 0x50,0x20,0x20,0x20,0x50,0x20,0x9c,0x90, - 0xf0,0x50,0x5c,0x30,0x30,0x1c,0x60,0x20, - 0x70,0x88,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00, - 0x20,0x40,0xf8,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0x20,0x10,0xf8,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x00,0x50,0xe0, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x80,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x40,0x20,0xe0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0xa0,0x40,0xe0,0x40,0x40, - 0x40,0x40,0x40,0xe0,0x00,0xa0,0x78,0x44, - 0x44,0xf4,0x44,0x44,0x44,0x78,0x88,0x98, - 0x98,0xa8,0xc8,0xc8,0x88,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x40,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0x50,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x88,0x50,0x20,0x50,0x88,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x00,0x50,0x20,0x20,0x20,0x50, - 0x50,0x88,0x88,0x00,0x20,0x10,0x80,0x80, - 0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0xb0, - 0x88,0x88,0x88,0x90,0xa0,0x90,0x60,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x40,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x10,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x20,0x78, - 0x88,0x78,0x08,0x70,0x00,0xb0,0x68,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x78,0x88, - 0x78,0x08,0x70,0x00,0x20,0x50,0x20,0x6c, - 0x90,0x7c,0x12,0x6c,0x60,0x20,0x70,0x88, - 0x80,0x80,0x88,0x70,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x40,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x10,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x80,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x20,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x40,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x78,0x08, - 0x90,0x60,0xd0,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x10,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x70, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x00,0xf8,0x00,0x20,0xb8, - 0x64,0x54,0x4c,0x3a,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x40,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0x20,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x88,0x00,0x20,0x10,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0xf0, - 0x08,0x68,0x98,0x88,0x88,0x88,0x00,0xd8, -}; - -BMF_FontData BMF_font_scr12 = { - 0, -2, - 7, 10, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 8, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 8}, - {7, 8, 0, 0, 7, 12}, - {5, 9, -1, 1, 7, 20}, - {6, 8, 0, 0, 7, 29}, - {6, 8, 0, 0, 7, 37}, - {3, 4, -2, -5, 7, 45}, - {3, 10, -2, 2, 7, 49}, - {3, 10, -2, 2, 7, 59}, - {5, 5, -1, -3, 7, 69}, - {5, 5, -1, -1, 7, 74}, - {2, 4, -2, 2, 7, 79}, - {5, 1, -1, -3, 7, 83}, - {1, 2, -3, 0, 7, 84}, - {5, 10, -1, 1, 7, 86}, - {5, 8, -1, 0, 7, 96}, - {3, 8, -2, 0, 7, 104}, - {5, 8, -1, 0, 7, 112}, - {5, 8, -1, 0, 7, 120}, - {5, 8, -1, 0, 7, 128}, - {5, 8, -1, 0, 7, 136}, - {5, 8, -1, 0, 7, 144}, - {5, 8, -1, 0, 7, 152}, - {5, 8, -1, 0, 7, 160}, - {5, 8, -1, 0, 7, 168}, - {1, 6, -3, 0, 7, 176}, - {2, 8, -2, 2, 7, 182}, - {5, 9, -1, 1, 7, 190}, - {5, 3, -1, -2, 7, 199}, - {5, 9, -1, 1, 7, 202}, - {5, 8, -1, 0, 7, 211}, - {5, 8, -1, 0, 7, 219}, - {5, 8, -1, 0, 7, 227}, - {5, 8, -1, 0, 7, 235}, - {5, 8, -1, 0, 7, 243}, - {5, 8, -1, 0, 7, 251}, - {5, 8, -1, 0, 7, 259}, - {5, 8, -1, 0, 7, 267}, - {5, 8, -1, 0, 7, 275}, - {5, 8, -1, 0, 7, 283}, - {3, 8, -2, 0, 7, 291}, - {5, 8, -1, 0, 7, 299}, - {5, 8, -1, 0, 7, 307}, - {5, 8, -1, 0, 7, 315}, - {5, 8, -1, 0, 7, 323}, - {5, 8, -1, 0, 7, 331}, - {5, 8, -1, 0, 7, 339}, - {5, 8, -1, 0, 7, 347}, - {5, 10, -1, 2, 7, 355}, - {5, 8, -1, 0, 7, 365}, - {5, 8, -1, 0, 7, 373}, - {5, 8, -1, 0, 7, 381}, - {5, 8, -1, 0, 7, 389}, - {5, 8, -1, 0, 7, 397}, - {5, 8, -1, 0, 7, 405}, - {5, 8, -1, 0, 7, 413}, - {5, 8, -1, 0, 7, 421}, - {5, 8, -1, 0, 7, 429}, - {3, 9, -2, 1, 7, 437}, - {5, 10, -1, 1, 7, 446}, - {3, 9, -2, 1, 7, 456}, - {5, 3, -1, -5, 7, 465}, - {7, 1, 0, 1, 7, 468}, - {3, 4, -2, -5, 7, 469}, - {5, 6, -1, 0, 7, 473}, - {5, 8, -1, 0, 7, 479}, - {5, 6, -1, 0, 7, 487}, - {5, 8, -1, 0, 7, 493}, - {5, 6, -1, 0, 7, 501}, - {5, 8, -1, 0, 7, 507}, - {5, 8, -1, 2, 7, 515}, - {5, 8, -1, 0, 7, 523}, - {3, 8, -2, 0, 7, 531}, - {4, 10, -1, 2, 7, 539}, - {5, 8, -1, 0, 7, 549}, - {3, 8, -2, 0, 7, 557}, - {5, 6, -1, 0, 7, 565}, - {5, 6, -1, 0, 7, 571}, - {5, 6, -1, 0, 7, 577}, - {5, 8, -1, 2, 7, 583}, - {5, 8, -1, 2, 7, 591}, - {5, 6, -1, 0, 7, 599}, - {5, 6, -1, 0, 7, 605}, - {4, 7, -1, 0, 7, 611}, - {5, 6, -1, 0, 7, 618}, - {5, 6, -1, 0, 7, 624}, - {5, 6, -1, 0, 7, 630}, - {5, 6, -1, 0, 7, 636}, - {5, 8, -1, 2, 7, 642}, - {5, 6, -1, 0, 7, 650}, - {5, 10, -1, 2, 7, 656}, - {1, 10, -3, 1, 7, 666}, - {5, 10, -1, 2, 7, 676}, - {6, 3, 0, -2, 7, 686}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 8, -3, 2, 7, 689}, - {5, 9, -1, 0, 7, 697}, - {5, 8, -1, 0, 7, 706}, - {4, 6, -1, -2, 7, 714}, - {5, 8, -1, 0, 7, 720}, - {1, 10, -3, 1, 7, 728}, - {5, 10, -1, 1, 7, 738}, - {3, 1, -2, -7, 7, 748}, - {6, 7, 0, 0, 7, 749}, - {4, 5, -1, -4, 7, 756}, - {6, 7, 0, 0, 7, 761}, - {5, 2, -1, -3, 7, 768}, - {4, 1, -1, -3, 7, 770}, - {6, 7, 0, 0, 7, 771}, - {3, 1, -2, -7, 7, 778}, - {4, 3, -1, -4, 7, 779}, - {5, 7, -1, 0, 7, 782}, - {3, 5, -2, -4, 7, 789}, - {3, 5, -2, -4, 7, 794}, - {2, 2, -2, -7, 7, 799}, - {5, 6, -1, 1, 7, 801}, - {6, 9, 0, 1, 7, 807}, - {1, 2, -3, -3, 7, 816}, - {2, 2, -2, 2, 7, 818}, - {3, 5, -2, -4, 7, 820}, - {4, 5, -1, -4, 7, 825}, - {6, 7, 0, 0, 7, 830}, - {5, 10, -1, 1, 7, 837}, - {5, 10, -1, 1, 7, 847}, - {5, 10, -1, 1, 7, 857}, - {5, 8, -1, 2, 7, 867}, - {5, 10, -1, 0, 7, 875}, - {5, 10, -1, 0, 7, 885}, - {5, 10, -1, 0, 7, 895}, - {5, 10, -1, 0, 7, 905}, - {5, 9, -1, 0, 7, 915}, - {5, 10, -1, 0, 7, 924}, - {6, 8, 0, 0, 7, 934}, - {5, 10, -1, 2, 7, 942}, - {5, 10, -1, 0, 7, 952}, - {5, 10, -1, 0, 7, 962}, - {5, 10, -1, 0, 7, 972}, - {5, 9, -1, 0, 7, 982}, - {3, 10, -2, 0, 7, 991}, - {3, 10, -2, 0, 7, 1001}, - {3, 10, -2, 0, 7, 1011}, - {3, 9, -2, 0, 7, 1021}, - {6, 8, 0, 0, 7, 1030}, - {5, 10, -1, 0, 7, 1038}, - {5, 10, -1, 0, 7, 1048}, - {5, 10, -1, 0, 7, 1058}, - {5, 10, -1, 0, 7, 1068}, - {5, 10, -1, 0, 7, 1078}, - {5, 9, -1, 0, 7, 1088}, - {5, 5, -1, -1, 7, 1097}, - {7, 7, 0, 0, 7, 1102}, - {5, 10, -1, 0, 7, 1109}, - {5, 10, -1, 0, 7, 1119}, - {5, 10, -1, 0, 7, 1129}, - {5, 9, -1, 0, 7, 1139}, - {5, 10, -1, 0, 7, 1148}, - {5, 9, -1, 0, 7, 1158}, - {5, 8, -1, 0, 7, 1167}, - {5, 8, -1, 0, 7, 1175}, - {5, 8, -1, 0, 7, 1183}, - {5, 8, -1, 0, 7, 1191}, - {5, 8, -1, 0, 7, 1199}, - {5, 7, -1, 0, 7, 1207}, - {5, 9, -1, 0, 7, 1214}, - {7, 5, 0, 0, 7, 1223}, - {5, 8, -1, 2, 7, 1228}, - {5, 8, -1, 0, 7, 1236}, - {5, 8, -1, 0, 7, 1244}, - {5, 8, -1, 0, 7, 1252}, - {5, 7, -1, 0, 7, 1260}, - {3, 8, -2, 0, 7, 1267}, - {3, 8, -2, 0, 7, 1275}, - {3, 8, -2, 0, 7, 1283}, - {3, 7, -2, 0, 7, 1291}, - {5, 9, -1, 0, 7, 1298}, - {5, 8, -1, 0, 7, 1307}, - {5, 8, -1, 0, 7, 1315}, - {5, 8, -1, 0, 7, 1323}, - {5, 8, -1, 0, 7, 1331}, - {5, 8, -1, 0, 7, 1339}, - {5, 7, -1, 0, 7, 1347}, - {5, 5, -1, -1, 7, 1354}, - {7, 5, 0, 0, 7, 1359}, - {5, 8, -1, 0, 7, 1364}, - {5, 8, -1, 0, 7, 1372}, - {5, 8, -1, 0, 7, 1380}, - {5, 7, -1, 0, 7, 1388}, - {5, 10, -1, 2, 7, 1395}, - {5, 10, -1, 2, 7, 1405}, - {5, 9, -1, 2, 7, 1415}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr14.cpp b/intern/bmfont/intern/BMF_font_scr14.cpp deleted file mode 100644 index 596442885e1..00000000000 --- a/intern/bmfont/intern/BMF_font_scr14.cpp +++ /dev/null @@ -1,510 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR14 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc, - 0x28,0x28,0x28,0x7e,0x14,0x14,0x20,0x70, - 0xa8,0x28,0x30,0x60,0xa0,0xa8,0x70,0x20, - 0x98,0x54,0x54,0x2c,0x10,0x68,0x54,0x54, - 0x32,0x74,0x88,0x8c,0x90,0x60,0x20,0x50, - 0x48,0x30,0x80,0x40,0x20,0x20,0x20,0x40, - 0x40,0x80,0x80,0x80,0x80,0x80,0x40,0x40, - 0x20,0x80,0x40,0x40,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0x20,0xa8,0x70,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88, - 0x70,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xf8,0x80,0x40,0x20,0x10,0x08, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x70, - 0x08,0x08,0x88,0x70,0x10,0x10,0x10,0xf8, - 0x90,0x50,0x50,0x30,0x10,0x70,0x88,0x08, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0x88,0x88,0xf0,0x80,0x88,0x70,0x40, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x88, - 0x70,0x70,0x88,0x08,0x08,0x78,0x88,0x88, - 0x88,0x70,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x40,0x40,0xc0,0x00,0x00,0x40,0x40, - 0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x00,0xf8,0x80,0x40,0x20,0x10, - 0x08,0x10,0x20,0x40,0x80,0x20,0x20,0x00, - 0x20,0x20,0x10,0x88,0x88,0x70,0x38,0x40, - 0x98,0xa8,0xa8,0x98,0x88,0x48,0x30,0x88, - 0x88,0xf8,0x88,0x50,0x50,0x50,0x20,0x20, - 0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0x88, - 0xf0,0x70,0x88,0x80,0x80,0x80,0x80,0x80, - 0x88,0x70,0xf0,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0x80,0xf8,0x80,0x80,0x80,0x80, - 0xf0,0x80,0x80,0x80,0xf8,0x68,0x98,0x88, - 0x88,0x98,0x80,0x80,0x88,0x70,0x88,0x88, - 0x88,0x88,0xf8,0x88,0x88,0x88,0x88,0xe0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x08,0x08,0x08,0x08,0x08, - 0x08,0x88,0x88,0x90,0xa0,0xc0,0xa0,0x90, - 0x88,0x88,0xf8,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0x88,0xa8,0xa8, - 0xd8,0xd8,0x88,0x88,0x88,0x98,0x98,0xa8, - 0xa8,0xc8,0xc8,0x88,0x88,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x80,0x80, - 0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x08, - 0x10,0x70,0xa8,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x88,0x88,0x90,0xa0,0xf0,0x88, - 0x88,0x88,0xf0,0x70,0x88,0x08,0x08,0x70, - 0x80,0x80,0x88,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x20,0x20, - 0x50,0x50,0x50,0x88,0x88,0x88,0x88,0x50, - 0x50,0xf8,0xa8,0xa8,0x88,0x88,0x88,0x88, - 0x88,0x88,0x50,0x50,0x20,0x50,0x50,0x88, - 0x88,0x20,0x20,0x20,0x20,0x20,0x50,0x50, - 0x88,0x88,0xf8,0x80,0x40,0x40,0x20,0x10, - 0x10,0x08,0xf8,0xf0,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xf0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xf0,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0xf0,0x88,0x50,0x20,0xfe,0x20, - 0x40,0x80,0x80,0x68,0x98,0x88,0x78,0x08, - 0x88,0x70,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x70,0x88,0x80,0x80,0x80, - 0x88,0x70,0x68,0x98,0x88,0x88,0x88,0x98, - 0x68,0x08,0x08,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x40,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0x70,0x88,0x08,0x68,0x98, - 0x88,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0x88,0xc8,0xb0,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x60, - 0x90,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x70,0x00,0x10,0x88,0x88,0x90,0xe0,0xa0, - 0x90,0x88,0x80,0x80,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x80,0x80,0x80,0xb0,0xc8,0x88, - 0x88,0x88,0xc8,0xb0,0x08,0x08,0x08,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x80,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x08, - 0x70,0x80,0x88,0x70,0x30,0x40,0x40,0x40, - 0x40,0x40,0xf0,0x40,0x40,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x20,0x20,0x50,0x50, - 0x88,0x88,0x88,0x50,0xa8,0xa8,0xa8,0xa8, - 0x88,0x88,0x88,0x88,0x50,0x20,0x50,0x88, - 0x88,0x70,0x88,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0xf8,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x18,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x18,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x20,0x20,0x20,0x20,0x20, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x80,0x20,0x20,0x70,0x88,0x80,0x80, - 0x88,0x70,0x20,0x20,0xb0,0x48,0x40,0x40, - 0xf0,0x40,0x40,0x48,0x30,0x88,0x70,0x88, - 0x88,0x70,0x88,0x70,0x20,0xf8,0x20,0xf8, - 0x50,0x50,0x88,0x88,0x80,0x80,0x80,0x80, - 0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80, - 0x70,0x88,0x10,0x28,0x48,0x88,0x90,0xa0, - 0x40,0x88,0x70,0xd8,0x38,0x44,0x92,0xaa, - 0xa2,0xaa,0x92,0x44,0x38,0xf8,0x00,0x68, - 0x90,0x70,0x10,0x60,0x12,0x24,0x48,0x90, - 0x48,0x24,0x12,0x08,0x08,0xf8,0xf0,0x38, - 0x44,0xaa,0xaa,0xb2,0xaa,0xb2,0x44,0x38, - 0xe0,0x60,0x90,0x90,0x60,0xf8,0x00,0x20, - 0x20,0xf8,0x20,0x20,0xe0,0x40,0x20,0xa0, - 0x40,0xc0,0x20,0x40,0x20,0xc0,0x80,0x40, - 0x80,0x80,0xb4,0xc8,0x88,0x88,0x88,0x88, - 0x28,0x28,0x28,0x28,0x28,0x68,0xa8,0xa8, - 0xa8,0x7c,0x80,0x80,0xc0,0x20,0x40,0xe0, - 0x40,0x40,0xc0,0x40,0xf8,0x00,0x70,0x88, - 0x88,0x88,0x70,0x90,0x48,0x24,0x12,0x24, - 0x48,0x90,0x04,0x9e,0x54,0x2c,0x14,0xe8, - 0x44,0x40,0xc0,0x40,0x1c,0x08,0x84,0x54, - 0x28,0x10,0xe8,0x44,0x40,0xc0,0x40,0x04, - 0x9e,0x54,0x2c,0xd4,0x28,0x44,0x20,0xc0, - 0x70,0x88,0x80,0x40,0x20,0x20,0x00,0x00, - 0x20,0x20,0x88,0x88,0xf8,0x88,0x50,0x50, - 0x20,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x88,0x50,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x00,0x50,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0x00,0xb0,0x68,0x88,0x88, - 0xf8,0x88,0x50,0x50,0x20,0x20,0x00,0xd8, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9c,0x90,0xf0,0x90,0x5c, - 0x50,0x30,0x30,0x1c,0x60,0x10,0x20,0x70, - 0x88,0x80,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8, - 0x00,0x20,0x40,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x20,0x10,0xf8,0x80, - 0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x50, - 0x20,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0xd8,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x00,0x40,0x80,0xe0,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x20,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xe0,0x00,0xa0,0x40,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x70,0x00,0xd8,0x78,0x44, - 0x44,0x44,0xf4,0x44,0x44,0x44,0x78,0x88, - 0x98,0x98,0xa8,0xa8,0xc8,0xc8,0x88,0x00, - 0xb0,0x68,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0xd8, - 0x88,0x50,0x20,0x50,0x88,0xb8,0x44,0x64, - 0x64,0x54,0x4c,0x4c,0x44,0x3a,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x40,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x00, - 0xd8,0x20,0x20,0x20,0x20,0x50,0x50,0x88, - 0x88,0x00,0x20,0x10,0xe0,0x40,0x78,0x44, - 0x44,0x44,0x78,0x40,0xe0,0xb0,0x88,0x88, - 0x88,0x90,0xa0,0x90,0x90,0x60,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0x20,0x40, - 0x68,0x98,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x68,0x98,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x68,0x98,0x88,0x78, - 0x08,0x88,0x70,0x00,0xb0,0x68,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0xd8,0x68, - 0x98,0x88,0x78,0x08,0x88,0x70,0x00,0x20, - 0x50,0x20,0x6c,0x92,0x90,0x7e,0x12,0x92, - 0x6c,0x60,0x10,0x20,0x70,0x88,0x80,0x80, - 0x80,0x88,0x70,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0xd8,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x40,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x00,0x20,0x10,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0xa0,0x40, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0xd8,0x70,0x88,0x88,0x88,0x88,0x88,0x78, - 0x10,0xd0,0x20,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x40, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x50,0x20,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xd8,0x10, - 0x10,0x00,0xfe,0x00,0x10,0x10,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x68,0x98,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x68,0x98,0x88,0x88,0x88, - 0x88,0x88,0x00,0xd8,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0xe0,0x40,0x58,0x64,0x44,0x44,0x44, - 0x64,0x58,0x40,0xc0,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0xd8, -}; - -BMF_FontData BMF_font_scr14 = { - 0, -3, - 7, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 9, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 9}, - {7, 9, 0, 0, 7, 13}, - {5, 10, -1, 1, 7, 22}, - {7, 9, 0, 0, 7, 32}, - {6, 9, 0, 0, 7, 41}, - {3, 4, -2, -5, 7, 50}, - {3, 11, -2, 1, 7, 54}, - {3, 11, -2, 1, 7, 65}, - {5, 6, -1, -2, 7, 76}, - {5, 5, -1, -2, 7, 82}, - {2, 4, -2, 2, 7, 87}, - {5, 1, -1, -4, 7, 91}, - {1, 2, -3, 0, 7, 92}, - {5, 10, -1, 0, 7, 94}, - {5, 9, -1, 0, 7, 104}, - {3, 9, -2, 0, 7, 113}, - {5, 9, -1, 0, 7, 122}, - {5, 9, -1, 0, 7, 131}, - {5, 9, -1, 0, 7, 140}, - {5, 9, -1, 0, 7, 149}, - {5, 9, -1, 0, 7, 158}, - {5, 9, -1, 0, 7, 167}, - {5, 9, -1, 0, 7, 176}, - {5, 9, -1, 0, 7, 185}, - {1, 6, -3, 0, 7, 194}, - {2, 8, -2, 1, 7, 200}, - {5, 9, -1, 0, 7, 208}, - {5, 3, -1, -3, 7, 217}, - {5, 9, -1, 0, 7, 220}, - {5, 9, -1, 0, 7, 229}, - {5, 9, -1, 0, 7, 238}, - {5, 9, -1, 0, 7, 247}, - {5, 9, -1, 0, 7, 256}, - {5, 9, -1, 0, 7, 265}, - {5, 9, -1, 0, 7, 274}, - {5, 9, -1, 0, 7, 283}, - {5, 9, -1, 0, 7, 292}, - {5, 9, -1, 0, 7, 301}, - {5, 9, -1, 0, 7, 310}, - {3, 9, -2, 0, 7, 319}, - {5, 9, -1, 0, 7, 328}, - {5, 9, -1, 0, 7, 337}, - {5, 9, -1, 0, 7, 346}, - {5, 9, -1, 0, 7, 355}, - {5, 9, -1, 0, 7, 364}, - {5, 9, -1, 0, 7, 373}, - {5, 9, -1, 0, 7, 382}, - {5, 11, -1, 2, 7, 391}, - {5, 9, -1, 0, 7, 402}, - {5, 9, -1, 0, 7, 411}, - {5, 9, -1, 0, 7, 420}, - {5, 9, -1, 0, 7, 429}, - {5, 9, -1, 0, 7, 438}, - {5, 9, -1, 0, 7, 447}, - {5, 9, -1, 0, 7, 456}, - {5, 9, -1, 0, 7, 465}, - {5, 9, -1, 0, 7, 474}, - {4, 11, -2, 1, 7, 483}, - {5, 10, -1, 0, 7, 494}, - {4, 11, -1, 1, 7, 504}, - {5, 3, -1, -6, 7, 515}, - {7, 1, 0, 2, 7, 518}, - {3, 4, -2, -5, 7, 519}, - {5, 7, -1, 0, 7, 523}, - {5, 9, -1, 0, 7, 530}, - {5, 7, -1, 0, 7, 539}, - {5, 9, -1, 0, 7, 546}, - {5, 7, -1, 0, 7, 555}, - {5, 9, -1, 0, 7, 562}, - {5, 10, -1, 3, 7, 571}, - {5, 9, -1, 0, 7, 581}, - {3, 9, -2, 0, 7, 590}, - {4, 12, -1, 3, 7, 599}, - {5, 9, -1, 0, 7, 611}, - {3, 9, -2, 0, 7, 620}, - {5, 7, -1, 0, 7, 629}, - {5, 7, -1, 0, 7, 636}, - {5, 7, -1, 0, 7, 643}, - {5, 10, -1, 3, 7, 650}, - {5, 10, -1, 3, 7, 660}, - {5, 7, -1, 0, 7, 670}, - {5, 7, -1, 0, 7, 677}, - {4, 9, -1, 0, 7, 684}, - {5, 7, -1, 0, 7, 693}, - {5, 7, -1, 0, 7, 700}, - {5, 7, -1, 0, 7, 707}, - {5, 7, -1, 0, 7, 714}, - {5, 10, -1, 3, 7, 721}, - {5, 7, -1, 0, 7, 731}, - {5, 12, -1, 2, 7, 738}, - {1, 12, -3, 2, 7, 750}, - {5, 12, -1, 2, 7, 762}, - {6, 3, 0, -3, 7, 774}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 9, -3, 2, 7, 777}, - {5, 10, -1, 0, 7, 786}, - {5, 9, -1, 0, 7, 796}, - {5, 6, -1, -3, 7, 805}, - {5, 9, -1, 0, 7, 811}, - {1, 12, -3, 2, 7, 820}, - {5, 11, -1, 2, 7, 832}, - {5, 1, -1, -8, 7, 843}, - {7, 9, 0, 0, 7, 844}, - {5, 7, -1, -2, 7, 853}, - {7, 7, 0, 0, 7, 860}, - {5, 3, -1, -3, 7, 867}, - {4, 1, -1, -4, 7, 870}, - {7, 9, 0, 0, 7, 871}, - {3, 1, -2, -8, 7, 880}, - {4, 4, -1, -4, 7, 881}, - {5, 7, -1, 0, 7, 885}, - {3, 5, -2, -5, 7, 892}, - {3, 5, -2, -5, 7, 897}, - {2, 2, -3, -8, 7, 902}, - {6, 8, -1, 2, 7, 904}, - {6, 10, 0, 1, 7, 912}, - {1, 2, -3, -3, 7, 922}, - {3, 3, -2, 3, 7, 924}, - {3, 5, -2, -5, 7, 927}, - {5, 7, -1, -2, 7, 932}, - {7, 7, 0, 0, 7, 939}, - {7, 10, 0, 0, 7, 946}, - {6, 11, 0, 1, 7, 956}, - {7, 9, 0, -1, 7, 967}, - {5, 10, -1, 3, 7, 976}, - {5, 11, -1, 0, 7, 986}, - {5, 11, -1, 0, 7, 997}, - {5, 11, -1, 0, 7, 1008}, - {5, 11, -1, 0, 7, 1019}, - {5, 10, -1, 0, 7, 1030}, - {5, 11, -1, 0, 7, 1040}, - {6, 9, 0, 0, 7, 1051}, - {5, 12, -1, 3, 7, 1060}, - {5, 11, -1, 0, 7, 1072}, - {5, 11, -1, 0, 7, 1083}, - {5, 11, -1, 0, 7, 1094}, - {5, 10, -1, 0, 7, 1105}, - {3, 11, -2, 0, 7, 1115}, - {3, 11, -2, 0, 7, 1126}, - {3, 11, -2, 0, 7, 1137}, - {5, 10, -1, 0, 7, 1148}, - {6, 9, 0, 0, 7, 1158}, - {5, 11, -1, 0, 7, 1167}, - {5, 11, -1, 0, 7, 1178}, - {5, 11, -1, 0, 7, 1189}, - {5, 11, -1, 0, 7, 1200}, - {5, 11, -1, 0, 7, 1211}, - {5, 10, -1, 0, 7, 1222}, - {5, 5, -1, -1, 7, 1232}, - {7, 9, 0, 0, 7, 1237}, - {5, 11, -1, 0, 7, 1246}, - {5, 11, -1, 0, 7, 1257}, - {5, 11, -1, 0, 7, 1268}, - {5, 10, -1, 0, 7, 1279}, - {5, 11, -1, 0, 7, 1289}, - {6, 9, 0, 0, 7, 1300}, - {5, 9, -1, 0, 7, 1309}, - {5, 10, -1, 0, 7, 1318}, - {5, 10, -1, 0, 7, 1328}, - {5, 10, -1, 0, 7, 1338}, - {5, 10, -1, 0, 7, 1348}, - {5, 9, -1, 0, 7, 1358}, - {5, 11, -1, 0, 7, 1367}, - {7, 7, 0, 0, 7, 1378}, - {5, 10, -1, 3, 7, 1385}, - {5, 10, -1, 0, 7, 1395}, - {5, 10, -1, 0, 7, 1405}, - {5, 10, -1, 0, 7, 1415}, - {5, 9, -1, 0, 7, 1425}, - {3, 10, -2, 0, 7, 1434}, - {4, 10, -2, 0, 7, 1444}, - {3, 10, -2, 0, 7, 1454}, - {5, 9, -2, 0, 7, 1464}, - {5, 11, -1, 0, 7, 1473}, - {5, 10, -1, 0, 7, 1484}, - {5, 10, -1, 0, 7, 1494}, - {5, 10, -1, 0, 7, 1504}, - {5, 10, -1, 0, 7, 1514}, - {5, 10, -1, 0, 7, 1524}, - {5, 9, -1, 0, 7, 1534}, - {7, 7, 0, 0, 7, 1543}, - {7, 7, 0, 0, 7, 1550}, - {5, 10, -1, 0, 7, 1557}, - {5, 10, -1, 0, 7, 1567}, - {5, 10, -1, 0, 7, 1577}, - {5, 9, -1, 0, 7, 1587}, - {5, 13, -1, 3, 7, 1596}, - {6, 11, 0, 2, 7, 1609}, - {5, 12, -1, 3, 7, 1620}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/BMF_font_scr15.cpp b/intern/bmfont/intern/BMF_font_scr15.cpp deleted file mode 100644 index 8490e999bdb..00000000000 --- a/intern/bmfont/intern/BMF_font_scr15.cpp +++ /dev/null @@ -1,525 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "BMF_FontData.h" -#include "BMF_Settings.h" - -#if BMF_INCLUDE_SCR15 - -static unsigned char bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x90,0x90,0x90,0x90,0x48,0x48, - 0x48,0xfe,0x24,0x24,0x24,0x7f,0x12,0x12, - 0x20,0x70,0xa8,0xa8,0x28,0x30,0x60,0xa0, - 0xa8,0xa8,0x70,0x20,0x8c,0x52,0x52,0x2c, - 0x10,0x10,0x68,0x94,0x94,0x62,0x72,0x8c, - 0x84,0x8a,0x50,0x20,0x30,0x48,0x48,0x30, - 0x80,0x40,0x60,0x60,0x10,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x10,0x80,0x40,0x20,0x20,0x10,0x10,0x10, - 0x10,0x10,0x20,0x20,0x40,0x80,0x20,0xa8, - 0x70,0x70,0xa8,0x20,0x10,0x10,0x10,0xfe, - 0x10,0x10,0x10,0x80,0x40,0x20,0x60,0x60, - 0xfc,0xc0,0xc0,0x80,0x80,0x40,0x40,0x20, - 0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x78, - 0x84,0x84,0xc4,0xa4,0x94,0x8c,0x84,0x84, - 0x78,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xfc,0x80,0x40,0x20,0x10, - 0x08,0x04,0x84,0x84,0x78,0x78,0x84,0x04, - 0x04,0x04,0x38,0x04,0x04,0x84,0x78,0x08, - 0x08,0x08,0xfc,0x88,0x48,0x48,0x28,0x18, - 0x08,0x78,0x84,0x04,0x04,0x04,0xf8,0x80, - 0x80,0x80,0xfc,0x78,0x84,0x84,0x84,0x84, - 0xf8,0x80,0x80,0x84,0x78,0x20,0x20,0x20, - 0x10,0x10,0x08,0x08,0x04,0x04,0xfc,0x78, - 0x84,0x84,0x84,0x84,0x78,0x84,0x84,0x84, - 0x78,0x78,0x84,0x04,0x04,0x7c,0x84,0x84, - 0x84,0x84,0x78,0xc0,0xc0,0x00,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0x00,0xc0,0xc0,0x04,0x08,0x10,0x20,0x40, - 0x80,0x40,0x20,0x10,0x08,0x04,0xfc,0x00, - 0x00,0xfc,0x80,0x40,0x20,0x10,0x08,0x04, - 0x08,0x10,0x20,0x40,0x80,0x10,0x10,0x00, - 0x10,0x10,0x08,0x04,0x84,0x84,0x78,0x38, - 0x44,0x80,0x98,0xa4,0xa4,0x9c,0x84,0x48, - 0x30,0x84,0x84,0xfc,0x84,0x48,0x48,0x48, - 0x30,0x30,0x30,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x84,0x84,0x84,0xf8,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xf0, - 0x88,0x84,0x84,0x84,0x84,0x84,0x84,0x88, - 0xf0,0xfc,0x80,0x80,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xfc,0x80,0x80,0x80,0x80,0x80, - 0xf8,0x80,0x80,0x80,0xfc,0x74,0x8c,0x84, - 0x84,0x84,0x9c,0x80,0x80,0x84,0x78,0x84, - 0x84,0x84,0x84,0x84,0xfc,0x84,0x84,0x84, - 0x84,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x08,0x08,0x84,0x84,0x88, - 0x90,0xa0,0xc0,0xa0,0x90,0x88,0x84,0xfc, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x82,0x82,0x92,0x92,0xaa,0xaa,0xc6, - 0xc6,0x82,0x82,0x84,0x8c,0x8c,0x94,0x94, - 0xa4,0xa4,0xc4,0xc4,0x84,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x04,0x08,0x10,0x78,0xa4,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x84,0x84, - 0x88,0x90,0xf8,0x84,0x84,0x84,0x84,0xf8, - 0x78,0x84,0x84,0x04,0x18,0x60,0x80,0x84, - 0x84,0x78,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0xfe,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x30,0x30, - 0x30,0x48,0x48,0x48,0x84,0x84,0x84,0x84, - 0x44,0x44,0x44,0xaa,0xaa,0xaa,0x92,0x92, - 0x92,0x82,0x84,0x84,0x48,0x48,0x30,0x30, - 0x48,0x48,0x84,0x84,0x10,0x10,0x10,0x10, - 0x10,0x28,0x44,0x44,0x82,0x82,0xfc,0x80, - 0x40,0x40,0x20,0x10,0x08,0x08,0x04,0xfc, - 0xf0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xf0,0x04,0x04,0x08, - 0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80, - 0x80,0xf0,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0x10,0x10,0xf0,0x88,0x50, - 0x20,0xff,0x20,0x40,0xc0,0xc0,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0xb8,0xc4,0x84, - 0x84,0x84,0xc4,0xb8,0x80,0x80,0x80,0x78, - 0x84,0x80,0x80,0x80,0x84,0x78,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x04,0x04,0x04, - 0x78,0x84,0x80,0xfc,0x84,0x84,0x78,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x20,0x20, - 0x1c,0x78,0x84,0x04,0x04,0x74,0x8c,0x84, - 0x84,0x84,0x8c,0x74,0x84,0x84,0x84,0x84, - 0x84,0xc4,0xb8,0x80,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x20, - 0x70,0x88,0x08,0x08,0x08,0x08,0x08,0x08, - 0x08,0x08,0x38,0x00,0x08,0x08,0x84,0x88, - 0x90,0xe0,0xa0,0x90,0x88,0x80,0x80,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0xe0,0x92,0x92,0x92,0x92,0x92,0x92, - 0xec,0x84,0x84,0x84,0x84,0x84,0xc4,0xb8, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xb8,0xc4,0x84,0x84,0x84, - 0xc4,0xb8,0x04,0x04,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x80,0x80,0x80, - 0x80,0x80,0xc4,0xb8,0x78,0x84,0x04,0x78, - 0x80,0x84,0x78,0x1c,0x20,0x20,0x20,0x20, - 0x20,0xf8,0x20,0x20,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x30,0x30,0x48,0x48,0x84, - 0x84,0x84,0x6c,0x92,0x92,0x92,0x92,0x82, - 0x82,0x84,0x84,0x48,0x30,0x48,0x84,0x84, - 0x78,0x84,0x04,0x04,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0xfc,0x80,0x40,0x20,0x10, - 0x08,0xfc,0x1c,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x20,0x1c,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x10,0x10, - 0x10,0x10,0x10,0x0c,0x10,0x10,0x10,0x10, - 0x10,0xe0,0x98,0xb4,0x64,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x80,0x20, - 0x20,0x70,0x88,0x80,0x80,0x88,0x70,0x20, - 0x20,0xb8,0x44,0x40,0x40,0xf0,0x40,0x40, - 0x40,0x48,0x30,0x84,0x78,0x84,0x84,0x84, - 0x78,0x84,0x38,0x10,0x7c,0x10,0x7c,0x28, - 0x44,0x44,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x78,0x84,0x04,0x18,0x24,0x44, - 0x84,0x88,0x90,0x60,0x80,0x84,0x78,0xd8, - 0x38,0x44,0x92,0xaa,0xa2,0xaa,0x92,0x44, - 0x38,0xf8,0x00,0x68,0x90,0x70,0x10,0x60, - 0x09,0x12,0x24,0x48,0x90,0x48,0x24,0x12, - 0x09,0x04,0x04,0xfc,0xfc,0x38,0x44,0xaa, - 0xaa,0xb2,0xaa,0xb2,0x44,0x38,0xf0,0x60, - 0x90,0x90,0x60,0xfe,0x00,0x10,0x10,0x10, - 0xfe,0x10,0x10,0x10,0xf0,0x40,0x20,0x90, - 0x60,0xe0,0x10,0x60,0x10,0xe0,0x80,0x40, - 0x80,0x80,0x80,0xb4,0xc8,0x88,0x88,0x88, - 0x88,0x88,0x24,0x24,0x24,0x24,0x24,0x24, - 0x64,0xa4,0xa4,0xa4,0xa4,0x7e,0xc0,0xc0, - 0x20,0x40,0xe0,0x40,0x40,0xc0,0x40,0xf8, - 0x00,0x70,0x88,0x88,0x88,0x70,0x90,0x48, - 0x24,0x12,0x09,0x12,0x24,0x48,0x90,0x04, - 0x9e,0x54,0x2c,0x14,0xe8,0x44,0x42,0xc0, - 0x40,0x1e,0x08,0x84,0x52,0x2c,0x10,0xe8, - 0x44,0x42,0xc0,0x40,0x04,0x9e,0x54,0x2c, - 0xd4,0x28,0x44,0x22,0xc0,0x78,0x84,0x84, - 0x80,0x40,0x20,0x20,0x00,0x20,0x20,0x84, - 0x84,0xfc,0x84,0x48,0x48,0x30,0x30,0x00, - 0x20,0x40,0x84,0x84,0xfc,0x84,0x48,0x48, - 0x30,0x30,0x00,0x10,0x08,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x00,0x48,0x30, - 0x84,0x84,0xfc,0x84,0x48,0x48,0x30,0x30, - 0x00,0x98,0x64,0x84,0x84,0xfc,0x84,0x48, - 0x48,0x30,0x30,0x00,0x6c,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x30,0x48,0x30, - 0x9e,0x90,0x90,0xf0,0x90,0x5c,0x50,0x50, - 0x30,0x1e,0x30,0x08,0x10,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xfc, - 0x80,0x80,0x80,0xf8,0x80,0x80,0xfc,0x00, - 0x20,0x40,0xfc,0x80,0x80,0x80,0xf8,0x80, - 0x80,0xfc,0x00,0x10,0x08,0xfc,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xfc,0x00,0x48,0x30, - 0xfc,0x80,0x80,0x80,0xf8,0x80,0x80,0xfc, - 0x00,0x6c,0xe0,0x40,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0x40,0x80,0xe0,0x40,0x40, - 0x40,0x40,0x40,0x40,0xe0,0x00,0x40,0x20, - 0xe0,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x90,0x60,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x70,0x00,0xd8,0x78,0x44,0x42, - 0x42,0x42,0xf2,0x42,0x42,0x44,0x78,0x84, - 0x8c,0x94,0x94,0xa4,0xa4,0xc4,0x84,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x20,0x40,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x10,0x08, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x78, - 0x00,0x48,0x30,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x98,0x64,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x6c, - 0x84,0x48,0x30,0x30,0x48,0x84,0xbc,0x42, - 0x62,0x52,0x52,0x4a,0x4a,0x46,0x42,0x3d, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x84, - 0x00,0x20,0x40,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x30,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x6c,0x10,0x10,0x10,0x10,0x28, - 0x44,0x44,0x82,0x00,0x10,0x08,0xe0,0x40, - 0x7c,0x42,0x42,0x42,0x42,0x7c,0x40,0xe0, - 0x98,0xa4,0x84,0x84,0x84,0x88,0xb0,0x88, - 0x88,0x70,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x20,0x40,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x20,0x10,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x48,0x30, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x98,0x64,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0xd8,0x74,0x88,0x88,0x78,0x08, - 0x88,0x70,0x00,0x30,0x48,0x30,0x6c,0x92, - 0x90,0x7e,0x12,0x92,0x6c,0x30,0x08,0x10, - 0x78,0x84,0x80,0x80,0x80,0x84,0x78,0x78, - 0x84,0x80,0xfc,0x84,0x84,0x78,0x00,0x20, - 0x40,0x78,0x84,0x80,0xfc,0x84,0x84,0x78, - 0x00,0x10,0x08,0x78,0x84,0x80,0xfc,0x84, - 0x84,0x78,0x00,0x48,0x30,0x78,0x84,0x80, - 0xfc,0x84,0x84,0x78,0x00,0x6c,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x40,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x90,0x60,0x10,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0xd8,0x78,0x84,0x84, - 0x84,0x84,0x84,0x7c,0x04,0xc8,0x30,0xc8, - 0x84,0x84,0x84,0x84,0x84,0xc4,0xb8,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x20,0x40,0x78,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x48,0x30, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x00,0x6c,0x30,0x00,0x00,0xfc, - 0x00,0x00,0x30,0xbc,0x62,0x52,0x4a,0x46, - 0x42,0x3d,0x74,0x8c,0x84,0x84,0x84,0x84, - 0x84,0x00,0x20,0x40,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x00,0x20,0x10,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x48,0x30, - 0x74,0x8c,0x84,0x84,0x84,0x84,0x84,0x00, - 0x00,0x6c,0x78,0x84,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x20,0x10, - 0xe0,0x40,0x40,0x5c,0x62,0x42,0x42,0x42, - 0x62,0x5c,0x40,0x40,0xc0,0x78,0x84,0x04, - 0x04,0x74,0x8c,0x84,0x84,0x84,0x84,0x84, - 0x00,0x00,0x6c, -}; - -BMF_FontData BMF_font_scr15 = { - 0, -4, - 8, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 20, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 0, 8, 0}, - {4, 4, -2, -6, 8, 10}, - {8, 10, 0, 0, 8, 14}, - {5, 12, -1, 1, 8, 24}, - {7, 10, 0, 0, 8, 36}, - {7, 10, 0, 0, 8, 46}, - {3, 4, -2, -6, 8, 56}, - {4, 13, -2, 2, 8, 60}, - {4, 13, -2, 2, 8, 73}, - {5, 6, -1, -2, 8, 86}, - {7, 7, 0, -1, 8, 92}, - {3, 5, -2, 3, 8, 99}, - {6, 1, -1, -4, 8, 104}, - {2, 2, -3, 0, 8, 105}, - {6, 12, -1, 1, 8, 107}, - {6, 10, -1, 0, 8, 119}, - {3, 10, -3, 0, 8, 129}, - {6, 10, -1, 0, 8, 139}, - {6, 10, -1, 0, 8, 149}, - {6, 10, -1, 0, 8, 159}, - {6, 10, -1, 0, 8, 169}, - {6, 10, -1, 0, 8, 179}, - {6, 10, -1, 0, 8, 189}, - {6, 10, -1, 0, 8, 199}, - {6, 10, -1, 0, 8, 209}, - {2, 7, -3, 0, 8, 219}, - {2, 9, -3, 2, 8, 226}, - {6, 11, -1, 1, 8, 235}, - {6, 4, -1, -3, 8, 246}, - {6, 11, -1, 1, 8, 250}, - {6, 10, -1, 0, 8, 261}, - {6, 10, -1, 0, 8, 271}, - {6, 10, -1, 0, 8, 281}, - {6, 10, -1, 0, 8, 291}, - {6, 10, -1, 0, 8, 301}, - {6, 10, -1, 0, 8, 311}, - {6, 10, -1, 0, 8, 321}, - {6, 10, -1, 0, 8, 331}, - {6, 10, -1, 0, 8, 341}, - {6, 10, -1, 0, 8, 351}, - {3, 10, -2, 0, 8, 361}, - {5, 10, -1, 0, 8, 371}, - {6, 10, -1, 0, 8, 381}, - {6, 10, -1, 0, 8, 391}, - {7, 10, 0, 0, 8, 401}, - {6, 10, -1, 0, 8, 411}, - {6, 10, -1, 0, 8, 421}, - {6, 10, -1, 0, 8, 431}, - {6, 13, -1, 3, 8, 441}, - {6, 10, -1, 0, 8, 454}, - {6, 10, -1, 0, 8, 464}, - {7, 10, 0, 0, 8, 474}, - {6, 10, -1, 0, 8, 484}, - {6, 10, -1, 0, 8, 494}, - {7, 10, 0, 0, 8, 504}, - {6, 10, -1, 0, 8, 514}, - {7, 10, 0, 0, 8, 524}, - {6, 10, -1, 0, 8, 534}, - {4, 13, -2, 2, 8, 544}, - {6, 12, -1, 1, 8, 557}, - {4, 13, -2, 2, 8, 569}, - {5, 3, -1, -6, 8, 582}, - {8, 1, 0, 3, 8, 585}, - {3, 4, -2, -6, 8, 586}, - {6, 7, -1, 0, 8, 590}, - {6, 10, -1, 0, 8, 597}, - {6, 7, -1, 0, 8, 607}, - {6, 10, -1, 0, 8, 614}, - {6, 7, -1, 0, 8, 624}, - {6, 10, -1, 0, 8, 631}, - {6, 11, -1, 4, 8, 641}, - {6, 10, -1, 0, 8, 652}, - {3, 10, -2, 0, 8, 662}, - {5, 14, -1, 4, 8, 672}, - {6, 10, -1, 0, 8, 686}, - {3, 10, -2, 0, 8, 696}, - {7, 7, 0, 0, 8, 706}, - {6, 7, -1, 0, 8, 713}, - {6, 7, -1, 0, 8, 720}, - {6, 11, -1, 4, 8, 727}, - {6, 11, -1, 4, 8, 738}, - {6, 7, -1, 0, 8, 749}, - {6, 7, -1, 0, 8, 756}, - {6, 9, -1, 0, 8, 763}, - {6, 7, -1, 0, 8, 772}, - {6, 7, -1, 0, 8, 779}, - {7, 7, 0, 0, 8, 786}, - {6, 7, -1, 0, 8, 793}, - {6, 11, -1, 4, 8, 800}, - {6, 7, -1, 0, 8, 811}, - {6, 13, -1, 2, 8, 818}, - {1, 14, -3, 3, 8, 831}, - {6, 13, -1, 2, 8, 845}, - {6, 3, -1, -3, 8, 858}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 3, 8, 861}, - {5, 10, -1, 0, 8, 871}, - {6, 10, -1, 0, 8, 881}, - {6, 7, -1, -2, 8, 891}, - {7, 10, 0, 0, 8, 898}, - {1, 14, -3, 3, 8, 908}, - {6, 13, -1, 3, 8, 922}, - {5, 1, -1, -9, 8, 935}, - {7, 9, 0, 0, 8, 936}, - {5, 7, -1, -3, 8, 945}, - {8, 9, 0, 0, 8, 952}, - {6, 3, -1, -3, 8, 961}, - {6, 1, -1, -4, 8, 964}, - {7, 9, 0, 0, 8, 965}, - {4, 1, -2, -9, 8, 974}, - {4, 4, -2, -4, 8, 975}, - {7, 9, 0, 0, 8, 979}, - {4, 5, -2, -5, 8, 988}, - {4, 5, -2, -5, 8, 993}, - {2, 2, -3, -9, 8, 998}, - {6, 10, -1, 3, 8, 1000}, - {7, 12, 0, 2, 8, 1010}, - {2, 1, -3, -4, 8, 1022}, - {3, 3, -3, 3, 8, 1023}, - {3, 5, -3, -5, 8, 1026}, - {5, 7, -1, -3, 8, 1031}, - {8, 9, 0, 0, 8, 1038}, - {7, 10, 0, 0, 8, 1047}, - {7, 11, 0, 1, 8, 1057}, - {7, 9, 0, -1, 8, 1068}, - {6, 10, -1, 2, 8, 1077}, - {6, 11, -1, 0, 8, 1087}, - {6, 11, -1, 0, 8, 1098}, - {6, 11, -1, 0, 8, 1109}, - {6, 11, -1, 0, 8, 1120}, - {6, 10, -1, 0, 8, 1131}, - {6, 11, -1, 0, 8, 1141}, - {7, 10, 0, 0, 8, 1152}, - {6, 13, -1, 3, 8, 1162}, - {6, 11, -1, 0, 8, 1175}, - {6, 11, -1, 0, 8, 1186}, - {6, 11, -1, 0, 8, 1197}, - {6, 10, -1, 0, 8, 1208}, - {3, 11, -2, 0, 8, 1218}, - {3, 11, -2, 0, 8, 1229}, - {4, 11, -2, 0, 8, 1240}, - {5, 10, -1, 0, 8, 1251}, - {7, 10, 0, 0, 8, 1261}, - {6, 11, -1, 0, 8, 1271}, - {6, 11, -1, 0, 8, 1282}, - {6, 11, -1, 0, 8, 1293}, - {6, 11, -1, 0, 8, 1304}, - {6, 11, -1, 0, 8, 1315}, - {6, 10, -1, 0, 8, 1326}, - {6, 6, -1, -1, 8, 1336}, - {8, 10, 0, 0, 8, 1342}, - {6, 11, -1, 0, 8, 1352}, - {6, 11, -1, 0, 8, 1363}, - {6, 11, -1, 0, 8, 1374}, - {6, 10, -1, 0, 8, 1385}, - {7, 11, 0, 0, 8, 1395}, - {7, 10, 0, 0, 8, 1406}, - {6, 10, -1, 0, 8, 1416}, - {6, 10, -1, 0, 8, 1426}, - {6, 10, -1, 0, 8, 1436}, - {6, 10, -1, 0, 8, 1446}, - {6, 10, -1, 0, 8, 1456}, - {6, 9, -1, 0, 8, 1466}, - {6, 11, -1, 0, 8, 1475}, - {7, 7, 0, 0, 8, 1486}, - {6, 10, -1, 3, 8, 1493}, - {6, 10, -1, 0, 8, 1503}, - {6, 10, -1, 0, 8, 1513}, - {6, 10, -1, 0, 8, 1523}, - {6, 9, -1, 0, 8, 1533}, - {3, 10, -2, 0, 8, 1542}, - {3, 10, -2, 0, 8, 1552}, - {4, 10, -2, 0, 8, 1562}, - {5, 9, -1, 0, 8, 1572}, - {6, 11, -1, 0, 8, 1581}, - {6, 10, -1, 0, 8, 1592}, - {6, 10, -1, 0, 8, 1602}, - {6, 10, -1, 0, 8, 1612}, - {6, 10, -1, 0, 8, 1622}, - {6, 10, -1, 0, 8, 1632}, - {6, 10, -1, 0, 8, 1642}, - {6, 7, -1, 0, 8, 1652}, - {8, 7, 0, 0, 8, 1659}, - {6, 10, -1, 0, 8, 1666}, - {6, 10, -1, 0, 8, 1676}, - {6, 10, -1, 0, 8, 1686}, - {6, 10, -1, 0, 8, 1696}, - {6, 14, -1, 4, 8, 1706}, - {7, 13, 0, 3, 8, 1720}, - {6, 14, -1, 4, 8, 1733}, - }, - bitmap_data -}; - -#endif - diff --git a/intern/bmfont/intern/Makefile b/intern/bmfont/intern/Makefile deleted file mode 100644 index f420cfcf1e6..00000000000 --- a/intern/bmfont/intern/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# bmfont intern Makefile -# - -LIBNAME = bmfont -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I. -CPPFLAGS += -I.. -CPPFLAGS += -I$(OPENGL_HEADERS) - diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp deleted file mode 100644 index b7ff7774fa1..00000000000 --- a/intern/bmfont/make/msvc_6_0/bmfont.dsp +++ /dev/null @@ -1,176 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bmfont" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=bmfont - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "bmfont.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bmfont.mak" CFG="bmfont - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bmfont - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "bmfont - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bmfont - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\libbmfont.lib" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copying BMFONT files library (release target) to lib tree. -PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\*.a ECHO Done -# End Special Build Tool - -!ELSEIF "$(CFG)" == "bmfont - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont\debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont\debug" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\debug\libbmfont.lib" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree. -PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\bmfont\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bmfont\debug\*.lib ..\..\..\..\..\lib\windows\bmfont\lib\debug\*.a ECHO Done -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "bmfont - Win32 Release" -# Name "bmfont - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\intern\BMF_Api.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_BitmapFont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helv10.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helv12.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helvb10.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helvb12.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helvb14.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_helvb8.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_scr12.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_scr14.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_font_scr15.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "intern" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\intern\BMF_BitmapFont.h -# End Source File -# Begin Source File - -SOURCE=..\..\intern\BMF_FontData.h -# End Source File -# End Group -# Begin Group "extern" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\BMF_Api.h -# End Source File -# Begin Source File - -SOURCE=..\..\BMF_Fonts.h -# End Source File -# Begin Source File - -SOURCE=..\..\BMF_Settings.h -# End Source File -# End Group -# End Group -# End Target -# End Project diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsw b/intern/bmfont/make/msvc_6_0/bmfont.dsw deleted file mode 100644 index 265738bc0fe..00000000000 --- a/intern/bmfont/make/msvc_6_0/bmfont.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "bmfont"=.\bmfont.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/intern/bmfont/make/msvc_7_0/bmfont.sln b/intern/bmfont/make/msvc_7_0/bmfont.sln deleted file mode 100644 index 7f1979a8273..00000000000 --- a/intern/bmfont/make/msvc_7_0/bmfont.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmfont", "bmfont.vcproj", "{8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Debug.ActiveCfg = Debug|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Debug.Build.0 = Debug|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Release.ActiveCfg = Release|Win32 - {8CDFE9DC-F28C-4E1F-9389-3066BB0AB09F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/bmfont/make/msvc_7_0/bmfont.vcproj b/intern/bmfont/make/msvc_7_0/bmfont.vcproj deleted file mode 100644 index 089130bc5e0..00000000000 --- a/intern/bmfont/make/msvc_7_0/bmfont.vcproj +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intern/bmfont/make/msvc_9_0/bmfont.vcproj b/intern/bmfont/make/msvc_9_0/bmfont.vcproj deleted file mode 100644 index 91d6e6afc1a..00000000000 --- a/intern/bmfont/make/msvc_9_0/bmfont.vcproj +++ /dev/null @@ -1,413 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/intern/bmfont/test/Makefile b/intern/bmfont/test/Makefile deleted file mode 100644 index 135db74f38b..00000000000 --- a/intern/bmfont/test/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the bmfont module -# - -LIBNAME = bmfont -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = simpletest - -include nan_subdirs.mk -include nan_compile.mk -include nan_link.mk - -TESTLIBS = $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)lib$(LIBNAME).a -TESTLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -TESTLIBS += $(LCGDIR)/ghost/$(DEBUG_DIR)lib/libghost.a - - -ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd")) - TESTLIBS += -L/usr/X11R6/lib -lglut -pthread -endif - -ifeq ($(OS),$(findstring $(OS), "solaris")) - TESTLIBS += -L/usr/openwin/lib -lglut -lX11 -lGL -lGLU -lXmu -endif - - -all debug:: - @echo "****> linking $@ in $(SOURCEDIR)" - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)BMF_Test $(DIR)/BMF_Test.o $(TESTLIBS) - -clean:: - $(RM) $(DIR)/BMF_Test $(DIR)/debug/BMF_Test - -test:: $(DIR)/BMF_Test - $(DIR)/BMF_Test $(NAN_TEST_VERBOSITY) - diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp deleted file mode 100644 index d178f5b4dc1..00000000000 --- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp +++ /dev/null @@ -1,109 +0,0 @@ -# Microsoft Developer Studio Project File - Name="BMF_Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=BMF_Test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "BMF_Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "BMF_Test.mak" CFG="BMF_Test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "BMF_Test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "BMF_Test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "BMF_Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test" -# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libstring.a libghost.a glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib" - -!ELSEIF "$(CFG)" == "BMF_Test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug" -# PROP Intermediate_Dir "../../../../../../obj/windows/intern/BMF_bmfont/test/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../" /I "../../../../../lib/windows/string/include" /I "../../../../../lib/windows/ghost/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glu32.lib opengl32.lib libstring.a libghost.a user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/windows/string/lib" /libpath:"../../../../../lib/windows/ghost/lib" - -!ENDIF - -# Begin Target - -# Name "BMF_Test - Win32 Release" -# Name "BMF_Test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\intern\BMF_glut_helb8.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\intern\BMF_glut_helb8.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\BMF_Test.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw b/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw deleted file mode 100644 index 321de497224..00000000000 --- a/intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "BMF_Test"=.\BMF_Test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name BMF_bmfont - End Project Dependency -}}} - -############################################################################### - -Project: "BMF_bmfont"=..\..\..\make\msvc_6_0\BMF_bmfont.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/intern/bmfont/test/simpletest/BMF_Test.cpp b/intern/bmfont/test/simpletest/BMF_Test.cpp deleted file mode 100644 index 93a55042a4f..00000000000 --- a/intern/bmfont/test/simpletest/BMF_Test.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/** - * $Id$ - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** - - * $Id$ - * Copyright (C) 2001 NaN Technologies B.V. - * Simple test file for the bitmap font library using GHOST. - * @author Maarten Gribnau - * @date November 15, 2001 - */ - -#include - -#ifdef HAVE_CONFIG_H -#include -#endif - -#define FALSE 0 -#define TRUE 1 - -#if defined(WIN32) || defined(__APPLE__) -#ifdef WIN32 -#include -#include -#else // WIN32 -// __APPLE__ is defined -#include -#endif // WIN32 -#else // defined(WIN32) || defined(__APPLE__) -#include -#endif // defined(WIN32) || defined(__APPLE__) - - -#include "STR_String.h" -#include "GHOST_Rect.h" - -#include "GHOST_ISystem.h" -#include "GHOST_IEvent.h" -#include "GHOST_IEventConsumer.h" - -#include "BMF_Api.h" - -static class Application* fApp; -static GHOST_ISystem* fSystem = 0; - - -static void drawGL() -{ - GLint x = 10, y = 10; - - ::glRasterPos2i(x, y); - BMF_Font *font = BMF_GetFont(BMF_kHelvetica10); - BMF_DrawString(font, "Helvetica 10 point"); - y += 14; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelvetica12); - BMF_DrawString(font, "Helvetica 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold8); - BMF_DrawString(font, "Helvetica Bold 8 point"); - y += 12; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold10); - BMF_DrawString(font, "Helvetica Bold 10 point"); - y += 14; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold12); - BMF_DrawString(font, "Helvetica Bold 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kHelveticaBold14); - BMF_DrawString(font, "Helvetica Bold 14 point"); - y += 18; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen12); - BMF_DrawString(font, "Screen 12 point"); - y += 16; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen14); - BMF_DrawString(font, "Screen 14 point"); - y += 18; - ::glRasterPos2i(x, y); - font = BMF_GetFont(BMF_kScreen15); - BMF_DrawString(font, "Screen 15 point"); -} - - -static void setViewPortGL(GHOST_IWindow* window) -{ - window->activateDrawingContext(); - GHOST_Rect bnds; - window->getClientBounds(bnds); - - ::glViewport(0, 0, bnds.getWidth(), bnds.getHeight()); - - ::glMatrixMode(GL_PROJECTION); - ::glLoadIdentity(); - ::glOrtho(0, bnds.getWidth(), 0, bnds.getHeight(), -10, 10); - - ::glClearColor(.2f,0.0f,0.0f,0.0f); - ::glClear(GL_COLOR_BUFFER_BIT); -} - - - -class Application : public GHOST_IEventConsumer { -public: - Application(GHOST_ISystem* system); - virtual bool processEvent(GHOST_IEvent* event); - - GHOST_ISystem* m_system; - GHOST_IWindow* m_mainWindow; - bool m_exitRequested; -}; - - -Application::Application(GHOST_ISystem* system) - : m_system(system), m_mainWindow(0), m_exitRequested(false) -{ - fApp = this; - - // Create the main window - STR_String title1 ("gears - main window"); - m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL,FALSE); - if (!m_mainWindow) { - std::cout << "could not create main window\n"; - exit(-1); - } -} - - -bool Application::processEvent(GHOST_IEvent* event) -{ - bool handled = true; - - switch (event->getType()) { - case GHOST_kEventWindowClose: - { - GHOST_IWindow* window2 = event->getWindow(); - if (window2 == m_mainWindow) { - exit(0); - } else { - m_system->disposeWindow(window2); - } - } - break; - - case GHOST_kEventWindowActivate: - handled = false; - break; - case GHOST_kEventWindowDeactivate: - handled = false; - break; - case GHOST_kEventWindowUpdate: - { - GHOST_IWindow* window2 = event->getWindow(); - if (!m_system->validWindow(window2)) break; - { - setViewPortGL(window2); - drawGL(); - window2->swapBuffers(); - } - } - break; - - default: - handled = false; - break; - } - return handled; -} - - -int main(int /*argc*/, char** /*argv*/) -{ - // Create the system - GHOST_ISystem::createSystem(); - fSystem = GHOST_ISystem::getSystem(); - - if (fSystem) { - // Create an application object - Application app (fSystem); - - // Add the application as event consumer - fSystem->addEventConsumer(&app); - - // Enter main loop - while (!app.m_exitRequested) { - fSystem->processEvents(TRUE); - fSystem->dispatchEvents(); - } - } - - // Dispose the system - GHOST_ISystem::disposeSystem(); - - return 0; -} - diff --git a/intern/bmfont/test/simpletest/Makefile b/intern/bmfont/test/simpletest/Makefile deleted file mode 100644 index 5c5e32f2ed2..00000000000 --- a/intern/bmfont/test/simpletest/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the bmfont module -# - -LIBNAME = bmfont -DIR = $(OCGDIR)/intern/$(LIBNAME)/test - -# we don't want a library here, only object files: -ALLTARGETS = $(OBJS) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS = -I../.. -CPPFLAGS += -I../../intern -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_GHOST)/include diff --git a/intern/ghost/test/multitest/Makefile b/intern/ghost/test/multitest/Makefile index e67faf012d2..1ecbcd98e2b 100644 --- a/intern/ghost/test/multitest/Makefile +++ b/intern/ghost/test/multitest/Makefile @@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../.. @@ -49,7 +48,6 @@ OCGGHOST = $(OCGDIR)/intern/ghost LIBS = $(OCGGHOST)/$(DEBUG_DIR)libghost.a SLIBS += $(LCGDIR)/string/lib/libstring.a -SLIBS += $(LCGDIR)/bmfont/lib/libbmfont.a SLIBS += $(LCGDIR)/guardedalloc/lib/libguardedalloc.a all:: diff --git a/source/Makefile b/source/Makefile index 1173756cbcb..85486c3a81f 100644 --- a/source/Makefile +++ b/source/Makefile @@ -158,7 +158,6 @@ endif COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a -COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a @@ -184,22 +183,17 @@ ifeq ($(WITH_BINRELOC), true) COMLIB += $(OCGDIR)/extern/binreloc/$(DEBUG_DIR)libbinreloc.a endif -ifeq ($(WITH_FREETYPE2), true) - ifeq ($(OS), windows) - ifeq ($(FREE_WINDOWS), true) - COMLIB += $(NAN_FTGL)/lib/libftgl.a +ifeq ($(OS), windows) + ifeq ($(FREE_WINDOWS), true) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib + else COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib - endif + endif +else + ifeq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else - COMLIB += $(NAN_FTGL)/lib/$(DEBUG_DIR)libftgl.a - ifeq ($(OS), irix) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - endif endif endif diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 510ff550acc..516ecd102d6 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -31,7 +31,7 @@ struct rctf; -int BLF_init(void); +int BLF_init(int points, int dpi); void BLF_exit(void); int BLF_load(char *name); @@ -43,15 +43,14 @@ int BLF_load_mem(char *name, unsigned char *mem, int mem_size); void BLF_set(int fontid); int BLF_get(void); -/* - * Return the font type, can be freetype2 or internal, -1 if - * some error happen (no current font). - */ -int BLF_type_get(void); - void BLF_aspect(float aspect); void BLF_position(float x, float y, float z); void BLF_size(int size, int dpi); + +/* Draw the string using the default font, size and dpi. */ +void BLF_draw_default(float x, float y, float z, char *str); + +/* Draw the string using the current font. */ void BLF_draw(char *str); /* @@ -68,6 +67,14 @@ void BLF_boundbox(char *str, struct rctf *box); float BLF_width(char *str); float BLF_height(char *str); +/* + * and this two function return the width and height + * of the string, using the default font and both value + * are multiplied by the aspect of the font. + */ +float BLF_width_default(char *str); +float BLF_height_default(char *str); + /* * By default, rotation and clipping are disable and * have to be enable/disable using BLF_enable/disable. @@ -112,8 +119,4 @@ void BLF_dir_free(char **dirs, int count); #define BLF_MODE_TEXTURE 0 #define BLF_MODE_BITMAP 1 -/* font->type */ -#define BLF_FONT_FREETYPE2 0 -#define BLF_FONT_INTERNAL 1 - #endif /* BLF_API_H */ diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 4c21138f552..aef655ca0d1 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -26,18 +26,12 @@ FILE(GLOB SRC intern/*.c) SET(INC ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include - ../blenkernel ../ftfont ../../../extern/glew/include . + ../blenkernel ../../../extern/glew/include . ${FTGL_INC} ${FREETYPE_INC} ${GETTEXT_INC} ) -ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC) - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(WIN32) ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL) ENDIF(WIN32) diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 85797c3c23b..fa6fa19a9ef 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -4,19 +4,14 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../editors/include' +incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../editors/include' incs += ' #/extern/glew/include' -incs += ' ' + env['BF_FTGL_INC'] incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] defs = '' -defs += 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' -if env['WITH_BF_INTERNATIONAL']: - defs += ' WITH_FREETYPE2' - env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) diff --git a/source/blender/blenfont/intern/Makefile b/source/blender/blenfont/intern/Makefile index 18bf42f3fa5..6e53ca959d3 100644 --- a/source/blender/blenfont/intern/Makefile +++ b/source/blender/blenfont/intern/Makefile @@ -60,16 +60,11 @@ ifeq ($(OS),linux) endif endif -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 -endif - # Modules CPPFLAGS += -I../../editors/include CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../blenkernel -CPPFLAGS += -I../../ftfont # Memory allocator CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index e43d7905cf9..d49ca0bd0ac 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -31,15 +31,11 @@ #include #include -#ifdef WITH_FREETYPE2 - #include #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -75,14 +71,20 @@ int global_font_num= 0; /* Current font. */ int global_font_cur= 0; +/* Default size and dpi, for BLF_draw_default. */ +int global_font_default= -1; +int global_font_points= 11; +int global_font_dpi= 72; -int BLF_init(void) +int BLF_init(int points, int dpi) { int i; for (i= 0; i < BLF_MAX_FONT; i++) global_font[i]= NULL; + global_font_points= points; + global_font_dpi= dpi; return(blf_font_init()); } @@ -142,7 +144,6 @@ int BLF_load(char *name) return(-1); } -#ifdef WITH_FREETYPE2 font= blf_font_new(name, filename); MEM_freeN(filename); @@ -155,9 +156,6 @@ int BLF_load(char *name) i= global_font_num; global_font_num++; return(i); -#endif /* WITH_FREETYPE2 */ - - return(-1); } int BLF_load_mem(char *name, unsigned char *mem, int mem_size) @@ -181,21 +179,15 @@ int BLF_load_mem(char *name, unsigned char *mem, int mem_size) return(-1); } - font= blf_internal_new(name); - if (!font) { -#ifdef WITH_FREETYPE2 - if (!mem || !mem_size) { - printf("Can't load font: %s from memory!!\n", name); - return(-1); - } - - font= blf_font_new_from_mem(name, mem, mem_size); -#endif /* WITH_FREETYPE2 */ + if (!mem || !mem_size) { + printf("Can't load font: %s from memory!!\n", name); + return(-1); + } - if (!font) { - printf("Can't load font: %s from memory!!\n", name); - return(-1); - } + font= blf_font_new_from_mem(name, mem, mem_size); + if (!font) { + printf("Can't load font: %s from memory!!\n", name); + return(-1); } global_font[global_font_num]= font; @@ -215,16 +207,6 @@ int BLF_get(void) return(global_font_cur); } -int BLF_type_get(void) -{ - FontBLF *font; - - font= global_font[global_font_cur]; - if (font) - return(font->type); - return(-1); -} - void BLF_enable(int option) { FontBLF *font; @@ -299,6 +281,41 @@ void BLF_blur(int size) font->blur= size; } +void BLF_draw_default(float x, float y, float z, char *str) +{ + FontBLF *font; + int old_font, old_point, old_dpi; + + if (!str) + return; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Warning: Can't found default font!!\n"); + return; + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + BLF_position(x, y, z); + BLF_draw(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } +} + void BLF_draw(char *str) { FontBLF *font; @@ -363,6 +380,39 @@ float BLF_width(char *str) return(0.0f); } +float BLF_width_default(char *str) +{ + FontBLF *font; + float width; + int old_font, old_point, old_dpi; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Error: Can't found default font!!\n"); + return(0.0f); + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + width= BLF_width(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } + return(width); +} + float BLF_height(char *str) { FontBLF *font; @@ -373,6 +423,39 @@ float BLF_height(char *str) return(0.0f); } +float BLF_height_default(char *str) +{ + FontBLF *font; + float height; + int old_font, old_point, old_dpi; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Error: Can't found default font!!\n"); + return(0.0f); + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + height= BLF_height(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } + return(height); +} + void BLF_rotation(float angle) { FontBLF *font; diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 1216c610515..d87262522d8 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -29,15 +29,11 @@ #include #include -#ifdef WITH_FREETYPE2 - #include #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 6d185378c25..02b21264115 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -30,15 +30,11 @@ #include #include -#ifdef WITH_FREETYPE2 - #include #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -58,8 +54,6 @@ #include "blf_internal.h" -#ifdef WITH_FREETYPE2 - /* freetype2 handle. */ FT_Library global_ft_lib; @@ -294,7 +288,6 @@ void blf_font_free(FontBLF *font) void blf_font_fill(FontBLF *font) { - font->type= BLF_FONT_FREETYPE2; font->mode= BLF_MODE_TEXTURE; font->ref= 1; font->aspect= 1.0f; @@ -372,16 +365,3 @@ FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size) blf_font_fill(font); return(font); } - -#else /* !WITH_FREETYPE2 */ - -int blf_font_init(void) -{ - return(0); -} - -void blf_font_exit(void) -{ -} - -#endif /* WITH_FREETYPE2 */ diff --git a/source/blender/blenfont/intern/blf_font_helv10.h b/source/blender/blenfont/intern/blf_font_helv10.h deleted file mode 100644 index 7a0a48d83bc..00000000000 --- a/source/blender/blenfont/intern/blf_font_helv10.h +++ /dev/null @@ -1,487 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELV10_H -#define BLF_FONT_HELV10_H - -static unsigned char helv10_bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0x50,0x50,0xf8,0x28,0x7c,0x28, - 0x28,0x20,0x70,0xa8,0x28,0x70,0xa0,0xa8, - 0x70,0x20,0x26,0x29,0x16,0x10,0x08,0x68, - 0x94,0x64,0x64,0x98,0x98,0xa4,0x60,0x50, - 0x50,0x20,0x80,0x40,0x40,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x40,0x40,0x20,0x80, - 0x40,0x40,0x20,0x20,0x20,0x20,0x40,0x40, - 0x80,0xa0,0x40,0xa0,0x20,0x20,0xf8,0x20, - 0x20,0x80,0x40,0x40,0xf8,0x80,0x80,0x80, - 0x40,0x40,0x40,0x40,0x20,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x40,0x40, - 0x40,0x40,0x40,0x40,0xc0,0x40,0xf8,0x80, - 0x40,0x30,0x08,0x08,0x88,0x70,0x70,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x10,0x10, - 0xf8,0x90,0x50,0x50,0x30,0x10,0x70,0x88, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0xc8,0xb0,0x80,0x88,0x70,0x40,0x40, - 0x20,0x20,0x10,0x10,0x08,0xf8,0x70,0x88, - 0x88,0x88,0x70,0x88,0x88,0x70,0x70,0x88, - 0x08,0x68,0x98,0x88,0x88,0x70,0x80,0x00, - 0x00,0x00,0x00,0x80,0x80,0x40,0x40,0x00, - 0x00,0x00,0x00,0x40,0x20,0x40,0x80,0x40, - 0x20,0xf0,0x00,0xf0,0x80,0x40,0x20,0x40, - 0x80,0x40,0x00,0x40,0x40,0x20,0x10,0x90, - 0x60,0x3e,0x00,0x40,0x00,0x9b,0x00,0xa4, - 0x80,0xa4,0x80,0xa2,0x40,0x92,0x40,0x4d, - 0x40,0x20,0x80,0x1f,0x00,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0xf0,0x88,0x88, - 0x88,0xf0,0x88,0x88,0xf0,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf0,0x88,0x84, - 0x84,0x84,0x84,0x88,0xf0,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x80,0x80,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x74,0x8c,0x84, - 0x8c,0x80,0x80,0x84,0x78,0x84,0x84,0x84, - 0x84,0xfc,0x84,0x84,0x84,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x60,0x90,0x10, - 0x10,0x10,0x10,0x10,0x10,0x88,0x88,0x90, - 0x90,0xe0,0xa0,0x90,0x88,0xf0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x92,0x92,0x92, - 0xaa,0xaa,0xc6,0xc6,0x82,0x8c,0x8c,0x94, - 0x94,0xa4,0xa4,0xc4,0xc4,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x80,0x80,0x80, - 0x80,0xf0,0x88,0x88,0xf0,0x02,0x7c,0x8c, - 0x94,0x84,0x84,0x84,0x84,0x78,0x88,0x88, - 0x88,0x88,0xf0,0x88,0x88,0xf0,0x70,0x88, - 0x88,0x08,0x70,0x80,0x88,0x70,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x10,0x28, - 0x28,0x44,0x44,0x44,0x82,0x82,0x22,0x00, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x88,0x88, - 0x50,0x50,0x20,0x50,0x88,0x88,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0xf8,0x80, - 0x40,0x20,0x20,0x10,0x08,0xf8,0xc0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xc0, - 0x20,0x20,0x40,0x40,0x40,0x40,0x80,0x80, - 0xc0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x88,0x50,0x50,0x20,0x20,0xfc, - 0x80,0x80,0x40,0x68,0x90,0x90,0x70,0x10, - 0xe0,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x80, - 0x80,0x60,0x90,0x80,0x80,0x90,0x60,0x68, - 0x98,0x88,0x88,0x98,0x68,0x08,0x08,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x40,0x30,0x70,0x08,0x68, - 0x98,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x90,0x90, - 0xa0,0xc0,0xa0,0x90,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x92,0x92, - 0x92,0x92,0x92,0xec,0x88,0x88,0x88,0x88, - 0xc8,0xb0,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0, - 0x08,0x08,0x68,0x98,0x88,0x88,0x98,0x68, - 0x80,0x80,0x80,0x80,0xc0,0xa0,0x60,0x90, - 0x10,0x60,0x90,0x60,0x60,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x20,0x20,0x50,0x50,0x88,0x88, - 0x28,0x28,0x54,0x54,0x92,0x92,0x88,0x88, - 0x50,0x20,0x50,0x88,0x80,0x40,0x40,0x60, - 0xa0,0xa0,0x90,0x90,0xf0,0x80,0x40,0x20, - 0x10,0xf0,0x20,0x40,0x40,0x40,0x40,0x80, - 0x40,0x40,0x40,0x20,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40, - 0x40,0x40,0x40,0x20,0x40,0x40,0x40,0x80, - 0x98,0x64,0x80,0x80,0x80,0x80,0x80,0x80, - 0x00,0x80,0x40,0x70,0xa8,0xa0,0xa0,0xa8, - 0x70,0x10,0xb0,0x48,0x40,0x40,0xe0,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0xf8,0x20,0xf8,0x50,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x18,0x70,0xc8,0x98, - 0x70,0xc0,0x88,0x70,0xa0,0x38,0x44,0x9a, - 0xa2,0x9a,0x44,0x38,0xe0,0x00,0xa0,0x20, - 0xe0,0x28,0x50,0xa0,0x50,0x28,0x08,0x08, - 0xf8,0xe0,0x38,0x44,0xaa,0xb2,0xba,0x44, - 0x38,0xe0,0x60,0x90,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0xa0, - 0x60,0xc0,0x20,0x40,0xe0,0x80,0x40,0x80, - 0x80,0xf0,0x90,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x28,0x68,0xe8,0xe8,0xe8, - 0x7c,0xc0,0xc0,0x40,0x40,0x40,0xc0,0x40, - 0xe0,0x00,0xe0,0xa0,0xe0,0xa0,0x50,0x28, - 0x50,0xa0,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0x48,0x00,0x44,0x00,0xc4,0x00, - 0x42,0x00,0x27,0x12,0x15,0x0b,0x48,0x44, - 0xc4,0x42,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0xc8,0x00,0x24,0x00,0x44,0x00, - 0xe2,0x00,0x60,0x90,0x80,0x40,0x20,0x20, - 0x00,0x20,0x82,0x82,0x7c,0x44,0x28,0x28, - 0x10,0x10,0x00,0x10,0x20,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0x00,0x10,0x08, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x00,0x28,0x10,0x82,0x82,0x7c,0x44,0x28, - 0x28,0x10,0x10,0x00,0x28,0x14,0x82,0x82, - 0x7c,0x44,0x28,0x28,0x10,0x10,0x00,0x28, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x10,0x28,0x10,0x8f,0x80,0x88,0x00,0x78, - 0x00,0x48,0x00,0x2f,0x80,0x28,0x00,0x18, - 0x00,0x1f,0x80,0x30,0x10,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x00,0x20,0x40, - 0xf8,0x80,0x80,0x80,0xf8,0x80,0x80,0xf8, - 0x00,0x20,0x10,0xf8,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0x80,0xf8,0x80,0x80,0xf8,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x00,0xa0,0x78,0x44,0x42,0x42,0xf2, - 0x42,0x44,0x78,0x8c,0x8c,0x94,0x94,0xa4, - 0xa4,0xc4,0xc4,0x00,0x50,0x28,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x10, - 0x20,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x10,0x08,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x78,0x00,0x28,0x10,0x78, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x50,0x28,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x48,0x88,0x50,0x20,0x50, - 0x88,0x80,0x78,0xc4,0xa4,0xa4,0x94,0x94, - 0x8c,0x78,0x04,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x20,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x20, - 0x10,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x28,0x10,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x00,0x48,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0x00,0x10, - 0x08,0x80,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0x90,0xa0,0x90,0x90, - 0x60,0x68,0x90,0x90,0x70,0x10,0xe0,0x00, - 0x20,0x40,0x68,0x90,0x90,0x70,0x10,0xe0, - 0x00,0x20,0x10,0x68,0x90,0x90,0x70,0x10, - 0xe0,0x00,0x50,0x20,0x68,0x90,0x90,0x70, - 0x10,0xe0,0x00,0xa0,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x00,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x20,0x50,0x20,0x6c,0x92, - 0x90,0x7e,0x12,0xec,0x60,0x20,0x60,0x90, - 0x80,0x80,0x90,0x60,0x60,0x90,0x80,0xf0, - 0x90,0x60,0x00,0x20,0x40,0x60,0x90,0x80, - 0xf0,0x90,0x60,0x00,0x40,0x20,0x60,0x90, - 0x80,0xf0,0x90,0x60,0x00,0x50,0x20,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x00,0x50,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x88,0x78, - 0x90,0x60,0x50,0x90,0x90,0x90,0x90,0x90, - 0xe0,0x00,0xa0,0x50,0x70,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x70,0x00,0x20,0x10,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x50,0x28, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x00,0xf8,0x00,0x20,0x70,0x88,0xc8, - 0xa8,0x98,0x74,0x70,0x90,0x90,0x90,0x90, - 0x90,0x00,0x20,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x00,0x40,0x20,0x70,0x90,0x90, - 0x90,0x90,0x90,0x00,0x50,0x20,0x70,0x90, - 0x90,0x90,0x90,0x90,0x00,0x50,0x80,0x40, - 0x40,0x60,0xa0,0xa0,0x90,0x90,0x00,0x20, - 0x10,0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x40,0x40,0x60,0xa0, - 0xa0,0x90,0x90,0x00,0x50, -}; - -FontDataBLF blf_font_helv10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 0, 3, 0}, - {3, 2, -1, -6, 4, 8}, - {6, 7, 0, 0, 6, 10}, - {5, 9, 0, 1, 6, 17}, - {8, 8, 0, 0, 9, 26}, - {6, 8, -1, 0, 8, 34}, - {2, 3, -1, -5, 3, 42}, - {3, 10, 0, 2, 4, 45}, - {3, 10, -1, 2, 4, 55}, - {3, 3, 0, -5, 4, 65}, - {5, 5, 0, -1, 6, 68}, - {2, 3, 0, 2, 3, 73}, - {5, 1, -1, -3, 7, 76}, - {1, 1, -1, 0, 3, 77}, - {3, 8, 0, 0, 3, 78}, - {5, 8, 0, 0, 6, 86}, - {2, 8, -1, 0, 6, 94}, - {5, 8, 0, 0, 6, 102}, - {5, 8, 0, 0, 6, 110}, - {5, 8, 0, 0, 6, 118}, - {5, 8, 0, 0, 6, 126}, - {5, 8, 0, 0, 6, 134}, - {5, 8, 0, 0, 6, 142}, - {5, 8, 0, 0, 6, 150}, - {5, 8, 0, 0, 6, 158}, - {1, 6, -1, 0, 3, 166}, - {2, 8, 0, 2, 3, 172}, - {3, 5, -1, -1, 6, 180}, - {4, 3, 0, -2, 5, 185}, - {3, 5, -1, -1, 6, 188}, - {4, 8, -1, 0, 6, 193}, - {10, 10, 0, 2, 11, 201}, - {7, 8, 0, 0, 7, 221}, - {5, 8, -1, 0, 7, 229}, - {6, 8, -1, 0, 8, 237}, - {6, 8, -1, 0, 8, 245}, - {5, 8, -1, 0, 7, 253}, - {5, 8, -1, 0, 6, 261}, - {6, 8, -1, 0, 8, 269}, - {6, 8, -1, 0, 8, 277}, - {1, 8, -1, 0, 3, 285}, - {4, 8, 0, 0, 5, 293}, - {5, 8, -1, 0, 7, 301}, - {4, 8, -1, 0, 6, 309}, - {7, 8, -1, 0, 9, 317}, - {6, 8, -1, 0, 8, 325}, - {6, 8, -1, 0, 8, 333}, - {5, 8, -1, 0, 7, 341}, - {7, 9, -1, 1, 8, 349}, - {5, 8, -1, 0, 7, 358}, - {5, 8, -1, 0, 7, 366}, - {5, 8, 0, 0, 5, 374}, - {6, 8, -1, 0, 8, 382}, - {7, 8, 0, 0, 7, 390}, - {9, 8, 0, 0, 9, 398}, - {5, 8, -1, 0, 7, 414}, - {7, 8, 0, 0, 7, 422}, - {5, 8, -1, 0, 7, 430}, - {2, 10, -1, 2, 3, 438}, - {3, 8, 0, 0, 3, 448}, - {2, 10, 0, 2, 3, 456}, - {5, 5, 0, -3, 6, 466}, - {6, 1, 0, 2, 6, 471}, - {2, 3, 0, -5, 3, 472}, - {5, 6, 0, 0, 5, 475}, - {5, 8, 0, 0, 6, 481}, - {4, 6, 0, 0, 5, 489}, - {5, 8, 0, 0, 6, 495}, - {4, 6, 0, 0, 5, 503}, - {4, 8, 0, 0, 4, 509}, - {5, 8, 0, 2, 6, 517}, - {5, 8, 0, 0, 6, 525}, - {1, 8, 0, 0, 2, 533}, - {1, 9, 0, 1, 2, 541}, - {4, 8, 0, 0, 5, 550}, - {1, 8, 0, 0, 2, 558}, - {7, 6, 0, 0, 8, 566}, - {5, 6, 0, 0, 6, 572}, - {5, 6, 0, 0, 6, 578}, - {5, 8, 0, 2, 6, 584}, - {5, 8, 0, 2, 6, 592}, - {3, 6, 0, 0, 4, 600}, - {4, 6, 0, 0, 5, 606}, - {3, 8, 0, 0, 4, 612}, - {4, 6, 0, 0, 5, 620}, - {5, 6, 0, 0, 6, 626}, - {7, 6, 0, 0, 8, 632}, - {5, 6, 0, 0, 6, 638}, - {4, 8, 0, 2, 5, 644}, - {4, 6, 0, 0, 5, 652}, - {3, 10, 0, 2, 3, 658}, - {1, 10, -1, 2, 3, 668}, - {3, 10, 0, 2, 3, 678}, - {6, 2, 0, -3, 7, 688}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 2, 3, 690}, - {5, 8, 0, 1, 6, 698}, - {5, 8, 0, 0, 6, 706}, - {4, 6, 0, -1, 5, 714}, - {5, 8, 0, 0, 6, 720}, - {1, 10, -1, 2, 3, 728}, - {5, 10, 0, 2, 6, 738}, - {3, 1, 0, -7, 3, 748}, - {7, 7, -1, 0, 9, 749}, - {3, 5, 0, -3, 4, 756}, - {5, 5, 0, 0, 6, 761}, - {5, 3, -1, -2, 7, 766}, - {3, 1, 0, -3, 4, 769}, - {7, 7, -1, 0, 9, 770}, - {3, 1, 0, -7, 3, 777}, - {4, 4, 0, -3, 4, 778}, - {5, 7, 0, 0, 6, 782}, - {3, 4, 0, -3, 3, 789}, - {3, 4, 0, -3, 3, 793}, - {2, 2, 0, -6, 3, 797}, - {4, 8, 0, 2, 5, 799}, - {6, 10, 0, 2, 6, 807}, - {2, 1, 0, -3, 3, 817}, - {2, 2, 0, 2, 3, 818}, - {2, 4, 0, -3, 3, 820}, - {3, 5, 0, -3, 4, 824}, - {5, 5, 0, 0, 6, 829}, - {9, 8, 0, 0, 9, 834}, - {8, 8, 0, 0, 9, 850}, - {9, 8, 0, 0, 9, 858}, - {4, 8, -1, 2, 6, 874}, - {7, 11, 0, 0, 7, 882}, - {7, 11, 0, 0, 7, 893}, - {7, 11, 0, 0, 7, 904}, - {7, 11, 0, 0, 7, 915}, - {7, 10, 0, 0, 7, 926}, - {7, 11, 0, 0, 7, 936}, - {9, 8, 0, 0, 10, 947}, - {6, 10, -1, 2, 8, 963}, - {5, 11, -1, 0, 7, 973}, - {5, 11, -1, 0, 7, 984}, - {5, 11, -1, 0, 7, 995}, - {5, 10, -1, 0, 7, 1006}, - {2, 11, 0, 0, 3, 1016}, - {2, 11, -1, 0, 3, 1027}, - {3, 11, 0, 0, 3, 1038}, - {3, 10, 0, 0, 3, 1049}, - {7, 8, 0, 0, 8, 1059}, - {6, 11, -1, 0, 8, 1067}, - {6, 11, -1, 0, 8, 1078}, - {6, 11, -1, 0, 8, 1089}, - {6, 11, -1, 0, 8, 1100}, - {6, 11, -1, 0, 8, 1111}, - {6, 10, -1, 0, 8, 1122}, - {5, 5, 0, -1, 6, 1132}, - {6, 10, -1, 1, 8, 1137}, - {6, 11, -1, 0, 8, 1147}, - {6, 11, -1, 0, 8, 1158}, - {6, 11, -1, 0, 8, 1169}, - {6, 10, -1, 0, 8, 1180}, - {7, 11, 0, 0, 7, 1190}, - {5, 8, -1, 0, 7, 1201}, - {4, 8, 0, 0, 5, 1209}, - {5, 9, 0, 0, 5, 1217}, - {5, 9, 0, 0, 5, 1226}, - {5, 9, 0, 0, 5, 1235}, - {5, 9, 0, 0, 5, 1244}, - {5, 8, 0, 0, 5, 1253}, - {5, 9, 0, 0, 5, 1261}, - {7, 6, 0, 0, 8, 1270}, - {4, 8, 0, 2, 5, 1276}, - {4, 9, 0, 0, 5, 1284}, - {4, 9, 0, 0, 5, 1293}, - {4, 9, 0, 0, 5, 1302}, - {4, 8, 0, 0, 5, 1311}, - {2, 9, 1, 0, 2, 1319}, - {2, 9, 0, 0, 2, 1328}, - {3, 9, 1, 0, 2, 1337}, - {3, 8, 0, 0, 2, 1346}, - {5, 9, 0, 0, 6, 1354}, - {4, 9, 0, 0, 5, 1363}, - {5, 9, 0, 0, 6, 1372}, - {5, 9, 0, 0, 6, 1381}, - {5, 9, 0, 0, 6, 1390}, - {5, 9, 0, 0, 6, 1399}, - {5, 8, 0, 0, 6, 1408}, - {5, 5, 0, -1, 6, 1416}, - {6, 6, 0, 0, 6, 1421}, - {4, 9, 0, 0, 5, 1427}, - {4, 9, 0, 0, 5, 1436}, - {4, 9, 0, 0, 5, 1445}, - {4, 8, 0, 0, 5, 1454}, - {4, 11, 0, 2, 5, 1462}, - {5, 10, 0, 2, 6, 1473}, - {4, 10, 0, 2, 5, 1483}, - }, - helv10_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELV10_H */ diff --git a/source/blender/blenfont/intern/blf_font_helv12.h b/source/blender/blenfont/intern/blf_font_helv12.h deleted file mode 100644 index 8ba38ca1cee..00000000000 --- a/source/blender/blenfont/intern/blf_font_helv12.h +++ /dev/null @@ -1,519 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELV12_H -#define BLF_FONT_HELV12_H - -static unsigned char helv12_bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0x50,0x50,0x50,0xfc, - 0x28,0xfc,0x28,0x28,0x20,0x70,0xa8,0xa8, - 0x28,0x70,0xa0,0xa8,0x70,0x20,0x23,0x00, - 0x14,0x80,0x14,0x80,0x13,0x00,0x08,0x00, - 0x68,0x00,0x94,0x00,0x94,0x00,0x62,0x00, - 0x72,0x8c,0x84,0x8a,0x50,0x30,0x48,0x48, - 0x30,0x80,0x40,0xc0,0x20,0x40,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x80,0x40,0x40,0x20,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0xa0,0x40,0xa0,0x20, - 0x20,0xf8,0x20,0x20,0x80,0x40,0x40,0xf8, - 0x80,0x80,0x80,0x40,0x40,0x40,0x20,0x20, - 0x10,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf8,0x80,0x80,0x40, - 0x20,0x10,0x08,0x88,0x70,0x70,0x88,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x08,0x08, - 0xfc,0x88,0x48,0x28,0x28,0x18,0x08,0x70, - 0x88,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xc8,0xb0,0x80,0x88, - 0x70,0x40,0x40,0x20,0x20,0x20,0x10,0x10, - 0x08,0xf8,0x70,0x88,0x88,0x88,0x88,0x70, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x78, - 0x88,0x88,0x88,0x70,0x80,0x00,0x00,0x00, - 0x00,0x80,0x80,0x40,0x40,0x00,0x00,0x00, - 0x00,0x40,0x0c,0x30,0xc0,0x30,0x0c,0xf8, - 0x00,0xf8,0xc0,0x30,0x0c,0x30,0xc0,0x20, - 0x00,0x20,0x20,0x10,0x10,0x88,0x88,0x70, - 0x3e,0x00,0x40,0x00,0x9b,0x00,0xa6,0x80, - 0xa2,0x40,0xa2,0x40,0x92,0x40,0x4d,0x40, - 0x60,0x80,0x1f,0x00,0x82,0x82,0x82,0x7c, - 0x44,0x44,0x28,0x28,0x10,0xf8,0x84,0x84, - 0x84,0xf8,0x84,0x84,0x84,0xf8,0x3c,0x42, - 0x80,0x80,0x80,0x80,0x80,0x42,0x3c,0xf8, - 0x84,0x82,0x82,0x82,0x82,0x82,0x84,0xf8, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0x80,0xf8,0x80,0x80, - 0x80,0xfc,0x3a,0x46,0x82,0x82,0x8e,0x80, - 0x80,0x42,0x3c,0x82,0x82,0x82,0x82,0xfe, - 0x82,0x82,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x70,0x88,0x88, - 0x08,0x08,0x08,0x08,0x08,0x08,0x82,0x84, - 0x88,0x90,0xe0,0xa0,0x90,0x88,0x84,0xf8, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x88,0x80,0x88,0x80,0x94,0x80,0x94,0x80, - 0xa2,0x80,0xa2,0x80,0xc1,0x80,0xc1,0x80, - 0x80,0x80,0x82,0x86,0x8a,0x8a,0x92,0xa2, - 0xa2,0xc2,0x82,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x80,0x80,0x80,0x80, - 0xf8,0x84,0x84,0x84,0xf8,0x3d,0x42,0x85, - 0x89,0x81,0x81,0x81,0x42,0x3c,0x84,0x84, - 0x84,0x88,0xf8,0x84,0x84,0x84,0xf8,0x78, - 0x84,0x84,0x04,0x18,0x60,0x80,0x84,0x78, - 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0xfe,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x10,0x10,0x28,0x28,0x44,0x44, - 0x44,0x82,0x82,0x22,0x00,0x22,0x00,0x22, - 0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x88, - 0x80,0x88,0x80,0x88,0x80,0x82,0x44,0x44, - 0x28,0x10,0x28,0x44,0x44,0x82,0x10,0x10, - 0x10,0x10,0x28,0x44,0x44,0x82,0x82,0xfe, - 0x80,0x40,0x20,0x10,0x08,0x04,0x02,0xfe, - 0xc0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x10,0x10,0x20,0x20, - 0x20,0x40,0x40,0x80,0x80,0xc0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xfe,0xc0,0x80,0x40, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x08,0x08, - 0x70,0x88,0x80,0xf8,0x88,0x88,0x70,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x40,0x30, - 0x70,0x88,0x08,0x68,0x98,0x88,0x88,0x88, - 0x98,0x68,0x88,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x80,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x88,0x90,0xa0,0xc0,0xc0,0xa0,0x90,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x92,0x92,0x92,0x92,0x92,0xda, - 0xa4,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x08,0x08,0x08,0x68,0x98,0x88,0x88, - 0x88,0x98,0x68,0x80,0x80,0x80,0x80,0x80, - 0xc0,0xa0,0x60,0x90,0x10,0x60,0x80,0x90, - 0x60,0x60,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x40,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x20,0x20,0x50,0x50,0x88,0x88,0x88, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x84,0x84, - 0x48,0x30,0x30,0x48,0x84,0x80,0x40,0x20, - 0x20,0x50,0x50,0x90,0x88,0x88,0x88,0xf0, - 0x80,0x40,0x40,0x20,0x10,0xf0,0x30,0x40, - 0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40, - 0x40,0x30,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0xc0,0x20, - 0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20, - 0x20,0xc0,0x98,0x64,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x70, - 0xc8,0xa0,0xa0,0xa0,0xa8,0x70,0x10,0xb0, - 0x48,0x20,0x20,0xf0,0x40,0x40,0x48,0x30, - 0x84,0x78,0x48,0x48,0x78,0x84,0x20,0x20, - 0xf8,0x20,0xf8,0x20,0x50,0x88,0x88,0x80, - 0x80,0x80,0x80,0x00,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x08,0x30,0x48,0x88, - 0x88,0x90,0x60,0x80,0x88,0x70,0xa0,0x3e, - 0x00,0x41,0x00,0x9c,0x80,0xa2,0x80,0xa0, - 0x80,0xa2,0x80,0x9c,0x80,0x41,0x00,0x3e, - 0x00,0xe0,0x00,0xa0,0x20,0xe0,0x28,0x50, - 0xa0,0x50,0x28,0x04,0x04,0x04,0xfc,0xf0, - 0x3e,0x00,0x41,0x00,0x94,0x80,0x94,0x80, - 0x98,0x80,0x94,0x80,0x9c,0x80,0x41,0x00, - 0x3e,0x00,0xf0,0x60,0x90,0x90,0x60,0xf8, - 0x00,0x20,0x20,0xf8,0x20,0x20,0xf0,0x40, - 0x20,0x90,0x60,0xc0,0x20,0x40,0x20,0xe0, - 0x80,0x40,0x80,0x80,0x80,0xe8,0x98,0x88, - 0x88,0x88,0x88,0x88,0x28,0x28,0x28,0x28, - 0x28,0x28,0x68,0xe8,0xe8,0xe8,0x68,0x3c, - 0x80,0xc0,0x20,0x20,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0,0xa0, - 0x50,0x28,0x50,0xa0,0x41,0x00,0x27,0x80, - 0x15,0x00,0x13,0x00,0x49,0x00,0x44,0x00, - 0x44,0x00,0xc2,0x00,0x41,0x00,0x47,0x80, - 0x22,0x00,0x11,0x00,0x14,0x80,0x4b,0x00, - 0x48,0x00,0x44,0x00,0xc2,0x00,0x41,0x00, - 0x21,0x00,0x17,0x80,0x15,0x00,0x0b,0x00, - 0xc9,0x00,0x24,0x00,0x44,0x00,0x22,0x00, - 0xe1,0x00,0x70,0x88,0x88,0x40,0x40,0x20, - 0x20,0x00,0x20,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x10,0x20,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x10,0x08,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x10,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x28,0x14,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x82,0x82, - 0x82,0x7c,0x44,0x44,0x28,0x10,0x10,0x10, - 0x28,0x10,0x8f,0x80,0x88,0x00,0x88,0x00, - 0x78,0x00,0x4f,0x80,0x48,0x00,0x28,0x00, - 0x28,0x00,0x1f,0x80,0x30,0x08,0x08,0x3c, - 0x42,0x80,0x80,0x80,0x80,0x80,0x42,0x3c, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x10,0x20,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x10,0x08, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x28,0x10,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x28,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x7c,0x42, - 0x41,0x41,0xf1,0x41,0x41,0x42,0x7c,0x82, - 0x86,0x8a,0x8a,0x92,0xa2,0xa2,0xc2,0x82, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x08,0x10,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x08,0x04,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x14,0x08,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x24,0x88,0x50, - 0x20,0x50,0x88,0x80,0x00,0x5e,0x00,0x21, - 0x00,0x50,0x80,0x48,0x80,0x44,0x80,0x44, - 0x80,0x42,0x80,0x21,0x00,0x1e,0x80,0x00, - 0x40,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x10,0x20,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x10, - 0x08,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x28,0x10,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x10,0x10,0x10,0x10,0x28,0x44,0x44,0x82, - 0x82,0x00,0x10,0x08,0x80,0x80,0xf8,0x84, - 0x84,0x84,0xf8,0x80,0x80,0xb0,0x88,0x88, - 0x88,0xb0,0x88,0x88,0x88,0x70,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x10,0x20, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x50,0x28,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x50,0x74, - 0x88,0x88,0x78,0x08,0x88,0x70,0x30,0x48, - 0x30,0x77,0x00,0x88,0x80,0x88,0x00,0x7f, - 0x80,0x08,0x80,0x88,0x80,0x77,0x00,0x60, - 0x10,0x20,0x70,0x88,0x80,0x80,0x80,0x88, - 0x70,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x10,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x00,0x80,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x00,0xa0,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x88,0x88,0x88,0x88,0x78,0x08,0x50,0x30, - 0x68,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x50,0x20,0x00,0xf8,0x00, - 0x20,0xb8,0x44,0x64,0x54,0x4c,0x44,0x3a, - 0x68,0x98,0x88,0x88,0x88,0x88,0x88,0x00, - 0x20,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0x00,0x50,0x20,0x68,0x98, - 0x88,0x88,0x88,0x88,0x88,0x00,0x50,0x80, - 0x40,0x20,0x20,0x50,0x50,0x90,0x88,0x88, - 0x88,0x00,0x20,0x10,0x80,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0xc0,0x20,0x20,0x20,0x30,0x50,0x50,0x48, - 0x88,0x88,0x00,0x50, -}; - -FontDataBLF blf_font_helv12 = { - 0, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 9, -1, 0, 3, 0}, - {3, 3, -1, -6, 5, 9}, - {6, 8, 0, 0, 7, 12}, - {5, 10, -1, 1, 7, 20}, - {9, 9, -1, 0, 11, 30}, - {7, 9, -1, 0, 9, 48}, - {2, 3, -1, -6, 3, 57}, - {3, 12, -1, 3, 4, 60}, - {3, 12, 0, 3, 4, 72}, - {3, 3, -1, -6, 5, 84}, - {5, 5, -1, -1, 7, 87}, - {2, 3, -1, 2, 4, 92}, - {5, 1, -1, -3, 8, 95}, - {1, 1, -1, 0, 3, 96}, - {4, 9, 0, 0, 4, 97}, - {5, 9, -1, 0, 7, 106}, - {3, 9, -1, 0, 7, 115}, - {5, 9, -1, 0, 7, 124}, - {5, 9, -1, 0, 7, 133}, - {6, 9, 0, 0, 7, 142}, - {5, 9, -1, 0, 7, 151}, - {5, 9, -1, 0, 7, 160}, - {5, 9, -1, 0, 7, 169}, - {5, 9, -1, 0, 7, 178}, - {5, 9, -1, 0, 7, 187}, - {1, 6, -1, 0, 3, 196}, - {2, 8, 0, 2, 3, 202}, - {6, 5, 0, -1, 7, 210}, - {5, 3, -1, -2, 7, 215}, - {6, 5, -1, -1, 7, 218}, - {5, 9, -1, 0, 7, 223}, - {10, 10, -1, 1, 12, 232}, - {7, 9, -1, 0, 9, 252}, - {6, 9, -1, 0, 8, 261}, - {7, 9, -1, 0, 9, 270}, - {7, 9, -1, 0, 9, 279}, - {6, 9, -1, 0, 8, 288}, - {6, 9, -1, 0, 8, 297}, - {7, 9, -1, 0, 9, 306}, - {7, 9, -1, 0, 9, 315}, - {1, 9, -1, 0, 3, 324}, - {5, 9, -1, 0, 7, 333}, - {7, 9, -1, 0, 8, 342}, - {5, 9, -1, 0, 7, 351}, - {9, 9, -1, 0, 11, 360}, - {7, 9, -1, 0, 9, 378}, - {8, 9, -1, 0, 10, 387}, - {6, 9, -1, 0, 8, 396}, - {8, 9, -1, 0, 10, 405}, - {6, 9, -1, 0, 8, 414}, - {6, 9, -1, 0, 8, 423}, - {7, 9, 0, 0, 7, 432}, - {6, 9, -1, 0, 8, 441}, - {7, 9, -1, 0, 9, 450}, - {9, 9, -1, 0, 11, 459}, - {7, 9, -1, 0, 9, 477}, - {7, 9, -1, 0, 9, 486}, - {7, 9, -1, 0, 9, 495}, - {2, 12, -1, 3, 3, 504}, - {4, 9, 0, 0, 4, 516}, - {2, 12, 0, 3, 3, 525}, - {5, 3, 0, -5, 6, 537}, - {7, 1, 0, 2, 7, 540}, - {2, 3, 0, -6, 3, 541}, - {6, 7, -1, 0, 7, 544}, - {5, 9, -1, 0, 7, 551}, - {5, 7, -1, 0, 7, 560}, - {5, 9, -1, 0, 7, 567}, - {5, 7, -1, 0, 7, 576}, - {4, 9, 0, 0, 3, 583}, - {5, 10, -1, 3, 7, 592}, - {5, 9, -1, 0, 7, 602}, - {1, 9, -1, 0, 3, 611}, - {2, 12, 0, 3, 3, 620}, - {5, 9, -1, 0, 6, 632}, - {1, 9, -1, 0, 3, 641}, - {7, 7, -1, 0, 9, 650}, - {5, 7, -1, 0, 7, 657}, - {5, 7, -1, 0, 7, 664}, - {5, 10, -1, 3, 7, 671}, - {5, 10, -1, 3, 7, 681}, - {3, 7, -1, 0, 4, 691}, - {4, 7, -1, 0, 6, 698}, - {3, 9, 0, 0, 3, 705}, - {5, 7, -1, 0, 7, 714}, - {5, 7, -1, 0, 7, 721}, - {9, 7, 0, 0, 9, 728}, - {6, 7, 0, 0, 6, 742}, - {5, 10, -1, 3, 7, 749}, - {4, 7, -1, 0, 6, 759}, - {4, 12, 0, 3, 4, 766}, - {1, 12, -1, 3, 3, 778}, - {4, 12, 0, 3, 4, 790}, - {6, 2, 0, -3, 7, 802}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 10, -1, 3, 3, 804}, - {5, 9, -1, 1, 7, 814}, - {5, 9, -1, 0, 7, 823}, - {6, 6, 0, -1, 7, 832}, - {5, 9, -1, 0, 7, 838}, - {1, 11, -1, 2, 3, 847}, - {5, 12, 0, 3, 6, 858}, - {3, 1, 0, -8, 3, 870}, - {9, 9, -1, 0, 11, 871}, - {3, 5, -1, -4, 5, 889}, - {5, 5, -1, -1, 7, 894}, - {6, 4, -1, -2, 8, 899}, - {4, 1, 0, -3, 5, 903}, - {9, 9, -1, 0, 11, 904}, - {4, 1, 0, -8, 4, 922}, - {4, 4, 0, -4, 5, 923}, - {5, 7, -1, 0, 7, 927}, - {4, 5, 0, -3, 4, 934}, - {3, 5, 0, -3, 4, 939}, - {2, 2, 0, -8, 2, 944}, - {5, 10, -1, 3, 7, 946}, - {6, 12, 0, 3, 7, 956}, - {1, 1, -1, -3, 3, 968}, - {3, 4, 0, 3, 3, 969}, - {2, 5, -1, -3, 4, 973}, - {3, 5, -1, -4, 5, 978}, - {5, 5, -1, -1, 7, 983}, - {9, 9, 0, 0, 10, 988}, - {9, 9, 0, 0, 10, 1006}, - {9, 9, 0, 0, 10, 1024}, - {5, 9, -1, 3, 7, 1042}, - {7, 12, -1, 0, 9, 1051}, - {7, 12, -1, 0, 9, 1063}, - {7, 12, -1, 0, 9, 1075}, - {7, 12, -1, 0, 9, 1087}, - {7, 11, -1, 0, 9, 1099}, - {7, 12, -1, 0, 9, 1110}, - {9, 9, -1, 0, 11, 1122}, - {7, 12, -1, 3, 9, 1140}, - {6, 12, -1, 0, 8, 1152}, - {6, 12, -1, 0, 8, 1164}, - {6, 12, -1, 0, 8, 1176}, - {6, 11, -1, 0, 8, 1188}, - {2, 12, 0, 0, 3, 1199}, - {2, 12, -1, 0, 3, 1211}, - {3, 12, 0, 0, 3, 1223}, - {3, 11, 0, 0, 3, 1235}, - {8, 9, 0, 0, 9, 1246}, - {7, 12, -1, 0, 9, 1255}, - {8, 12, -1, 0, 10, 1267}, - {8, 12, -1, 0, 10, 1279}, - {8, 12, -1, 0, 10, 1291}, - {8, 12, -1, 0, 10, 1303}, - {8, 11, -1, 0, 10, 1315}, - {5, 5, -1, -1, 7, 1326}, - {10, 11, 0, 1, 10, 1331}, - {6, 12, -1, 0, 8, 1353}, - {6, 12, -1, 0, 8, 1365}, - {6, 12, -1, 0, 8, 1377}, - {6, 11, -1, 0, 8, 1389}, - {7, 12, -1, 0, 9, 1400}, - {6, 9, -1, 0, 8, 1412}, - {5, 9, -1, 0, 7, 1421}, - {6, 10, -1, 0, 7, 1430}, - {6, 10, -1, 0, 7, 1440}, - {6, 10, -1, 0, 7, 1450}, - {6, 10, -1, 0, 7, 1460}, - {6, 9, -1, 0, 7, 1470}, - {6, 10, -1, 0, 7, 1479}, - {9, 7, -1, 0, 11, 1489}, - {5, 10, -1, 3, 7, 1503}, - {5, 10, -1, 0, 7, 1513}, - {5, 10, -1, 0, 7, 1523}, - {5, 10, -1, 0, 7, 1533}, - {5, 9, -1, 0, 7, 1543}, - {2, 10, 0, 0, 3, 1552}, - {2, 10, -1, 0, 3, 1562}, - {3, 10, 0, 0, 3, 1572}, - {3, 9, 0, 0, 3, 1582}, - {5, 10, -1, 0, 7, 1591}, - {5, 10, -1, 0, 7, 1601}, - {5, 10, -1, 0, 7, 1611}, - {5, 10, -1, 0, 7, 1621}, - {5, 10, -1, 0, 7, 1631}, - {5, 10, -1, 0, 7, 1641}, - {5, 9, -1, 0, 7, 1651}, - {5, 5, -1, -1, 7, 1660}, - {7, 7, 0, 0, 7, 1665}, - {5, 10, -1, 0, 7, 1672}, - {5, 10, -1, 0, 7, 1682}, - {5, 10, -1, 0, 7, 1692}, - {5, 9, -1, 0, 7, 1702}, - {5, 13, -1, 3, 7, 1711}, - {5, 12, -1, 3, 7, 1724}, - {5, 12, -1, 3, 7, 1736}, - }, - helv12_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELV12_H */ diff --git a/source/blender/blenfont/intern/blf_font_helvb10.h b/source/blender/blenfont/intern/blf_font_helvb10.h deleted file mode 100644 index 35744946ef0..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb10.h +++ /dev/null @@ -1,487 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB10_H -#define BLF_FONT_HELVB10_H - -static unsigned char helvb10_bitmap_data[]= { - 0x00,0xc0,0x00,0x80,0x80,0xc0,0xc0,0xc0, - 0xc0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x7e,0x28,0x28,0x20,0x70,0xa8,0x28,0x38, - 0x70,0xe0,0xa8,0x70,0x20,0x8c,0x56,0x2c, - 0x10,0x10,0x68,0xb4,0x62,0x76,0xdc,0xcc, - 0xde,0x70,0xd8,0xd8,0x70,0x80,0x40,0xc0, - 0xc0,0x20,0x60,0x40,0xc0,0xc0,0xc0,0xc0, - 0x40,0x60,0x20,0x80,0xc0,0x40,0x60,0x60, - 0x60,0x60,0x40,0xc0,0x80,0xa0,0x40,0xa0, - 0x30,0x30,0xfc,0x30,0x30,0x80,0x40,0xc0, - 0xc0,0xf8,0xc0,0xc0,0x80,0x80,0x40,0x40, - 0x20,0x20,0x10,0x10,0x70,0xd8,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x70,0x60,0x60,0x60,0x60, - 0x60,0x60,0xe0,0x60,0xf8,0xc0,0x60,0x30, - 0x18,0x18,0xd8,0x70,0x70,0xd8,0x18,0x18, - 0x30,0x18,0xd8,0x70,0x18,0x18,0xfc,0x98, - 0x58,0x38,0x18,0x08,0x70,0xd8,0x98,0x18, - 0xf0,0xc0,0xc0,0xf8,0x70,0xd8,0xd8,0xd8, - 0xf0,0xc0,0xd8,0x70,0x60,0x60,0x60,0x30, - 0x30,0x18,0x18,0xf8,0x70,0xd8,0xd8,0xd8, - 0x70,0xd8,0xd8,0x70,0x70,0xd8,0x18,0x78, - 0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x30,0x60,0xc0,0x60,0x30,0xf8, - 0x00,0xf8,0xc0,0x60,0x30,0x60,0xc0,0x60, - 0x00,0x60,0x60,0x30,0x18,0xd8,0x70,0x3e, - 0x00,0x40,0x00,0x9b,0x00,0xa4,0x80,0xa2, - 0x40,0x92,0x40,0x4d,0x40,0x60,0x80,0x1f, - 0x00,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0xf8,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xf8,0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66, - 0x3c,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xd8, - 0xf0,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0xc0,0xc0,0xc0,0xc0,0xf0,0xc0,0xc0, - 0xf8,0x3a,0x66,0xc6,0xce,0xc0,0xc2,0x66, - 0x3c,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc, - 0xcc,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x70,0xd8,0x18,0x18,0x18,0x18,0x18, - 0x18,0xc6,0xcc,0xd8,0xf0,0xe0,0xf0,0xd8, - 0xcc,0xf8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc9,0x80,0xc9,0x80,0xdd,0x80,0xd5, - 0x80,0xf7,0x80,0xe3,0x80,0xe3,0x80,0xc1, - 0x80,0xc6,0xce,0xce,0xd6,0xd6,0xe6,0xe6, - 0xc6,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0xc0,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0x02,0x3c,0x6c,0xd6,0xc6,0xc6,0xc6, - 0x6c,0x38,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xcc,0xf8,0x78,0xcc,0x8c,0x1c,0x78,0xe0, - 0xcc,0x78,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xfc,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x10,0x38,0x38,0x6c,0x6c,0x6c, - 0xc6,0xc6,0x33,0x00,0x33,0x00,0x7f,0x80, - 0x6d,0x80,0x6d,0x80,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xc6,0xc6,0x6c,0x38,0x38,0x6c, - 0xc6,0xc6,0x18,0x18,0x18,0x3c,0x66,0x66, - 0xc3,0xc3,0xfc,0xc0,0x60,0x70,0x30,0x18, - 0x0c,0xfc,0xe0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xe0,0x10,0x10,0x20,0x20, - 0x40,0x40,0x80,0x80,0xe0,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x90,0x90, - 0xf0,0x60,0xfc,0xc0,0xc0,0x80,0x40,0x6c, - 0xd8,0xd8,0x78,0x98,0x70,0xf0,0xd8,0xd8, - 0xd8,0xd8,0xf0,0xc0,0xc0,0x70,0xd0,0xc0, - 0xc0,0xd0,0x70,0x78,0xd8,0xd8,0xd8,0xd8, - 0x78,0x18,0x18,0x70,0xd8,0xc0,0xf8,0xd8, - 0x70,0x60,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x38,0x70,0x18,0x78,0xd8,0xd8,0xd8,0xd8, - 0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0xf0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0xcc,0xd8,0xf0,0xe0,0xf0, - 0xd8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xdb,0xdb,0xdb,0xdb,0xdb, - 0xb6,0xd8,0xd8,0xd8,0xd8,0xd8,0xb0,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0xf0, - 0xd8,0xd8,0xd8,0xd8,0xb0,0x18,0x18,0x78, - 0xd8,0xd8,0xd8,0xd8,0x68,0xc0,0xc0,0xc0, - 0xc0,0xe0,0xb0,0x70,0xd8,0x18,0x70,0xd8, - 0x70,0x30,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x60,0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0x20, - 0x70,0x50,0xd8,0xd8,0xd8,0x6c,0x6c,0x6c, - 0xd6,0xd6,0xd6,0xcc,0xcc,0x78,0x30,0x78, - 0xcc,0x60,0x30,0x30,0x78,0xd8,0xd8,0xd8, - 0xd8,0xf8,0xc0,0x60,0x30,0x18,0xf8,0x30, - 0x60,0x60,0x60,0x60,0xc0,0x60,0x60,0x60, - 0x30,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x60,0x60,0x60,0x60, - 0x30,0x60,0x60,0x60,0xc0,0xb0,0x68,0x00, - 0xc0,0xc0,0xc0,0xc0,0x40,0x40,0x00,0xc0, - 0x40,0x70,0xd8,0xa0,0xa0,0xd8,0x70,0x10, - 0xd8,0x68,0x60,0x60,0xf0,0x60,0x68,0x38, - 0x84,0x78,0x48,0x48,0x78,0x84,0x30,0xfc, - 0x30,0xfc,0x48,0xcc,0x84,0x84,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x70,0x98,0x38,0x70,0xc8,0x98,0x70,0xe0, - 0xc8,0x70,0xa0,0x3c,0x42,0x9d,0xa1,0xa5, - 0x99,0x42,0x3c,0xe0,0x00,0xa0,0x20,0xe0, - 0x6c,0xd8,0x6c,0x08,0x08,0xf8,0xf0,0x3c, - 0x42,0xa5,0xb9,0xa5,0xbd,0x42,0x3c,0xe0, - 0xc0,0xa0,0x60,0xfc,0x00,0x30,0x30,0xfc, - 0x30,0x30,0xe0,0x40,0xa0,0x60,0xc0,0x20, - 0x40,0xe0,0x80,0x40,0xc0,0xc0,0xe8,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x28,0x28,0x28,0x28, - 0x28,0x68,0xe8,0xe8,0xe8,0x7c,0xc0,0xc0, - 0x40,0x40,0x40,0xc0,0x40,0xe0,0x00,0xe0, - 0xa0,0xe0,0xd8,0x6c,0xd8,0x42,0x2f,0x26, - 0x12,0x48,0x48,0xc4,0x44,0x4e,0x24,0x2a, - 0x16,0x48,0x48,0xc4,0x44,0x42,0x2f,0x26, - 0x12,0xc8,0x28,0x44,0xe4,0x70,0xd8,0xc0, - 0x60,0x30,0x30,0x00,0x30,0xc6,0xc6,0xfe, - 0x6c,0x6c,0x6c,0x38,0x38,0x00,0x10,0x20, - 0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38,0x38, - 0x00,0x10,0x08,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x00,0x28,0x10,0xc6,0xc6, - 0xfe,0x6c,0x6c,0x6c,0x38,0x38,0x00,0x28, - 0x14,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0x00,0x28,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x10,0x28,0x10,0xcf,0x80, - 0xcc,0x00,0xfc,0x00,0x6c,0x00,0x6f,0x80, - 0x6c,0x00,0x3c,0x00,0x3f,0x80,0x30,0x10, - 0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66,0x3c, - 0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0,0xf8, - 0x00,0x20,0x40,0xf8,0xc0,0xc0,0xc0,0xf8, - 0xc0,0xc0,0xf8,0x00,0x20,0x10,0xf8,0xc0, - 0xc0,0xc0,0xf8,0xc0,0xc0,0xf8,0x00,0x50, - 0x20,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0x00,0x50,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x00,0x40,0x80,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x80, - 0x40,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xa0,0x40,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x00,0x90,0x78,0x6c, - 0x66,0x66,0xf6,0x66,0x6c,0x78,0xc6,0xce, - 0xce,0xd6,0xd6,0xe6,0xe6,0xc6,0x00,0x28, - 0x14,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0x00,0x08,0x10,0x38,0x6c,0xc6,0xc6, - 0xc6,0xc6,0x6c,0x38,0x00,0x10,0x08,0x38, - 0x6c,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00, - 0x28,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xc6, - 0x6c,0x38,0x00,0x28,0x14,0x38,0x6c,0xc6, - 0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x28,0xcc, - 0x78,0x30,0x78,0xcc,0xb8,0x6c,0xe6,0xd6, - 0xd6,0xce,0x6c,0x3a,0x78,0xcc,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x10,0x20,0x78, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, - 0x10,0x08,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x00,0x50,0x20,0x78,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x48,0x18, - 0x18,0x18,0x3c,0x66,0x66,0xc3,0xc3,0x00, - 0x08,0x04,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0xc0,0xd0,0xc8,0xc8,0xc8,0xd0,0xc8, - 0xc8,0x70,0x6c,0xd8,0xd8,0x78,0x98,0x70, - 0x00,0x10,0x20,0x6c,0xd8,0xd8,0x78,0x98, - 0x70,0x00,0x20,0x10,0x6c,0xd8,0xd8,0x78, - 0x98,0x70,0x00,0x50,0x20,0x6c,0xd8,0xd8, - 0x78,0x98,0x70,0x00,0x50,0x28,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x00,0x50,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x20,0x50,0x20,0x6e, - 0xdb,0xd8,0x7f,0x9b,0x7e,0x60,0x20,0x70, - 0xd0,0xc0,0xc0,0xd0,0x70,0x70,0xd8,0xc0, - 0xf8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xc0,0xf8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x40, - 0x80,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0x80,0x40,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x00,0xa0,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x00,0xa0,0x70,0xd8,0xd8,0xd8,0xd8, - 0x70,0xa0,0x60,0x50,0xd8,0xd8,0xd8,0xd8, - 0xd8,0xb0,0x00,0xa0,0x50,0x70,0xd8,0xd8, - 0xd8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xd8,0xd8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0xa0, - 0x50,0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00, - 0x50,0x30,0x00,0xfc,0x00,0x30,0xb8,0x6c, - 0x6c,0x7c,0x6c,0x3a,0x68,0xd8,0xd8,0xd8, - 0xd8,0xd8,0x00,0x20,0x40,0x68,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x00,0x20,0x10,0x68,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x20,0x68, - 0xd8,0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x60, - 0x30,0x30,0x78,0xd8,0xd8,0xd8,0xd8,0x00, - 0x20,0x10,0xc0,0xc0,0xf0,0xd8,0xc8,0xc8, - 0xd8,0xf0,0xc0,0xc0,0x60,0x30,0x30,0x78, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50, -}; - -FontDataBLF blf_font_helvb10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 8, -1, 0, 4, 1}, - {3, 3, -1, -5, 5, 9}, - {7, 7, 1, 0, 6, 12}, - {5, 10, 0, 1, 6, 19}, - {7, 8, 0, 0, 8, 29}, - {7, 8, 0, 0, 8, 37}, - {2, 4, 0, -4, 3, 45}, - {3, 10, 0, 2, 4, 49}, - {3, 10, 0, 2, 4, 59}, - {3, 3, 0, -5, 4, 69}, - {6, 5, 0, -1, 6, 72}, - {2, 4, 0, 2, 3, 77}, - {5, 1, -1, -3, 7, 81}, - {2, 2, 0, 0, 3, 82}, - {4, 8, 0, 0, 4, 84}, - {5, 8, 0, 0, 6, 92}, - {3, 8, -1, 0, 6, 100}, - {5, 8, 0, 0, 6, 108}, - {5, 8, 0, 0, 6, 116}, - {6, 8, 0, 0, 6, 124}, - {5, 8, 0, 0, 6, 132}, - {5, 8, 0, 0, 6, 140}, - {5, 8, 0, 0, 6, 148}, - {5, 8, 0, 0, 6, 156}, - {5, 8, 0, 0, 6, 164}, - {2, 6, 0, 0, 3, 172}, - {2, 8, 0, 2, 3, 178}, - {4, 5, 0, -1, 5, 186}, - {5, 3, 0, -2, 6, 191}, - {4, 5, 0, -1, 5, 194}, - {5, 8, 0, 0, 6, 199}, - {10, 9, 0, 1, 11, 207}, - {7, 8, 0, 0, 8, 225}, - {6, 8, 0, 0, 7, 233}, - {7, 8, 0, 0, 8, 241}, - {6, 8, 0, 0, 7, 249}, - {5, 8, 0, 0, 6, 257}, - {5, 8, 0, 0, 6, 265}, - {7, 8, 0, 0, 8, 273}, - {6, 8, 0, 0, 7, 281}, - {2, 8, 0, 0, 3, 289}, - {5, 8, 0, 0, 6, 297}, - {7, 8, 0, 0, 7, 305}, - {5, 8, 0, 0, 6, 313}, - {9, 8, 0, 0, 10, 321}, - {7, 8, 0, 0, 8, 337}, - {7, 8, 0, 0, 8, 345}, - {6, 8, 0, 0, 7, 353}, - {7, 9, 0, 1, 8, 361}, - {6, 8, 0, 0, 7, 370}, - {6, 8, 0, 0, 7, 378}, - {6, 8, 0, 0, 7, 386}, - {6, 8, 0, 0, 7, 394}, - {7, 8, 0, 0, 8, 402}, - {10, 8, 0, 0, 11, 410}, - {7, 8, 0, 0, 8, 426}, - {8, 8, 0, 0, 9, 434}, - {6, 8, 0, 0, 7, 442}, - {3, 10, 0, 2, 4, 450}, - {4, 8, 0, 0, 4, 460}, - {3, 10, 0, 2, 4, 468}, - {4, 4, 0, -4, 5, 478}, - {6, 1, 0, 2, 6, 482}, - {2, 4, 0, -4, 3, 483}, - {6, 6, 0, 0, 6, 487}, - {5, 8, 0, 0, 6, 493}, - {4, 6, 0, 0, 5, 501}, - {5, 8, 0, 0, 6, 507}, - {5, 6, 0, 0, 6, 515}, - {5, 8, 1, 0, 4, 521}, - {5, 8, 0, 2, 6, 529}, - {5, 8, 0, 0, 6, 537}, - {2, 8, 0, 0, 3, 545}, - {3, 10, 1, 2, 3, 553}, - {6, 8, 0, 0, 6, 563}, - {2, 8, 0, 0, 3, 571}, - {8, 6, 0, 0, 9, 579}, - {5, 6, 0, 0, 6, 585}, - {5, 6, 0, 0, 6, 591}, - {5, 8, 0, 2, 6, 597}, - {5, 8, 0, 2, 6, 605}, - {4, 6, 0, 0, 4, 613}, - {5, 6, 0, 0, 6, 619}, - {4, 8, 1, 0, 4, 625}, - {5, 6, 0, 0, 6, 633}, - {5, 6, 0, 0, 6, 639}, - {7, 6, 0, 0, 8, 645}, - {6, 6, 0, 0, 7, 651}, - {5, 8, 0, 2, 6, 657}, - {5, 6, 0, 0, 6, 665}, - {4, 10, 0, 2, 5, 671}, - {1, 10, -1, 2, 3, 681}, - {4, 10, 0, 2, 5, 691}, - {5, 2, 0, -3, 6, 701}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 703}, - {2, 8, -1, 2, 4, 704}, - {5, 8, 0, 1, 6, 712}, - {5, 8, 0, 0, 6, 720}, - {6, 6, 0, -1, 6, 728}, - {6, 8, 0, 0, 7, 734}, - {1, 10, -1, 2, 3, 742}, - {5, 10, 0, 2, 6, 752}, - {3, 1, 0, -7, 3, 762}, - {8, 8, -1, 0, 10, 763}, - {3, 5, -1, -3, 5, 771}, - {6, 3, 0, -1, 7, 776}, - {5, 3, -1, -2, 7, 779}, - {4, 1, 0, -3, 5, 782}, - {8, 8, -1, 0, 10, 783}, - {3, 1, 0, -7, 3, 791}, - {3, 3, 0, -5, 4, 792}, - {6, 7, 0, 0, 6, 795}, - {3, 4, 0, -4, 3, 802}, - {3, 4, 0, -4, 3, 806}, - {2, 2, 0, -7, 3, 810}, - {5, 8, 0, 2, 6, 812}, - {6, 10, 0, 2, 6, 820}, - {2, 1, 0, -3, 3, 830}, - {2, 2, 0, 2, 3, 831}, - {2, 4, 0, -4, 3, 833}, - {3, 5, -1, -3, 5, 837}, - {6, 3, 0, -1, 7, 842}, - {8, 8, 0, 0, 9, 845}, - {7, 8, 0, 0, 9, 853}, - {8, 8, 0, 0, 9, 861}, - {5, 8, 0, 2, 6, 869}, - {7, 11, 0, 0, 8, 877}, - {7, 11, 0, 0, 8, 888}, - {7, 11, 0, 0, 8, 899}, - {7, 11, 0, 0, 8, 910}, - {7, 10, 0, 0, 8, 921}, - {7, 11, 0, 0, 8, 931}, - {9, 8, 0, 0, 10, 942}, - {7, 10, 0, 2, 8, 958}, - {5, 11, 0, 0, 6, 968}, - {5, 11, 0, 0, 6, 979}, - {5, 11, 0, 0, 6, 990}, - {5, 10, 0, 0, 6, 1001}, - {2, 11, 0, 0, 3, 1011}, - {2, 11, 0, 0, 3, 1022}, - {3, 11, 1, 0, 3, 1033}, - {4, 10, 1, 0, 3, 1044}, - {7, 8, 1, 0, 7, 1054}, - {7, 11, 0, 0, 8, 1062}, - {7, 11, 0, 0, 8, 1073}, - {7, 11, 0, 0, 8, 1084}, - {7, 11, 0, 0, 8, 1095}, - {7, 11, 0, 0, 8, 1106}, - {7, 10, 0, 0, 8, 1117}, - {6, 5, 0, -1, 6, 1127}, - {7, 8, 0, 0, 8, 1132}, - {6, 11, 0, 0, 7, 1140}, - {6, 11, 0, 0, 7, 1151}, - {6, 11, 0, 0, 7, 1162}, - {6, 10, 0, 0, 7, 1173}, - {8, 11, 0, 0, 9, 1183}, - {6, 8, 0, 0, 7, 1194}, - {5, 8, 0, 0, 6, 1202}, - {6, 9, 0, 0, 6, 1210}, - {6, 9, 0, 0, 6, 1219}, - {6, 9, 0, 0, 6, 1228}, - {6, 9, 0, 0, 6, 1237}, - {6, 8, 0, 0, 6, 1246}, - {6, 9, 0, 0, 6, 1254}, - {8, 6, 0, 0, 9, 1263}, - {4, 8, 0, 2, 5, 1269}, - {5, 9, 0, 0, 6, 1277}, - {5, 9, 0, 0, 6, 1286}, - {5, 9, 0, 0, 6, 1295}, - {5, 8, 0, 0, 6, 1304}, - {2, 9, 0, 0, 3, 1312}, - {2, 9, 0, 0, 3, 1321}, - {3, 9, 0, 0, 3, 1330}, - {3, 8, 0, 0, 3, 1339}, - {5, 9, 0, 0, 6, 1347}, - {5, 9, 0, 0, 6, 1356}, - {5, 9, 0, 0, 6, 1365}, - {5, 9, 0, 0, 6, 1374}, - {5, 9, 0, 0, 6, 1383}, - {5, 9, 0, 0, 6, 1392}, - {5, 8, 0, 0, 6, 1401}, - {6, 5, 0, -1, 6, 1409}, - {7, 6, 1, 0, 6, 1414}, - {5, 9, 0, 0, 6, 1420}, - {5, 9, 0, 0, 6, 1429}, - {5, 9, 0, 0, 6, 1438}, - {5, 8, 0, 0, 6, 1447}, - {5, 11, 0, 2, 6, 1455}, - {5, 10, 0, 2, 6, 1466}, - {5, 10, 0, 2, 6, 1476}, - }, - helvb10_bitmap_data, - 0 -}; - -#endif - diff --git a/source/blender/blenfont/intern/blf_font_helvb12.h b/source/blender/blenfont/intern/blf_font_helvb12.h deleted file mode 100644 index c8ac2d224b4..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb12.h +++ /dev/null @@ -1,559 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB12_H -#define BLF_FONT_HELVB12_H - -static unsigned char helvb12_bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xa0,0xa0,0xa0,0x6c, - 0x00,0x6c,0x00,0x6c,0x00,0xff,0x00,0x36, - 0x00,0x36,0x00,0x36,0x00,0x7f,0x80,0x1b, - 0x00,0x1b,0x00,0x1b,0x00,0x30,0x30,0x78, - 0xec,0xac,0x3c,0x38,0x70,0xf0,0xd4,0xdc, - 0x78,0x30,0x63,0x80,0x37,0xc0,0x36,0xc0, - 0x1f,0xc0,0x1b,0x80,0x0c,0x00,0x76,0x00, - 0xfe,0x00,0xdb,0x00,0xfb,0x00,0x71,0x80, - 0x73,0x80,0xff,0x00,0xce,0x00,0xcf,0x00, - 0xdd,0x80,0x79,0x80,0x38,0x00,0x6c,0x00, - 0x6c,0x00,0x7c,0x00,0x38,0x00,0x80,0x40, - 0xc0,0xc0,0x30,0x60,0x60,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x30, - 0xc0,0x60,0x60,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x60,0x60,0xc0,0xd8,0x70, - 0x70,0xf8,0x20,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x80,0x40,0xc0,0xc0,0xfc,0xfc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x60,0x20, - 0x30,0x30,0x30,0x18,0x18,0x18,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xf0,0xf0,0x30,0xfc,0xfc,0xc0,0x60, - 0x70,0x38,0x18,0xcc,0xcc,0xfc,0x78,0x78, - 0xfc,0xcc,0xcc,0x0c,0x38,0x38,0x0c,0xcc, - 0xfc,0x78,0x0c,0x0c,0xfe,0xfe,0xcc,0x6c, - 0x6c,0x3c,0x3c,0x1c,0x1c,0x78,0xfc,0xcc, - 0xcc,0x0c,0xfc,0xf8,0xc0,0xc0,0xfc,0xfc, - 0x78,0xfc,0xcc,0xcc,0xcc,0xfc,0xf8,0xc0, - 0xcc,0xfc,0x78,0x60,0x60,0x60,0x30,0x30, - 0x30,0x18,0x18,0x0c,0xfc,0xfc,0x78,0xfc, - 0xcc,0xcc,0xcc,0x78,0x78,0xcc,0xcc,0xfc, - 0x78,0x78,0xfc,0xcc,0x0c,0x7c,0xfc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xc0,0xc0,0x00,0x00, - 0x00,0x00,0xc0,0xc0,0x80,0x40,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x0c,0x38, - 0xe0,0xe0,0x38,0x0c,0xfc,0xfc,0x00,0xfc, - 0xfc,0xc0,0x70,0x1c,0x1c,0x70,0xc0,0x30, - 0x30,0x00,0x30,0x30,0x38,0x1c,0xcc,0xcc, - 0xfc,0x78,0x1f,0x00,0x71,0x80,0x40,0x00, - 0xdd,0x80,0xb6,0xc0,0xb2,0x40,0xb3,0x60, - 0xdb,0x20,0x4d,0xa0,0x60,0x40,0x39,0xc0, - 0x0f,0x00,0xc3,0xc3,0xff,0x7e,0x66,0x66, - 0x3c,0x3c,0x3c,0x18,0x18,0xf8,0xfc,0xcc, - 0xcc,0xcc,0xf8,0xf8,0xcc,0xcc,0xfc,0xf8, - 0x78,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xcc,0xfc,0x78,0xf8,0xfc,0xce,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xce,0xfc,0xf8,0xfc,0xfc, - 0xc0,0xc0,0xc0,0xf8,0xf8,0xc0,0xc0,0xfc, - 0xfc,0xc0,0xc0,0xc0,0xc0,0xc0,0xf8,0xf8, - 0xc0,0xc0,0xfc,0xfc,0x76,0xfe,0xc6,0xc6, - 0xde,0xde,0xc0,0xc0,0xc6,0xfe,0x7c,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xfe,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x70,0xf8,0xd8, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, - 0xc6,0xce,0xcc,0xd8,0xf8,0xf0,0xf0,0xd8, - 0xcc,0xcc,0xc6,0xfc,0xfc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc9,0x80, - 0xc9,0x80,0xdd,0x80,0xdd,0x80,0xf7,0x80, - 0xf7,0x80,0xe3,0x80,0xe3,0x80,0xe3,0x80, - 0xc1,0x80,0xc1,0x80,0xc6,0xc6,0xce,0xce, - 0xde,0xd6,0xf6,0xe6,0xe6,0xc6,0xc6,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xfe,0x7c,0xc0,0xc0,0xc0,0xc0,0xfc,0xfe, - 0xc6,0xc6,0xc6,0xfe,0xfc,0x06,0x7e,0xfc, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xfe, - 0x7c,0xc6,0xc6,0xc6,0xce,0xfc,0xfc,0xc6, - 0xc6,0xc6,0xfe,0xfc,0x78,0xfc,0xcc,0x0c, - 0x1c,0x78,0xe0,0xc0,0xcc,0xfc,0x78,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0xfc,0xfc,0x7c,0xfe,0xc6,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xc6,0x18,0x18,0x18, - 0x3c,0x3c,0x3c,0x66,0x66,0x66,0xc3,0xc3, - 0x33,0x00,0x33,0x00,0x33,0x00,0x3b,0x00, - 0x7f,0x80,0x6d,0x80,0x6d,0x80,0x6d,0x80, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xc3,0xc3, - 0x66,0x7e,0x3c,0x18,0x3c,0x7e,0x66,0xc3, - 0xc3,0x18,0x18,0x18,0x18,0x18,0x3c,0x3c, - 0x66,0x66,0xc3,0xc3,0xfe,0xfe,0xc0,0x60, - 0x60,0x30,0x18,0x18,0x0c,0xfe,0xfe,0xe0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xe0,0x30,0x30,0x30, - 0x70,0x60,0x60,0x60,0xe0,0xc0,0xc0,0xc0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x88,0xd8, - 0x70,0x70,0x20,0xfe,0xc0,0xc0,0x80,0x40, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0xd8, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xc0,0xc0, - 0xcc,0xfc,0x78,0x6c,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x6c,0x0c,0x0c,0x0c,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xec,0xfc,0xd8,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0xc0,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x60, - 0xcc,0xd8,0xd8,0xf0,0xe0,0xf0,0xd8,0xcc, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xee,0xc0,0xff,0xc0,0xbb,0x80,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0x0c,0x0c,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xb0,0x78,0xfc,0xcc,0x1c, - 0x78,0xe0,0xfc,0x78,0x30,0x70,0x60,0x60, - 0x60,0x60,0xf0,0xf0,0x60,0x60,0x6c,0xfc, - 0xdc,0xcc,0xcc,0xcc,0xcc,0xcc,0x30,0x30, - 0x78,0x78,0x78,0xcc,0xcc,0xcc,0x24,0x24, - 0x76,0x76,0x7e,0xdb,0xdb,0xdb,0xcc,0xcc, - 0x78,0x38,0x70,0x78,0xcc,0xcc,0xe0,0xf0, - 0x30,0x30,0x38,0x78,0x78,0x48,0xcc,0xcc, - 0xcc,0xfc,0xfc,0x60,0x30,0x30,0x18,0xfc, - 0xfc,0x30,0x60,0x60,0x60,0x60,0x60,0x40, - 0x80,0x40,0x60,0x60,0x60,0x60,0x30,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x60,0x60,0x60, - 0x60,0x60,0x20,0x10,0x20,0x60,0x60,0x60, - 0x60,0xc0,0x98,0xfc,0x64,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0xc0, - 0xc0,0x78,0xfc,0xec,0xe0,0xd0,0xd4,0xfc, - 0x78,0x0c,0xdc,0xfe,0x60,0x30,0x30,0xfc, - 0x30,0x60,0x64,0x7c,0x38,0xcc,0x78,0xcc, - 0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e,0x18, - 0x7e,0x3c,0x66,0x66,0xc3,0xc3,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x80,0x78,0xfc,0xcc,0x1c,0x38, - 0x6c,0xcc,0xcc,0xd8,0x70,0xe0,0xcc,0xfc, - 0x78,0xd8,0xd8,0x1f,0x00,0x71,0xc0,0x6e, - 0xc0,0xdb,0x60,0xdb,0x60,0xd8,0x60,0xdb, - 0x60,0xdb,0x60,0x6e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60, - 0x36,0x6c,0xd8,0x6c,0x36,0x0c,0x0c,0xfc, - 0xfc,0xe0,0xe0,0x1f,0x00,0x71,0xc0,0x7b, - 0xc0,0xdb,0x60,0xdf,0x60,0xde,0x60,0xdb, - 0x60,0xdb,0x60,0x7e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0xf0,0x60,0x90,0x90,0x60,0xfc, - 0xfc,0x00,0x30,0x30,0xfc,0xfc,0x30,0x30, - 0xf0,0x40,0x20,0x10,0x90,0x60,0x60,0x90, - 0x10,0x20,0x90,0x60,0xc0,0x70,0x30,0xc0, - 0xc0,0xc0,0xec,0xfc,0xdc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x36,0x36,0x36,0x36,0x36,0x36, - 0x36,0x36,0x76,0xf6,0xf6,0xf6,0xfe,0x7e, - 0xc0,0xc0,0xc0,0x60,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf8,0x00,0x70,0xd8,0xd8, - 0xd8,0x70,0xd8,0x6c,0x36,0x6c,0xd8,0x20, - 0x80,0x27,0xc0,0x12,0x80,0x12,0x80,0x09, - 0x80,0x4c,0x80,0x44,0x00,0x42,0x00,0x42, - 0x00,0xc1,0x00,0x41,0x00,0x23,0xc0,0x21, - 0x00,0x10,0x80,0x10,0x40,0x0a,0x40,0x4d, - 0x80,0x44,0x00,0x42,0x00,0x42,0x00,0xc1, - 0x00,0x41,0x00,0x20,0x80,0x27,0xc0,0x12, - 0x80,0x12,0x80,0x09,0x80,0x6c,0x80,0x94, - 0x00,0x12,0x00,0x22,0x00,0x91,0x00,0x61, - 0x00,0x78,0xfc,0xcc,0xcc,0xe0,0x70,0x30, - 0x30,0x00,0x30,0x30,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x0c,0x38,0x30, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x30,0x1c,0x0c,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x66,0x3c,0x18, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x2c,0x3e,0x1a,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x6c,0x6c,0xc3, - 0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18,0x00, - 0x18,0x34,0x18,0xc7,0xe0,0xc7,0xe0,0xfe, - 0x00,0x7e,0x00,0x66,0x00,0x67,0xc0,0x37, - 0xc0,0x36,0x00,0x3e,0x00,0x1f,0xe0,0x1f, - 0xe0,0x60,0x30,0x20,0x78,0xfc,0xcc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xfc,0x78,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0x18,0x70,0x60,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0x60,0x38,0x18,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0xcc,0x78,0x30,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0xd8,0xd8,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x30, - 0xe0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0xc0,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xcc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0xd8,0x7c,0x7e,0x67, - 0x63,0x63,0xfb,0xfb,0x63,0x67,0x7e,0x7c, - 0xc6,0xce,0xce,0xde,0xf6,0xe6,0xe6,0xc6, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x18,0x70,0x60, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0xcc,0x78,0x30, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x6c,0x6c,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xde,0x00,0x7f, - 0x00,0x63,0x00,0x73,0x00,0x7b,0x00,0x6b, - 0x00,0x6f,0x00,0x67,0x00,0x63,0x00,0x7f, - 0x00,0x3d,0x80,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x18,0x70,0x60,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0xcc,0x78,0x30,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x6c,0x18,0x18,0x18,0x18,0x3c,0x7e, - 0xe7,0xc3,0x00,0x30,0x1c,0x0c,0xc0,0xc0, - 0xfc,0xfe,0xc6,0xc6,0xc6,0xfe,0xfc,0xc0, - 0xc0,0xd8,0xdc,0xcc,0xcc,0xcc,0xd8,0xd8, - 0xcc,0xcc,0xfc,0x78,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0x18,0x70,0x60, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x60,0x38,0x18,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xcc,0x78,0x30, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x58,0x7c,0x34,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xd8,0xd8,0x76, - 0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78,0x00, - 0x30,0x68,0x30,0x77,0x80,0xff,0xc0,0xcc, - 0x00,0xff,0xc0,0x7f,0xc0,0x8c,0xc0,0xff, - 0xc0,0x7b,0x80,0x60,0x30,0x20,0x78,0xfc, - 0xcc,0xc0,0xc0,0xcc,0xfc,0x78,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0x18, - 0x70,0x60,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0x60,0x38,0x18,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0xcc, - 0x78,0x30,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0xd8,0xd8,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x30,0xe0, - 0xc0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xc0,0x70,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x00,0xcc,0x78, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x78,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xb0,0x60,0xd0,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0x18,0x70,0x60,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0x60,0x38,0x18,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xcc,0x78,0x30,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x30,0x30, - 0x00,0xfc,0xfc,0x00,0x30,0x30,0xc0,0x78, - 0xfc,0xcc,0xec,0xdc,0xcc,0xfc,0x78,0x0c, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0x18,0x70,0x60,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x60,0x38,0x18, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0xcc,0x78,0x30,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0xd8,0xd8,0xe0, - 0xf0,0x30,0x30,0x38,0x78,0x78,0x48,0xcc, - 0xcc,0xcc,0x00,0x60,0x38,0x18,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0xc0,0xc0,0xc0,0xe0,0xf0,0x30,0x30, - 0x38,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x00, - 0xd8,0xd8, -}; - -FontDataBLF blf_font_helvb12 = { - -1, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 11, -1, 0, 4, 1}, - {3, 3, 0, -8, 4, 12}, - {9, 11, 1, 0, 7, 15}, - {6, 13, 0, 2, 7, 37}, - {10, 11, 0, 0, 11, 50}, - {9, 11, 0, 0, 9, 72}, - {2, 4, 0, -7, 3, 94}, - {4, 14, 0, 3, 4, 98}, - {4, 14, 1, 3, 4, 112}, - {5, 5, 0, -6, 6, 126}, - {6, 6, 0, -1, 7, 131}, - {2, 4, 0, 2, 3, 137}, - {6, 2, -1, -3, 9, 141}, - {2, 2, 0, 0, 3, 143}, - {5, 13, 1, 2, 4, 145}, - {6, 11, 0, 0, 7, 158}, - {4, 11, 0, 0, 6, 169}, - {6, 11, 0, 0, 7, 180}, - {6, 11, 0, 0, 7, 191}, - {7, 11, 0, 0, 7, 202}, - {6, 11, 0, 0, 7, 213}, - {6, 11, 0, 0, 7, 224}, - {6, 11, 0, 0, 7, 235}, - {6, 11, 0, 0, 7, 246}, - {6, 11, 0, 0, 7, 257}, - {2, 8, -1, 0, 4, 268}, - {2, 10, -1, 2, 4, 276}, - {6, 6, 0, -1, 7, 286}, - {6, 5, 0, -2, 7, 292}, - {6, 6, 0, -1, 7, 297}, - {6, 11, 0, 0, 7, 303}, - {11, 12, 0, 1, 12, 314}, - {8, 11, 0, 0, 8, 338}, - {6, 11, -1, 0, 8, 349}, - {6, 11, -1, 0, 8, 360}, - {7, 11, -1, 0, 9, 371}, - {6, 11, -1, 0, 8, 382}, - {6, 11, -1, 0, 7, 393}, - {7, 11, -1, 0, 9, 404}, - {7, 11, -1, 0, 9, 415}, - {2, 11, -2, 0, 6, 426}, - {5, 11, 0, 0, 6, 437}, - {7, 11, -1, 0, 8, 448}, - {6, 11, -1, 0, 7, 459}, - {9, 11, -1, 0, 11, 470}, - {7, 11, -1, 0, 9, 492}, - {7, 11, -1, 0, 9, 503}, - {7, 11, -1, 0, 9, 514}, - {7, 12, -1, 1, 9, 525}, - {7, 11, -1, 0, 9, 537}, - {6, 11, -1, 0, 8, 548}, - {6, 11, 0, 0, 6, 559}, - {7, 11, -1, 0, 9, 570}, - {8, 11, 0, 0, 8, 581}, - {10, 11, 0, 0, 10, 592}, - {8, 11, 0, 0, 8, 614}, - {8, 11, 0, 0, 8, 625}, - {7, 11, 0, 0, 7, 636}, - {3, 14, 0, 3, 4, 647}, - {4, 11, 0, 0, 5, 661}, - {3, 14, 0, 3, 4, 672}, - {5, 5, 0, -6, 7, 686}, - {7, 1, 0, 2, 7, 691}, - {2, 4, 0, -7, 3, 692}, - {7, 8, 0, 0, 7, 696}, - {6, 11, 0, 0, 7, 704}, - {6, 8, 0, 0, 7, 715}, - {6, 11, 0, 0, 7, 723}, - {6, 8, 0, 0, 7, 734}, - {4, 11, 0, 0, 5, 742}, - {6, 11, 0, 3, 7, 753}, - {6, 11, 0, 0, 7, 764}, - {2, 11, -1, 0, 5, 775}, - {3, 14, 0, 3, 5, 786}, - {6, 11, 0, 0, 6, 800}, - {2, 11, -1, 0, 5, 811}, - {10, 8, 0, 0, 11, 822}, - {6, 8, 0, 0, 7, 838}, - {6, 8, 0, 0, 7, 846}, - {6, 11, 0, 3, 7, 854}, - {6, 11, 0, 3, 7, 865}, - {4, 8, 0, 0, 4, 876}, - {6, 8, 0, 0, 7, 884}, - {4, 10, 0, 0, 5, 892}, - {6, 8, 0, 0, 7, 902}, - {6, 8, 0, 0, 7, 910}, - {8, 8, 0, 0, 9, 918}, - {6, 8, 0, 0, 7, 926}, - {6, 11, 0, 3, 7, 934}, - {6, 8, 0, 0, 7, 945}, - {4, 14, 0, 3, 4, 953}, - {1, 13, -1, 2, 3, 967}, - {4, 14, 0, 3, 4, 980}, - {6, 3, 0, -3, 7, 994}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 11, 0, 3, 3, 997}, - {6, 10, 0, 1, 7, 1008}, - {7, 11, 0, 0, 7, 1018}, - {6, 6, 0, -3, 7, 1029}, - {8, 11, 1, 0, 7, 1035}, - {1, 13, -1, 2, 3, 1046}, - {6, 14, 0, 3, 7, 1059}, - {5, 2, 0, -9, 5, 1073}, - {11, 11, 0, 0, 12, 1075}, - {4, 7, 0, -4, 5, 1097}, - {7, 5, 0, -2, 8, 1104}, - {6, 4, -1, -3, 9, 1109}, - {3, 2, 0, -3, 4, 1113}, - {11, 11, 0, 0, 12, 1115}, - {4, 2, 0, -9, 4, 1137}, - {4, 4, -1, -7, 6, 1139}, - {6, 9, 0, -1, 7, 1143}, - {4, 6, 0, -5, 4, 1152}, - {4, 6, 0, -5, 4, 1158}, - {4, 3, -1, -9, 4, 1164}, - {6, 11, 0, 3, 7, 1167}, - {7, 14, -1, 3, 10, 1178}, - {2, 2, 0, -5, 3, 1192}, - {3, 3, -1, 3, 5, 1194}, - {2, 6, 0, -5, 4, 1197}, - {5, 7, 0, -4, 6, 1203}, - {7, 5, 0, -2, 8, 1210}, - {10, 11, 0, 0, 11, 1215}, - {10, 11, 0, 0, 11, 1237}, - {10, 11, 0, 0, 11, 1259}, - {6, 11, 0, 3, 7, 1281}, - {8, 12, 0, 0, 8, 1292}, - {8, 12, 0, 0, 8, 1304}, - {8, 12, 0, 0, 8, 1316}, - {8, 12, 0, 0, 8, 1328}, - {8, 11, 0, 0, 8, 1340}, - {8, 12, 0, 0, 8, 1351}, - {11, 11, 0, 0, 12, 1363}, - {6, 14, -1, 3, 8, 1385}, - {6, 12, -1, 0, 8, 1399}, - {6, 12, -1, 0, 8, 1411}, - {6, 12, -1, 0, 8, 1423}, - {6, 11, -1, 0, 8, 1435}, - {4, 12, -1, 0, 6, 1446}, - {4, 12, -1, 0, 6, 1458}, - {6, 12, 0, 0, 6, 1470}, - {5, 11, 0, 0, 6, 1482}, - {8, 11, 0, 0, 9, 1493}, - {7, 12, -1, 0, 9, 1504}, - {7, 12, -1, 0, 9, 1516}, - {7, 12, -1, 0, 9, 1528}, - {7, 12, -1, 0, 9, 1540}, - {7, 12, -1, 0, 9, 1552}, - {7, 11, -1, 0, 9, 1564}, - {6, 6, 0, -1, 7, 1575}, - {9, 11, 0, 0, 9, 1581}, - {7, 12, -1, 0, 9, 1603}, - {7, 12, -1, 0, 9, 1615}, - {7, 12, -1, 0, 9, 1627}, - {7, 11, -1, 0, 9, 1639}, - {8, 12, 0, 0, 8, 1650}, - {7, 11, -1, 0, 9, 1662}, - {6, 11, 0, 0, 7, 1673}, - {7, 12, 0, 0, 7, 1684}, - {7, 12, 0, 0, 7, 1696}, - {7, 12, 0, 0, 7, 1708}, - {7, 12, 0, 0, 7, 1720}, - {7, 11, 0, 0, 7, 1732}, - {7, 12, 0, 0, 7, 1743}, - {10, 8, 0, 0, 11, 1755}, - {6, 11, 0, 3, 7, 1771}, - {6, 12, 0, 0, 7, 1782}, - {6, 12, 0, 0, 7, 1794}, - {6, 12, 0, 0, 7, 1806}, - {6, 11, 0, 0, 7, 1818}, - {4, 12, 0, 0, 5, 1829}, - {4, 12, 0, 0, 5, 1841}, - {6, 12, 1, 0, 5, 1853}, - {5, 11, 1, 0, 5, 1865}, - {6, 11, 0, 0, 7, 1876}, - {6, 12, 0, 0, 7, 1887}, - {6, 12, 0, 0, 7, 1899}, - {6, 12, 0, 0, 7, 1911}, - {6, 12, 0, 0, 7, 1923}, - {6, 12, 0, 0, 7, 1935}, - {6, 11, 0, 0, 7, 1947}, - {6, 8, 0, 0, 7, 1958}, - {6, 10, 0, 1, 7, 1966}, - {6, 12, 0, 0, 7, 1976}, - {6, 12, 0, 0, 7, 1988}, - {6, 12, 0, 0, 7, 2000}, - {6, 11, 0, 0, 7, 2012}, - {6, 15, 0, 3, 7, 2023}, - {6, 14, 0, 3, 7, 2038}, - {6, 14, 0, 3, 7, 2052}, - }, - helvb12_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELVB12_H */ diff --git a/source/blender/blenfont/intern/blf_font_helvb8.h b/source/blender/blenfont/intern/blf_font_helvb8.h deleted file mode 100644 index 1e4682f1f5b..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb8.h +++ /dev/null @@ -1,449 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB8_H -#define BLF_FONT_HELVB8_H - -static unsigned char helvb8_bitmap_data[]= { - 0x00,0x80,0x00,0x80,0x80,0x80,0x80,0xa0, - 0xa0,0xa0,0x50,0xf8,0x50,0xf8,0x50,0x40, - 0xe0,0x10,0x60,0x80,0x70,0x20,0x5c,0x54, - 0x2c,0xd0,0xa8,0xe8,0x58,0xb0,0xa8,0x48, - 0xa0,0x40,0x80,0x80,0x80,0x40,0x80,0x80, - 0x80,0x80,0x80,0x40,0x80,0x40,0x40,0x40, - 0x40,0x40,0x80,0x40,0xe0,0x40,0x20,0x20, - 0xf8,0x20,0x20,0x80,0x40,0x40,0xf0,0x80, - 0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x60, - 0x90,0x90,0x90,0x90,0x60,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf0,0x40,0x20,0x10,0x90, - 0x60,0xc0,0x20,0x20,0xc0,0x20,0xc0,0x20, - 0x20,0xf0,0x60,0x20,0x20,0xc0,0x20,0x20, - 0xc0,0x80,0xe0,0x60,0x90,0x90,0xe0,0x80, - 0x70,0x40,0x40,0x40,0x20,0x10,0xf0,0x60, - 0x90,0x90,0x60,0x90,0x60,0x60,0x10,0x70, - 0x90,0x90,0x60,0x80,0x00,0x00,0x80,0x80, - 0x40,0x40,0x00,0x00,0x40,0x20,0x40,0x80, - 0x40,0x20,0xe0,0x00,0xe0,0x80,0x40,0x20, - 0x40,0x80,0x40,0x00,0x40,0x20,0xc0,0x78, - 0x80,0x9e,0xa5,0x99,0x41,0x3e,0x88,0x88, - 0x70,0x50,0x20,0x20,0xe0,0x90,0x90,0xe0, - 0x90,0xe0,0x70,0x88,0x80,0x80,0x88,0x70, - 0xf0,0x88,0x88,0x88,0x88,0xf0,0xf0,0x80, - 0x80,0xe0,0x80,0xf0,0x80,0x80,0x80,0xe0, - 0x80,0xf0,0x70,0x88,0x88,0x98,0x80,0x70, - 0x88,0x88,0x88,0xf8,0x88,0x88,0x80,0x80, - 0x80,0x80,0x80,0x80,0x40,0xa0,0x20,0x20, - 0x20,0x20,0x90,0x90,0xe0,0xc0,0xa0,0x90, - 0xe0,0x80,0x80,0x80,0x80,0x80,0xa8,0xa8, - 0xa8,0xa8,0xd8,0x88,0x88,0x98,0xa8,0xa8, - 0xc8,0x88,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xe0,0x90,0x90,0xe0,0x10,0x20, - 0x70,0x88,0x88,0x88,0x88,0x70,0x90,0x90, - 0xe0,0x90,0x90,0xe0,0xe0,0x10,0x10,0xe0, - 0x80,0x70,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x40,0xa0, - 0x90,0x90,0x90,0x90,0x48,0x48,0x6c,0x92, - 0x92,0x92,0x90,0x90,0x60,0x60,0x90,0x90, - 0x20,0x20,0x30,0x48,0x48,0xc8,0xf0,0x80, - 0x40,0x20,0x10,0xf0,0xc0,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xf8,0x80,0x80,0x80, - 0xd0,0xa0,0xe0,0x20,0xc0,0xe0,0x90,0x90, - 0x90,0xe0,0x80,0x80,0x60,0x80,0x80,0x80, - 0x60,0x70,0x90,0x90,0x90,0x70,0x10,0x10, - 0x60,0x80,0xe0,0xa0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x20,0x60,0x10,0x70,0x90, - 0x90,0x70,0x90,0x90,0x90,0x90,0xe0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0xa0,0xa0,0xc0,0xc0,0xa0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xa8, - 0xa8,0xa8,0xa8,0xf0,0x90,0x90,0x90,0x90, - 0xe0,0x60,0x90,0x90,0x90,0x60,0x80,0xe0, - 0x90,0x90,0x90,0xe0,0x10,0x70,0x90,0x90, - 0x90,0x70,0x80,0x80,0x80,0xc0,0xa0,0xc0, - 0x20,0x60,0x80,0x60,0x40,0x40,0x40,0x40, - 0xe0,0x40,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x40,0xa0,0x90,0x90,0x90,0x50,0x50,0xa8, - 0xa8,0xa8,0x90,0x90,0x60,0x90,0x90,0x80, - 0x40,0x60,0x90,0x90,0x90,0xe0,0x80,0x40, - 0x20,0xe0,0x20,0x40,0x40,0xc0,0x40,0x40, - 0x20,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x40,0x40,0x60,0x40,0x40,0x80,0xb0, - 0x48,0x00,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x40,0x40,0xa0,0x80,0xa0,0x40,0x40, - 0xf0,0x40,0x40,0xe0,0x40,0x30,0x88,0x70, - 0x50,0x70,0x88,0x20,0x20,0xf8,0x50,0x88, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0xe0, - 0x10,0x30,0x60,0x90,0x60,0x80,0x70,0x90, - 0x78,0x84,0xb4,0xa4,0xb4,0x84,0x78,0xe0, - 0x00,0xe0,0x20,0xc0,0x50,0xa0,0x50,0x10, - 0x10,0xf0,0xc0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x40,0xa0,0x40,0xf0,0x00, - 0x20,0xf0,0x20,0xc0,0x80,0x40,0x80,0xc0, - 0x20,0x60,0xe0,0x80,0x40,0x80,0x80,0xe0, - 0xa0,0xa0,0xa0,0x50,0x50,0x50,0x50,0xd0, - 0xd0,0xd0,0x78,0x80,0x80,0x80,0x40,0x40, - 0x40,0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0, - 0xa0,0x50,0xa0,0x04,0x5e,0x2c,0x54,0x48, - 0xc4,0x40,0x0e,0x44,0x22,0x5c,0x48,0xc4, - 0x40,0x04,0x5e,0x2c,0xd4,0x28,0x64,0xe0, - 0x60,0x90,0x40,0x20,0x00,0x20,0x88,0x88, - 0x70,0x50,0x20,0x20,0x00,0x20,0x40,0x88, - 0x88,0x70,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0x70,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0x70,0x50,0x20,0x20,0x00, - 0x50,0x28,0x88,0x88,0x70,0x50,0x20,0x20, - 0x00,0x50,0x88,0x88,0x70,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9e,0x90,0x7c,0x50,0x30, - 0x3e,0x80,0x40,0x70,0x88,0x80,0x88,0x88, - 0x70,0xf0,0x80,0x80,0xe0,0x80,0xf0,0x00, - 0x20,0x40,0xf0,0x80,0x80,0xe0,0x80,0xf0, - 0x00,0x40,0x20,0xf0,0x80,0x80,0xe0,0x80, - 0xf0,0x00,0xa0,0x40,0xf0,0x80,0x80,0xe0, - 0x80,0xf0,0x00,0xa0,0x40,0x40,0x40,0x40, - 0x40,0x40,0x00,0x40,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x48,0x48,0xe8,0x48,0x70,0x88,0x98,0xa8, - 0xa8,0xc8,0x88,0x00,0x50,0x28,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x28,0x70,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x90,0x60,0x60,0x90,0x80,0xf0, - 0xc8,0xa8,0x98,0x88,0x78,0x08,0x70,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x00, - 0x50,0x20,0x20,0x30,0x48,0x48,0xc8,0x00, - 0x10,0x08,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0xa0,0x90,0x60,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x80,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x20,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0x40,0x68, - 0x50,0x70,0x10,0x60,0x00,0xb0,0x68,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0xd0,0xa0, - 0xe0,0x20,0xc0,0x40,0xa0,0x40,0xd8,0xa0, - 0xf8,0x28,0xd0,0x80,0x40,0x60,0x80,0x80, - 0x80,0x60,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x20,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x40,0x20,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x60,0x90,0x90,0x90,0x70,0xa0,0x60,0x90, - 0x90,0x90,0x90,0x90,0xe0,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x10, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x90,0x20, - 0x00,0xf0,0x00,0x20,0x80,0x70,0x68,0x58, - 0x48,0x3c,0x02,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x80,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x20,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x20,0x10,0x80,0xe0,0x90,0x90,0x90, - 0xe0,0x80,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x50, -}; - -FontDataBLF blf_font_helvb8 = { - 0, -2, - 9, 9, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 0}, - {1, 6, -1, 0, 2, 1}, - {3, 3, -1, -3, 3, 7}, - {5, 5, 0, 0, 5, 10}, - {4, 7, -1, 1, 5, 15}, - {6, 6, -1, 0, 7, 22}, - {5, 6, -1, 0, 6, 28}, - {1, 3, -1, -3, 2, 34}, - {2, 7, -1, 1, 3, 37}, - {2, 7, -1, 1, 3, 44}, - {3, 3, -1, -2, 3, 51}, - {5, 5, -1, 0, 5, 54}, - {2, 3, 0, 2, 2, 59}, - {4, 1, -2, -2, 6, 62}, - {1, 1, -1, 0, 2, 63}, - {2, 7, -1, 1, 2, 64}, - {4, 6, -1, 0, 5, 71}, - {2, 6, -2, 0, 5, 77}, - {4, 6, -1, 0, 5, 83}, - {3, 6, -2, 0, 5, 89}, - {4, 6, -1, 0, 5, 95}, - {3, 6, -2, 0, 5, 101}, - {4, 6, -1, 0, 5, 107}, - {4, 6, -1, 0, 5, 113}, - {4, 6, -1, 0, 5, 119}, - {4, 6, -1, 0, 5, 125}, - {1, 4, -1, 0, 2, 131}, - {2, 6, 0, 2, 2, 135}, - {3, 5, -1, 0, 5, 141}, - {3, 3, -1, -1, 4, 146}, - {3, 5, -2, 0, 5, 149}, - {3, 5, -2, 0, 5, 154}, - {8, 7, -1, 1, 9, 159}, - {5, 6, -1, 0, 6, 166}, - {4, 6, -2, 0, 6, 172}, - {5, 6, -1, 0, 6, 178}, - {5, 6, -1, 0, 6, 184}, - {4, 6, -2, 0, 6, 190}, - {4, 6, -2, 0, 5, 196}, - {5, 6, -1, 0, 6, 202}, - {5, 6, -1, 0, 6, 208}, - {1, 6, -1, 0, 2, 214}, - {3, 6, -1, 0, 4, 220}, - {4, 6, -2, 0, 6, 226}, - {3, 6, -2, 0, 5, 232}, - {5, 6, -2, 0, 7, 238}, - {5, 6, -1, 0, 6, 244}, - {5, 6, -1, 0, 6, 250}, - {4, 6, -2, 0, 6, 256}, - {5, 8, -1, 2, 6, 262}, - {4, 6, -2, 0, 6, 270}, - {4, 6, -2, 0, 6, 276}, - {3, 6, -1, 0, 4, 282}, - {5, 6, -1, 0, 6, 288}, - {4, 6, -2, 0, 6, 294}, - {7, 6, -1, 0, 7, 300}, - {4, 6, -2, 0, 6, 306}, - {5, 6, -1, 0, 6, 312}, - {4, 6, -2, 0, 6, 318}, - {2, 7, -1, 1, 2, 324}, - {2, 7, 0, 1, 2, 331}, - {2, 7, 0, 1, 2, 338}, - {5, 3, 0, -2, 5, 345}, - {5, 1, 0, 1, 5, 348}, - {1, 3, -1, -3, 2, 349}, - {4, 5, -1, 0, 4, 352}, - {4, 7, -1, 0, 5, 357}, - {3, 5, -1, 0, 4, 364}, - {4, 7, -1, 0, 5, 369}, - {3, 5, -1, 0, 4, 376}, - {3, 7, -1, 0, 3, 381}, - {4, 6, -1, 1, 5, 388}, - {4, 7, -1, 0, 5, 394}, - {1, 7, -1, 0, 2, 401}, - {2, 9, 0, 2, 2, 408}, - {3, 7, -1, 0, 4, 417}, - {1, 7, -1, 0, 2, 424}, - {5, 5, -1, 0, 6, 431}, - {4, 5, -1, 0, 5, 436}, - {4, 5, -1, 0, 5, 441}, - {4, 6, -1, 1, 5, 446}, - {4, 6, -1, 1, 5, 452}, - {3, 5, -1, 0, 3, 458}, - {3, 5, -1, 0, 4, 463}, - {3, 7, -1, 0, 3, 468}, - {3, 5, -1, 0, 4, 475}, - {4, 5, -1, 0, 5, 480}, - {5, 5, -1, 0, 6, 485}, - {4, 5, -1, 0, 5, 490}, - {4, 6, -1, 1, 4, 495}, - {3, 5, -1, 0, 4, 501}, - {3, 7, 0, 1, 2, 506}, - {1, 7, -1, 1, 2, 513}, - {3, 7, 0, 1, 2, 520}, - {5, 2, -1, -2, 6, 527}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 529}, - {1, 7, -1, 2, 2, 530}, - {3, 7, -1, 1, 5, 537}, - {4, 6, -1, 0, 5, 544}, - {5, 5, 0, 0, 4, 550}, - {5, 5, -1, 0, 6, 555}, - {1, 7, -1, 1, 2, 560}, - {4, 8, -1, 2, 5, 567}, - {4, 1, 0, -5, 2, 575}, - {6, 7, -1, 1, 7, 576}, - {3, 5, 0, -1, 3, 583}, - {4, 3, -1, -1, 5, 588}, - {4, 3, -1, -1, 6, 591}, - {2, 1, 0, -2, 3, 594}, - {6, 7, -1, 1, 7, 595}, - {3, 1, 0, -5, 2, 602}, - {3, 3, -1, -3, 3, 603}, - {4, 5, -1, 0, 5, 606}, - {2, 4, -1, -2, 2, 611}, - {3, 4, 0, -2, 2, 615}, - {2, 2, 0, -4, 2, 619}, - {3, 6, -1, 2, 4, 621}, - {5, 8, 0, 2, 5, 627}, - {1, 2, -1, -1, 2, 635}, - {2, 2, 0, 2, 2, 637}, - {2, 4, 0, -2, 2, 639}, - {3, 5, 0, -1, 3, 643}, - {4, 3, -1, -1, 5, 648}, - {7, 7, 0, 1, 7, 651}, - {7, 7, 0, 1, 7, 658}, - {7, 7, 0, 1, 7, 665}, - {4, 6, -1, 1, 5, 672}, - {5, 9, -1, 0, 6, 678}, - {5, 9, -1, 0, 6, 687}, - {5, 9, -1, 0, 6, 696}, - {5, 9, -1, 0, 6, 705}, - {5, 8, -1, 0, 6, 714}, - {5, 9, -1, 0, 6, 722}, - {7, 6, -1, 0, 8, 731}, - {5, 8, -1, 2, 6, 737}, - {4, 9, -2, 0, 6, 745}, - {4, 9, -2, 0, 6, 754}, - {4, 9, -2, 0, 6, 763}, - {4, 8, -2, 0, 6, 772}, - {2, 9, 0, 0, 2, 780}, - {2, 9, -1, 0, 2, 789}, - {3, 9, 0, 0, 2, 798}, - {3, 8, 0, 0, 2, 807}, - {5, 6, -1, 0, 6, 815}, - {5, 9, -1, 0, 6, 821}, - {5, 9, -1, 0, 6, 830}, - {5, 9, -1, 0, 6, 839}, - {5, 9, -1, 0, 6, 848}, - {5, 9, -1, 0, 6, 857}, - {5, 8, -1, 0, 6, 866}, - {4, 4, -1, 0, 5, 874}, - {5, 8, -1, 1, 6, 878}, - {5, 9, -1, 0, 6, 886}, - {5, 9, -1, 0, 6, 895}, - {5, 9, -1, 0, 6, 904}, - {5, 8, -1, 0, 6, 913}, - {5, 9, -1, 0, 6, 921}, - {5, 6, -1, 0, 6, 930}, - {4, 7, -2, 1, 6, 936}, - {4, 8, -1, 0, 4, 943}, - {4, 8, -1, 0, 4, 951}, - {4, 8, -1, 0, 4, 959}, - {5, 8, 0, 0, 4, 967}, - {4, 7, -1, 0, 4, 975}, - {4, 8, -1, 0, 4, 982}, - {5, 5, -1, 0, 6, 990}, - {3, 7, -1, 2, 4, 995}, - {3, 8, -1, 0, 4, 1002}, - {3, 8, -1, 0, 4, 1010}, - {3, 8, -1, 0, 4, 1018}, - {3, 7, -1, 0, 4, 1026}, - {2, 8, 0, 0, 2, 1033}, - {2, 8, -1, 0, 2, 1041}, - {3, 8, 0, 0, 2, 1049}, - {3, 7, 0, 0, 2, 1057}, - {4, 8, -1, 0, 5, 1064}, - {4, 8, -1, 0, 5, 1072}, - {4, 8, -1, 0, 5, 1080}, - {4, 8, -1, 0, 5, 1088}, - {4, 8, -1, 0, 5, 1096}, - {4, 8, -1, 0, 5, 1104}, - {4, 7, -1, 0, 5, 1112}, - {4, 5, -1, 0, 5, 1119}, - {7, 7, 0, 1, 5, 1124}, - {3, 8, -1, 0, 4, 1131}, - {3, 8, -1, 0, 4, 1139}, - {3, 8, -1, 0, 4, 1147}, - {3, 7, -1, 0, 4, 1155}, - {4, 9, -1, 1, 4, 1162}, - {4, 7, -1, 1, 5, 1171}, - {4, 8, -1, 1, 4, 1178}, - }, - helvb8_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELVB8_H */ diff --git a/source/blender/blenfont/intern/blf_font_scr12.h b/source/blender/blenfont/intern/blf_font_scr12.h deleted file mode 100644 index 6460cf6f501..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr12.h +++ /dev/null @@ -1,479 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR12_H -#define BLF_FONT_SCR12_H - -static unsigned char scr12_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x28,0x7e,0x14,0x14,0x20,0x70,0xa8,0x28, - 0x70,0xa0,0xa8,0x70,0x20,0x98,0x54,0x54, - 0x2c,0xd0,0xa8,0xa8,0x64,0x74,0x88,0x8c, - 0x50,0x20,0x50,0x48,0x30,0x80,0x40,0x20, - 0x20,0x20,0x40,0x40,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x80,0x40,0x40,0x20,0x20, - 0x20,0x20,0x40,0x40,0x80,0x20,0xa8,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x70, - 0xe0,0x40,0x40,0x40,0x40,0x40,0xc0,0x40, - 0xf8,0x80,0x40,0x20,0x10,0x08,0x88,0x70, - 0x70,0x88,0x08,0x08,0x70,0x08,0x88,0x70, - 0x10,0x10,0x10,0xf8,0x90,0x50,0x30,0x10, - 0x70,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xf0,0x80,0x88,0x70, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x70, - 0x70,0x88,0x08,0x78,0x88,0x88,0x88,0x70, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x40, - 0x40,0xc0,0x00,0x00,0x40,0x40,0x08,0x10, - 0x20,0x40,0x80,0x40,0x20,0x10,0x08,0xf8, - 0x00,0xf8,0x80,0x40,0x20,0x10,0x08,0x10, - 0x20,0x40,0x80,0x20,0x00,0x20,0x20,0x10, - 0x88,0x88,0x70,0x38,0x40,0x98,0xa8,0xa8, - 0x98,0x48,0x30,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0xf0,0x88,0x88,0x88,0xf0, - 0x88,0x88,0xf0,0x70,0x88,0x80,0x80,0x80, - 0x80,0x88,0x70,0xf0,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x80,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x68,0x98,0x88,0x88,0x98, - 0x80,0x88,0x70,0x88,0x88,0x88,0x88,0xf8, - 0x88,0x88,0x88,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x88,0x88,0x90,0xa0,0xc0, - 0xa0,0x90,0x88,0xf8,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0xa8,0xa8,0xd8, - 0xd8,0x88,0x88,0x88,0x98,0x98,0xa8,0xa8, - 0xc8,0xc8,0x88,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x80,0x80,0x80,0x80,0xf0, - 0x88,0x88,0xf0,0x08,0x10,0x70,0xa8,0x88, - 0x88,0x88,0x88,0x88,0x70,0x88,0x90,0x90, - 0xa0,0xf0,0x88,0x88,0xf0,0x70,0x88,0x88, - 0x08,0x70,0x80,0x88,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x20,0x20,0x50, - 0x50,0x50,0x88,0x88,0x88,0x50,0x50,0xf8, - 0xa8,0xa8,0xa8,0x88,0x88,0x88,0x88,0x50, - 0x20,0x20,0x50,0x88,0x88,0x20,0x20,0x20, - 0x20,0x50,0x50,0x88,0x88,0xf8,0x80,0x40, - 0x40,0x20,0x10,0x08,0xf8,0xe0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xe0,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x88,0x50,0x20,0xfe,0x20,0x40,0x80, - 0x80,0x68,0x98,0x88,0x78,0x08,0x70,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0x70, - 0x88,0x80,0x80,0x88,0x70,0x68,0x98,0x88, - 0x88,0x98,0x68,0x08,0x08,0x70,0x88,0x80, - 0xf8,0x88,0x70,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x98,0x68,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x60,0x90,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0x10,0x88,0x90,0xa0, - 0xc0,0xa0,0x90,0x80,0x80,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x70,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x08, - 0x08,0x68,0x98,0x88,0x88,0x98,0x68,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x10, - 0x60,0x88,0x70,0x30,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x20,0x20,0x50,0x50,0x88,0x88,0x50,0xa8, - 0xa8,0xa8,0x88,0x88,0x88,0x88,0x50,0x20, - 0x50,0x88,0xf0,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0xf8,0x80,0x40,0x20,0x10,0xf8, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x20,0x20, - 0x20,0x18,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x20,0x20,0x20, - 0x20,0x18,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x20,0x20,0x70,0x88,0x80,0x88,0x70, - 0x20,0x20,0xb0,0x48,0x40,0xf0,0x40,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0x70,0x20,0x70,0x20,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x10,0x28,0x48,0x90, - 0xa0,0x40,0x88,0x70,0xa0,0x78,0x84,0xb4, - 0xa4,0xb4,0x84,0x78,0xf0,0x90,0x70,0x10, - 0x60,0x14,0x28,0x50,0xa0,0x50,0x28,0x14, - 0x08,0xf8,0xf0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x60,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0x20, - 0xa0,0x40,0xc0,0x20,0x40,0x20,0xc0,0x80, - 0x40,0x80,0xe8,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x68,0xa8,0xa8,0xa8,0x7c, - 0x80,0x80,0xc0,0x40,0xe0,0x40,0x40,0xc0, - 0x40,0xf0,0x60,0x90,0x90,0x60,0xa0,0x50, - 0x28,0x14,0x28,0x50,0xa0,0x08,0x38,0xa8, - 0x58,0x28,0xf0,0x48,0x40,0xc0,0x40,0x38, - 0x10,0x88,0x68,0x30,0xf0,0x48,0x40,0xc0, - 0x40,0x08,0x38,0xa8,0x58,0x28,0xd0,0x28, - 0x40,0x20,0xc0,0x70,0x88,0x88,0x40,0x20, - 0x20,0x00,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x50,0x50,0x20,0x20,0x00,0x20,0x10,0x88, - 0x88,0xf8,0x50,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0xf8,0x50,0x50,0x20,0x20, - 0x00,0xb0,0x68,0x88,0x88,0xf8,0x50,0x50, - 0x20,0x20,0x00,0x50,0x88,0x88,0xf8,0x50, - 0x50,0x20,0x20,0x20,0x50,0x20,0x9c,0x90, - 0xf0,0x50,0x5c,0x30,0x30,0x1c,0x60,0x20, - 0x70,0x88,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00, - 0x20,0x40,0xf8,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0x20,0x10,0xf8,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x00,0x50,0xe0, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x80,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x40,0x20,0xe0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0xa0,0x40,0xe0,0x40,0x40, - 0x40,0x40,0x40,0xe0,0x00,0xa0,0x78,0x44, - 0x44,0xf4,0x44,0x44,0x44,0x78,0x88,0x98, - 0x98,0xa8,0xc8,0xc8,0x88,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x40,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0x50,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x88,0x50,0x20,0x50,0x88,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x00,0x50,0x20,0x20,0x20,0x50, - 0x50,0x88,0x88,0x00,0x20,0x10,0x80,0x80, - 0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0xb0, - 0x88,0x88,0x88,0x90,0xa0,0x90,0x60,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x40,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x10,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x20,0x78, - 0x88,0x78,0x08,0x70,0x00,0xb0,0x68,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x78,0x88, - 0x78,0x08,0x70,0x00,0x20,0x50,0x20,0x6c, - 0x90,0x7c,0x12,0x6c,0x60,0x20,0x70,0x88, - 0x80,0x80,0x88,0x70,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x40,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x10,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x80,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x20,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x40,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x78,0x08, - 0x90,0x60,0xd0,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x10,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x70, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x00,0xf8,0x00,0x20,0xb8, - 0x64,0x54,0x4c,0x3a,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x40,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0x20,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x88,0x00,0x20,0x10,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0xf0, - 0x08,0x68,0x98,0x88,0x88,0x88,0x00,0xd8, -}; - -FontDataBLF blf_font_scr12 = { - 0, -2, - 7, 10, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 8, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 8}, - {7, 8, 0, 0, 7, 12}, - {5, 9, -1, 1, 7, 20}, - {6, 8, 0, 0, 7, 29}, - {6, 8, 0, 0, 7, 37}, - {3, 4, -2, -5, 7, 45}, - {3, 10, -2, 2, 7, 49}, - {3, 10, -2, 2, 7, 59}, - {5, 5, -1, -3, 7, 69}, - {5, 5, -1, -1, 7, 74}, - {2, 4, -2, 2, 7, 79}, - {5, 1, -1, -3, 7, 83}, - {1, 2, -3, 0, 7, 84}, - {5, 10, -1, 1, 7, 86}, - {5, 8, -1, 0, 7, 96}, - {3, 8, -2, 0, 7, 104}, - {5, 8, -1, 0, 7, 112}, - {5, 8, -1, 0, 7, 120}, - {5, 8, -1, 0, 7, 128}, - {5, 8, -1, 0, 7, 136}, - {5, 8, -1, 0, 7, 144}, - {5, 8, -1, 0, 7, 152}, - {5, 8, -1, 0, 7, 160}, - {5, 8, -1, 0, 7, 168}, - {1, 6, -3, 0, 7, 176}, - {2, 8, -2, 2, 7, 182}, - {5, 9, -1, 1, 7, 190}, - {5, 3, -1, -2, 7, 199}, - {5, 9, -1, 1, 7, 202}, - {5, 8, -1, 0, 7, 211}, - {5, 8, -1, 0, 7, 219}, - {5, 8, -1, 0, 7, 227}, - {5, 8, -1, 0, 7, 235}, - {5, 8, -1, 0, 7, 243}, - {5, 8, -1, 0, 7, 251}, - {5, 8, -1, 0, 7, 259}, - {5, 8, -1, 0, 7, 267}, - {5, 8, -1, 0, 7, 275}, - {5, 8, -1, 0, 7, 283}, - {3, 8, -2, 0, 7, 291}, - {5, 8, -1, 0, 7, 299}, - {5, 8, -1, 0, 7, 307}, - {5, 8, -1, 0, 7, 315}, - {5, 8, -1, 0, 7, 323}, - {5, 8, -1, 0, 7, 331}, - {5, 8, -1, 0, 7, 339}, - {5, 8, -1, 0, 7, 347}, - {5, 10, -1, 2, 7, 355}, - {5, 8, -1, 0, 7, 365}, - {5, 8, -1, 0, 7, 373}, - {5, 8, -1, 0, 7, 381}, - {5, 8, -1, 0, 7, 389}, - {5, 8, -1, 0, 7, 397}, - {5, 8, -1, 0, 7, 405}, - {5, 8, -1, 0, 7, 413}, - {5, 8, -1, 0, 7, 421}, - {5, 8, -1, 0, 7, 429}, - {3, 9, -2, 1, 7, 437}, - {5, 10, -1, 1, 7, 446}, - {3, 9, -2, 1, 7, 456}, - {5, 3, -1, -5, 7, 465}, - {7, 1, 0, 1, 7, 468}, - {3, 4, -2, -5, 7, 469}, - {5, 6, -1, 0, 7, 473}, - {5, 8, -1, 0, 7, 479}, - {5, 6, -1, 0, 7, 487}, - {5, 8, -1, 0, 7, 493}, - {5, 6, -1, 0, 7, 501}, - {5, 8, -1, 0, 7, 507}, - {5, 8, -1, 2, 7, 515}, - {5, 8, -1, 0, 7, 523}, - {3, 8, -2, 0, 7, 531}, - {4, 10, -1, 2, 7, 539}, - {5, 8, -1, 0, 7, 549}, - {3, 8, -2, 0, 7, 557}, - {5, 6, -1, 0, 7, 565}, - {5, 6, -1, 0, 7, 571}, - {5, 6, -1, 0, 7, 577}, - {5, 8, -1, 2, 7, 583}, - {5, 8, -1, 2, 7, 591}, - {5, 6, -1, 0, 7, 599}, - {5, 6, -1, 0, 7, 605}, - {4, 7, -1, 0, 7, 611}, - {5, 6, -1, 0, 7, 618}, - {5, 6, -1, 0, 7, 624}, - {5, 6, -1, 0, 7, 630}, - {5, 6, -1, 0, 7, 636}, - {5, 8, -1, 2, 7, 642}, - {5, 6, -1, 0, 7, 650}, - {5, 10, -1, 2, 7, 656}, - {1, 10, -3, 1, 7, 666}, - {5, 10, -1, 2, 7, 676}, - {6, 3, 0, -2, 7, 686}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 8, -3, 2, 7, 689}, - {5, 9, -1, 0, 7, 697}, - {5, 8, -1, 0, 7, 706}, - {4, 6, -1, -2, 7, 714}, - {5, 8, -1, 0, 7, 720}, - {1, 10, -3, 1, 7, 728}, - {5, 10, -1, 1, 7, 738}, - {3, 1, -2, -7, 7, 748}, - {6, 7, 0, 0, 7, 749}, - {4, 5, -1, -4, 7, 756}, - {6, 7, 0, 0, 7, 761}, - {5, 2, -1, -3, 7, 768}, - {4, 1, -1, -3, 7, 770}, - {6, 7, 0, 0, 7, 771}, - {3, 1, -2, -7, 7, 778}, - {4, 3, -1, -4, 7, 779}, - {5, 7, -1, 0, 7, 782}, - {3, 5, -2, -4, 7, 789}, - {3, 5, -2, -4, 7, 794}, - {2, 2, -2, -7, 7, 799}, - {5, 6, -1, 1, 7, 801}, - {6, 9, 0, 1, 7, 807}, - {1, 2, -3, -3, 7, 816}, - {2, 2, -2, 2, 7, 818}, - {3, 5, -2, -4, 7, 820}, - {4, 5, -1, -4, 7, 825}, - {6, 7, 0, 0, 7, 830}, - {5, 10, -1, 1, 7, 837}, - {5, 10, -1, 1, 7, 847}, - {5, 10, -1, 1, 7, 857}, - {5, 8, -1, 2, 7, 867}, - {5, 10, -1, 0, 7, 875}, - {5, 10, -1, 0, 7, 885}, - {5, 10, -1, 0, 7, 895}, - {5, 10, -1, 0, 7, 905}, - {5, 9, -1, 0, 7, 915}, - {5, 10, -1, 0, 7, 924}, - {6, 8, 0, 0, 7, 934}, - {5, 10, -1, 2, 7, 942}, - {5, 10, -1, 0, 7, 952}, - {5, 10, -1, 0, 7, 962}, - {5, 10, -1, 0, 7, 972}, - {5, 9, -1, 0, 7, 982}, - {3, 10, -2, 0, 7, 991}, - {3, 10, -2, 0, 7, 1001}, - {3, 10, -2, 0, 7, 1011}, - {3, 9, -2, 0, 7, 1021}, - {6, 8, 0, 0, 7, 1030}, - {5, 10, -1, 0, 7, 1038}, - {5, 10, -1, 0, 7, 1048}, - {5, 10, -1, 0, 7, 1058}, - {5, 10, -1, 0, 7, 1068}, - {5, 10, -1, 0, 7, 1078}, - {5, 9, -1, 0, 7, 1088}, - {5, 5, -1, -1, 7, 1097}, - {7, 7, 0, 0, 7, 1102}, - {5, 10, -1, 0, 7, 1109}, - {5, 10, -1, 0, 7, 1119}, - {5, 10, -1, 0, 7, 1129}, - {5, 9, -1, 0, 7, 1139}, - {5, 10, -1, 0, 7, 1148}, - {5, 9, -1, 0, 7, 1158}, - {5, 8, -1, 0, 7, 1167}, - {5, 8, -1, 0, 7, 1175}, - {5, 8, -1, 0, 7, 1183}, - {5, 8, -1, 0, 7, 1191}, - {5, 8, -1, 0, 7, 1199}, - {5, 7, -1, 0, 7, 1207}, - {5, 9, -1, 0, 7, 1214}, - {7, 5, 0, 0, 7, 1223}, - {5, 8, -1, 2, 7, 1228}, - {5, 8, -1, 0, 7, 1236}, - {5, 8, -1, 0, 7, 1244}, - {5, 8, -1, 0, 7, 1252}, - {5, 7, -1, 0, 7, 1260}, - {3, 8, -2, 0, 7, 1267}, - {3, 8, -2, 0, 7, 1275}, - {3, 8, -2, 0, 7, 1283}, - {3, 7, -2, 0, 7, 1291}, - {5, 9, -1, 0, 7, 1298}, - {5, 8, -1, 0, 7, 1307}, - {5, 8, -1, 0, 7, 1315}, - {5, 8, -1, 0, 7, 1323}, - {5, 8, -1, 0, 7, 1331}, - {5, 8, -1, 0, 7, 1339}, - {5, 7, -1, 0, 7, 1347}, - {5, 5, -1, -1, 7, 1354}, - {7, 5, 0, 0, 7, 1359}, - {5, 8, -1, 0, 7, 1364}, - {5, 8, -1, 0, 7, 1372}, - {5, 8, -1, 0, 7, 1380}, - {5, 7, -1, 0, 7, 1388}, - {5, 10, -1, 2, 7, 1395}, - {5, 10, -1, 2, 7, 1405}, - {5, 9, -1, 2, 7, 1415}, - }, - scr12_bitmap_data, - 0 -}; - -#endif - diff --git a/source/blender/blenfont/intern/blf_font_scr14.h b/source/blender/blenfont/intern/blf_font_scr14.h deleted file mode 100644 index d9cc0b84e14..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr14.h +++ /dev/null @@ -1,504 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR14_H -#define BLF_FONT_SCR14_H - -static unsigned char scr14_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc, - 0x28,0x28,0x28,0x7e,0x14,0x14,0x20,0x70, - 0xa8,0x28,0x30,0x60,0xa0,0xa8,0x70,0x20, - 0x98,0x54,0x54,0x2c,0x10,0x68,0x54,0x54, - 0x32,0x74,0x88,0x8c,0x90,0x60,0x20,0x50, - 0x48,0x30,0x80,0x40,0x20,0x20,0x20,0x40, - 0x40,0x80,0x80,0x80,0x80,0x80,0x40,0x40, - 0x20,0x80,0x40,0x40,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0x20,0xa8,0x70,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88, - 0x70,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xf8,0x80,0x40,0x20,0x10,0x08, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x70, - 0x08,0x08,0x88,0x70,0x10,0x10,0x10,0xf8, - 0x90,0x50,0x50,0x30,0x10,0x70,0x88,0x08, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0x88,0x88,0xf0,0x80,0x88,0x70,0x40, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x88, - 0x70,0x70,0x88,0x08,0x08,0x78,0x88,0x88, - 0x88,0x70,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x40,0x40,0xc0,0x00,0x00,0x40,0x40, - 0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x00,0xf8,0x80,0x40,0x20,0x10, - 0x08,0x10,0x20,0x40,0x80,0x20,0x20,0x00, - 0x20,0x20,0x10,0x88,0x88,0x70,0x38,0x40, - 0x98,0xa8,0xa8,0x98,0x88,0x48,0x30,0x88, - 0x88,0xf8,0x88,0x50,0x50,0x50,0x20,0x20, - 0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0x88, - 0xf0,0x70,0x88,0x80,0x80,0x80,0x80,0x80, - 0x88,0x70,0xf0,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0x80,0xf8,0x80,0x80,0x80,0x80, - 0xf0,0x80,0x80,0x80,0xf8,0x68,0x98,0x88, - 0x88,0x98,0x80,0x80,0x88,0x70,0x88,0x88, - 0x88,0x88,0xf8,0x88,0x88,0x88,0x88,0xe0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x08,0x08,0x08,0x08,0x08, - 0x08,0x88,0x88,0x90,0xa0,0xc0,0xa0,0x90, - 0x88,0x88,0xf8,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0x88,0xa8,0xa8, - 0xd8,0xd8,0x88,0x88,0x88,0x98,0x98,0xa8, - 0xa8,0xc8,0xc8,0x88,0x88,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x80,0x80, - 0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x08, - 0x10,0x70,0xa8,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x88,0x88,0x90,0xa0,0xf0,0x88, - 0x88,0x88,0xf0,0x70,0x88,0x08,0x08,0x70, - 0x80,0x80,0x88,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x20,0x20, - 0x50,0x50,0x50,0x88,0x88,0x88,0x88,0x50, - 0x50,0xf8,0xa8,0xa8,0x88,0x88,0x88,0x88, - 0x88,0x88,0x50,0x50,0x20,0x50,0x50,0x88, - 0x88,0x20,0x20,0x20,0x20,0x20,0x50,0x50, - 0x88,0x88,0xf8,0x80,0x40,0x40,0x20,0x10, - 0x10,0x08,0xf8,0xf0,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xf0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xf0,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0xf0,0x88,0x50,0x20,0xfe,0x20, - 0x40,0x80,0x80,0x68,0x98,0x88,0x78,0x08, - 0x88,0x70,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x70,0x88,0x80,0x80,0x80, - 0x88,0x70,0x68,0x98,0x88,0x88,0x88,0x98, - 0x68,0x08,0x08,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x40,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0x70,0x88,0x08,0x68,0x98, - 0x88,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0x88,0xc8,0xb0,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x60, - 0x90,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x70,0x00,0x10,0x88,0x88,0x90,0xe0,0xa0, - 0x90,0x88,0x80,0x80,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x80,0x80,0x80,0xb0,0xc8,0x88, - 0x88,0x88,0xc8,0xb0,0x08,0x08,0x08,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x80,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x08, - 0x70,0x80,0x88,0x70,0x30,0x40,0x40,0x40, - 0x40,0x40,0xf0,0x40,0x40,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x20,0x20,0x50,0x50, - 0x88,0x88,0x88,0x50,0xa8,0xa8,0xa8,0xa8, - 0x88,0x88,0x88,0x88,0x50,0x20,0x50,0x88, - 0x88,0x70,0x88,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0xf8,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x18,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x18,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x20,0x20,0x20,0x20,0x20, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x80,0x20,0x20,0x70,0x88,0x80,0x80, - 0x88,0x70,0x20,0x20,0xb0,0x48,0x40,0x40, - 0xf0,0x40,0x40,0x48,0x30,0x88,0x70,0x88, - 0x88,0x70,0x88,0x70,0x20,0xf8,0x20,0xf8, - 0x50,0x50,0x88,0x88,0x80,0x80,0x80,0x80, - 0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80, - 0x70,0x88,0x10,0x28,0x48,0x88,0x90,0xa0, - 0x40,0x88,0x70,0xd8,0x38,0x44,0x92,0xaa, - 0xa2,0xaa,0x92,0x44,0x38,0xf8,0x00,0x68, - 0x90,0x70,0x10,0x60,0x12,0x24,0x48,0x90, - 0x48,0x24,0x12,0x08,0x08,0xf8,0xf0,0x38, - 0x44,0xaa,0xaa,0xb2,0xaa,0xb2,0x44,0x38, - 0xe0,0x60,0x90,0x90,0x60,0xf8,0x00,0x20, - 0x20,0xf8,0x20,0x20,0xe0,0x40,0x20,0xa0, - 0x40,0xc0,0x20,0x40,0x20,0xc0,0x80,0x40, - 0x80,0x80,0xb4,0xc8,0x88,0x88,0x88,0x88, - 0x28,0x28,0x28,0x28,0x28,0x68,0xa8,0xa8, - 0xa8,0x7c,0x80,0x80,0xc0,0x20,0x40,0xe0, - 0x40,0x40,0xc0,0x40,0xf8,0x00,0x70,0x88, - 0x88,0x88,0x70,0x90,0x48,0x24,0x12,0x24, - 0x48,0x90,0x04,0x9e,0x54,0x2c,0x14,0xe8, - 0x44,0x40,0xc0,0x40,0x1c,0x08,0x84,0x54, - 0x28,0x10,0xe8,0x44,0x40,0xc0,0x40,0x04, - 0x9e,0x54,0x2c,0xd4,0x28,0x44,0x20,0xc0, - 0x70,0x88,0x80,0x40,0x20,0x20,0x00,0x00, - 0x20,0x20,0x88,0x88,0xf8,0x88,0x50,0x50, - 0x20,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x88,0x50,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x00,0x50,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0x00,0xb0,0x68,0x88,0x88, - 0xf8,0x88,0x50,0x50,0x20,0x20,0x00,0xd8, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9c,0x90,0xf0,0x90,0x5c, - 0x50,0x30,0x30,0x1c,0x60,0x10,0x20,0x70, - 0x88,0x80,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8, - 0x00,0x20,0x40,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x20,0x10,0xf8,0x80, - 0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x50, - 0x20,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0xd8,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x00,0x40,0x80,0xe0,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x20,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xe0,0x00,0xa0,0x40,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x70,0x00,0xd8,0x78,0x44, - 0x44,0x44,0xf4,0x44,0x44,0x44,0x78,0x88, - 0x98,0x98,0xa8,0xa8,0xc8,0xc8,0x88,0x00, - 0xb0,0x68,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0xd8, - 0x88,0x50,0x20,0x50,0x88,0xb8,0x44,0x64, - 0x64,0x54,0x4c,0x4c,0x44,0x3a,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x40,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x00, - 0xd8,0x20,0x20,0x20,0x20,0x50,0x50,0x88, - 0x88,0x00,0x20,0x10,0xe0,0x40,0x78,0x44, - 0x44,0x44,0x78,0x40,0xe0,0xb0,0x88,0x88, - 0x88,0x90,0xa0,0x90,0x90,0x60,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0x20,0x40, - 0x68,0x98,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x68,0x98,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x68,0x98,0x88,0x78, - 0x08,0x88,0x70,0x00,0xb0,0x68,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0xd8,0x68, - 0x98,0x88,0x78,0x08,0x88,0x70,0x00,0x20, - 0x50,0x20,0x6c,0x92,0x90,0x7e,0x12,0x92, - 0x6c,0x60,0x10,0x20,0x70,0x88,0x80,0x80, - 0x80,0x88,0x70,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0xd8,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x40,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x00,0x20,0x10,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0xa0,0x40, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0xd8,0x70,0x88,0x88,0x88,0x88,0x88,0x78, - 0x10,0xd0,0x20,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x40, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x50,0x20,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xd8,0x10, - 0x10,0x00,0xfe,0x00,0x10,0x10,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x68,0x98,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x68,0x98,0x88,0x88,0x88, - 0x88,0x88,0x00,0xd8,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0xe0,0x40,0x58,0x64,0x44,0x44,0x44, - 0x64,0x58,0x40,0xc0,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0xd8, -}; - -FontDataBLF blf_font_scr14 = { - 0, -3, - 7, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 9, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 9}, - {7, 9, 0, 0, 7, 13}, - {5, 10, -1, 1, 7, 22}, - {7, 9, 0, 0, 7, 32}, - {6, 9, 0, 0, 7, 41}, - {3, 4, -2, -5, 7, 50}, - {3, 11, -2, 1, 7, 54}, - {3, 11, -2, 1, 7, 65}, - {5, 6, -1, -2, 7, 76}, - {5, 5, -1, -2, 7, 82}, - {2, 4, -2, 2, 7, 87}, - {5, 1, -1, -4, 7, 91}, - {1, 2, -3, 0, 7, 92}, - {5, 10, -1, 0, 7, 94}, - {5, 9, -1, 0, 7, 104}, - {3, 9, -2, 0, 7, 113}, - {5, 9, -1, 0, 7, 122}, - {5, 9, -1, 0, 7, 131}, - {5, 9, -1, 0, 7, 140}, - {5, 9, -1, 0, 7, 149}, - {5, 9, -1, 0, 7, 158}, - {5, 9, -1, 0, 7, 167}, - {5, 9, -1, 0, 7, 176}, - {5, 9, -1, 0, 7, 185}, - {1, 6, -3, 0, 7, 194}, - {2, 8, -2, 1, 7, 200}, - {5, 9, -1, 0, 7, 208}, - {5, 3, -1, -3, 7, 217}, - {5, 9, -1, 0, 7, 220}, - {5, 9, -1, 0, 7, 229}, - {5, 9, -1, 0, 7, 238}, - {5, 9, -1, 0, 7, 247}, - {5, 9, -1, 0, 7, 256}, - {5, 9, -1, 0, 7, 265}, - {5, 9, -1, 0, 7, 274}, - {5, 9, -1, 0, 7, 283}, - {5, 9, -1, 0, 7, 292}, - {5, 9, -1, 0, 7, 301}, - {5, 9, -1, 0, 7, 310}, - {3, 9, -2, 0, 7, 319}, - {5, 9, -1, 0, 7, 328}, - {5, 9, -1, 0, 7, 337}, - {5, 9, -1, 0, 7, 346}, - {5, 9, -1, 0, 7, 355}, - {5, 9, -1, 0, 7, 364}, - {5, 9, -1, 0, 7, 373}, - {5, 9, -1, 0, 7, 382}, - {5, 11, -1, 2, 7, 391}, - {5, 9, -1, 0, 7, 402}, - {5, 9, -1, 0, 7, 411}, - {5, 9, -1, 0, 7, 420}, - {5, 9, -1, 0, 7, 429}, - {5, 9, -1, 0, 7, 438}, - {5, 9, -1, 0, 7, 447}, - {5, 9, -1, 0, 7, 456}, - {5, 9, -1, 0, 7, 465}, - {5, 9, -1, 0, 7, 474}, - {4, 11, -2, 1, 7, 483}, - {5, 10, -1, 0, 7, 494}, - {4, 11, -1, 1, 7, 504}, - {5, 3, -1, -6, 7, 515}, - {7, 1, 0, 2, 7, 518}, - {3, 4, -2, -5, 7, 519}, - {5, 7, -1, 0, 7, 523}, - {5, 9, -1, 0, 7, 530}, - {5, 7, -1, 0, 7, 539}, - {5, 9, -1, 0, 7, 546}, - {5, 7, -1, 0, 7, 555}, - {5, 9, -1, 0, 7, 562}, - {5, 10, -1, 3, 7, 571}, - {5, 9, -1, 0, 7, 581}, - {3, 9, -2, 0, 7, 590}, - {4, 12, -1, 3, 7, 599}, - {5, 9, -1, 0, 7, 611}, - {3, 9, -2, 0, 7, 620}, - {5, 7, -1, 0, 7, 629}, - {5, 7, -1, 0, 7, 636}, - {5, 7, -1, 0, 7, 643}, - {5, 10, -1, 3, 7, 650}, - {5, 10, -1, 3, 7, 660}, - {5, 7, -1, 0, 7, 670}, - {5, 7, -1, 0, 7, 677}, - {4, 9, -1, 0, 7, 684}, - {5, 7, -1, 0, 7, 693}, - {5, 7, -1, 0, 7, 700}, - {5, 7, -1, 0, 7, 707}, - {5, 7, -1, 0, 7, 714}, - {5, 10, -1, 3, 7, 721}, - {5, 7, -1, 0, 7, 731}, - {5, 12, -1, 2, 7, 738}, - {1, 12, -3, 2, 7, 750}, - {5, 12, -1, 2, 7, 762}, - {6, 3, 0, -3, 7, 774}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 9, -3, 2, 7, 777}, - {5, 10, -1, 0, 7, 786}, - {5, 9, -1, 0, 7, 796}, - {5, 6, -1, -3, 7, 805}, - {5, 9, -1, 0, 7, 811}, - {1, 12, -3, 2, 7, 820}, - {5, 11, -1, 2, 7, 832}, - {5, 1, -1, -8, 7, 843}, - {7, 9, 0, 0, 7, 844}, - {5, 7, -1, -2, 7, 853}, - {7, 7, 0, 0, 7, 860}, - {5, 3, -1, -3, 7, 867}, - {4, 1, -1, -4, 7, 870}, - {7, 9, 0, 0, 7, 871}, - {3, 1, -2, -8, 7, 880}, - {4, 4, -1, -4, 7, 881}, - {5, 7, -1, 0, 7, 885}, - {3, 5, -2, -5, 7, 892}, - {3, 5, -2, -5, 7, 897}, - {2, 2, -3, -8, 7, 902}, - {6, 8, -1, 2, 7, 904}, - {6, 10, 0, 1, 7, 912}, - {1, 2, -3, -3, 7, 922}, - {3, 3, -2, 3, 7, 924}, - {3, 5, -2, -5, 7, 927}, - {5, 7, -1, -2, 7, 932}, - {7, 7, 0, 0, 7, 939}, - {7, 10, 0, 0, 7, 946}, - {6, 11, 0, 1, 7, 956}, - {7, 9, 0, -1, 7, 967}, - {5, 10, -1, 3, 7, 976}, - {5, 11, -1, 0, 7, 986}, - {5, 11, -1, 0, 7, 997}, - {5, 11, -1, 0, 7, 1008}, - {5, 11, -1, 0, 7, 1019}, - {5, 10, -1, 0, 7, 1030}, - {5, 11, -1, 0, 7, 1040}, - {6, 9, 0, 0, 7, 1051}, - {5, 12, -1, 3, 7, 1060}, - {5, 11, -1, 0, 7, 1072}, - {5, 11, -1, 0, 7, 1083}, - {5, 11, -1, 0, 7, 1094}, - {5, 10, -1, 0, 7, 1105}, - {3, 11, -2, 0, 7, 1115}, - {3, 11, -2, 0, 7, 1126}, - {3, 11, -2, 0, 7, 1137}, - {5, 10, -1, 0, 7, 1148}, - {6, 9, 0, 0, 7, 1158}, - {5, 11, -1, 0, 7, 1167}, - {5, 11, -1, 0, 7, 1178}, - {5, 11, -1, 0, 7, 1189}, - {5, 11, -1, 0, 7, 1200}, - {5, 11, -1, 0, 7, 1211}, - {5, 10, -1, 0, 7, 1222}, - {5, 5, -1, -1, 7, 1232}, - {7, 9, 0, 0, 7, 1237}, - {5, 11, -1, 0, 7, 1246}, - {5, 11, -1, 0, 7, 1257}, - {5, 11, -1, 0, 7, 1268}, - {5, 10, -1, 0, 7, 1279}, - {5, 11, -1, 0, 7, 1289}, - {6, 9, 0, 0, 7, 1300}, - {5, 9, -1, 0, 7, 1309}, - {5, 10, -1, 0, 7, 1318}, - {5, 10, -1, 0, 7, 1328}, - {5, 10, -1, 0, 7, 1338}, - {5, 10, -1, 0, 7, 1348}, - {5, 9, -1, 0, 7, 1358}, - {5, 11, -1, 0, 7, 1367}, - {7, 7, 0, 0, 7, 1378}, - {5, 10, -1, 3, 7, 1385}, - {5, 10, -1, 0, 7, 1395}, - {5, 10, -1, 0, 7, 1405}, - {5, 10, -1, 0, 7, 1415}, - {5, 9, -1, 0, 7, 1425}, - {3, 10, -2, 0, 7, 1434}, - {4, 10, -2, 0, 7, 1444}, - {3, 10, -2, 0, 7, 1454}, - {5, 9, -2, 0, 7, 1464}, - {5, 11, -1, 0, 7, 1473}, - {5, 10, -1, 0, 7, 1484}, - {5, 10, -1, 0, 7, 1494}, - {5, 10, -1, 0, 7, 1504}, - {5, 10, -1, 0, 7, 1514}, - {5, 10, -1, 0, 7, 1524}, - {5, 9, -1, 0, 7, 1534}, - {7, 7, 0, 0, 7, 1543}, - {7, 7, 0, 0, 7, 1550}, - {5, 10, -1, 0, 7, 1557}, - {5, 10, -1, 0, 7, 1567}, - {5, 10, -1, 0, 7, 1577}, - {5, 9, -1, 0, 7, 1587}, - {5, 13, -1, 3, 7, 1596}, - {6, 11, 0, 2, 7, 1609}, - {5, 12, -1, 3, 7, 1620}, - }, - scr14_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_SCR14_H */ diff --git a/source/blender/blenfont/intern/blf_font_scr15.h b/source/blender/blenfont/intern/blf_font_scr15.h deleted file mode 100644 index f7719cdd051..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr15.h +++ /dev/null @@ -1,519 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR15_H -#define BLF_FONT_SCR15_H - -static unsigned char scr15_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x90,0x90,0x90,0x90,0x48,0x48, - 0x48,0xfe,0x24,0x24,0x24,0x7f,0x12,0x12, - 0x20,0x70,0xa8,0xa8,0x28,0x30,0x60,0xa0, - 0xa8,0xa8,0x70,0x20,0x8c,0x52,0x52,0x2c, - 0x10,0x10,0x68,0x94,0x94,0x62,0x72,0x8c, - 0x84,0x8a,0x50,0x20,0x30,0x48,0x48,0x30, - 0x80,0x40,0x60,0x60,0x10,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x10,0x80,0x40,0x20,0x20,0x10,0x10,0x10, - 0x10,0x10,0x20,0x20,0x40,0x80,0x20,0xa8, - 0x70,0x70,0xa8,0x20,0x10,0x10,0x10,0xfe, - 0x10,0x10,0x10,0x80,0x40,0x20,0x60,0x60, - 0xfc,0xc0,0xc0,0x80,0x80,0x40,0x40,0x20, - 0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x78, - 0x84,0x84,0xc4,0xa4,0x94,0x8c,0x84,0x84, - 0x78,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xfc,0x80,0x40,0x20,0x10, - 0x08,0x04,0x84,0x84,0x78,0x78,0x84,0x04, - 0x04,0x04,0x38,0x04,0x04,0x84,0x78,0x08, - 0x08,0x08,0xfc,0x88,0x48,0x48,0x28,0x18, - 0x08,0x78,0x84,0x04,0x04,0x04,0xf8,0x80, - 0x80,0x80,0xfc,0x78,0x84,0x84,0x84,0x84, - 0xf8,0x80,0x80,0x84,0x78,0x20,0x20,0x20, - 0x10,0x10,0x08,0x08,0x04,0x04,0xfc,0x78, - 0x84,0x84,0x84,0x84,0x78,0x84,0x84,0x84, - 0x78,0x78,0x84,0x04,0x04,0x7c,0x84,0x84, - 0x84,0x84,0x78,0xc0,0xc0,0x00,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0x00,0xc0,0xc0,0x04,0x08,0x10,0x20,0x40, - 0x80,0x40,0x20,0x10,0x08,0x04,0xfc,0x00, - 0x00,0xfc,0x80,0x40,0x20,0x10,0x08,0x04, - 0x08,0x10,0x20,0x40,0x80,0x10,0x10,0x00, - 0x10,0x10,0x08,0x04,0x84,0x84,0x78,0x38, - 0x44,0x80,0x98,0xa4,0xa4,0x9c,0x84,0x48, - 0x30,0x84,0x84,0xfc,0x84,0x48,0x48,0x48, - 0x30,0x30,0x30,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x84,0x84,0x84,0xf8,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xf0, - 0x88,0x84,0x84,0x84,0x84,0x84,0x84,0x88, - 0xf0,0xfc,0x80,0x80,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xfc,0x80,0x80,0x80,0x80,0x80, - 0xf8,0x80,0x80,0x80,0xfc,0x74,0x8c,0x84, - 0x84,0x84,0x9c,0x80,0x80,0x84,0x78,0x84, - 0x84,0x84,0x84,0x84,0xfc,0x84,0x84,0x84, - 0x84,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x08,0x08,0x84,0x84,0x88, - 0x90,0xa0,0xc0,0xa0,0x90,0x88,0x84,0xfc, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x82,0x82,0x92,0x92,0xaa,0xaa,0xc6, - 0xc6,0x82,0x82,0x84,0x8c,0x8c,0x94,0x94, - 0xa4,0xa4,0xc4,0xc4,0x84,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x04,0x08,0x10,0x78,0xa4,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x84,0x84, - 0x88,0x90,0xf8,0x84,0x84,0x84,0x84,0xf8, - 0x78,0x84,0x84,0x04,0x18,0x60,0x80,0x84, - 0x84,0x78,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0xfe,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x30,0x30, - 0x30,0x48,0x48,0x48,0x84,0x84,0x84,0x84, - 0x44,0x44,0x44,0xaa,0xaa,0xaa,0x92,0x92, - 0x92,0x82,0x84,0x84,0x48,0x48,0x30,0x30, - 0x48,0x48,0x84,0x84,0x10,0x10,0x10,0x10, - 0x10,0x28,0x44,0x44,0x82,0x82,0xfc,0x80, - 0x40,0x40,0x20,0x10,0x08,0x08,0x04,0xfc, - 0xf0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xf0,0x04,0x04,0x08, - 0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80, - 0x80,0xf0,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0x10,0x10,0xf0,0x88,0x50, - 0x20,0xff,0x20,0x40,0xc0,0xc0,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0xb8,0xc4,0x84, - 0x84,0x84,0xc4,0xb8,0x80,0x80,0x80,0x78, - 0x84,0x80,0x80,0x80,0x84,0x78,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x04,0x04,0x04, - 0x78,0x84,0x80,0xfc,0x84,0x84,0x78,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x20,0x20, - 0x1c,0x78,0x84,0x04,0x04,0x74,0x8c,0x84, - 0x84,0x84,0x8c,0x74,0x84,0x84,0x84,0x84, - 0x84,0xc4,0xb8,0x80,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x20, - 0x70,0x88,0x08,0x08,0x08,0x08,0x08,0x08, - 0x08,0x08,0x38,0x00,0x08,0x08,0x84,0x88, - 0x90,0xe0,0xa0,0x90,0x88,0x80,0x80,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0xe0,0x92,0x92,0x92,0x92,0x92,0x92, - 0xec,0x84,0x84,0x84,0x84,0x84,0xc4,0xb8, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xb8,0xc4,0x84,0x84,0x84, - 0xc4,0xb8,0x04,0x04,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x80,0x80,0x80, - 0x80,0x80,0xc4,0xb8,0x78,0x84,0x04,0x78, - 0x80,0x84,0x78,0x1c,0x20,0x20,0x20,0x20, - 0x20,0xf8,0x20,0x20,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x30,0x30,0x48,0x48,0x84, - 0x84,0x84,0x6c,0x92,0x92,0x92,0x92,0x82, - 0x82,0x84,0x84,0x48,0x30,0x48,0x84,0x84, - 0x78,0x84,0x04,0x04,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0xfc,0x80,0x40,0x20,0x10, - 0x08,0xfc,0x1c,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x20,0x1c,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x10,0x10, - 0x10,0x10,0x10,0x0c,0x10,0x10,0x10,0x10, - 0x10,0xe0,0x98,0xb4,0x64,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x80,0x20, - 0x20,0x70,0x88,0x80,0x80,0x88,0x70,0x20, - 0x20,0xb8,0x44,0x40,0x40,0xf0,0x40,0x40, - 0x40,0x48,0x30,0x84,0x78,0x84,0x84,0x84, - 0x78,0x84,0x38,0x10,0x7c,0x10,0x7c,0x28, - 0x44,0x44,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x78,0x84,0x04,0x18,0x24,0x44, - 0x84,0x88,0x90,0x60,0x80,0x84,0x78,0xd8, - 0x38,0x44,0x92,0xaa,0xa2,0xaa,0x92,0x44, - 0x38,0xf8,0x00,0x68,0x90,0x70,0x10,0x60, - 0x09,0x12,0x24,0x48,0x90,0x48,0x24,0x12, - 0x09,0x04,0x04,0xfc,0xfc,0x38,0x44,0xaa, - 0xaa,0xb2,0xaa,0xb2,0x44,0x38,0xf0,0x60, - 0x90,0x90,0x60,0xfe,0x00,0x10,0x10,0x10, - 0xfe,0x10,0x10,0x10,0xf0,0x40,0x20,0x90, - 0x60,0xe0,0x10,0x60,0x10,0xe0,0x80,0x40, - 0x80,0x80,0x80,0xb4,0xc8,0x88,0x88,0x88, - 0x88,0x88,0x24,0x24,0x24,0x24,0x24,0x24, - 0x64,0xa4,0xa4,0xa4,0xa4,0x7e,0xc0,0xc0, - 0x20,0x40,0xe0,0x40,0x40,0xc0,0x40,0xf8, - 0x00,0x70,0x88,0x88,0x88,0x70,0x90,0x48, - 0x24,0x12,0x09,0x12,0x24,0x48,0x90,0x04, - 0x9e,0x54,0x2c,0x14,0xe8,0x44,0x42,0xc0, - 0x40,0x1e,0x08,0x84,0x52,0x2c,0x10,0xe8, - 0x44,0x42,0xc0,0x40,0x04,0x9e,0x54,0x2c, - 0xd4,0x28,0x44,0x22,0xc0,0x78,0x84,0x84, - 0x80,0x40,0x20,0x20,0x00,0x20,0x20,0x84, - 0x84,0xfc,0x84,0x48,0x48,0x30,0x30,0x00, - 0x20,0x40,0x84,0x84,0xfc,0x84,0x48,0x48, - 0x30,0x30,0x00,0x10,0x08,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x00,0x48,0x30, - 0x84,0x84,0xfc,0x84,0x48,0x48,0x30,0x30, - 0x00,0x98,0x64,0x84,0x84,0xfc,0x84,0x48, - 0x48,0x30,0x30,0x00,0x6c,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x30,0x48,0x30, - 0x9e,0x90,0x90,0xf0,0x90,0x5c,0x50,0x50, - 0x30,0x1e,0x30,0x08,0x10,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xfc, - 0x80,0x80,0x80,0xf8,0x80,0x80,0xfc,0x00, - 0x20,0x40,0xfc,0x80,0x80,0x80,0xf8,0x80, - 0x80,0xfc,0x00,0x10,0x08,0xfc,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xfc,0x00,0x48,0x30, - 0xfc,0x80,0x80,0x80,0xf8,0x80,0x80,0xfc, - 0x00,0x6c,0xe0,0x40,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0x40,0x80,0xe0,0x40,0x40, - 0x40,0x40,0x40,0x40,0xe0,0x00,0x40,0x20, - 0xe0,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x90,0x60,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x70,0x00,0xd8,0x78,0x44,0x42, - 0x42,0x42,0xf2,0x42,0x42,0x44,0x78,0x84, - 0x8c,0x94,0x94,0xa4,0xa4,0xc4,0x84,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x20,0x40,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x10,0x08, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x78, - 0x00,0x48,0x30,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x98,0x64,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x6c, - 0x84,0x48,0x30,0x30,0x48,0x84,0xbc,0x42, - 0x62,0x52,0x52,0x4a,0x4a,0x46,0x42,0x3d, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x84, - 0x00,0x20,0x40,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x30,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x6c,0x10,0x10,0x10,0x10,0x28, - 0x44,0x44,0x82,0x00,0x10,0x08,0xe0,0x40, - 0x7c,0x42,0x42,0x42,0x42,0x7c,0x40,0xe0, - 0x98,0xa4,0x84,0x84,0x84,0x88,0xb0,0x88, - 0x88,0x70,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x20,0x40,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x20,0x10,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x48,0x30, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x98,0x64,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0xd8,0x74,0x88,0x88,0x78,0x08, - 0x88,0x70,0x00,0x30,0x48,0x30,0x6c,0x92, - 0x90,0x7e,0x12,0x92,0x6c,0x30,0x08,0x10, - 0x78,0x84,0x80,0x80,0x80,0x84,0x78,0x78, - 0x84,0x80,0xfc,0x84,0x84,0x78,0x00,0x20, - 0x40,0x78,0x84,0x80,0xfc,0x84,0x84,0x78, - 0x00,0x10,0x08,0x78,0x84,0x80,0xfc,0x84, - 0x84,0x78,0x00,0x48,0x30,0x78,0x84,0x80, - 0xfc,0x84,0x84,0x78,0x00,0x6c,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x40,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x90,0x60,0x10,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0xd8,0x78,0x84,0x84, - 0x84,0x84,0x84,0x7c,0x04,0xc8,0x30,0xc8, - 0x84,0x84,0x84,0x84,0x84,0xc4,0xb8,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x20,0x40,0x78,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x48,0x30, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x00,0x6c,0x30,0x00,0x00,0xfc, - 0x00,0x00,0x30,0xbc,0x62,0x52,0x4a,0x46, - 0x42,0x3d,0x74,0x8c,0x84,0x84,0x84,0x84, - 0x84,0x00,0x20,0x40,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x00,0x20,0x10,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x48,0x30, - 0x74,0x8c,0x84,0x84,0x84,0x84,0x84,0x00, - 0x00,0x6c,0x78,0x84,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x20,0x10, - 0xe0,0x40,0x40,0x5c,0x62,0x42,0x42,0x42, - 0x62,0x5c,0x40,0x40,0xc0,0x78,0x84,0x04, - 0x04,0x74,0x8c,0x84,0x84,0x84,0x84,0x84, - 0x00,0x00,0x6c, -}; - -FontDataBLF blf_font_scr15 = { - 0, -4, - 8, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 20, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 0, 8, 0}, - {4, 4, -2, -6, 8, 10}, - {8, 10, 0, 0, 8, 14}, - {5, 12, -1, 1, 8, 24}, - {7, 10, 0, 0, 8, 36}, - {7, 10, 0, 0, 8, 46}, - {3, 4, -2, -6, 8, 56}, - {4, 13, -2, 2, 8, 60}, - {4, 13, -2, 2, 8, 73}, - {5, 6, -1, -2, 8, 86}, - {7, 7, 0, -1, 8, 92}, - {3, 5, -2, 3, 8, 99}, - {6, 1, -1, -4, 8, 104}, - {2, 2, -3, 0, 8, 105}, - {6, 12, -1, 1, 8, 107}, - {6, 10, -1, 0, 8, 119}, - {3, 10, -3, 0, 8, 129}, - {6, 10, -1, 0, 8, 139}, - {6, 10, -1, 0, 8, 149}, - {6, 10, -1, 0, 8, 159}, - {6, 10, -1, 0, 8, 169}, - {6, 10, -1, 0, 8, 179}, - {6, 10, -1, 0, 8, 189}, - {6, 10, -1, 0, 8, 199}, - {6, 10, -1, 0, 8, 209}, - {2, 7, -3, 0, 8, 219}, - {2, 9, -3, 2, 8, 226}, - {6, 11, -1, 1, 8, 235}, - {6, 4, -1, -3, 8, 246}, - {6, 11, -1, 1, 8, 250}, - {6, 10, -1, 0, 8, 261}, - {6, 10, -1, 0, 8, 271}, - {6, 10, -1, 0, 8, 281}, - {6, 10, -1, 0, 8, 291}, - {6, 10, -1, 0, 8, 301}, - {6, 10, -1, 0, 8, 311}, - {6, 10, -1, 0, 8, 321}, - {6, 10, -1, 0, 8, 331}, - {6, 10, -1, 0, 8, 341}, - {6, 10, -1, 0, 8, 351}, - {3, 10, -2, 0, 8, 361}, - {5, 10, -1, 0, 8, 371}, - {6, 10, -1, 0, 8, 381}, - {6, 10, -1, 0, 8, 391}, - {7, 10, 0, 0, 8, 401}, - {6, 10, -1, 0, 8, 411}, - {6, 10, -1, 0, 8, 421}, - {6, 10, -1, 0, 8, 431}, - {6, 13, -1, 3, 8, 441}, - {6, 10, -1, 0, 8, 454}, - {6, 10, -1, 0, 8, 464}, - {7, 10, 0, 0, 8, 474}, - {6, 10, -1, 0, 8, 484}, - {6, 10, -1, 0, 8, 494}, - {7, 10, 0, 0, 8, 504}, - {6, 10, -1, 0, 8, 514}, - {7, 10, 0, 0, 8, 524}, - {6, 10, -1, 0, 8, 534}, - {4, 13, -2, 2, 8, 544}, - {6, 12, -1, 1, 8, 557}, - {4, 13, -2, 2, 8, 569}, - {5, 3, -1, -6, 8, 582}, - {8, 1, 0, 3, 8, 585}, - {3, 4, -2, -6, 8, 586}, - {6, 7, -1, 0, 8, 590}, - {6, 10, -1, 0, 8, 597}, - {6, 7, -1, 0, 8, 607}, - {6, 10, -1, 0, 8, 614}, - {6, 7, -1, 0, 8, 624}, - {6, 10, -1, 0, 8, 631}, - {6, 11, -1, 4, 8, 641}, - {6, 10, -1, 0, 8, 652}, - {3, 10, -2, 0, 8, 662}, - {5, 14, -1, 4, 8, 672}, - {6, 10, -1, 0, 8, 686}, - {3, 10, -2, 0, 8, 696}, - {7, 7, 0, 0, 8, 706}, - {6, 7, -1, 0, 8, 713}, - {6, 7, -1, 0, 8, 720}, - {6, 11, -1, 4, 8, 727}, - {6, 11, -1, 4, 8, 738}, - {6, 7, -1, 0, 8, 749}, - {6, 7, -1, 0, 8, 756}, - {6, 9, -1, 0, 8, 763}, - {6, 7, -1, 0, 8, 772}, - {6, 7, -1, 0, 8, 779}, - {7, 7, 0, 0, 8, 786}, - {6, 7, -1, 0, 8, 793}, - {6, 11, -1, 4, 8, 800}, - {6, 7, -1, 0, 8, 811}, - {6, 13, -1, 2, 8, 818}, - {1, 14, -3, 3, 8, 831}, - {6, 13, -1, 2, 8, 845}, - {6, 3, -1, -3, 8, 858}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 3, 8, 861}, - {5, 10, -1, 0, 8, 871}, - {6, 10, -1, 0, 8, 881}, - {6, 7, -1, -2, 8, 891}, - {7, 10, 0, 0, 8, 898}, - {1, 14, -3, 3, 8, 908}, - {6, 13, -1, 3, 8, 922}, - {5, 1, -1, -9, 8, 935}, - {7, 9, 0, 0, 8, 936}, - {5, 7, -1, -3, 8, 945}, - {8, 9, 0, 0, 8, 952}, - {6, 3, -1, -3, 8, 961}, - {6, 1, -1, -4, 8, 964}, - {7, 9, 0, 0, 8, 965}, - {4, 1, -2, -9, 8, 974}, - {4, 4, -2, -4, 8, 975}, - {7, 9, 0, 0, 8, 979}, - {4, 5, -2, -5, 8, 988}, - {4, 5, -2, -5, 8, 993}, - {2, 2, -3, -9, 8, 998}, - {6, 10, -1, 3, 8, 1000}, - {7, 12, 0, 2, 8, 1010}, - {2, 1, -3, -4, 8, 1022}, - {3, 3, -3, 3, 8, 1023}, - {3, 5, -3, -5, 8, 1026}, - {5, 7, -1, -3, 8, 1031}, - {8, 9, 0, 0, 8, 1038}, - {7, 10, 0, 0, 8, 1047}, - {7, 11, 0, 1, 8, 1057}, - {7, 9, 0, -1, 8, 1068}, - {6, 10, -1, 2, 8, 1077}, - {6, 11, -1, 0, 8, 1087}, - {6, 11, -1, 0, 8, 1098}, - {6, 11, -1, 0, 8, 1109}, - {6, 11, -1, 0, 8, 1120}, - {6, 10, -1, 0, 8, 1131}, - {6, 11, -1, 0, 8, 1141}, - {7, 10, 0, 0, 8, 1152}, - {6, 13, -1, 3, 8, 1162}, - {6, 11, -1, 0, 8, 1175}, - {6, 11, -1, 0, 8, 1186}, - {6, 11, -1, 0, 8, 1197}, - {6, 10, -1, 0, 8, 1208}, - {3, 11, -2, 0, 8, 1218}, - {3, 11, -2, 0, 8, 1229}, - {4, 11, -2, 0, 8, 1240}, - {5, 10, -1, 0, 8, 1251}, - {7, 10, 0, 0, 8, 1261}, - {6, 11, -1, 0, 8, 1271}, - {6, 11, -1, 0, 8, 1282}, - {6, 11, -1, 0, 8, 1293}, - {6, 11, -1, 0, 8, 1304}, - {6, 11, -1, 0, 8, 1315}, - {6, 10, -1, 0, 8, 1326}, - {6, 6, -1, -1, 8, 1336}, - {8, 10, 0, 0, 8, 1342}, - {6, 11, -1, 0, 8, 1352}, - {6, 11, -1, 0, 8, 1363}, - {6, 11, -1, 0, 8, 1374}, - {6, 10, -1, 0, 8, 1385}, - {7, 11, 0, 0, 8, 1395}, - {7, 10, 0, 0, 8, 1406}, - {6, 10, -1, 0, 8, 1416}, - {6, 10, -1, 0, 8, 1426}, - {6, 10, -1, 0, 8, 1436}, - {6, 10, -1, 0, 8, 1446}, - {6, 10, -1, 0, 8, 1456}, - {6, 9, -1, 0, 8, 1466}, - {6, 11, -1, 0, 8, 1475}, - {7, 7, 0, 0, 8, 1486}, - {6, 10, -1, 3, 8, 1493}, - {6, 10, -1, 0, 8, 1503}, - {6, 10, -1, 0, 8, 1513}, - {6, 10, -1, 0, 8, 1523}, - {6, 9, -1, 0, 8, 1533}, - {3, 10, -2, 0, 8, 1542}, - {3, 10, -2, 0, 8, 1552}, - {4, 10, -2, 0, 8, 1562}, - {5, 9, -1, 0, 8, 1572}, - {6, 11, -1, 0, 8, 1581}, - {6, 10, -1, 0, 8, 1592}, - {6, 10, -1, 0, 8, 1602}, - {6, 10, -1, 0, 8, 1612}, - {6, 10, -1, 0, 8, 1622}, - {6, 10, -1, 0, 8, 1632}, - {6, 10, -1, 0, 8, 1642}, - {6, 7, -1, 0, 8, 1652}, - {8, 7, 0, 0, 8, 1659}, - {6, 10, -1, 0, 8, 1666}, - {6, 10, -1, 0, 8, 1676}, - {6, 10, -1, 0, 8, 1686}, - {6, 10, -1, 0, 8, 1696}, - {6, 14, -1, 4, 8, 1706}, - {7, 13, 0, 3, 8, 1720}, - {6, 14, -1, 4, 8, 1733}, - }, - scr15_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_SCR15_H */ diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 510204b0f51..551db2cdaa9 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -31,16 +31,12 @@ #include #include -#ifdef WITH_FREETYPE2 - #include #include FT_FREETYPE_H #include FT_GLYPH_H #include FT_OUTLINE_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -59,8 +55,6 @@ #include "blf_internal.h" -#ifdef WITH_FREETYPE2 - GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi) { GlyphCacheBLF *p; @@ -433,6 +427,67 @@ void blf_glyph_free(GlyphBLF *g) MEM_freeN(g); } +static void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2) +{ + + glBegin(GL_QUADS); + glTexCoord2f(uv[0][0], uv[0][1]); + glVertex2f(dx, y1); + + glTexCoord2f(uv[0][0], uv[1][1]); + glVertex2f(dx, y2); + + glTexCoord2f(uv[1][0], uv[1][1]); + glVertex2f(dx1, y2); + + glTexCoord2f(uv[1][0], uv[0][1]); + glVertex2f(dx1, y1); + glEnd(); + +} + +static void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2) +{ + float soft[25]= { + 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f, + 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, + 2/60.0f, 5/60.0f, 8/60.0f, 5/60.0f, 2/60.0f, + 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, + 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f}; + + float color[4], *fp= soft; + int dx, dy; + + glGetFloatv(GL_CURRENT_COLOR, color); + + for(dx=-2; dx<3; dx++) { + for(dy=-2; dy<3; dy++, fp++) { + glColor4f(color[0], color[1], color[2], fp[0]*color[3]); + blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); + } + } + + glColor4fv(color); +} + +static void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2) +{ + float soft[9]= {1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f}; + float color[4], *fp= soft; + int dx, dy; + + glGetFloatv(GL_CURRENT_COLOR, color); + + for(dx=-1; dx<2; dx++) { + for(dy=-1; dy<2; dy++, fp++) { + glColor4f(color[0], color[1], color[2], fp[0]*color[3]); + blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); + } + } + + glColor4fv(color); +} + int blf_glyph_texture_render(FontBLF *font, GlyphBLF *g, float x, float y) { GlyphTextureBLF *gt; @@ -504,5 +559,3 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) return(blf_glyph_bitmap_render(font, g, x, y)); return(blf_glyph_texture_render(font, g, x, y)); } - -#endif /* WITH_FREETYPE2 */ diff --git a/source/blender/blenfont/intern/blf_internal.c b/source/blender/blenfont/intern/blf_internal.c deleted file mode 100644 index 414ec5abead..00000000000 --- a/source/blender/blenfont/intern/blf_internal.c +++ /dev/null @@ -1,435 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include -#include -#include - -#ifdef WITH_FREETYPE2 - -#include - -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#endif /* WITH_FREETYPE2 */ - -#include "MEM_guardedalloc.h" - -#include "DNA_listBase.h" -#include "DNA_vec_types.h" - -#include "BKE_utildefines.h" - -#include "BLI_blenlib.h" -#include "BLI_linklist.h" /* linknode */ -#include "BLI_string.h" -#include "BLI_arithb.h" - -#include "BIF_gl.h" -#include "BLF_api.h" - -#include "blf_internal_types.h" -#include "blf_internal.h" -#include "blf_font_helv10.h" - -#ifndef BLF_INTERNAL_MINIMAL -#include "blf_font_helv12.h" -#include "blf_font_helvb8.h" -#include "blf_font_helvb10.h" -#include "blf_font_helvb12.h" -#include "blf_font_scr12.h" -#include "blf_font_scr14.h" -#include "blf_font_scr15.h" -#endif - -int blf_internal_get_texture(FontBLF *font) -{ - FontDataBLF *data; - CharDataBLF *cd; - int width; - int height; - int c_rows, c_cols, c_width, c_height; - int i_width, i_height; - GLubyte *img, *img_row, *chr_row, *img_pxl; - int base_line, i, cell_x, cell_y, y, x; - int byte_idx, bit_idx; - - data= (FontDataBLF *)font->engine; - if (data->texid != 0) - return(0); - - width= data->xmax - data->xmin; - height= data->ymax - data->ymin; - c_rows= 16; - c_cols= 16; - c_width= 16; - c_height= 16; - i_width= c_cols * c_width; - i_height= c_rows * c_height; - base_line= -(data->ymin); - img= (GLubyte *)malloc(i_height * i_width); - memset((void *)img, 0, i_height * i_width); - - if (width >= 16 || height >= 16) { - printf("Warning: Bad font size for: %s\n", font->name); - return(-1); - } - - for (i= 0; i < 256; i++) { - cd= &data->chars[i]; - - if (cd->data_offset != -1) { - cell_x= i%16; - cell_y= i/16; - - for (y= 0; y < cd->height; y++) { - img_row = &img[(cell_y*c_height + y + base_line - cd->yorig)*i_width]; - chr_row = &data->bitmap_data[cd->data_offset + ((cd->width+7)/8)*y]; - - for (x= 0; x < cd->width; x++) { - img_pxl= &img_row[(cell_x*c_width + x - cd->xorig)]; - byte_idx= x/8; - bit_idx= 7 - (x%8); - - if (chr_row[byte_idx]&(1<texid); - glBindTexture(GL_TEXTURE_2D, data->texid); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, i_width, i_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - if (glGetError()) { - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE4_ALPHA4, i_width, i_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - } - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - free((void *)img); - return(0); -} - -void blf_internal_size(FontBLF *font, int size, int dpi) -{ - /* dpi don't work here and size is limit to: - * helv: 10, 12 - * helvb: 8, 10, 12 - * scr: 12, 14, 15 - */ - font->dpi= dpi; - - if (font->size != size) { - if (!strcmp(font->name, "helv")) { - if (size == 12) { - font->engine= (void *)&blf_font_helv12; - font->size= 12; - } - else { - font->engine= (void *)&blf_font_helv10; - font->size= 10; - } - } - else if (!strcmp(font->name, "helvb")) { - if (size == 10) { - font->engine= (void *)&blf_font_helvb10; - font->size= 10; - } - else if (size == 12) { - font->engine= (void *)&blf_font_helvb12; - font->size= 12; - } - else { - font->engine= (void *)&blf_font_helvb8; - font->size= 8; - } - } - else { /* scr */ - if (size == 14) { - font->engine= (void *)&blf_font_scr14; - font->size= 14; - } - else if (size == 15) { - font->engine= (void *)&blf_font_scr15; - font->size= 15; - } - else { - font->engine= (void *)&blf_font_scr12; - font->size= 12; - } - } - - if (font->mode == BLF_MODE_TEXTURE) { - if (blf_internal_get_texture(font) != 0) - printf("Can't create texture font!!\n"); - } - } -} - -void blf_internal_texture_draw(FontBLF *font, char *str) -{ - FontDataBLF *data; - CharDataBLF *cd; - unsigned char c; - float pos, x, y; - float uv[2][2]; - int base_line; - GLint cur_tex; - float dx, dx1, dy, dy1; - - data= (FontDataBLF *)font->engine; - base_line= -(data->ymin); - pos= 0; - x= 0.0f; - y= 0.0f; - - glGetIntegerv(GL_TEXTURE_2D_BINDING_EXT, &cur_tex); - if (cur_tex != data->texid) - glBindTexture(GL_TEXTURE_2D, data->texid); - - while ((c= (unsigned char) *str++)) { - cd= &data->chars[c]; - - if (cd->data_offset != -1) { - uv[0][0]= ((c%16)/16.0) + 1.0/16.0; - uv[0][1]= (c/16)/16.0; - uv[1][0]= (c%16)/16.0; - uv[1][1]= ((c/16)/16.0) + 1.0/16.0; - - dx= x + pos + 16.0; - dx1= x + pos + 0.0; - dy= -base_line + y + 0.0; - dy1= -base_line + y + 16.0; - - if (font->flags & BLF_CLIPPING) { - /* Don't return, just skip this character and check the others. */ - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], dy + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], dy1 + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx1 + font->pos[0], dy1 + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx1 + font->pos[0], dy + font->pos[1])) - goto next_tex_char; - } - - if (font->blur == 3) - blf_texture3_draw(uv, dx, dy, dx1, dy1); - else if (font->blur == 5) - blf_texture5_draw(uv, dx, dy, dx1, dy1); - else - blf_texture_draw(uv, dx, dy, dx1, dy1); - } -next_tex_char: - pos += cd->advance; - } -} - -void blf_internal_bitmap_draw(FontBLF *font, char *str) -{ - FontDataBLF *data; - CharDataBLF *cd; - unsigned char c; - GLint alignment; - float dx; - - data= (FontDataBLF *)font->engine; - - glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - dx= 0; - - while ((c= (unsigned char) *str++)) { - cd= &data->chars[c]; - - if (font->flags & BLF_CLIPPING) { - /* The same here, always check all the characters. */ - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], cd->height + font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + cd->width + font->pos[0], cd->height + font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + cd->width + font->pos[0], font->pos[1])) - goto next_bitmap_char; - } - - if (cd->data_offset==-1) { - GLubyte nullBitmap= 0; - glBitmap(1, 1, 0, 0, cd->advance, 0, &nullBitmap); - } else { - GLubyte *bitmap= &data->bitmap_data[cd->data_offset]; - glBitmap(cd->width, cd->height, cd->xorig, cd->yorig, cd->advance, 0, bitmap); - } -next_bitmap_char: - dx += cd->advance; - } - - glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); -} - -void blf_internal_draw(FontBLF *font, char *str) -{ - if (font->mode == BLF_MODE_BITMAP) - blf_internal_bitmap_draw(font, str); - else - blf_internal_texture_draw(font, str); -} - -void blf_internal_boundbox(FontBLF *font, char *str, rctf *box) -{ - FontDataBLF *data; - unsigned char c; - int length= 0; - int ascent= 0; - int descent= 0; - int a=0, d=0; - - data= (FontDataBLF *)font->engine; - while ((c= (unsigned char) *str++)) { - length += data->chars[c].advance; - d = data->chars[c].yorig; - a = data->chars[c].height - data->chars[c].yorig; - if (a > ascent) - ascent= a; - if (d > descent) - descent= d; - } - box->xmin = (float)0; - box->ymin = (float)-descent * font->aspect; - box->xmax = (float)length * font->aspect; - box->ymax = (float)ascent * font->aspect; -} - -float blf_internal_width(FontBLF *font, char *str) -{ - FontDataBLF *data; - unsigned char c; - int length= 0; - - data= (FontDataBLF *)font->engine; - while ((c= (unsigned char) *str++)) { - length += data->chars[c].advance; - } - - return((float)(length * font->aspect)); -} - -float blf_internal_height(FontBLF *font, char *str) -{ - FontDataBLF *data; - - data= (FontDataBLF *)font->engine; - return(((float)(data->ymax - data->ymin)) * font->aspect); -} - -void blf_internal_free(FontBLF *font) -{ - FontDataBLF *data; - - data= (FontDataBLF *)font->engine; - if (data->texid != 0) { - glDeleteTextures(1, &data->texid); - data->texid= 0; - } - - MEM_freeN(font->name); - MEM_freeN(font); -} - -FontBLF *blf_internal_new(char *name) -{ - FontBLF *font; - - font= (FontBLF *)MEM_mallocN(sizeof(FontBLF), "blf_internal_new"); - font->name= BLI_strdup(name); - font->filename= NULL; - - if (!strcmp(name, "helv")) { - font->engine= (void *)&blf_font_helv10; - font->size= 10; - } -#ifndef BLF_INTERNAL_MINIMAL - else if (!strcmp(name, "helvb")) { - font->engine= (void *)&blf_font_helvb8; - font->size= 8; - } - else if (!strcmp(name, "scr")) { - font->engine= (void *)&blf_font_scr12; - font->size= 12; - } -#endif - else - font->engine= NULL; - - if (!font->engine) { - MEM_freeN(font->name); - MEM_freeN(font); - return(NULL); - } - - font->type= BLF_FONT_INTERNAL; - font->ref= 1; - font->mode= BLF_MODE_TEXTURE; - font->aspect= 1.0f; - font->pos[0]= 0.0f; - font->pos[1]= 0.0f; - font->angle= 0.0f; - Mat4One(font->mat); - font->clip_rec.xmin= 0.0f; - font->clip_rec.xmax= 0.0f; - font->clip_rec.ymin= 0.0f; - font->clip_rec.ymax= 0.0f; - font->flags= 0; - font->dpi= 72; - font->cache.first= NULL; - font->cache.last= NULL; - font->glyph_cache= NULL; - glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->max_tex_size); - - font->size_set= blf_internal_size; - font->draw= blf_internal_draw; - font->boundbox_get= blf_internal_boundbox; - font->width_get= blf_internal_width; - font->height_get= blf_internal_height; - font->free= blf_internal_free; - - if (font->mode == BLF_MODE_TEXTURE) { - if (blf_internal_get_texture(font) != 0) { - MEM_freeN(font->name); - MEM_freeN(font); - return(NULL); - } - } - - return(font); -} diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h index a042eefb4d9..af49dda0023 100644 --- a/source/blender/blenfont/intern/blf_internal.h +++ b/source/blender/blenfont/intern/blf_internal.h @@ -32,20 +32,12 @@ unsigned int blf_next_p2(unsigned int x); unsigned int blf_hash(unsigned int val); int blf_utf8_next(unsigned char *buf, int *iindex); -void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2); -void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2); -void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2); - char *blf_dir_search(const char *file); int blf_dir_split(const char *str, char *file, int *size); int blf_font_init(void); void blf_font_exit(void); -FontBLF *blf_internal_new(char *name); - -#ifdef WITH_FREETYPE2 - FontBLF *blf_font_new(char *name, char *filename); FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size); @@ -59,5 +51,4 @@ GlyphBLF *blf_glyph_add(FontBLF *font, FT_UInt index, unsigned int c); void blf_glyph_free(GlyphBLF *g); int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y); -#endif /* WITH_FREETYPE2 */ #endif /* BLF_INTERNAL_H */ diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index da2d3c17f79..9d762a7e155 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -140,9 +140,6 @@ typedef struct FontBLF { /* filename or NULL. */ char *filename; - /* font type, can be freetype2 or internal. */ - int type; - /* draw mode, texture or bitmap. */ int mode; @@ -197,24 +194,6 @@ typedef struct FontBLF { void (*free)(struct FontBLF *); } FontBLF; -typedef struct CharDataBLF { - signed char width, height; - signed char xorig, yorig; - signed char advance; - - short data_offset; -} CharDataBLF; - -typedef struct FontDataBLF { - int xmin, ymin; - int xmax, ymax; - - CharDataBLF chars[256]; - unsigned char *bitmap_data; - - GLuint texid; -} FontDataBLF; - typedef struct DirBLF { struct DirBLF *next; struct DirBLF *prev; diff --git a/source/blender/blenfont/intern/blf_util.c b/source/blender/blenfont/intern/blf_util.c index 8de6aea754b..03e1066caa1 100644 --- a/source/blender/blenfont/intern/blf_util.c +++ b/source/blender/blenfont/intern/blf_util.c @@ -76,34 +76,30 @@ int blf_utf8_next(unsigned char *buf, int *iindex) * * Returns 0 to indicate an error (e.g. invalid UTF8) */ - int index= *iindex, r; - unsigned char d= buf[index++], d2, d3, d4; + int index= *iindex, len, r; + unsigned char d, d2, d3, d4; + d= buf[index++]; if (!d) return(0); - if (d < 0x80) { - *iindex= index; - return(d); - } + while (buf[index] && ((buf[index] & 0xc0) == 0x80)) + index++; - if ((d & 0xe0) == 0xc0) { + len= index - *iindex; + if (len == 1) + r= d; + else if (len == 2) { /* 2 byte */ - d2= buf[index++]; - if ((d2 & 0xc0) != 0x80) - return(0); + d2= buf[*iindex + 1]; r= d & 0x1f; /* copy lower 5 */ r <<= 6; r |= (d2 & 0x3f); /* copy lower 6 */ } - else if ((d & 0xf0) == 0xe0) { + else if (len == 3) { /* 3 byte */ - d2= buf[index++]; - d3= buf[index++]; - - if ((d2 & 0xc0) != 0x80 || (d3 & 0xc0) != 0x80) - return(0); - + d2= buf[*iindex + 1]; + d3= buf[*iindex + 2]; r= d & 0x0f; /* copy lower 4 */ r <<= 6; r |= (d2 & 0x3f); @@ -112,14 +108,9 @@ int blf_utf8_next(unsigned char *buf, int *iindex) } else { /* 4 byte */ - d2= buf[index++]; - d3= buf[index++]; - d4= buf[index++]; - - if ((d2 & 0xc0) != 0x80 || (d3 & 0xc0) != 0x80 || - (d4 & 0xc0) != 0x80) - return(0); - + d2= buf[*iindex + 1]; + d3= buf[*iindex + 2]; + d4= buf[*iindex + 3]; r= d & 0x0f; /* copy lower 4 */ r <<= 6; r |= (d2 & 0x3f); @@ -131,64 +122,3 @@ int blf_utf8_next(unsigned char *buf, int *iindex) *iindex= index; return(r); } - -void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2) -{ - - glBegin(GL_QUADS); - glTexCoord2f(uv[0][0], uv[0][1]); - glVertex2f(dx, y1); - - glTexCoord2f(uv[0][0], uv[1][1]); - glVertex2f(dx, y2); - - glTexCoord2f(uv[1][0], uv[1][1]); - glVertex2f(dx1, y2); - - glTexCoord2f(uv[1][0], uv[0][1]); - glVertex2f(dx1, y1); - glEnd(); - -} - -void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2) -{ - float soft[25]= { - 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f, - 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, - 2/60.0f, 5/60.0f, 8/60.0f, 5/60.0f, 2/60.0f, - 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, - 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f}; - - float color[4], *fp= soft; - int dx, dy; - - glGetFloatv(GL_CURRENT_COLOR, color); - - for(dx=-2; dx<3; dx++) { - for(dy=-2; dy<3; dy++, fp++) { - glColor4f(color[0], color[1], color[2], fp[0]*color[3]); - blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); - } - } - - glColor4fv(color); -} - -void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2) -{ - float soft[9]= {1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f}; - float color[4], *fp= soft; - int dx, dy; - - glGetFloatv(GL_CURRENT_COLOR, color); - - for(dx=-1; dx<2; dx++) { - for(dy=-1; dy<2; dy++, fp++) { - glColor4f(color[0], color[1], color[2], fp[0]*color[3]); - blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); - } - } - - glColor4fv(color); -} diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index ac161caeb2e..4b7ddf43647 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -45,7 +45,6 @@ extern "C" { struct Main; struct Object; struct bSoundListener; -struct BMF_Font; struct BME_Glob; typedef struct Global { @@ -53,9 +52,6 @@ typedef struct Global { /* active pointers */ struct Main *main; - /* fonts, allocated global data */ - struct BMF_Font *font, *fonts, *fontss; - /* strings: lastsaved */ char ima[256], sce[256], lib[256]; diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5a612df2589..ebe0ea74c28 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -31,7 +31,7 @@ SET(INC ../render/extern/include ../../../intern/decimation/extern ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern ../../../intern/iksolver/extern ../blenloader ../quicktime - ../../../intern/bmfont ../../../extern/bullet2/src + ../../../extern/bullet2/src ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/bsp/extern ${SDL_INC} @@ -66,10 +66,6 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(NOT WITH_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_ELBEEM) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 86ff3a43045..19d150b34a8 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -8,7 +8,6 @@ incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' #/intern/iksolver/extern ../blenloader' incs += ' #/extern/bullet2/src' -incs += ' #/intern/bmfont' incs += ' #/intern/opennl/extern #/intern/bsp/extern' incs += ' ../gpu #/extern/glew/include' @@ -33,9 +32,6 @@ if env['WITH_BF_SDL']: else: defs.append('DISABLE_SDL') -if env['WITH_BF_INTERNATIONAL']: - defs.append('WITH_FREETYPE2') - if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 6554c93662d..1528ec1c86e 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -59,8 +59,6 @@ CPPFLAGS += -I../../editors/include # to include the render stuff: CPPFLAGS += -I../../render/extern/include -# for image stamping -CPPFLAGS += -I$(NAN_BMFONT)/include # for sound #CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += $(NAN_SDLCFLAGS) @@ -85,12 +83,8 @@ CPPFLAGS += -I.. # path to bullet2, for cloth CPPFLAGS += -I../../../../extern/bullet2/src - -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 - CPPFLAGS += -I$(NAN_FREETYPE)/include - CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 -endif +CPPFLAGS += -I$(NAN_FREETYPE)/include +CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 ifeq ($(WITH_FFMPEG),true) CPPFLAGS += -DWITH_FFMPEG diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 8bd848ea9e6..dfe3b7ea279 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -33,8 +33,6 @@ #include "BLI_winstuff.h" #endif -//#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ced8d3bdebb..b94652eb7c3 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -355,11 +355,7 @@ static VFontData *vfont_get_data(VFont *vfont) } if (pf) { -#ifdef WITH_FREETYPE2 vfont->data= BLI_vfontdata_from_freetypefont(pf); -#else - vfont->data= BLI_vfontdata_from_psfont(pf); -#endif if (pf != vfont->packedfile) { freePackedFile(pf); } @@ -398,12 +394,7 @@ VFont *load_vfont(char *name) if (pf) { VFontData *vfd; -#ifdef WITH_FREETYPE2 vfd= BLI_vfontdata_from_freetypefont(pf); -#else - vfd= BLI_vfontdata_from_psfont(pf); -#endif - if (vfd) { vfont = alloc_libblock(&G.main->vfont, ID_VF, filename); vfont->data = vfd; @@ -755,21 +746,22 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode) che = che->next; } -#ifdef WITH_FREETYPE2 - // The character wasn't in the current curve base so load it - // But if the font is then do not try loading since whole font is in the memory already + /* + * The character wasn't in the current curve base so load it + * But if the font is then do not try loading since + * whole font is in the memory already + */ if(che == NULL && strcmp(vfont->name, "")) { BLI_vfontchar_from_freetypefont(vfont, ascii); } - // Try getting the character again from the list + /* Try getting the character again from the list */ che = vfd->characters.first; while(che) { if(che->index == ascii) break; che = che->next; } -#endif /* No VFont found */ if (vfont==0) { diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 99ec7ce1cc8..6086aa58d40 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 53b805f5f4c..629f34518b9 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -77,9 +77,6 @@ #include "RE_pipeline.h" -/* for stamp drawing to an image */ -#include "BMF_Api.h" - #include "GPU_extensions.h" #include "GPU_draw.h" @@ -1069,6 +1066,9 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix) void BKE_stamp_buf(Scene *scene, unsigned char *rect, float *rectf, int width, int height, int channels) { +#if 0 +// XXX +// This go back when BLF_draw_buffer is implemented - Diego struct StampData stamp_data; int x=1,y=1; @@ -1188,7 +1188,7 @@ void BKE_stamp_buf(Scene *scene, unsigned char *rect, float *rectf, int width, i buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1); BMF_DrawStringBuf(font, stamp_data.strip, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels); } - +#endif // 0 XXX } void BKE_stamp_info(Scene *scene, struct ImBuf *ibuf) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index b22e7b1dd70..334c8e6906b 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -40,10 +40,6 @@ SET(INC ) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index d0084be0d56..e0411a6fc80 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -12,9 +12,6 @@ defs = '' if env['WITH_BF_SDL']: incs += ' ' + env['BF_SDL_INC'] -if env['WITH_BF_INTERNATIONAL']: - defs = 'WITH_FREETYPE2' - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index f92fa0a7e25..f729a4e3fe0 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -53,9 +53,6 @@ CPPFLAGS += -I$(NAN_ZLIB)/include ifdef NAN_PTHREADS CPPFLAGS += -I$(NAN_PTHREADS)/include endif -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 -endif ifeq ($(OS),linux) CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include endif diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 4b7b5914b60..0f2a6179964 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -30,8 +30,6 @@ * Code that uses exotic character maps is present but commented out. */ -#ifdef WITH_FREETYPE2 - #ifdef WIN32 #pragma warning (disable:4244) #endif @@ -514,10 +512,6 @@ int BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character) return TRUE; } -#endif // WITH_FREETYPE2 - - - #if 0 // Freetype2 Outline struct diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 06b0fb4ab41..914fdaa4bc6 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -30,7 +30,7 @@ SET(INC ../windowmanager ../editors/include ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel - ../include ../../../intern/bmfont ../imbuf ../render/extern/include + ../include ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include ../../../intern/decimation/extern ../blenloader ../python ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue @@ -43,9 +43,7 @@ SET(INC ../windowmanager ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/editors/armature/Makefile b/source/blender/editors/armature/Makefile index f8cbb5ab37e..6c7ce81a8a1 100644 --- a/source/blender/editors/armature/Makefile +++ b/source/blender/editors/armature/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_OPENNL)/include # not very neat.... diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index e4e42a27b36..f96d25b0fe0 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[44] ) diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index ca0694a7ece..98f51a4015d 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 5a636672f29..7e6c84764ae 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -53,8 +53,6 @@ //#include "BDR_editobject.h" -#include "BMF_Api.h" - #include "ED_mesh.h" #include "ED_armature.h" //#include "BIF_interface.h" diff --git a/source/blender/editors/curve/Makefile b/source/blender/editors/curve/Makefile index b27749ce6fd..6b1f628f231 100644 --- a/source/blender/editors/curve/Makefile +++ b/source/blender/editors/curve/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript index 92c982db611..3a1930899d3 100644 --- a/source/blender/editors/curve/SConscript +++ b/source/blender/editors/curve/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 78b86ad7f32..c60007680ba 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -38,8 +38,6 @@ #include #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" #include "BLI_dynstr.h" diff --git a/source/blender/editors/gpencil/Makefile b/source/blender/editors/gpencil/Makefile index bb76c9c2b23..f4c1cd246f4 100644 --- a/source/blender/editors/gpencil/Makefile +++ b/source/blender/editors/gpencil/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index 6c47b2f69ff..af3cbdb901d 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index fd59539bb56..5c6294022ee 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -37,8 +37,6 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "BMF_Api.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -907,8 +905,7 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy /* only draw it if view is wide enough (assume padding of 20 is enough for now) */ if (winx > (xmax + 20)) { - glRasterPos2i(winx-xmax, winy-20); - BMF_DrawString(G.fonts, printable); + BLF_draw_default(winx-xmax, winy-20, 0.0f, printable); } } diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 28748d4a631..8be56dc416e 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index a745e5f4084..d84b93267a6 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile index fa9550041c5..dfc8187de49 100644 --- a/source/blender/editors/interface/Makefile +++ b/source/blender/editors/interface/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager @@ -48,7 +47,6 @@ CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf -CPPFLAGS += -I../../ftfont CPPFLAGS += -I../../blenfont # own include diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index fa89cd4891c..bac3742c12f 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -7,14 +7,12 @@ for source in env.Glob('*_api.c'): sources.remove(source) incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #intern/bmfont' +incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc' incs += ' #/extern/glew/include' defs = [] if env['WITH_BF_INTERNATIONAL']: - incs += ' ../../ftfont' defs.append('INTERNATIONAL') - defs.append('FTGL_STATIC_LIBRARY') env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[110] ) diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 8c07a6ea0ab..d0361174e70 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -171,11 +171,7 @@ void uiStyleFontDraw(uiFontStyle *fs, rcti *rect, char *str) xofs= rect->xmax - rect->xmin - BLF_width(str); /* clip is very strict, so we give it some space */ - if (BLF_type_get() == BLF_FONT_INTERNAL) - BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+8, rect->ymax+4); - else - BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4); - + BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4); BLF_enable(BLF_CLIPPING); if(fs->shadow) @@ -240,18 +236,13 @@ void uiStyleInit(void) font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); } - if (font->blf_id == -1) { - /* when all fail, we go back to the internal font. */ - font->blf_id= BLF_load_mem("helv", NULL, 0); - } - if (font->blf_id == -1) printf("uiStyleInit error, no fonts available\n"); else { BLF_set(font->blf_id); /* ? just for speed to initialize? - * Yes but only if we used the freetype2 library, - * this build the glyph cache and create the texture. + * Yes, this build the glyph cache and create + * the texture. */ BLF_size(11, U.dpi); BLF_size(12, U.dpi); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 3b503f00fd3..6107aa4ccc8 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -49,8 +49,6 @@ #include "ED_screen.h" -#include "BMF_Api.h" - #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" @@ -1391,8 +1389,7 @@ static void scroll_printstr(View2DScrollers *scrollers, Scene *scene, float x, f } /* draw it */ - glRasterPos2f(x, y); - BMF_DrawString(G.fonts, str); // XXX check this again when new text-drawing api is done + BLF_draw_default(x, y, 0.0f, str); } /* local defines for scrollers drawing */ diff --git a/source/blender/editors/mesh/Makefile b/source/blender/editors/mesh/Makefile index 60b1fa1c329..650771519cd 100644 --- a/source/blender/editors/mesh/Makefile +++ b/source/blender/editors/mesh/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index e99351e1a70..df1f297698d 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 90b26d0f425..b6e679468e0 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -82,8 +82,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "WM_api.h" #include "WM_types.h" -#include "BMF_Api.h" - #include "ED_mesh.h" #include "ED_view3d.h" #include "ED_util.h" diff --git a/source/blender/editors/object/Makefile b/source/blender/editors/object/Makefile index 9011f566bc6..c0312023bfd 100644 --- a/source/blender/editors/object/Makefile +++ b/source/blender/editors/object/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 5cd7a3b91af..3371e172a82 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' -incs += ' #/intern/guardedalloc #intern/bmfont' +incs += ' #/intern/guardedalloc' incs += ' ../../makesrna ../../python' defs = [] diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a7e2ce34443..68a2cf04692 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -120,8 +120,6 @@ #include "ED_util.h" #include "ED_view3d.h" -#include "BMF_Api.h" - #include "BIF_transform.h" #include "UI_interface.h" diff --git a/source/blender/editors/physics/Makefile b/source/blender/editors/physics/Makefile index bd2dbc65f91..a71ea9e2083 100644 --- a/source/blender/editors/physics/Makefile +++ b/source/blender/editors/physics/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index 241962442d4..5718ae0c217 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/preview/Makefile b/source/blender/editors/preview/Makefile index 84514d73570..c44da6753f3 100644 --- a/source/blender/editors/preview/Makefile +++ b/source/blender/editors/preview/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/preview/SConscript b/source/blender/editors/preview/SConscript index dcc80e8c626..922232822ff 100644 --- a/source/blender/editors/preview/SConscript +++ b/source/blender/editors/preview/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' incs += ' ../../blenloader' diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 42480f65268..4ed1e59a87f 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -33,7 +33,7 @@ SET(INC ../../windowmanager ../../editors/include ../../../../intern/guardedalloc ../../../../intern/memutil ../../blenlib ../../makesdna ../../makesrna ../../blenkernel - ../../include ../../../../intern/bmfont ../../imbuf + ../../include ../../imbuf ../../render/extern/include ../../../../intern/bsp/extern ../../radiosity/extern/include ../../../intern/decimation/extern ../../blenloader @@ -45,9 +45,7 @@ SET(INC ../../windowmanager ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile index d18d15d00d9..cf6e692c304 100644 --- a/source/blender/editors/screen/Makefile +++ b/source/blender/editors/screen/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -49,6 +48,7 @@ CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index c291533790a..d00c01a040c 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna' incs += ' ../../render/extern/include' -incs += ' #/intern/guardedalloc #/extern/glew/include #intern/bmfont' +incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 9956b8eabcb..6b7b7a914f4 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -50,13 +50,12 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "BLF_api.h" #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "BMF_Api.h" - #ifndef DISABLE_PYTHON #include "BPY_extern.h" #endif @@ -270,8 +269,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) glClear(GL_COLOR_BUFFER_BIT); UI_ThemeColor(TH_TEXT); - glRasterPos2i(20, 6); - BMF_DrawString(G.font, ar->headerstr); + BLF_draw_default(20, 6, 0.0f, ar->headerstr); } else if(at->draw) { at->draw(C, ar); diff --git a/source/blender/editors/sculpt_paint/Makefile b/source/blender/editors/sculpt_paint/Makefile index e810f7efbe4..9353116a4bc 100644 --- a/source/blender/editors/sculpt_paint/Makefile +++ b/source/blender/editors/sculpt_paint/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 3e00453e049..01e1d80c24c 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna' env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_file/Makefile b/source/blender/editors/space_file/Makefile index 480a4ee3889..c8f2af9c2e8 100644 --- a/source/blender/editors/space_file/Makefile +++ b/source/blender/editors/space_file/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index 8302d6eecef..699b988f50f 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../blenloader #intern/bmfont ../../makesrna' +incs += ' ../../blenloader ../../makesrna' incs += ' ../../render/extern/include ' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 84e0f264275..dafb254f4bc 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -37,7 +37,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "BKE_colortools.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_node/Makefile b/source/blender/editors/space_node/Makefile index 233572dbfb1..60f81255a74 100644 --- a/source/blender/editors/space_node/Makefile +++ b/source/blender/editors/space_node/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index babd8dc9080..ad57970950d 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' -incs += ' ../../nodes #intern/bmfont ../../render/extern/include' +incs += ' ../../nodes ../../render/extern/include' incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' defs = [] cf = [] diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 25693009bf2..9c2cf5dc5dd 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -71,8 +71,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" - #include "MEM_guardedalloc.h" #include "ED_node.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ab6d3c245f1..0670dd9e01f 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -68,7 +68,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index ae986d71258..7104fad1767 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -3988,6 +3988,9 @@ static void outliner_draw_tree(Scene *scene, ARegion *ar, SpaceOops *soops) float col[4]; #if 0 // XXX was #ifdef INTERNATIONAL + /* Maybe the INTERNATIONAL was really for check about freetype2 ? + * anyway I think that we can remove this now - Diego + */ FTF_SetFontSize('l'); BIF_SetScale(1.0); #endif diff --git a/source/blender/editors/space_sequencer/Makefile b/source/blender/editors/space_sequencer/Makefile index c04202cba73..80699db4baa 100644 --- a/source/blender/editors/space_sequencer/Makefile +++ b/source/blender/editors/space_sequencer/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -49,6 +48,7 @@ CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 1794ef29257..8a8c4963003 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -5,6 +5,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #intern/bmfont ../../makesrna' +incs += ' ../../makesrna' env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] ) diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index e71abec8e4b..5e07689f536 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -30,8 +30,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" @@ -57,6 +55,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "BLF_api.h" #include "ED_anim_api.h" #include "ED_space_api.h" @@ -404,12 +403,14 @@ static void draw_seq_handle(SpaceSeq *sseq, Sequence *seq, float pixelx, short d cpack(0xFFFFFF); if (direction == SEQ_LEFTHANDLE) { sprintf(str, "%d", seq->startdisp); - glRasterPos3f(rx1, y1-0.15, 0.0); + x1= rx1; + y1 -= 0.15; } else { sprintf(str, "%d", seq->enddisp - 1); - glRasterPos3f((x2-BMF_GetStringWidth(G.fonts, str)*pixelx), y2+0.05, 0.0); + x1= x2 - BLF_width_default(str) * pixelx; + y1= y2 + 0.05; } - BMF_DrawString(G.fonts, str); + BLF_draw_default(x1, y1, 0.0f, str); } } @@ -572,8 +573,9 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float } strp= str; - - while( (len= BMF_GetStringWidth(G.font, strp)) > size) { + // XXX + /* The correct thing is used a Styla and set the clipping region. */ + while( (len= BLF_width_default(strp)) > size) { if(len < 10) break; if(strp[1]==0) break; strp++; @@ -590,8 +592,7 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float }else{ cpack(0); } - glRasterPos3f(x1, y1+SEQ_STRIP_OFSBOTTOM, 0.0); - BMF_DrawString(G.font, strp); + BLF_draw_default(x1, y1+SEQ_STRIP_OFSBOTTOM, 0.0, strp); } /* draws a shaded strip, made from gradient + flat color + gradient */ diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript index 3d5ccc318e1..09ba961bfce 100644 --- a/source/blender/editors/space_text/SConscript +++ b/source/blender/editors/space_text/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') defs = [] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/bmfont ../../python ../../makesrna ../../blenfont' +incs += ' ../../python ../../makesrna ../../blenfont' if not env['WITH_BF_PYTHON']: defs.append('DISABLE_PYTHON') diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 50109ba8c42..259811aee0f 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -33,7 +33,6 @@ struct ARegion; struct ARegionType; struct bContext; -struct BMF_Font; struct ReportList; struct ScrArea; struct SpaceText; diff --git a/source/blender/editors/space_view3d/Makefile b/source/blender/editors/space_view3d/Makefile index 442ab502e65..dd4eab89411 100644 --- a/source/blender/editors/space_view3d/Makefile +++ b/source/blender/editors/space_view3d/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -51,6 +50,7 @@ CPPFLAGS += -I../../python CPPFLAGS += -I../../gpu CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index c9b29f61e44..b771095c781 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' -incs += ' ../../gpu ../../makesrna' +incs += ' ../../render/extern/include #/intern/guardedalloc' +incs += ' ../../gpu ../../makesrna ../../blenfont' env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 5d130cee48d..dfdd70b11e7 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -37,8 +37,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" @@ -74,6 +72,7 @@ #include "WM_api.h" #include "WM_types.h" +#include "BLF_api.h" #include "UI_resources.h" @@ -1806,9 +1805,8 @@ static void draw_pose_channels(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba /* Draw names of bone */ if (arm->flag & ARM_DRAWNAMES) { VecMidf(vec, pchan->pose_head, pchan->pose_tail); - glRasterPos3fv(vec); - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, pchan->name); + BLF_draw_default(vec[0], vec[1], vec[2], " "); + BLF_draw_default(vec[0] + BLF_width_default(" "), vec[1], vec[2], pchan->name); } /* Draw additional axes on the bone tail */ @@ -1993,8 +1991,8 @@ static void draw_ebones(View3D *v3d, RegionView3D *rv3d, Object *ob, int dt) if (arm->flag & ARM_DRAWNAMES) { VecMidf(vec, eBone->head, eBone->tail); glRasterPos3fv(vec); - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, eBone->name); + BLF_draw_default(vec[0], vec[1], vec[2], " "); + BLF_draw_default(vec[0] + BLF_width_default(" "), vec[1], vec[2], eBone->name); } /* Draw additional axes */ if (arm->flag & ARM_DRAWAXES) { @@ -2155,15 +2153,13 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec /* only draw framenum if several consecutive highlighted points don't occur on same point */ if (a == 0) { - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } else if ((a > stepsize) && (a < len-stepsize)) { if ((VecEqual(fp, fp-(stepsize*3))==0) || (VecEqual(fp, fp+(stepsize*3))==0)) { - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } } } @@ -2205,9 +2201,8 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec if (ak->cfra == (a+sfra)) { char str[32]; - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } } } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 10edd4eccb5..3725fc24b6c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -34,8 +34,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" @@ -107,6 +105,7 @@ #include "UI_interface_icons.h" #include "WM_api.h" +#include "BLF_api.h" #include "view3d_intern.h" // own include @@ -361,16 +360,15 @@ void drawaxes(float size, int flag, char drawtype) glEnd(); v2[axis]+= size*0.125; - glRasterPos3fv(v2); // patch for 3d cards crashing on glSelect for text drawing (IBM) if((flag & DRAW_PICKING) == 0) { if (axis==0) - BMF_DrawString(G.font, "x"); + BLF_draw_default(v2[0], v2[1], v2[2], "x"); else if (axis==1) - BMF_DrawString(G.font, "y"); + BLF_draw_default(v2[0], v2[1], v2[2], "y"); else - BMF_DrawString(G.font, "z"); + BLF_draw_default(v2[0], v2[1], v2[2], "z"); } } break; @@ -1778,7 +1776,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E Mesh *me= ob->data; EditEdge *eed; EditFace *efa; - float v1[3], v2[3], v3[3], v4[3]; + float v1[3], v2[3], v3[3], v4[3], x, y, z; float fvec[3]; char val[32]; /* Stores the measurement display text here */ char conv_float[5]; /* Use a float conversion matching the grid size */ @@ -1818,7 +1816,9 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E VECCOPY(v1, eed->v1->co); VECCOPY(v2, eed->v2->co); - glRasterPos3f( 0.5*(v1[0]+v2[0]), 0.5*(v1[1]+v2[1]), 0.5*(v1[2]+v2[2])); + x= 0.5*(v1[0]+v2[0]); + y= 0.5*(v1[1]+v2[1]); + z= 0.5*(v1[2]+v2[2]); if(v3d->flag & V3D_GLOBAL_STATS) { Mat4MulVecfl(ob->obmat, v1); @@ -1826,7 +1826,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E } sprintf(val, conv_float, VecLenf(v1, v2)); - BMF_DrawString( G.fonts, val); + BLF_draw_default(x, y, z, val); } } } @@ -1861,8 +1861,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E area = AreaT3Dfl(v1, v2, v3); sprintf(val, conv_float, area); - glRasterPos3fv(efa->cent); - BMF_DrawString( G.fonts, val); + BLF_draw_default(efa->cent[0], efa->cent[1], efa->cent[2], val); } } } @@ -1904,15 +1903,13 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E /* Vec 1 */ sprintf(val,"%.3f", VecAngle3(v4, v1, v2)); VecLerpf(fvec, efa->cent, efa->v1->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(efa->cent[0], efa->cent[1], efa->cent[2], val); } if( (e1->f & e2->f & SELECT) || (G.moving && (efa->v2->f & SELECT)) ) { /* Vec 2 */ sprintf(val,"%.3f", VecAngle3(v1, v2, v3)); VecLerpf(fvec, efa->cent, efa->v2->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } if( (e2->f & e3->f & SELECT) || (G.moving && (efa->v3->f & SELECT)) ) { /* Vec 3 */ @@ -1921,16 +1918,14 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E else sprintf(val,"%.3f", VecAngle3(v2, v3, v1)); VecLerpf(fvec, efa->cent, efa->v3->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } /* Vec 4 */ if(efa->v4) { if( (e3->f & e4->f & SELECT) || (G.moving && (efa->v4->f & SELECT)) ) { sprintf(val,"%.3f", VecAngle3(v3, v4, v1)); VecLerpf(fvec, efa->cent, efa->v4->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } } } @@ -3257,9 +3252,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv if(part->draw&PART_DRAW_NUM && !(G.f & G_RENDER_SHADOW)){ /* in path drawing state.co is the end point */ - glRasterPos3f(state.co[0], state.co[1], state.co[2]); sprintf(val," %i",a); - BMF_DrawString(G.font, val); + BLF_draw_default(state.co[0], state.co[1], state.co[2], val); } } } @@ -3574,9 +3568,8 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob for(k=0, key=edit->keys[i]+k; ktotkey; k++, key++){ if(key->flag & PEK_HIDE) continue; - glRasterPos3fv(key->world_co); sprintf(val," %.1f",*key->time); - BMF_DrawString(G.font, val); + BLF_draw_default(key->world_co[0], key->world_co[1], key->world_co[2], val); } } } @@ -3598,9 +3591,8 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob glEnd(); if((pset->flag & PE_SHOW_TIME) && !(G.f & G_RENDER_SHADOW)){ - glRasterPos3fv(key->world_co); sprintf(val," %.1f",*key->time); - BMF_DrawString(G.font, val); + BLF_draw_default(key->world_co[0], key->world_co[1], key->world_co[2], val); } } } @@ -4625,13 +4617,12 @@ void drawRBpivot(bRigidBodyJointConstraint *data) glVertex3fv(v1); glVertex3fv(v); glEnd(); - glRasterPos3fv(v); if (axis==0) - BMF_DrawString(G.font, "px"); + BLF_draw_default(v[0], v[1], v[2], "px"); else if (axis==1) - BMF_DrawString(G.font, "py"); + BLF_draw_default(v[0], v[1], v[2], "py"); else - BMF_DrawString(G.font, "pz"); + BLF_draw_default(v[0], v[1], v[2], "pz"); } glLineWidth (1.0f); setlinestyle(0); @@ -5051,10 +5042,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) /* but, we also dont draw names for sets or duplicators */ if(flag == 0) { if(v3d->zbuf) glDisable(GL_DEPTH_TEST); - glRasterPos3f(0.0, 0.0, 0.0); - - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, ob->id.name+2); + BLF_draw_default(0.0, 0.0, 0.0, " "); + BLF_draw_default(0.0 + BLF_width_default(" "), 0.0, 0.0, ob->id.name+2); if(v3d->zbuf) glEnable(GL_DEPTH_TEST); } } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index cb67a1fc9aa..bbf0279692a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -69,9 +69,9 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "WM_api.h" +#include "BLF_api.h" #include "ED_armature.h" #include "ED_keyframing.h" @@ -558,8 +558,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "x"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "x"); } /* Y */ @@ -579,8 +578,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "y"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "y"); } /* Z */ @@ -600,8 +598,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "z"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "z"); } /* restore line-width */ @@ -693,8 +690,7 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d) if (printable) { UI_ThemeColor(TH_TEXT_HI); - glRasterPos2i(10, ar->winy-20); - BMF_DrawString(G.fonts, printable); + BLF_draw_default(10, ar->winy-20, 0.0f, printable); } if (v3d->localview) { @@ -799,7 +795,7 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d) } /* colour depends on whether there is a keyframe */ - if (id_frame_has_keyframe((ID *)ob, /*frame_to_float(scene, CFRA)*/(float)(CFRA), v3d->keyflags)) + if (id_frame_has_keyframe((ID *)ob, /*frame_to_float(scene, CFRA)*/(float)(CFRA), v3d->keyflags)) UI_ThemeColor(TH_VERTEX_SELECT); else UI_ThemeColor(TH_TEXT_HI); @@ -817,9 +813,8 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d) if (U.uiflag & USER_SHOW_ROTVIEWICON) offset = 14 + (U.rvisize * 2); - - glRasterPos2i(offset, 10); - BMF_DrawString(G.fonts, info); + + BLF_draw_default(offset, 10, 0.0f, info); } static void view3d_get_viewborder_size(Scene *scene, ARegion *ar, float size_r[2]) @@ -999,9 +994,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) /* camera name - draw in highlighted text color */ if (ca && (ca->flag & CAM_SHOWNAME)) { UI_ThemeColor(TH_TEXT_HI); - glRasterPos2f(x1, y1-15); - - BMF_DrawString(G.font, v3d->camera->id.name+2); + BLF_draw_default(x1, y1-15, 0.0f, v3d->camera->id.name+2); UI_ThemeColor(TH_WIRE); } diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index fba8e0c4eb7..24d211d81ab 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -92,8 +92,6 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "BMF_Api.h" - #include "view3d_intern.h" diff --git a/source/blender/editors/transform/Makefile b/source/blender/editors/transform/Makefile index 36758190b52..bc3e08a2ae8 100644 --- a/source/blender/editors/transform/Makefile +++ b/source/blender/editors/transform/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript index 2c44204afa9..b2dee8c3358 100644 --- a/source/blender/editors/transform/SConscript +++ b/source/blender/editors/transform/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna' env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] ) \ No newline at end of file diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 1f76cd0b424..a4d5b0f0ed2 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -55,9 +55,5 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - BLENDERLIB(bf_nodes "${SRC}" "${INC}") diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index a9f303c8dd3..164e30c7d05 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -27,9 +27,6 @@ if env['WITH_BF_PYTHON']: else: defs.append('DISABLE_PYTHON') -if env['WITH_BF_INTERNATIONAL']: - defs.append('WITH_FREETYPE2') - if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index b94ae8749df..d15970e1df4 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -47,8 +47,3 @@ ENDIF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_CCGSUBSURF) BLENDERLIB(bf_python "${SRC}" "${INC}") - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - diff --git a/source/blender/python/intern/Makefile b/source/blender/python/intern/Makefile index ea08ecac945..3e28f5aac31 100644 --- a/source/blender/python/intern/Makefile +++ b/source/blender/python/intern/Makefile @@ -42,7 +42,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # PreProcessor stuff CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS) # modules diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index f9dd6a19fb7..088bdc99687 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -30,7 +30,7 @@ SET(INC . ../editors/include ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel - ../include ../../../intern/bmfont ../imbuf ../render/extern/include + ../include ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include ../../../intern/decimation/extern ../blenloader ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue @@ -43,9 +43,7 @@ SET(INC . ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 862235d7b4b..91635904524 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -8,10 +8,10 @@ sources = env.Glob('intern/*.c') incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' -incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system' +incs += ' ../radiosity/extern/include ../../kernel/gen_system' incs += ' ../makesrna ../gpu ../blenfont' -incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' +incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' defs = [] diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile index 0bf161e3250..80ae58f9398 100644 --- a/source/blender/windowmanager/intern/Makefile +++ b/source/blender/windowmanager/intern/Makefile @@ -43,7 +43,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # PreProcessor stuff CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_ELBEEM)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS) @@ -59,7 +58,6 @@ CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../gpu CPPFLAGS += -I../../render/extern/include -CPPFLAGS += -I../../ftfont CPPFLAGS += -I../../radiosity/extern/include CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += -I../../blenfont diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index d394a4d6eee..adbc43e439d 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -54,8 +54,6 @@ #include "BKE_utildefines.h" #include "BKE_packedFile.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "RE_pipeline.h" /* RE_ free stuff */ @@ -120,7 +118,7 @@ void WM_init(bContext *C) ED_file_init(); /* for fsmenu */ ED_init_node_butfuncs(); - BLF_init(); + BLF_init(11, U.dpi); BLF_lang_init(); init_builtin_keyingsets(); /* editors/animation/keyframing.c */ @@ -130,11 +128,6 @@ void WM_init(bContext *C) UI_init(); - /* goes away */ - G.font= BMF_GetFont(BMF_kHelvetica12); - G.fonts= BMF_GetFont(BMF_kHelvetica10); - G.fontss= BMF_GetFont(BMF_kHelveticaBold8); - // clear_matcopybuf(); /* XXX */ // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 14263580c4a..fe0f741bb96 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -243,11 +243,8 @@ IF(UNIX) bf_guardedalloc blender_CTR bf_moto - bf_bmfont bf_windowmanager - bf_editors - bf_ftfont - extern_ftgl + bf_editors bf_blroutines bf_converter bf_dummy diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index e090a4b9c56..107ef9b4b87 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -7,7 +7,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../source/gameengine/Converter ../../../source/blender/imbuf ../../../intern/ghost/include diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 648ad79210e..b08eaf6e026 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -42,8 +42,6 @@ #include #include -#include "BMF_Api.h" - #include "GL/glew.h" #include "BL_Material.h" // MAXTEX @@ -148,8 +146,7 @@ void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height /* the actual drawing */ glColor3ub(255, 255, 255); - glRasterPos2s(xco, height-yco); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco, height-yco, 0.0f, text); glMatrixMode(GL_TEXTURE); glPopMatrix(); @@ -184,11 +181,9 @@ void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int /* draw in black first*/ glColor3ub(0, 0, 0); - glRasterPos2s(xco+1, height-yco-1); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco+1, height-yco-1, 0.0f, text); glColor3ub(255, 255, 255); - glRasterPos2s(xco, height-yco); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco, height-yco, 0.0f, text); glMatrixMode(GL_TEXTURE); glPopMatrix(); diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 03a7a247727..3a2c30672cc 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -40,7 +40,6 @@ CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include CPPFLAGS += -I$(NAN_SOLID) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GLEW)/include diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 020402e9bcd..684b80dceee 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') defs = [] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #source/gameengine/Converter #source/blender/imbuf' incs += ' #intern/ghost/include' incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib' diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index a5219b9e759..44692241e6f 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -32,7 +32,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../intern/SoundSystem ../../../intern/SoundSystem/include ../../../intern/SoundSystem/openal diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 98b7c71bad2..af0d39771de 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') defs = [] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf' diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 0c6c4179e2d..ce1cd217f60 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -42,7 +42,6 @@ SET(INC ../../../../intern/string ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/bmfont ../../../../intern/moto/include ../../../../intern/SoundSystem ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index eafdb8a96bb..a036f9821a4 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -29,8 +29,6 @@ #include "GL/glew.h" -#include "BMF_Api.h" - #include "DNA_scene_types.h" #include "RAS_IRenderTools.h" @@ -61,7 +59,7 @@ unsigned int GPC_RenderTools::m_numgllights; GPC_RenderTools::GPC_RenderTools() { - m_font = BMF_GetFont(BMF_kHelvetica10); +// XXX m_font = BMF_GetFont(BMF_kHelvetica10); glGetIntegerv(GL_MAX_LIGHTS, (GLint*) &m_numgllights); if (m_numgllights < 8) diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index 316860a7d43..478d8b1a3c5 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -38,8 +38,6 @@ #include "RAS_IRenderTools.h" -#include "BMF_Api.h" - struct KX_ClientObjectInfo; class KX_RayCast; @@ -57,7 +55,7 @@ class GPC_RenderTools : public RAS_IRenderTools void *m_lastauxinfo; static unsigned int m_numgllights; - BMF_Font* m_font; +// XXX BMF_Font* m_font; public: GPC_RenderTools(); diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index 6a12e659be6..84b4a4170a9 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -56,7 +56,6 @@ CPPFLAGS += -I$(NAN_PNG)/include CPPFLAGS += -I$(NAN_ZLIB)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I../../../gameengine/Converter CPPFLAGS += -I../../../gameengine/Expressions diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 23ad413350b..e96b2c5400b 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -18,7 +18,6 @@ incs = ['.', '#intern/string', '#intern/ghost', '#intern/guardedalloc', - '#intern/bmfont', '#intern/moto/include', '#intern/SoundSystem', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', diff --git a/source/gameengine/GamePlayer/common/unix/Makefile b/source/gameengine/GamePlayer/common/unix/Makefile index 3d44a41afee..90342c7b735 100644 --- a/source/gameengine/GamePlayer/common/unix/Makefile +++ b/source/gameengine/GamePlayer/common/unix/Makefile @@ -60,7 +60,6 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_SUMO)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOLID)/include # Blender stuff diff --git a/source/gameengine/GamePlayer/common/windows/Makefile b/source/gameengine/GamePlayer/common/windows/Makefile index f35642f9651..b622ee974c8 100644 --- a/source/gameengine/GamePlayer/common/windows/Makefile +++ b/source/gameengine/GamePlayer/common/windows/Makefile @@ -48,7 +48,6 @@ CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GLEW)/include diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index a3cd8296da3..71961f27339 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -37,7 +37,6 @@ SET(INC ../../../../intern/string ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/bmfont ../../../../intern/moto/include ../../../../intern/SoundSystem ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile index 5f90d804611..c82edca0d45 100644 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ b/source/gameengine/GamePlayer/ghost/Makefile @@ -39,7 +39,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 9b17ed3757b..1cb7c9f2457 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -12,7 +12,6 @@ incs = ['.', '#intern/string', '#intern/ghost', '#intern/guardedalloc', - '#intern/bmfont', '#intern/moto/include', '#intern/SoundSystem', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 73d7191ffde..ca9ce4dc50c 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -47,7 +47,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../source/gameengine/Converter ../../../source/blender/imbuf ../../../intern/ghost/include diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 0e888edd43b..921aba9c11f 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -31,7 +31,7 @@ defs = '' incs = '. #source/blender/python/api2_2x' # Only for Mathutils! and bpy_internal_import.h, be very careful incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index eadc334431d..ba2f8f04233 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -106,17 +106,14 @@ endif export NAN_ACTION ?= $(LCGDIR)/action export NAN_GHOST ?= $(LCGDIR)/ghost export NAN_TEST_VERBOSITY ?= 1 - export NAN_BMFONT ?= $(LCGDIR)/bmfont export NAN_OPENNL ?= $(LCGDIR)/opennl export NAN_ELBEEM ?= $(LCGDIR)/elbeem export NAN_SUPERLU ?= $(LCGDIR)/superlu export NAN_GLEW ?= $(LCGDIR)/glew ifeq ($(FREE_WINDOWS), true) - export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libavdevice.a else - export NAN_FTGL ?= $(LCGDIR)/ftgl export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a endif @@ -172,9 +169,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),darwin) @@ -246,9 +240,6 @@ endif # enable l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - else ifeq ($(OS),freebsd) @@ -290,9 +281,6 @@ endif # enable l10n # export INTERNATIONAL ?= true - # enable freetype2 support for text objects - # export WITH_FREETYPE2 ?= true - else ifeq ($(OS),irix) @@ -347,9 +335,6 @@ endif # enable l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - else ifeq ($(OS),linux) @@ -403,9 +388,6 @@ endif # l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - export WITH_BINRELOC ?= true # enable ffmpeg support @@ -454,9 +436,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),solaris) @@ -502,9 +481,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),windows) @@ -561,9 +537,6 @@ endif # l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - # enable quicktime support # export WITH_QUICKTIME ?= true @@ -605,9 +578,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - endif # windows + fallback endif # solaris endif # openbsd @@ -624,8 +594,3 @@ ifeq ($(NAN_NO_KETSJI), true) export NAN_JUST_BLENDERDYNAMIC=true export NAN_NO_OPENAL=true endif - -# INTERNATIONAL implies WITH_FREETYPE2 -ifeq ($(INTERNATIONAL), true) - export WITH_FREETYPE2=true -endif diff --git a/tools/Blender.py b/tools/Blender.py index d24a7c4c2cb..6ffc0b8d76d 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -119,6 +119,7 @@ def setup_staticlibs(lenv): lenv['BF_ICONV_LIBPATH'] ] + libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_PYTHON']: libincs += Split(lenv['BF_PYTHON_LIBPATH']) if lenv['WITH_BF_SDL']: @@ -133,7 +134,6 @@ def setup_staticlibs(lenv): statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) - libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_OPENAL']: libincs += Split(lenv['BF_OPENAL_LIBPATH']) if lenv['WITH_BF_STATICOPENAL']: @@ -157,13 +157,13 @@ def setup_syslibs(lenv): lenv['BF_ZLIB_LIB'] ] + syslibs += Split(lenv['BF_FREETYPE_LIB']) if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']: if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc'): syslibs.append(lenv['BF_PYTHON_LIB']+'_d') else: syslibs.append(lenv['BF_PYTHON_LIB']) if lenv['WITH_BF_INTERNATIONAL']: - syslibs += Split(lenv['BF_FREETYPE_LIB']) syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: if not lenv['WITH_BF_STATICOPENAL']: diff --git a/tools/btools.py b/tools/btools.py index 7c77e9c1b0a..2c9b564b8a1 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -49,7 +49,6 @@ def validate_arguments(args, bc): 'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', - 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', 'WITH_BF_PLAYER', 'WITH_BF_NOBLENDER', 'WITH_BF_BINRELOC', @@ -235,7 +234,7 @@ def read_opts(cfg, args): ('BF_ZLIB_LIB', 'ZLib library', ''), ('BF_ZLIB_LIBPATH', 'ZLib library path', ''), - (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', True)), + (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext if true', True)), ('BF_GETTEXT', 'gettext base path', ''), ('BF_GETTEXT_INC', 'gettext include path', ''), @@ -308,11 +307,6 @@ def read_opts(cfg, args): ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), - (BoolVariable('WITH_BF_FTGL', 'Use FTGL if true', True)), - ('BF_FTGL', 'FTGL base path', ''), - ('BF_FTGL_INC', 'FTGL include path', ''), - ('BF_FTGL_LIB', 'FTGL libraries', ''), - (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)), (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), -- cgit v1.2.3