Browse Source

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

seba 12 years ago
parent
commit
2df5ba43f3
2 changed files with 8 additions and 0 deletions
  1. 6
    0
      glfontengine.cpp
  2. 2
    0
      glsdlscreen.cpp

+ 6
- 0
glfontengine.cpp View File

@@ -68,6 +68,7 @@ GLFontEngine::GLFontEngine(std::string fontstr) {
68 68
 
69 69
 void GLFontEngine::init() {
70 70
 // 	r = g = b = a = 1.0f;
71
+	col.set(1.0f, 1.0f, 1.0f);
71 72
 	fsize = 16;
72 73
 }
73 74
 
@@ -105,6 +106,11 @@ void GLFontEngine::renderText(std::string text, SDL_Rect pos) {
105 106
 
106 107
 void GLFontEngine::renderLine(std::string text, SDL_Rect pos) {
107 108
 // 	glColor4f(r, g, b, a);
109
+
110
+	glMatrixMode(GL_TEXTURE);
111
+	glLoadIdentity();
112
+	glMatrixMode(GL_MODELVIEW);
113
+
108 114
 	glColorGLC(col);
109 115
 	
110 116
 	if(fontloaded) {

+ 2
- 0
glsdlscreen.cpp View File

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

Loading…
Cancel
Save