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

Timestamp:

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

Author:

bensch

Message:

font is a Material now

Location:

branches/fontdata/src/lib/graphics/text_engine

Files:

• font.cc (modified) (7 diffs)
• font.h (modified) (4 diffs)
• font_data.cc (modified) (1 diff)
• font_data.h (modified) (3 diffs)
• limited_width_text.cc (modified) (1 diff)
• multi_line_text.cc (modified) (2 diffs)
• text.cc (modified) (1 diff)

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;

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

@@ -17 +17 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public BaseObject /* TODO Material it should be */
+class Font : public Material /* TODO Material it should be */
 {
 
@@ -27 +27 @@
   virtual ~Font();
 
-  Font& operator=(const Font& font) { this->data = font.data; return *this; };
+  Font& operator=(const Font& font);
   bool operator==(const Font& font) const { return this->data == font.data; };
 
@@ -42 +42 @@
   inline TTF_Font* getTTF() const { return this->data->getTTF(); };
 
-  inline GLuint getTexture() const { return this->data->getTexture(); };
-
-
   int getMaxHeight() const;
   int getMaxAscent() const;
@@ -52 +49 @@
   //inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
+
   void createAsciiImage(const std::string& fileName, unsigned int size) const;
 
-  void debug() const ;
+  void debug() const;
 
 private:
   void init();
+  void initGlyphs(Uint16 from, Uint16 count);
   bool getGlyphMetrics(Glyph* glyph, Uint16 character);
+  static void initDefaultFont();
 
+  int findOptimalFastTextureSize();
   bool createFastTexture();
 
-  void initGlyphs(Uint16 from, Uint16 count);
-  int findOptimalFastTextureSize();
+  bool setTexture(GLuint texture);
 
-  static void initDefaultFont();
 
 private:

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

@@ -27 +27 @@
  */
 FontData::FontData()
+  : texData(new TextureData)
 {
+  printf("CREATE FONT_DATA\n");
   this->fontTTF = NULL;
   this->glyphArray = NULL;

branches/fontdata/src/lib/graphics/text_engine/font_data.h

@@ -48 +48 @@
 
 
-class FontData : public TextureData
+class FontData
 {
   friend class Font;
 public:
-  FontData();
   ~FontData();
 
@@ -65 +64 @@
 
 private:
+  FontData();
+
+private:
   TTF_Font*     fontTTF;             //!< The font we use for this.
   int           renderStyle;         //!< The Renderstyle
@@ -70 +72 @@
 
   Glyph**       glyphArray;          //!< An Array of all the Glyphs stored in the Array of Glyphs.
+
+  TextureDataPointer   texData;
 };
 

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

@@ -76 +76 @@
   glActiveTexture(GL_TEXTURE0);
 
-  glEnable(GL_BLEND);
-  glEnable(GL_TEXTURE_2D);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
+//   glEnable(GL_BLEND);
+//   glEnable(GL_TEXTURE_2D);
+//   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
+//
+//   glBindTexture(GL_TEXTURE_2D, this->font().getTexture());
+  this->font().select();
 
-  glBindTexture(GL_TEXTURE_2D, this->font().getTexture());
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);

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

@@ -76 +76 @@
   glActiveTexture(GL_TEXTURE0);
 
-  glColor4fv(&this->color()[0]);
+/*  glColor4fv(&this->color()[0]);
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
@@ -82 +82 @@
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
-  glBindTexture(GL_TEXTURE_2D, this->font().getTexture());
+  glBindTexture(GL_TEXTURE_2D, this->font().getTexture());*/
+  this->font().select();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);

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

@@ -228 +228 @@
 
 
-  glActiveTexture(GL_TEXTURE0);
+/*  glActiveTexture(GL_TEXTURE0);
 
   glEnable(GL_BLEND);
-  glEnable(GL_TEXTURE_2D);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
-  glBindTexture(GL_TEXTURE_2D, this->_font.getTexture());
+  glBindTexture(GL_TEXTURE_2D, this->_font.getTexture());*/
+  this->font().select();
+  //printf("Texture is : %d\n",);
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);