mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-06 16:55:45 +00:00
Code Issues Projects Releases Wiki Activity

renderer: Improve font error-handling

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1377 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
ximion
2012-01-05 18:35:53 +00:00
parent 48fe89fb2a
commit acb200345b
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libprojectM/Renderer/Renderer.cpp
View File

@ -49,16 +49,23 @@ Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetec
title_font = new FTGLPixmapFont(title_fontURL.c_str());
other_font = new FTGLPixmapFont(menu_fontURL.c_str());
other_font->UseDisplayList(true);
title_font->UseDisplayList(true);
poly_font = new FTGLExtrdFont(title_fontURL.c_str());
poly_font->UseDisplayList(true);
poly_font->Depth(20);
poly_font->FaceSize(72);
if(title_font->Error()) {
fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str());
} else {
title_font->UseDisplayList(true);
}
poly_font->UseDisplayList(true);
other_font->UseDisplayList(true);
if(poly_font->Error()) {
fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str());
} else {
poly_font->UseDisplayList(true);
poly_font->Depth(20);
poly_font->FaceSize(72);
}
#endif /** USE_FTGL */

2
src/projectM-jack/CMakeLists.txt
View File

@ -86,7 +86,7 @@ endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
LINK_DIRECTORIES(${PROJECTM_LINK})
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)