mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-08 00:15:16 +00:00
Code Issues Projects Releases Wiki Activity

more config file options

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@520 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-10-05 04:14:40 +00:00
parent 3157d4b7b7
commit 16d856a10e
10 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/projectM-engine/Renderer.cpp
View File

@ -13,7 +13,7 @@ class Preset;
GLuint texture;
Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTarget, TextureManager *textureManager, BeatDetect *beatDetect, std::string _fontURL): fontURL(_fontURL), m_presetName("None")
Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTarget, TextureManager *textureManager, BeatDetect *beatDetect, std::string _titlefontURL, std::string _menufontURL): title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), m_presetName("None")
{
int x; int y;
@ -81,12 +81,18 @@ Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTa
this->beatDetect = beatDetect;
this->textureManager = textureManager;
#ifdef USE_FTGL
/** Reset fonts */
title_font = NULL;
other_font = NULL;
poly_font = NULL;
/**f Load the standard fonts */
title_font = new FTGLPixmapFont(title_fontURL.c_str());
poly_font = new FTGLPolygonFont(title_fontURL.c_str());
other_font = new FTGLPixmapFont(menu_fontURL.c_str());
#endif /** USE_FTGL */
}
@ -460,19 +466,6 @@ void Renderer::reset(int w, int h)
#ifdef USE_FTGL
/**f Load the standard fonts */
if ( title_font == NULL && other_font == NULL ) {
char path[1024];
sprintf( path, "%s%cVera.ttf", this->fontURL.c_str(), PATH_SEPARATOR );
title_font = new FTGLPixmapFont(path);
poly_font = new FTGLPolygonFont(path);
sprintf( path, "%s%cVeraMono.ttf", this->fontURL.c_str(), PATH_SEPARATOR );
other_font = new FTGLPixmapFont(path);
}
#endif /** USE_FTGL */
if (!this->renderTarget->useFBO)
{