Changeset 5207 in orxonox.OLD

Timestamp:

Sep 19, 2005, 10:00:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: default value can now be supplied as aditional arg of the SHELL_COMMAND-macro

Location:

trunk/src

Files:

• lib/shell/shell_command.cc (modified) (1 diff)
• lib/shell/shell_command.h (modified) (2 diffs)
• lib/shell/shell_input.cc (modified) (2 diffs)
• lib/util/helper_functions.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)
• orxonox.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -572 +572 @@
   return this;
 }
+
+/**
+ * sets default Values of the Commands
+ * @param count how many default Values to set.
+ * @param ... the default Values in order. They will be cast to the right type
+ * @returns itself
+ *
+ * Be aware, that when you use this Function, you !!MUST!! match the input as
+ * count, [EXACTLY THE SAME AS IF YOU WOULD CALL THE FUNCTION UP TO count ARGUMENTS]
+ */
+ShellCommandBase* ShellCommandBase::defaultValues(unsigned int count, ...)
+{
+  if (this == NULL)
+    return NULL;
+  if (count == 0)
+    return this;
+  if (count > this->paramCount)
+    count = this->paramCount;
+
+  va_list defaultList;
+  va_start(defaultList, count);
+
+  for (unsigned int i = 0; i < count; i++)
+  {
+    switch (this->parameters[i])
+    {
+      case ParameterBool:
+        this->defaultBools[i] = va_arg(defaultList, int);
+        break;
+      case ParameterChar:
+        this->defaultStrings[i] = new char[2];
+        sprintf(this->defaultStrings[0], "%c",  va_arg(defaultList, int));
+        break;
+      case ParameterString:
+        this->defaultStrings[i] = va_arg(defaultList, char*);
+        break;
+      case ParameterInt:
+        this->defaultInts[i] = va_arg(defaultList, int);
+        break;
+      case ParameterUInt:
+        this->defaultInts[i] = va_arg(defaultList, unsigned int);
+        break;
+      case ParameterFloat:
+        this->defaultFloats[i] = va_arg(defaultList, double);
+        break;
+      case ParameterLong:
+        this->defaultInts[i] = va_arg(defaultList, long);
+        break;
+      default:
+        break;
+    }
+  }
+
+  return this;
+}
+
 
 /**

trunk/src/lib/shell/shell_command.h

@@ -2 +2 @@
  * @file shell_command.h
  * Definition of a on-screen-shell
- * @todo simple way to supply Default Values with the macro.
 */
 
@@ -87 +86 @@
     ShellCommandBase* describe(const char* description);
     ShellCommandBase* setAlias(const char* alias);
+    ShellCommandBase* defaultValues(unsigned int count, ...);
 
     /** @returns the CommandList of the Shell */

trunk/src/lib/shell/shell_input.cc

@@ -36 +36 @@
     ->describe("retrieve some help about the input mode")
     ->setAlias("help");
-
 /**
  * standard constructor
@@ -179 +178 @@
 void ShellInput::help(const char* className, const char* functionName)
 {
+  printf("%s::%s\n", className, functionName);
+
   if (strlen(className) == 0)
   {

trunk/src/lib/util/helper_functions.cc

@@ -63 +63 @@
 const char* isString(const char* STRING, const char* defaultValue)
 {
-  if (STRING != NULL)
+  if (STRING != NULL && strlen(STRING) > 0)
     return STRING;
   else

trunk/src/orxonox.cc

@@ -58 +58 @@
 
 using namespace std;
+
+SHELL_COMMAND(restart, Orxonox, restart);
 
 /**
@@ -121 +123 @@
 Orxonox* Orxonox::singletonRef = NULL;
 
+// DANGEROUS
+void Orxonox::restart()
+{
+//   int argc = this->argc;
+//   char** argv = this->argv;
+//
+//   Orxonox *orx = Orxonox::getInstance();
+//
+//   delete orx;
+//
+//   orx = Orxonox::getInstance();
+//
+//   if((*orx).init(argc, argv) == -1)
+//   {
+//     PRINTF(1)("! Orxonox initialization failed\n");
+//     return;
+//   }
+//
+//   printf("finished inizialisation\n");
+//   orx->start();
+}
+
 /**
  *  this finds the config file

trunk/src/orxonox.h

@@ -25 +25 @@
   int init (int argc, char** argv);
 
+  void restart();
+
   void start();
 
@@ -40 +42 @@
   int initNetworking ();
   int initMisc ();
+
 
   const char* getConfigFile ();