Merge someserver.de:/home/seba/projects/c++/libsegl

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) {

glsdlscreen.cpp

@@ -111,6 +111,8 @@ bool GLSDLScreen::apply() {
 			extraglparam();
 		}
 		
+		glMatrixMode(GL_MODELVIEW);
+
 		// Texturen neuladen, eigentlich nur für Windows. Aber egal.
 		GLTexture::reloadAll();
 	}