Arbeit auf Orchesterfahrt
This commit is contained in:
parent
ef309c3240
commit
996c52b22e
|
@ -68,6 +68,7 @@ GLFontEngine::GLFontEngine(std::string fontstr) {
|
||||||
|
|
||||||
void GLFontEngine::init() {
|
void GLFontEngine::init() {
|
||||||
// r = g = b = a = 1.0f;
|
// r = g = b = a = 1.0f;
|
||||||
|
col.set(1.0f, 1.0f, 1.0f);
|
||||||
fsize = 16;
|
fsize = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,6 +106,11 @@ void GLFontEngine::renderText(std::string text, SDL_Rect pos) {
|
||||||
|
|
||||||
void GLFontEngine::renderLine(std::string text, SDL_Rect pos) {
|
void GLFontEngine::renderLine(std::string text, SDL_Rect pos) {
|
||||||
// glColor4f(r, g, b, a);
|
// glColor4f(r, g, b, a);
|
||||||
|
|
||||||
|
glMatrixMode(GL_TEXTURE);
|
||||||
|
glLoadIdentity();
|
||||||
|
glMatrixMode(GL_MODELVIEW);
|
||||||
|
|
||||||
glColorGLC(col);
|
glColorGLC(col);
|
||||||
|
|
||||||
if(fontloaded) {
|
if(fontloaded) {
|
||||||
|
|
|
@ -111,6 +111,8 @@ bool GLSDLScreen::apply() {
|
||||||
extraglparam();
|
extraglparam();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
glMatrixMode(GL_MODELVIEW);
|
||||||
|
|
||||||
// Texturen neuladen, eigentlich nur für Windows. Aber egal.
|
// Texturen neuladen, eigentlich nur für Windows. Aber egal.
|
||||||
GLTexture::reloadAll();
|
GLTexture::reloadAll();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue