Changeset 5208 in orxonox.OLD for trunk/src/lib

Timestamp:

Sep 19, 2005, 8:36:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: first fruits of valgrind…. delete[] are fine now

Location:

trunk/src/lib

Files:

• graphics/text_engine.cc (modified) (1 diff)
• shell/shell.cc (modified) (6 diffs)
• shell/shell.h (modified) (2 diffs)
• shell/shell_input.h (modified) (1 diff)

trunk/src/lib/graphics/text_engine.cc

@@ -104 +104 @@
 
   tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (!tmpFont)
+  if (tmpFont == NULL)
   {
     PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);

trunk/src/lib/shell/shell.cc

@@ -41 +41 @@
     ->describe("Deactivates the Shell. (moves it into background)")
     ->setAlias("hide");
+SHELL_COMMAND(textsize, Shell, setTextSize)
+    ->describe("Sets the size of the Text (size, linespacing)");
 
 /**
@@ -57 +59 @@
   this->setAbsCoor2D(3, -400);
   this->textSize = 15;
-  this->lineSpacing = 5;
+  this->lineSpacing = 0;
   this->bActive = false;
 
@@ -72 +74 @@
   // EVENT-Handler subscription of '`' to all States.
   EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
-
 }
 
@@ -139 +140 @@
   this->textSize = textSize;
   this->lineSpacing = lineSpacing;
-
-  this->rebuildText();
+  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
+
+//  this->rebuildText();
 }
 
@@ -150 +152 @@
 void Shell::rebuildText()
 {
-  this->shellInput->setFont("fonts/Aniron_Bold.ttf", this->textSize);
+  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
   this->shellInput->setColor(1, 0, 0);
   this->shellInput->setAlignment(TEXT_ALIGN_LEFT);
-  this->shellInput->setText(NULL);
   this->shellInput->setParent2D(this);
   this->shellInput->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
@@ -176 +177 @@
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
   {
-    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_RENDER_DYNAMIC);
+    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);

trunk/src/lib/shell/shell.h

@@ -4 +4 @@
  *
  * @todo check for smooth deletion process
+ * @todo Buffer Display in different Colors for different debug mode.
  */
 
@@ -78 +79 @@
     unsigned int             lineSpacing;            //!< The Spacing between lines.
     unsigned int             textSize;               //!< The size of the text.
+    char*                    textFont;               //!< The file containing the font.
 
     // HANDLING TEXT INPUT

trunk/src/lib/shell/shell_input.h

@@ -2 +2 @@
  * @file shell_input.h
  * @brief Definition of ...
+ * @todo AutoCompletion should print nice output
+ * @todo move up and down in Buffer
+ * @todo display old shell Commands
 */