Changeset 5251 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Sep 25, 2005, 1:13:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver change between fonts in Shell

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (7 diffs)
• shell.h (modified) (2 diffs)

trunk/src/lib/shell/shell.cc

@@ -64 +64 @@
   this->lineSpacing = 0;
   this->bActive = false;
+  this->fontFile = NULL;
+  this->setFont("fonts/dpquake_.ttf");
 
   // BUFFER
@@ -88 +90 @@
   delete[] this->bufferText;
   delete this->bufferIterator;
-
+  delete[] this->fontFile;
   // delete the inputLine
   delete this->shellInput;
@@ -123 +125 @@
 void Shell::deactivate()
 {
+   this->setFont("fonts/dark_crystal.ttf");
+   this->rebuildText();
+
   if (this->bActive == false)
     PRINTF(3)("The shell is already inactive\n");
@@ -140 +145 @@
 
   this->bufferOffset = 0;
+}
+
+/**
+ * sets the File to load the fonts from
+ * @param fontFile the file to load the font from
+ */
+void Shell::setFont(const char* fontFile)
+{
+  if (this->fontFile != NULL)
+    delete[] this->fontFile;
+
+  this->fontFile = new char[strlen(fontFile)+1];
+  strcpy(this->fontFile, fontFile);
+
 }
 
@@ -154 +173 @@
   this->textSize = textSize;
   this->lineSpacing = lineSpacing;
-  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
+  this->shellInput->setFont(this->fontFile, this->textSize);
 
 //  this->rebuildText();
@@ -166 +185 @@
 void Shell::rebuildText()
 {
-  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
+  this->shellInput->setFont(this->fontFile, this->textSize);
   this->shellInput->setColor(1, 0, 0);
   this->shellInput->setAlignment(TEXT_ALIGN_LEFT);
@@ -181 +200 @@
 void Shell::setBufferDisplaySize(unsigned int bufferDisplaySize)
 {
+  Text** bufferText = this->bufferText;
+  this->bufferText = NULL;
+  if (bufferText != NULL)
+  {
+    for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
+      delete bufferText[i];
+    delete[] bufferText;
+  }
+
+  bufferText = new Text*[bufferDisplaySize];
+  for (unsigned int i = 0; i < bufferDisplaySize; i++)
+  {
+    bufferText[i] = TextEngine::getInstance()->createText(this->fontFile, this->textSize, TEXT_RENDER_DYNAMIC);
+    bufferText[i]->setColor(1, 0, 0);
+    bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
+    bufferText[i]->setRelCoor2D(calculateLinePosition(i));
+    bufferText[i]->setText(NULL);
+    bufferText[i]->setParent2D(this);
+  }
+  this->bufferDisplaySize = bufferDisplaySize;
+
+  this->bufferText = bufferText;
+  this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
+}
+
+/**
+ * deletes all the Buffers
+ */
+void Shell::flush()
+{
+  // remove all chars from the BufferTexts.
   if (this->bufferText != NULL)
-  {
-    for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
-      delete this->bufferText[i];
-    delete[] this->bufferText;
-  }
-
-  this->bufferText = new Text*[bufferDisplaySize];
-  for (unsigned int i = 0; i < bufferDisplaySize; i++)
-  {
-    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/dpquake_.ttf", this->textSize, TEXT_RENDER_DYNAMIC);
-    this->bufferText[i]->setColor(1, 0, 0);
-    this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
-    this->bufferText[i]->setRelCoor2D(calculateLinePosition(i));
-    this->bufferText[i]->setText(NULL);
-    this->bufferText[i]->setParent2D(this);
-  }
-  this->bufferDisplaySize = bufferDisplaySize;
-
-  this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
-}
-
-/**
- * deletes all the Buffers
- */
-void Shell::flush()
-{
-  // remove all chars from the BufferTexts.
-  if (this->bufferText)
     for (int i = 0; i < this->bufferDisplaySize; i++)
     {

trunk/src/lib/shell/shell.h

@@ -48 +48 @@
     inline bool isActive() const { return this->bActive; };
 
+    void setFont(const char* fontFile);
     void setTextSize(unsigned int textSize, unsigned int lineSpacing = 1);
     void rebuildText();
@@ -83 +84 @@
     unsigned int             lineSpacing;            //!< The Spacing between lines.
     unsigned int             textSize;               //!< The size of the text.
-    char*                    textFont;               //!< The file containing the font.
+    char*                    fontFile;               //!< The file containing the font.
 
     // HANDLING TEXT INPUT