Changeset 7757 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

May 21, 2006, 11:07:48 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Resize of the Shell works quite nice

Location:

trunk/src/lib/graphics/text_engine

Files:

• multi_line_text.cc (modified) (3 diffs)
• multi_line_text.h (modified) (2 diffs)

trunk/src/lib/graphics/text_engine/multi_line_text.cc

@@ -26 +26 @@
  * @param type The renderType to display this font in
  */
-MultiLineText::MultiLineText(const std::string& fontFile, unsigned int textSize, unsigned int lineWidth)
+MultiLineText::MultiLineText(const std::string& fontFile, unsigned int textSize, float lineWidth)
   : Text(fontFile, textSize)
 {
   this->setClassID(CL_MULTI_LINE_TEXT, "MultiLineText");
 
-  this->lineSpacing = 1.0f;
+  this->lineSpacing = 1.0;
   this->lineCount = 0;
   this->setLineWidth(lineWidth);
@@ -93 +93 @@
   for (unsigned int i = 0; i < this->getText().size(); ++i)
   {
-    if (unlikely(!this->lineEnds.empty() && i == this->lineEnds[lineNumber]))
+    if (unlikely(this->lineEnds.size() > lineNumber && i == this->lineEnds[lineNumber]))
     {
       // go to the next Line.
       ++lineNumber;
-      posX = 0.0f;
+      posX = 10.0f;
       posY += this->lineSpacing + this->getSize(); //this->getFont()->getMaxHeight();
     }
@@ -149 +149 @@
       width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
   }
-
-  this->lineCount = lineEnds.size()+1;
+  this->lineCount = lineEnds.size() + 1;
   this->setSizeY2D((this->lineEnds.size()+1) * (this->lineSpacing + this->getFont()->getMaxHeight()));
 }
+
+void MultiLineText::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];
+  }
+}

trunk/src/lib/graphics/text_engine/multi_line_text.h

@@ -15 +15 @@
 {
   public:
-    MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, unsigned int lineWidth = 100.0);
+    MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);
 
     // Setup:
@@ -30 +30 @@
     virtual void draw() const;
 
+    void debug() const;
+
   protected:
     virtual void setupTextWidth();