Changeset 5106 in orxonox.OLD

Timestamp:

Aug 23, 2005, 8:09:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: top-down shell, as proposed by patrick. This makes sense, becuase the general people knows only shells comming top down

Location:

trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (4 diffs)
• lib/lang/class_list.cc (modified) (2 diffs)
• util/shell.cc (modified) (16 diffs)
• util/shell.h (modified) (2 diffs)

trunk/src/lib/graphics/text_engine.cc

@@ -592 +592 @@
           if( glyphSurf != NULL )
             {
-
               SDL_SetAlpha(glyphSurf, 0, 0);
 
@@ -598 +597 @@
               TexCoord tmpTexCoord;
               tmpTexCoord.minU = (float)tmpRect.x/(float)tmpSurf->w;
-              tmpTexCoord.maxU = (float)(tmpRect.x +1 +tmpGlyph->width)/(float)tmpSurf->w;
+              tmpTexCoord.maxU = (float)(tmpRect.x +1 + tmpGlyph->width)/(float)tmpSurf->w;
               tmpTexCoord.minV = (float)tmpRect.y/(float)tmpSurf->w;
               tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
@@ -620 +619 @@
 
               // Outputting Glyphs to BMP-files.
-              /*
-                char outname[64];
+/*
+                char outname[512];
                 if (i < 10)
-                sprintf( outname, "glyph-00%d.bmp", i );
+                sprintf( outname, "%s-glyph-00%d.bmp", this->getName(), i );
                 else if (i <100)
-                sprintf( outname, "glyph-0%d.bmp", i );
+                  sprintf( outname, "%s-glyph-0%d.bmp", this->getName(), i );
                 else
-                sprintf( outname, "glyph-%d.bmp", i );
-                SDL_SaveBMP(tmpSurf, outname);
-              */
+                  sprintf( outname, "%s-glyph-%d.bmp", this->getName(), i );
+                SDL_SaveBMP(tmpSurf, outname);*/
+
             }
         }
@@ -712 +711 @@
                   x = 0;
                   y = y + maxLineHeight;
-                  maxLineHeight = 0;
+                  //maxLineHeight = 0;
                 }
               if (y + maxLineHeight + 1 > size)

trunk/src/lib/lang/class_list.cc

@@ -285 +285 @@
 }
 
+/**
+ * converts a ClassID into a string
+ * @param classID the ClassID to search for
+ * @return a String containing the name of the Class, NULL if the Class was not found
+ */
 const char* ClassList::IDToString(ClassID classID)
 {
@@ -300 +305 @@
 }
 
+/**
+ * converts a String into a ClassID
+ * @param className the name of the class to search for
+ * @return the ClassID. CL_NULL, if the class was not found.
+ */
 long ClassList::StringToID(const char* className)
 {

trunk/src/util/shell.cc

@@ -25 +25 @@
 #include "load_param.h"
 #include "class_list.h"
+
+#include "key_names.h"
 #include "debug.h"
 #include <stdarg.h>
@@ -40 +42 @@
   this->setName("Shell");
 
+  this->shellHeight = 400;
   this->buffer = new tList<char>;
 
-  this->textSize = 10;
+  this->textSize = 15;
+  this->lineSpacing = 5;
 
   //this->bufferSize = 0;
   this->bufferText = NULL;
   this->setBufferSize(100);
+  this->bufferDisplaySize = 10;
   this->setBufferDisplaySize(10);
-  this->setAbsCoor2D(3, GraphicsEngine::getInstance()->getResolutionY());
+  this->setAbsCoor2D(3, -400);
   this->delayed = 0;
   this->setRepeatDelay(.3, .05);
   this->pressedKey = SDLK_FIRST;
 
-  this->inputLineText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 255, 0, 0);
-  this->inputLineText->setAlignment(TEXT_ALIGN_LEFT);
-  this->inputLineText->setText(NULL);
+  this->inputLineText = NULL;
   this->inputLine = new char[1];
   this->inputLine[0] = '\0';
-  this->inputLineText->setParent2D(this);
-
+
+  this->rebuildText();
   this->completionList = NULL;
 
+  // EVENT-Handler subscription of '`' to all States, and all other keyboard commands to ES_SEHLL
   EventHandler* evh = EventHandler::getInstance();
   evh->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
@@ -78 +82 @@
   for (int i = 0; i < this->bufferDisplaySize; i++)
     delete this->bufferText[i];
-  delete this->bufferText;
+  delete[] this->bufferText;
 
   // delete the inputLine
@@ -100 +104 @@
 }
 
