seba
/
libsegl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
seba 2008-02-15 21:04:57 +01:00
parent a3731df27c 996c52b22e
commit 2df5ba43f3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glfontengine.cpp
View File

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

2
glsdlscreen.cpp
View File

@ -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();
} }