Changeset 8758 in orxonox.OLD for branches/fontdata/src/lib/graphics/text_engine/font.cc

Timestamp:

Jun 23, 2006, 10:20:35 PM (19 years ago)

Author:

bensch

Message:

font is a Material now

File:

• branches/fontdata/src/lib/graphics/text_engine/font.cc (modified) (7 diffs)

branches/fontdata/src/lib/graphics/text_engine/font.cc

@@ -50 +50 @@
     this->loadFontFromTTF(fontFile, renderSize);
 }
+
 
 /**
@@ -108 +109 @@
 { }
 
+Font& Font::operator=(const Font& font)
+{
+  this->data = font.data;
+  this->setDiffuseMap(font.data->texData);
+
+  return *this;
+};
+
+
 /**
  * @brief initializes a Font (with default values)
@@ -113 +123 @@
 void Font::init()
 {
+  this->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
   this->setClassID(CL_FONT, "Font");
   if (Font::defaultFontData.get() == NULL)
@@ -152 +164 @@
   {
     this->setStyle("c");
-    this->createFastTexture();
-    if (this->getTexture() != 0)
+    if (this->createFastTexture())
       return true;
     else
@@ -186 +197 @@
   if (newSurf != NULL)
   {
-    this->data->setSurface(newSurf);
-    this->data->setAlpha(hasAlpha);
-    this->data->setTexture(Texture::loadTexToGL(newSurf));
+    this->data->texData->setSurface(newSurf);
+    this->data->texData->setAlpha(hasAlpha);
+    this->setTexture(Texture::loadTexToGL(newSurf));
   }
   else
@@ -479 +490 @@
 //       sprintf( outName, "%s-glyphs.bmp", this->getName());
 //       SDL_SaveBMP(tmpSurf, outName);
-  this->data->setAlpha(true);
-  if (this->data->setSurface(tmpSurf))
-    (this->data->setTexture(Texture::loadTexToGL(tmpSurf)));
+  this->data->texData->setAlpha(true);
+  if (this->data->texData->setSurface(tmpSurf))
+    this->setTexture(Texture::loadTexToGL(tmpSurf));
   return true;
 }
+
+/**
+ * @brief the Internal implementation of setting up the Texture.
+ * @param texture the Texture to load.
+ * @returns true on success, false otherwise.
+ */
+bool Font::setTexture(GLuint texture)
+{
+  bool retVal = this->data->texData->setTexture(texture);
+  this->setDiffuseMap(data->texData, 0);
+  printf("this->texture %d\n", texture);
+  //printf(this->getT)
+  this->debug();
+  return retVal;
+};
 
 /**
@@ -577 +603 @@
 void Font::debug() const
 {
+  Material::debug();
+
+  PRINT(0)("TEST %p and %p\n", this->data.get(), this->data->texData.get());
   // print the loaded font's style
   int style = TTF_STYLE_NORMAL;