Changeset 5119 in orxonox.OLD for trunk

Timestamp:

Aug 24, 2005, 3:22:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cleanup/some display stuff

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• util/shell.cc (modified) (9 diffs)
• util/shell.h (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -78 +78 @@
 PNode::~PNode ()
 {
-  printf("deleting %s::%s\n", this->getClassName(), this->getName());
   tIterator<PNode>* iterator = this->children->getIterator();
   PNode* pn = iterator->firstElement();

trunk/src/util/shell.cc

@@ -69 +69 @@
   EventHandler* evh = EventHandler::getInstance();
   evh->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
-  for (int i = 1; i < SDLK_F15; i++)
+  for (int i = 1; i < SDLK_LAST; i++)
     evh->subscribe(this, ES_SHELL, i);
 }
@@ -105 +105 @@
 
 
+/**
+ * activates the shell
+ *
+ * This also feeds the Last few lines from the main buffers into the displayBuffer
+ */
 void Shell::activate()
 {
@@ -119 +124 @@
 }
 
+/**
+ * deactiveates the Shell.
+ */
 void Shell::deactivate()
 {
@@ -130 +138 @@
 }
 
+/**
+ * sets the size of the text and spacing
+ * @param textSize the size of the Text in Pixels
+ * @param lineSpacing the size of the Spacing between two lines in pixels
+ *
+ * this also rebuilds the entire Text, inputLine and displayBuffer,
+ * to be accurate again.
+ */
 void Shell::setTextSize(unsigned int textSize, unsigned int lineSpacing)
 {
@@ -150 +166 @@
   this->setBufferDisplaySize(this->bufferDisplaySize);
 }
-
-
 
 /**
@@ -421 +435 @@
     {
       if (EventHandler::getInstance()->getState() == ES_GAME)
-      {
         this->activate();
-      }
-
       else
-      {
         this->deactivate();
-      }
-    }
+    }
+    else if (event.type == SDLK_F1)
+      this->help();
+    else if (event.type == SDLK_F2)
+      this->debug();
     else if (event.type == SDLK_TAB)
       this->autoComplete();
@@ -650 +663 @@
 }
 
-
-
 /**
  * searches for classes, which beginn with classNameBegin
@@ -719 +730 @@
 }
 
+void Shell::help() const
+{
+  PRINT(0)("Help for the most important Shell-commands\n");
+  PRINT(0)("F1 - HELP; F2 - DEBUG; ` - open/close shell\n");
+  PRINT(0)("input order:\n");
+  PRINT(0)("ClassName::objectName function [parameter1, [parameter2 ...]]  or\n");
+  PRINT(0)("Command [parameter]\n");
+}
+
 /**
  * displays some nice output from the Shell
@@ -724 +744 @@
 void Shell::debug() const
 {
+  PRINT(3)("Debugging output to console (not this shell)\n");
+
   if (this->pressedKey != SDLK_FIRST)
     printf("%s::%f %f\n", SDLKToKeyname(this->pressedKey), this->delayed, this->repeatDelay);
-}
+
+
+  char* tmpChar = this->bufferIterator->firstElement();
+  while(tmpChar != NULL)
+  {
+    printf(tmpChar);
+    tmpChar = this->bufferIterator->nextElement();
+  }
+}

trunk/src/util/shell.h

@@ -69 +69 @@
     virtual void draw() const;
 
+    void help() const;
     void debug() const;