+
+void Shell::activate()
+{
+  EventHandler::getInstance()->setState(ES_SHELL);
+  this->setRelCoorSoft2D(0, 0, 1, 5);
+}
+
+void Shell::deactivate()
+{
+  EventHandler::getInstance()->setState(ES_GAME);
+  this->setRelCoorSoft2D(0, -400, 1, 5);
+}
+
+void Shell::setTextSize(unsigned int textSize, unsigned int lineSpacing)
+{
+  this->textSize = textSize;
+  this->lineSpacing = lineSpacing;
+
+  this->rebuildText();
+}
+
+void Shell::rebuildText()
+{
+  if (this->inputLineText == NULL)
+    delete this->inputLineText;
+  this->inputLineText = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
+  this->inputLineText->setAlignment(TEXT_ALIGN_LEFT);
+  this->inputLineText->setText(NULL);
+  this->inputLineText->setParent2D(this);
+  this->inputLineText->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize);
+
+  this->setBufferDisplaySize(this->bufferDisplaySize);
+}
+
+
+
 /**
  * sets The count of Lines to display in the buffer.
@@ -110 +150 @@
     for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
       delete this->bufferText[i];
-    delete this->bufferText;
+    delete[] this->bufferText;
   }
 
@@ -116 +156 @@
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
   {
-    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/earth.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
+    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
     this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
-    this->bufferText[i]->setRelCoor2D(5, 12+12*i);
+    this->bufferText[i]->setRelCoor2D(5, (this->textSize + this->lineSpacing)*i);
     this->bufferText[i]->setText(NULL);
     this->bufferText[i]->setParent2D(this);
   }
-
-
   this->bufferDisplaySize = bufferDisplaySize;
+
+  this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
 }
 
@@ -157 +197 @@
  * @param line the Line as in the first argument in printf
  * @param args the arguments as a va_list
- *
- * @todo optimize
  */
 bool Shell::addBufferLineStatic(const char* line, ...)
@@ -178 +216 @@
   return true;
 }
-int curr = 0;
 
 /**
@@ -213 +250 @@
    }
    this->bufferText[0]->setText(newLine);
-   // this->bufferText->
-//  this->inputLineText->setText(newLine);
 }
 
@@ -250 +285 @@
 }
 
-
 /**
  * deletes the InputLine
@@ -262 +296 @@
   this->inputLine = new char[1];
   *this->inputLine = '\0';
-
 }
 
@@ -320 +353 @@
 bool Shell::executeCommand()
 {
-
   this->addBufferLineStatic("Execute Command: %s\n", this->inputLine);
   delete this->inputLine;
@@ -341 +373 @@
 }
 
-
-#include "key_names.h"
 /**
  * listens for some event
@@ -356 +386 @@
       if (EventHandler::getInstance()->getState() == ES_GAME)
       {
-        EventHandler::getInstance()->setState(ES_SHELL);
-        this->setRelCoorSoft2D(0, GraphicsEngine::getInstance()->getResolutionY()-150, 1, 5);
+        this->activate();
       }
 
       else
       {
-        EventHandler::getInstance()->setState(ES_GAME);
-        this->setRelCoorSoft2D(0, GraphicsEngine::getInstance()->getResolutionY()+10, 1, 5);
+        this->deactivate();
       }
     }
@@ -432 +460 @@
 
 //  glTexCoord2f(this->texCoord.maxU, this->texCoord.minV);
-  glVertex2f(this->getAbsCoor2D().x + 800, this->getAbsCoor2D().y  );
+  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y  );
 
 //  glTexCoord2f(this->texCoord.maxU, this->texCoord.maxV);
-  glVertex2f(this->getAbsCoor2D().x + 800, this->getAbsCoor2D().y + 150);
+  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
 
 //  glTexCoord2f(this->texCoord.minU, this->texCoord.maxV);
-  glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + 150);
+  glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
 
   glEnd();
@@ -655 +683 @@
 }
 
-
-
 /**
  * displays some nice output from the Shell

trunk/src/util/shell.h

@@ -36 +36 @@
 
 
-    void setBufferSize(unsigned int bufferSize) { this->bufferSize = bufferSize; };
+    void activate();
+    void deactivate();
 
-    void setBufferDisplaySize(unsigned int bufferDisplaySize);
+    void setTextSize(unsigned int textSize, unsigned int lineSpacing = 1);
+    void rebuildText();
 
     // BUFFER //
+    void setBufferSize(unsigned int bufferSize) { this->bufferSize = bufferSize; };
+    void setBufferDisplaySize(unsigned int bufferDisplaySize);
     void flushBuffers();
     static bool addBufferLineStatic(const char* line, ...);
@@ -96 +100 @@
     unsigned int           textSize;               //!< The size of the text.
     unsigned int           lineSpacing;            //!< The Spacing between lines.
+    unsigned int           shellHeight;            //!< The hight of the Shell in Pixels
 
     char                   bufferArray[10000];     //!< a BUFFER for fast writing