Changeset 5369 in orxonox.OLD for trunk/src

Timestamp:

Oct 13, 2005, 12:39:28 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver font-changing in the Shell

Location:

trunk/src/lib

Files:

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

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

@@ -428 +428 @@
                                                0xFF000000
 #else
-                                                   0xFF000000,
+                                               0xFF000000,
                                                0x00FF0000,
                                                0x0000FF00,
@@ -497 +497 @@
   glGenTextures(1, &texture);
   glBindTexture(GL_TEXTURE_2D, texture);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexImage2D(GL_TEXTURE_2D,
                0,

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

@@ -23 +23 @@
 
 /* some default values */
-#define FONT_NUM_COLORS              256                        //!< number of colors.
+#define FONT_NUM_COLORS              256           //!< number of colors.
 
-#define FONT_HIGHEST_KNOWN_CHAR      128                        //!< The highest character known to the textEngine.
-
+#define FONT_HIGHEST_KNOWN_CHAR      128           //!< The highest character known to the textEngine.
+#define FONT_DEFAULT_RENDER_SIZE     50            //!< At what Resolution to render fonts.
 // FORWARD DECLARATION
 

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

@@ -37 +37 @@
 
   if (fontFile != NULL)
-    this->setFont(fontFile, textSize);
+    this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
   this->setType(type);
   this->size = textSize;

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

@@ -58 +58 @@
     void init();
 
-    void setFont(const char* fontFile, unsigned int fontSize);
+    void setFont(const char* fontFile, unsigned int renderSize);
 
     void setText(const char* text, bool isExtern = false);
@@ -67 +67 @@
     inline void setBlending(float blending) { this->blending = blending; };
     /** sets the Color of the Text to render (values in [0-1]) @param r red @param g green @param b blue */
-    void setColor(float r, float g, float b) { this->color = Vector(r,g,b); };
+    void setColor(float r, float g, float b) { this->color = Vector(r, g, b); };
     /** sets the Size of the Font */
     void setSize(float size) { this->size = size; };
+    /** @returns the Size of the Text */
+    float getSize() const { return this->size; };
 
     void setType(TEXT_RENDER_TYPE type);

trunk/src/lib/shell/shell.cc

@@ -183 +183 @@
   this->textSize = textSize;
   this->lineSpacing = lineSpacing;
-  this->shellInput->setFont(this->fontFile, this->textSize);
-
-  this->rebuildText();
+  this->shellInput->setSize(this->textSize);
+  this->shellInput->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
+
+  if (this->bufferText != NULL)
+  {
+    for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
+    {
+      if (this->bufferText[i] != NULL)
+      {
+        this->bufferText[i]->setSize(this->textSize);
+        this->bufferText[i]->setRelCoorSoft2D(calculateLinePosition(i));
+      }
+    }
+  }
+  this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
+
 }
 

trunk/src/lib/shell/shell_input.cc

@@ -208 +208 @@
   ShellBuffer::addBufferLineStatic("Execute Command: %s\n", this->inputLine);
 
+  if (strlen(this->inputLine) == 0)
+    return false;
+
   char* newCommand = new char[strlen(this->inputLine)+1];
   strcpy(newCommand, this->inputLine);
+
+  ShellCommandBase::execute(newCommand);
 
   // removing the eventually added Entry (from scrolling) to the List
@@ -227 +232 @@
   }
 
-  ShellCommandBase::execute(this->inputLine);
-
   this->flush();
 
-  return false;
+  return true;
 }