Changeset 8538 in orxonox.OLD

Timestamp:

Jun 16, 2006, 4:36:12 PM (18 years ago)

Author:

bensch

Message:

limited text-lenght

Location:

branches/gui/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/text_engine/limited_width_text.cc (copied) (copied from branches/gui/src/lib/graphics/text_engine/multi_line_text.cc) (8 diffs)
• lib/graphics/text_engine/limited_width_text.h (copied) (copied from branches/gui/src/lib/graphics/text_engine/multi_line_text.h) (3 diffs)
• lib/gui/gl/glgui_defs.h (modified) (4 diffs)

branches/gui/src/defs/class_id.h

@@ -287 +287 @@
   CL_TEXT                       =    0x00804000,
   CL_MULTI_LINE_TEXT            =    0x00000840,
+  CL_LIMITED_WIDTH_TEXT         =    0x00000841,
 
   // Texutres.

branches/gui/src/lib/graphics/Makefile.am

@@ -15 +15 @@
                            text_engine/text.cc \
                            text_engine/multi_line_text.cc \
+                           text_engine/limited_width_text.cc \
                            text_engine/font.cc \
                            \
@@ -40 +41 @@
                  text_engine/text.h \
                  text_engine/multi_line_text.h \
+                 text_engine/limited_width_text.h \
                  text_engine/font.h \
                  text_engine/default_font.xpm \

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
-#include "multi_line_text.h"
+#include "limited_width_text.h"
 #include "font.h"
 
@@ -24 +24 @@
  * @param type The renderType to display this font in
  */
-MultiLineText::MultiLineText(const std::string& fontFile, unsigned int textSize, float lineWidth)
-  : Text(fontFile, textSize)
+LimitedWidthText::LimitedWidthText(const std::string& fontFile, unsigned int textSize, float lineWidth, DotsPosition dotsPosition)
+    : Text(fontFile, textSize)
 {
-  this->setClassID(CL_MULTI_LINE_TEXT, "MultiLineText");
+  this->setClassID(CL_LIMITED_WIDTH_TEXT, "LimitedWidthText");
 
-  this->lineSpacing = 1.0;
-  this->lineCount = 0;
+  this->_dotsPosition = End;
   this->setLineWidth(lineWidth);
 }
@@ -38 +37 @@
  * @param lineWidth the maximum lineWidth.
  */
