From 996c52b22ec635c1e7b12123e38637d8e4c43bd1 Mon Sep 17 00:00:00 2001 From: seba Date: Fri, 15 Feb 2008 15:32:34 +0100 Subject: [PATCH] Arbeit auf Orchesterfahrt --- glfontengine.cpp | 6 ++++++ glsdlscreen.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/glfontengine.cpp b/glfontengine.cpp index 9dc68e1..80ccb48 100644 --- a/glfontengine.cpp +++ b/glfontengine.cpp @@ -68,6 +68,7 @@ GLFontEngine::GLFontEngine(std::string fontstr) { void GLFontEngine::init() { // r = g = b = a = 1.0f; + col.set(1.0f, 1.0f, 1.0f); fsize = 16; } @@ -105,6 +106,11 @@ void GLFontEngine::renderText(std::string text, SDL_Rect pos) { void GLFontEngine::renderLine(std::string text, SDL_Rect pos) { // glColor4f(r, g, b, a); + + glMatrixMode(GL_TEXTURE); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glColorGLC(col); if(fontloaded) { diff --git a/glsdlscreen.cpp b/glsdlscreen.cpp index b406ae2..d305fa6 100644 --- a/glsdlscreen.cpp +++ b/glsdlscreen.cpp @@ -111,6 +111,8 @@ bool GLSDLScreen::apply() { extraglparam(); } + glMatrixMode(GL_MODELVIEW); + // Texturen neuladen, eigentlich nur für Windows. Aber egal. GLTexture::reloadAll(); }