Changeset 3748 in orxonox.OLD

Timestamp:

Apr 7, 2005, 5:29:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: now the Glyph is transparent

File:

• orxonox/branches/textEngine/src/lib/graphics/font/glfont.cc (modified) (6 diffs)

orxonox/branches/textEngine/src/lib/graphics/font/glfont.cc

@@ -471 +471 @@
   // Surface definition.
   SDL_Rect tmpRect; // this represents a Rectangle for blitting.
-  SDL_Surface* tmpSurf =  SDL_CreateRGBSurface(
-                                               SDL_SWSURFACE,
+  SDL_Surface* tmpSurf =  SDL_CreateRGBSurface(SDL_SWSURFACE,
                                                rectSize, rectSize,
                                                32,
@@ -487 +486 @@
 #endif
                                                );
-
   tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = tmpSurf->w; tmpRect.h = tmpSurf->h;
   SDL_SetClipRect(tmpSurf, &tmpRect);
@@ -515 +513 @@
             }
           // reading in the new Glyph
-          glyphSurf = TTF_RenderGlyph_Shaded(this->font,
-                                              i,
-                                              this->currentText->color,
-          tmpColor);
+          //glyphSurf = TTF_RenderGlyph_Shaded(this->font, i, this->currentText->color, tmpColor);
+          glyphSurf = TTF_RenderGlyph_Blended(this->font, i, this->currentText->color);
           if( glyphSurf ) 
             {
+
+              SDL_SetAlpha(glyphSurf, 0, 0);
+
               SDL_BlitSurface(glyphSurf, NULL, tmpSurf, &tmpRect);
               TexCoord tmpTexCoord;
@@ -534 +533 @@
               glVertex2d(0, 0);
               glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.maxV);
-              glVertex2d(0, tmpRect.y);
+              glVertex2d(0, tmpGlyph->height);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.maxV);
-              glVertex2d(tmpRect.x, tmpRect.y);
+              glVertex2d(tmpGlyph->width, tmpGlyph->height);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.minV);
-              glVertex2d(tmpRect.x, 0);
+              glVertex2d(tmpGlyph->width, 0);
               glEnd();
               glEndList();
@@ -559 +558 @@
         }
     }
-
-  GLuint tmpRet = this->loadTexture(tmpSurf, NULL);
+  GLuint texture;
+  glGenTextures(1, &texture);
+  glBindTexture(GL_TEXTURE_2D, texture);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexImage2D(GL_TEXTURE_2D,
+               0,
+               GL_RGBA,
+               tmpSurf->w, tmpSurf->h,
+               0,
+               GL_RGBA,
+               GL_UNSIGNED_BYTE,
+               tmpSurf->pixels);
   SDL_FreeSurface(tmpSurf);
-  return tmpRet;
+  return texture;
 }
 
@@ -590 +600 @@
       texCoord->maxV = (GLfloat)surface->h / h;
     }
-  image = SDL_CreateRGBSurface(
-                               SDL_SWSURFACE,
+  image = SDL_CreateRGBSurface(SDL_SWSURFACE,
                                w, h,
                                32,