Changeset 7757 in orxonox.OLD

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

Files:

• graphics/text_engine/multi_line_text.cc (modified) (3 diffs)
• graphics/text_engine/multi_line_text.h (modified) (2 diffs)
• shell/shell.cc (modified) (7 diffs)
• shell/shell.h (modified) (1 diff)

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();

trunk/src/lib/shell/shell.cc

@@ -67 +67 @@
     EventHandler::getInstance()->subscribe(this, ES_SHELL, SDLK_PAGEUP);
     EventHandler::getInstance()->subscribe(this, ES_SHELL, SDLK_PAGEDOWN);
+    EventHandler::getInstance()->subscribe(this, ES_SHELL, EV_VIDEO_RESIZE);
 
     // BUFFER
@@ -76 +77 @@
 
     // Element2D and generals
+    this->setSizeX2D(GraphicsEngine::getInstance()->getResolutionX());
     this->setAbsCoor2D(3, -400);
     this->textSize = 15;
@@ -136 +138 @@
         (*text)->setText("");
     }
-    repositionText();
+    this->updateResolution( GraphicsEngine::getInstance()->getResolutionX());
+    this->repositionText();
   }
 
@@ -226 +229 @@
   {
     this->backgroundMaterial.setDiffuseMap(fileName);
+  }
+
+
+  /**
+   * @brief updates the Shell's Width
+   * @param width the new Width.
+   */
+  void Shell::updateResolution(unsigned int width)
+  {
+    if (width == this->getSizeX2D())
+      return;
+    this->setSizeX2D(width);
+    for (std::list<MultiLineText*>::iterator textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt)
+    {
+      (*textIt)->setLineWidth(width);
+    }
   }
 
@@ -402 +421 @@
 
 
-      (*textIt)->setRelCoor2D(calculateLinePosition( (linePos++ > 0)? linePos : 0));
+      (*textIt)->setRelCoor2D(calculateLinePosition( (linePos++ > 0) ? linePos : 0));
       (*textIt)->setText((*it));
     }
@@ -446 +465 @@
         this->moveDisplayBuffer(-this->bufferDisplaySize+1);
       }
+      else if (event.type == EV_VIDEO_RESIZE)
+      {
+        this->updateResolution(event.resize.w);
+        this->repositionText();
+      }
     }
   }
@@ -487 +511 @@
   Vector2D Shell::calculateLinePosition(unsigned int lineNumber)
   {
-    return Vector2D(5, (int)(this->textSize + this->lineSpacing)*(int)((int)this->bufferDisplaySize - (int)lineNumber - (int)2) + (int)this->textSize);
+    return Vector2D(5.0f, (float)(this->textSize + this->lineSpacing)*(float)((int)this->bufferDisplaySize - (int)lineNumber - (int)1));
   }
 

trunk/src/lib/shell/shell.h

@@ -81 +81 @@
     void testShell() const;
   private:
+    void updateResolution(unsigned int width);
     void repositionText();
     void applyTextSettings(Text* text);