-void MultiLineText::setLineWidth(float lineWidth)
+void LimitedWidthText::setLineWidth(float lineWidth)
 {
-  this->lineWidth = lineWidth;
+  this->_lineWidth = lineWidth;
   this->setSizeX2D(lineWidth);
   this->setupTextWidth();
@@ -47 +46 @@
 
 /**
- * @param lineSpacing: the Spacing between the lines
- */
-void MultiLineText::setLineSpacing(float lineSpacing)
-{
-   this->lineSpacing = lineSpacing;
-   this->setupTextWidth();
-}
-
-
-/**
  * @brief draws the Text
  */
-void MultiLineText::draw() const
+void LimitedWidthText::draw() const
 {
-  if (unlikely(this->getText().empty()))
+  if (unlikely(this->_dotedText.empty()))
     return;
   glPushMatrix();
   glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
-  // TODO make the Stuff with the alignment
   if (this->getAlignment() == TEXT_ALIGN_RIGHT)
     glTranslatef(-this->getSizeX2D(), 0, 0);
@@ -74 +62 @@
   // drawing this Text.
   // setting the Blending effects
+  glColor4fv(&this->getColor()[0]);
+
+
   glActiveTexture(GL_TEXTURE0);
 
-  glColor4fv(&this->getColor()[0]);
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
@@ -83 +73 @@
 
   glBindTexture(GL_TEXTURE_2D, this->getFont()->getTexture());
-  glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
+  glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
 
   Glyph* tmpGlyph;
   float posX = 0.0f;
-  float posY = 0.0f;
-  unsigned int lineNumber = 0;
-
   glBegin(GL_QUADS);
-  for (unsigned int i = 0; i < this->getText().size(); ++i)
+  for (unsigned int i = 0; i < this->_dotedText.size(); i++)
   {
-    if (unlikely(this->lineEnds.size() > lineNumber && i == this->lineEnds[lineNumber]))
-    {
-      // go to the next Line.
-      ++lineNumber;
-      posX = 0.0f;
-      posY += this->lineSpacing + this->getSize(); //this->getFont()->getMaxHeight();
-    }
-
-    if(likely((tmpGlyph = this->getFont()->getGlyphArray()[this->getText()[i]]) != NULL))
+    if(likely((tmpGlyph = this->getFont()->getGlyphArray()[this->_dotedText[i]]) != NULL))
     {
       glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-      glVertex2d(posX+tmpGlyph->maxX*this->getSize(), posY);
+      glVertex2d(posX+tmpGlyph->maxX*this->getSize(), 0);
 
       glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-      glVertex2d(posX+tmpGlyph->maxX*this->getSize(), posY + this->getSize());
+      glVertex2d(posX+tmpGlyph->maxX*this->getSize(), this->getSize());
 
       glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-      glVertex2d(posX+tmpGlyph->minX*this->getSize(), posY+ this->getSize());
+      glVertex2d(posX+tmpGlyph->minX*this->getSize(), this->getSize());
 
       glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
-      glVertex2d(posX+tmpGlyph->minX*this->getSize(), posY);
+      glVertex2d(posX+tmpGlyph->minX*this->getSize(), 0);
 
       posX += tmpGlyph->advance * this->getSize();
@@ -128 +107 @@
  * @brief setting up the Text-Width if DYNAMIC
  */
-void MultiLineText::setupTextWidth()
+void LimitedWidthText::setupTextWidth()
 {
-  this->lineEnds.clear();
+  float dotsSize = this->getFont()->getGlyphArray()[46]->advance * 3.0;
+
   float width = 0.0f;
-  float maxWidth = this->lineWidth / this->getSize();
+  float maxWidth = this->_lineWidth / this->getSize();
 
-  for (unsigned int i = 0; i < this->getText().size(); i++)
+  switch (this->_dotsPosition)
   {
-    if (width > maxWidth || this->getText()[i] == '\n')
-    {
-      if (likely(i > 0))
+    case End:
+      for (unsigned int i = 0; i < this->getText().size(); i++)
       {
-        this->lineEnds.push_back( i -1 );
-        width = this->getFont()->getGlyphArray()[this->getText()[i-1]]->advance;
+        if (width + dotsSize > maxWidth )
+        {
+          this->_dotedText = this->getText().substr(0, i) + "...";
+          width += dotsSize;
+          break;
+        }
+        // Advance the Text.
+        if(this->getFont()->getGlyphArray()[this->getText()[i]] != NULL)
+          width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
       }
-      else
-        width = 0.0f;
-    }
-
-    // Advance the Text.
-    if(this->getFont()->getGlyphArray()[this->getText()[i]] != NULL)
-      width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
+      this->setSizeX2D(width);
+      break;
+    case Begin:
+      for (unsigned int i = this->getText().size() - 1; i < 0; i--)
+      {
+        if (width + dotsSize > maxWidth )
+        {
+          this->_dotedText = std::string("...") + this->getText().substr(i);
+          width += dotsSize;
+          break;
+        }
+        // Advance the Text.
+        if(this->getFont()->getGlyphArray()[this->getText()[i]] != NULL)
+          width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
+      }
+      this->setSizeX2D(width);
+      break;
   }
-  this->lineCount = lineEnds.size() + 1;
-  this->setSizeY2D((this->lineEnds.size()+1) * (this->lineSpacing + this->getFont()->getMaxHeight()));
 }
 
@@ -158 +152 @@
  * @brief print out some nice debug output
  */
-void MultiLineText::debug() const
+void LimitedWidthText::debug() const
 {
- printf("Debug %s::%s: %d lines\n", this->getClassName(), this->getName(), this->getLineCount());
-
- std::string tmpText = this->getText();
- std::vector<unsigned int> ends = this->lineEnds;
- ends.push_back(tmpText.size());
-
- unsigned int prev = 0;
-  for (unsigned int i = 0; i < ends.size(); i++)
-  {
-    printf("Line %d: %s\n", i, tmpText.substr(prev, ends[i] - prev).c_str());
-    prev = ends[i];
-  }
+  printf("Debug %s::%s \n", this->getClassName(), this->getName() );
 }

branches/gui/src/lib/graphics/text_engine/limited_width_text.h

@@ -1 +1 @@
 /*!
- * @file multi_line_text.h
+ * @file limited_width_text.h
  * @brief Definition of a text Class, that is able to render text.
  */
 
-#ifndef _MULTI_LINE_TEXT_H
-#define _MULTI_LINE_TEXT_H
+#ifndef _LIMITED_WIDTH_TEXT_H
+#define _LIMITED_WIDTH_TEXT_H
 
 #include "text.h"
@@ -12 +12 @@
 
 //! Represents one textElement.
-class MultiLineText : public Text
+class LimitedWidthText : public Text
 {
   public:
-    MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);
+    typedef enum {
+      Begin,
+      End,
+    } DotsPosition;
+
+
+  public:
+    LimitedWidthText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0, DotsPosition dotsPosition = Begin);
 
     // Setup:
     void setLineWidth(float lineWidth);
-    void setLineSpacing(float lineSpacing);
+    void setDotsPosition(DotsPosition dotsPosition);
 
     // Retrieve:
     /** @returns the LineWidth (maximum distance from the left to the right */
-    inline float getLineWidth() const { return this->lineWidth; };
-    /** @returns the LineSpacing */
-    inline float getLineSpacing() const { return this->lineSpacing; };
-    inline unsigned int getLineCount() const { return this->lineCount; };
-
+    inline float lineWidth() const { return this->_lineWidth; };
+    /** @returns the dots position. */
+    inline float dotsPosition() const { return this->_dotsPosition; };
     virtual void draw() const;
 
@@ -36 +41 @@
 
   private:
-    float                      lineWidth;
-    float                      lineSpacing;
-    std::vector<unsigned int>  lineEnds;
-    unsigned int               lineCount;
+    std::string                _dotedText;
+
+    DotsPosition               _dotsPosition;
+    float                      _lineWidth;
+    unsigned int               _lineEnds;
 };
 
-#endif /* _MULTI_LINE_TEXT_H */
+#endif /* _LIMITED_WIDTH_TEXT_H */

branches/gui/src/lib/gui/gl/glgui_defs.h

@@ -22 +22 @@
   } Orientation;
 
+  //! Names of Orientations
   const std::string OrientationString[] = {
     "Horizontal",
@@ -30 +31 @@
   typedef enum {
     Normal,           //!< Normal state of the GUI's Widgets.
-    Active,           //!< If the widget is Active.
+    Focused,           //!< If the widget is Active.
     Selected,         //!< If the Widget is Selected.
     Insensitive       //!< If the Widget is insensitive.
@@ -38 +39 @@
 #define GLGUI_DEFAULT_STYLE OrxGui::Normal
 
+//! names of the States.
   const std::string StateString[] =
     {
       "Normal",
-      "Active",
+      "Focused",
       "Selected",
       "Insensitive"
@@ -54 +56 @@
     } FeaturePosition;
 
+    //! Names of Feature-Positions
     const std::string FeaturePositionString[] =
     {